From 3b7fcc031ee23a45e7089b4a41345fd420cb8a83 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 2 Oct 2016 13:10:42 +0200 Subject: [PATCH 1/6] Revert "mccabe_0_4: init at 0.4.0. Apparently, flake8 of the current default version needs older mccabe" This reverts commit 8eae96d70c18f2a1015796e8aa0ff84463f4711c. --- mccabe was already reverted --- pkgs/top-level/python-packages.nix | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1d658a0b5b..09f93953a8c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10547,7 +10547,7 @@ in modules // { }; buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = with self; [ pyflakes pep8 mccabe_0_4 ]; + propagatedBuildInputs = with self; [ pyflakes pep8 mccabe ]; meta = { description = "Code checking using pep8 and pyflakes"; @@ -13498,24 +13498,6 @@ in modules // { }; }); - mccabe_0_4 = buildPythonPackage (rec { - name = "mccabe-0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mccabe/${name}.tar.gz"; - sha256 = "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws"; - }; - - buildInputs = with self; [ pytestrunner pytest ]; - - meta = { - description = "McCabe checker, plugin for flake8"; - homepage = "https://github.com/flintwork/mccabe"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }); - mechanize = buildPythonPackage (rec { name = "mechanize-0.2.5"; From ad99006e47cde282a14d387c59b65db073830a88 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Fri, 30 Sep 2016 13:30:55 +0200 Subject: [PATCH 2/6] pythonPackages.mccabe_0_5: init 0.5.2 Signed-off-by: Alexander Ried --- pkgs/top-level/python-packages.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09f93953a8c..079a8e1bcb9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10567,7 +10567,7 @@ in modules // { }; buildInputs = with self; [ nose mock pytestrunner pytest ]; - propagatedBuildInputs = with self; [ pyflakes mccabe enum34 configparser pycodestyle ]; + propagatedBuildInputs = with self; [ pyflakes mccabe_0_5 enum34 configparser pycodestyle ]; patches = [ ../development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch @@ -13498,6 +13498,23 @@ in modules // { }; }); + mccabe_0_5 = buildPythonPackage (rec { + name = "mccabe-0.5.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/m/mccabe/${name}.tar.gz"; + sha256 = "1zss8c5cn8wvxsbjzv70dxymybh3cjzrjl19vxfbnyvmidng0wrl"; + }; + + buildInputs = with self; [ pytestrunner pytest ]; + + meta = { + description = "McCabe checker, plugin for flake8"; + homepage = "https://github.com/flintwork/mccabe"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; + }); mechanize = buildPythonPackage (rec { name = "mechanize-0.2.5"; From aada610882536d8cd9918c89bb3bdda65ae1c357 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 20:07:14 +0200 Subject: [PATCH 3/6] pythonPackages.flake8: 2.5.4 -> 2.6.2 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 079a8e1bcb9..b9df5ae919e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10539,15 +10539,15 @@ in modules // { flake8 = buildPythonPackage rec { name = "flake8-${version}"; - version = "2.5.4"; + version = "2.6.2"; src = pkgs.fetchurl { url = "mirror://pypi/f/flake8/${name}.tar.gz"; - sha256 = "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc"; + sha256 = "0y57hzal0j84dh9i1g1g6dc4aywvrnhy2fjmmbglpv5ajihxh713"; }; buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = with self; [ pyflakes pep8 mccabe ]; + propagatedBuildInputs = with self; [ pyflakes pycodestyle mccabe ]; meta = { description = "Code checking using pep8 and pyflakes"; From be14bfef44643fea691f678026a95f77672d38e2 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 20:00:59 +0200 Subject: [PATCH 4/6] pythonPackages.xdis: init at 2.3.1 --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9df5ae919e..f4a68bc1d3d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12004,6 +12004,21 @@ in modules // { }; + xdis = buildPythonPackage rec { + name = "xdis-${version}"; + version = "2.3.1"; + src = pkgs.fetchurl { + url = "mirror://pypi/x/xdis/${name}.tar.gz"; + sha256 = "1bi53n9fifjz2ja5inm546vzhjpgwx6n0qrhp106fss7bdm44a4v"; + }; + propagatedBuildInputs = with self; [ nose ]; + meta = { + description = "Python cross-version byte-code disassembler and marshal routines"; + homepage = https://github.com/rocky/python-xdis/; + license = licenses.mit; + }; + }; + lsi = buildPythonPackage rec { name = "lsi-${version}"; version = "0.2.2"; From c316e38bad0c75b9ecc8bb1f4721928ce523f5a9 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 20:01:18 +0200 Subject: [PATCH 5/6] pythonPackages.uncompyle6: init at 2.8.3 --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4a68bc1d3d..77d9ab72b12 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12019,6 +12019,21 @@ in modules // { }; }; + uncompyle6 = buildPythonPackage rec { + name = "uncompyle6-${version}"; + version = "2.8.3"; + src = pkgs.fetchurl { + url = "mirror://pypi/u/uncompyle6/${name}.tar.gz"; + sha256 = "0hx5sji6qjvnq1p0zhvyk5hgracpv2w6iar1j59qwllxv115ffi1"; + }; + propagatedBuildInputs = with self; [ spark_parser xdis ]; + meta = { + description = "Python cross-version byte-code deparser"; + homepage = http://github.com/rocky/python-uncompyle6/; + license = licenses.mit; + }; + }; + lsi = buildPythonPackage rec { name = "lsi-${version}"; version = "0.2.2"; From 1d2d782bfe78b47688a71cb25bdf67b7d7750bbc Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 20:01:46 +0200 Subject: [PATCH 6/6] pythonPackages.hypothesis: 3.1.0 -> 3.5.2 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77d9ab72b12..17effa8558f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11969,18 +11969,18 @@ in modules // { # If you need these, you can just add them to your environment. name = "hypothesis-${version}"; - version = "3.1.0"; + version = "3.5.2"; # Upstream prefers github tarballs src = pkgs.fetchFromGitHub { - owner = "DRMacIver"; + owner = "HypothesisWorks"; repo = "hypothesis"; rev = "${version}"; - sha256 = "1fhdb2vwc4blas5fvcly6pmha8psqm4bhi67jz32ypjryzk09iyf"; + sha256 = "030rf4gn4b0hylr90wazilwa3bc038fcqng0wibcx67mqaq035n4"; }; buildInputs = with self; [ flake8 pytest flaky ]; - propagatedBuildInputs = with self; ([] ++ optionals isPy27 [ enum34 modules.sqlite3 ]); + propagatedBuildInputs = with self; ([ uncompyle6 ] ++ optionals isPy27 [ enum34 modules.sqlite3 ]); # https://github.com/DRMacIver/hypothesis/issues/300 checkPhase = ''