From 00df7774e887d39075d295289e2a498a879c8bb3 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 11 May 2017 22:56:43 +0200 Subject: [PATCH 1/3] python-pyflakes: 1.3.0 -> 1.5.0 Fixes #25678 --- .../python-modules/pyflakes/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------------ 2 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/pyflakes/default.nix diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix new file mode 100644 index 000000000000..fbb0de6f0ced --- /dev/null +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, unittest2 }: + +buildPythonPackage rec { + pname = "pyflakes"; + version = "1.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x1pcca4a24k4pw8x1c77sgi58cg1wl2k38mp8a25k608pzls3da"; + }; + + buildInputs = [ unittest2 ]; + + doCheck = !isPyPy; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/pyflakes; + description = "A simple program which checks Python source files for errors"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 110ce6b84116..179b3d35a9a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19820,28 +19820,7 @@ in { }; }; - pyflakes = buildPythonPackage rec { - pname = "pyflakes"; - version = "1.3.0"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "a4f93317c97a9d9ed71d6ecfe08b68e3de9fea3f4d94dcd1d9d83ccbf929bc31"; - }; - - buildInputs = with self; [ unittest2 ]; - - doCheck = !isPyPy; - force-rebuild = 1; # fix transient test suite error at http://hydra.nixos.org/build/45083762 - - meta = { - homepage = https://launchpad.net/pyflakes; - description = "A simple program which checks Python source files for errors"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }; + pyflakes = callPackage ../development/python-modules/pyflakes { }; pyftgl = buildPythonPackage rec { name = "pyftgl-0.4b"; From af14949b0824c8d1ea227eb2d34103ea8147e1ef Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 11 May 2017 23:02:10 +0200 Subject: [PATCH 2/3] python-mccabe: 0.5.3 -> 0.6.1 --- .../python-modules/mccabe/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------------- 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/mccabe/default.nix diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix new file mode 100644 index 000000000000..472bba26eb65 --- /dev/null +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "mccabe"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx"; + }; + + buildInputs = [ pytest pytestrunner ]; + + meta = with stdenv.lib; { + description = "McCabe checker, plugin for flake8"; + homepage = "https://github.com/flintwork/mccabe"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 179b3d35a9a2..5b5badd22a62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13955,23 +13955,7 @@ in { }; - mccabe = buildPythonPackage (rec { - name = "mccabe-0.5.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mccabe/${name}.tar.gz"; - sha256 = "16293af41e7242031afd73896fef6458f4cad38201d21e28f344fff50ae1c25e"; - }; - - 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 ]; - }; - }); + mccabe = callPackage ../development/python-modules/mccabe { }; mechanize = buildPythonPackage (rec { name = "mechanize-0.2.5"; From 4005d8a26d6043841aa0039d720db9e831b6f8f3 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 11 May 2017 22:50:32 +0200 Subject: [PATCH 3/3] python-flake8: 3.2.1 -> 3.3.0 --- .../python-modules/flake8/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/flake8/default.nix diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix new file mode 100644 index 000000000000..aec715328f9b --- /dev/null +++ b/pkgs/development/python-modules/flake8/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +, mock, pytest, pytestrunner +, configparser, enum34, mccabe, pycodestyle, pyflakes +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "flake8"; + version = "3.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "04izn1q1lgbr408l9b3vkxqmpi6mq47bxwc0iwypb02mrxns41xr"; + }; + + buildInputs = [ pytest mock pytestrunner ]; + propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] + ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] + ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser ]; + + meta = with stdenv.lib; { + description = "Code checking using pep8 and pyflakes"; + homepage = http://pypi.python.org/pypi/flake8; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b5badd22a62..ddb4963f569c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11081,27 +11081,7 @@ in { }; }; - flake8 = buildPythonPackage rec { - name = "flake8-${version}"; - version = "3.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/flake8/${name}.tar.gz"; - sha256 = "c7c460b5aff3a2063c798a77af18ec70af3941d35a22e2e76965e3c0e0b36055"; - }; - - buildInputs = with self; [ pytest mock pytestrunner ]; - propagatedBuildInputs = with self; [ pyflakes pycodestyle mccabe ] - ++ optionals (pythonOlder "3.4") [ enum34 ] - ++ optionals (pythonOlder "3.2") [ configparser ]; - - meta = { - description = "Code checking using pep8 and pyflakes"; - homepage = http://pypi.python.org/pypi/flake8; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }; + flake8 = callPackage ../development/python-modules/flake8 { }; flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { };