diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2018-05-14 22:05:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-14 22:05:49 +0200 |
commit | 318970454971380d62a12c07fbf60b6e36c34aae (patch) | |
tree | 04b15f597c6cbcac106506926ffa108d1edb2683 /pkgs | |
parent | 33e07634be2fd2e496a12ef2103602d676bd4963 (diff) | |
parent | 42d11feae80f86b450ce64eef75a6f21dc807aab (diff) | |
download | nixlib-318970454971380d62a12c07fbf60b6e36c34aae.tar nixlib-318970454971380d62a12c07fbf60b6e36c34aae.tar.gz nixlib-318970454971380d62a12c07fbf60b6e36c34aae.tar.bz2 nixlib-318970454971380d62a12c07fbf60b6e36c34aae.tar.lz nixlib-318970454971380d62a12c07fbf60b6e36c34aae.tar.xz nixlib-318970454971380d62a12c07fbf60b6e36c34aae.tar.zst nixlib-318970454971380d62a12c07fbf60b6e36c34aae.zip |
Merge pull request #36426 from couchemar/isort-4.3.4
pythonPackages.isort: 4.2.5 -> 4.3.4
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/isort/default.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 19 |
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 a5a24e42865a..51553ea0e56e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6782,24 +6782,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 {}; |