about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrey Pavlov <couchemar@yandex.ru>2018-03-07 17:19:37 +0300
committerRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-04-29 20:35:26 +0200
commit42d11feae80f86b450ce64eef75a6f21dc807aab (patch)
tree23e35ad4d4f58ac950b850ec1f1a616a8509b8da
parent0963abfb41e48d60315e73223d390c1b4df3ff12 (diff)
downloadnixlib-42d11feae80f86b450ce64eef75a6f21dc807aab.tar
nixlib-42d11feae80f86b450ce64eef75a6f21dc807aab.tar.gz
nixlib-42d11feae80f86b450ce64eef75a6f21dc807aab.tar.bz2
nixlib-42d11feae80f86b450ce64eef75a6f21dc807aab.tar.lz
nixlib-42d11feae80f86b450ce64eef75a6f21dc807aab.tar.xz
nixlib-42d11feae80f86b450ce64eef75a6f21dc807aab.tar.zst
nixlib-42d11feae80f86b450ce64eef75a6f21dc807aab.zip
pythonPackages.isort: 4.2.5 -> 4.3.4
-rw-r--r--pkgs/development/python-modules/isort/default.nix28
-rw-r--r--pkgs/top-level/python-packages.nix19
2 files changed, 29 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix
new file mode 100644
index 000000000000..5a7e50d43322
--- /dev/null
+++ b/pkgs/development/python-modules/isort/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27, futures, mock, pytest }:
+
+buildPythonPackage rec {
+  pname = "isort";
+  version = "4.3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r";
+  };
+
+  propagatedBuildInputs = lib.optional isPy27 futures;
+
+  checkInputs = [ mock pytest ];
+
+  checkPhase = ''
+    py.test test_isort.py -k "not test_long_line_comments \
+                          and not test_import_case_produces_inconsistent_results_issue_472 \
+                          and not test_no_extra_lines_issue_557"
+  '';
+
+  meta = with lib; {
+    description = "A Python utility / library to sort Python imports";
+    homepage = https://github.com/timothycrosley/isort;
+    license = licenses.mit;
+    maintainers = with maintainers; [ couchemar nand0p ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f24d6ff955bd..997da36a1eb8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6802,24 +6802,7 @@ in {
 
   iso8601 = callPackage ../development/python-modules/iso8601 { };
 
-  isort = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "isort";
-    version = "4.2.5";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/${pname}/${name}.tar.gz";
-      sha256 = "0p7a6xaq7zxxq5vr5gizshnsbk2afm70apg97xwfdxiwyi201cjn";
-    };
-    buildInputs = with self; [ mock pytest ];
-    # No tests distributed
-    doCheck = false;
-    meta = {
-      description = "A Python utility / library to sort Python imports";
-      homepage = https://github.com/timothycrosley/isort;
-      license = licenses.mit;
-      maintainers = with maintainers; [ couchemar nand0p ];
-    };
-  };
+  isort = callPackage ../development/python-modules/isort {};
 
   jabberbot = callPackage ../development/python-modules/jabberbot {};