NixOS · Mar 15, 2019 · Mar 15, 2019 · Mar 15, 2019
Showing with 34 additions and 17 deletions.

+3 −3 pkgs/development/python-modules/pysrt/default.nix

+7 −6 pkgs/development/python-modules/restructuredtext_lint/default.nix

+24 −8 pkgs/development/python-modules/subliminal/default.nix
diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix
@@ -1,11 +1,11 @@
 { stdenv
-, buildPythonApplication
+, buildPythonPackage
 , fetchFromGitHub
 , chardet
 , nose
 }:
 
-buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "pysrt";
   version = "1.1.1";
 
@@ -16,7 +16,7 @@ buildPythonApplication rec {
     sha256 = "0rwjaf26885vxhxnas5d8zwasvj7x88y4y2pdivjd4vdcpqrqdjn";
   };
 
-  buildInputs = [ nose ];
+  checkInputs = [ nose ];
   checkPhase = ''
     nosetests -v
   '';

diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix
@@ -1,33 +1,34 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, isPy37
 , docutils
 , nose
-, stdenv
-, flake8
-, pyyaml
 , testtools
 }:
 
 buildPythonPackage rec {
   pname = "restructuredtext_lint";
   version = "1.2.2";
 
+  # https://github.com/twolfson/restructuredtext-lint/pull/47
+  disabled = isPy37;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350";
   };
 
-  checkInputs = [ nose flake8 pyyaml testtools ];
+  checkInputs = [ nose testtools ];
   propagatedBuildInputs = [ docutils ];
 
   checkPhase = ''
-     ${stdenv.shell} test.sh
+    nosetests --nocapture
   '';
 
   meta = {
     description = "reStructuredText linter";
     homepage = https://github.com/twolfson/restructuredtext-lint;
     license = lib.licenses.unlicense;
   };
-}
+}
diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix
@@ -1,6 +1,7 @@
-{ stdenv
+{ lib
 , fetchPypi
-, buildPythonApplication
+, buildPythonPackage
+, isPy3k
 , guessit
 , babelfish
 , enzyme
@@ -16,9 +17,16 @@
 , rarfile
 , pytz
 , futures
+, sympy
+, vcrpy
+, pytest
+, pytestpep8
+, pytest-flakes
+, pytestcov
+, pytestrunner
 }:
 
-buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "subliminal";
   version = "2.0.5";
 
@@ -27,13 +35,21 @@ buildPythonApplication rec {
     sha256 = "1dzv5csjcwgz69aimarx2c6606ckm2gbn4x2mzydcqnyai7sayhl";
   };
 
-  # Too many test dependencies
+  propagatedBuildInputs = [
+    guessit babelfish enzyme beautifulsoup4 requests
+    click dogpile_cache stevedore chardet pysrt six
+    appdirs rarfile pytz
+  ] ++ lib.optional (!isPy3k) futures;
+
+  checkInputs = [
+    sympy vcrpy pytest pytestpep8 pytest-flakes
+    pytestcov pytestrunner
+  ];
+
+  # https://github.com/Diaoul/subliminal/pull/963
   doCheck = false;
-  propagatedBuildInputs = [ guessit babelfish enzyme beautifulsoup4 requests
-                            click dogpile_cache stevedore chardet pysrt six
-                            appdirs rarfile pytz futures ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/Diaoul/subliminal;
     description = "Python library to search and download subtitles";
     license = licenses.mit;