diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules')
188 files changed, 1404 insertions, 449 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/nixpkgs/pkgs/development/python-modules/Cython/default.nix index 2d987abb3e48..3d5afd52abdd 100644 --- a/nixpkgs/pkgs/development/python-modules/Cython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Cython/default.nix @@ -5,7 +5,7 @@ , fetchpatch , python , glibcLocales -, pkgconfig +, pkg-config , gdb , numpy , ncurses @@ -26,15 +26,15 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.14"; + version = "0.29.19"; src = fetchPypi { inherit pname version; - sha256 = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414"; + sha256 = "0n2j87nka8cs772qc60d0c7lrpvsw0y8p3qzvhrsi3nmq1yqmycp"; }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; checkInputs = [ numpy ncurses diff --git a/nixpkgs/pkgs/development/python-modules/GitPython/default.nix b/nixpkgs/pkgs/development/python-modules/GitPython/default.nix index b5ffacae2964..7b39ebb7a390 100644 --- a/nixpkgs/pkgs/development/python-modules/GitPython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/GitPython/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }: buildPythonPackage rec { - version = "3.1.2"; + version = "3.1.3"; pname = "GitPython"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "864a47472548f3ba716ca202e034c1900f197c0fb3a08f641c20c3cafd15ed94"; + sha256 = "e107af4d873daed64648b4f4beb89f89f0cfbe3ef558fc7821ed2331c2f8da1a"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/JPype1/default.nix b/nixpkgs/pkgs/development/python-modules/JPype1/default.nix index c43b2a05a519..b70879952f4e 100644 --- a/nixpkgs/pkgs/development/python-modules/JPype1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/JPype1/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "JPype1"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "92f24b0fe11e90b57343494ce38699043d9e6828a22a99dddbcf99c0adb4c1f7"; + sha256 = "7bbd25453dc04704d77d854c80acb5537ecb18b9de8a5572e5f22649a2160aaf"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/Mako/default.nix b/nixpkgs/pkgs/development/python-modules/Mako/default.nix index 597a4695c0cb..375a02968646 100644 --- a/nixpkgs/pkgs/development/python-modules/Mako/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Mako/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "3139c5d64aa5d175dbafb95027057128b5fbd05a40c53999f3905ceb53366d9d"; + sha256 = "8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27"; }; checkInputs = [ markupsafe nose mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix b/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix index 13769bbeaed3..09b6919495de 100644 --- a/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioharmony/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aioharmony"; - version = "0.2.1"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "8c8f6e3b776e4e7eba5a1d2ae739aac6a1dd558a7f15951c34ffe0ee28f7f538"; + sha256 = "445323810978454ba3b32be53ba6b43cf9948586de3f9734b8743b55858b3cc7"; }; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index 7d164cf5e4f0..c58944a59d72 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, pythonAtLeast , attrs , chardet , multidict @@ -12,9 +11,8 @@ , idna-ssl , typing-extensions , pytestrunner -, pytest +, pytestCheckHook , gunicorn -, pytest-timeout , async_generator , pytest_xdist , pytestcov @@ -22,13 +20,14 @@ , trustme , brotlipy , freezegun +, isPy38 }: buildPythonPackage rec { pname = "aiohttp"; version = "3.6.2"; # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures - disabled = pythonOlder "3.5" || pythonAtLeast "3.8"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; @@ -36,28 +35,40 @@ buildPythonPackage rec { }; checkInputs = [ - pytestrunner pytest gunicorn async_generator pytest_xdist + pytestrunner pytestCheckHook gunicorn async_generator pytest_xdist pytest-mock pytestcov trustme brotlipy freezegun ]; propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ]; - # disable tests which attempt to do loopback connections - checkPhase = '' + disabledTests = [ + # disable tests which attempt to do loopback connections + "get_valid_log_format_exc" + "test_access_logger_atoms" + "aiohttp_request_coroutine" + "server_close_keepalive_connection" + "connector" + "client_disconnect" + "handle_keepalive_on_closed_connection" + "proxy_https_bad_response" + "partially_applied_handler" + "middleware" + ] ++ lib.optionals stdenv.is32bit [ + "test_cookiejar" + ] ++ lib.optionals isPy38 [ + # Python 3.8 https://github.com/aio-libs/aiohttp/issues/4525 + "test_read_boundary_with_incomplete_chunk" + "test_read_incomplete_chunk" + "test_request_tracing_exception" + ] ++ lib.optionals stdenv.isDarwin [ + "test_close" + ]; + + # aiohttp in current folder shadows installed version + # Probably because we run `python -m pytest` instead of `pytest` in the hook. + preCheck = '' cd tests - pytest -k "not get_valid_log_format_exc \ - and not test_access_logger_atoms \ - and not aiohttp_request_coroutine \ - and not server_close_keepalive_connection \ - and not connector \ - and not client_disconnect \ - and not handle_keepalive_on_closed_connection \ - and not proxy_https_bad_response \ - and not partially_applied_handler \ - ${lib.optionalString stdenv.is32bit "and not test_cookiejar"} \ - and not middleware" \ - --ignore=test_connector.py ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix index c40f8d3b4471..7b33b1c508f8 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.6.7"; + version = "0.6.8"; src = fetchPypi { inherit pname version; - sha256 = "cf53c9faea6eee25a466e73eef1753b82a75c7497648149c19c15342df2678f2"; + sha256 = "9f9055bc2a9a72c5eab17e0ce5522edecd6de07e21cf347bf0cffabdabe5570e"; }; # tests are not implemented diff --git a/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix b/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix index bbeca1c31507..9034e6a67316 100644 --- a/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.6.3"; + version = "0.6.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "06w15iyr07s861hkzqfdclzxkpvgg83sx8f235mz8k2490hnyqvv"; + sha256 = "4397ca736238a1ada8c7f47e557dda05e9ecfdd467b9f6b83871efd365af7e9f"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/alot/default.nix b/nixpkgs/pkgs/development/python-modules/alot/default.nix index a2012132024b..04b2d898e66a 100644 --- a/nixpkgs/pkgs/development/python-modules/alot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alot/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { description = "Terminal MUA using notmuch mail"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ aepsil0n ]; + maintainers = with maintainers; [ edibopp ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix b/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix index 706648f56a31..f8ef6b9492a3 100644 --- a/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix @@ -52,13 +52,16 @@ , typing , nose , python -, isPy3k +, pythonOlder +, pythonAtLeast }: buildPythonPackage rec { pname = "apache-airflow"; version = "1.10.5"; - disabled = (!isPy3k); + # Upstream does not yet support python 3.8 + # https://github.com/apache/airflow/issues/8674 + disabled = pythonOlder "3.5" || pythonAtLeast "3.8"; src = fetchFromGitHub rec { owner = "apache"; @@ -189,6 +192,6 @@ buildPythonPackage rec { description = "Programmatically author, schedule and monitor data pipelines"; homepage = "http://airflow.apache.org/"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ingenieroariel ]; + maintainers = with maintainers; [ bhipple costrouc ingenieroariel ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/appdirs/default.nix b/nixpkgs/pkgs/development/python-modules/appdirs/default.nix index 2f7f2ae0281b..22fa3dc98fb0 100644 --- a/nixpkgs/pkgs/development/python-modules/appdirs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/appdirs/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "appdirs"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92"; + sha256 = "7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index f9462c5b0a50..5f124cc09434 100755 --- a/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.15.7"; + version = "1.15.9"; src = fetchPypi { inherit pname version; - sha256 = "b54cce1ca4bea838a949b4362410b1d717597951e5b7efbfa34ce89bc5df805e"; + sha256 = "c6a3125ee68ecf4d11947497c1f891b6436df9d8453f8865cabf595813504cc1"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix index 715e4da8f44e..7b7131f2a7fc 100644 --- a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.2"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "0m29ndgrcgrzi3y1fsxmdl421x6n4gn02l70hsz8486h8zzdhbqm"; + sha256 = "60fd8c4341bab59963dafd5d2a566e94f547e660b9b396f772afe67d8481dbf0"; }; propagatedBuildInputs = [ pycodestyle ]; diff --git a/nixpkgs/pkgs/development/python-modules/av/default.nix b/nixpkgs/pkgs/development/python-modules/av/default.nix index 7ccc569a87e5..ca750f32dba9 100644 --- a/nixpkgs/pkgs/development/python-modules/av/default.nix +++ b/nixpkgs/pkgs/development/python-modules/av/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , numpy -, ffmpeg_4 +, ffmpeg , pkgconfig }: @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ numpy ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg_4 ]; + buildInputs = [ ffmpeg ]; # Tests require downloading files from internet doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/awkward1/default.nix b/nixpkgs/pkgs/development/python-modules/awkward1/default.nix index 3e2b08061d92..e3549e0a4a85 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.2.19"; + version = "0.2.23"; src = fetchPypi { inherit pname version; - sha256 = "23446eacdf52cad1fb0b5bb0f2ed16c1ae8bb5a282d667ad37ab69494e1ef27f"; + sha256 = "d7458b499959af66e0a640e29e6b676a39cc9614cd504e5a2e8f8d0c7f546597"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 19be6d28e170..5a1b7600ecfc 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "228ea058361763a5a31273df7d813b9134d0ecff4567c533eb7e1afaf772fbc7"; + sha256 = "03417eecfa1fac906e674cb1cb43ed7da27a96277277b091d7c389ba39f6c3fe"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index c23ebfc2ce9c..fd0c527344c0 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cc4058174e371a0b68b305cd5a082fcca47f3446dd9aefd9ada72da4bd637da9"; + sha256 = "7f8b912ca62431c1697b4914c12cc5f8123e60ee6c65d123591f937744d204e0"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index f5b04c36b0d6..404caf4ebf5b 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.0"; pname = "azure-mgmt-imagebuilder"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0r4sxr3pbcci5qif1ip1lrix3cryj0b3asqch3zds4q705jiakc4"; + sha256 = "4c9291bf16b40b043637e5e4f15650f71418ac237393e62219cab478a7951733"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index eb4772ce5439..69c1aaffada3 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "16f4c4f676ea718b7e1c59bd9a516fcfc796f1aff844b183a7ce9afe69fb214d"; + sha256 = "a1527fe8b1e8a47558bfa03bd6c587706d8fb9213142aea42da07397daa2d039"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix index 2ccb773c105a..8192064626ea 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-signalr"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a"; + sha256 = "6503ddda9d6f4b634dfeb8eb4bcd14ede5e0900585f6c83bf9010cf82215c126"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index 02460b27952e..2a3552d1fb5f 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "0.50.2"; + version = "0.50.3"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "836649d510aa2b7467bc87d8dab18f2db917b63aa2fe8f3e5d0bb44011e465f5"; + sha256 = "2b1e60c81fcf5b6a5bb3ceddb27f24543f479912e39a4706a390a16d8c0a71f4"; }; buildInputs = [ @@ -29,6 +29,9 @@ buildPythonPackage rec { # has no tests doCheck = false; + # python2 will fail due to pep 420 + pythonImportsCheck = lib.optionals isPy3k [ "azure.servicebus" ]; + meta = with lib; { description = "This is the Microsoft Azure Service Bus Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix b/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix index 63aa7883e3a9..bfc52c99ef5d 100644 --- a/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix +++ b/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchFromGitHub +, fetchpatch , pytest , unittest2 , future @@ -27,6 +28,13 @@ buildPythonPackage rec { }; + patches = [ + (fetchpatch { + url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch"; + sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0"; + }) + ]; + propagatedBuildInputs = [ future numpy pillow scipy scikitlearn scikitimage threadpoolctl ]; diff --git a/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/nixpkgs/pkgs/development/python-modules/beancount/default.nix index 045dd14da0d8..9709037792dc 100644 --- a/nixpkgs/pkgs/development/python-modules/beancount/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beancount/default.nix @@ -4,14 +4,14 @@ , ply, python_magic, pytest, requests }: buildPythonPackage rec { - version = "2.2.3"; + version = "2.3.0"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0pcfl2rx2ng06i4f9izdpnlnb1k0rdzsckbzzn4cn4ixfzyssm0m"; + sha256 = "04i788glp2cslwi67dixy1pi5l0izcl078i9mrd1j1sh8f99cvcs"; }; # Tests require files not included in the PyPI archive. diff --git a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index 56a941e60e09..036f54346144 100644 --- a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.5.1"; + version = "1.5.2"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "1fy8w56m0x546zjk3is1xp83jm19fkn4y15g5jgmq29sfzc8n3y3"; + sha256 = "6f3bd0402d41ee9be03637d74f34a7db279d00cb9c6386b0597cbbac16ee8f4e"; }; propagatedBuildInputs = [ ]; diff --git a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index e8a20b6df47d..97c6b957a437 100644 --- a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -7,6 +7,7 @@ , gzip , bzip2 , gnutar +, p7zip , cabextract , lzma , nose @@ -28,7 +29,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar cabextract lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] ++ stdenv.lib.optional visualizationSupport pyqtgraph; # setup.py only installs version.py during install, not test diff --git a/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/nixpkgs/pkgs/development/python-modules/bleach/default.nix index 1b10fe166f8a..9b27ae254903 100644 --- a/nixpkgs/pkgs/development/python-modules/bleach/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bleach/default.nix @@ -6,6 +6,7 @@ , six , html5lib , setuptools +, packaging }: buildPythonPackage rec { @@ -18,11 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six html5lib setuptools ]; - - postPatch = '' - substituteInPlace setup.py --replace ",<3dev" "" - ''; + propagatedBuildInputs = [ packaging six html5lib setuptools ]; # Disable network tests checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/nixpkgs/pkgs/development/python-modules/bleak/default.nix index 559fd33e8eb0..b7ebca9eb034 100644 --- a/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.6.2"; + version = "0.6.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1kmq2z3dhq6dd20i5w71gshjrfvyw0pkpnld8iib9ai2rz6a8aj0"; + sha256 = "1dc32899d0700c5b5ed9abf642dfee28ac62b1fb5d7be5fa5a6db104dec9a03c"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/block-io/default.nix b/nixpkgs/pkgs/development/python-modules/block-io/default.nix index f80c8a8c145f..505d3ffe149c 100644 --- a/nixpkgs/pkgs/development/python-modules/block-io/default.nix +++ b/nixpkgs/pkgs/development/python-modules/block-io/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "block-io"; - version = "1.1.10"; + version = "1.1.13"; src = fetchPypi { inherit pname version; - sha256 = "ba2e750085d9da4d1567932f3f719974fdc3f02649ee0d5c2f85fce592208723"; + sha256 = "a45e31361d17ce272a0d563a689d6b87b65cc16e9348f8cd3a6460c93359b1bd"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 2903b8ae7c66..1baa668d3c89 100644 --- a/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.13.6"; # N.B: if you change this, change botocore too + version = "1.13.23"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "f1ac7eb23ff8b1d7e314123668ff1e93b874dd396ac5424adc443d68bd8a6fbf"; + sha256 = "bcaa88b2f81b88741c47da52f3414c876236700441df87b6198f860e6a200d6f"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/nixpkgs/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch b/nixpkgs/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch new file mode 100644 index 000000000000..685d34228a1b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch @@ -0,0 +1,27 @@ +From 6f544a5bd43446859754cb80e012af933b843db9 Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Wed, 3 Jun 2020 22:05:34 +0200 +Subject: [PATCH] clipboard: make which substitutable + +This is used to detect the presence of xclip and other clipboard +handling tools. +--- + bpython/clipboard.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bpython/clipboard.py b/bpython/clipboard.py +index aee429b..f346429 100644 +--- a/bpython/clipboard.py ++++ b/bpython/clipboard.py +@@ -58,7 +58,7 @@ class OSXClipboard(object): + + def command_exists(command): + process = subprocess.Popen( +- ["which", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE ++ ["@which@", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE + ) + process.communicate() + +-- +2.26.2 + diff --git a/nixpkgs/pkgs/development/python-modules/bpython/default.nix b/nixpkgs/pkgs/development/python-modules/bpython/default.nix index 73ce843cf018..ad7322cbf661 100644 --- a/nixpkgs/pkgs/development/python-modules/bpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bpython/default.nix @@ -1,4 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, pygments, greenlet, curtsies, urwid, requests, mock }: +{ stdenv +, buildPythonPackage +, fetchPypi +, curtsies +, greenlet +, mock +, pygments +, requests +, substituteAll +, urwid +, which }: buildPythonPackage rec { pname = "bpython"; @@ -9,6 +19,11 @@ buildPythonPackage rec { sha256 = "1764ikgj24jjq46s50apwkydqvy5a13adb2nbszk8kbci6df0v27"; }; + patches = [ (substituteAll { + src = ./clipboard-make-which-substitutable.patch; + which = "${which}/bin/which"; + })]; + propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; postInstall = '' diff --git a/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix b/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix index 2df937f4232c..8050f886db5a 100644 --- a/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "bravia-tv"; - version = "1.0.1"; + version = "1.0.5"; disabled = isPy27; src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "0jlrin5qw3ny2r961y5divd5xa9giprxhhxdc84rjlq9qdmnsk68"; + sha256 = "17nd0v3pgmbfafi3vypls9jnpg4dk7wyh7fl7gpzcnkq1f8pf087"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix b/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix index 2f0e67683d9a..612ab13c1934 100644 --- a/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "17cjh7g8gbr0gb22nzybkw7vq9x5wfa5ln94hhzijbz934bw1f37"; + sha256 = "8878437aa44ec485cecb255742035b3b98a6c7e7d167a943b5fbe597b2f8f7f9"; }; propagatedBuildInputs = [ six webob ]; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index b088480f5de4..c5a12c997d9d 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.7.0"; + version = "2.8.2"; src = fetchPypi { inherit pname version; - sha256 = "0jj8fh611n7xc3vsfbgpqsllp38cfj3spkr2kz3ara2x7jvh3406"; + sha256 = "0rdrz2zkd6xaf9kb5l41xmbfzq618sz498w23irshih4c802pdv5"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index cb3124ec7e38..4bb8613afeab 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -1,12 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, buildbot }: buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.7.0"; + inherit (buildbot) version; src = fetchPypi { inherit pname version; - sha256 = "03zb09r8w8dvd9qas7h6gdwlqc7q482ikph6h3708lpnkn72xdkb"; + sha256 = "1yz3k6dg15q4911x8kjy396dccfgrs50mjz278l09p6zmm71llax"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index cd35f14fb37d..4c5aa374562a 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1d8xdk4rq4p3fw03cvz7d1pmpjjbyrnzzjifzv46q88vk7jakgxi"; + sha256 = "19qwr0h6qavznx8rfjq6zjccyd2y7x4nc8asldvay3b44xfsr385"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "03pl75avi6cmmhjvfn0a0b4drn35yv37kvgn04zjdwa3m6p3haa8"; + sha256 = "1wfhwmb1d32k8isk7k8525pmkfih8hlvy53zsj19l3gvjm0da9gw"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0rzjk3qmlvid8qag3r00zaszchncl1nl8l2yapvc1zqh2dqlln58"; + sha256 = "0g62v0maz3b9bmjvvjcin6ayg0f5k0n8m93zk75lagyr69g5vaka"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1n4j73y9kwfqk7dz1fh1bpan68vlpnbz7idxpmsphyay8w8y9dd4"; + sha256 = "0dlq8pchgccc66gfdlssydacisia5fbwc8b4gd8f9gcbish8jmf7"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1babkcgxczs6zfk2b6jmsy2vwbrgdydrp2px1mfwa3wmv8fwlssg"; + sha256 = "193nni55py6yzw730yyp5va2n4313sjf6a7jmi0xs9bivvvzg5w9"; }; buildInputs = [ buildbot-pkg ]; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index 365ca0bcf14a..05938e43ad69 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -1,13 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future, - coreutils }: +{ lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted, + future, coreutils }: buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.7.0"; + inherit (buildbot) version; src = fetchPypi { inherit pname version; - sha256 = "1vwy46acvczgk1hhpsqdwpcw55j4hm5pkw6j01f92axiga8r5jk6"; + sha256 = "0p1w6ailp6xpa6ckl5prj413ilxx5s3lga5mzqxj9nn00vni8ik2"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/nixpkgs/pkgs/development/python-modules/can/default.nix b/nixpkgs/pkgs/development/python-modules/can/default.nix index 3629e0097eda..0a7e58ac8006 100644 --- a/nixpkgs/pkgs/development/python-modules/can/default.nix +++ b/nixpkgs/pkgs/development/python-modules/can/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-can"; - version = "3.3.2"; + version = "3.3.3"; src = fetchPypi { inherit pname version; - sha256 = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e"; + sha256 = "ecd69cf6b2f0235345ebe607a15325cf1384c85b24ffbe1d68c3754357f87488"; }; propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index d0d4f2e69fb8..740023c1fdb9 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -4,14 +4,16 @@ buildPythonPackage rec { pname = "celery"; - version = "4.4.2"; + version = "4.4.4"; src = fetchPypi { inherit pname version; - sha256 = "0ps1c6ill7q0m5kzb87hisgshdk3kzpa6cvcjch1d1wa07whp2hh"; + sha256 = "0zk42fxznrhww0dxak9b6nkfqg02z49zr839k6ql7nk3him7n0y2"; }; postPatch = '' + substituteInPlace requirements/default.txt \ + --replace "kombu>=4.6.10,<4.7" "kombu" substituteInPlace requirements/test.txt \ --replace "moto==1.3.7" moto \ --replace "pytest>=4.3.1,<4.4.0" pytest @@ -20,9 +22,13 @@ buildPythonPackage rec { # ignore test that's incompatible with pytest5 # test_eventlet touches network # test_mongodb requires pymongo + # test_multi tries to create directories under /var checkPhase = '' - pytest -k 'not restore_current_app_fallback and not msgpack and not on_apply' \ + pytest -k 'not restore_current_app_fallback and not msgpack and not on_apply and not pytest' \ + --ignore=t/unit/contrib/test_pytest.py \ --ignore=t/unit/concurrency/test_eventlet.py \ + --ignore=t/unit/bin/test_multi.py \ + --ignore=t/unit/apps/test_multi.py \ --ignore=t/unit/backends/test_mongodb.py ''; diff --git a/nixpkgs/pkgs/development/python-modules/citeproc-py/default.nix b/nixpkgs/pkgs/development/python-modules/citeproc-py/default.nix new file mode 100644 index 000000000000..bd1ae0c563a4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/citeproc-py/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, git +, lxml +, rnc2rng +}: + +buildPythonPackage rec { + pname = "citeproc-py"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "00aaff50jy4j0nakdzq9258z1gzrac9baarli2ymgspj88jg5968"; + }; + + buildInputs = [ rnc2rng ]; + + propagatedBuildInputs = [ lxml ]; + + checkInputs = [ nose git ]; + checkPhase = "nosetests tests"; + doCheck = false; # seems to want a Git repository, but fetchgit with leaveDotGit also fails + pythonImportsCheck = [ "citeproc" ]; + + meta = with lib; { + homepage = "https://github.com/brechtm/citeproc-py"; + description = "Citation Style Language (CSL) parser for Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/clickclick/default.nix b/nixpkgs/pkgs/development/python-modules/clickclick/default.nix index d35c356c8220..b2e23dc55bdb 100644 --- a/nixpkgs/pkgs/development/python-modules/clickclick/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clickclick/default.nix @@ -14,8 +14,10 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytestcov ]; propagatedBuildInputs = [ flake8 click pyyaml six ]; - disabledTests = lib.optionals isPy36 [ + # test_cli asserts on exact quoting style of output + disabledTests = [ "test_cli" + ] ++ lib.optionals isPy36 [ "test_choice_default" ]; diff --git a/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix b/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix index 054e302dfe76..f4f46f2dff0f 100644 --- a/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "CNVkit"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "1hj8c98s538i0hg5mrz4bw4v07qmcl51rhxq611rj2nglnc9r25y"; + sha256 = "d68adc0121e17c61a3aa28c0a9ba6526510a5a0df0f0a6eb1818bab71b7e927a"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix b/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix index 34c21372aee1..873cbe142d9b 100644 --- a/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, isPyPy , pytest, pytestcov, pytest-mock, freezegun -, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests }: +, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests +, python-slugify }: buildPythonPackage rec { pname = "cookiecutter"; @@ -16,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov pytest-mock freezegun ]; propagatedBuildInputs = [ - jinja2 future binaryornot click whichcraft poyo jinja2_time requests + jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify ]; # requires network access for cloning git repos diff --git a/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/nixpkgs/pkgs/development/python-modules/croniter/default.nix index 90334fd42250..15aaf97d15c0 100644 --- a/nixpkgs/pkgs/development/python-modules/croniter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/croniter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "croniter"; - version = "0.3.31"; + version = "0.3.32"; src = fetchPypi { inherit pname version; - sha256 = "15riw8sl8jzzkvvjlz3i3p7jcx423zipxhff5ddvki6zgnrb9149"; + sha256 = "0d5bf45f12861c1b718c51bd6e2ab056da94e651bf22900658421cdde0ff7088"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix index 90993db4c5bf..4eb9a8da773e 100644 --- a/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -4,6 +4,7 @@ , django , python , pillow +, python_magic }: buildPythonPackage rec { @@ -14,7 +15,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "8322ee9d7bf5ffa5360990320d2cc2efc7017feff35422636d49f625721edf82"; }; - propagatedBuildInputs = [ pillow ]; + propagatedBuildInputs = [ pillow python_magic ]; checkInputs = [ django ]; diff --git a/nixpkgs/pkgs/development/python-modules/django/2_2.nix b/nixpkgs/pkgs/development/python-modules/django/2_2.nix index 70cba819e92d..42af34659c0f 100644 --- a/nixpkgs/pkgs/development/python-modules/django/2_2.nix +++ b/nixpkgs/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.11"; + version = "2.2.13"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0l0gndky4nwc1jk68b31m583a9g0fhmll903p0xislyyddz3iqk5"; + sha256 = "103db5gmny6bkq9jgr2m6gdfy1n29bj2v87184y1zgpdmkv71ww4"; }; patches = stdenv.lib.optional withGdal diff --git a/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix b/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix index 27060e18ae27..4ded69bc3256 100644 --- a/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "5.0.1"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1fk7fh30i0fzi0hjd841vxh25iryvgp4lirmxfpq428w4nq7p1bg"; + sha256 = "c7a42cf9b93d1161a10bf59919f7ee52d996a523a4134b2a136f6fe1eba7a2fa"; }; disabled = pythonOlder "3.5"; diff --git a/nixpkgs/pkgs/development/python-modules/dnslib/default.nix b/nixpkgs/pkgs/development/python-modules/dnslib/default.nix index fafa4c5cbf57..df9843893238 100644 --- a/nixpkgs/pkgs/development/python-modules/dnslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.12"; + version = "0.9.13"; src = fetchPypi { inherit pname version; - sha256 = "c206f09948f3ad17884adffdb552b700072c6022fa59744a0f0606114c475e19"; + sha256 = "a0fed3e139c12ee4884b19bcde1d4a170745bcabb6026397876e3236ce38b9db"; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; diff --git a/nixpkgs/pkgs/development/python-modules/doc8/default.nix b/nixpkgs/pkgs/development/python-modules/doc8/default.nix index f7e620f491cb..c2a7df098f4b 100644 --- a/nixpkgs/pkgs/development/python-modules/doc8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/doc8/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "doc8"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "2df89f9c1a5abfb98ab55d0175fed633cae0cf45025b8b1e0ee5ea772be28543"; + sha256 = "4d1df12598807cf08ffa9a1d5ef42d229ee0de42519da01b768ff27211082c12"; }; buildInputs = [ pbr ]; diff --git a/nixpkgs/pkgs/development/python-modules/docker/default.nix b/nixpkgs/pkgs/development/python-modules/docker/default.nix index a31ba7c69c03..9c788bde123d 100644 --- a/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0bkj1xfp6mnvk1i9hl5awsmwi07q6iwwsjznd7kvrx5m19i6dbnx"; + sha256 = "380a20d38fbfaa872e96ee4d0d23ad9beb0f9ed57ff1c30653cbeb0c9c0964f2"; }; nativeBuildInputs = lib.optional isPy27 mock; diff --git a/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix index ffed5fb170d4..580945656b4c 100644 --- a/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { - version = "0.0.17"; + version = "0.0.18"; pname = "dockerfile-parse"; src = fetchPypi { inherit pname version; - sha256 = "a69d4ed44c4a890c16437327009ae59ec3a3afeb1abc3819d0c1b14a46099220"; + sha256 = "a09eae6871b7b314f8a8bddb67b6c5002708b22247511906cf2a9a45564b83db"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix b/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix index f671cdc9642a..03445f79117f 100644 --- a/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix @@ -1,8 +1,11 @@ { stdenv +, python , buildPythonPackage , fetchPypi -, isPy3k +, substituteAll , pyparsing +, graphviz +, texlive }: buildPythonPackage rec { @@ -14,11 +17,26 @@ buildPythonPackage rec { sha256 = "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9"; }; - # Tests fail with 3.x. Furthermore, package is no longer maintained. - disabled = isPy3k; + patches = [ + (substituteAll { + src = ./path.patch; + inherit graphviz; + }) + ./test.patch # https://github.com/kjellmf/dot2tex/issues/5 + ]; propagatedBuildInputs = [ pyparsing ]; + checkInputs = [ + (texlive.combine { + inherit (texlive) scheme-small preview pstricks; + }) + ]; + + checkPhase = '' + ${python.interpreter} tests/test_dot2tex.py + ''; + meta = with stdenv.lib; { description = "Convert graphs generated by Graphviz to LaTeX friendly formats"; homepage = "https://github.com/kjellmf/dot2tex"; diff --git a/nixpkgs/pkgs/development/python-modules/dot2tex/path.patch b/nixpkgs/pkgs/development/python-modules/dot2tex/path.patch new file mode 100644 index 000000000000..4e05b7a8dff3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dot2tex/path.patch @@ -0,0 +1,104 @@ +diff --git a/dot2tex/dotparsing.py b/dot2tex/dotparsing.py +index 391b5dc..6dc77a3 100644 +--- a/dot2tex/dotparsing.py ++++ b/dot2tex/dotparsing.py +@@ -180,18 +180,8 @@ def __find_executables(path): + def find_graphviz(): + """Locate Graphviz's executables in the system. + +- Tries three methods: +- +- First: Windows Registry (Windows only) +- This requires Mark Hammond's pywin32 is installed. +- +- Secondly: Search the path +- It will look for 'dot', 'twopi' and 'neato' in all the directories +- specified in the PATH environment variable. +- +- Thirdly: Default install location (Windows only) +- It will look for 'dot', 'twopi' and 'neato' in the default install +- location under the "Program Files" directory. ++ It will look for 'dot', 'twopi' and 'neato' in ++ @graphviz@/bin. + + It will return a dictionary containing the program names as keys + and their paths as values. +@@ -199,75 +189,9 @@ def find_graphviz(): + If this fails, it returns None. + """ + +- # Method 1 (Windows only) +- # +- if os.sys.platform == 'win32': +- try: +- import win32api, win32con +- +- # Get the GraphViz install path from the registry +- # +- hkey = win32api.RegOpenKeyEx(win32con.HKEY_LOCAL_MACHINE, +- "SOFTWARE\AT&T Research Labs\Graphviz", 0, win32con.KEY_QUERY_VALUE) +- +- path = win32api.RegQueryValueEx(hkey, "InstallPath")[0] +- win32api.RegCloseKey(hkey) +- +- # Now append the "bin" subdirectory: +- # +- path = os.path.join(path, "bin") +- progs = __find_executables(path) +- if progs is not None: +- # print("Used Windows registry") +- return progs +- +- except ImportError: +- # Print a messaged suggesting they install these? +- # +- log.debug('The win32api is not installed') +- pass +- except: +- log.debug('Failed to access the registry key') +- +- # Method 2 (Linux, Windows etc) +- # +- if 'PATH' in os.environ: +- for path in os.environ['PATH'].split(os.pathsep): +- progs = __find_executables(path) +- if progs is not None: +- return progs +- +- # Method 3 (Windows only) +- # +- if os.sys.platform == 'win32': +- # Try and work out the equivalent of "C:\Program Files" on this +- # machine (might be on drive D:, or in a different language) +- # +- if 'PROGRAMFILES' in os.environ: +- # Note, we could also use the win32api to get this +- # information, but win32api may not be installed. +- +- path = os.path.join(os.environ['PROGRAMFILES'], 'ATT', 'GraphViz', 'bin') +- +- else: +- # Just in case, try the default... +- path = r"C:\Program Files\att\Graphviz\bin" +- +- progs = __find_executables(path) +- +- if progs is not None: +- # print("Used default install location") +- return progs +- +- for path in ( +- '/usr/bin', '/usr/local/bin', +- '/opt/local/bin', +- '/opt/bin', '/sw/bin', '/usr/share', +- '/Applications/Graphviz.app/Contents/MacOS/'): +- progs = __find_executables(path) +- if progs is not None: +- # print("Used path") +- return progs ++ progs = __find_executables('@graphviz@/bin') ++ if progs is not None: ++ return progs + + # Failed to find GraphViz + # diff --git a/nixpkgs/pkgs/development/python-modules/dot2tex/test.patch b/nixpkgs/pkgs/development/python-modules/dot2tex/test.patch new file mode 100644 index 000000000000..9ead8ac5ee5c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dot2tex/test.patch @@ -0,0 +1,12 @@ +diff --git a/tests/test_dot2tex.py b/tests/test_dot2tex.py +index 74b01ed..7be9aba 100644 +--- a/tests/test_dot2tex.py ++++ b/tests/test_dot2tex.py +@@ -147,6 +147,7 @@ class NeedsQuotesTests(unittest.TestCase): + + class MultipleStatements(unittest.TestCase): + # https://github.com/kjellmf/dot2tex/issues/5 ++ @unittest.skip('fails upstream') + def test_semicolon(self): + """Test for issue 5""" + testgraph1 = """ diff --git a/nixpkgs/pkgs/development/python-modules/duecredit/default.nix b/nixpkgs/pkgs/development/python-modules/duecredit/default.nix new file mode 100644 index 000000000000..28aaf8ee47c9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/duecredit/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, contextlib2 +, pytest +, pytestCheckHook +, vcrpy +, citeproc-py +, requests +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "duecredit"; + version = "0.8.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1yxd8579pakrfhq0hls0iy37nxllsm8y33na220g08znibrp7ix0"; + }; + + # bin/duecredit requires setuptools at runtime + propagatedBuildInputs = [ citeproc-py requests setuptools six ]; + + checkInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; + disabledTests = [ "test_io" ]; + + meta = with lib; { + homepage = "https://github.com/duecredit/duecredit"; + description = "Simple framework to embed references in code"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 712766fa58e2..68d658f4989e 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "7.2.0"; + version = "7.2.1"; src = fetchPypi { inherit pname version; - sha256 = "19q91srlcvfrk5rnk18c0mzvki9l893g7rqgymfg0p8abb9c05a0"; + sha256 = "1e345535164cb684de4b825e1d0daf81b75554b30d3905446584a9e4af0cc3e7"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index 821a890346fc..b04bc9069f71 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.7.0"; + version = "7.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1fm6lalyiy4ayj0mp400dvy629j2av5cqww72w4cg8bqifb83pim"; + sha256 = "9bfcb2bd137d6d7ca123e252b9d7261cfe4f7723f7b749a99c52b47766cf387c"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/nixpkgs/pkgs/development/python-modules/eve/default.nix b/nixpkgs/pkgs/development/python-modules/eve/default.nix index 7a74de03d522..062d6e3bedb8 100644 --- a/nixpkgs/pkgs/development/python-modules/eve/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eve/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Eve"; - version = "1.1"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1a7i7x77p5wjqfzmgn30m9sz2mcz06k4qf5af6a45109lafcq0bv"; + sha256 = "dbb409c481ffd5100a5ab13177f6ef6284257e33ac8e5090cd50e42533607ebd"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix b/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix new file mode 100644 index 000000000000..fb85408dd3d2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, six, pytest }: + +buildPythonPackage rec { + pname = "fake-useragent"; + version = "0.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Up to date simple useragent faker with real world database"; + homepage = "https://github.com/hellysmile/fake-useragent"; + license = licenses.asl20; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix b/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix index ae7dc43020b5..51b0060cb2d6 100644 --- a/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , substituteAll -, ffmpeg +, ffmpeg_3 , future , pytest , pytestrunner @@ -24,7 +24,7 @@ buildPythonPackage rec { ( substituteAll { src = ./ffmpeg-location.patch; - inherit ffmpeg; + ffmpeg = ffmpeg_3; } ) ]; diff --git a/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix b/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix index 48a80f097712..26b6977116fd 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix @@ -1,9 +1,11 @@ -{ stdenv +{ lib , buildPythonPackage +, pythonOlder , fetchPypi , flask , flask-silk , future +, pathlib }: buildPythonPackage rec { @@ -19,9 +21,11 @@ buildPythonPackage rec { flask flask-silk future + ] ++ lib.optionals (pythonOlder "3.4") [ + pathlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The mod_autoindex for Flask"; longDescription = '' Flask-AutoIndex generates an index page for your Flask application automatically. diff --git a/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 2453bb50766d..594af9f74bf4 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.4.1"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "6974785d913666587949f7c2946f7001e4fa2cb2d19f4e69ead02e4b8f50b33d"; + sha256 = "0b656fbf87c5f24109d859bafa791d29751fabbda2302b606881ae5485b557a5"; }; propagatedBuildInputs = [ flask sqlalchemy ]; diff --git a/nixpkgs/pkgs/development/python-modules/flower/default.nix b/nixpkgs/pkgs/development/python-modules/flower/default.nix index 2b5781341742..3a2f987ed510 100644 --- a/nixpkgs/pkgs/development/python-modules/flower/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flower/default.nix @@ -1,22 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, Babel, celery, importlib-metadata, pytz, tornado, mock }: +{ lib +, buildPythonPackage +, fetchPypi +, Babel +, celery +, future +, humanize +, importlib-metadata +, mock +, pytz +, tornado +}: buildPythonPackage rec { pname = "flower"; version = "0.9.4"; - + src = fetchPypi { inherit pname version; sha256 = "25782840f7ffc25dcf478d94535a2d815448de4aa6c71426be6abfa9ca417448"; }; - propagatedBuildInputs = [ Babel celery importlib-metadata pytz tornado ]; - + # flower and humanize aren't listed in setup.py but imported + propagatedBuildInputs = [ + Babel + celery + future + importlib-metadata + pytz + tornado + humanize + ]; + checkInputs = [ mock ]; - + meta = with lib; { description = "Celery Flower"; homepage = "https://github.com/mher/flower"; - license = licenses.bsdOriginal; + license = licenses.bsdOriginal; maintainers = [ maintainers.arnoldfarkas ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index e4fbb37c966e..892b373f065c 100644 --- a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.8.0"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0kqxm9imqjbhjj5imvf2kl57di454xmnnsr3i0cs66ibq90nx5m8"; + sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9"; }; propagatedBuildInputs = [ sqlalchemy shapely ]; diff --git a/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix b/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix index 634d7c2ddc04..a9214cf49f70 100644 --- a/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix @@ -11,22 +11,26 @@ , tornado , aiohttp , uritemplate +, pyjwt }: buildPythonPackage rec { pname = "gidgethub"; - version = "3.2.0"; + version = "4.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8f4b69063a256994d38243cc0eba4e1453017b5b8b04a173216d02d47ffc3989"; + sha256 = "13nzc40c71kxvjxahgnc6c974xp5fpm02gqymwgfjbj2dmlzmayg"; }; nativeBuildInputs = [ setuptools pytestrunner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; - propagatedBuildInputs = [ uritemplate ]; + propagatedBuildInputs = [ + uritemplate + pyjwt + ]; postPatch = '' substituteInPlace setup.py \ diff --git a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 12668e979d2d..c70496b2b9fa 100644 --- a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.8.4"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "06csvbpdv3kl806nqvh5hpag86wpafp1q9r07m7kc1fw3xhi5qmv"; + sha256 = "0nfqf62g3l7ij779ind41p800ahdjijkhqx8nq6y029p98672c52"; }; # No tests included in archive diff --git a/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix b/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix index f3209c2d5203..1efec99d8f72 100644 --- a/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix @@ -1,14 +1,16 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 -, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio, mock }: +, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio +, mock +}: buildPythonPackage rec { pname = "google-api-core"; - version = "1.16.0"; + version = "1.17.0"; disabled = isPy27; # google namespace no longer works on python2 src = fetchPypi { inherit pname version; - sha256 = "1qh30ji399gngv2j1czzvi3h0mgx3lfdx2n8qp8vii7ihyh65scj"; + sha256 = "12fn05x2fdhqmcaspjkkny2lh66hnnl0xf6pz3idxhlx8w5jl274"; }; propagatedBuildInputs = [ @@ -27,8 +29,13 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients."; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + description = "Core Library for Google Client Libraries"; + longDescription = '' + This library is not meant to stand-alone. Instead it defines common + helpers used by all Google API clients. + ''; + homepage = "https://github.com/googleapis/python-api-core"; + changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/google_auth/default.nix b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix index d8c6a12aeaaf..92369abec6d3 100644 --- a/nixpkgs/pkgs/development/python-modules/google_auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_auth/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.11.3"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "05av4clwv7kdk1v55ibcv8aim6dwfg1mi4wy0vv91fr6wq3205zc"; + sha256 = "1xd7fi7vhqbbkvwjg5fgj8bkbfjwxx4f2bb0zsnj8wci46qk4dqv"; }; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; @@ -43,8 +43,14 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "This library simplifies using Google’s various server-to-server authentication mechanisms to access Google APIs."; - homepage = "https://google-auth.readthedocs.io/en/latest/"; + description = "Google Auth Python Library"; + longDescription = '' + This library simplifies using Google’s various server-to-server + authentication mechanisms to access Google APIs. + ''; + homepage = "https://github.com/googleapis/google-auth-library-python"; + changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; + # Documentation: https://googleapis.dev/python/google-auth/latest/index.html license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index d1d4217b3ccc..84fac88bcfa9 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.30.1"; + version = "0.30.2"; src = fetchPypi { inherit pname version; - sha256 = "03n9ahf4qiyamblh217m5bjc8n57gh09xz87l2iw84c81xxdfcpg"; + sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix b/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix index e9c7eecbc3a7..40c8f2596bb1 100644 --- a/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "2a8fd188afe1cbfd5998bf20602f76b0336aa892de88fe842a806b9a3ed78d2a"; + sha256 = "97155236971970382b738921f978a6f86a7b5a0b0311703d991e065d3cb55773"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/greenlet/default.nix b/nixpkgs/pkgs/development/python-modules/greenlet/default.nix index f6cff7411d21..c325c9652491 100644 --- a/nixpkgs/pkgs/development/python-modules/greenlet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/greenlet/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "0.4.15"; + version = "0.4.16"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "9416443e219356e3c31f1f918a91badf2e37acf297e2fa13d24d1cc2380f8fbc"; + sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c"; }; propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix index 11080d3fbc84..00d05e189126 100644 --- a/nixpkgs/pkgs/development/python-modules/gst-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - sha256 = "II3zFI1z2fQW0BZWRzdYXY6nY9kSAXMtRLX+aIxiiKg="; + sha256 = "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390"; }; nativeBuildInputs = [ @@ -45,6 +45,13 @@ buildPythonPackage rec { url = "https://github.com/GStreamer/gst-python/commit/f98c206bdf01529f8ea395a719b10baf2bdf717f.patch"; sha256 = "04n4zrnfivgr7iaqw4sjlbd882s8halc2bbbhfxqf0sg2lqwmrxg"; }) + ] ++ [ + # Fix linking against Python 3.8 + # https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/30 + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-python/commit/22f28155d86e27c4134de4ed2861264003fcfd23.patch"; + sha256 = "Y70qVguHUBmmRVMFBKAP0d6anBQw5W0TKyu2bAwxbQg="; + }) ]; mesonFlags = [ diff --git a/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix b/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix index d6438c6a5b8b..cf119c1dec56 100644 --- a/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k -, ffmpeg, async-timeout }: +, ffmpeg_3, async-timeout }: buildPythonPackage rec { pname = "ha-ffmpeg"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "230f2fa990c9caaff1c67c2227b64756062248083849651a9bec7d599e519a42"; }; - buildInputs = [ ffmpeg ]; + buildInputs = [ ffmpeg_3 ]; propagatedBuildInputs = [ async-timeout ]; diff --git a/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix b/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix index 28fa42b70f04..d12d3bc8c832 100644 --- a/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hsaudiotag3k/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "hsaudiotag3k"; - version = "1.1.3"; + version = "1.1.3.post1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0bv5k5594byr2bmhh77xv10fkdpckcmxg3w380yp30aqf83rcsx3"; + sha256 = "ef60e9210d4727e82f0095a686cb07b676d055918f0c59c5bfa8598da03e59d1"; }; # no tests diff --git a/nixpkgs/pkgs/development/python-modules/httplib2/default.nix b/nixpkgs/pkgs/development/python-modules/httplib2/default.nix index f0191ad8226c..5495c806dc0f 100644 --- a/nixpkgs/pkgs/development/python-modules/httplib2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.17.3"; + version = "0.17.4"; src = fetchPypi { inherit pname version; - sha256 = "39dd15a333f67bfb70798faa9de8a6e99c819da6ad82b77f9a259a5c7b1225a2"; + sha256 = "1e9340ecf0187a621bdcfb407c32e04e8e09fc6ab28b050efa38f20eae0e975f"; }; # Needs setting up diff --git a/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/nixpkgs/pkgs/development/python-modules/hvac/default.nix index a783246ee5c3..d68e12b37732 100644 --- a/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.1"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "1fcd2psvkfsqy45iygm59rzhb7qkbgv3c1dk3x3jvhy6a1ls4kkq"; + sha256 = "391b558a465d1919a2862926ab9a7c6bef1f2ac2c46daf8dd5115080c42978e4"; }; propagatedBuildInputs = [ requests six ]; diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix index 19ad7317ce41..9f78298a3f3a 100644 --- a/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.16"; + version = "1.4.19"; src = fetchPypi { inherit pname version; - sha256 = "19zk3qmcf0afbcbfnj7cmmgr47pxhjqwa1bfdc3fp60yy10kvbgr"; + sha256 = "249ebc7e2066d6393d27c1b1be3b70433f824a120b1d8274d362f1eb419e3b52"; }; # Tests not included in PyPI tarball diff --git a/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/nixpkgs/pkgs/development/python-modules/imageio/default.nix index 5433e1ea9e41..ebb7f86f5afb 100644 --- a/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -8,7 +8,7 @@ , pytest , numpy , isPy3k -, ffmpeg +, ffmpeg_3 , futures , enum34 }: @@ -23,7 +23,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ - imageio-ffmpeg ffmpeg + imageio-ffmpeg ffmpeg_3 ]; propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ futures diff --git a/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix b/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix index ce265d013785..4a1543083432 100644 --- a/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ html5lib ]; - propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg pkgs.swftools pkgs.rtmpdump ]; + propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ]; meta = with stdenv.lib; { description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; diff --git a/nixpkgs/pkgs/development/python-modules/ipython/7.9.nix b/nixpkgs/pkgs/development/python-modules/ipython/7.9.nix index 4c8086def330..9953868df5f3 100644 --- a/nixpkgs/pkgs/development/python-modules/ipython/7.9.nix +++ b/nixpkgs/pkgs/development/python-modules/ipython/7.9.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "IPython: Productive Interactive Computing"; homepage = "http://ipython.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor fridh ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/nixpkgs/pkgs/development/python-modules/ipython/default.nix index 69fe73eb3423..692daa7b2f38 100644 --- a/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.14.0"; + version = "7.15.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f0126781d0f959da852fb3089e170ed807388e986a8dd4e6ac44855845b0fb1c"; + sha256 = "0ef1433879816a960cd3ae1ae1dc82c64732ca75cec8dab5a4e29783fb571d0e"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix index 11ae3157615a..2c454fd9ce0c 100644 --- a/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.1"; + version = "3.10.3"; src = fetchPypi { inherit pname version; - sha256 = "1ky5ynb8p580y2x3vpib6yrvdjgjb0wpqmdfnq5pqi3qzjyzsqra"; + sha256 = "2295c01465fe19776b1f9432fd99fd24e61230d146ded2752e0d980ef6f4101f"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/iterm2/default.nix b/nixpkgs/pkgs/development/python-modules/iterm2/default.nix new file mode 100644 index 000000000000..33504323802a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/iterm2/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, protobuf +, websockets +}: + +buildPythonPackage rec { + pname = "iterm2"; + version = "1.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "089pln3c41n6dyh91hw9gy6mpm9s663lpmdc4gamig3g6pfmbsk4"; + }; + + propagatedBuildInputs = [ protobuf websockets ]; + + # The tests require pyobjc. We can't use pyobjc because at + # time of writing the pyobjc derivation is disabled on python 3. + # iterm2 won't build on python 2 because it depends on websockets + # which is disabled below python 3.3. + doCheck = false; + + pythonImportsCheck = [ "iterm2" ]; + + meta = with lib; { + description = "Python interface to iTerm2's scripting API"; + homepage = "http://github.com/gnachman/iTerm2"; + license = licenses.gpl2; + maintainers = with maintainers; [ jeremyschlatter ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jc/default.nix b/nixpkgs/pkgs/development/python-modules/jc/default.nix index 7293846178c9..e48fec89b9d7 100644 --- a/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.11.1"; + version = "1.11.6"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "0qackvhs35npgnga5riclnwqdwasc0kba48pwnrfxf0hm2i0kbgp"; + sha256 = "0jyygq7zmam7yriiv5j4d6mpjdi2p3p7d53bn3qwfzkh4ifsbfan"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix new file mode 100644 index 000000000000..9f2143e2f20d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nbformat +, sphinx +, ipywidgets +, pythonOlder +}: + +buildPythonPackage rec { + pname = "jupyter-sphinx"; + version = "0.2.4"; + + src = fetchPypi { + inherit version; + pname = "jupyter_sphinx"; + sha256 = "b5ba1efdd1488b385de0068036a665932ed93998e40ce3a342c60f0926781fd9"; + }; + + propagatedBuildInputs = [ nbformat sphinx ipywidgets ]; + + doCheck = false; + + disabled = pythonOlder "3.5"; + + meta = with lib; { + description = "Jupyter Sphinx Extensions"; + homepage = "https://github.com/jupyter/jupyter-sphinx/"; + license = licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix b/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix index 4855663ebc7d..8ce8150cbd47 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Jupyter protocol implementation and client libraries"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index a8057ed06ae5..8d08fec6f5d9 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.1.2"; + version = "2.1.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "380c29d674f6dcf8e380615334c7813bb4feb7bbb6222baf1d4c9f8318f4b104"; + sha256 = "7b5bd4a05330a01c8522ee7f1cda5cb2e0d96412d9e1e879a19b3afb63d4ac69"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index cd166b2d801e..9185c2940060 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "1.1.3"; + version = "1.1.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "17eac20af10167abebbeca72e7e390b9c19a400b8fffa158b5cfdcac344253d4"; + sha256 = "3398e401b95da868bc96bdaa44fa61252bf3e68fc9dd1645bd93293cce095f6c"; }; checkInputs = [ requests pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix b/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix index cb4b6d249b60..d62a179136f4 100644 --- a/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Preprocessing"; - version = "1.1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1r98nm4k1svsqjyaqkfk23i31bl1kcfcyp7094yyj3c43phfp3as"; + sha256 = "add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/nixpkgs/pkgs/development/python-modules/kombu/default.nix index 437f03276708..27d225c6f7cf 100644 --- a/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.6.8"; + version = "4.6.10"; src = fetchPypi { inherit pname version; - sha256 = "0xlv1rsfc3vn22l35csaj939zygd15nzmxbz3bcl981685vxl71d"; + sha256 = "437b9cdea193cc2ed0b8044c85fd0f126bb3615ca2f4d4a35b39de7cacfa3c1a"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/libevdev/default.nix b/nixpkgs/pkgs/development/python-modules/libevdev/default.nix new file mode 100644 index 000000000000..ab00340cfe19 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/libevdev/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, isPy27, fetchPypi }: + +buildPythonPackage rec { + pname = "libevdev"; + version = "0.7"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "10gwj08kn2rs4waq7807mq34cbavgkpg8fpir8mvnba601b8q4r4"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python wrapper around the libevdev C library"; + homepage = "https://gitlab.freedesktop.org/libevdev/python-libevdev"; + license = licenses.mit; + maintainers = with maintainers; [ nickhu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index ff4f6198aa5e..aca4bf35434b 100644 --- a/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -19,14 +19,14 @@ }: buildPythonPackage rec { - pname = "nio"; - version = "0.10.0"; + pname = "matrix-nio"; + version = "0.12.0"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "04ryf9lrm0820hqij46hav6mgplabnyl9dfj46iwvxasn06fh2j8"; + sha256 = "1d4jhl2xjjp31yjs4zz2cfkvzbi2vr5bsrp07s6nhyc18azxr7ba"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index a9310af1432f..362e34157676 100644 --- a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.4.2"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "0f8pzi7ip82p7hn6d9xrgp5wsl4s3w6gmjsgb8gjy2606f7czqyg"; + sha256 = "0csvk3y0y2r9gnfqj91fiqprgp8dxiv4n80b6myraab5s7zn1mvv"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/meinheld/default.nix b/nixpkgs/pkgs/development/python-modules/meinheld/default.nix index 247523a9a830..2941505184de 100644 --- a/nixpkgs/pkgs/development/python-modules/meinheld/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meinheld/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "meinheld"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "447de7189e4dc9c1f425aa1b9c8210aab492fda4d86f73a24059264e7d8b0134"; + sha256 = "008c76937ac2117cc69e032dc69cea9f85fc605de9bac1417f447c41c16a56d6"; }; propagatedBuildInputs = [ greenlet ]; diff --git a/nixpkgs/pkgs/development/python-modules/minio/default.nix b/nixpkgs/pkgs/development/python-modules/minio/default.nix index f1255f3636c8..6fdc962cdb46 100644 --- a/nixpkgs/pkgs/development/python-modules/minio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -1,19 +1,34 @@ { lib, buildPythonPackage, isPy3k, fetchPypi -, urllib3, future, python-dateutil , pytz, faker, mock, nose }: +, configparser +, faker +, future +, mock +, nose +, python-dateutil +, pytz +, pytestCheckHook +, urllib3 +}: buildPythonPackage rec { pname = "minio"; version = "5.0.10"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; sha256 = "6ecb7637a35f806733e9d112eacfa599a58d7c3d4698fda2b5c86fff5d34b417"; }; - disabled = !isPy3k; + propagatedBuildInputs = [ + configparser + future + python-dateutil + pytz + urllib3 + ]; - checkInputs = [ faker mock nose ]; - propagatedBuildInputs = [ urllib3 python-dateutil pytz future ]; + checkInputs = [ faker mock nose pytestCheckHook ]; meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; diff --git a/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix index d646c1ed15f2..9be30fff5383 100644 --- a/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.5"; + version = "0.4.6.post0"; src = fetchPypi { inherit pname version; - sha256 = "0z3ls52iamqv6fbn1ljnd5nnnzaiakczciry5c3vym5r77wgc9mg"; + sha256 = "dfcb0c9cb5850e656344ac464a260e7b8b9b1c62d77c2e1d3d9ef15a88f1df6b"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/multidict/default.nix b/nixpkgs/pkgs/development/python-modules/multidict/default.nix index 155395efa4ad..d818a63cd5d0 100644 --- a/nixpkgs/pkgs/development/python-modules/multidict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/multidict/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "multidict"; - version = "4.7.5"; + version = "4.7.6"; src = fetchPypi { inherit pname version; - sha256 = "aee283c49601fa4c13adc64c09c978838a7e812f85377ae130a24d7198c0331e"; + sha256 = "fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430"; }; checkInputs = [ pytest pytestrunner pytestcov ]; diff --git a/nixpkgs/pkgs/development/python-modules/nbformat/2.nix b/nixpkgs/pkgs/development/python-modules/nbformat/2.nix index faf2cee2b008..06d02520b20d 100644 --- a/nixpkgs/pkgs/development/python-modules/nbformat/2.nix +++ b/nixpkgs/pkgs/development/python-modules/nbformat/2.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "The Jupyter Notebook format"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh globin ]; + maintainers = with lib.maintainers; [ globin ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix b/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix index 17e4669b6bed..56387835cc6e 100644 --- a/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,13 +9,17 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "2.3.2"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "18xj618zjs13ib7f996fnl0xiqig0w48yns45nvy3xab55wximdx"; + sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E="; }; + # The tests for this package require nix and network access. That's + # why we cannot execute them inside the building process. + doCheck = false; + propagatedBuildInputs = [ attrs click diff --git a/nixpkgs/pkgs/development/python-modules/notebook/2.nix b/nixpkgs/pkgs/development/python-modules/notebook/2.nix index 8b8cce2f8245..37f39c44967c 100644 --- a/nixpkgs/pkgs/development/python-modules/notebook/2.nix +++ b/nixpkgs/pkgs/development/python-modules/notebook/2.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 62a871fda092..0c9bac973203 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -35,13 +35,13 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.18.4"; + version = "1.18.5"; format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bbcc85aaf4cd84ba057decaead058f43191cc0e30d6bc5d44fe336dc3d3f4509"; + sha256 = "34e96e9dae65c4839bd80012023aadd6ee2ccb73ce7fdf3074c62f301e63120b"; }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/owslib/default.nix b/nixpkgs/pkgs/development/python-modules/owslib/default.nix index e5dea71c8fd8..b19e41116f02 100644 --- a/nixpkgs/pkgs/development/python-modules/owslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/owslib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest } : +{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; version = "0.19.2"; @@ -9,7 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ dateutil pyproj pytz requests ]; + propagatedBuildInputs = [ dateutil pyproj pytz requests pyyaml ]; # 'tests' dir not included in pypy distribution archive. doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix index 0f4a35420865..5d7bb4a6d696 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "11j5s6hz29yh3rwa2rjgric0knbhp9shphd4i7hx00xr5wr2xx1j"; + sha256 = "b35d625282baa7b51e82e52622c300a1ca9f786711b2af7cbe64f1e6831f4126"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; diff --git a/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix b/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix index 5b87593e0c67..f688d97c91d1 100644 --- a/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix @@ -3,7 +3,7 @@ , fetchPypi }: -buildPythonPackage rec{ +buildPythonPackage rec { version = "1.4.2"; pname = "pandocfilters"; diff --git a/nixpkgs/pkgs/development/python-modules/papis/default.nix b/nixpkgs/pkgs/development/python-modules/papis/default.nix index 39b324dd55c3..fbfb72bb8a09 100644 --- a/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "papis"; repo = pname; rev = "v${version}"; - sha256 = "kzA8nlglbjHDPEB7HRAY2dza1Umn/OYUu+ydbA1OJ5Y="; + sha256 = "15i79q6nr7gcpcafdz5797axmp6r3081sys07k1k2vi5b2g3qc4k"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/parsy/default.nix b/nixpkgs/pkgs/development/python-modules/parsy/default.nix index 156da0885473..ab4aeba84b69 100644 --- a/nixpkgs/pkgs/development/python-modules/parsy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parsy/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-parsy/parsy"; description = "Easy-to-use parser combinators, for parsing in pure Python"; license = [ licenses.mit ]; - maintainers = with maintainers; [ aepsil0n ]; + maintainers = with maintainers; [ edibopp ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/periodictable/default.nix b/nixpkgs/pkgs/development/python-modules/periodictable/default.nix index e35362326805..acbfc06850e4 100644 --- a/nixpkgs/pkgs/development/python-modules/periodictable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/periodictable/default.nix @@ -1,6 +1,6 @@ {lib, fetchPypi, buildPythonPackage, numpy, pyparsing}: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "periodictable"; version = "1.5.2"; diff --git a/nixpkgs/pkgs/development/python-modules/phik/default.nix b/nixpkgs/pkgs/development/python-modules/phik/default.nix index e09182d5e714..ca1b5ba65da7 100644 --- a/nixpkgs/pkgs/development/python-modules/phik/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phik/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "phik"; - version = "0.9.11"; + version = "0.9.12"; format = "wheel"; disabled = !isPy3k; src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "b8c36dc50265d8c0626b34e3bc74cd0edd342d9d8ecc3d78c06817200bb31d10"; + sha256 = "c4f86e5587e5b456e69bf69d95d07fe7aafc341c40f8f3a21dd5b52272e9ae7b"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 47a60acaa0af..2ba64faad31e 100644 --- a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.4"; + version = "8.12.5"; src = fetchPypi { inherit pname version; - sha256 = "021dc6kdzqh9kkrsbs08x3ibmfm4xr9hqvdnsji6l0knw1zrkia6"; + sha256 = "3586f19abeb92aa6b539d7a4757cb507cf54efcd78224e895caf20fbdde07c26"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/piccata/default.nix b/nixpkgs/pkgs/development/python-modules/piccata/default.nix index f1cfb362a80c..bbb4fcf19934 100644 --- a/nixpkgs/pkgs/development/python-modules/piccata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/piccata/default.nix @@ -1,16 +1,22 @@ -{ buildPythonPackage, fetchPypi, lib, ipaddress, isPy3k }: +{ buildPythonPackage, isPy27, fetchFromGitHub, lib, ipaddress }: buildPythonPackage rec { pname = "piccata"; - version = "1.0.1"; - disabled = isPy3k; + version = "2.0.0"; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "45f6c98c2ea809d445040888117f99bc3ee843490d86fecc5805ff5ea41508f7"; + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = pname; + rev = version; + sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr"; }; - propagatedBuildInputs = [ ipaddress ]; + propagatedBuildInputs = [ + ipaddress + ]; + + pythonImportsCheck = [ "piccata" ]; meta = { description = "Simple CoAP (RFC7252) toolkit"; diff --git a/nixpkgs/pkgs/development/python-modules/pillow/6.nix b/nixpkgs/pkgs/development/python-modules/pillow/6.nix new file mode 100644 index 000000000000..ad69f4f23450 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pillow/6.nix @@ -0,0 +1,82 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy +, olefile +, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, openjpeg, libimagequant +, pytest, pytestrunner, pyroma, numpy +}: + +buildPythonPackage rec { + pname = "Pillow"; + version = "6.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv"; + }; + + # Disable imagefont tests, because they don't work well with infinality: + # https://github.com/python-pillow/Pillow/issues/1259 + postPatch = '' + rm Tests/test_imagefont.py + ''; + + checkPhase = '' + runHook preCheck + python -m pytest -v -x -W always + runHook postCheck + ''; + + propagatedBuildInputs = [ olefile ]; + + checkInputs = [ pytest pytestrunner pyroma numpy ]; + + buildInputs = [ + freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] + ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; + + # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. + # NOTE: The Pillow install script will, by default, add paths like /usr/lib + # and /usr/include to the search paths. This can break things when building + # on a non-NixOS system that has some libraries installed that are not + # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't + # build Pillow with this support). We patch the `disable_platform_guessing` + # setting here, instead of passing the `--disable-platform-guessing` + # command-line option, since the command-line option doesn't work when we run + # tests. + preConfigure = let + libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; + s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; + s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' + export LDFLAGS="-L${libwebp}/lib" + export CFLAGS="-I${libwebp}/include" + '' + # Remove impurities + + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py \ + --replace '"/Library/Frameworks",' "" \ + --replace '"/System/Library/Frameworks"' "" + ''; + + meta = with stdenv.lib; { + homepage = "https://python-pillow.github.io/"; + description = "Fork of The Python Imaging Library (PIL)"; + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + license = "http://www.pythonware.com/products/pil/license.htm"; + maintainers = with maintainers; [ goibhniu prikhi ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index 4e8a47569b7e..cc9a77be7827 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -1,32 +1,37 @@ { stdenv, buildPythonPackage, fetchPypi, isPyPy , olefile , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, pytestrunner -, pytest +, openjpeg, libimagequant +, pyroma, numpy, pytestCheckHook +, isPy3k }: + buildPythonPackage rec { pname = "Pillow"; - version = "6.2.2"; + version = "7.1.2"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950"; + sha256 = "1pdh1zzdwxilvsjg6rnl4q810pc2p2y16q6lx9gzzihb25h9kd50"; }; - doCheck = !stdenv.isDarwin && !isPyPy; - # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 postPatch = '' rm Tests/test_imagefont.py ''; + # Disable darwin tests which require executables: `iconutil` and `screencapture` + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ]; + propagatedBuildInputs = [ olefile ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytestCheckHook pyroma numpy ]; buildInputs = [ - freetype libjpeg zlib libtiff libwebp tcl lcms2 ] + freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. @@ -45,6 +50,8 @@ buildPythonPackage rec { sed -i "setup.py" \ -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; + s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; @@ -61,8 +68,8 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = "https://python-pillow.github.io/"; - description = "Fork of The Python Imaging Library (PIL)"; + homepage = "https://python-pillow.org/"; + description = "The friendly PIL fork (Python Imaging Library)"; longDescription = '' The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library diff --git a/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix b/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix index 2e6fb7c47058..05f13e8878a3 100644 --- a/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix @@ -4,7 +4,13 @@ buildPythonPackage rec { pname = "pkgconfig"; version = "1.5.1"; - setupHook = pkgconfig.setupHook; + inherit (pkgconfig) + setupHooks + wrapperName + suffixSalt + targetPrefix + baseBinName + ; src = fetchPypi { inherit pname version; @@ -21,7 +27,7 @@ buildPythonPackage rec { patches = [ ./executable.patch ]; postPatch = '' - substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/pkg-config"' + substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"' ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/playsound/default.nix b/nixpkgs/pkgs/development/python-modules/playsound/default.nix new file mode 100644 index 000000000000..589a8f3db819 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/playsound/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "playsound"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "TaylorSMarks"; + repo = "playsound"; + rev = "907f1fe73375a2156f7e0900c4b42c0a60fa1d00"; + sha256 = "1fh3m115h0c57lj2pfhhqhmsh5awzblb7csi1xc5a6f6slhl059k"; + }; + + doCheck = false; + + pythonImportsCheck = [ "playsound" ]; + + meta = with lib; { + homepage = "https://github.com/TaylorSMarks/playsound"; + description = "Pure Python, cross platform, single function module with no dependencies for playing sounds"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ luc65r ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix index 6d0a7d301ede..a933093bef42 100644 --- a/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix @@ -6,6 +6,7 @@ , identify , importlib-metadata , importlib-resources +, isPy27 , nodeenv , python , six @@ -15,16 +16,18 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "1.21.0"; + version = "2.4.0"; + disabled = isPy27; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "0l5qg1cw4a0670m96s0ryy5mqz5aslfrrnwpriqgmrnsgdixhj4g"; + sha256 = "1l0lcl3l2544m2k8jlmblfsjn0p2hdxrzzwy646xpvp0rcs2wgkh"; }; patches = [ ./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch + ./languages-use-the-hardcoded-path-to-python-binaries.patch ]; propagatedBuildInputs = [ @@ -36,9 +39,8 @@ buildPythonPackage rec { six toml virtualenv - importlib-metadata - ] ++ lib.optional (pythonOlder "3.7") importlib-resources - ++ lib.optional (pythonOlder "3.2") futures; + ] ++ lib.optional (pythonOlder "3.8") importlib-metadata + ++ lib.optional (pythonOlder "3.7") importlib-resources; # slow and impure doCheck = false; @@ -46,6 +48,10 @@ buildPythonPackage rec { preFixup = '' substituteInPlace $out/${python.sitePackages}/pre_commit/resources/hook-tmpl \ --subst-var-by pre-commit $out + substituteInPlace $out/${python.sitePackages}/pre_commit/languages/python.py \ + --subst-var-by virtualenv ${virtualenv} + substituteInPlace $out/${python.sitePackages}/pre_commit/languages/node.py \ + --subst-var-by nodeenv ${nodeenv} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch b/nixpkgs/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch index 23115bbbd20f..4c1b6421e090 100644 --- a/nixpkgs/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch +++ b/nixpkgs/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch @@ -1,25 +1,15 @@ -From d9e6999e32112602ec276634cb004eda3ca64ec3 Mon Sep 17 00:00:00 2001 -From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com> -Date: Mon, 13 Jan 2020 11:04:58 -0800 -Subject: [PATCH] hook-tmpl: use the hardcoded path to pre-commit, if found - ---- - pre_commit/resources/hook-tmpl | 2 ++ - 1 file changed, 2 insertions(+) - diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl -index 213d16e..3a99211 100755 +index 299144e..6d12543 100755 --- a/pre_commit/resources/hook-tmpl +++ b/pre_commit/resources/hook-tmpl -@@ -107,6 +107,8 @@ def _exe() -> Tuple[str, ...]: - except OSError: - pass - -+ if os.path.isfile('@pre-commit@/bin/pre-commit') and os.access('@pre-commit@/bin/pre-commit', os.X_OK): -+ return ('@pre-commit@/bin/pre-commit', 'run') - if distutils.spawn.find_executable('pre-commit'): - return ('pre-commit', 'run') - --- -2.23.1 +@@ -25,8 +25,8 @@ ARGS.append('--') + ARGS.extend(sys.argv[1:]) + DNE = '`pre-commit` not found. Did you forget to activate your virtualenv?' +-if os.access(INSTALL_PYTHON, os.X_OK): +- CMD = [INSTALL_PYTHON, '-mpre_commit'] ++if os.access('@pre-commit@/bin/pre-commit', os.X_OK): ++ CMD = ['@pre-commit@/bin/pre-commit'] + elif which('pre-commit'): + CMD = ['pre-commit'] + else: diff --git a/nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch new file mode 100644 index 000000000000..c1bead48b345 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch @@ -0,0 +1,26 @@ +diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py +index 26f4919..4885ec1 100644 +--- a/pre_commit/languages/node.py ++++ b/pre_commit/languages/node.py +@@ -82,7 +82,7 @@ def install_environment( + envdir = fr'\\?\{os.path.normpath(envdir)}' + with clean_path_on_failure(envdir): + cmd = [ +- sys.executable, '-mnodeenv', '--prebuilt', '--clean-src', envdir, ++ '@nodeenv@/bin/nodeenv', '--prebuilt', '--clean-src', envdir, + ] + if version != C.DEFAULT: + cmd.extend(['-n', version]) +diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py +index e17376e..0c1d2ab 100644 +--- a/pre_commit/languages/python.py ++++ b/pre_commit/languages/python.py +@@ -204,7 +204,7 @@ def install_environment( + ) -> None: + envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version)) + python = norm_version(version) +- venv_cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python) ++ venv_cmd = ('@virtualenv@/bin/virtualenv', envdir, '-p', python) + install_cmd = ('python', '-mpip', 'install', '.', *additional_dependencies) + + with clean_path_on_failure(envdir): diff --git a/nixpkgs/pkgs/development/python-modules/pulp/default.nix b/nixpkgs/pkgs/development/python-modules/pulp/default.nix index 049d8720f455..ab6fda9d3d45 100644 --- a/nixpkgs/pkgs/development/python-modules/pulp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pulp/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchPypi, buildPythonPackage, pyparsing }: +{ stdenv +, fetchPypi +, buildPythonPackage +, pyparsing +}: buildPythonPackage rec { pname = "PuLP"; - version = "2.0"; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "fb0b0e8073aa82f3459c4241b9625e0ccd26c0838ad8253c6bc67e041901b765"; + sha256 = "06swbi7wygh7y0kxc85q1pdhzk662375d9a5jnahgr76hkwwkybn"; }; propagatedBuildInputs = [ pyparsing ]; # only one test that requires an extra doCheck = false; + pythonImportsCheck = [ "pulp" ]; meta = with stdenv.lib; { homepage = "https://github.com/coin-or/pulp"; diff --git a/nixpkgs/pkgs/development/python-modules/py4j/default.nix b/nixpkgs/pkgs/development/python-modules/py4j/default.nix index cf3a68a64721..db117e04d128 100644 --- a/nixpkgs/pkgs/development/python-modules/py4j/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py4j/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - extension= "zip"; sha256 = "36ec57f43ff8ced260a18aa9a4e46c3500a730cac8860e259cbaa546c2b9db2f"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix index b704e54321b9..74b9f7dfdebe 100644 --- a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "UTbBv5GeEB1OyQGiduhupg5Ygaj/d2PjVvGYQOX/4d0="; + sha256 = "1pg1zzjl167iavin6xzzm20mh3m6dvl7d8h1r571s44yj6zw2dji"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/nixpkgs/pkgs/development/python-modules/pycurl/default.nix index e65ae7a167b3..7531bb8f7bbc 100644 --- a/nixpkgs/pkgs/development/python-modules/pycurl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycurl/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { ]; # skip impure or flakey tests + # See also: + # * https://github.com/NixOS/nixpkgs/issues/77304 checkPhase = '' HOME=$TMPDIR pytest tests -k "not test_ssl_in_static_libs \ and not test_keyfunction \ @@ -44,7 +46,9 @@ buildPythonPackage rec { and not test_libcurl_ssl_nss \ and not test_libcurl_ssl_openssl" \ --ignore=tests/getinfo_test.py \ - --ignore=tests/memory_mgmt_test.py + --ignore=tests/memory_mgmt_test.py \ + --ignore=tests/multi_memory_mgmt_test.py \ + --ignore=tests/multi_timer_test.py ''; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/nixpkgs/pkgs/development/python-modules/pydantic/default.nix index ef33b6fb2bd5..371bfba2f0f9 100644 --- a/nixpkgs/pkgs/development/python-modules/pydantic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydantic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , ujson , email_validator , typing-extensions @@ -22,6 +23,14 @@ buildPythonPackage rec { sha256 = "0fwrx7p6d5vskg9ibganahiz9y9299idvdmzhjw62jy84gn1vrb4"; }; + # fix tests, remove on next version bump + patches = [ + (fetchpatch { + url = "https://github.com/samuelcolvin/pydantic/commit/a5b0e741e585040a0ab8b0be94dd9dc2dd3afcc7.patch"; + sha256 = "0v91ac3dw23rm73370s2ns84vi0xqbfzpvj84zb7xdiicx8fhmf1"; + }) + ]; + propagatedBuildInputs = [ ujson email_validator diff --git a/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix b/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix index 1d2686ec2992..1c82f7c9d630 100644 --- a/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyenchant"; - version = "3.1.0"; + version = "3.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "14is5p40f516plzccwg6yf51zkja38abw46kybzwgyy94phr8i9b"; + sha256 = "ce0915d7acd771fde6e8c2dce8ad0cb0e6f7c4fa8430cc96e3e7134e99aeb12f"; }; propagatedBuildInputs = [ enchant2 ]; diff --git a/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix b/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix index 447fbdfcdc44..b3d1fb3d26df 100644 --- a/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , gdb @@ -19,6 +20,9 @@ buildPythonPackage rec { checkInputs = [ gdb ]; + # tests require gcc for some reason + doCheck = !stdenv.hostPlatform.isDarwin; + postPatch = '' # tries to execute flake8, # which is likely to break on flake8 updates diff --git a/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/nixpkgs/pkgs/development/python-modules/pygobject/3.nix index 2a1b8bcb4105..74606902722a 100644 --- a/nixpkgs/pkgs/development/python-modules/pygobject/3.nix +++ b/nixpkgs/pkgs/development/python-modules/pygobject/3.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hoPS37W6qeUBqaZO66XCwRF+rbeBqxzXqdJVg0r22u8="; + sha256 = "1vysyr586mfjm7biraw1nynpw4f1qajynkm6m40ybadsnpgx50w6"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix b/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix index 5349ea994a44..14bf1cfe7be0 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.66"; + version = "0.1.67"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f046db8406ee8a1aea6f6b05de8a133d3459b990c065c3f66446050e9aad5d79"; + sha256 = "2d18e0059367e9e32d6472023322113fce431bcc72187b4a6eb7402fe5d2794b"; }; # PyPI tarball does not include tests/ directory diff --git a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index 1625b15f2ee9..c91892585d60 100644 --- a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.18"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "0gpcmmcjgwc6x4rn6nm3akiijdkpa9nahsw2x8a0i7z7kzj4firk"; + sha256 = "0de92a8fb65db6e661594cc5865a340a2daac3cb9bb58e030820769ece1343c1"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/pynput/default.nix b/nixpkgs/pkgs/development/python-modules/pynput/default.nix new file mode 100644 index 000000000000..2b83f4c1223b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pynput/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib }: + +buildPythonPackage rec { + pname = "pynput"; + version = "1.6.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "16h4wn7f54rw30jrya7rmqkx3f51pxn8cplid95v880md8yqdhb8"; + }; + + nativeBuildInputs = [ sphinx ]; + + propagatedBuildInputs = [ setuptools-lint xlib ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A library to control and monitor input devices"; + homepage = "https://github.com/moses-palmer/pynput"; + license = licenses.lgpl3; + maintainers = with maintainers; [ nickhu ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index 67e8e5573d7f..427c42545c5a 100644 --- a/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.28"; + version = "0.0.31"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "09852c0bfe07e3529f8665527381f586c7ea3beabcd7291311e679d56459069d"; + sha256 = "03f21d2fb27cd938bd2c47f8582c0737eb7426a0cd59e5a60171fabe5e963e62"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix index 13806781125e..9e570a801f99 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix @@ -1,23 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.5.1"; pname = "pytest-dependency"; src = fetchPypi { inherit pname version; - sha256 = "bda0ef48e6a44c091399b12ab4a7e580d2dd8294c222b301f88d7d57f47ba142"; + sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b"; }; - patches = [ - # Fix tests for pytest>=4.2.0. Remove with the next release - (fetchpatch { - url = "https://github.com/RKrahl/pytest-dependency/commit/089395bf77e629ee789666361ee12395d840252c.patch"; - sha256 = "1nkha2gndrr3mx11kx2ipxhphqd6wr25hvkrfwzyrispqfhgl0wm"; - excludes = [ "doc/src/changelog.rst" ]; - }) - ]; - propagatedBuildInputs = [ pytest ]; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix new file mode 100644 index 000000000000..44a59730146c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pytest +, inflection +, factory_boy +, pytestcache +, pytestcov +, pytestpep8 +, mock +}: + +buildPythonPackage rec { + pname = "pytest-factoryboy"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-factoryboy"; + rev = version; + sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn"; + }; + + propagatedBuildInputs = [ factory_boy inflection pytest ]; + + # The project uses tox, which we can't. So we simply run pytest manually. + checkInputs = [ + mock + pytestCheckHook + pytestcache + pytestcov + pytestpep8 + ]; + pytestFlagsArray = [ "--ignore=docs" ]; + + meta = with stdenv.lib; { + description = "Integration of factory_boy into the pytest runner."; + homepage = "https://pytest-factoryboy.readthedocs.io/en/latest/"; + maintainers = with maintainers; [ winpat ]; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix index af1cbb2add51..a5ed447aceac 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.5"; + version = "1.0.6"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d85efaafbdb9580791cfa8671799dd40d482fc30bd4476c1ca5efd661e751333"; + sha256 = "1b82bb58c88eb1db40524018d3fcfd0424575029703b4e2d8e3ee873f2b17027"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/nixpkgs/pkgs/development/python-modules/pytest/default.nix index 9e0cd88cf0a4..daf43961ea67 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest/default.nix @@ -19,7 +19,7 @@ }: buildPythonPackage rec { - version = "5.4.2"; + version = "5.4.3"; pname = "pytest"; disabled = !isPy3k; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "eb2b5e935f6a019317e455b6da83dd8650ac9ffd2ee73a7b657a30873d67a698"; + sha256 = "7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"; }; checkInputs = [ hypothesis pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix b/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix index e33aee6c1c91..d8b501d62e5a 100644 --- a/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix @@ -2,7 +2,7 @@ , docutils , lockfile , mock -, pytest +, pytest_4 , testscenarios , twine }: @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ twine ]; propagatedBuildInputs = [ docutils lockfile ]; - checkInputs = [ pytest mock testscenarios ]; + checkInputs = [ pytest_4 mock testscenarios ]; checkPhase = '' pytest -k 'not detaches_process_context \ and not standard_stream_file_descriptors' diff --git a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index 128fb8961d4d..cb3fe1a9f38d 100644 --- a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { description = "Engine.IO server"; homepage = "https://github.com/miguelgrinberg/python-engineio/"; license = licenses.mit; - platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix b/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix index 4c66ed02cfca..e9317d3f7c67 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr"; }; - buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; + nativeBuildInputs = [ setuptools_scm pkgconfig pytestrunner ]; checkInputs = [ pytest pytestcov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix index 5b8c140df67e..a18645697089 100644 --- a/nixpkgs/pkgs/development/python-modules/python-miio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.0.1"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "fa9c318256945ad4a8623fdf921ce81c466a7aea18b04a6711efb662f520b195"; + sha256 = "8d23caf4906f2112dc88b9a6d5e1767877744cae016cd71c2bf75592a4be3b79"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-pam/default.nix b/nixpkgs/pkgs/development/python-modules/python-pam/default.nix new file mode 100644 index 000000000000..4065cd7c0145 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-pam/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pam }: + +buildPythonPackage rec { + pname = "python-pam"; + version = "1.8.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "16whhc0vr7gxsbzvsnq65nq8fs3wwmx755cavm8kkczdkz4djmn8"; + }; + + postPatch = '' + substituteInPlace pam.py --replace 'find_library("pam")' \ + '"${pam}/lib/libpam${stdenv.hostPlatform.extensions.sharedLibrary}"' + ''; + + meta = with stdenv.lib; { + description = "Python PAM module using ctypes"; + homepage = "https://github.com/FirefighterBlu3/python-pam"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pythonmagick/default.nix b/nixpkgs/pkgs/development/python-modules/pythonmagick/default.nix new file mode 100644 index 000000000000..a647fa1005bc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pythonmagick/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchurl +, python +, pkg-config +, imagemagick +, autoreconfHook +, boost +, isPy3k +, pythonImportsCheckHook +}: + +buildPythonPackage rec { + pname = "pythonmagick"; + version = "0.9.16"; + format = "other"; + + src = fetchurl { + url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz"; + sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn"; + }; + + postPatch = '' + rm configure + ''; + + configureFlags = [ "--with-boost=${boost}" ]; + + nativeBuildInputs = [ pkg-config autoreconfHook pythonImportsCheckHook ]; + buildInputs = [ python boost imagemagick ]; + + pythonImportsCheck = [ + "PythonMagick" + ]; + + disabled = isPy3k; + + meta = with lib; { + homepage = "http://www.imagemagick.org/script/api.php"; + license = licenses.imagemagick; + description = "PythonMagick provides object oriented bindings for the ImageMagick Library."; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix index 0027c8d32a63..82ddb8c810b0 100644 --- a/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix @@ -9,6 +9,7 @@ , pkgconfig , dotnetbuildhelpers , clang +, glib , mono }: @@ -63,6 +64,7 @@ buildPythonPackage rec { ]; buildInputs = [ + glib mono psutil # needed for memory leak tests ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index 2318738411f4..80c3c6d72931 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix @@ -104,7 +104,7 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.4.1"; + version = "1.5.0"; pname = "pytorch"; disabled = !isPy3k; @@ -118,7 +118,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1aa1il4f98pswfj20cv27yfb91l1jcq4515i7mvq7sh5647yzwms"; + sha256 = "19qyrjd72mc0llcfn50av8ym05f2iwa38gv068wykji4ph7qjlv2"; }; preConfigure = lib.optionalString cudaSupport '' @@ -128,24 +128,6 @@ in buildPythonPackage rec { export CUDNN_INCLUDE_DIR=${cudnn}/include ''; - patches = [ - # Prevents a race condition which would be introduced by pull 30333. - # See https://github.com/pytorch/pytorch/issues/32277 - # Can be removed >1.5.0. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30332.patch"; - sha256 = "1v9dwbhz3rdxcx6sz8y8j9n3bj6nqs78b1r8yg89yc15n6l4cqx2"; - }) - - # Fixes errors with gcc-9 compilation. Cherry-picked on advice from ezyang. - # See https://github.com/pytorch/pytorch/issues/32277 - # Can be removed >1.5.0. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30333.patch"; - sha256 = "139413fl37h2fnil0cv99a67mqqnsh02k74b92by1qyr6pcfyg3q"; - }) - ]; - # Use pytorch's custom configurations dontUseCmakeConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix index db7f781c5bf4..0b0bad801e12 100644 --- a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytrends"; - version = "4.7.2"; + version = "4.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1cf80573276b3a93c4fb2ff296c260fa86e7ab43709473ce34f3bad3841f06df"; + sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa"; }; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix b/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix index a5cb694b4c15..65cb4389583c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchpatch }: buildPythonPackage rec { @@ -15,6 +16,14 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; + patches = [ + # see: https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/5 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xdg/pyxdg/-/commit/78405aaa34463db2c6f33ca28ae2293dd3bb1e91.patch"; + sha256 = "17cjax546rkqv5kvwczjqjdd6vmlvcxjanz0296dlfq23j2wbx63"; + }) + ]; + meta = with stdenv.lib; { homepage = "http://freedesktop.org/wiki/Software/pyxdg"; description = "Contains implementations of freedesktop.org standards"; diff --git a/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index efadd4337126..68ccf676f292 100644 --- a/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "faccf1c52aab34b1fdfd672ec4ce4321975453b05741e32a94b33cc682d045b2"; + sha256 = "33dbb135373d539233f7fbdb5e8dcfa07d41254300ee23719eb9caa8c68a40ae"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix b/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix index 4f62d232ab5e..17bf5fbf2974 100644 --- a/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "97b3da356d5b3a8514d8f1f9098febd8b41463bed6a1d9f126cf0a048b6fd908"; + sha256 = "470e53b64817211a42805c3a104d2216f6f5834b22fe7adb637d1de4d6501fb8"; }; checkInputs = [ nose testtools ]; diff --git a/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix b/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix index fc33d7206e76..f1239b75d481 100644 --- a/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "rethinkdb"; - version = "2.4.6"; + version = "2.4.7"; src = fetchPypi { inherit pname version; - sha256 = "4eb4252b498af3f5d01e07d7870eb35f78b96bccc45812d313c14c5184789d74"; + sha256 = "945b5efdc10f468fc056bd53a4e4224ec4c2fe1a7e83ae47443bbb6e7c7a1f7d"; }; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix b/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix new file mode 100644 index 000000000000..8e42baf8ff74 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, rply +}: + +buildPythonPackage rec { + pname = "rnc2rng"; + version = "2.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kmp3iwxxyzjsd47j2sprd47ihhkwhb3yydih3af5bbfq0ibh1w8"; + }; + + propagatedBuildInputs = [ rply ]; + + checkPhase = "${python.interpreter} test.py"; + + meta = with lib; { + homepage = "https://github.com/djc/rnc2rng"; + description = "Compact to regular syntax conversion library for RELAX NG schemata"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rope/default.nix b/nixpkgs/pkgs/development/python-modules/rope/default.nix index 6bcc05fb34d6..73b5e0b8c2b5 100644 --- a/nixpkgs/pkgs/development/python-modules/rope/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rope/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "rope"; - version = "0.16.0"; + version = "0.17.0"; disabled = pythonAtLeast "3.8"; # 0.17 should support Python 3.8 src = fetchPypi { inherit pname version; - sha256 = "1zlxdrs6ww2hm41izz67h67z9dkm0rlgw8m04vygaip0q91030yj"; + sha256 = "1qa9nqryp05ah9b4r8cy5ph31kr9cm4ak79pvzbg7p23bxqdd2k5"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix new file mode 100644 index 000000000000..cf6f8a010714 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, scrapy, bsddb3 }: + +buildPythonPackage rec { + pname = "scrapy-deltafetch"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m511psddvlapg492ny36l8rzy7z4i39yx6a1agxzfz6s9b83fq8"; + }; + + propagatedBuildInputs = [ bsddb3 scrapy ]; + + checkInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls"; + homepage = "https://github.com/scrapy-plugins/scrapy-deltafetch"; + license = licenses.bsd3; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix new file mode 100644 index 000000000000..26e142434c59 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, fake-useragent, scrapy }: + +buildPythonPackage rec { + pname = "scrapy-fake-useragent"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "02mayk804vdl15wjpx7jcjkc4zgrra4izf6iv00mcxq4fd4ck03l"; + }; + + propagatedBuildInputs = [ fake-useragent ]; + + checkInputs = [ pytest scrapy ]; + + meta = with stdenv.lib; { + description = "Random User-Agent middleware based on fake-useragent"; + homepage = "https://github.com/alecxe/scrapy-fake-useragent"; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix new file mode 100644 index 000000000000..7799186d6216 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, hypothesis, scrapy }: + +buildPythonPackage rec { + pname = "scrapy-splash"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488"; + }; + + checkInputs = [ pytest hypothesis scrapy ]; + + meta = with stdenv.lib; { + description = "Scrapy+Splash for JavaScript integration"; + homepage = "https://github.com/scrapy-plugins/scrapy-splash"; + license = licenses.bsd3; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix b/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix new file mode 100644 index 000000000000..9ee04cb50a82 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonApplication, fetchPypi, isPy36, dataclasses, libX11, libXinerama, libXrandr }: + +buildPythonApplication rec { + pname = "screeninfo"; + version = "0.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vcw54crdgmbzwlrfg80kd1a8p9i10yks8k0szzi0k5q80zhp8xz"; + }; + + # dataclasses is a compatibility shim for python 3.6 ONLY + patchPhase = if isPy36 then "" else '' + substituteInPlace setup.py \ + --replace "\"dataclasses\"," "" + '' + '' + substituteInPlace screeninfo/enumerators/xinerama.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")" + substituteInPlace screeninfo/enumerators/xrandr.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" + ''; + + propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses; + + buildInputs = [ libX11 libXinerama libXrandr]; + + meta = with stdenv.lib; { + description = "Fetch location and size of physical screens"; + homepage = "https://github.com/rr-/screeninfo"; + license = licenses.mit; + maintainers = [ maintainers.nickhu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix new file mode 100644 index 000000000000..fbe1528c4c3b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/setuptools-lint/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pylint }: + +buildPythonPackage rec { + pname = "setuptools-lint"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577"; + }; + + propagatedBuildInputs = [ pylint ]; + + meta = with stdenv.lib; { + description = "Package to expose pylint as a lint command into setup.py"; + homepage = "https://github.com/johnnoone/setuptools-pylint"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ nickhu ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix index c14c5ec42659..238d394ee11e 100644 --- a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "shellingham"; version = "1.3.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix b/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix index 76820b6ebc6a..d7791fcf96cb 100644 --- a/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; + buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/snapcast/default.nix b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix index 6e319a183418..93d7d1d9d9cf 100644 --- a/nixpkgs/pkgs/development/python-modules/snapcast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "snapcast"; - version = "2.1.0"; + version = "2.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1z3c9p22pm3823jzh917c3rryv02mhigrjkjf9wlhzmjwx5vmjqf"; + sha256 = "c3ecd63d997fbcf6e5322dc47c1f02615f1d9611cba01ec18e9c9f8c14ed824b"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 0b14a97b647f..1d8389d80640 100644 --- a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.2.5"; + version = "2.2.7"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2f720c4989b2ad92c1fc3c221f049102155f2d8006527daa15f2b54ecfdaf652"; + sha256 = "84974778dd8d1efd4ff87d8404d71241f90e02044b1b94a52eea567080f93ac4"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/snscrape/default.nix b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix index 9f0b805a19da..4370388959d0 100644 --- a/nixpkgs/pkgs/development/python-modules/snscrape/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "snscrape"; - version = "0.3.1"; + version = "0.3.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11jv5mv3l11qjlsjihd74gc1jafq0i7360cksqjkx1wv2hcc32rf"; + sha256 = "ea038827afe439577eb109ebd1b5c481d516d489c624fc3fe6e92ec71ef42be9"; }; # There are no tests; make sure the executable works. diff --git a/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/nixpkgs/pkgs/development/python-modules/somajo/default.nix index 306737c40028..958c9ab82662 100644 --- a/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.0.5"; + version = "2.0.6"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "01zvmqilnndh2b257z7bhcc7av5vhjm1g8gmdiiw15gcd2xfmqjs"; + sha256 = "08nicj3nj6pi6djli26gf0kf3s2da9ysn1cpkyw7j88v8vav0p7s"; }; propagatedBuildInputs = [ regex ]; diff --git a/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix b/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix index b8cdd63cbde5..bb5ecbc839c2 100644 --- a/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix +++ b/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "1.9.5"; + version = "1.9.6"; src = fetchPypi { inherit pname version; - sha256 = "e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda"; + sha256 = "7985bacc98c34923a439967c1a602dc4f1e15f923b6fcf02344184f86cc7efaa"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 6a54cc1ec715..f0a143ec30c7 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1fgm1zlw8mjhmk64skxs79ymhcningml13y9c9fy7rj1b1yadwzh"; + sha256 = "0nri437dyapiq5gx8lbmjdfvqw2cnw3di13kp44rzr17bm5yh2jv"; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { # ''; postPatch = '' - substituteInPlace setup.cfg --replace "thinc==7.4.0" "thinc>=7.4.0,<8" + substituteInPlace setup.cfg --replace "thinc==7.4.1" "thinc>=7.4.1,<8" ''; meta = with lib; { @@ -62,5 +62,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/spaCy"; license = licenses.mit; maintainers = with maintainers; [ danieldk sdll ]; - }; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/spacy/models.json b/nixpkgs/pkgs/development/python-modules/spacy/models.json index 1f1558b23c39..1c02b05d303e 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/models.json +++ b/nixpkgs/pkgs/development/python-modules/spacy/models.json @@ -1,108 +1,108 @@ [{ "pname": "de_core_news_md", - "version": "2.2.5", - "sha256": "1jkc4r0f1916k5qpmpnwawsbnrbscq250q7b1llgxi70f2xyw9gk", + "version": "2.3.0", + "sha256": "0kxir1w000r5fn1kpa38m7688xinkn2mk1m82aiwqlck3r72jdi6", "license": "cc-by-sa-40" }, { "pname": "de_core_news_sm", - "version": "2.2.5", - "sha256": "10z30hirfwa692m0zp6wk60ccvqj84i5vjaiyyzd21innysb5y3g", + "version": "2.3.0", + "sha256": "00cbmrf4njg28laysapdnp4rv4lw4yw03rxkynw1ain5fwb0izl7", "license": "cc-by-sa-40" }, { "pname": "el_core_news_md", - "version": "2.2.5", - "sha256": "1jjmf6rf1hjgqswhpqq2l5w7s351k4kk93c7rr85iv2754f71h36", + "version": "2.3.0", + "sha256": "170x8bzm5nf02mhkxyxjk58yk2639hsjb5b9prcc69500c0vmnp0", "license": "cc-by-sa-40" }, { "pname": "el_core_news_sm", - "version": "2.2.5", - "sha256": "00h55fc27d3jfm3knyidz7a4rasiz7qs4wfs3sl0ndq815yvag0l", + "version": "2.3.0", + "sha256": "10mh3za4jvr07rawzk8ps642rp11s3smraj9xvrxflik4fqkz18b", "license": "cc-by-sa-40" }, { "pname": "en_core_web_lg", - "version": "2.2.5", - "sha256": "1shd4gkshr4a92fhvrjhzn1abywnrcf548cv3dz8dhmi0wxa4klr", + "version": "2.3.0", + "sha256": "0mfa5wz31ya295jhyj489gb4qy806zmpq1zc11bvv5alv2m35if2", "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "2.2.5", - "sha256": "1x32vl2a75ps2iyhysjvdygd366zs546s82yzqwj2m7jcsdszrxy", + "version": "2.3.0", + "sha256": "1ys8sqkhiap1mq6mhbkbq8bc07lvl68xngbx725xkwvirzl5gabh", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "2.2.5", - "sha256": "1vna6zik7863hahxdgz0s80kbbfyw42h4c1k5jby9lkzr5jr1dk0", + "version": "2.3.0", + "sha256": "04icv9qf4pj53ll8vqxcjl2a723q1k00i7lifk8wx5saif28g37a", "license": "cc-by-sa-40" }, { "pname": "en_vectors_web_lg", - "version": "2.1.0", - "sha256": "1sq41pr70215f2s8k35x5ni4w0i4xhbzbfg3iyxgbp1b35gizg94", + "version": "2.3.0", + "sha256": "13g012rwh0bcxx3ii5mmygqzyryah1y3zd000zhidnacc1x1g743", "license": "cc-by-sa-40" }, { "pname": "es_core_news_md", - "version": "2.2.5", - "sha256": "0b50gd2mx1klr6ss0fsj58qmw2wpbawwv015pr9vq3j7jq805scl", + "version": "2.3.0", + "sha256": "0nz33bmpr3rxqbnv6vb1id8pkfsvh8ii8vqplwgb3b8772kmpzy2", "license": "cc-by-sa-40" }, { "pname": "es_core_news_sm", - "version": "2.2.5", - "sha256": "19hrpxg1a5bvf9j9wlm03rkxfkgrldky7alsgl8bdwnwq3vpbgfi", + "version": "2.3.0", + "sha256": "02xqhg4m0gg5r9yibvl02zixkll6w0nsmbdhp07y5yyaqjarc90d", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_md", - "version": "2.2.5", - "sha256": "1y4dqbcwa7gg6z8q84n0j4my7gyia7a2z7pln71sqa78pin06r9b", + "version": "2.3.0", + "sha256": "04fk212ksac3bp9dj7dmzsdcnbqmbsgymsic6ddcv9zbfdv5d0db", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_sm", - "version": "2.2.5", - "sha256": "1q2kvznbylyz4frxy5rbvpm5jvm7bfin8g3dks0c1k9hhdymv35y", + "version": "2.3.0", + "sha256": "0kldww855z67qfc9maa9z1lsvdf5vj5vc8gj0x3h68kv5n1xr4h0", "license": "cc-by-sa-40" }, { "pname": "it_core_news_sm", - "version": "2.2.5", - "sha256": "02r3x308s5kn62xpa2cizxfw7cyjk48zm9i6r4vhs8kycmp9z0px", + "version": "2.3.0", + "sha256": "1c3ywqa8li0j7cyvd1xqbb096y61978hd6qv7rc6cxxjdhmkrrds", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "2.2.5", - "sha256": "0vy0cff1fw33srqyi93vj03rnzqr8f62p1hwi565b0sb8v3n4p08", + "version": "2.3.0", + "sha256": "0r3rbqgz4897wyhz5jli30lryb45039f4rlvn4q0364cg1pm92g9", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_sm", - "version": "2.2.5", - "sha256": "1kdn3qwlmmd52sjrvi97aiv7xp260bka009jjal79l3qrz4czrw1", + "version": "2.3.0", + "sha256": "07b7xri2q3m7fvn9a2gjc1044a3f14231vr32hrw96h7k6vg95h7", "license": "mit" }, { "pname": "nl_core_news_sm", - "version": "2.2.1", - "sha256": "0gw9a1j3v4f15cxcz7zr7dz7mqi2a3541b04q6kj74gg397li4ny", + "version": "2.3.0", + "sha256": "0alvz7pn7cj0yax8h5gp71vrdblh3mcsmyhzgiddsd44ry35nxnj", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "2.2.5", - "sha256": "02p617ybh6wqmq1scch9dgim44rhhj0k81sbw8nysv20pc6wb89a", + "version": "2.3.0", + "sha256": "1vcvzdg9f93x0vaafkk9l9xhpmaavfj0cf0l3p06c5kx2d76f9ph", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "2.2.0", - "sha256": "0niwnd1mdaji92yp2dqsbmr0w420gpaybb1ppbqr1rmk6bwgyhsb", + "version": "2.3.0", + "sha256": "0x3zmmybl5kh4dn5prkfmr4q5j9bh13p40qc3rhdfi0i3jxc11pn", "license": "cc-by-sa-40" }] diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index d3c9fe152806..95bd4b592010 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.6.0"; + version = "0.6.1"; # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple # directories). But python2 is EOL, so not supporting it should be ok. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1692q3f3z1rsd3nyxd8wrv0vscwcq2gqjbv79c8ws402y3m7y5ni"; + sha256 = "88320b2780f350d67f84a5424973ce24aee65701e8e163a7f5856c5df3353188"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index 9be357fbed33..cd2b00021e7b 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.3.16"; + version = "1.3.17"; src = fetchPypi { inherit pname version; - sha256 = "0w1xfy7j1h0dyfwk6zc6lfbv2m77lmxk7g17sbgpi08bq0kf293j"; + sha256 = "156a27548ba4e1fed944ff9fcdc150633e61d350d673ae7baaf6c25c04ac1f71"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index bc94ad50861a..81aede240eeb 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.5"; + version = "1.4.6"; src = fetchPypi { inherit pname version; - sha256 = "1ec0d320aca95be3ba53d1af0faefc047864dfe6328622ae10e33a6ed9446ca8"; + sha256 = "0da3a6700a370fcd671265502c7c4aca39a1d055de9a1dcc8b9b751c9ad3efa8"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/stytra/default.nix b/nixpkgs/pkgs/development/python-modules/stytra/default.nix index 970fe5a19878..9fba92ca12f7 100644 --- a/nixpkgs/pkgs/development/python-modules/stytra/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stytra/default.nix @@ -8,7 +8,7 @@ , pandas , tables , git -, ffmpeg +, ffmpeg_3 , scikitimage , matplotlib , qdarkstyle @@ -30,12 +30,12 @@ buildPythonPackage rec { pname = "stytra"; - version = "0.8.27"; + version = "0.8.33"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8fc1ca5f75f47ec1eeb3d62722437bed4ddf598e130b3dd22f0e663f61857df5"; + sha256 = "b0aacc8e2c1bba33c337ebc76c0d8f2971c113d298aea2a375d84a5eeff5d83e"; }; doCheck = false; checkInputs = [ @@ -55,7 +55,7 @@ buildPythonPackage rec { pandas tables git - ffmpeg + ffmpeg_3 scikitimage matplotlib qdarkstyle diff --git a/nixpkgs/pkgs/development/python-modules/telethon/default.nix b/nixpkgs/pkgs/development/python-modules/telethon/default.nix index a125cfd9bff3..f8c0661f0cd8 100644 --- a/nixpkgs/pkgs/development/python-modules/telethon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.10.10"; + version = "1.14.0"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "0zm3577f1l5g0i0gcxr3s0nrqy0i81ppr6vp31p550vvnlnkjsqj"; + sha256 = "1fg12gcg6ca7rjh7m3g48m30cx4aaw5g09855nlyz2sa1kw3gfyq"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix index 17ce469dc1c5..18570c90c00f 100644 --- a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix @@ -1,22 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, pbr, six, futures, monotonic, setuptools_scm -, pytest, sphinx, tornado +{ lib, buildPythonPackage, fetchPypi, isPy27, isPy3k +, pbr, six, futures, monotonic, typing, setuptools_scm +, pytest, sphinx, tornado, typeguard }: buildPythonPackage rec { pname = "tenacity"; - version = "6.0.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "72f397c2bb1887e048726603f3f629ea16f88cb3e61e4ed3c57e98582b8e3571"; + sha256 = "16ikf6n6dw1kzncs6vjc4iccl76f9arln59jhiiai27lzbkr1bi9"; }; nativeBuildInputs = [ pbr setuptools_scm ]; propagatedBuildInputs = [ six ] - ++ lib.optionals isPy27 [ futures monotonic ]; + ++ lib.optionals isPy27 [ futures monotonic typing ]; - checkInputs = [ pytest sphinx tornado ]; + checkInputs = [ pytest sphinx tornado ] + ++ lib.optionals isPy3k [ typeguard ]; checkPhase = if isPy27 then '' pytest --ignore='tenacity/tests/test_asyncio.py' '' else '' diff --git a/nixpkgs/pkgs/development/python-modules/thumbor/default.nix b/nixpkgs/pkgs/development/python-modules/thumbor/default.nix index ee805ce6300f..86a2dd200110 100644 --- a/nixpkgs/pkgs/development/python-modules/thumbor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thumbor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { gifsicle = "${pkgs.gifsicle}/bin/gifsicle"; exiftool = "${pkgs.exiftool}/bin/exiftool"; jpegtran = "${pkgs.libjpeg}/bin/jpegtran"; - ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; + ffmpeg = "${pkgs.ffmpeg_3}/bin/ffmpeg"; }) ]; diff --git a/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix index 62d3f2dde24d..29715dd2f53f 100644 --- a/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,13 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi, twine, pbr, click, click-completion, validate-email, -pendulum, ptable, requests, inquirer, pythonOlder, pytest, pytestcov, pytest-mock, faker, factory_boy, -setuptools }: +{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder +, click +, click-completion +, factory_boy +, faker +, inquirer +, pbr +, pendulum +, ptable +, pytest +, pytestcov +, pytest-mock +, requests +, setuptools +, twine +, validate-email +}: buildPythonPackage rec { pname = "toggl-cli"; version = "2.1.0"; - - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.5" || pythonAtLeast "3.8"; src = fetchPypi { pname = "togglCli"; diff --git a/nixpkgs/pkgs/development/python-modules/toml/default.nix b/nixpkgs/pkgs/development/python-modules/toml/default.nix index 29d0a4c692f3..8e96efcdf444 100644 --- a/nixpkgs/pkgs/development/python-modules/toml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/toml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "toml"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "0p1xww2mzkhqvxkfvmfzm58bbfj812zhdz4rwdjiv94ifz2q37r2"; + sha256 = "926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"; }; # This package has a test script (built for Travis) that involves a) diff --git a/nixpkgs/pkgs/development/python-modules/toolz/default.nix b/nixpkgs/pkgs/development/python-modules/toolz/default.nix index cb635d227f7c..e0039057d828 100644 --- a/nixpkgs/pkgs/development/python-modules/toolz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/toolz/default.nix @@ -4,7 +4,7 @@ , nose }: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; diff --git a/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index af72dc6b8a5f..138c24ebbe3c 100644 --- a/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.46.0"; + version = "4.46.1"; src = fetchPypi { inherit pname version; - sha256 = "4733c4a10d0f2a4d098d801464bdaf5240c7dadd2a7fde4ee93b0a0efd9fb25e"; + sha256 = "cd140979c2bebd2311dfb14781d8f19bd5a9debb92dcab9f6ef899c987fcf71f"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix b/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix index ad4a30d97c50..2c254aa25bbf 100644 --- a/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix @@ -13,7 +13,7 @@ , pinentry }: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "trezor_agent"; version = "0.10.0"; diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index be135f651213..c6d1ba00a850 100644 --- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.6.38"; + version = "3.6.43"; src = fetchPypi { inherit pname version; - sha256 = "0rdffk6a1jlfanb4i0prvy68qya8waa390yyw2kix4ja8fk7y6sx"; + sha256 = "f62dbaf4739858148fe4889f3b4dff93da281982b6592f211c4d33c2e00678eb"; }; propagatedBuildInputs = [ numpy ]; diff --git a/nixpkgs/pkgs/development/python-modules/txdbus/default.nix b/nixpkgs/pkgs/development/python-modules/txdbus/default.nix index 0fbe4900f9e5..8ef694d34ff2 100644 --- a/nixpkgs/pkgs/development/python-modules/txdbus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/txdbus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "txdbus"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0z41n1ikpdvk0nm8dbyh6g9bg781q4j6hg2b09b5k4wdqm17zxbg"; + sha256 = "eefcffa4efbf82ba11222f17f5989fe1b2b6ef57226ef896c4a7084c990ba217"; }; propagatedBuildInputs = [ six twisted ]; diff --git a/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index 35ef67326ce7..e1527ea27e69 100644 --- a/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.7"; + version = "1.2.8"; src = fetchPypi { inherit pname version; - sha256 = "d5ac4f6e66baf466cb1c5e00d52f5da3a42bf811724522475b7e2125fbae4aae"; + sha256 = "12yq435h27iv1kzgq3gl7c7hxdivvc2sl0l1kslgf2wxw53n7jgj"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 55c215ac75a3..3d472a604d64 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.11.5"; + version = "3.11.7"; src = fetchPypi { inherit pname version; - sha256 = "05bb55d0576813bb7bf252654cf854fcbabe34e30eb99beb70eff6abc4d3f121"; + sha256 = "3fbf9dfe5ce996ffda3a49d16eba804b95fb05bc041fc4e7bc05317a03bf6cba"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix b/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix index cfbfcde6fd50..8beb39b26d9e 100644 --- a/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "0de23c0a09f0d849db626569207d52d324ffd51c69b4f7f3650f167c3c2c9de9"; + sha256 = "570525d0371806993874bd2ee0f47cc5d68994abb5aa382e964e53e0b81160b2"; }; propagatedBuildInputs = [ future dateutil six ]; diff --git a/nixpkgs/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch b/nixpkgs/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch new file mode 100644 index 000000000000..2b34da289e2d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch @@ -0,0 +1,37 @@ +From 21563405d6e2348ee457187f7fb61beb102bb367 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk <fridh@fridh.nl> +Date: Sun, 24 May 2020 09:33:13 +0200 +Subject: [PATCH] Check base_prefix and base_exec_prefix for Python 2 + +This is a Nixpkgs-specific change so it can support virtualenvs from Nix envs. +--- + src/virtualenv/discovery/py_info.py | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/virtualenv/discovery/py_info.py b/src/virtualenv/discovery/py_info.py +index 6f12128..74e9218 100644 +--- a/src/virtualenv/discovery/py_info.py ++++ b/src/virtualenv/discovery/py_info.py +@@ -51,13 +51,17 @@ class PythonInfo(object): + self.version = u(sys.version) + self.os = u(os.name) + ++ config_vars = {} if sys.version_info.major is not 2 else sysconfig._CONFIG_VARS ++ base_prefix = config_vars.get("prefix") ++ base_exec_prefix = config_vars.get("exec_prefix") ++ + # information about the prefix - determines python home + self.prefix = u(abs_path(getattr(sys, "prefix", None))) # prefix we think +- self.base_prefix = u(abs_path(getattr(sys, "base_prefix", None))) # venv ++ self.base_prefix = u(abs_path(getattr(sys, "base_prefix", base_prefix))) # venv + self.real_prefix = u(abs_path(getattr(sys, "real_prefix", None))) # old virtualenv + + # information about the exec prefix - dynamic stdlib modules +- self.base_exec_prefix = u(abs_path(getattr(sys, "base_exec_prefix", None))) ++ self.base_exec_prefix = u(abs_path(getattr(sys, "base_exec_prefix", base_exec_prefix))) + self.exec_prefix = u(abs_path(getattr(sys, "exec_prefix", None))) + + self.executable = u(abs_path(sys.executable)) # the executable we were invoked via +-- +2.25.1 + diff --git a/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index ff5172d415f7..5ca27330103d 100644 --- a/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -43,6 +43,10 @@ buildPythonPackage rec { importlib-metadata ]; + patches = lib.optionals (isPy27) [ + ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch + ]; + meta = { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; diff --git a/nixpkgs/pkgs/development/python-modules/wtforms/default.nix b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix index 98c3b1be93b5..410abbbb622b 100644 --- a/nixpkgs/pkgs/development/python-modules/wtforms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wtforms/default.nix @@ -1,29 +1,29 @@ { stdenv , buildPythonPackage , fetchPypi -, Babel +, markupsafe }: buildPythonPackage rec { - version = "2.1"; - pname = "wtforms"; + version = "2.3.1"; + pname = "WTForms"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz"; + sha256 = "0whrd9cqhlibm31yqhvhp9illddxf0cpgcn3v806f7ajmsri66l6"; }; + propagatedBuildInputs = [ markupsafe ]; + # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet." - # This is fixed in master I believe but not yet in 2.1; doCheck = false; - propagatedBuildInputs = [ Babel ]; - meta = with stdenv.lib; { - homepage = "https://github.com/wtforms/wtforms"; description = "A flexible forms validation and rendering library for Python"; + homepage = "https://github.com/wtforms/wtforms"; + changelog = "https://github.com/wtforms/wtforms/blob/${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = [ maintainers.bhipple ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix b/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix index 7cc921047ac1..22ce5917e2a6 100644 --- a/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix @@ -3,7 +3,7 @@ , fetchPypi }: -buildPythonPackage rec{ +buildPythonPackage rec { version = "1.4"; pname = "x11_hash"; diff --git a/nixpkgs/pkgs/development/python-modules/yenc/default.nix b/nixpkgs/pkgs/development/python-modules/yenc/default.nix index 13c8d53f19b3..453f3113853b 100644 --- a/nixpkgs/pkgs/development/python-modules/yenc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yenc/default.nix @@ -6,7 +6,7 @@ , isPy3k }: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "yenc"; version = "0.4.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix index ccc34b42afb4..16bf5b7855c5 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.3"; + version = "3.7.4"; src = fetchPypi { inherit version pname; - sha256 = "1adec3b54c77c46acfc8a99d6336ce9a0223a7016852666358133cbe37d99744"; + sha256 = "dc79a1eaad1d1cd1cf8cfe636e1bc413c60645e3e87a5a8e9b97ce882690e0e4"; }; buildInputs = [ openssl bzip2 ]; diff --git a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index d293ae449c1d..e9d3c6e038ea 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.26.1"; + version = "0.26.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "09rvliph7phvgzwmmdv1kwcp3andpiiqfpkrwq1vkxvwqa3mgwji"; + sha256 = "43ad5006c00be2040cdca1fe768206f4a25356d3cc87eff8b66bd7ead2a82440"; }; propagatedBuildInputs = [ ifaddr ] diff --git a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 2beabc8a61c7..6494aa7a71af 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -1,8 +1,10 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy3k , zope_event , zope_component +, zope_interface }: buildPythonPackage rec { @@ -16,6 +18,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_event zope_component ]; + # namespace colides with local directory + doCheck = false; + + # zope uses pep 420 namespaces for python3, doesn't work with nix + python2 + pythonImportsCheck = stdenv.lib.optionals isPy3k [ + "zope.lifecycleevent" + "zope.interface" + ]; + meta = with stdenv.lib; { homepage = "https://github.com/zopefoundation/zope.lifecycleevent"; description = "Object life-cycle events"; diff --git a/nixpkgs/pkgs/development/python-modules/zstd/default.nix b/nixpkgs/pkgs/development/python-modules/zstd/default.nix index 75856a88b7e0..8f61f2ffc66e 100644 --- a/nixpkgs/pkgs/development/python-modules/zstd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zstd/default.nix @@ -3,16 +3,16 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.4.4.0"; + version = "1.4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "33f2c1fd8d3f9ac8e35fb3e199896afc54cceb68878570c6d4b72985dc6584a5"; + sha256 = "2a1806d625bd2d8944ead4b3018fc6444a31467fa09935e9c1d4296275f024c6"; }; postPatch = '' substituteInPlace setup.py \ - --replace "/usr/bin/pkg-config" "${pkgconfig}/bin/pkg-config" + --replace "/usr/bin/pkg-config" "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" ''; nativeBuildInputs = [ pkgconfig ]; |