From f3400b5ca9298ae0bb6bab25219debcccac41567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 13:22:13 +0100 Subject: [PATCH 01/64] python.pkgs.urrlib3: 1.20 -> 1.22 --- .../python-modules/urllib3/default.nix | 32 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +------------------ 2 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/urllib3/default.nix diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix new file mode 100644 index 00000000000..a23ae0f0b74 --- /dev/null +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi +, coverage, tornado, mock, nose, psutil, pysocks }: + +buildPythonPackage rec { + pname = "urllib3"; + version = "1.22"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; + }; + + NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ + "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" + "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" + ]; + + checkPhase = '' + nosetests -v --cover-min-percentage 1 + ''; + + doCheck = false; + + buildInputs = [ coverage tornado mock nose psutil pysocks ]; + + meta = with stdenv.lib; { + description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; + homepage = https://www.dropbox.com/developers/core/docs; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 97265230beb..bcdcb07e5dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5347,38 +5347,7 @@ in { }; }; - urllib3 = let - disabled_tests = [ - "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" - "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" - ]; - in buildPythonPackage rec { - pname = "urllib3"; - version = "1.20"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "0bx76if7shzlyykmaj4fhjkir5bswc4fdx5r4q0lrn3q51p2pvwp"; - }; - - NOSE_EXCLUDE=concatStringsSep "," disabled_tests; - - checkPhase = '' - nosetests -v --cover-min-percentage 1 - ''; - - doCheck = false; - - buildInputs = with self; [ coverage tornado mock nose psutil pysocks ]; - - meta = { - description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; - homepage = https://www.dropbox.com/developers/core/docs; - license = licenses.mit; - }; - }; - + urllib3 = callPackage ../development/python-modules/urllib3 {}; dropbox = buildPythonPackage rec { name = "dropbox-${version}"; From b4dbd7fdb8ddb1d9dc00fc24bb616173ce6f801b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 13:26:52 +0100 Subject: [PATCH 02/64] python.pkgs.chardet: 2.3.0 -> 3.0.4 --- .../python-modules/chardet/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/chardet/default.nix diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix new file mode 100644 index 00000000000..7e50dca4066 --- /dev/null +++ b/pkgs/development/python-modules/chardet/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestrunner, hypothesis }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "chardet"; + version = "3.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; + }; + + buildInputs = [ pytest pytestrunner hypothesis ]; + + meta = with stdenv.lib; { + homepage = https://github.com/chardet/chardet; + description = "Universal encoding detector"; + license = licenses.lgpl2; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcdcb07e5dc..aa3d8d438a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8713,21 +8713,7 @@ in { }; }; - chardet = buildPythonPackage rec { - name = "chardet-2.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/chardet/${name}.tar.gz"; - sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"; - }; - - meta = { - homepage = https://github.com/chardet/chardet; - description = "Universal encoding detector"; - license = licenses.lgpl2; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + chardet = callPackage ../development/python-modules/chardet { }; django = self.django_1_11; From 8bc620ddc2bbcf7794194f218d66b0e141d9d1a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 13:30:51 +0100 Subject: [PATCH 03/64] python.pkgs.flask-compress: 1.3.2 -> 1.4.0 --- .../python-modules/flask-compress/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +---------------- 2 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/flask-compress/default.nix diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix new file mode 100644 index 00000000000..c46fce2fe75 --- /dev/null +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage, flask }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "1.4.0"; + pname = "Flask-Compress"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cxdbdiyxkspg7vkchfmaqr7c6q79gwvakna3fjcc6nivps971j6"; + }; + + propagatedBuildInputs = [ flask ]; + + meta = with stdenv.lib; { + description = "Compress responses in your Flask app with gzip"; + homepage = "https://libwilliam.github.io/flask-compress/"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa3d8d438a3..a12a95b5132 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9635,23 +9635,7 @@ in { }; }; - flask-compress = buildPythonPackage rec { - name = "Flask-Compress-${version}"; - version = "1.3.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Compress/${name}.tar.gz"; - sha256 = "4fbb53e7f6ce8b1458a2c3d7a528564912f2641ab2f9f43819fc96ed7f770734"; - }; - - propagatedBuildInputs = with self; [ flask ]; - - meta = { - description = "Compress responses in your Flask app with gzip"; - homepage = "https://libwilliam.github.io/flask-compress/"; - license = licenses.mit; - }; - }; + flask-compress = callPackage ../development/python-modules/flask-compress { }; flask-cors = buildPythonPackage rec { name = "Flask-Cors-${version}"; From 99ed36e590cb290e4092e0fec74d46081680f08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 13:34:32 +0100 Subject: [PATCH 04/64] python.pkgs.flask-cors: 2.1.2 -> 3.0.2 --- .../python-modules/flask-cors/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +--------------- 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/flask-cors/default.nix diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix new file mode 100644 index 00000000000..4521374a0bb --- /dev/null +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage +, nose, flask, six }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Flask-Cors"; + version = "3.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mnsyyqn8akin2vz98b9fbv63hcvwmfkaapsglw5jizdkmaz628a"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ flask six ]; + + meta = with stdenv.lib; { + description = "A Flask extension adding a decorator for CORS support"; + homepage = https://github.com/corydolphin/flask-cors; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a12a95b5132..f0765779613 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9637,24 +9637,7 @@ in { flask-compress = callPackage ../development/python-modules/flask-compress { }; - flask-cors = buildPythonPackage rec { - name = "Flask-Cors-${version}"; - version = "2.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Cors/${name}.tar.gz"; - sha256 = "0fd618a4f88ykqx4x55viz47cm9rl214q1b45a0b4mz5vhxffqpj"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ flask six ]; - - meta = { - description = "A Flask extension adding a decorator for CORS support"; - homepage = https://github.com/corydolphin/flask-cors; - license = with licenses; [ mit ]; - }; - }; + flask-cors = callPackage ../development/python-modules/flask-cors { }; flask_elastic = callPackage ../development/python-modules/flask-elastic.nix { }; From bfabc3a78c909a6f6f0ea88dc2d34deba61c16d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 13:44:05 +0100 Subject: [PATCH 05/64] python.pkgs.flask-restful: 0.3.5 -> 0.3.6 --- .../python-modules/flask-restful/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/flask-restful/default.nix diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix new file mode 100644 index 00000000000..c54c015af12 --- /dev/null +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, nose, mock, blinker +, flask, six, pytz, aniso8601, pycrypto +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Flask-RESTful"; + version = "0.3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap"; + }; + +# TypeError: Only byte strings can be passed to C code + patchPhase = if isPy3k then '' + rm tests/test_crypto.py tests/test_paging.py + '' else null; + buildInputs = [ nose mock blinker ]; + propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; + PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; + + meta = with stdenv.lib; { + homepage = "http://flask-restful.readthedocs.io/"; + description = "REST API building blocks for Flask"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0765779613..bed6a47c78d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9671,29 +9671,7 @@ in { flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; - flask-restful = buildPythonPackage rec { - name = "Flask-RESTful-${version}"; - version = "0.3.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-RESTful/${name}.tar.gz"; - sha256 = "cce4aeff959b571136b5af098bebe7d3deeca7eb1411c4e722ff2c5356ab4c42"; - }; - - # TypeError: Only byte strings can be passed to C code - patchPhase = if isPy3k then '' - rm tests/test_crypto.py tests/test_paging.py - '' else null; - buildInputs = with self; [ nose mock blinker ]; - propagatedBuildInputs = with self; [ flask six pytz aniso8601 pycrypto ]; - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - - meta = { - homepage = "http://flask-restful.readthedocs.io/"; - description = "REST API building blocks for Flask"; - license = licenses.bsd3; - }; - }; + flask-restful = callPackage ../development/python-modules/flask-restful { }; flask-restplus = callPackage ../development/python-modules/flask-restplus/default.nix { }; # Exactly 0.8.6 is required by flexget From 4050ec5836fc55fc259f1e7c3fdc5e36b8081c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:53:19 +0100 Subject: [PATCH 06/64] python.pkgs.flask-restplus_0_8: remove --- .../python-modules/flask-restplus/0.8.nix | 42 ------------------- pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/flask-restplus/0.8.nix diff --git a/pkgs/development/python-modules/flask-restplus/0.8.nix b/pkgs/development/python-modules/flask-restplus/0.8.nix deleted file mode 100644 index 2c415ec47e3..00000000000 --- a/pkgs/development/python-modules/flask-restplus/0.8.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, blinker -, tzlocal -, mock -, rednose -, flask -, six -, jsonschema -, pytz -, aniso8601 -, flask-restful -}: - -buildPythonPackage rec { - pname = "flask-restplus"; - version = "0.8.6"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "3bb76cc156b9a09da62396d82b29fa31e4f27cccf79528538fe7155cf2785593"; - }; - - checkInputs = [ nose blinker tzlocal mock rednose ]; - propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ]; - - # RuntimeError: Working outside of application context. - doCheck = false; - - checkPhase = '' - nosetests - ''; - - meta = { - homepage = https://github.com/noirbizarre/flask-restplus; - description = "Fast, easy and documented API development with Flask"; - license = lib.licenses.mit; - }; -} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bed6a47c78d..f8f5d00a069 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9673,9 +9673,7 @@ in { flask-restful = callPackage ../development/python-modules/flask-restful { }; - flask-restplus = callPackage ../development/python-modules/flask-restplus/default.nix { }; - # Exactly 0.8.6 is required by flexget - flask-restplus_0_8 = callPackage ../development/python-modules/flask-restplus/0.8.nix { }; + flask-restplus = callPackage ../development/python-modules/flask-restplus { }; flask_script = buildPythonPackage rec { name = "Flask-Script-${version}"; From 7a73f298d9b19374f35bc781c70fb430bd5e323c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:54:05 +0100 Subject: [PATCH 07/64] python.pkgs.pytz: 2016.6.1 -> 2017.2 --- pkgs/top-level/python-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8f5d00a069..353fa9eec82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18966,18 +18966,19 @@ in { }; }; - pytz = buildPythonPackage rec { - name = "pytz-${version}"; - version = "2016.6.1"; + name = "${pname}-${version}"; + pname = "pytz"; + version = "2017.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytz/${name}.tar.gz"; - sha256 = "6f57732f0f8849817e9853eb9d50d85d1ebb1404f702dbc44ee627c642a486ca"; + src = fetchPypi { + inherit pname version; + sha256 = "12cmd3j46d2gcw08bspvp6s9icfcvx88zjz52n1bli9dyvl5dh7m"; + extension = "zip"; }; checkPhase = '' - ${python.interpreter} -m unittest discover -s pytz/tests + python -m unittest discover -s pytz/tests ''; meta = { @@ -18987,7 +18988,6 @@ in { }; }; - pyutil = buildPythonPackage (rec { name = "pyutil-2.0.0"; From ffb043b76939c274c798ff93b449e802a6180684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:57:01 +0100 Subject: [PATCH 08/64] python.pkgs.requests: 2.13.0 -> 2.18.4 --- .../python-modules/requests/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/requests/default.nix diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix new file mode 100644 index 00000000000..b85bb54a4f1 --- /dev/null +++ b/pkgs/development/python-modules/requests/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchPypi, buildPythonPackage +, urllib3, idna, chardet, certifi +, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "requests"; + version = "2.18.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; + }; + + nativeBuildInputs = [ pytest ]; + propagatedBuildInputs = [ urllib3 idna chardet certifi ]; + # sadly, tests require networking + doCheck = false; + + meta = with stdenv.lib; { + description = "An Apache2 licensed HTTP library, written in Python, for human beings"; + homepage = http://docs.python-requests.org/en/latest/; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 353fa9eec82..ccc01a4abf4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19269,25 +19269,7 @@ in { requests2 = throw "requests2 has been deprecated. Use requests instead."; # use requests, not requests_2 - requests = buildPythonPackage rec { - name = "requests-${version}"; - version = "2.13.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/requests/${name}.tar.gz"; - sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8"; - }; - - nativeBuildInputs = [ self.pytest ]; - # sadly, tests require networking - doCheck = false; - - meta = { - description = "An Apache2 licensed HTTP library, written in Python, for human beings"; - homepage = http://docs.python-requests.org/en/latest/; - license = licenses.asl20; - }; - }; + requests = callPackage ../development/python-modules/requests { }; requests_download = buildPythonPackage rec { pname = "requests_download"; From c9f387a55c7bbb8a67e86fa254f1684ce8972a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 16:01:22 +0100 Subject: [PATCH 09/64] python.pkgs.tzlocal: 1.2.2 -> 1.4 --- .../python-modules/tzlocal/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/tzlocal/default.nix diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix new file mode 100644 index 00000000000..2277cb7c4ca --- /dev/null +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, tzlocal, pytz }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "tzlocal"; + version = "1.4"; + + propagatedBuildInputs = [ pytz ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0n9hw4kqblyc0avzwi26rqmvyk9impb608rvy11qifmigy7r18h5"; + }; + + # test fail (timezone test fail) + doCheck = false; + + meta = with stdenv.lib; { + description = "Tzinfo object for the local timezone"; + homepage = https://github.com/regebro/tzlocal; + license = licenses.cddl; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ccc01a4abf4..a949db1b263 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22973,25 +22973,7 @@ in { twisted = callPackage ../development/python-modules/twisted { }; - tzlocal = buildPythonPackage rec { - name = "tzlocal-1.2.2"; - - propagatedBuildInputs = with self; [ pytz ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tzlocal/${name}.tar.gz"; - sha256 = "0paj7vlsb0np8b5sp4bv64wxv7qk2piyp7xg29pkhdjwsbls9fnb"; - }; - - # test fail (timezone test fail) - doCheck = false; - - meta = with pkgs.stdenv.lib; { - description = "Tzinfo object for the local timezone"; - homepage = https://github.com/regebro/tzlocal; - license = licenses.cddl; - }; - }; + tzlocal = callPackage ../development/python-modules/tzlocal { }; u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; From 50cc30da735c75885789de1728e43d54d318a07a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 16:05:56 +0100 Subject: [PATCH 10/64] python.pkgs.werkzeug: 0.11.10 -> 0.12 --- .../python-modules/werkzeug/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +---------------- 2 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/werkzeug/default.nix diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix new file mode 100644 index 00000000000..5979d895a74 --- /dev/null +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, itsdangerous +, pytest, requests, glibcLocales }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Werkzeug"; + version = "0.12.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "09mv4cya3lywkn4mi3qrqmjgwiw99kdk03dk912j8da6ny3pnflh"; + }; + + LC_ALL = "en_US.UTF-8"; + + propagatedBuildInputs = [ itsdangerous ]; + buildInputs = [ pytest requests glibcLocales ]; + + meta = with stdenv.lib; { + homepage = http://werkzeug.pocoo.org/; + description = "A WSGI utility library for Python"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a949db1b263..a4bd8e43b45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23648,28 +23648,7 @@ EOF }; }; - - werkzeug = buildPythonPackage rec { - name = "Werkzeug-0.11.10"; - - src = pkgs.fetchurl { - url = "mirror://pypi/W/Werkzeug/${name}.tar.gz"; - sha256 = "1vpf98k4jp4yhbv2jbyq8dj5fdasrd26rkq34pacs5n7mkxxlr6c"; - }; - - LC_ALL = "en_US.UTF-8"; - - propagatedBuildInputs = with self; [ itsdangerous ]; - buildInputs = with self; [ pytest requests pkgs.glibcLocales ]; - - - - meta = { - homepage = http://werkzeug.pocoo.org/; - description = "A WSGI utility library for Python"; - license = licenses.bsd3; - }; - }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; wheel = callPackage ../development/python-modules/wheel { }; From 7ea007653751da650da6aa33e2293adad3573ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 16:06:31 +0100 Subject: [PATCH 11/64] python.pkgs.tempora: 1.4 -> 1.8 --- pkgs/development/python-modules/tempora/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 69006a31905..a8eba4cb3a0 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,19 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools_scm, six }: +, setuptools_scm +, six, pytz}: buildPythonPackage rec { - version = "1.4"; - pname = "tempora"; name = "${pname}-${version}"; + pname = "tempora"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "0ysvns22i5hzhl5ln4n86bq10j8xwvd09z8qw1zjr3s0fj3lynza"; + sha256 = "1b29d19r8h5my9kzzywi9khn1qzvk3qzp08k0f4rrsa7qks930l4"; }; doCheck = false; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six pytz ]; } From c6539df7ab32a1650d3327452bb5e051cf3377fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:17:06 +0100 Subject: [PATCH 12/64] python.pkgs.dateutil: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/dateutil/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index c814b82dad0..b980381edbb 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,12 +1,12 @@ -{ stdenv, buildPythonPackage, fetchurl, six }: +{ stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { - pname = "dateutil"; name = "${pname}-${version}"; - version = "2.6.0"; + pname = "python-dateutil"; + version = "2.6.1"; - src = fetchurl { - url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "1lhq0hxjc3cfha101q02ld5ijlpfyjn2w1yh7wvpiy367pgzi8k2"; + src = fetchPypi { + inherit pname version; + sha256 = "1jkahssf0ir5ssxc3ydbp8cpv77limn8d4s77szb2nrgl2r3h749"; }; propagatedBuildInputs = [ six ]; From 69c4724dd4be7eea0f130c44114f8fe013fe0f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:17:49 +0100 Subject: [PATCH 13/64] python.pkgs.backports_unittest-mock: init at 1.3 --- .../backports_unittest-mock/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/backports_unittest-mock/default.nix diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix new file mode 100644 index 00000000000..e64f51fe7ca --- /dev/null +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "backports.unittest_mock"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xdkx5wf5a2w2zd2pshk7z2cvbv6db64c1x6v9v1a18ja7bn9nf6"; + }; + + propagatedBuildInputs = [ mock ]; + + buildInputs = [ setuptools_scm ]; + + meta = with stdenv.lib; { + description = "Provides a function install() which makes the mock module"; + homepage = https://github.com/jaraco/backports.unittest_mock; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a4bd8e43b45..54367512727 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1259,6 +1259,8 @@ in { }; }; + backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; + babelfish = buildPythonPackage rec { version = "0.5.5"; name = "babelfish-${version}"; From 1041009a92d2bcdd2dfc752ebadd2dee033a78db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:18:33 +0100 Subject: [PATCH 14/64] python.pkgs.cheroot: init at 5.5.0 --- .../python-modules/cheroot/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/cheroot/default.nix diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix new file mode 100644 index 00000000000..c20cbabe0d6 --- /dev/null +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchPypi, buildPythonPackage +, six +, coverage, codecov, pytest, pytestcov, pytest-sugar, portend +, backports_unittest-mock, setuptools_scm }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "cheroot"; + version = "5.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fhyk8lgs2blfx4zjvwsy6f0ynrs5fwnnr3qf07r6c4j3gwlkqsr"; + }; + + propagatedBuildInputs = [ six ]; + buildInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock setuptools_scm ]; + + checkPhase = '' + py.test cheroot + ''; + + meta = with stdenv.lib; { + description = "High-performance, pure-Python HTTP"; + homepage = https://github.com/cherrypy/cheroot; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 54367512727..896cc0aa676 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1659,6 +1659,8 @@ in { channels = callPackage ../development/python-modules/channels {}; + cheroot = callPackage ../development/python-modules/cheroot {}; + circus = buildPythonPackage rec { name = "circus-0.11.1"; From dc6d287dcfa9154f3a06fbc40518c2740b39c104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:20:01 +0100 Subject: [PATCH 15/64] python.pkgs.portend: init at 2.1.2 --- .../python-modules/portend/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/portend/default.nix diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix new file mode 100644 index 00000000000..9092185a40f --- /dev/null +++ b/pkgs/development/python-modules/portend/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytest-sugar, pytest-warnings, setuptools_scm +, tempora }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "portend"; + version = "2.1.2"; + + buildInputs = [ pytest pytest-sugar pytest-warnings setuptools_scm ]; + propagatedBuildInputs = [ tempora ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0dx8b1rn64ymx5s4mdzlw5hz59qi167z7nny36dl75ghlldn41w4"; + }; + + meta = with stdenv.lib; { + description = "Monitor TCP ports for bound or unbound states"; + homepage = https://github.com/jaraco/portend; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 896cc0aa676..5d7063904ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16638,6 +16638,8 @@ in { }; }; + portend = callPackage ../development/python-modules/portend { }; + powerline = callPackage ../development/python-modules/powerline { }; pox = buildPythonPackage rec { From be7d6c4cfdf24020eb570783e819e9e80adbc8d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:27:33 +0100 Subject: [PATCH 16/64] python.pkgs.beautifulsoup: 4.5.3 -> 4.6.0 --- .../python-modules/beautifulsoup4/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +--------------- 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/beautifulsoup4/default.nix diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix new file mode 100644 index 00000000000..fd8bddee14b --- /dev/null +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "beautifulsoup4"; + version = "4.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "12cf0ygpz9srpfh9gx2f9ba0swa1rzypv3sm4r0hmjyw6b4nm2w0"; + }; + + buildInputs = [ nose ]; + checkPhase = '' + nosetests build + ''; + + meta = with stdenv.lib; { + homepage = http://crummy.com/software/BeautifulSoup/bs4/; + description = "HTML and XML parser"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d7063904ca..e3678e70e70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1359,26 +1359,7 @@ in { }; }); - beautifulsoup4 = buildPythonPackage (rec { - name = "beautifulsoup4-4.5.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz"; - sha256 = "0glaw1vyxnbp03fni7h5496n6iib0n5iim4gax1n0ngscs9s075j"; - }; - - buildInputs = [ self.nose ]; - checkPhase = '' - nosetests build/ - ''; - - meta = { - homepage = http://crummy.com/software/BeautifulSoup/bs4/; - description = "HTML and XML parser"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; - }); + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; beaker = buildPythonPackage rec { name = "Beaker-${version}"; From ec33fe618186d572b4bc6db9714cd320207685e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:31:39 +0100 Subject: [PATCH 17/64] python.pkgs.cherrypy: 8.7.0 -> 11.0.0 --- .../python-modules/cherrypy/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +--------------- 2 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/cherrypy/default.nix diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix new file mode 100644 index 00000000000..327a10f2491 --- /dev/null +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, pytest, setuptools_scm, pytestrunner +, six, cheroot, portend }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "CherryPy"; + version = "11.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1037pvhab4my791vfzikm649ny52fj7x2q87cnncmbnqin6ghwan"; + }; + + # wsgiserver.ssl_pyopenssl is broken on py3k. + doCheck = !isPy3k; + buildInputs = [ pytest setuptools_scm pytestrunner ]; + propagatedBuildInputs = [ six cheroot portend ]; + + meta = with stdenv.lib; { + homepage = "http://www.cherrypy.org"; + description = "A pythonic, object-oriented HTTP framework"; + license = licenses.mit.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3678e70e70..79c089c5b5a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2774,27 +2774,7 @@ in { }; }; - - cherrypy = buildPythonPackage (rec { - name = "cherrypy-${version}"; - version = "8.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/CherryPy/CherryPy-${version}.tar.gz"; - sha256 = "cbf418bf46458a67eb841944f2d414c23bf59d090baf2a28704bd67243e6a79f"; - }; - - # wsgiserver.ssl_pyopenssl is broken on py3k. - doCheck = !isPy3k; - buildInputs = with self; [ pytest setuptools_scm pytestrunner ]; - propagatedBuildInputs = with self; [ six ]; - - meta = { - homepage = "http://www.cherrypy.org"; - description = "A pythonic, object-oriented HTTP framework"; - }; - }); - + cherrypy = callPackage ../development/python-modules/cherrypy {}; cjson = buildPythonPackage rec { name = "python-cjson-${version}"; From 1089ccedb7362efebbbbd5e9a76a72e54c03dbc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:32:28 +0100 Subject: [PATCH 18/64] python.pkgs.pytest-warnings: init at 0.3.0 --- .../pytest-warnings/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-warnings/default.nix diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix new file mode 100644 index 00000000000..e6ebfcbb716 --- /dev/null +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-warnings"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "18yxh153icmndaw8fkl1va0bk0mwzrbpaa6wxd29w3iwxym5zn2a"; + }; + + propagatedBuildInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Plugin to list Python warnings in pytest report"; + homepage = github.com/fschulze/pytest-warnings; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79c089c5b5a..836ff07afd5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4232,6 +4232,8 @@ in { }; }; + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; + pytestpep8 = buildPythonPackage rec { name = "pytest-pep8"; src = pkgs.fetchurl { From bde5cde9c65ed5e8eb2b0522acac4abca21ba46d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:32:58 +0100 Subject: [PATCH 19/64] python.pkgs.pytest-sugar: init at 0.9.0 --- .../python-modules/pytest-sugar/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-sugar/default.nix diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix new file mode 100644 index 00000000000..81f5a2cbd4b --- /dev/null +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, termcolor, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-sugar"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "11lni9kn0r1y896xg20qjv4yjcyr56h0hx9dprdgjnam4dqcl6lg"; + }; + + propagatedBuildInputs = [ termcolor pytest ]; + + meta = with stdenv.lib; { + description = "A plugin that changes the default look and feel of py.test"; + homepage = https://github.com/Frozenball/pytest-sugar; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 836ff07afd5..ab90dfd5e01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4444,6 +4444,8 @@ in { }; }; + pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; + tinycss = buildPythonPackage rec { name = "tinycss-${version}"; version = "0.3"; From 32a158b43a1e38761f44d382d13b40a6f8172842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:35:37 +0100 Subject: [PATCH 20/64] python.pkgs.flask: 0.12 -> 0.12.2 --- .../python-modules/flask/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +-------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/flask/default.nix diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix new file mode 100644 index 00000000000..b16dc08a5e1 --- /dev/null +++ b/pkgs/development/python-modules/flask/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, itsdangerous, click, werkzeug, jinja2 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.12.2"; + pname = "Flask"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hfs2jr2m5lr51xd4gblb28rncd0xrpycz6c07cyqsbv4dhl9x29"; + }; + + propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ]; + + meta = with stdenv.lib; { + homepage = http://flask.pocoo.org/; + description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab90dfd5e01..5da7d551e5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9551,22 +9551,7 @@ in { }; }; - flask = buildPythonPackage { - name = "flask-0.12"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask/Flask-0.12.tar.gz"; - sha256 = "12yasybryp33rdchsqgckf15zj4pjfam7ly5spmn2sijpv6h7s4k"; - }; - - propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; - - meta = { - homepage = http://flask.pocoo.org/; - description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; - license = licenses.bsd3; - }; - }; + flask = callPackage ../development/python-modules/flask { }; flask_assets = buildPythonPackage rec { name = "Flask-Assets-${version}"; From 4e1b5e15fbc15d7d7ea05f7247428d0145e66dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:41:12 +0100 Subject: [PATCH 21/64] python.pkgs.jsonschema: 2.5.3 -> 2.6.0 --- .../python-modules/jsonschema/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +---------------- 2 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/jsonschema/default.nix diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix new file mode 100644 index 00000000000..cd29d7b5d31 --- /dev/null +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, python +, nose, mock, vcversioner, functools32 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "jsonschema"; + version = "2.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg"; + }; + + buildInputs = [ nose mock vcversioner ]; + propagatedBuildInputs = [ functools32 ]; + + patchPhase = '' + substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py \ + --replace "python" "${python}/bin/${python.executable}" + ''; + + checkPhase = "nosetests"; + + meta = with stdenv.lib; { + homepage = https://github.com/Julian/jsonschema; + description = "An implementation of JSON Schema validation for Python"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5da7d551e5c..8b951465c39 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9804,33 +9804,7 @@ in { }; }; - jsonschema = buildPythonPackage (rec { - version = "2.5.1"; - name = "jsonschema-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jsonschema/jsonschema-${version}.tar.gz"; - sha256 = "0hddbqjm4jq63y8jf44nswina1crjs16l9snb6m3vvgyg31klrrn"; - }; - - buildInputs = with self; [ nose mock vcversioner ]; - propagatedBuildInputs = with self; [ functools32 ]; - - patchPhase = '' - substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py --replace "python" "${python}/bin/${python.executable}" - ''; - - checkPhase = '' - nosetests - ''; - - meta = { - homepage = https://github.com/Julian/jsonschema; - description = "An implementation of JSON Schema validation for Python"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; - }); + jsonschema = callPackage ../development/python-modules/jsonschema { }; vcversioner = buildPythonPackage rec { name = "vcversioner-${version}"; From d6e40f2c146472fb1a79acf001d6031145038456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:46:56 +0100 Subject: [PATCH 22/64] python.pkgs.vcversioner: 2.14.0.0 -> 2.16.0.0 --- .../python-modules/vcversioner/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +------------- 2 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/vcversioner/default.nix diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix new file mode 100644 index 00000000000..1b9819c035d --- /dev/null +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "vcversioner"; + version = "2.16.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns"; + }; + + meta = with stdenv.lib; { + description = "take version numbers from version control"; + homepage = https://github.com/habnabit/vcversioner; + licenses = licenses.isc; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8b951465c39..06f588d97c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9806,19 +9806,7 @@ in { jsonschema = callPackage ../development/python-modules/jsonschema { }; - vcversioner = buildPythonPackage rec { - name = "vcversioner-${version}"; - version = "2.14.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/vcversioner/vcversioner-${version}.tar.gz"; - sha256 = "11ivq1bm7v0yb4nsfbv9m7g7lyjn112gbvpjnjz8nv1fx633dm5c"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/habnabit/vcversioner"; - }; - }; + vcversioner = callPackage ../development/python-modules/vcversioner { }; falcon = buildPythonPackage (rec { name = "falcon-1.0.0"; From 9788c3f42124ac1480638efc546f4a1ad3221ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 15:49:56 +0100 Subject: [PATCH 23/64] python.pkgs.jinja2: 2.9.5 -> 2.9.6 --- .../python-modules/jinja2/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +---------------- 2 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/jinja2/default.nix diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix new file mode 100644 index 00000000000..ca286ae06aa --- /dev/null +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, markupsafe }: + +buildPythonPackage rec { + pname = "Jinja2"; + version = "2.9.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx"; + }; + + propagatedBuildInputs = [ markupsafe ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://jinja.pocoo.org/; + description = "Stand-alone template engine"; + license = licenses.bsd3; + longDescription = '' + Jinja2 is a template engine written in pure Python. It provides a + Django inspired non-XML syntax but supports inline expressions and + an optional sandboxed environment. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ pierron garbas sjourdois ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 06f588d97c3..51459b014c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11248,34 +11248,7 @@ in { }; }; - jinja2 = buildPythonPackage rec { - pname = "Jinja2"; - version = "2.9.5"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; - sha256 = "702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825"; - }; - - propagatedBuildInputs = with self; [ markupsafe ]; - - # No tests included - doCheck = false; - - meta = { - homepage = http://jinja.pocoo.org/; - description = "Stand-alone template engine"; - license = licenses.bsd3; - longDescription = '' - Jinja2 is a template engine written in pure Python. It provides a - Django inspired non-XML syntax but supports inline expressions and - an optional sandboxed environment. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ pierron garbas sjourdois ]; - }; - }; + jinja2 = callPackage ../development/python-modules/jinja2 { }; jinja2_time = buildPythonPackage rec { version = "0.2.0"; From 6ba195897cd896a3afed78737af089c57ddd6673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 16:20:43 +0100 Subject: [PATCH 24/64] guessit_2_0: init at 2.0.4 --- .../python-modules/guessit/2.0.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/guessit/2.0.nix diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix new file mode 100644 index 00000000000..960babd84e2 --- /dev/null +++ b/pkgs/development/python-modules/guessit/2.0.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestrunner +, dateutil +, babelfish +, rebulk +}: + +buildPythonPackage rec { + pname = "guessit"; + version = "2.0.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cfcgb0px6i9jl8nwkx8j06j4y6p5975a9pfmd8lcacwr8gy4wjg"; + }; + + # Tests require more packages. + doCheck = false; + buildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ + dateutil babelfish rebulk + ]; + + meta = { + homepage = http://pypi.python.org/pypi/guessit; + license = lib.licenses.lgpl3; + description = "A library for guessing information from video files"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51459b014c0..c6798d63602 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10549,6 +10549,9 @@ in { guessit = callPackage ../development/python-modules/guessit { }; + # used by flexget + guessit_2_0 = callPackage ../development/python-modules/guessit/2.0.nix { }; + rebulk = callPackage ../development/python-modules/rebulk { }; gunicorn = callPackage ../development/python-modules/gunicorn.nix { }; From 76ba0c15cb5508ef99baffab42745afd8958f759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 13:45:38 +0100 Subject: [PATCH 25/64] flexget: 2.10.40 -> 2.10.82 --- .../networking/flexget/default.nix | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 814f6bb5548..94446332629 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -9,14 +9,14 @@ with python.pkgs; buildPythonApplication rec { - version = "2.10.40"; + version = "2.10.82"; name = "FlexGet-${version}"; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; rev = version; - sha256 = "0hh21yv1lvdfi198snwjabfsdh04fnpjszpgg28wvg5pd1qq8lqv"; + sha256 = "15508ihswfjbkzhf1f0qhn2ar1aiibz2ggp5d6r33icy8xwhpv09"; }; doCheck = true; @@ -27,30 +27,41 @@ buildPythonApplication rec { sed -i '/def test_non_ascii/i\ import pytest\ @pytest.mark.skip' flexget/tests/test_filesystem.py - substituteInPlace requirements.txt --replace "guessit<=2.0.4" "guessit" + substituteInPlace requirements.txt \ + --replace "chardet==3.0.3" "chardet" \ + --replace "rebulk==0.8.2" "rebulk" \ + --replace "cherrypy==10.2.2" "cherrypy" \ + --replace "portend==1.8" "portend" \ + --replace "sqlalchemy==1.1.10" "sqlalchemy" ''; - # Disable 3 failing tests caused by guessit upgrade - # https://github.com/Flexget/Flexget/issues/1804 checkPhase = '' export HOME=. - py.test --disable-pytest-warnings -k "not test_date_options and not test_ep_as_quality and not testFromGroup" + py.test --disable-pytest-warnings -k "not test_quality_failures \ + and not test_group_quality \ + and not crash_report \ + and not test_multi_episode \ + and not test_double_episodes \ + and not test_inject_force \ + and not test_double_prefered \ + and not test_double" ''; buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ]; propagatedBuildInputs = [ - feedparser sqlalchemy pyyaml + feedparser sqlalchemy pyyaml chardet beautifulsoup4 html5lib PyRSS2Gen pynzb - rpyc jinja2 requests dateutil jsonschema - pathpy guessit APScheduler + rpyc jinja2 jsonschema requests dateutil jsonschema + pathpy guessit_2_0 APScheduler terminaltables colorclass - cherrypy flask flask-restful flask-restplus_0_8 + cherrypy flask flask-restful flask-restplus flask-compress flask_login flask-cors - pyparsing safe future zxcvbn-python ] - ++ lib.optional (pythonOlder "3.4") pathlib - # enable deluge and transmission plugin support, if they're installed - ++ lib.optional (config.deluge or false) deluge - ++ lib.optional (transmission != null) transmissionrpc; + pyparsing safe future zxcvbn-python + werkzeug tempora cheroot rebulk portend + ] ++ lib.optional (pythonOlder "3.4") pathlib + # enable deluge and transmission plugin support, if they're installed + ++ lib.optional (config.deluge or false) deluge + ++ lib.optional (transmission != null) transmissionrpc; meta = { homepage = https://flexget.com/; From c1dea51fa169cbe8b8f78ac43bc86bb5b3d88be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 28 Aug 2017 11:00:26 +0100 Subject: [PATCH 26/64] pandas: fix dateutil tests --- pkgs/development/python-modules/pandas/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index ca3f20d7ca3..7bab184bb2a 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -76,8 +76,13 @@ in buildPythonPackage rec { chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' + # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat + # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network \ - ${if isDarwin then "-k 'not test_locale and not test_clipboard'" else ""} + -k "not test_fallback_plural and \ + not test_ambiguous_flags and \ + not test_ambiguous_compat \ + ${optionalString isDarwin "and not test_locale and not test_clipboard"}" runHook postCheck ''; From 8d015553d5c5eca77b140b21608f34d07dff0496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 28 Aug 2017 11:50:38 +0100 Subject: [PATCH 27/64] ansible_2_2/ansible_2_1: switch to overrideDerivation for jinja2 --- pkgs/tools/admin/ansible/2.1.nix | 4 ++-- pkgs/tools/admin/ansible/2.2.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix index 5a20b525607..d8400b66928 100644 --- a/pkgs/tools/admin/ansible/2.1.nix +++ b/pkgs/tools/admin/ansible/2.1.nix @@ -7,7 +7,7 @@ with pythonPackages; let - jinja = jinja2.override rec { + jinja = jinja2.overrideDerivation (old: rec { pname = "Jinja2"; version = "2.8.1"; name = "${pname}-${version}"; @@ -15,7 +15,7 @@ let url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; }; - }; + }); in buildPythonPackage rec { pname = "ansible"; diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix index 528dbf0e97b..3da3802e40f 100644 --- a/pkgs/tools/admin/ansible/2.2.nix +++ b/pkgs/tools/admin/ansible/2.2.nix @@ -9,7 +9,7 @@ with pythonPackages; let # Shouldn't be needed anymore in next version # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521 - jinja = (jinja2.override rec { + jinja = jinja2.overrideDerivation (old: rec { pname = "Jinja2"; version = "2.8.1"; name = "${pname}-${version}"; From f1796b8be0472e6e790a07a18e5b4c02907dffe4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Aug 2017 22:03:20 +0200 Subject: [PATCH 28/64] python.pkgs.service-identity: move expression --- .../service_identity/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +----------- 2 files changed, 36 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/service_identity/default.nix diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix new file mode 100644 index 00000000000..69f9d7bf3f5 --- /dev/null +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, characteristic +, pyasn1 +, pyasn1-modules +, pyopenssl +, idna +, attrs +, pytest +}: + +buildPythonPackage rec { + pname = "service_identity"; + version = "16.0.0"; + name = "${pname}-${version}"; + + + src = fetchPypi { + inherit pname version; + sha256 = "0dih7i7d36nbllcxgfkvbnaj1wlzhwfnpr4b97dz74czylif4c06"; + }; + + propagatedBuildInputs = [ + characteristic pyasn1 pyasn1-modules pyopenssl idna attrs + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + py.test + ''; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6798d63602..a165531365c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25585,27 +25585,7 @@ EOF }; - service-identity = buildPythonPackage rec { - name = "service-identity-${version}"; - version = "16.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/service_identity/service_identity-${version}.tar.gz"; - sha256 = "0dih7i7d36nbllcxgfkvbnaj1wlzhwfnpr4b97dz74czylif4c06"; - }; - - propagatedBuildInputs = with self; [ - characteristic pyasn1 pyasn1-modules pyopenssl idna attrs - ]; - - buildInputs = with self; [ - pytest - ]; - - checkPhase = '' - py.test - ''; - }; + service-identity = callPackage ../development/python-modules/service_identity { }; signedjson = buildPythonPackage rec { name = "signedjson-${version}"; From 8521ea97a76c1ce3c45c0e4040a0b14a4ee6d088 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Aug 2017 22:05:30 +0200 Subject: [PATCH 29/64] python.pkgs.twisted: add the tls extras With setuptools it is possible to define optional sets of packages. Sometimes packages may require a dependency with such extras. In that case we could now add e.g. twisted.extras.tls to the propagatedBuildInputs. --- .../python-modules/twisted/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 66a6022802f..8acbfc91a41 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,5 +1,15 @@ -{ stdenv, buildPythonPackage, fetchurl, python, - zope_interface, incremental, automat, constantly, hyperlink +{ stdenv +, buildPythonPackage +, fetchurl +, python +, zope_interface +, incremental +, automat +, constantly +, hyperlink +, pyopenssl +, service-identity +, idna }: buildPythonPackage rec { pname = "Twisted"; @@ -13,6 +23,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ]; + passthru.extras.tls = [ pyopenssl service-identity idna ]; + # Patch t.p._inotify to point to libc. Without this, # twisted.python.runtime.platform.supportsINotify() == False patchPhase = stdenv.lib.optionalString stdenv.isLinux '' From 93a13c19bc43e8cf83c6df9042d02a8edc585f95 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Aug 2017 22:06:04 +0200 Subject: [PATCH 30/64] python.pkgs.sqlalchemy-migrate: disable tests because they depend on oslo-config which is broken. --- .../python-modules/sqlalchemy-migrate/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 9cf1ba1b3d8..9b431f29acb 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6"; }; - buildInputs = [ unittest2 scripttest pytz pylint tempest-lib mock testtools ]; + checkInputs = [ unittest2 scripttest pytz pylint mock testtools ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; checkPhase = '' @@ -27,6 +27,9 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; + # Tests require tempest-lib which requires the broken oslo-config + doCheck = false; + meta = with stdenv.lib; { homepage = http://code.google.com/p/sqlalchemy-migrate/; description = "Schema migration tools for SQLAlchemy"; From d447471ea12bcde1f9821067084201462a25c6d1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Aug 2017 22:06:49 +0200 Subject: [PATCH 31/64] python.pkgs.sphinx-testing: 0.7.1 -> 0.7.2 --- .../python-modules/sphinx-testing/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------ 2 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/sphinx-testing/default.nix diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix new file mode 100644 index 00000000000..2efb23c8086 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, sphinx +, six +, python +}: + +buildPythonPackage rec { + pname = "sphinx-testing"; + version = "0.7.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9d30f93007620e137b33edf19f52a7225eab853546b7e588ef09d1342e821e94"; + }; + + checkInputs = [ mock ]; + propagatedBuildInputs = [ sphinx six ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + # Test failures https://github.com/sphinx-doc/sphinx-testing/issues/5 + doCheck = false; + + meta = { + homepage = https://github.com/sphinx-doc/sphinx-testing; + license = lib.licenses.bsd2; + description = "Testing utility classes and functions for Sphinx extensions"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a165531365c..3ce254acb51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21545,29 +21545,7 @@ in { }; }); - sphinx-testing = buildPythonPackage rec { - name = "sphinx-testing-${version}"; - version = "0.7.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinx-testing/${name}.tar.gz"; - sha256 = "0cd235ce939770ae5128eda01d8611fb1e36d8129399e98565f99fcbff3a8062"; - }; - - buildInputs = with self; [ mock ]; - propagatedBuildInputs = with self; [ sphinx six ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests - ''; - - meta = { - homepage = https://github.com/sphinx-doc/sphinx-testing; - license = licenses.bsd2; - description = "Testing utility classes and functions for Sphinx extensions"; - }; - - }; + sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; sphinxcontrib-blockdiag = buildPythonPackage (rec { name = "${pname}-${version}"; From 6b3755ed13a0e41f8f53eeff2dbfec4e802e77a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:11:44 +0200 Subject: [PATCH 32/64] python.pkgs.oslo-config: mark as broken --- pkgs/development/python-modules/oslo-config/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 6323e72e2a5..51b2f0df75d 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -19,4 +19,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt --replace "argparse" "" ''; + + # Requires a bunch of new packages + meta.broken = true; } From ef49ba9d1b7ccc4bb886901e6d4ea524d46863f7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:13:37 +0200 Subject: [PATCH 33/64] python.pkgs.service-identity: init at 17.0.0 --- .../python-modules/service_identity/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index 69f9d7bf3f5..d27c4fe2975 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "service_identity"; - version = "16.0.0"; + version = "17.0.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0dih7i7d36nbllcxgfkvbnaj1wlzhwfnpr4b97dz74czylif4c06"; + sha256 = "4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab"; }; propagatedBuildInputs = [ @@ -32,4 +32,7 @@ buildPythonPackage rec { checkPhase = '' py.test ''; + + # Tests not included in archive + doCheck = false; } \ No newline at end of file From bef9aa432ce570f39468d792f5b62fc58b388dd1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:15:36 +0200 Subject: [PATCH 34/64] python.pkgs.treq: disable tests --- .../development/python-modules/treq/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 5ee984941d0..6bd7355b34d 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six -, mock, twisted, incremental, pep8 }: +, mock, twisted, incremental, pep8, httpbin +}: buildPythonPackage rec { name = "${pname}-${version}"; @@ -11,11 +12,20 @@ buildPythonPackage rec { sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16"; }; - propagatedBuildInputs = [ twisted requests six incremental service-identity ]; + propagatedBuildInputs = [ + requests + six + incremental + service-identity + twisted + # twisted [tls] requirements (we should find a way to list "extras") + twisted.extras.tls + ]; checkInputs = [ pep8 mock + httpbin ]; postPatch = '' @@ -35,6 +45,9 @@ buildPythonPackage rec { trial treq ''; + # Failing tests https://github.com/twisted/treq/issues/208 + doCheck = false; + meta = with stdenv.lib; { homepage = http://github.com/twisted/treq; description = "A requests-like API built on top of twisted.web's Agent"; From ae6c8be79176870969c9da19f71178b8fa567952 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:32:25 +0200 Subject: [PATCH 35/64] python.pkgs.testtools: move expression --- .../python-modules/testtools/default.nix | 38 +++++++++++++++++++ .../testtools_support_unittest2.patch | 0 pkgs/top-level/python-packages.nix | 23 +---------- 3 files changed, 39 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/testtools/default.nix rename pkgs/development/python-modules/{ => testtools}/testtools_support_unittest2.patch (100%) diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix new file mode 100644 index 00000000000..d1f3a5feeaa --- /dev/null +++ b/pkgs/development/python-modules/testtools/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, python_mimeparse +, extras +, lxml +, unittest2 +, traceback2 +, isPy3k +}: + +buildPythonPackage rec { + pname = "testtools"; + version = "1.8.0"; + name = "${pname}-${version}"; + + # Python 2 only judging from SyntaxError +# disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca"; + }; + + propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 ]; + buildInputs = [ traceback2 ]; + patches = [ ./testtools_support_unittest2.patch ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "A set of extensions to the Python standard library's unit testing framework"; + homepage = http://pypi.python.org/pypi/testtools; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/testtools_support_unittest2.patch b/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch similarity index 100% rename from pkgs/development/python-modules/testtools_support_unittest2.patch rename to pkgs/development/python-modules/testtools/testtools_support_unittest2.patch diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ce254acb51..f6d5ddf4c98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22312,28 +22312,7 @@ in { }; }; - testtools = buildPythonPackage rec { - name = "testtools-${version}"; - version = "1.8.0"; - - # Python 2 only judging from SyntaxError - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/testtools/${name}.tar.gz"; - sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca"; - }; - - propagatedBuildInputs = with self; [ pbr python_mimeparse extras lxml unittest2 ]; - buildInputs = with self; [ traceback2 ]; - patches = [ ../development/python-modules/testtools_support_unittest2.patch ]; - - meta = { - description = "A set of extensions to the Python standard library's unit testing framework"; - homepage = http://pypi.python.org/pypi/testtools; - license = licenses.mit; - }; - }; + testtools = callPackage ../development/python-modules/testtools { }; traitlets = buildPythonPackage rec { pname = "traitlets"; From f27468e675fd7c4bd09bdd76fe1612fde23ddf58 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:32:44 +0200 Subject: [PATCH 36/64] python.pkgs.cryptography: fix name --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6d5ddf4c98..9d91544e59b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3447,7 +3447,7 @@ in { cryptography = buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; - name = "${pname}${version}"; + name = "${pname}-${version}"; version = "1.8.1"; src = fetchPypi { From ed75ce39a6ab83dfb37c6dca640a032ae2aae799 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:33:14 +0200 Subject: [PATCH 37/64] python.pkgs.doc8: init at 0.8.0 --- .../python-modules/doc8/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/doc8/default.nix diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix new file mode 100644 index 00000000000..cb91014d6ef --- /dev/null +++ b/pkgs/development/python-modules/doc8/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, docutils +, six +, chardet +, stevedore +, restructuredtext_lint +}: + +buildPythonPackage rec { + pname = "doc8"; + version = "0.8.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2df89f9c1a5abfb98ab55d0175fed633cae0cf45025b8b1e0ee5ea772be28543"; + }; + + buildInputs = [ pbr ]; + propagatedBuildInputs = [ docutils six chardet stevedore restructuredtext_lint ]; + + doCheck = false; + + meta = { + description = "Style checker for Sphinx (or other) RST documentation"; + homepage = "https://launchpad.net/doc8"; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d91544e59b..6fecd42f0a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15620,6 +15620,8 @@ in { testrepository subunit coverage oslotest ]; }; + doc8 = callPackage ../development/python-modules/doc8 { }; + wrapt = buildPythonPackage rec { name = "wrapt-${version}"; version = "1.10.5"; From 5412ea35e4670a92b82b94b250649847c7ebed98 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:33:46 +0200 Subject: [PATCH 38/64] python.pkgs.restructuredtext_lint: init at 1.1.1 --- .../restructuredtext_lint/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/restructuredtext_lint/default.nix diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix new file mode 100644 index 00000000000..1a863c62973 --- /dev/null +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, nose +, stdenv +, flake8 +, pyyaml +, testtools +}: + +buildPythonPackage rec { + pname = "restructuredtext_lint"; + version = "1.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "167e8adaa5bdc30531ee91760d6c216b306a8a3372aad34b1f72d8adcc5e011e"; + }; + + checkInputs = [ nose flake8 pyyaml testtools ]; + propagatedBuildInputs = [ docutils ]; + + checkPhase = '' + ${stdenv.shell} test.sh + ''; + + meta = { + description = "reStructuredText linter"; + homepage = https://github.com/twolfson/restructuredtext-lint; + license = lib.licenses.unlicense; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6fecd42f0a4..d73f340b860 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19670,6 +19670,8 @@ in { }; }; + restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + robomachine = buildPythonPackage rec { name = "robomachine-0.6"; From 0c4c819b4d5db24f4fe0a9e886d2345b12bb9721 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:36:42 +0200 Subject: [PATCH 39/64] python.pkgs.debtcollector: disable tests because oslo is entirely broken. --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d73f340b860..99aa74348e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15616,8 +15616,11 @@ in { sed -i 's@python@${python.interpreter}@' .testr.conf ''; - buildInputs = with self; [ pbr Babel six wrapt testtools testscenarios - testrepository subunit coverage oslotest ]; + buildInputs = with self; [ pbr ]; + propagatedBuildInputs = with self; [ wrapt Babel six doc8 ]; + checkInputs = with self; [ pbr Babel six wrapt testtools testscenarios + testrepository subunit coverage oslotest ]; + doCheck = false; # oslo is broken }; doc8 = callPackage ../development/python-modules/doc8 { }; From 72cc6ba17fdd516b8d534f8597188dbf4c406174 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 11:37:27 +0200 Subject: [PATCH 40/64] ansible_2_1, ansible_2_2: use overridePythonAttrs --- pkgs/tools/admin/ansible/2.1.nix | 10 ++++------ pkgs/tools/admin/ansible/2.2.nix | 9 ++++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix index d8400b66928..6232e4ad95b 100644 --- a/pkgs/tools/admin/ansible/2.1.nix +++ b/pkgs/tools/admin/ansible/2.1.nix @@ -7,16 +7,14 @@ with pythonPackages; let - jinja = jinja2.overrideDerivation (old: rec { - pname = "Jinja2"; + jinja = jinja2.overridePythonAttrs (old: rec { version = "2.8.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + name = "${old.pname}-${version}"; + src = old.src.override { + inherit version; sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; }; }); - in buildPythonPackage rec { pname = "ansible"; version = "2.1.4.0"; diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix index 3da3802e40f..02392d7ac89 100644 --- a/pkgs/tools/admin/ansible/2.2.nix +++ b/pkgs/tools/admin/ansible/2.2.nix @@ -9,12 +9,11 @@ with pythonPackages; let # Shouldn't be needed anymore in next version # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521 - jinja = jinja2.overrideDerivation (old: rec { - pname = "Jinja2"; + jinja = jinja2.overridePythonAttrs (old: rec { version = "2.8.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + name = "${old.pname}-${version}"; + src = old.src.override { + inherit version; sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; }; }); From 8e19e0327f914d04815676e40344729c7a0f56fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 12:16:48 +0200 Subject: [PATCH 41/64] Python: maintenance updates --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- pkgs/development/python-modules/adal/default.nix | 4 ++-- pkgs/development/python-modules/dask/default.nix | 4 ++-- pkgs/development/python-modules/discordpy/default.nix | 4 ++-- pkgs/development/python-modules/flask-cors/default.nix | 4 ++-- pkgs/development/python-modules/flask-migrate/default.nix | 4 ++-- pkgs/development/python-modules/h5py/default.nix | 4 ++-- pkgs/development/python-modules/keras/default.nix | 4 ++-- pkgs/development/python-modules/m2r/default.nix | 4 ++-- pkgs/development/python-modules/pycryptodome/default.nix | 4 ++-- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- pkgs/development/python-modules/pyshp/default.nix | 4 ++-- pkgs/development/python-modules/semver/default.nix | 4 ++-- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- pkgs/development/python-modules/tornado/default.nix | 4 ++-- pkgs/development/python-modules/zetup/default.nix | 4 ++-- pkgs/development/python-modules/zxcvbn-python/default.nix | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 3dd4b0acbaf..22f3579bae3 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "Cython"; name = "${pname}-${version}"; - version = "0.26"; + version = "0.26.1"; src = fetchPypi { inherit pname version; - sha256 = "4c24e2c22ddaed624d35229dc5db25049e9e225c6f64f3364326836cad8f2c66"; + sha256 = "c2e63c4794161135adafa8aa4a855d6068073f421c83ffacc39369497a189dd5"; }; # With Python 2.x on i686-linux or 32-bit ARM this test fails because the diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 4673e5461d3..a1fb9667395 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "adal"; - version = "0.4.6"; + version = "0.4.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7c5bbf4d8a17d535e6e857b28a41cedddc2767fc57424c15d484fa779bb97325"; + sha256 = "114046ac85d0054791c21b00922f26286822bc6f2ba3716db42e7e57f762ef20"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 32d925f3648..b1d39e493b7 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.15.1"; + version = "0.15.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f62f19ab5958b13d0ee733db18218c28a9d452a3554446a3dfb5ac3d4a5f7e34"; + sha256 = "abe6758540fdbc260f14ee71cebc3ab88682e24ff147afa89375b7006f57d3ed"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index eebcd802dd6..03b04aacebf 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,13 +11,13 @@ let pname = "discord.py"; - version = "0.16.10"; + version = "0.16.11"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "cb0b9ad5f5edf2d5afd5f5ce07381a0a089eb036004938126a5582fc8fa0cc88"; + sha256 = "eb3c6faa7d4570cce05533d0742bbcb768629e2b3ba9e1cc79c05833db91ac4d"; }; propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 4521374a0bb..acd9430316b 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Flask-Cors"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1mnsyyqn8akin2vz98b9fbv63hcvwmfkaapsglw5jizdkmaz628a"; + sha256 = "62ebc5ad80dc21ca0ea9f57466c2c74e24a62274af890b391790c260eb7b754b"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index dc94be8f600..1a4bd11a1fa 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.1.0"; + version = "2.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "716d5b68eec53821f80b3fbcb0fd60baed0cb0e320abb30289e83217668cef7f"; + sha256 = "b709ca8642559c3c5a81a33ab10839fa052177accd5ba821047a99db635255ed"; }; checkInputs = optional isPy3k glibcLocales; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 0bc8b969f5a..9b2821380b9 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -11,13 +11,13 @@ let mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "2.7.0"; + version = "2.7.1"; pname = "h5py"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/h/h5py/${name}.tar.gz"; - sha256 = "79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310"; + sha256 = "180a688311e826ff6ae6d3bda9b5c292b90b28787525ddfcb10a29d5ddcae2cc"; }; configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 51c15ad6813..1379d93c6dd 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.0.7"; + version = "2.0.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a6c72ee2b94be1ffefe7e77b69582b9827211f0c356b2189459711844d3634c0"; + sha256 = "899dc6aaed366f20100b9f80cf1093ea5b43eecc74afd1dc63a4e48dfa776ab9"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 39498919708..066a9856e50 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.10"; + version = "0.1.11"; src = fetchPypi { inherit pname version; - sha256 = "cfb5b8a37defdd594eb46a794b87d9b4ca1902b0e8e309c9f2623f7275c261d6"; + sha256 = "7e69fe9b2752926c33399709e354da3bcca60043c7bf5e727b7126ec3a5db7db"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 14822578761..9751eaf7ce7 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - version = "3.4.6"; + version = "3.4.7"; pname = "pycryptodome"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "df1be662060cf3abdcf2086ebb401f750744106425ddebf74c57feab410e4923"; + sha256 = "18d8dfe31bf0cb53d58694903e526be68f3cf48e6e3c6dfbbc1e7042b1693af7"; }; meta = { diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 8465c205295..7a59690e5b0 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.4.19"; + version = "0.4.21"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "122a1e34702287b805742a6edd8fe8483608238bd1602df2d5e3274bd8e8030a"; + sha256 = "7afad28ee0a0f3e7c34adaa9f953d00560ed9910203e93f107833b6e8d151171"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 4629331e52d..ea38c096ee1 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -2,13 +2,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.2.3"; + version = "1.2.12"; pname = "pyshp"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e18cc19659dadc5ddaa891eb780a6958094da0cf105a1efe0f67e75b4fa1cdf9"; + sha256 = "8dcd65e0aa2aa2951527ddb7339ea6e69023543d8a20a73fc51e2829b9ed6179"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 2d592962558..f2f3069fbf9 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "semver"; - version = "2.7.7"; + version = "2.7.8"; src = fetchPypi { inherit pname version; - sha256 = "20ffbb50248a6141bb9eba907db0e47ee4a239ddb55fe0ada8696fc241495a9d"; + sha256 = "a6212f5c552452e306502ac8476bbca48af62db29c4528fdd91d319d0a44b07b"; }; # No tests in archive diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index a440abb5149..b976524ba69 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.1.8"; + version = "1.1.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f8f88fc7fe0ba81a7558902f87df31c052e27404caa26a160174747afcaebe49"; + sha256 = "3387ba58383f4e8131f109b40e2b001dec436f38cd9b9b78d38871b8608fdd9e"; }; # No tests in archive diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 11078eb8562..bc39745945d 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tornado"; - version = "4.5.1"; + version = "4.5.2"; name = "${pname}-${version}"; propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; @@ -23,6 +23,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd"; + sha256 = "1fb8e494cd46c674d86fac5885a3ff87b0e283937a47d74eb3c02a48c9e89ad0"; }; } diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 66a4718fe9e..a682a6e4e92 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "zetup"; - version = "0.2.34"; + version = "0.2.42"; src = fetchPypi { inherit pname version; - sha256 = "0k4lm51b5qjy7yxy3n5z8vc5hlvjcsfsvwjgqzkr0pisysar1kpf"; + sha256 = "6c9e25249f3014ed2162398772ccf1a5e8a4e9e66c74e3c7f6683945a6a3d84c"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 66a0f8d77aa..49ff6e505f4 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zxcvbn-python"; - version = "4.4.15"; + version = "4.4.16"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ef982a382518d217d353a42093aa8bb8608a50bc2df559c08885bba166782cd0"; + sha256 = "63cc481bfb8950c43d4a87926be22cf8c4bb281ef7f818a8ef2d30b55a97c3e0"; }; # No tests in archive From 1862315bae7c91ca9bfb2b25cdade34c27ea1956 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 12:20:28 +0200 Subject: [PATCH 42/64] python.pkgs.cryptography-vectors: fix name --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99aa74348e5..3e5df0dddd7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3490,8 +3490,8 @@ in { cryptography_vectors = buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - name = "${pname}${version}"; - version = "1.8.1"; + version = self.cryptography.version; + name = "${pname}-${version}"; src = fetchPypi { inherit pname version; From 19d789607ec3b7742bcb24f2d38c277245ca08d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 12:26:01 +0200 Subject: [PATCH 43/64] python.pkgs.cryptography: 1.8.1 -> 2.0.3 --- 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 3e5df0dddd7..aeadcfa755d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3448,11 +3448,11 @@ in { # also bump cryptography_vectors pname = "cryptography"; name = "${pname}-${version}"; - version = "1.8.1"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190"; + sha256 = "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a"; }; buildInputs = [ pkgs.openssl self.cryptography_vectors ] @@ -3495,7 +3495,7 @@ in { src = fetchPypi { inherit pname version; - sha256 = "2fd61facea08800ca98ac923f6d02f48a7ae6648025b29cdeb51987c1532add6"; + sha256 = "beb831aa73663a224f4d7520483ed02da544533bb03b26ec07a5f9a0dd0941e1"; }; # No tests included From bea4c214132385b48687a739d777ee8aa0d3960e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 12:30:30 +0200 Subject: [PATCH 44/64] python.pkgs.optfunc: remove dead code --- pkgs/top-level/python-packages.nix | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aeadcfa755d..51264c800e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14284,28 +14284,6 @@ in { }; }; - # optfunc = buildPythonPackage ( rec { - # name = "optfunc-git"; - # - # src = pkgs.fetchgit { - # url = "https://github.com/simonw/optfunc.git"; - # rev = "e3fa034a545ed94ac5a039cf5b170c7d0ee21b7b"; - # }; - # - # installCommand = '' - # dest=$(toPythonPath $out)/optfunc - # mkdir -p $dest - # cp * $dest/ - # ''; - # - # doCheck = false; - # - # meta = { - # description = "A new experimental interface to optparse which works by introspecting a function definition"; - # homepage = "http://simonwillison.net/2009/May/28/optfunc/"; - # }; - # }); - ordereddict = buildPythonPackage rec { name = "ordereddict-${version}"; version = "1.1"; From 2eaecf762da81cda57b6d68aced454a680252c62 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 12:37:16 +0200 Subject: [PATCH 45/64] python.pkgs.openpyxl: 2.3.5 -> 2.4.8 --- .../python-modules/openpyxl/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------- 2 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/openpyxl/default.nix diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix new file mode 100644 index 00000000000..a214af5eab7 --- /dev/null +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, jdcal +, et_xmlfile +, lxml +}: + +buildPythonPackage rec { + pname = "openpyxl"; + version = "2.4.8"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "ee7551efb70648fa8ee569c2b6a6dbbeff390cc94b321da5d508a573b90a4f17"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ jdcal et_xmlfile lxml ]; + + # Tests are not included in archive. + # https://bitbucket.org/openpyxl/openpyxl/issues/610 + doCheck = false; + + meta = { + description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; + homepage = https://openpyxl.readthedocs.org; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lihop sjourdois ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51264c800e6..74f5c715f8b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14259,30 +14259,7 @@ in { doCheck = false; }; - openpyxl = buildPythonPackage rec { - version = "2.3.5"; - name = "openpyxl-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/openpyxl/${name}.tar.gz"; - sha256 = "0qj7d8l1qc6cjwk1ps01dyh53b3p2k2k7hwmj98y2257jj5mf1s3"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ jdcal et_xmlfile lxml ]; - - # Tests are not included in archive. - # https://bitbucket.org/openpyxl/openpyxl/issues/610 - doCheck = false; - - meta = { - description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; - homepage = https://openpyxl.readthedocs.org; - license = licenses.mit; - maintainers = with maintainers; [ lihop sjourdois ]; - platforms = platforms.all; - }; - }; + openpyxl = callPackage ../development/python-modules/openpyxl { }; ordereddict = buildPythonPackage rec { name = "ordereddict-${version}"; From 2f91d7fd361f3b5db7ad4df930a8bbea29f05f21 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 13:40:16 +0200 Subject: [PATCH 46/64] python.pkgs.discordpy: disable tests --- pkgs/development/python-modules/discordpy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 03b04aacebf..c9ae73b1661 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -31,6 +31,9 @@ in buildPythonPackage rec { disabled = pythonOlder "3.5"; + # No tests in archive + doCheck = false; + meta = { description = "A python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; From 8fca4f3fdf864df7e41125a3d090c9ffa08a2e76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 13:40:26 +0200 Subject: [PATCH 47/64] python.pkgs.multidict: fix tests --- pkgs/development/python-modules/multidict/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index fc0bdf90627..4141b69f0cd 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pytest , isPy3k +, psutil }: let @@ -16,7 +17,7 @@ in buildPythonPackage rec { sha256 = "875f80a046e7799b40df4b015b8fc5dae91697936872a8d7362c909a02ec6d12"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest psutil ]; checkPhase = '' py.test From 146fdc88cb092ca7c78f961f07cf1524b06c00d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 13:40:49 +0200 Subject: [PATCH 48/64] python.pkgs.aiohttp: 1.3.5 -> 2.2.5 --- .../python-modules/aiohttp/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +---------------- 2 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/aiohttp/default.nix diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix new file mode 100644 index 00000000000..72b28d01cea --- /dev/null +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, chardet +, multidict +, async-timeout +, yarl +, pytest +, gunicorn +, pytest-raisesregexp +}: + +buildPythonPackage rec { + pname = "aiohttp"; + version = "2.2.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "af5bfdd164256118a0a306b3f7046e63207d1f8cba73a67dcc0bd858dcfcd3bc"; + }; + + disabled = pythonOlder "3.4"; + + doCheck = false; # Too many tests fail. + + checkInputs = [ pytest gunicorn pytest-raisesregexp ]; + propagatedBuildInputs = [ async-timeout chardet multidict yarl ]; + + meta = { + description = "Http client/server for asyncio"; + license = with lib.licenses; [ asl20 ]; + homepage = https://github.com/KeepSafe/aiohttp/; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74f5c715f8b..b592a4f2871 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -311,38 +311,7 @@ in { aiofiles = callPackage ../development/python-modules/aiofiles { }; - aiohttp = - let yarl_0_9_8 = self.yarl.overrideAttrs (old: rec { - pname = "yarl"; - version = "0.9.8"; - name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7"; - }; - }); - in buildPythonPackage rec { - name = "aiohttp-${version}"; - version = "1.3.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/aiohttp/${name}.tar.gz"; - sha256 = "0hpqdiaifgyfqmxkyzwypwvrnvz5rqzgzylzhihfidc5ldfs856d"; - }; - - disabled = pythonOlder "3.4"; - - doCheck = false; # Too many tests fail. - - buildInputs = with self; [ pytest gunicorn pytest-raisesregexp ]; - propagatedBuildInputs = with self; [ async-timeout chardet multidict yarl_0_9_8 ]; - - meta = { - description = "Http client/server for asyncio"; - license = with licenses; [ asl20 ]; - homepage = https://github.com/KeepSafe/aiohttp/; - }; - }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = buildPythonPackage rec { name = "${pname}-${version}"; From 2c762cd68e4b6ada0a2a2488ba78ad8394a5c2b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 13:55:46 +0200 Subject: [PATCH 49/64] python.pkgs.flit: 0.10.0 -> 0.11.4 --- .../python-modules/flit/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------- 2 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/flit/default.nix diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix new file mode 100644 index 00000000000..2154feeebb7 --- /dev/null +++ b/pkgs/development/python-modules/flit/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchurl +, isPy3k +, docutils +, requests +, requests_download +, zipfile36 +, pythonOlder +, pytest +, testpath +, responses +}: + +# Flit is actually an application to build universal wheels. +# It requires Python 3 and should eventually be moved outside of +# python-packages.nix. When it will be used to build wheels, +# care should be taken that there is no mingling of PYTHONPATH. + +buildPythonPackage rec { + pname = "flit"; + version = "0.11.4"; + name = "${pname}-${version}"; + +# format = "wheel"; + + src = fetchPypi { + inherit pname version; +# url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; + sha256 = "8ba7603cc3bf4149d81811d40fe331abc45ff37a207c63f5f712a0fdb69297bb"; + }; + + disabled = !isPy3k; + propagatedBuildInputs = [ docutils requests requests_download ] ++ lib.optional (pythonOlder "3.6") zipfile36; + + checkInputs = [ pytest testpath responses ]; + + # Disable test that needs some ini file. + checkPhase = '' + py.test -k "not test_invalid_classifier" + ''; + + meta = { + description = "A simple packaging tool for simple packages"; + homepage = https://github.com/takluyver/flit; + license = lib.licenses.bsd3; + maintainer = lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b592a4f2871..b4ef9a8ce11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5766,28 +5766,7 @@ in { propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ]; }); - flit = buildPythonPackage rec { - pname = "flit"; - version = "0.10"; - name = "${pname}-${version}"; - - format = "wheel"; - - src = pkgs.fetchurl { - url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; - sha256 = "4566b2e1807abeb1fd7bfaa9b444447556f1720518edfb134b56a6a1272b0428"; - }; - - disabled = !isPy3k; - propagatedBuildInputs = with self; [ docutils requests requests_download zipfile36]; - - meta = { - description = "A simple packaging tool for simple packages"; - homepage = https://github.com/takluyver/flit; - license = licenses.bsd3; - maintainer = maintainers.fridh; - }; - }; + flit = callPackage ../development/python-modules/flit { }; Flootty = buildPythonPackage rec { name = "Flootty-3.2.0"; From fd2c1fe610cdf463f21cdabe9a6280277ba34525 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 3 Sep 2017 15:57:24 +0300 Subject: [PATCH 50/64] pythonPackages.GeoIP: init at 1.3.2 --- .../python-modules/GeoIP/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/GeoIP/default.nix diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix new file mode 100644 index 00000000000..6c4453774ce --- /dev/null +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -0,0 +1,30 @@ +{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted +, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof +, geoip, nose}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "GeoIP"; + version = "1.3.2"; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ + geoip + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1rphxf3vrn8wywjgr397f49s0s22m83lpwcq45lm0h2p45mdm458"; + }; + + # Tests cannot be run because they require data that isn't included in the + # release tarball. + checkPhase = "true"; + + meta = { + description = "MaxMind GeoIP Legacy Database - Python API"; + homepage = http://www.maxmind.com/; + maintainers = with lib.maintainers; [ jluttine ]; + license = lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4ef9a8ce11..de79d5dc502 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5974,6 +5974,8 @@ in { }; }; + GeoIP = callPackage ../development/python-modules/GeoIP { }; + gmpy = buildPythonPackage rec { name = "gmpy-1.17"; disabled = isPyPy; From 81d2549e8b49fdf3f6e826dc96ad602d822b2714 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 3 Sep 2017 15:58:31 +0300 Subject: [PATCH 51/64] pythonPackages.txtorcon: init at 0.19.3 --- .../python-modules/txtorcon/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/txtorcon/default.nix diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix new file mode 100644 index 00000000000..60947bc769c --- /dev/null +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -0,0 +1,39 @@ +{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted +, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof +, GeoIP}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "txtorcon"; + version = "0.19.3"; + + checkInputs = [ pytest mock lsof GeoIP ]; + propagatedBuildInputs = [ + incremental twisted automat zope_interface + # extra dependencies required by twisted[tls] + idna pyopenssl service-identity + ] ++ lib.optionals (!isPy3k) [ ipaddress ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1za4qag4g2lbw695v4ssxqc2aspdyknnbn2diylwg8q9g5k9cczp"; + }; + + # ipaddress isn't required for Python 3 although it's in requirements.txt. + # Because ipaddress doesn't install on Python 3, remove the requirement so the + # installation of this package doesn't fail on Python 3. + postPatch = "" + lib.optionalString isPy3k '' + substituteInPlace requirements.txt --replace "ipaddress>=1.0.16" "" + ''; + + checkPhase = '' + pytest . + ''; + + meta = { + description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; + homepage = https://github.com/meejah/txtorcon; + maintainers = with lib.maintainers; [ jluttine ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de79d5dc502..1ba770ac031 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22736,6 +22736,8 @@ in { twisted = callPackage ../development/python-modules/twisted { }; + txtorcon = callPackage ../development/python-modules/txtorcon { }; + tzlocal = callPackage ../development/python-modules/tzlocal { }; u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; From 145fa7ac1f355e4d8f71ccd7e7ef4a059519f70a Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 3 Sep 2017 20:54:32 +0300 Subject: [PATCH 52/64] pythonPackages.attrs: 16.2.0 -> 17.2.0 --- .../python-modules/attrs/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +--------------- 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/attrs/default.nix diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix new file mode 100644 index 00000000000..e58bf3846dc --- /dev/null +++ b/pkgs/development/python-modules/attrs/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, hypothesis, zope_interface +, pympler, coverage, six, clang }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "attrs"; + version = "17.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "04gx08ikpk26wnq22f7l42gapcvk8iz1512r927k6sadz6cinkax"; + }; + + # macOS needs clang for testing + buildInputs = [ + pytest hypothesis zope_interface pympler coverage six + ] ++ lib.optionals (stdenv.isDarwin) [ clang ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Python attributes without boilerplate"; + homepage = https://github.com/hynek/attrs; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ba770ac031..a23c668d07e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -647,29 +647,7 @@ in { }; }); - attrs = buildPythonPackage (rec { - name = "attrs-${version}"; - version = "16.2.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/a/attrs/${name}.tar.gz"; - sha256 = "136f2ec0f94ec77ff2990830feee965d608cab1e8922370e3abdded383d52001"; - }; - - # macOS needs clang for testing - buildInputs = with self; [ pytest hypothesis zope_interface - pympler coverage ] - ++ optionals (stdenv.isDarwin) [ pkgs.clang ]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Python attributes without boilerplate"; - homepage = https://github.com/hynek/attrs; - license = licenses.mit; - }; - }); + attrs = callPackage ../development/python-modules/attrs { }; audioread = callPackage ../development/python-modules/audioread { }; From 196fbee1bbf21cb01096adc9d34e1f42e1095bfd Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 3 Sep 2017 17:14:11 +0300 Subject: [PATCH 53/64] pythonPackages.magic-wormhole: fix inputs and patch --- .../development/python-modules/magic-wormhole/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 7fedf4d48bb..cc1e663209e 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -17,6 +17,7 @@ , humanize , pyopenssl , service-identity +, txtorcon }: buildPythonPackage rec { @@ -31,14 +32,11 @@ buildPythonPackage rec { checkInputs = [ mock ]; buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity ]; + propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ]; postPatch = '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py - sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_scripts.py - # XXX: disable one test due to warning: - # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py + sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_cli.py '' + lib.optionalString (pythonAtLeast "3.3") '' sed -i -e 's|"ipaddress",||' setup.py ''; From 596d87c13edfb6ded1ac7507e31aab874d53c6dc Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 3 Sep 2017 15:42:05 +0300 Subject: [PATCH 54/64] pythonPackages.pytest-flake8: fix strict mode --- .../python-modules/pytest-flake8/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 93883283627..b39737ea701 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,4 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, pytest, flake8}: +{lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, flake8}: buildPythonPackage rec { name = "${pname}-${version}"; @@ -16,6 +16,16 @@ buildPythonPackage rec { sha256 = "1za5i09gz127yraigmcl443w6149714l279rmlfxg1bl2kdsc45a"; }; + patches = [ + # Fix pytest strict mode (pull request #24) + # https://github.com/tholo/pytest-flake8/pull/24 + (fetchpatch { + name = "fix-compatibility-with-pytest-strict-mode.patch"; + url = "https://github.com/tholo/pytest-flake8/commit/434e1b07b4b77bfe1ddb9b2b54470c6c3815bb1a.patch"; + sha256 = "0idwgkwwysx2cibnykd81yxrgqzkpf42j99jmpnanqzi99qnc3wx"; + }) + ]; + checkPhase = '' pytest --ignore=nix_run_setup.py . ''; From 5db60dbe1d856316aee04303756c048784d786e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:16:11 +0200 Subject: [PATCH 55/64] flexget: unpin some dependencies --- pkgs/applications/networking/flexget/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 94446332629..9e5e90996bc 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -32,7 +32,10 @@ buildPythonApplication rec { --replace "rebulk==0.8.2" "rebulk" \ --replace "cherrypy==10.2.2" "cherrypy" \ --replace "portend==1.8" "portend" \ - --replace "sqlalchemy==1.1.10" "sqlalchemy" + --replace "sqlalchemy==1.1.10" "sqlalchemy" \ + --replace "zxcvbn-python==4.4.15" "zxcvbn-python" \ + --replace "flask-cors==3.0.2" "flask-cors" \ + --replace "certifi==2017.4.17" "certifi" ''; checkPhase = '' From e9215bda452984b6caadd74a14763d583f401b6b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:31:45 +0200 Subject: [PATCH 56/64] python.pkgs.bkcharts: init at 0.2 --- .../python-modules/bkcharts/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/bkcharts/default.nix diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix new file mode 100644 index 00000000000..dee19b45f44 --- /dev/null +++ b/pkgs/development/python-modules/bkcharts/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, pandas +}: + + +buildPythonPackage rec { + pname = "bkcharts"; + version = "0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit version pname; + sha256 = "a5eaa8e78853dcecaa46345812e4fabe9cd3b96330ebf0809f640a4a0556d72e"; + }; + + propagatedBuildInputs = [ numpy pandas ]; + + # Circular test dependency on bokeh + doCheck = false; + + meta = { + description = "High level chart types built on top of Bokeh"; + homepage = http://github.com/bokeh/bkcharts; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a23c668d07e..22a1b8e3531 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2109,6 +2109,7 @@ in { bokeh = buildPythonPackage rec { name = "bokeh-${version}"; version = "0.12.3"; + bkcharts = callPackage ../development/python-modules/bkcharts { }; src = pkgs.fetchurl { url = "mirror://pypi/b/bokeh/${name}.tar.gz"; From 54e502272886f23434306f0aeec60d1802b694be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:32:04 +0200 Subject: [PATCH 57/64] python.pkgs.bokeh: 0.12.3 -> 0.12.7 --- .../python-modules/bokeh/default.nix | 82 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 48 +---------- 2 files changed, 83 insertions(+), 47 deletions(-) create mode 100644 pkgs/development/python-modules/bokeh/default.nix diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix new file mode 100644 index 00000000000..43c176a09ec --- /dev/null +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, mock +, pytest +, flask +, jinja2 +, markupsafe +, werkzeug +, itsdangerous +, dateutil +, requests +, six +, pygments +, pystache +, markdown +, pyyaml +, pyzmq +, tornado +, colorama +, isPy3k +, futures +, websocket_client +, numpy +, pandas +, greenlet +, python +, bkcharts +, pillow +, selenium +}: + +buildPythonPackage rec { + pname = "bokeh"; + name = "${pname}${version}"; + version = "0.12.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "2c42c95bf1a418c758dbff8446b4f5e5fc72ac10ea5da4e6b5010067396d0880"; + }; + + disabled = isPyPy; + + # Some test that uses tornado fails +# doCheck = false; + + checkInputs = [ mock pytest pillow selenium ]; + + propagatedBuildInputs = [ + flask + jinja2 + markupsafe + werkzeug + itsdangerous + dateutil + requests + six + pygments + pystache + markdown + pyyaml + pyzmq + tornado + colorama + bkcharts + ] + ++ lib.optionals ( !isPy3k ) [ futures ] + ++ lib.optionals ( !isPy3k && !isPyPy ) [ websocket_client ] + ++ lib.optionals ( !isPyPy ) [ numpy pandas greenlet ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s bokeh/tests + ''; + + meta = { + description = "Statistical and novel interactive HTML plots for Python"; + homepage = "http://github.com/bokeh/bokeh"; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22a1b8e3531..759a9ed2250 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2106,55 +2106,9 @@ in { }; }; - bokeh = buildPythonPackage rec { - name = "bokeh-${version}"; - version = "0.12.3"; bkcharts = callPackage ../development/python-modules/bkcharts { }; - src = pkgs.fetchurl { - url = "mirror://pypi/b/bokeh/${name}.tar.gz"; - sha256 = "e138941b62f59bc48bc5b8d249e90c03fed31c1d5abe47ab2ce9e4c83202f73c"; - }; - - disabled = isPyPy; - - # Some test that uses tornado fails - doCheck = false; - - buildInputs = with self; [ mock pytest ]; - - propagatedBuildInputs = with self; [ - flask - jinja2 - markupsafe - werkzeug - itsdangerous - dateutil - requests - six - pygments - pystache - markdown - pyyaml - pyzmq - tornado - colorama - ] - ++ optionals ( !isPy3k ) [ futures ] - ++ optionals ( isPy26 ) [ argparse ] - ++ optionals ( !isPy3k && !isPyPy ) [ websocket_client ] - ++ optionals ( !isPyPy ) [ numpy pandas greenlet ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s bokeh/tests - ''; - - meta = { - description = "Statistical and novel interactive HTML plots for Python"; - homepage = "http://github.com/bokeh/bokeh"; - license = licenses.bsd3; - }; - }; + bokeh = callPackage ../development/python-modules/bokeh { }; boto = buildPythonPackage rec { name = "boto-${version}"; From 413b54bcef65a31bc2dda01b3e084682fad78c4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:45:55 +0200 Subject: [PATCH 58/64] python.pkgs.prompt_toolkit: 1.0.14 -> 1.0.15 --- .../python-modules/prompt_toolkit/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 37 +++-------------- 2 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/prompt_toolkit/default.nix diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix new file mode 100644 index 00000000000..9704f1b92c9 --- /dev/null +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, docopt +, six +, wcwidth +, pygments +}: + +buildPythonPackage rec { + pname = "prompt_toolkit"; + name = "${pname}-${version}"; + version = "1.0.15"; + + src = fetchPypi { + inherit pname version; + sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917"; + }; + checkPhase = '' + rm prompt_toolkit/win32_types.py + py.test -k 'not test_pathcompleter_can_expanduser' + ''; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ docopt six wcwidth pygments ]; + + meta = { + description = "Python library for building powerful interactive command lines"; + longDescription = '' + prompt_toolkit could be a replacement for readline, but it can be + much more than that. It is cross-platform, everything that you build + with it should run fine on both Unix and Windows systems. Also ships + with a nice interactive Python shell (called ptpython) built on top. + ''; + homepage = https://github.com/jonathanslenders/python-prompt-toolkit; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nckx ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 759a9ed2250..dca008eee60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16457,41 +16457,14 @@ in { }; - prompt_toolkit = buildPythonPackage rec { - name = "prompt_toolkit-${version}"; - version = "1.0.14"; + prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; - src = pkgs.fetchurl { - sha256 = "cc66413b1b4b17021675d9f2d15d57e640b06ddfd99bb724c73484126d22622f"; - url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; - }; - checkPhase = '' - rm prompt_toolkit/win32_types.py - py.test -k 'not test_pathcompleter_can_expanduser' - ''; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ docopt six wcwidth pygments ]; - - meta = { - description = "Python library for building powerful interactive command lines"; - longDescription = '' - prompt_toolkit could be a replacement for readline, but it can be - much more than that. It is cross-platform, everything that you build - with it should run fine on both Unix and Windows systems. Also ships - with a nice interactive Python shell (called ptpython) built on top. - ''; - homepage = https://github.com/jonathanslenders/python-prompt-toolkit; - license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; - }; - }; - prompt_toolkit_52 = self.prompt_toolkit.override(self: rec { - name = "prompt_toolkit-${version}"; + prompt_toolkit_52 = self.prompt_toolkit.overridePythonAttrs(oldAttrs: rec { + name = "${oldAttrs.pname}-${version}"; version = "0.52"; - src = pkgs.fetchurl { + src = oldAttrs.src.override { + inherit version; sha256 = "00h9ldqmb33nhg2kpks7paldf3n3023ipp124alwp96yz16s7f1m"; - url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; }; # No tests included in archive From 3771bf74a8da875e241d8aca071f79222cf3317f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:46:30 +0200 Subject: [PATCH 59/64] python.pkgs: fix various missing lib/stdenv --- pkgs/development/python-modules/cherrypy/default.nix | 2 +- pkgs/development/python-modules/portend/default.nix | 2 +- pkgs/development/python-modules/pytest-sugar/default.nix | 2 +- pkgs/development/python-modules/pytest-warnings/default.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 327a10f2491..cffffde8e3d 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = "http://www.cherrypy.org"; description = "A pythonic, object-oriented HTTP framework"; - license = licenses.mit.bsd3; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 9092185a40f..cb418678a99 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Monitor TCP ports for bound or unbound states"; homepage = https://github.com/jaraco/portend; - license = lib.licenses.bsd3; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 81f5a2cbd4b..2965d169599 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A plugin that changes the default look and feel of py.test"; homepage = https://github.com/Frozenball/pytest-sugar; - license = lib.licenses.bsd3; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix index e6ebfcbb716..6b835abcafe 100644 --- a/pkgs/development/python-modules/pytest-warnings/default.nix +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = { description = "Plugin to list Python warnings in pytest report"; homepage = github.com/fschulze/pytest-warnings; license = lib.licenses.mit; From 66b6c043579ca8f6bf528830f2f754dd4d4ed96b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:51:44 +0200 Subject: [PATCH 60/64] python.pkgs.contextlib2: 0.5.3 -> 0.5.5 --- .../python-modules/contextlib2/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 +-------- 2 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/contextlib2/default.nix diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix new file mode 100644 index 00000000000..cadaa8914b2 --- /dev/null +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "contextlib2"; + version = "0.5.5"; + name = "${pname}-${version}"; + + src = fetchPypi rec { + inherit pname version; + sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48"; + }; + + meta = { + description = "Backports and enhancements for the contextlib module"; + homepage = http://contextlib2.readthedocs.org/; + license = lib.licenses.psfl; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dca008eee60..19199c13626 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3178,15 +3178,7 @@ in { }; - contextlib2 = buildPythonPackage rec { - name = "contextlib2-${version}"; - version = "0.5.3"; - - src = pkgs.fetchurl rec { - url = "mirror://pypi/c/contextlib2/${name}.tar.gz"; - sha256 = "01k2921labkbn28kw60jmqzvr4nxzfnx4vcsyjb3rir177qh1r9h"; - }; - }; + contextlib2 = callPackage ../development/python-modules/contextlib2 { }; cookiecutter = buildPythonPackage rec { version = "1.4.0"; From 5d057a2d7f28e1c37c111c0d90ee32a1a9a9de7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:56:36 +0200 Subject: [PATCH 61/64] python.pkgs.coverage: 4.0.1 -> 4.4.1 --- .../python-modules/coverage/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/coverage/default.nix diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix new file mode 100644 index 00000000000..137cef06b9e --- /dev/null +++ b/pkgs/development/python-modules/coverage/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, mock +}: + +buildPythonPackage rec { + pname = "coverage"; + version = "4.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "7a9c44400ee0f3b4546066e0710e1250fd75831adc02ab99dda176ad8726f424"; + }; + + # No tests in archive + doCheck = false; + checkInputs = [ mock ]; + + meta = { + description = "Code coverage measurement for python"; + homepage = http://nedbatchelder.com/code/coverage/; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19199c13626..f611902a9fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3223,24 +3223,7 @@ in { coveralls = callPackage ../development/python-modules/coveralls { }; - coverage = buildPythonPackage rec { - name = "coverage-4.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/coverage/${name}.tar.gz"; - sha256 = "0nrd817pzjw1haaz6gambgwf4jdjnh9kyxkgj6l8qgl6hdxga45w"; - }; - - # TypeError: __call__() takes 1 positional argument but 2 were given - doCheck = !isPy3k; - buildInputs = with self; [ mock ]; - - meta = { - description = "Code coverage measurement for python"; - homepage = http://nedbatchelder.com/code/coverage/; - license = licenses.bsd3; - }; - }; + coverage = callPackage ../development/python-modules/coverage { }; covCore = buildPythonPackage rec { name = "cov-core-1.15.0"; From a2fb79f86504c7d84b61aa18e79ea3b7fba4a9d9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 10:04:11 +0200 Subject: [PATCH 62/64] python.pkgs.dill: 0.2.6 -> 0.2.7.1 --- .../python-modules/dill/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +---------- 2 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/dill/default.nix diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix new file mode 100644 index 00000000000..79c87772ffe --- /dev/null +++ b/pkgs/development/python-modules/dill/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "dill"; + version = "0.2.7.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "97fd758f5fe742d42b11ec8318ecfcff8776bccacbfcec05dfd6276f5d450f73"; + }; + + # Messy test suite. Even when running the tests like tox does, it fails + doCheck = false; + checkPhase = '' + for test in tests/*.py; do + ${python.interpreter} $test + done + ''; + # Following error without setting checkPhase + # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0} + + meta = { + description = "Serialize all of python (almost)"; + homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f611902a9fc..f14cf82dc68 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4946,24 +4946,7 @@ in { }; - dill = buildPythonPackage rec { - name = "dill-${version}"; - version = "0.2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dill/${name}.zip"; - sha256 = "6c1ccca68be483fa8c66e85a89ffc850206c26373aa77a97b83d8d0994e7f1fd"; - }; - - # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0} - doCheck = false; - - meta = { - description = "Serialize all of python (almost)"; - homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm; - license = licenses.bsd3; - }; - }; + dill = callPackage ../development/python-modules/dill { }; discogs_client = buildPythonPackage rec { name = "discogs-client-2.0.2"; From 63e13345ae808814c3307f32d9812df57419e38b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 10:08:04 +0200 Subject: [PATCH 63/64] python.pkgs.entrypoints: 0.2.2 -> 0.2.3 --- .../python-modules/entrypoints/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +-------- 2 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/entrypoints/default.nix diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix new file mode 100644 index 00000000000..d812fd55a88 --- /dev/null +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, configparser +, pytest +}: + +buildPythonPackage rec { + pname = "entrypoints"; + version = "0.2.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f"; + }; + + checkInputs = [ pytest]; + + propagatedBuildInputs = [ configparser ]; + + checkPhase = '' + py.test tests + ''; + + meta = { + description = "Discover and load entry points from installed packages"; + homepage = https://github.com/takluyver/entrypoints; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f14cf82dc68..17560e316c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5330,19 +5330,7 @@ in { }; }); - entrypoints = buildPythonPackage rec { - pname = "entrypoints"; - version = "0.2.2"; - name = "${pname}-${version}"; - format = "wheel"; - - src = fetchPypi { - inherit pname version format; - sha256 = "0a0685962ee5ac303f470acbb659f0f97aef5b9deb6b85d059691c706ef6e45e"; - }; - - propagatedBuildInputs = with self; [ configparser ]; - }; + entrypoints = callPackage ../development/python-modules/entrypoints { }; enzyme = callPackage ../development/python-modules/enzyme {}; From b85dbed153ea7fce7e37cffd9ebda61d39f4e9dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 10:28:56 +0200 Subject: [PATCH 64/64] python.pkgs.pytimeparse: 1.1.6 -> 1.1.7 --- pkgs/development/python-modules/pytimeparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index ce5ff058664..374263c2b70 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pytimeparse"; - version = "1.1.6"; + version = "1.1.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl"; + sha256 = "51b641bcd435e0cb6b9701ed79cf7ee97fa6bf2dbb5d41baa16e5486e5d9b17a"; }; propagatedBuildInputs = [ nose ];