diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 571097ad4786c..2110a0deb242e 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -30,7 +30,6 @@ python3.pkgs.buildPythonApplication rec { ++ optionals withDbusPython [ dbus-python ] ++ optionals withPyInotify [ pyinotify ] ++ optionals withMusicBrainzNgs [ musicbrainzngs ] - ++ optionals stdenv.isDarwin [ pyobjc ] ++ optionals withPahoMqtt [ paho-mqtt ]; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 952d1fe16db66..4b78cda356481 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -7,6 +7,7 @@ , glib , gtk3 , libnotify +, scandir ? null }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index e19e89ec6c0b7..392e2c312f7df 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { dateutil gflags httplib2 parsedatetime six vobject google-api-python-client oauth2client uritemplate libnotify - ] ++ lib.optional (!isPy3k) futures; + ]; # There are no tests as of 4.0.0a4 doCheck = false; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 8ef1f5189e5b9..b985d56bb27d4 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -11,6 +11,14 @@ let python3 = pkgs.python3.override { packageOverrides = self: super: { + cypari2 = super.cypari2.overridePythonAttrs (oldAttrs: rec { + version = "2.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db"; + }; + }); + # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { inherit flint arb; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index dcccaf1f2b7b6..07d52a532fb41 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -69,12 +69,15 @@ with pkgs; recursivePthLoader ; }; + optionalExtensions = cond: as: if cond then as else []; + python2Extension = import ../../../top-level/python2-packages.nix; + extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]); in lib.makeScopeWithSplicing pkgs.splicePackages pkgs.newScope otherSplices keep - (lib.extends overrides pythonPackagesFun)) + (lib.extends extensions pythonPackagesFun)) { overrides = packageOverrides; }; diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 175454ea05593..e9c769821d6f6 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -104,11 +104,13 @@ else let inherit (python) stdenv; + name_ = name; + self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" ]) // { - name = namePrefix + name; + name = namePrefix + name_; nativeBuildInputs = [ python diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index 1025ed6a05ee0..2e70d3aa121e3 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -9,13 +9,19 @@ buildPythonPackage rec { pname = "fabric"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "19nzdibjfndzcwvby20p59igqwyzw7skrb45v2mxqsjma5yjv114"; + sha256 = "47f184b070272796fd2f9f0436799e18f2ccba4ee8ee587796fca192acd46cd2"; }; + # only relevant to python < 3.4 + postPatch = '' + substituteInPlace setup.py \ + --replace ', "pathlib2"' ' ' + ''; + propagatedBuildInputs = [ invoke paramiko cryptography ]; checkInputs = [ pytest mock pytest-relaxed ]; diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 0081051628df1..547be5dc4dc51 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "GitPython"; - version = "3.1.13"; + version = "3.1.14"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "sha256-hiGn53fidqXsg4tZKAulJy3RRKGBacNskD2LOLmfdQo="; + sha256 = "be27633e7509e58391f10207cd32b2a6cf5b908f92d9cd30da2e514e1137af61"; }; patches = [ diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix index eb802989a5c23..012f31c266b21 100644 --- a/pkgs/development/python-modules/Markups/default.nix +++ b/pkgs/development/python-modules/Markups/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Markups"; - version = "3.0.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1ea19458dfca6a4562044e701aa8698089a0c659fc535689ed260f89a04f8d39"; + sha256 = "e309d79dde0935576ce1def6752f2127a12e2c2ea2ae8b0c69f99ff8bc12181d"; }; checkInputs = [ markdown docutils pygments ]; diff --git a/pkgs/development/python-modules/Pygments/2_5.nix b/pkgs/development/python-modules/Pygments/2_5.nix index 965e6f0ec343c..aa59c370d2e7d 100644 --- a/pkgs/development/python-modules/Pygments/2_5.nix +++ b/pkgs/development/python-modules/Pygments/2_5.nix @@ -3,7 +3,6 @@ , fetchPypi , fetchpatch , docutils -, pytestCheckHook }: buildPythonPackage rec { @@ -26,7 +25,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ docutils ]; - checkInputs = [ pytestCheckHook ]; + # Circular dependency with sphinx + doCheck = false; meta = { homepage = "https://pygments.org/"; diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 48d74fddd4368..1f4795ac382a4 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -2,23 +2,22 @@ , buildPythonPackage , fetchPypi , docutils -, pytestCheckHook -, doCheck ? true }: buildPythonPackage rec { pname = "Pygments"; - version = "2.7.4"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337"; + sha256 = "153zyxigm879sk2n71lfv03y2pgxb7dl0dlsbwkz9aydxnkf2mi6"; }; propagatedBuildInputs = [ docutils ]; - inherit doCheck; - checkInputs = [ pytestCheckHook ]; + # Circular dependency with sphinx + doCheck = false; + pythonImportsCheck = [ "pygments" ]; meta = { homepage = "https://pygments.org/"; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index e70d830b7be08..ddb6ae1c2e92f 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "673cccb88d810e5627d0c1c818158485d106f65a583880e2f730c997399bcfa7"; + sha256 = "b44f68984a5ceb2607d135a615999b93924c771238a63920d17d3387b0d229d5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 5d9c3fe166956..f75a0d6bb60bb 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.1.2"; + version = "1.2.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1fn9hgcg3qr9f7srjxc21bzkiix4al9308531slwlm99r0x3xcjl"; + sha256 = "37c23166603a3bd134e5f6fc22dbbf8c274d4d24c71418fba292ed2cd7a0bf43"; }; # relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 1adc6f8152441..05e17ec12f430 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,5 +1,7 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, isPy27, isPyPy, python, pycares, typing, trollius }: +, isPy27, isPyPy, python, pycares, typing ? null +, trollius ? null +}: buildPythonPackage rec { pname = "aiodns"; diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix index 0d6796706cbd4..ef0166e5d624f 100644 --- a/pkgs/development/python-modules/aioeventlet/default.nix +++ b/pkgs/development/python-modules/aioeventlet/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , eventlet -, trollius +, trollius ? null , mock , python }: diff --git a/pkgs/development/python-modules/aiohttp-cors/default.nix b/pkgs/development/python-modules/aiohttp-cors/default.nix index 00198cd27cffa..fc5dc87f4ef2a 100644 --- a/pkgs/development/python-modules/aiohttp-cors/default.nix +++ b/pkgs/development/python-modules/aiohttp-cors/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, typing, aiohttp +, typing ? null, aiohttp }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 5a4ef5e0bc6e3..899bea2acb818 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.4.3"; + version = "1.5.8"; src = fetchPypi { inherit pname version; - sha256 = "5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245"; + sha256 = "e27fd67732c97a1c370c33169ef4578cf96436fa0e7dcfaeeef4a917d0737d56"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 99ee559da6b92..6e686d9fc9073 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -12,7 +12,7 @@ , six , sphinx , toolz -, typing +, typing ? null , vega_datasets }: diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 90d34951e4410..f28668a8912bf 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "8.1.1"; + version = "9.0.1"; meta = with lib; { description = "Parses ISO 8601 strings."; @@ -17,6 +17,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "be08b19c19ca527af722f2d4ba4dc569db292ec96f7de963746df4bb0bff9250"; + sha256 = "72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973"; }; } diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix index ad5f64146a69e..88675337b4cd8 100644 --- a/pkgs/development/python-modules/arabic-reshaper/default.nix +++ b/pkgs/development/python-modules/arabic-reshaper/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "arabic_reshaper"; - version = "2.1.1"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "zzGPpdUdLSJPpJv2vbu0aE9r0sBot1z84OYH+JrBmdw="; + sha256 = "a236fc6e9dde2a61cc6a5ca962b522e42694e1bb2a2d86894ed7a4eba4ce1890"; }; propagatedBuildInputs = [ future ] diff --git a/pkgs/development/python-modules/arrow/2.nix b/pkgs/development/python-modules/arrow/2.nix new file mode 100644 index 0000000000000..d87f1ede3ccde --- /dev/null +++ b/pkgs/development/python-modules/arrow/2.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, nose, chai, simplejson, backports_functools_lru_cache +, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "arrow"; + version = "0.17.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4"; + }; + + propagatedBuildInputs = [ python-dateutil ] + ++ lib.optionals isPy27 [ backports_functools_lru_cache ]; + + checkInputs = [ + dateparser + pytestCheckHook + pytestcov + pytest-mock + pytz + simplejson + sphinx + ]; + + # ParserError: Could not parse timezone expression "America/Nuuk" + disabledTests = [ + "test_parse_tz_name_zzz" + ]; + + meta = with lib; { + description = "Python library for date manipulation"; + homepage = "https://github.com/crsmithdev/arrow"; + license = licenses.asl20; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index d87f1ede3ccde..93347d7a4b4b1 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "arrow"; - version = "0.17.0"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4"; + sha256 = "399c9c8ae732270e1aa58ead835a79a40d7be8aa109c579898eb41029b5a231d"; }; propagatedBuildInputs = [ python-dateutil ] diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 4005c8668117a..39a0d38a0e948 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "arviz-devs"; repo = "arviz"; rev = "v${version}"; - sha256 = "1cnj972knkvi084cfcpc12lv0wxm8xm9clfd55r3hvv42g1ms5d9"; + sha256 = "0npwrpy262y6zqd0znz4w7ikfdyz4kc4gikmkpj6h1j6vxggrfaa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 468488ec0cada..77ac408076ccd 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.5"; + version = "2.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "03dzhjrsc5d2whyjngfrwvxn42058k0cjjr85x2wqzai8psr475k"; + sha256 = "cfc35498ee64017be059ceffab0a25bedf7548ab76f2bea691c5565896e7128d"; }; # From astroid/__pkginfo__.py diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 61f49322d3bb4..e82faba97583f 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "astropy-healpix"; - version = "0.5"; + version = "0.6"; doCheck = false; # tests require pytest-astropy src = fetchPypi { inherit pname version; - sha256 = "1bfdq33mj6mwk5fkc6n23f9bc9z8j7kmvql3zchz4h58jskmvqas"; + sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690"; }; propagatedBuildInputs = [ numpy astropy astropy-helpers ]; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index b1f0df0b3bc05..617d5562b43a5 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "2.1.2"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "f852bfd293fdcb0ab2d7a9ea907f8303cf14fe6f55e90c103d4de00393ea9555"; + sha256 = "7ef384a91a790c807336e2bd6b7554284691aadd6d7413d199baf752dd84c53e"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 12aa86774d88e..386d4766bbfa6 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,14 +1,15 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, - six, txaio, twisted, zope_interface, cffi, trollius, futures, + six, txaio, twisted, zope_interface, cffi, + trollius ? null, futures ? null, mock, pytest, cryptography, pynacl }: buildPythonPackage rec { pname = "autobahn"; - version = "20.12.3"; + version = "21.3.1"; src = fetchPypi { inherit pname version; - sha256 = "15b8zm7jalwisfwc08szxy3bh2bnn0hd41dbsnswi0lqwbh962j1"; + sha256 = "e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index fa3482c07951d..491663b56cd09 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.5"; + version = "1.5.6"; src = fetchPypi { inherit pname version; - sha256 = "cae4bc0fb616408191af41d062d7ec7ef8679c7f27b068875ca3a9e2878d5443"; + sha256 = "5454e6e9a3d02aae38f866eec0d9a7de4ab9f93c10a273fb0340f3d6d09f7514"; }; propagatedBuildInputs = [ pycodestyle toml ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 804ad078acb74..30059fe5a9375 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.1.0"; + version = "1.3.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1r4939m5k1nj6l9bv972z4fkmkl0z5f5r29bq7588yk113kkqr0c"; + sha256 = "1cfacp0a5qsaf3crcybslhbfwm1mqfyafj71dlvnidzx7b9bm60v"; }; # Package is not compatible with Python 3.5 diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 1c067bcec282d..d996c34b503dd 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.32.0"; + version = "1.35.0"; src = fetchPypi { inherit pname version; - sha256 = "jL+sAlKbeXA1QeJVQbAcgIaPEbD/Ko+QMrI1Ew2dVq4="; + sha256 = "5cf7faab3566843f3b44ef1a42a9c106ffb50809da4002faab818076dcc7bff8"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 313dd4241d5c7..0e1c272b3c860 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "abf5b90f740e1f402e23414c9670e59cb9772e235e271fef2bce62b9100cbc77"; + sha256 = "697c9068e84dd5d2c1456def3fd0865f226046b5db4db56d738050e425960adf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix index 5c580ccd3e2fa..8d92e1559d593 100644 --- a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix +++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix @@ -5,7 +5,7 @@ , azure-common , azure-storage-common , azure-cosmosdb-nspkg -, futures +, futures ? null , isPy3k }: diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix index 0e97752ae578a..f2c57d76623da 100644 --- a/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -4,7 +4,7 @@ , requests , adal , azure-common -, futures +, futures ? null , pathlib2 , isPy3k }: diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index fcde20b9bf799..fe3a99e62dc1e 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "0.7.0"; + version = "1.0.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "3cf37df471f75441b0afe98a0f3a548434e9bc6a6426dca8c089950b5423f63f"; + sha256 = "d5514dfef93294a2d9b8ff6fdb353b3102abd5750f147d904e6012f24113ff9c"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index b0c0a9e96cb96..d885166daa911 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -5,7 +5,7 @@ , azure-common , azure-core , msrestazure -, futures +, futures ? null , isPy3k }: diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 7367e9604b9a3..bbcf84ef6acdc 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -6,7 +6,7 @@ , azure-storage-common , msrest , isPy3k -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index c6413f191fce8..fc98e4207e8b1 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -7,7 +7,7 @@ , azure-core , cryptography , msrest -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/azure-storage-file/default.nix b/pkgs/development/python-modules/azure-storage-file/default.nix index 088b5260e65b5..8ce1d572e8e0c 100644 --- a/pkgs/development/python-modules/azure-storage-file/default.nix +++ b/pkgs/development/python-modules/azure-storage-file/default.nix @@ -4,7 +4,7 @@ , azure-common , azure-storage-common , isPy3k -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix index e2037bb7d21fc..258a5ebabb2cf 100644 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -3,7 +3,7 @@ , fetchPypi , python , azure-common -, futures +, futures ? null , dateutil , requests , isPy3k diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index cd695132d7ae7..fcbbddb61445c 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.2.0"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8e46ff9d47a9b90d8b9beab1969fcf4920300b02e20e6bf0745be04e09e8a6ff"; + sha256 = "fb82cbaef5dd7499b62622010fc8e328944ca8cbdd00b485530ab6600de1129d"; }; pythonImportsCheck = [ "b2sdk" ]; diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 79e11ecae4f74..6c0d1df81f390 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "backports.functools_lru_cache"; - version = "1.6.1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a"; + sha256 = "d84e126e2a29e4fde8931ff8131240bbf30a0e7dbcc3897a8dbd8ea5ac11419c"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index a429ab682f76d..60823b4c077b5 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -15,8 +15,8 @@ , cryptography , isPy27 , isPy3k -, funcsigs -, pycryptopp +, funcsigs ? null +, pycryptopp ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index b9120d412cb0b..433c02ddbe4e5 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "binwalk"; - version = "2.2.0"; + version = "27"; src = fetchFromGitHub { owner = "ReFirmLabs"; repo = "binwalk"; - rev = "v${version}"; - sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; + rev = "python${version}"; + sha256 = "03kqhs3j9czdc2pnr1v8iszwx254ljpvrmmj0j5ls0ssjrfxacyx"; }; propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools lzma pycrypto ] diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 5643ea29bc2a4..66a42858650c4 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231 ? null, progressbar33, mock }: buildPythonPackage rec { pname = "bitmath"; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index f0167625cf64d..6be290f0f79fb 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "blessed"; - version = "1.17.12"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "580429e7e0c6f6a42ea81b0ae5a4993b6205c6ccbb635d034b4277af8175753e"; + sha256 = "1312879f971330a1b7f2c6341f2ae7e2cbac244bfc9d0ecfbbecd4b0293bc755"; }; checkInputs = [ pytest mock glibcLocales ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 67d5088bf7dfe..3e605af19b9bb 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , fetchPypi -, futures +, futures ? null , isPy27 , isPyPy , jinja2 diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index bf5604e6d9814..f00ddff86be19 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -4,7 +4,7 @@ , botocore , jmespath , s3transfer -, futures +, futures ? null , docutils , nose , mock diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 8a37ed0bd9788..55e66545538fb 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.20.1"; + version = "0.21"; src = fetchPypi { inherit pname version; - sha256 = "6e7738806013b469be57b0117082b9c4557ed7c92c70ceb79f96d674d89c7503"; + sha256 = "88aa9b89974f6a7726499a2608fa7ded216d84c69e78114ab2ef996a45709487"; }; patches = [ (substituteAll { diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 0da53ab5ca221..1edc62317a647 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -2,14 +2,16 @@ buildPythonPackage rec { pname = "brotli"; - version = "1.0.7"; + version = "1.0.9"; # PyPI doesn't contain tests so let's use GitHub src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"; + sha256 = "1rdp9rx197q467ixp53g4cgc3jbsdaxr62pz0a8ayv2lvm944azh"; + # for some reason, the test data isn't captured in releases, force a git checkout + deepClone = true; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index b5dce09d516f8..639dc53babf23 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -12,7 +12,7 @@ , pytestCheckHook , pythonOlder , toml -, typing +, typing ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index ea49c9b4a7774..255a100ec6884 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -5,7 +5,7 @@ , isPy27 , aenum , wrapt -, typing +, typing ? null , pyserial , nose , mock diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 8ffacc1a99de5..d36f6805cc3fb 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -7,7 +7,7 @@ , click , future , pathlib2 -, typing +, typing ? null , lxml , xlwt , xlrd diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 55468ba0fdf7b..16479302221b8 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder , cython , eventlet -, futures +, futures ? null , iana-etc , geomet , libev diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index f55042c58d235..5e8634f9fc6bf 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.42.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "0cqpq7pxpslpd7am6mp6nmwhsb2p2a5lq3hjjxi8imv3wv7zql98"; + sha256 = "03j5w9cyvpbxh634jd2dhkgfs3c2hmgqh77w664855lgy2ph9zll"; }; postPatch = '' diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 9115b1d57c3fd..e99f321df37f3 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -15,18 +15,18 @@ , pyyaml , setuptools , six -, typing +, typing ? null , watchdog , wheel }: buildPythonPackage rec { pname = "chalice"; - version = "1.21.9"; + version = "1.22.3"; src = fetchPypi { inherit pname version; - sha256 = "312f88838c8ea4b4ac79dce0e5b4ba3125130ca66ea99a4694f535501dca95e3"; + sha256 = "5a84a73c4a8d8b22bb64e06ff99060d7f222097db4237e58749dcad5165f082d"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/pkgs/development/python-modules/chardet/2.nix b/pkgs/development/python-modules/chardet/2.nix new file mode 100644 index 0000000000000..65381d40268f4 --- /dev/null +++ b/pkgs/development/python-modules/chardet/2.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, fetchpatch +, pytest, pytestrunner, hypothesis }: + +buildPythonPackage rec { + pname = "chardet"; + version = "3.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; + }; + + patches = [ + # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174 + (fetchpatch { + url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch"; + sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q"; + }) + ]; + + checkInputs = [ pytest pytestrunner hypothesis ]; + + meta = with lib; { + homepage = "https://github.com/chardet/chardet"; + description = "Universal encoding detector"; + license = licenses.lgpl2; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 65381d40268f4..7753d6ccfdebc 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -1,29 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, pytest, pytestrunner, hypothesis }: +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "chardet"; - version = "3.0.4"; + version = "4.0.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; + sha256 = "sha256-DW9ToV20Eg8rCMlPEefZPSyRHuEYtrMKBOw+6DEBefo="; }; - patches = [ - # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174 - (fetchpatch { - url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch"; - sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q"; - }) + checkInputs = [ + hypothesis + pytestCheckHook ]; - checkInputs = [ pytest pytestrunner hypothesis ]; + pythonImportsCheck = [ "chardet" ]; meta = with lib; { - homepage = "https://github.com/chardet/chardet"; description = "Universal encoding detector"; - license = licenses.lgpl2; + homepage = "https://github.com/chardet/chardet"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 6679f13b1196c..e059725cad24a 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "1.1.0"; + version = "4.14.3"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; - rev = "${pname}-v${version}"; - sha256 = "1q3j3ih5k0jhr8ilwffkfxp1nifpnjnx7862bzhxfg4d386hfg4i"; + rev = "v${version}"; + sha256 = "1yrrcn9032r3l8y2cc1wvpydg4rkqvgkpyv1s7znby5mrxa1rjma"; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index a705bffa810a0..5efb262908482 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Cheetah3"; - version = "3.2.6"; + version = "3.2.6.post1"; src = fetchPypi { inherit pname version; - sha256 = "f1c2b693cdcac2ded2823d363f8459ae785261e61c128d68464c8781dba0466b"; + sha256 = "58b5d84e5fbff6cf8e117414b3ea49ef51654c02ee887d155113c5b91d761967"; }; doCheck = false; # Circular dependency diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 4d6c71a7e2a58..7e79d5c63a3c2 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.4.8"; + version = "8.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0r98qqdp9ww5r5ma6wf1n66r9813rrmfvc54z7yij39jkj5c528h"; + sha256 = "f137d03fd5155b1364bea557a7c98168665c239f6c8cedd8f80e81cdfac01567"; }; nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; diff --git a/pkgs/development/python-modules/class-registry/default.nix b/pkgs/development/python-modules/class-registry/default.nix index 93c41cadea6e5..3faf07966d094 100644 --- a/pkgs/development/python-modules/class-registry/default.nix +++ b/pkgs/development/python-modules/class-registry/default.nix @@ -4,7 +4,7 @@ lib, nose, six, - typing, + typing ? null, isPy27, }: diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 6943a3dcfd156..1579a6a6a893d 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -4,7 +4,7 @@ , pytest , click , isPy3k -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 7b07b09459198..1f6be754be19b 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , isPy27, pythonAtLeast -, pylev, pastel, typing, enum34, crashtest }: +, pylev, pastel, typing ? null, enum34 ? null, crashtest }: buildPythonPackage rec { pname = "clikit"; diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index ec5cbe827768d..b63432383832f 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0fv0mg8zh40ffq0q39s195y6hvjrzihpx0i3f7ba5881syw3x7p4"; + sha256 = "02bw2i03vd4rcvdk10qdjl2lbvvy81cn9qpr8vzq8cm9h45689mv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index e8610f053da61..47fe88d4e61ad 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "configparser"; - version = "5.0.1"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "005c3b102c96f4be9b8f40dafbd4997db003d07d1caa19f37808be8031475f2a"; + sha256 = "85d5de102cfe6d14a5172676f09d19c465ce63d6019cf0a4ef13385fc535e828"; }; # No tests available diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 589753cd1cb5a..d07930b5e54b5 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: buildPythonPackage rec { version = "1.6.0"; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 6b212be3bb7bf..25925f56069a8 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -26,7 +26,7 @@ , six , swagger-ui-bundle , testfixtures -, typing +, typing ? null , ujson }: diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 8d0c83ca9e8e5..3a3a3d3271892 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel_yaml +, lz4, cloudpickle }: buildPythonPackage rec { pname = "construct"; - version = "2.10.56"; + version = "2.10.63"; disabled = pythonOlder "3.6"; @@ -13,10 +14,15 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1j4mqwyxkbdcsnnk5bbdcljv855w4fglaqc94q1xdzm8kgjxk4mr"; + sha256 = "0dnj815qdxrn0q6bpwsmkca2jy02gjy6d3amqg4y6gha1kc1mymv"; }; - checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml ]; + # not an explicit dependency, but it's imported by an entrypoint + propagatedBuildInputs = [ + lz4 + ]; + + checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml cloudpickle ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index b7bb3c811344a..5a7fe9a534e6e 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "coverage"; - version = "5.3.1"; + version = "5.5"; src = fetchPypi { inherit pname version; - sha256 = "38f16b1317b8dd82df67ed5daa5f5e7c959e46579840d77a67a4ceb9cef0a50b"; + sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"; }; # No tests in archive diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 55032864c3f5b..46002fae4f265 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "coveralls"; - version = "2.2.0"; + version = "3.0.1"; disabled = isPy27; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "b990ba1f7bc4288e63340be0433698c1efe8217f78c689d254c2540af3d38617"; + sha256 = "cbb942ae5ef3d2b55388cb5b43e93a269544911535f1e750e1c656aef019ce60"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index 62f1435df30e9..dc32bcdf74c93 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing ? null}: buildPythonPackage rec { pname = "curtsies"; diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 53f0ef656e20a..c3c3618033ed1 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.4.2"; + version = "6.5.3"; src = fetchPypi { inherit pname version; - sha256 = "fe0af7c658442402bcd209f993219a6ab98a951459495b4a141eb03b552a1c68"; + sha256 = "e0d03cabcdf9b9c21354807ed9f06fa9481a8fd5a0838968a830f01a70820ff1"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index a68c86538ee11..a38350f0f6acb 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.5.0"; pname = "dask-image"; src = fetchPypi { inherit pname version; - sha256 = "a6873a39af21b856a4eb7efee6838e6897b1399f21ab9e65403e69eb62f96c2d"; + sha256 = "0bf7ea8dcd9d795505b498bd632394720c048f50761e23c574d9a6bacfb27cbb"; }; nativeBuildInputs = [ pytest-flake8 ]; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 4a1bddfe3692b..270a5b4e9d868 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -4,7 +4,7 @@ , pythonOlder , decorator , requests -, typing +, typing ? null , configparser , click , freezegun @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.39.0"; + version = "0.40.1"; src = fetchPypi { inherit pname version; - sha256 = "b0ef69a27aad0e4412c1ac3e6894fa1b5741db735515c34dfe1606d8cf30e4e5"; + sha256 = "438c1dde5462e68c5c792b7b4a1d87a0ddd970af3db31b3cf15980eed0c44311"; }; postPatch = '' diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index e8d2731eb559c..20aba1b4fa2b2 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "5.0.2"; + version = "5.2.3"; src = fetchPypi { inherit pname version; - sha256 = "e2b74af4da0ef9cd338bb6e8c97242c1ec9d81fcb28298d7bb24acdc19ea79d7"; + sha256 = "ae2cb98353309f93fbfdda4d77adb08fb303314d836bb6eac3d02ed71a10b40e"; }; # # Extra packages (may not be necessary) diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 797fee025be4b..c39ca96bfe17d 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "defusedxml"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "183fz8xwclhkirwpvpldyypn47r8lgzfz2mk9jgyg7b37jg5vcc6"; + sha256 = "1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 5ed5a3eb152c7..9c977ecc5f0c3 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "4.10.3"; + version = "4.31.1"; src = fetchPypi { inherit pname version; - sha256 = "93db83fac85bcb861469c0db1af11f4bc874aa2f9380151189a05d38c21afd60"; + sha256 = "b6b28b9571f44d575367c6005ba8aaa9fd2b70310e1c15410925d6f1ee2769ad"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 91832bc88ff34..e9f6184c528d3 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "4.0.1"; + version = "5.0.1"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "61a98ec126552d985c0e3e3c33cc72e79d7577f91f6edba99f635411a173d3b9"; + sha256 = "e80f7a4979b7a9d373903776588279ed2898f17729e608255c4119462c822edb"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 9bd72965cf8b1..3e7a1163b96f7 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -11,7 +11,7 @@ , shortuuid , six , tox -, typing +, typing ? null , vobject , werkzeug }: diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix index 3276f7a065c76..92aefe4a408b1 100644 --- a/pkgs/development/python-modules/django-pipeline/default.nix +++ b/pkgs/development/python-modules/django-pipeline/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy3k -, django, futures, mock, jinja2, jsmin, slimit }: +, django, futures ? null, mock ? null, jinja2, jsmin, slimit }: buildPythonPackage rec { pname = "django-pipeline"; diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 88536b210d2a1..be63c1e9e3c94 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.4"; + version = "4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "f50e4eea146f7af6702decf7ef198ac1eee1fb9bb4af2c5dba276c3c48f76623"; + sha256 = "80150017725239702054e5fa64dc66e383dc13ac262c8d47ee5a82cb005969da"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 1d224af0354d6..afb85fb61f570 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "dnspython"; - version = "2.0.0"; + version = "2.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "044af09374469c3a39eeea1a146e8cac27daec951f1f1f157b1962fc7cb9d1b7"; + sha256 = "e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4"; }; # needs networking for some tests diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 54af81d5d8b02..0d2b355b38a11 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, futures +, futures ? null , docloud , requests }: diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index ca0283b2cbdc3..dca83a57a7bce 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "10.10.0"; + version = "11.4.1"; src = fetchPypi { inherit pname version; - sha256 = "df43e9e0bdcae6d610dd754a5ec72f2f91a311bbc2c8a28d076df69695b18398"; + sha256 = "7ba43384029424779a4b3ec8d5832362c5c0f37cd644be2fb87e2b30a569849e"; }; # Set DROPBOX_TOKEN environment variable to a valid token. diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 465e8f6c772a1..8fe4686f7a7ea 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.11.0"; + version = "7.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1e24b33a82bf381b42d3b0d390f76fdb9d6a9d47b310dea8eaeb0a5933c394c0"; + sha256 = "9a77172be02bc4855210d83f0f1346a1e7d421e3cb2ca47ba81ac0c5a717b3a0"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index ad58ee3ae2fe0..da57aa50e07c7 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -1,18 +1,29 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto, - pycryptodome }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto +, pycryptodome +, eth-utils +}: buildPythonPackage rec { pname = "eth-hash"; - version = "0.2.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0xpiz0wrxxj11ki9yapvsibl25qnki90bl3d39nqascg14nw17a9"; + sha256 = "aee46d9c43b98ac6d4ddf957cf75d4d0a5174ee814cc6b53dd6134dcedb459bf"; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ pysha3 pycrypto pycryptodome ]; + propagatedBuildInputs = [ + pysha3 + pycrypto + pycryptodome + ]; + + pipInstallFlags = [ + # Circular dependency on eth-utils + "--no-dependencies" + ]; # setuptools-markdown uses pypandoc which is broken at the moment preConfigure = '' diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 9c67f0816e37d..172647f0da701 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "1.9.5"; + version = "1.10.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-utils/issues/130 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1h3xlw74zdf6cfvqf9193lx05bpdm05pmy9ap1g7q2kx0j2b6352"; + sha256 = "sha256-sq3H4HmUFUipqVYleZxWLG1gBsQEoNwcZAXiKckacek="; }; checkInputs = [ pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 9966dd81d2ee3..4eaba48922a46 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.30.1"; + version = "0.30.2"; src = fetchPypi { inherit pname version; - sha256 = "d00649a7e17de0bcddff1a96311ed3baf1b295b3223d4b71aceafe7b45e6d6f8"; + sha256 = "1811b122d9a45eb5bafba092d36911bca825f835cb648a862bbf984030acff9d"; }; propagatedBuildInputs = [ dnspython greenlet monotonic six ] diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 706e4d8137fef..0cccedd54a91a 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "3.2.1"; + version = "4.1.0"; disabled = pythonOlder "3.5"; # tests are not present in the PyPI version @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "1sh780q2iwdm3bnlnfdacracf0n7jhbv0g39cdx65v3d510zp4jv"; + sha256 = "0lkhjiz78x00d5gzn455660f31f8y4fcrqcn6rh0m41r1ar5im17"; }; checkInputs = [ psutil requests-mock pyyaml diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 990908efe0346..8175e1ffb8370 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Faker"; - version = "5.5.1"; + version = "6.6.2"; src = fetchPypi { inherit pname version; - sha256 = "1bskhmiir1ajipj7j535j2mxgnp6s3mxbvlag4aryj9zbhgg1c19"; + sha256 = "f43ac743c34affb1c7fccca8b06450371cd482b6ddcb4110e420acb24356e70b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 55b9d3b3023f6..1cf4c6b30d436 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -3,24 +3,36 @@ , fetchPypi , six , monotonic +, diskcache +, more-itertools , testtools , isPy3k , nose -, futures +, futures ? null }: buildPythonPackage rec { pname = "fasteners"; - version = "0.15"; + version = "0.16"; src = fetchPypi { inherit pname version; - sha256 = "3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef"; + sha256 = "c995d8c26b017c5d6a6de9ad29a0f9cdd57de61ae1113d28fac26622b06a0933"; }; - propagatedBuildInputs = [ six monotonic ]; + propagatedBuildInputs = [ + six + monotonic + ]; - checkInputs = [ testtools nose ] ++ lib.optionals (!isPy3k) [ futures ]; + checkInputs = [ + diskcache + more-itertools + testtools + nose + ] ++ lib.optionals (!isPy3k) [ + futures + ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 0821778d024fd..3ad45be5322ff 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fastrlock"; - version = "0.5"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "9ae1a31f6e069b5f0f28ba63c594d0c952065de0a375f7b491d21ebaccc5166f"; + sha256 = "9f5d6ec9fe130b7490bb04572134392420b72bd0842185e02d461a797d6bc749"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index ac8e912ba3d45..8689250dc6f92 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.8.1"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1hzprnd407g2xh9kyv8j8pq949hwr1snmg3fp65pqfbghzv6i424"; + sha256 = "8680ee25238e2307596eb3900a0f8c0d9cc91189146ed8039544f1a3a69dfe6e"; }; propagatedBuildInputs = [ six cryptography ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 6f1d8181a5839..7c81967d070e0 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,15 +1,15 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , mock, pytest, pytestrunner -, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata +, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing ? null, importlib-metadata }: buildPythonPackage rec { pname = "flake8"; - version = "3.8.4"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b"; + sha256 = "78873e372b12b093da7b5e5ed302e8ad9e988b38b063b61ad937f26ca58fc5f0"; }; checkInputs = [ pytest mock pytestrunner ]; diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 57c95cf8800a1..8182344487e35 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "Flask-Caching"; - version = "1.9.0"; + version = "1.10.1"; disabled = isPy27; # invalid python2 syntax src = fetchPypi { inherit pname version; - sha256 = "a0356ad868b1d8ec2d0e675a6fe891c41303128f8904d5d79e180d8b3f952aff"; + sha256 = "cf19b722fcebc2ba03e4ae7c55b532ed53f0cbf683ce36fafe5e881789a01c00"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index dd018d84a6d39..a49aefd5ebcd1 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "3.25.1"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "bbf4467f41c56cf1fd8a5870d2556f419c572aad2b4085757581c3f9b4d7767a"; + sha256 = "77ca23f23e80480ea42b9c1d9b0fca214e08db7192583e782c2421416b4a4655"; }; propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index ad43533123690..e26cac70b3cac 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "flask-mongoengine"; - version = "0.9.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "05hfddf1dm594wnjyqhj0zmjfsf1kpmx1frjwhypgzx4hf62qcmr"; + sha256 = "10g9b13ls2msnhv8j44gslrfxa2ppqz2y1xjn2a4gg4m9mdjv8b2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 1bac82fb44f6b..421bc95332b29 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.4.4"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1rgsj49gnx361hnb3vn6c1h17497qh22yc3r70l1r6w0mw71bixz"; + sha256 = "2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; }; propagatedBuildInputs = [ flask sqlalchemy ]; diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 53a1e0651f366..a4c6b99b07f4e 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -3,12 +3,13 @@ , flit , isPy3k , toml +, pytestCheckHook +, testpath }: buildPythonPackage rec { pname = "flit-core"; - version = "2.3.0"; - disabled = !isPy3k; + version = "3.2.0"; format = "pyproject"; inherit (flit) src patches; @@ -21,6 +22,11 @@ buildPythonPackage rec { toml ]; + checkInputs = [ + pytestCheckHook + testpath + ]; + passthru.tests = { inherit flit; }; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index c63fd1edeaf93..38369dfd4d2f9 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -21,30 +21,20 @@ buildPythonPackage rec { pname = "flit"; - version = "3.0.0"; - disabled = !isPy3k; + version = "3.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "takluyver"; repo = "flit"; rev = version; - sha256 = "zk6mozS3Q9U43PQe/DxgwwsBRJ6Qwb+rSUVGXHijD+g="; + sha256 = "sha256-zN+/oAyXBo6Ho7n/xhOQ2mjtPGKA1anCvl3sVf7t+Do="; }; nativeBuildInputs = [ flit-core ]; - # Use toml instead of pytoml - # Resolves infinite recursion since packaging started using flit. - patches = [ - (fetchpatch { - url = "https://github.com/takluyver/flit/commit/b81b1da55ef0f2768413669725d2874fcb0c29fb.patch"; - sha256 = "11oNaYsm00/j2046V9C0idpSeG7TpY3JtLuxX3ZL/OI="; - }) - ]; - propagatedBuildInputs = [ docutils requests diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index aa6831441d898..c14b169bea958 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -4,9 +4,9 @@ , fetchPypi , six , appdirs -, scandir -, backports_os -, typing +, scandir ? null +, backports_os ? null +, typing ? null , pytz , enum34 , pyftpdlib diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 129eaae340a14..14e1fc1c60986 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, lib, fetchFromGitHub, pytest -, typing, funcsigs, pythonOlder +, typing ? null, funcsigs ? null, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index a28bcfb0ec1b9..9d9cc2095e62b 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "4.2.0"; + version = "5.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5526cc2a06bfad707d10ec118393e0d33c2aa524605255d96958c22c93e8e7aa"; + sha256 = "a4a8d8b1ab629757b557d3bcb98a5a77790a3d00b320f5f881a1754cf0e21086"; }; nativeBuildInputs = [ setuptools pytestrunner ]; diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 5c3bd4ac43fc5..1ad0b320da84a 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ smmap ]; + postPatch = '' + substituteInPlace setup.py --replace ",<4" "" + ''; + # Bunch of tests fail because they need an actual git repo doCheck = false; diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index b0eea600384e1..6c371496ffafc 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -4,7 +4,6 @@ , pkg-config , gtk3 , gobject-introspection -, pygtk , pygobject3 , goocanvas2 , isPy3k diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 5c684ca126e9a..294c41e6e7c13 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.25.1"; + version = "1.26.2"; src = fetchPypi { inherit pname version; - sha256 = "0e152ec37b8481d1be1258d95844a5a7031cd3d83d7c7046d9e9b2d807042440"; + sha256 = "418a131cd349e8bda036741d93e7fb9caefa691daa7296851193edc60b3c946c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index bb7836ef85d18..ceaec714176f7 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-auth-httplib2"; - version = "0.0.4"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0fdwnx2yd65f5vhnmn39f4xnxac5j6x0pv2p42qifrdi1z32q2cd"; + sha256 = "a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 7fa7200fbbe57..d57de82d45954 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "1nai9k86g7g7w1pxk105dllncgax8nc5hpmk758b3jnqkb1mpdk5"; + sha256 = "54431535309cfab50897d9c181e8c2226268825aa6e42e930b05b99c5041a18c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index cf456317f8cb9..458a24cc64882 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.24.0"; + version = "1.28.0"; src = fetchPypi { inherit pname version; - sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb"; + sha256 = "9bd436d19ab047001a1340720d2b629eb96dd503258c524921ec2af3ee88a80e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index ccc8aa83975fd..8aff49154721d 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "c5669410018eb41cecf6f9c90136d24d0ca9ed141bda8fbb3d52cd3de7162960"; + sha256 = "98065257189388b6cc797478c4b2bdf86e9e8cdcaca5d170ded027646444a586"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 44764a4edb1c1..3ac6544c15647 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "01liq4nrd2g3ingg8v0ly4c86db8agnr9h1fiz219c7fz0as0xqj"; + sha256 = "c6abb18527545379fc82efc4de75ce9a3772ccad2fc645adace593ba097cbb02"; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index bbd51326e0f22..b124c62a6e6de 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "2fd6fe25343f7017c22e2733a0358c64b3171edc1669d0c8a1e1f07f86a048c4"; + sha256 = "cba8409f6e2c9822e7034c10fe1b1f7e566e1affa66e8be91badae69962142f9"; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 60783d3ded7d7..859dbf2a02b6b 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "639408cac9660b6c7c2324bf1b2461c9c8e338518b9ebb7ebfac833a61d753eb"; + sha256 = "9c21e1c0976805022f5358debfcf3fca2640050bd8e745d31547ad6e129e5b18"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 10ee559b8f0b4..a950665b4d150 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "0.1.2"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0ncgcnbvmgqph54yh2pjx2hh82gnkhsrw5yirp4wlf7jclh6j9xh"; + sha256 = "b463704affab327c1d3fa4af280a858635b5f59a88456b2a08db62a336a352aa"; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index c4849dd2f5593..a330ef65cd683 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.0.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "060c53bc6f541660a2fe868fd83a695207d4e7b050e04fe103d1e77634b813c7"; + sha256 = "41f9cb72d821fae0ccff518f3d5db49de82e0fe138518802c68fbc6a85fcd9b6"; }; propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ]; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 84706a8b5a91b..2ad5417165c4a 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.35.1"; + version = "1.36.2"; src = fetchPypi { inherit pname version; - sha256 = "dc076b6af6da991252416639cb93831f8e50c8328d5ac3fb8e03e40cd8de2290"; + sha256 = "89d3a101c8ca3aae7614253a03a2e7fe77c5e799469df2d4ec44044cccac1ad8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 2380e9183b733..559a3011b83b0 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "0.1.0"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1bn1pz00lxym3vkl6l45b3nydpmfdvmylwggh2lspldrxwx39a0k"; + sha256 = "a23be7cc23bccb1ae6debb74a47dc5b51858b6322fcf034ca92fe7a4acb896f3"; }; propagatedBuildInputs = [ google-auth six ]; diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 267e0e5f08aed..3a7c0510ad010 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.52.0"; + version = "1.53.0"; src = fetchPypi { inherit pname version; - sha256 = "0lakcsd35qm5x4visvw6z5f1niasv9a0mjyf2bd98wqi0z41c1sn"; + sha256 = "a88ee8903aa0a81f6c3cec2d5cf62d3c8aa67c06439b0496b49048fb1854ebf4"; }; propagatedBuildInputs = [ grpc protobuf ]; diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 81260110f929b..d2d6a78436ac4 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , django , memcached , txamqp @@ -9,7 +11,6 @@ , cairocffi , whisper , whitenoise -, scandir , urllib3 , six }: @@ -38,7 +39,6 @@ buildPythonPackage rec { cairocffi whisper whitenoise - scandir urllib3 six ]; diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 9d00e93739c3a..846c3d24ef51e 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -8,20 +8,18 @@ buildPythonPackage rec { pname = "greenlet"; - version = "0.4.17"; + version = "1.0.0"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "0swdhrcq13bdszv3yz5645gi4ijbzmmhxpb6whcfg3d7d5f87n21"; + sha256 = "719e169c79255816cdcf6dccd9ed2d089a72a9f6c42273aae12d55e8d35bdcf8"; }; propagatedBuildInputs = [ six ]; - # see https://github.com/python-greenlet/greenlet/issues/85 - preCheck = '' - rm tests/test_leaks.py - ''; + # No tests in archive + doCheck = false; meta = { homepage = "https://pypi.python.org/pypi/greenlet"; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 0fe6b9343eb3c..dadb9b527620f 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,8 +3,8 @@ , grpc , six , protobuf -, enum34 -, futures +, enum34 ? null +, futures ? null , isPy27 , pkg-config , cython diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 8eefb1f4318b5..cba42a2c00d75 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "1.9.3"; + version = "2.4.1"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "v${version}"; - sha256 = "07hw29r2inyp493dia4fx3ysfr1wxi2jb3n9cmwdi0l54s2ahqvf"; + sha256 = "02zxfmqw7a5kz8qjdph9a9961mbkd4haxwwa28yjkxs5hzs5x3c8"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index c8149a5fed8aa..38da1e75ad6f9 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.6.10"; + version = "1.6.12"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "11w8z9ik6zzv3pw3319mz91cgbfkgx0mffxbapqnhilzij2jad4q"; + sha256 = "0r6w52vji1095n3wgzjz9ddaqsvsf3f4gal0rv5i62hpqwlbzkn7"; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index d0c1e74ee290d..0450dfd07e585 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.1.1"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1c530pb0h34z0ziym256qps21b8mh533ia1lcnx9wqwx9rnqriki"; + sha256 = "8305e0086129614a8820a508303f98f56c584811489499bcc54a7ea6f1b0391e"; }; # Tests require more packages. diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 263bdfa2f4784..126606af73a94 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.17.3"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6"; + sha256 = "a0dcd25c1373f3938f4cb4565f74f434fba6faefb73a42d09c9dddd0c08af53e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index c167e2115c66b..7bf1df61c0dc0 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -8,13 +8,13 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.1"; pname = "h5py"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1e2516f190652beedcb8c7acfa1c6fa92d99b42331cbef5e5c7ec2d65b0fc3c2"; + sha256 = "89474be911bfcdb34cbf0d98b8ec48b578c27a89fdb1ae4ee7513f1ef8d9249e"; }; # avoid strict pinning of numpy diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index a7ec358ffd7b5..cf3f80d7ed415 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "habanero"; - version = "0.6.0"; + version = "0.7.4"; # Install from Pypi is failing because of a missing file (Changelog.rst) src = fetchFromGitHub { owner = "sckott"; repo = pname; rev = "v${version}"; - sha256 = "1l2cgl6iiq8jff2w2pib6w8dwaj8344crhwsni2zzq0p44dwi13d"; + sha256 = "1d8yj9xz5qabcj57rpjzvg0jcscvzrpb0739mll29nijbsaimfr1"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 4c74621b483b6..b7bd002c36786 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.2.0.post1"; + version = "10.3.0"; src = fetchPypi { inherit pname version; - sha256 = "391aa877a61ed04c58b8d82d465b3771f632bb9b19f22cbf18f0e5a1f42f8d4e"; + sha256 = "5d7f73fc1c357134ae9b4a3ed2d844ab8e75a4ca1303679a9e150e87617e7bc7"; }; doCheck = false; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index ef66870ddfd7d..5db7d6d025453 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { - version = "3.2.0"; + version = "3.3.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "09ph6fd1362xdn2hgwdgh30z0zqjp3bgvr1akyvm36b8jm400sdb"; + sha256 = "8bf7abd672b867f38b8b04593829b85b9b6199a61ef6586bf3629cc06458ff35"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index bab7986eda223..ad56de86782b4 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -1,12 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing }: +{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing ? null }: buildPythonPackage rec { pname = "hyperlink"; - version = "20.0.1"; + version = "21.0.0"; src = fetchPypi { inherit pname version; - sha256 = "47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af"; + sha256 = "427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b"; }; propagatedBuildInputs = [ idna ] diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 5b2869e10d192..86b43465fb648 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hyppo"; - version = "0.1.3"; + version = "0.2.1"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "neurodata"; repo = pname; rev = "v${version}"; - sha256 = "0qdnb1l4hz4dgwhapz1fp9sb2vxxvr8h2ngsbvyf50h3kapcn19r"; + sha256 = "0izjc68rb6sr3x55c3zzraakzspgzh80qykfax9zj868zypfm365"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/idna/2.nix b/pkgs/development/python-modules/idna/2.nix new file mode 100644 index 0000000000000..9a1c1dc271f19 --- /dev/null +++ b/pkgs/development/python-modules/idna/2.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "idna"; + version = "2.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = { + homepage = "https://github.com/kjd/idna/"; + description = "Internationalized Domain Names in Applications (IDNA)"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 613fde773a719..9bb639f95d5e1 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -1,17 +1,20 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook }: buildPythonPackage rec { pname = "idna"; - version = "2.10"; + version = "3.1"; src = fetchPypi { inherit pname version; - sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"; + sha256 = "c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1"; }; + checkInputs = [ pytestCheckHook ]; + meta = { homepage = "https://github.com/kjd/idna/"; description = "Internationalized Domain Names in Applications (IDNA)"; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 307c25e724eea..71bed73f9d7b7 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.2"; + version = "0.4.4.post1"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "00vcmhnp14s54g386izgaxzrdr2nqv3pz9nvpyiwrn33zawr308z"; + sha256 = "1a7vs4dzm5lmyck50ygi3j2d2wd6nxr5x91dpx0rmf97i6lywpyb"; }; checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 67920dc7b7d80..2b334fd121ce1 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -10,7 +10,7 @@ , numpy , isPy3k , ffmpeg_3 -, futures +, futures ? null , enum34 }: diff --git a/pkgs/development/python-modules/importlib-metadata/2.nix b/pkgs/development/python-modules/importlib-metadata/2.nix new file mode 100644 index 0000000000000..71dcd950db2c2 --- /dev/null +++ b/pkgs/development/python-modules/importlib-metadata/2.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, zipp +, pathlib2 +, contextlib2 +, configparser +, isPy3k +, importlib-resources +, packaging +}: + +buildPythonPackage rec { + pname = "importlib-metadata"; + version = "2.1.1"; + + src = fetchPypi { + pname = "importlib_metadata"; + inherit version; + sha256 = "1pdmsmwagimn0lsl4x7sg3skcr2fvzqpv2pjd1rh7yrm5gzrxpmq"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ zipp ] + ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ]; + + # Cyclic dependencies + doCheck = false; + + pythonImportsCheck = [ "importlib_metadata" ]; + + meta = with lib; { + description = "Read metadata from Python packages"; + homepage = "https://importlib-metadata.readthedocs.io/"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index edab68aa18a33..4149de3f43ae5 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -1,42 +1,41 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, pythonOlder +, setuptools-scm +, typing-extensions +, toml , zipp -, pathlib2 -, contextlib2 -, configparser -, isPy3k -, importlib-resources -, packaging }: buildPythonPackage rec { pname = "importlib-metadata"; - version = "1.7.0"; + version = "3.7.3"; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "10vz0ydrzspdhdbxrzwr9vhs693hzh4ff71lnqsifvdzvf66bfwh"; + sha256 = "742add720a20d0467df2f444ae41704000f50e1234f46174b51f9c6031a1bd71"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ zipp ] - ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ]; + propagatedBuildInputs = [ + toml + zipp + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; - doCheck = false; # Cyclic dependencies. - - # removing test_main.py - it requires 'pyflakefs' - # and adding `pyflakefs` to `checkInputs` causes infinite recursion. - preCheck = '' - rm importlib_metadata/tests/test_main.py - ''; + # Cyclic dependencies due to pyflakefs + doCheck = false; + pythonImportsCheck = [ "importlib_metadata" ]; meta = with lib; { description = "Read metadata from Python packages"; homepage = "https://importlib-metadata.readthedocs.io/"; license = licenses.asl20; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index ccb2190cf0454..cd8fec1e54e06 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -4,19 +4,19 @@ , setuptools_scm , toml , importlib-metadata -, typing -, singledispatch +, typing ? null +, singledispatch ? null , pythonOlder , python }: buildPythonPackage rec { pname = "importlib_resources"; - version = "3.3.1"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0ed250dbd291947d1a298e89f39afcc477d5a6624770503034b72588601bcc05"; + sha256 = "642586fc4740bd1cad7690f836b3321309402b20b332529f25617ff18e8e1370"; }; nativeBuildInputs = [ setuptools_scm toml ]; diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index 6241bc869c1c9..6cbed7221a8fe 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "incremental"; - version = "17.5.0"; + version = "21.3.0"; src = fetchPypi { inherit pname version; - sha256 = "7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3"; + sha256 = "02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 49cf660bf568e..41207295a2c91 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "intake"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f09800203fcaf1512f9234e54dbd07ec2b5217aafd21716385725ec052f5a52e"; + sha256 = "b0cab1d185a703acb38eecb9cff3edd5cc7004fe18a36d5e42a8f7fffc9cca1c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 45f3ee7a04db3..08d72cec4961a 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "de3f23bfe669e3db1085789fd859eb8ca8e0c5d9c20811e2407fa042e8a5e15d"; + sha256 = "f0c560075b5fb29ba14dad44a7185514e94970d1b9d57dcd3723bec5fed92650"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 7b8c877371cde..fbdfd5b7900a3 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.13.4"; + version = "0.13.7"; disabled = isPyPy || isPy27; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "c85398b5fb82f82399fc38c44fe3532c0dde1754abee727d8f5cfcc74547b334"; + sha256 = "178c367a61c1039e44e17c56fcc4a6e7dc11b33561261382d419b6ddb4401810"; }; propagatedBuildInputs = [ ipython ]; diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix index c97eafb6054c4..94af30c11ea9c 100644 --- a/pkgs/development/python-modules/ipfsapi/default.nix +++ b/pkgs/development/python-modules/ipfsapi/default.nix @@ -6,16 +6,16 @@ , requests }: -buildPythonPackage { +buildPythonPackage rec { pname = "ipfsapi"; - version = "0.4.2.post1"; + version = "0.7.0"; disabled = isPy27; src = fetchFromGitHub { owner = "ipfs"; repo = "py-ipfs-api"; - rev = "0c485544a114f580c65e2ffbb5782efbf7fd9f61"; - sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn"; + rev = version; + sha256 = "02yx7x9pdnfcav4vqd6ygqcisd3483b0zbx2j4brb4gxixk2hlyj"; }; propagatedBuildInputs = [ six requests ]; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index e6e1e605cca57..a0efa9b575db0 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "ipydatawidgets"; - version = "4.1.0"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d9f94828c11e3b40350fb14a02e027f42670a7c372bcb30db18d552dcfab7c01"; + sha256 = "d0e4b58b59b508165e8562b8f5d1dbfcd739855847ec0477bd9185a5e9b7c5bc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 4efe8b176c524..44c8c7bfd061f 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.5.8"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0e2f2e540a2dfea61524b7993fc8552c9236b1aaa3826e1f382c75cb2fa5c382"; + sha256 = "f0f1f356d8cb9d4fb51bb86dbbf837c190145316cb72f66081872ebc4d6db0a1"; }; propagatedBuildInputs = [ ipywidgets matplotlib ]; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 297b87d5745b6..2c5692bf26a9e 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -11,7 +11,7 @@ , ipykernel , tornado , isPy3k -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index c63cee7912324..b581c49d43f44 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.5.1"; + version = "1.6.2"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "593f5d6761e304cbb78bca967030485d8835e8d310ef7d83ac1b0e6a13e4911c"; + sha256 = "056776d359b55343442f707cb4ccd5607800599a36bee06e1f01ef0277f03ddc"; }; propagatedBuildInputs = [ ipyvue ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 5f2b3299a0241..eb6bf597d40b9 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.5.1"; + version = "7.6.3"; src = fetchPypi { inherit pname version; - sha256 = "e945f6e02854a74994c596d9db83444a1850c01648f1574adf144fbbabe05c97"; + sha256 = "9f1a43e620530f9e570e4a493677d25f08310118d315b00e25a18f12913c41f0"; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index a62d5068f7767..da44563208eb2 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.18"; + version = "1.19"; src = fetchPypi { inherit pname version; - sha256 = "88ca7dd76242205dc82761bf98932a42e6c1ba338cb065f1cc775413ef4e0dc2"; + sha256 = "04fad95b2258135814677317529654ab0de92b0a4576e4410689181a6a535805"; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 3c37755366d08..eac4e2ca328aa 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.0.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "be570ef4f2e7290b757449395238fa63d70a9255574624e73c5ff9f1ee554721"; + sha256 = "6d179770493c4f5802395ae5a29e07c66d826dc3cd680ad0b0f0fb9fd6cdf533"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index eb176d0d85751..3fa4de9f3d950 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.0.1"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "9fedc4be3117512ca3e03e1b2ffa7a6a6ffa589bfb7d02bfb324e55d493b94f4"; + sha256 = "97cf88b46ab544c266e2d81fa17bb183622268722a7dd1a3711ea426e9c26f94"; }; nativeBuildInputs = [ setuptools_scm toml ]; diff --git a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch deleted file mode 100644 index 2dcf7d6486261..0000000000000 --- a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fd56b0d85393d684bd3bf99f33d8638da884282f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Thu, 25 Jun 2020 09:52:11 +0100 -Subject: [PATCH] disable flake8/black8/coverage from tests -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - pytest.ini | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pytest.ini b/pytest.ini -index 5027d34..4e2a2d2 100644 ---- a/pytest.ini -+++ b/pytest.ini -@@ -1,5 +1,5 @@ - [pytest] - norecursedirs=dist build .tox .eggs --addopts=--doctest-modules --flake8 --black --cov -+addopts=--doctest-modules - doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES - filterwarnings= --- -2.27.0 - diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index f5d0b0538b669..91bb83fdb5a4d 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -4,21 +4,17 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "5.0.0"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - sha256 = "6447d567f57efe5efea386265c7864652e9530830a1b80f43e60b4f222b9ab84"; + sha256 = "6939e47806a39330a9f9772bf9ea910da39abc159ff2579d454a763358553439"; }; pythonNamespaces = [ "jaraco" ]; nativeBuildInputs = [ setuptools_scm ]; - patches = [ - ./0001-Don-t-run-flake8-checks-during-the-build.patch - ]; - propagatedBuildInputs = [ inflect more-itertools six ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index 4a6391fbc4891..e378240e6cccb 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.logging"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "31716fe84d3d5df39d95572942513bd4bf8ae0a478f64031eff4c2ea9e83434e"; + sha256 = "150dc8701207b28bc65a16f0e91c07250a8d1b9da324ce674c0e375774944f13"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index 9a4f6d972450e..f62cb1db8ba88 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jaraco.stream"; - version = "3.0.0"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "287e1cba9f278e0146fdded6bc40518930813a5584579769aeaa1d0bfd178a73"; + sha256 = "86c57fedffd4d5a4b18817f99ddf62ac8ed0a1bc31a1c41b9a88df9c6bb56e0b"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index c61c8f689ddc5..fb945d5b3f6fa 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.2.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1v0hz3h74m31jlbc5bxwkvrx1h2n7887bajrg1n1c3yc4q8qn1z5"; + sha256 = "f07f1076814a17a98eb915948b9a0dc71b1891c833588066ec1feb04ea4389b1"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index a9acf380da102..dd3c027bca20c 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -5,14 +5,15 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "javaproperties"; + format = "pyproject"; src = fetchFromGitHub { owner = "jwodder"; repo = pname; rev = "v${version}"; - sha256 = "14dlzwr4gxlbgjy012i4pqs2rn2rmp21w8n1k1wwjkf26mcvrq5s"; + sha256 = "0n6dz6rnpq8wdwqyxqwv0q7vrl26vfmvvysdjvy557fck1q2l0kf"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 9c54418bafefa..e8d2ced7602b4 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "joblib"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "092bnvr724cfvka8267z687bf086fvm7i1hwslkyrzf1g836dn3s"; + sha256 = "9c17567692206d2f3fb9ecf5e991084254fe631665c450b443761c4186a613f7"; }; checkInputs = [ sphinx numpydoc pytestCheckHook ]; diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 3f30da8da9b45..c46e937194dc3 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -1,31 +1,31 @@ -{ lib, fetchPypi, buildPythonPackage -# buildInputs -, six -, setuptools -, pyopenssl +{ lib +, fetchPypi +, buildPythonPackage , cryptography +, pyopenssl +, setuptools , mock , pytestCheckHook }: buildPythonPackage rec { pname = "josepy"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "d265414fa16d7a8b7a1d1833b4ebb19a22bd0deae5d44413cf9040fd8491d85a"; + sha256 = "a5a182eb499665d99e7ec54bb3fe389f9cbc483d429c9651f20384ba29564269"; }; postPatch = '' # remove coverage flags sed -i '/addopts/d' pytest.ini + sed -i '/flake8-ignore/d' pytest.ini ''; propagatedBuildInputs = [ pyopenssl cryptography - six setuptools ]; diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 8971bac4b4970..f77412e4cc145 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.27"; + version = "1.32"; src = fetchPypi { inherit pname version; - sha256 = "4d08af10d71723b5b2924da6ba90f273a4d1a5c6accfb605eb970cb2f9b29cf9"; + sha256 = "b6ddfe6c3db30d81a96aaeceb6baf916094ffa23d7dd5fa2c13e13f8b6e600c2"; }; # test files are missing diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index abf3c27e98ff1..78d2a5f6c8cea 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "1.4.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c9b99b28a9e6a3043ec993552db79f4389da11afcb1d0246d93c79f4b5e64062"; + sha256 = "0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index e1eaaed6c1784..39249c648f561 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpointer"; - version = "2.0"; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "0qjkjy1qlyc1nl3k95wd03ssxac0a717x8889ypgs1cfcj3bm4n1"; + sha256 = "5a34b698db1eb79ceac454159d3f7c12a451a91f6334a4f638454327b7a89962"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 00f0d748bbb00..5576196811ab1 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "1.1.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "383f331e28cd8f6e3fa86f3e7052efa541b7ae8bf328a4e692aa045cfc0ecf25"; + sha256 = "52b1cfe584df8bc2d19930fc18c5e982378690c825ba6916103724195ba52099"; }; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index db47a2240fb6c..bb9dc6bd33e87 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jsonrpc-base"; - version = "1.1.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "7f374c57bfa1cb16d1f340d270bc0d9f1f5608fb1ac6c9ea15768c0e6ece48b7"; + sha256 = "a583a6646cf3860a427d56ea6732e04618a919c5ea4a78d3dcb44d866c11a8e5"; }; propagatedBuildInputs = [ ]; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index bf8960ad27d99..44e3b1a68e5ad 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "1.2.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c343d057b572791ed3107b771c17358bc710772a9a6156047a3cfafb409ed895"; + sha256 = "10a5490479970b5b7093b4345528c538a1e1a51d9c58ae09ca2742fa6547bc3a"; }; nativeBuildInputs = [ pep8 ]; diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index 7646c007818cb..0750744885d35 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "Jug"; - version = "2.0.3"; + version = "2.1.1"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3656355c1f9cd1731065c9d589f66d33653cbe5e0879cbe5d8447b51e4ddb4ec"; + sha256 = "8ae7bb45d4495cf3d0dc5dd9df104a35bba2ca83eb4576732cadf8469e7cf1a1"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index fdc28f08ef4b9..60077e5bcf07d 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -1,22 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, deprecation , pythonOlder , packaging , pytestCheckHook +, tomlkit }: buildPythonPackage rec { pname = "jupyter-packaging"; - version = "0.7.12"; + version = "0.8.0"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-sUAyV3GIGn33t/LRSZe2GQY/51rnVrkCWFLkNGAAu7g="; + pname = "jupyter_packaging"; + inherit version; + sha256 = "276c9f884286695f6ab57a017f4bb9dd4df4f5e232b783050d2aa55b6b9ed650"; }; - propagatedBuildInputs = [ packaging ]; + propagatedBuildInputs = [ deprecation packaging tomlkit ]; checkInputs = [ pytestCheckHook ]; @@ -24,8 +27,16 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - # disable tests depending on network connection - disabledTests = [ "test_develop" "test_install" ]; + disabledTests = [ + # disable tests depending on network connection + "test_develop" + "test_install" + # Avoid unmainted "mocker" fixture library, and calls to dependent "build" module + "test_build" + "test_npm_build" + "test_create_cmdclass" + "test_ensure_with_skip_npm" + ]; pythonImportsCheck = [ "jupyter_packaging" ]; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 027ae2e40c8df..7597df0d76aae 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "2021.1.0"; + version = "2021.3.0"; pname = "jupyter-repo2docker"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "3e3e671407ef2a7f7695338dc6ce2ca9cc75683ffc7a543829cf119564aca802"; + sha256 = "42e0cf67181bdd03b54dabde695befec0586ed68a4ec1240104e209997d776c4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 456e82e75f184..5f534557a9ad7 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "6.1.11"; + version = "6.1.12"; src = fetchPypi { inherit pname version; - sha256 = "649ca3aca1e28f27d73ef15868a7c7f10d6e70f761514582accec3ca6bb13085"; + sha256 = "c4bca1d0846186ca8be97f4d2fa6d2bae889cce4892a167ffa1ba6bd1f73e782"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 712117d50113b..22e057a5654e0 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.3.0"; + version = "6.4.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "947f66bbdeee2221b4fb3a6b78225d337b8f10832f14cecf7932183635abe1d9"; + sha256 = "242248e1685039cd8bff2c2ecb7ce6c1546eb50ee3b08519729e6e881aec19c7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index a9f98781b4fba..1af7d693588b4 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "jupyter_server"; - version = "1.4.1"; + version = "1.5.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sBJvI39nlTPuxGJEz8ZtYeOh+OwPrS1HNS+hnT51Tkc="; + sha256 = "ff127713a57ab7aa7b23f7df9b082951cc4b05d8d64cc0949d01ea02ac24c70c"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index ba627449c123a..eedfcfbcb6e98 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.7.1"; + version = "1.11.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "23123b90c267c67716fe6a022dfae49b84fd3809370d83211f2920eb3106bf40"; + sha256 = "9062d001baaa32430fbb94a2c9394ac906db0a58da94e7aa4e414b73fd7d51bc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 6b4568cd748dc..cd51661bde052 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "1v0ns26ykskn0dpbvz9g6lz4q740qmahvddj3pc3rfbjvg43p3vh"; + sha256 = "0yi27wzb4q371y4bywi4hz37h4x63wjsyaa2mbx0rgc8xl2wm6yz"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 3e26079f12356..e7340561cdc55 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,43 +1,45 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonOlder -, dbus-python -, entrypoints +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +, setuptools-scm , importlib-metadata -, pytest -, pytest-flake8 +, dbus-python +, jeepney , secretstorage -, setuptools_scm -, toml +, pytestCheckHook }: buildPythonPackage rec { pname = "keyring"; - version = "21.5.0"; - disabled = isPy27; + version = "23.0.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "207bd66f2a9881c835dad653da04e196c678bf104f8252141d2d3c4f31051579"; + sha256 = "045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8"; }; nativeBuildInputs = [ - setuptools_scm - toml + setuptools-scm ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ dbus-python entrypoints ] - ++ lib.optional stdenv.isLinux secretstorage - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ] ++ lib.optionals stdenv.isLinux [ + dbus-python + jeepney + secretstorage + ]; - # checks try to access a darwin path on linux - doCheck = false; + pythonImportsCheck = [ "keyring" ]; meta = with lib; { description = "Store and access your passwords safely"; - homepage = "https://pypi.python.org/pypi/keyring"; - license = licenses.psfl; - maintainers = with maintainers; [ lovek323 ]; + homepage = "https://github.com/jaraco/keyring"; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 dotlambda ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index 548896b472863..6c173661084c2 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "kmapper"; - version = "1.4.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "3bb09d016ae0dc3308c2901f0775139a26e7f689afacea564a74e5627de35cd7"; + sha256 = "3708d889f96f6bbe89c52000dd9378ca4c35638180ff894b64ebbdfcfe62aab2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 1c29d7473681e..ce7cff4d79b87 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.4.11"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "e5a631a94ac2059648a884bebf39f7ca1e689baef4a2497f9aa5ec598e24deb7"; + sha256 = "7f2cbc5d4869d8acde865ad519fc1cc85338247cd7cf534334f988a040679219"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index f9d90e42686b0..485bc44ff6e2c 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "langcodes"; - version = "2.1.0"; + version = "3.1.0"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "75bcaca8825e1a321965b136815dee53083c63314975e024ad0ccff8545e681f"; + sha256 = "1ccd37e3a68760d29ec3b17f5962cd1d8f242f4d9705ad1601c5cb7fab48199c"; }; propagatedBuildInputs = [ marisa-trie ]; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 82a784cfe3c68..9eaae90f46ed1 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -1,26 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , setuptools_scm }: buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.5.2"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "5944a9b95e97de1980c65f03b79b356f30a43de48682b8bdd90aa5089f0ec1f4"; + sha256 = "489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ + setuptools_scm + ]; - checkInputs = [ pytest ]; - checkPhase = '' - py.test tests + postPatch = '' + substituteInPlace pyproject.toml --replace ",<6.0" "" + substituteInPlace setup.cfg --replace ",<6.0" "" ''; + checkInputs = [ + pytestCheckHook + ]; + # Broken tests. Seem to be fixed upstream according to Travis. doCheck = false; diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 71af0d294a2d2..3c613d74e2725 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.8.1"; + version = "2.9"; src = fetchPypi { inherit pname version; - sha256 = "37d633e20fa360c302b1263c96fe932d40622d0119f1bddcb829b03462eeeeb7"; + sha256 = "18c3ee656a6775b9b0d60f7c6c5b094d878d1d90fc03d56731039f0a4b546a91"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 567ad2cf4892e..d061356490cba 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -17,13 +17,13 @@ assert cudaSupport -> nvidia_x11 != null buildPythonPackage rec { pname = "libgpuarray"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "Theano"; repo = "libgpuarray"; rev = "v${version}"; - sha256 = "0zkdwjq3k6ciiyf8y5w663fbsnmzhgy27yvpxfhkpxazw9vg3l5v"; + sha256 = "0ksil18c9ign4xrv5k323flhvdy6wdxh8szdd3nivv31jc3zsdri"; }; # requires a GPU diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index 4bc2dfa2ffda2..fb77eeed4c2c0 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libversion"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "cf9ef702d0bc750f0ad44a2cffe8ebd83cd356b92cc25f767846509f84ea7e73"; + sha256 = "e6e903cc6307c3eda90401373eb81bfd0dd2dc93772ddab3d23705bed0c6f6e9"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index 97d80fbbbda7e..ecf5990e74bc4 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.4.2"; + version = "1.5.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1h5kqpvlx7xppd2wli986lkslqkcrlz1wixv7fvrppzjc2nfz5d4"; + sha256 = "1l6cvm8vs2gkmg4qwg5m5vqjql1gah2vd9vs7pcj2v5hf0cm5v9x"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index 98878c90640f8..b77cf430717c0 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -4,8 +4,8 @@ , isPyPy , pycrypto , requests -, singledispatch -, futures +, singledispatch ? null +, futures ? null , isPy27 }: diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 609dcb82237de..b5e6847a9f0c9 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.35.0"; + version = "0.36.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "80e51d5aa02ad72da9870e89d21f9b152b0220ca551b4596a6c0614bcde336fc"; + sha256 = "765128fdf5f149ed0b889ffbe2b05eb1717f8e20a5c87fa2b4018fbcce0fcfc9"; }; nativeBuildInputs = [ llvm ]; diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index f3e7a86a2aaea..fc7748765f31d 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "1.0.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "4136ffdf0aad61da86d1402808029d002a771b2a9ccc9b39c6bcafa7847c21b6"; + sha256 = "165cd1669b29b16c2d5cc8902b90fede15a7ee475c54d466f1444877a3f511ac"; }; buildInputs = [ lmdb ]; diff --git a/pkgs/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix index 015d387f27d88..4e3ffd255e078 100644 --- a/pkgs/development/python-modules/logzero/default.nix +++ b/pkgs/development/python-modules/logzero/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "logzero"; - version = "1.6.3"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1435284574e409b8ec8b680f276bca04cab41f93d6eff4dc8348b7630cddf560"; + sha256 = "7f73ddd3ae393457236f081ffebd044a3aa2e423a47ae6ddb5179ab90d0ad082"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 94b575f3f4681..219a9066dc74d 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.12.0"; + version = "3.15.0"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "SpamScope"; repo = pname; rev = "v${version}"; - sha256 = "0p851jlly6bzcs70kd1lcjwmg4scwh1icymfc0f2y6rkh4kfsdhk"; + sha256 = "0da2qr4p8jnjw6jdhbagm6slfcjnjyyjkszwfcfqvcywh1zm1sdw"; }; LC_ALL = "en_US.utf-8"; diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index b9d57a7c0899f..2019d7e31805c 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "manhole"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "d4ab98198481ed54a5b95c0439f41131f56d7d3755eedaedce5a45ca7ff4aa42"; + sha256 = "224985bf1dd032f2dc0ca4107f727835b6f50e1df6d78781d6c9f4cae8b585e2"; }; # test_help expects architecture-dependent Linux signal numbers. diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 2d915762fca22..c7a8a3e17f3e7 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "markdown-it-py"; - version = "0.5.6"; + version = "0.6.2"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = "markdown-it-py"; rev = "v${version}"; - sha256 = "1m9g8xvd7jiz80x9hl8bw9x0ppndqq5nlcn5y8bjxnfj5s31vpbi"; + sha256 = "1g9p8pdnvjya436lii63r5gjajhmbhmyh9ngbjqf9dqny05nagz1"; }; propagatedBuildInputs = [ attrs ]; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 22b0d5c27f89e..c0175a2e888b9 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Markdown"; - version = "3.3.3"; + version = "3.3.4"; src = fetchPypi { inherit pname version; - sha256 = "5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18"; + sha256 = "31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index afc378d4aaa88..a7ca14beb9425 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.9.1"; + version = "3.10.0"; disabled = isPy27; meta = { @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "73facc37462dfc0b27f571bdaffbef7709e19f7a616beb3802ea425b07843f4e"; + sha256 = "4ab2fdb7f36eb61c3665da67a7ce281c8900db08d72ba6bf0e695828253581f7"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 00ea5b06c646e..df0f421c17aa1 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "minio"; - version = "6.0.2"; + version = "7.0.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "acae9bfae0aec1b92025bd63e18135ebb4994c84600716c5323e14cb0c9a0b03"; + sha256 = "f2f6022cfe4694d946972efef2a752f87d08cc030940faa50a640088772953c8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 5ffde397337cb..13cfc0b63df2a 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.12.1"; + version = "1.14.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9b8af18d6e779fbbb094edfeb963691e485bba62eeec39fd62dfbe34bc12afeb"; + sha256 = "e3abff0831564d9a4b5d5a15e5ee76b0f5b4580b362c24a58ee821634c8fb1a3"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 84babe1718976..bed191c39e325 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.21.2"; + version = "0.22.0"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "18nfdbkffmxzkkbp3d4w8r2kfi0sxip3hy997d3mx6dy74jc7nmg"; + sha256 = "1s9pshrl40gkcsdwf4qdga3hjfmdbrvbgjcz0cfx3kl796x3im11"; }; propagatedBuildInputs = [ numpy scipy ]; diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 48abc30c9f7d1..f32f541573eb4 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.5.4"; + version = "5.6.4"; src = fetchPypi { inherit pname version; - sha256 = "08badabb6a1bbc9aa9e65fae8ecd3275d8342cb45d9c457b19e32b3312a8b663"; + sha256 = "8c6d04559f5e3bf75a18525cd46d213c0f3a8409363718978e6de691bdb551fb"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index c8969d9e2d4df..06f2c210415c7 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.22.0"; + version = "0.23.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "14n9rl8w3i1fq96f3jzsg7gy331d7fmrapva6m38ih53rnf38bdf"; + sha256 = "0mzh5pv0n81ms046yxb9rzql8bpbsf26jv6dihmhi0ds4yqkw836"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 77448d0e15fe3..a2398ce750dd0 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "monty"; - version = "3.0.2"; + version = "2021.3.3"; disabled = isPy27; # uses type annotations # No tests in Pypi @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "1wxqxp0j7i6czdpr2r1imgmy3qbgn2l7d4za2h1lg3hllvx6jra1"; + sha256 = "1nbv0ys0fv70rgzskkk8gsfr9dsmm7ykim5wv36li840zsj83b1l"; }; checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo]; diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 42de3d2da9a8f..59ebfc7091e36 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -1,17 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, setuptools-scm }: buildPythonPackage rec { pname = "mpmath"; - version = "1.1.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6"; + sha256 = "79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + # error: invalid command 'test' doCheck = false; diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index acdcf69e301d4..6eb6e49cdddae 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -6,14 +6,14 @@ , requests_oauthlib , isodate , certifi -, enum34 +, enum34 ? null , typing , aiohttp , aiodns , pytest , httpretty , mock -, futures +, futures ? null , trio }: diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 69178edb69193..52dd37c1533ba 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.23"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "cf79c77e828a2de9bdc74b43ad4abd4c2a3a30f0471b46e9b4e01b9877f166fb"; + sha256 = "77e10c476cdd3ee14535c2357e64deac6b1a69f33eb500d795b064acda48c66f"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 2622b815f1eed..c02baa571ed20 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "19lf036h0d9ryqasrh91myhn3dq5zcw4rik9jy6sayq7l6irmm94"; + sha256 = "53352237e2363079f6e38637a8ce90b47e720c8e2eb133a6a6f66fc13ff494cb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index ba3b9e4b0873a..2e352be412c17 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.9"; + version = "0.6.10"; src = fetchPypi { inherit pname version; - sha256 = "0112f2ad41fb658f52446d870853a63691d69299c73c7351c520d38dbd8dc0c4"; + sha256 = "67b1eba5a6c7c6075746d8c33d4e8f4ded17604034c1fcd1c78996ef52bf66ff"; }; checkInputs = [ nose rednose ]; diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 56c6044ba746a..33c37d5e98073 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.4.3"; + version = "1.5.1"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "eaa09ef1353ebefae19162ad423eef7a12166bcc63866f8bff8f3635353cd9fa"; + sha256 = "afc5a1c515210a23c461932765691ad39e8eba6551c055ac8d5546e69250d0aa"; }; # tests not packaged with source dist as of 1.3.2/1.3.2, and diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index e1efdf26de804..e3ce770398e4b 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1rhpy6na7hkhc211ri14zghvmb2fxkh995wi09pkc68klf1dzjg7"; + sha256 = "8b1409a5e1f0f6d1a1f02555c2f11115a2364f45f1e57bcb5fb3c9ea11f346fa"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 298b32ed8b8eb..c87a935a306dc 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,4 @@ -{ fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k +{ fetchPypi, buildPythonPackage, lib, six, singledispatch ? null, isPy3k , click , joblib , regex diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index bfc5d8c60c1ab..c7dc40d707915 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.2.0"; + version = "6.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0464b28e18e7a06cec37e6177546c2322739be07962dd13bf712bcb88361f013"; + sha256 = "cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 48ed52499c5ea..211e9d6185f6c 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { - version = "0.52.0"; + version = "0.53.0"; pname = "numba"; # uses f-strings, python 3.9 is not yet supported disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "44661c5bd85e3d3619be0a40eedee34e397e9ccb3d4c458b70e10bf95d1ce933"; + sha256 = "55c11d7edbba2ba715f2b56f5294cad55cfd87bff98e2627c3047c2d5cc52d16"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index e5a36fe454f8e..c2630d75eb45d 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.7.2"; + version = "2.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1ai3i5n07csnzfsxf2dxp8cpdk6ajl5iv8rv0fj6n9ag7qphixac"; + sha256 = "43616529f9b7d1afc83386f943dc66c4da5e052f00217ba7e3ad8dd1b5f3a825"; }; # Remove existing site.cfg, use the one we built for numpy. diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index df831ab6b5357..5bb173b9153b7 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "c6fe0a1b92c44bb64b2427f944fee663fe1aaf3d4d4080d04ad9c212b40a8763"; + sha256 = "474392035e9e20b2c74dced7df8bda135fd5c0ead2b2cf64523a4968c785ea73"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 02f51bc3e66fd..1cd95bcd6ab33 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.2.9"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1jw59mmd3n1d5zihdqz2a3j2axxf3m34lqp1190fw8rlndlilf3r"; + sha256 = "53ba3d884e98ff2062d5ada025aa590541dcd665b8f81067dc82dd61c0923759"; }; propagatedBuildInputs = [ jsonschema pyyaml six setuptools ] diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 48941c808161c..317aba65621a4 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "3.0.6"; + version = "3.0.7"; disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - sha256 = "b229112b46e158b910a5d1b270b212c42773d39cab24e8db527f775b82afc041"; + sha256 = "6456a3b472e1ef0facb1129f3c6ef00713cebf62e736cd7a75bcc3247432f251"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index 8e4ece43fd7b9..381b0d76b1445 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, futures +, futures ? null , gevent , mock , pytest diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index aa61b18291d6c..78694618f73e6 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "0.19.0"; + version = "2.6.0"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "v${version}"; - sha256 = "179x2lsckpmkrkkdnvvbzky86g1ba882z677qwbayhsc835wbp0y"; + sha256 = "11mskhb7i55i04cy0vkxi7kpaifbz8zc2m8x9s5y6yyyjinvly36"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 92a78ce0cf3fd..661754d89c3cb 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.21.0"; + version = "0.23.0"; src = fetchPypi { inherit pname version; - sha256 = "408d40b3a6a210bcb3f3609b607960eeedaa63ffd574dde7896906691c354814"; + sha256 = "0a03a9978673f377df45107024e2aae006f85afe7ef7bf4640ef663167a4386f"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 10dafc0072a34..5628b8cc19e48 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "panel"; - version = "0.9.7"; + version = "0.11.1"; # Version 10 attempts to download models from the web during build-time # https://github.com/holoviz/panel/issues/1819 src = fetchPypi { inherit pname version; - sha256 = "2e86d82bdd5e7664bf49558eedad62b664d5403ec9e422e5ddfcf69e3bd77318"; + sha256 = "ce531e5c0c8a8ae74d523762aeb1666650caebbe1867aba16129d29791e921f9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 0311e783d3970..9af09d5694662 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -14,7 +14,7 @@ , requests , entrypoints , tenacity -, futures +, futures ? null , black , backports_tempfile , isPy27 @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ptwZXypS9b7Y1CkszqOa8PMzgyS+r9VikPlhbJUDNiM="; + sha256 = "349aecd526c15c39f73a08df836467e2fead877c474d82c7df349f27ad272525"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index c5c0c1d7ae6d2..1ce34bfaab68a 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.18.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "91666032d6723dc5905248417ef0dc9e4c51df9526aaeef271eacad6491f06a4"; + sha256 = "9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 56e856cff9af3..5a0322edf6572 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -6,9 +6,7 @@ , pytest-flake8 , glibcLocales , packaging -, isPy27 , isPy38 -, backports_os , importlib-metadata , fetchpatch }: @@ -26,8 +24,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ importlib-metadata - ] ++ lib.optional isPy27 backports_os - ; + ]; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 6e04f2e7a0303..b21536060d3af 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -3,9 +3,9 @@ , fetchPypi , six , pythonOlder -, scandir +, scandir ? null , glibcLocales -, mock +, mock ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index bd6432db534f1..058fb86388300 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.14.2"; + version = "0.15.0"; disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; - rev = "v${version}"; - sha256 = "1zbi3v4jmgq1a3ml34dq48y1hinw2008vwqn30l09r5vqvdgnj8m"; + rev = version; + sha256 = "1ckbsq9dwca8hpx9frf9xd80b4z4kn9j7jx94hza9bwzrh26x5ji"; }; # doCheck tries to write to the global python directory to install things diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 50b62503ff875..d19fc1011347f 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -5,7 +5,7 @@ # Python deps , logutils , Mako -, singledispatch +, singledispatch ? null , six , webtest # Test Inputs diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 371eff249c2d7..70af6cc9c8ae3 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.8.4"; + version = "0.8.10"; disabled = isPy27; src = fetchFromGitHub { owner = "nschloe"; repo = "perfplot"; rev = "v${version}"; - sha256 = "0avb0inx8qh8ss3j460v3z6mmn863hswa3bl19vkh475ndsjwmp0"; + sha256 = "17xx33fk95fpkd8h2whblpwfls9vyqbv7anq34kpigjy8zxfi2qk"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 0979afa92f4a9..d016d1ccea8ba 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "persim"; - version = "0.1.3"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "be4ea4bfc2a0c6fcfc28ebd52e23a351ee00b0ef0ddaf527526bd0f919145348"; + sha256 = "5db2f7f65b1ad7b2cbfa254afb692ca0a91aeb686e82d6905838c41f516e6a13"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 588a27159e8e3..f8374a02a9b9b 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.30"; + version = "2.1.34"; src = fetchPypi { inherit pname version; - sha256 = "ac170d656d2083d02048850005415d03d1767087e4f5037bc86defb6b23e712d"; + sha256 = "988e6a4e12933522e0c647da78c6e30fc42e3a172ba52cfb0332affcfc9ee29e"; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix index 2c527d87d1865..b3fde72baec3a 100644 --- a/pkgs/development/python-modules/pgpy/default.nix +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -1,5 +1,5 @@ { lib, isPy3k, fetchFromGitHub, buildPythonPackage -, six, enum34, pyasn1, cryptography, singledispatch +, six, enum34, pyasn1, cryptography, singledispatch ? null , fetchPypi, pytestCheckHook }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 476921da632fa..d0cbf5bafe413 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.11.10"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1jrq6bhzwvz6db8ays8zff15hbk1iazs2qxrzvrnlkgxxjkp8p7n"; + sha256 = "b68feb0005f57861573d3fbb82c5c777950decfbb2d1624af57aec825db02c02"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 72c61e08ce4bc..64884393b79b4 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.18"; + version = "8.12.20"; src = fetchPypi { inherit pname version; - sha256 = "0aa0f5e1382d292a7ff2f8bc08673126521461c7f908e0220756449a734d8fef"; + sha256 = "ee5a8508c4a414262abad92ec33f050347f681973ed0fb36e98b52bfe159f6b8"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index e68516fb07f7b..1c401b626478e 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.9.1"; + version = "2.9.3"; src = fetchPypi { inherit pname version; - sha256 = "1jaizhkb59ixknvc75nrhfq51bh75912q8ay36bxpf4g5hzyhw3a"; + sha256 = "389dd33f5bfe35733c8346af6cc43bbd015ccf0efa947eb04b38bd5cb9d0b89b"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index c1bfe5297d71f..ef32507321648 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pika"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1gqx9avb9nwgiyw5nz08bf99v9b0hvzr1pmqn9wbhd2hnsj6p9wz"; + sha256 = "f023d6ac581086b124190cb3dc81dd581a149d216fa4540ac34f9be1e3970b89"; }; checkInputs = [ nose mock twisted tornado ]; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 565822c335585..adf30d57322da 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "2.8.0"; + version = "2.9.1"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "74ff96fddd21cd4c0830eb549137ea9eccbdbff8cef4f684322b9afb8e42ccb5"; + sha256 = "99c19cf0dd0fc89fc9e6a0de61e974e34d4111dd69802aeaee3e61fb1a74a3d8"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix index c022fdb988d53..b0a8d6d913c68 100644 --- a/pkgs/development/python-modules/pillowfight/default.nix +++ b/pkgs/development/python-modules/pillowfight/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pillowfight"; - version = "0.3"; + version = "0.4"; src = fetchPypi { inherit pname version; - sha256 = "913869b0563c5982bcf08cb1ea56fb0f87e3573d738e3e3692301bf45dba6252"; + sha256 = "4923f4d1e78be15f19f03a608fb34ba9cb71bf5205de3c9fe7461c49078167a7"; }; propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 4ea6f75932cd6..48f15181ce00e 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "5.4.0"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - sha256 = "a4d3990df2d65961af8b41dacc242e600fdc8a65a2e155ed3d2fc18a5c209f20"; + sha256 = "3b0c7b95e8d3dfb011bb42cb38f356fcf5d0630480462b59c4d0a112b8d90281"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 5216ab17879d5..1b1834e324bb7 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "a6a4ac943b496745cec21f14f021bbd869d5e9b4f6ec06918cffea5a2f4b9193"; + sha256 = "029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 9261133bc9251..bf66f7d01f193 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "plac"; - version = "1.2.0"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "ca03587234e5bdd2a3fa96f19a04a01ebb5b0cd66d48ecb5a54d42bc9b287320"; + sha256 = "51e332dabc2aed2cd1f038be637d557d116175101535f53eaa7ae854a00f2a74"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index aa329953a3912..040b51b9f6e6a 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "7.2.0"; + version = "7.2.1"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "bd599b384f94d8883344925f0ef223e1ab50f218872434aa40ba8c645937699c"; + sha256 = "af2ad326e8377c8c86d97184f60c0be41cd71f5075201dfdb3331cc85d4de513"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index e08537ff1abf3..278caa44b143e 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.6.9"; + version = "1.7.0"; checkInputs = [ pytest ]; @@ -14,6 +14,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1ps37vamqav6p277dlp51jnacd5q4x4z1x8y0nfjw3y8jsfy3f8n"; + sha256 = "317744342c755319907c773cc87c3a30adaa3a41b0d34c0ce02d9d1904922dce"; }; } diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 80c4b5acfe8ce..cc1724024add1 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -7,7 +7,7 @@ , pytest-mock , pytestCheckHook , tomlkit -, typing +, typing ? null , virtualenv }: diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 1519187d174bf..29c9698ec2882 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.4"; + version = "1.1.5"; format = "pyproject"; disabled = isPy27; @@ -32,13 +32,14 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs"; + sha256 = "sha256-DgIDtwL7R/oipcU7BMt31+ImgiQ9/9noNVNdpm+OZi8="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace 'importlib-metadata = {version = "^1.6.0", python = "<3.8"}' \ - 'importlib-metadata = {version = ">=1.6,<2", python = "<3.8"}' + 'importlib-metadata = {version = ">=1.6,<2", python = "<3.8"}' \ + --replace 'version = "^21.2.0"' 'version = ">=21.2"' ''; nativeBuildInputs = [ intreehooks ]; diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index f5fe7ff96b842..f664d9c6d25ea 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pre-commit-hooks"; - version = "3.3.0"; + version = "3.4.0"; disabled = isPy27; # fetchPypi does not provide tests @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "1sppwcqsbr9gv2cpjslngcbggsxvdr84zgrin94yjr40jgkjzdpq"; + sha256 = "1aqkmprdc2lhds9c59pkkf2js65j63197flanaggk7cm8k0kz7zs"; }; propagatedBuildInputs = [ toml ruamel_yaml ]; diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 5463403dec7b7..d349a58960a19 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e37acd91976fe6119172771520e58d1742c8479703489321dc1d9c85e7259922"; + sha256 = "5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index e43931d914c56..ac128c098ecc0 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "3.0.16"; + version = "3.0.18"; src = fetchPypi { inherit pname version; - sha256 = "0fa02fa80363844a4ab4b8d6891f62dd0645ba672723130423ca4037b80c1974"; + sha256 = "e1b4f11b9336a28fa11810bc623c357420f69dfdb6d2dac41ca2c21a55c033bc"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 4784dcdfa2f17..3fa782cb471b5 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.13.0"; + version = "1.18.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1i5jjnwpd288378h37zads08h695iwmhxm0sxbr3ln6aax97rdb1"; + sha256 = "cfc45474c7eda0fe3c4b9eca2542124f2a0ff5543242bec61e8d08bce0f5bd48"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 60c6f333275be..e3e66294a8f52 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -5,7 +5,7 @@ , buildPythonPackage , isPy37 , protobuf -, google-apputils +, google-apputils ? null , six , pyext , libcxx diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 51ad2e85ff2e0..65915c8586968 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.16"; + version = "3.0.17"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4b0f6e381a8251ec8d6aa94fe12f3400bf6edf789f89c8a6099f8a91d4a5d2e1"; + sha256 = "911d25cca31a8e4f9b2ecd16dcdad793b8859e94fca1275f3485d8cdf20b13de"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index 233dc6fb3148a..48b0ab48c7390 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ptyprocess"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0"; + sha256 = "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"; }; meta = { diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 8c9c0ea004ca4..8914b9884c23e 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pubnub"; - version = "4.8.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "16wjal95042kh5fxhvji0rwmw892pacqcnyms520mw15wcwilqir"; + sha256 = "0f6r439bfz58ddikqj5cx56vv7gxrpja9rcdg0j1mlng8ry581f3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index db48fbf1e4809..af653f260cd3e 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2019.2"; + version = "2020.1"; src = fetchPypi { inherit pname version; - sha256 = "1p2qizb35f9lfhklldzrn8g9mwiar3zmpc44463h5n1ln40ymw78"; + sha256 = "2ef23d3371439f13fffbe7f8b9fc180a19d4183dc9cab204d878d7c7766464bf"; }; propagatedBuildInputs = [ pygments urwid ]; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 2a66357f8494a..aa853dcd36587 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "20.5.1"; + version = "21.3.4"; src = fetchPypi { inherit pname version; - sha256 = "39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db"; + sha256 = "faa8b9336237565990298f20870e13dd1678a4586847ca5a7ff2abf10752f356"; }; patches = [ diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index 2f4a60b420aaa..dd8cbdcc5f0e2 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "py-vapid"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "f05cecaa9fc009515086d04b6117324f30eedf1a196f67fb1ec360a9dbdad4ee"; + sha256 = "9e8de790cce397d9bc567a2148c3c5d88740f668342c59aaff9ed004f716a111"; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index aa12deabb37ef..8c38723207a7a 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "py"; - version = "1.9.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"; + sha256 = "21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"; }; # Circular dependency on pytest diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 0c2ae1288279c..236a38c7e69a2 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.8.0"; + version = "0.9.3"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "1v419f1kkqw8hqyc3yhzslnbzk52j8j3wfknfkjg308n5mf5bn09"; + sha256 = "838836e58ca22557d83d1f0ef918bcce899b4c2666340b924b940dcdebf1d18c"; }; buildInputs = [ exiv2 boost ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index bd0f179dc8509..9967394d28e09 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.31"; + version = "3.35"; src = fetchPypi { inherit pname version; - sha256 = "426cff33c1d3a5ee6ae388089fd41dc47c4221800f43bd51779f823c781fb83b"; + sha256 = "1508fa481a2f1b55b9a9792f0480c7f54cad107c668ffc98a7c73622676e1c23"; }; doCheck = false; diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index 8eb1649fcc5ee..6ad9673b97554 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "py4j"; - version = "0.10.9.1"; + version = "0.10.9.2"; src = fetchPypi { inherit pname version; - sha256 = "7605e512bf9b002245f5a9121a8c2df9bfd1a6004fe6dd3ff29d46f901719d53"; + sha256 = "624f97c363b8dd84822bc666b12fa7f7d97824632b2ff3d852cc491359ce7615"; }; # No tests in archive diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index 4deee467f84e4..e65812cb3133e 100644 --- a/pkgs/development/python-modules/pyaftership/default.nix +++ b/pkgs/development/python-modules/pyaftership/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyaftership"; - version = "0.1.2"; + version = "21.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "057dwzacc0lmsq00ipfbnxkq4rc2by8glmza6s8i6dzi1cc68v98"; + sha256 = "28b62c323d06492399b60d8135a58d6feaa1d60837eddc14e57ea2b69d356c0a"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index aa65d7ccadfe2..048d218a9ea1b 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pybase64"; - version = "1.0.2"; + version = "1.1.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c430b36751dd89820c867aadd0130bbe8ce007ee570cbe91bb23012fb6f52e87"; + sha256 = "f0e0db1dee2a2cbf35e6710ea138594ecc1e0f491ff9103f136de83d8f159315"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 3fd9349386018..0ae0b26e12db1 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "TXljeRFonQwEmlIGMnTHwdfPsd9cMOVn5/1zb3tYBfI="; + sha256 = "1lsacpawl2gb5qlh0cawj9swsyfbwhzhwiv6553a7lsigdbadqpy"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index fb6fbf8dd381a..0ce28e5749248 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, latexcodec, pyyaml }: buildPythonPackage rec { - version = "0.23.0"; + version = "0.24.0"; pname = "pybtex"; doCheck = false; @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version pname; - sha256 = "b92be18ccd5e9a37895949dcf359a1f6890246b73646dddf1129178ee12e4bef"; + sha256 = "818eae35b61733e5c007c3fcd2cfb75ed1bc8b4173c1f70b56cc4c0802d34755"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 554a6ab0b02d4..195167b243779 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.0.8"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "623061d305bd5513a911abb2cbd0e37670be166a270123b43ca757bf78e4b438"; + sha256 = "ced62167216c75b58d5550adc74a0d328a166ded8b37b52ce90bc9736f597187"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 24e0f9792d7ad..1188b499302dc 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.18.2"; + version = "1.20.0"; format = "other"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "v${version}"; - sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j"; + sha256 = "0ifw4wjbml512w9kqj80y9gfqa7fkgfa1zkvi478k5krghjgk3lr"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index 8e0a9e3b152e6..b750bd30b0a41 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycm"; - version = "2.5"; + version = "3.1"; disabled = !isPy3k; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "v${version}"; - sha256 = "0zfv20hd7zq95sflsivjk47b0sm7q76w7fv2i2mafn83ficzx0p0"; + sha256 = "1aspd3vkjasb4wxs9czwjw42fmd4027wsmm4vlj09yp7sl57gary"; }; # remove a trivial dependency on the author's `art` Python ASCII art library diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix index f1d92a63d4015..36b171c22b12b 100644 --- a/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pycmarkgfm"; - version = "1.0.1"; + version = "1.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0wkbbma214f927ikn3cijxsrzkmm5cqz1x4fimrwx9s2wfphj250"; + sha256 = "694cb242f4961437c30b5b015dfbce9d1a1fa48305c2e39f902ce7c65b4cbe0e"; }; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index e1d21a6a2eb1d..0e92196f74536 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"; + sha256 = "c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"; }; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index e88b8529a3568..0c57ad9c96f2f 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.9.9"; + version = "3.10.1"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "910e202a557e1131b1c1b3f17a63914d57aac55cf9fb9b51644962841c3995c4"; + sha256 = "3e2e3a06580c5f190df843cdb90ea28d61099cf4924334d5297a995de68e4673"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index d3c6e37bbe4b1..11879159b4fde 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.8"; + version = "1.8.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+HfnM/IrFlUyQJdiOYyaJUNenh8dLtd8CUJWSbn6hwQ="; + sha256 = "1zvcmx3927fgx37gdhi8g8igvrkri1v78rn3118p4wssqhgfwa6n"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 884df63ce0365..6b67814a2220e 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pydub"; - version = "0.24.1"; + version = "0.25.1"; # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; repo = pname; rev = "v${version}"; - sha256 = "1pv4n54kkjpbjlvwh9b6a7zyq1ylg0fjmd2q4ws9nc2a6mrcivhc"; + sha256 = "0xskllq66wqndjfmvp58k26cv3w480sqsil6ifwp4gghir7hqc8m"; }; diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 7e388b93971ba..833b83b391362 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -1,4 +1,20 @@ -{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, isPy27 }: +{ buildPythonPackage +, fetchPypi +, lib +, vcversioner +, pytestrunner +, mock +, pytest +, pytest-asyncio +, pytest-trio +, twisted +, zipp ? null +, pyparsing ? null +, pyhamcrest +, futures ? null +, attrs ? null +, isPy27 +}: buildPythonPackage rec { pname = "pyee"; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index fe4182fd53d8e..fec3efb9b3abe 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyenchant"; - version = "3.1.1"; + version = "3.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ce0915d7acd771fde6e8c2dce8ad0cb0e6f7c4fa8430cc96e3e7134e99aeb12f"; + sha256 = "6b97e9a9f132fa7c9029a6635d821ccad67d4980e68186d02c765b4256b6f152"; }; propagatedBuildInputs = [ enchant2 ]; diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index d317ebdf21b83..7ad1fb41526d9 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.1.0"; + version = "7.3.0"; src = fetchPypi { inherit pname version; - sha256 = "a3e22a4d31429f0d5b9ff50aaac3fb47e4f7da678b6b0439a7b91ef40675f88d"; + sha256 = "a7031ec4cfff034affc822e47ff5e6c1a0272e576d79465cdbbe25f721740322"; }; propagatedBuildInputs = [ setuptools six traits ]; diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 9e21854a7c42d..13c00d80a62c3 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.5.9.2"; + version = "0.5.9.5"; src = fetchPypi { inherit pname version; - sha256 = "73e740eaa45c097a09e543450f88d5ed06c0ece4b6936dad7e71077f67797b74"; + sha256 = "9965644c5bd62bedc0ff7f336cbb2baef6406a36b4ec5c786b199872ce46192b"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 8ba9b3fc46fcd..cc7031db54acd 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.3.3"; + version = "4.4.0"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/7KrJkoLg69Uii2wxQl5jiCDYd85YBuomK5lzs+1nLs="; + sha256 = "082d863e0e2a74351f697da404e329a91e18e5055942e59d1b836e8459b2c94c"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index cf1b887818372..1f098ed781c82 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "2.2.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"; + sha256 = "f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"; }; checkInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix index a1d36670a396b..36980ddbadfea 100644 --- a/pkgs/development/python-modules/pyflume/default.nix +++ b/pkgs/development/python-modules/pyflume/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyflume"; - version = "0.6.2"; + version = "0.6.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ChrisMandich"; repo = "PyFlume"; rev = "v${version}"; - sha256 = "0i181c8722j831bjlcjwv5ccy20hl8zzlv7bfp8w0976gdmv4iz8"; + sha256 = "1dm560hh6fl1waiwsq8m31apmvvwhc3y95bfdb7449bs8k96dmxq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index 7e06b27a23f63..7d7bc459b6247 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -2,13 +2,13 @@ llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; - version = "1.9.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "gccxml"; repo = "pygccxml"; rev = "v${version}"; - sha256 = "02ip03s0vmp7czzflbvf7qnybibfrd0rzqbc5zfmq3zmpnck3hvm"; + sha256 = "1vsxnfzz6qhiv8ac98qgk6w3s4j1jp661qy48gc9plcg2r952453"; }; buildInputs = [ castxml llvmPackages.libcxxStdenv]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 5326a1963aa83..46117d13f41c2 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "cbeb38ab1df9b5d8896548a11e63aae8a064763ab5f1eabe4475e6b8a78ee1c8"; + sha256 = "9711367bd05f96ad6fc9c91d88fa96126ba2d1f1c3ea6f23c11402c243d66a20"; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 318706edd9308..130be6d44c369 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.2.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "v${version}"; - sha256 = "1yx1n6mxfmwg69ls5560nm6d3jxyghv27981iplz7m7990bbp468"; + sha256 = "0v57n3by9dwckjfmrgf1km4y3gwzj2gk0s9ly64hlaf05zihqnvc"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 9255c02ac2eef..c33f2b068087a 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "PyJWT"; - version = "1.7.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; + sha256 = "a5c70a06e1f33d81ef25eecd50d50bd30e34de1ca8b2b9fa3fe0daaabcf69bf7"; }; propagatedBuildInputs = [ cryptography ecdsa ]; diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 584c98f6cb091..294e47872fc15 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pykeepass"; - version = "3.2.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b3e07eb2dd3aeb1dfa1a2d2d17be77066ee560c1e770f1c72d7ea5608117d284"; + sha256 = "1b41b3277ea4e044556e1c5a21866ea4dfd36e69a4c0f14272488f098063178f"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pykmtronic/default.nix b/pkgs/development/python-modules/pykmtronic/default.nix index 50260afab10f3..7a055c1ed3fed 100644 --- a/pkgs/development/python-modules/pykmtronic/default.nix +++ b/pkgs/development/python-modules/pykmtronic/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pykmtronic"; - version = "0.0.3"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8bxn27DU1XUQUxQFJklEge29DHx1DMu7pJG4hVE1jDU="; + sha256 = "9d0301882f06a0c4865c89bb6c2a381c4a1ba6fe2a7a07d56351bdf5f96c9fa5"; }; propagatedBuildInputs = [ aiohttp lxml ]; diff --git a/pkgs/development/python-modules/pykwalify/default.nix b/pkgs/development/python-modules/pykwalify/default.nix index d2b31ebbf4cd7..ee5347d77a321 100644 --- a/pkgs/development/python-modules/pykwalify/default.nix +++ b/pkgs/development/python-modules/pykwalify/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.8.0"; pname = "pykwalify"; src = fetchPypi { inherit pname version; - sha256 = "1cnfzkg1b01f825ikpw2fhjclf9c8akxjfrbd1vc22x1lg2kk2vy"; + sha256 = "796b2ad3ed4cb99b88308b533fb2f559c30fa6efb4fa9fda11347f483d245884"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix index e53472c6ead32..08b3a5c5223b9 100644 --- a/pkgs/development/python-modules/pylatexenc/default.nix +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pylatexenc"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "phfaist"; repo = "pylatexenc"; rev = "v${version}"; - sha256 = "0m9vrbh1gmbgq6dqm7xzklar3accadw0pn896rqsdi5jbgd3w0mh"; + sha256 = "1kzfyhdpm3cw3g4mgd12nj0cs1kgqjr22yxr7vkawljaid4ail5z"; }; pythonImportsCheck = [ "pylatexenc" ]; diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index c5dfbd48fe128..54b2f65ad975c 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.3.0"; + version = "2.4.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "1088waraiigi2bnlighn7bvnvqmpx5fbw70c8jd8sh25mj38wgly"; + sha256 = "0535y4sdi521a9s7di8ld0i8aav0afbxmx0956v6sjpyqmqdm6hr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 43183482ecebd..10935d2d8880a 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.7.1"; + version = "2.7.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "10nrvzk1naf5ryawmi59wp99k31053sz37q3x9li2hj2cf7i1kl1"; + sha256 = "0e21d3b80b96740909d77206d741aa3ce0b06b41be375d92e1f3244a274c1f8a"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index fdf6b089844b2..f6f2ebe621080 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2020.12.31"; + version = "2022.0.5"; src = fetchPypi { inherit pname version; - sha256 = "5002490facd47c55d2dae42c35712e061c1f5d881180485c0543a899589856d6"; + sha256 = "69c370ebd2ff9aceb15bb6efd364473609ffb23d2b2f02a3eb64fd537df69de0"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index 8b390ac12faf8..4d0dbeaed3b93 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -2,21 +2,24 @@ , aiohttp , buildPythonPackage , fetchPypi -, pycryptodome +, cryptography , pythonOlder }: buildPythonPackage rec { pname = "pymazda"; - version = "0.0.10"; + version = "0.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sJj4RkVaELNitcz1H8YitNgIx4f35WeQf7M5miYD5yI="; + sha256 = "174c58e6e78081af3105524074ae26e62be683389e495ab85a30e2adbf7ba365"; }; - propagatedBuildInputs = [ aiohttp pycryptodome ]; + propagatedBuildInputs = [ + aiohttp + cryptography + ]; # Project has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index dfbfe90d2421d..e322bb14f7ba3 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.9.3"; + version = "3.11.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "abe046f5a5d0e5baee80b7c4bc0a4c218f61b517b62d77be4f89cf4784c27d78"; + sha256 = "d3b93c8923ae8c8107c5adfd22f7c37fa0849a00a9723e0e0a0ca6afb582d6c3"; }; # No need for coverage stats in Nix builds diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix index 047b7d697c9e9..162f3ab559666 100644 --- a/pkgs/development/python-modules/pymeeus/default.nix +++ b/pkgs/development/python-modules/pymeeus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyMeeus"; - version = "0.3.13"; + version = "0.5.11"; src = fetchPypi { inherit pname version; - sha256 = "43b800a2571f3237e558d8d305e97f6ac4027977666e22af98448e0f1f86af86"; + sha256 = "bb9d670818d8b0594317b48a7dadea02a0594e5344263bf2054e1a011c8fed55"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index 72a17f27dca91..ef5273936cf4c 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pymetar"; - version = "1.1"; + version = "1.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0y42l7mmp7jn4pzg66x3k57c6hqpxc22mgzgaqqpblkx2kzh42n9"; + sha256 = "f9a8caa21eff5367427da55a469ef396293ae4cc93797ab2f1a66a2924fbdc68"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 76f2e9a9338be..72f2f3ec14f30 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "riptideio"; repo = pname; rev = "v${version}"; - sha256 = "0x0dv02shcc2yxxm9kvcbhip111sna74dvcfssxdzzy967vnq76v"; + sha256 = "1ri4sy5axs4a1wg1qffp0k2z5v309612y8mfbxnb06fizqdkbclf"; }; # Twisted asynchronous version is not supported due to a missing dependency diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix index c243bf8f9540e..888b5b9d309c3 100644 --- a/pkgs/development/python-modules/pymysql/default.nix +++ b/pkgs/development/python-modules/pymysql/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "PyMySQL"; - version = "0.10.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "263040d2779a3b84930f7ac9da5132be0fefcd6f453a885756656103f8ee1fdd"; + sha256 = "816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36"; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 53df38b5836b2..5237ce99557d0 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "4.3.3"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - sha256 = "ced47c200073dbbfafb10b26931b9c9bf3c6b898f41dffa3676f5c2e2eddc2f0"; + sha256 = "01741df673abb518d5cf9f00223a227f5d0ab9e0a6b19e444ceb38d497019f31"; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 192827566df25..278508fa37f59 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xYwnv30I0+CAx4QODSeMNhdlM2NuM8v4J3rx99NdYCc="; + sha256 = "09v0bp9zgwbs4zwcncvfccrna5rnihkhs3l4qy0f1lq8gnzjg365"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 28e9922e17209..a908945fad5db 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynisher"; - version = "0.6.3"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "e4e1d9366fc4ca60b4b2354b6d12e65600600a8c7bf4392c84f2f4ff4abc85ff"; + sha256 = "111d91aad471375c0509a912415ff90053ef909100facf412511383af107c124"; }; propagatedBuildInputs = [ psutil docutils ]; diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 53bb06b13dd0a..b2b65680fab08 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -4,7 +4,7 @@ , nose , msgpack , greenlet -, trollius +, trollius ? null , pythonOlder , isPyPy , pytestrunner @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pynvim"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "6bc6204d465de5888a0c5e3e783fe01988b032e22ae87875912280bef0e40f8f"; + sha256 = "3a795378bde5e8092fbeb3a1a99be9c613d2685542f1db0e5c6fd467eed56dff"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 541a733b3f80e..cd100d005dbb2 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyobjc"; - version = "7.0.1"; + version = "7.1"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f4fd120683b19a2abeac351784204e6b092cf1fb94f597b6eb22f30c117b2ef0"; + sha256 = "1dfce78545df1af25d1dcd710309dd243083d90c977a8c84c483f8254967417b"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index cf881a580482b..b1e81140a906f 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2020.3.1"; + version = "2021.1.4"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "abc689307cf34d3dcc94d43815f64e2265469b50ecce6c903a3180589666fb36"; + sha256 = "6a9665e89c15e1c684789263bd3a632567e7c7bd25a657092df4b185b3468971"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 16a894546e49c..ee34f91b57e2d 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyparted"; - version = "3.11.4"; + version = "3.11.7"; disabled = isPyPy; src = fetchFromGitHub { repo = pname; owner = "dcantrell"; rev = "v${version}"; - sha256 = "0wd0xhv1y1zw7djzcnimj8irif3mg0shbhgz0jn5yi914is88h6n"; + sha256 = "01193fmkss9icjvqpw85szpk8ld1pnha7p9kqm7mpwk6rc6gi2m3"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 0df0da0cc5ed5..c04cc9eec3464 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.8.1"; + version = "1.8.2"; pname = "pyperclip"; src = fetchPypi { inherit pname version; - sha256 = "9abef1e79ce635eb62309ecae02dfb5a3eb952fa7d6dce09c1aef063f81424d3"; + sha256 = "105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index f17f83bd17b96..f4239fb922520 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.0.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "2189fbc4af08d519f85468e70e32c902eab0f1341b2c41028b94b2832d3169a7"; + sha256 = "498bb4d1fe21350c2b7c1aa8bb3eae9c9979358d0b66327954bc66839fcba8b6"; }; checkInputs = [ nose psutil ] ++ diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index a26eff37ef218..da9569b7fb730 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.5"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "fe1bd1140e6b79fe07f0053981d49be2dc66656cc8b481dd7ffcaa872fc25467"; + sha256 = "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77"; }; checkInputs = [ webtest zope_component ]; diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index 1d5608ec777aa..96f0ba057f655 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -2,12 +2,12 @@ , graphviz, networkx, six, opt-einsum, tqdm, pyro-api }: buildPythonPackage rec { - version = "1.5.2"; + version = "1.6.0"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "8a93af3a007ac507a8b50fd1165dbb355182d17df29d3b5bc498b02b479fdb27"; + sha256 = "ee181852713058f59d600dfa2e05bbc6f7f9b88fcdb4d2f1ccf61b0bf4794088"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index 5afce4a37dacb..97b41b03daf81 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "Pyro5"; - version = "5.11"; + version = "5.12"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "867cdd291d85560373e0c468da7fd18754f2568ef60e0bc504af42f391d7a3e5"; + sha256 = "616e6957c341da0ca26f947805c9c97b42031941f59ca5613537d1420ff4f2e2"; }; propagatedBuildInputs = [ serpent ]; diff --git a/pkgs/development/python-modules/pyroma/2.nix b/pkgs/development/python-modules/pyroma/2.nix new file mode 100644 index 0000000000000..9fee5ec56c0e6 --- /dev/null +++ b/pkgs/development/python-modules/pyroma/2.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi +, docutils, pygments, setuptools +}: + +buildPythonPackage rec { + pname = "pyroma"; + version = "2.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pygments < 2.6" "pygments" + ''; + + propagatedBuildInputs = [ docutils pygments setuptools ]; + + meta = with lib; { + description = "Test your project's packaging friendliness"; + homepage = "https://github.com/regebro/pyroma"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index 9fee5ec56c0e6..c8fc988b96c03 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyroma"; - version = "2.6.1"; + version = "3.1"; src = fetchPypi { inherit pname version; - sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f"; + sha256 = "45ad8201da9a813b5597bb85c80bbece93af9ec89170fc2be5ad85fa9463cef1"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 5cc86e909f005..39941242f1d99 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.4"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BOVALVFb/p2q3A4NkvgtwmL5fNvwMCk0hb1L5MRWzHY="; + sha256 = "da4bed38aba52fa097694bda15c7fd80ca698d9352e71a63bc29092d635de54d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 2d09a0a0c3b08..064a8db88e2d7 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.0.2"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d4f2ced43394ad773f7b516a4bbcb5821a940462a17b1a25f175c83771b62ebc"; + sha256 = "104abc146d4ffb72d4c683d25d7af5a6bf955d94590a76f542ee23185670aa7e"; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 25d5aa30543a9..10b9b0ec48226 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "2.1.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "ansible"; repo = "pytest-ansible"; rev = "v${version}"; - sha256 = "0v97sqk3q2vkmwnjlnncz8ss8086x9jg3cz0g2nzlngs4ql1gdb0"; + sha256 = "0vh2f34qxs8qfv15hf1q7li2iqjiydjsb4c86i2ma1b7vhi73j57"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 003d7e14ab596..a41c26b753b79 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "2.10.1"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e"; + sha256 = "359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index bf8dc9f8dfcee..335846fc34255 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.8.0"; + version = "0.9.0"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "fb083925a17ce636f33997c275f61123e63372c1db11fefac1e991ed25a4ca37"; + sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index e55d98ce46bee..f5fd4c5251d4d 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pytest-flask"; - version = "1.1.0"; + version = "1.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9c136afd6d0fb045b0b8fd2363421b6670bfebd21d9141f79669d9051c9d2d05"; + sha256 = "46fde652f77777bf02dc91205aec4ce20cdf2acbbbd66a918ab91f5c14693d3d"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index c634aa00718e9..43ef2a1339f76 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pytest-helpers-namespace"; - version = "2019.1.8"; + version = "2021.3.24"; src = fetchFromGitHub { owner = "saltstack"; repo = pname; - rev = "v${version}"; - sha256 = "0z9f25d2wpf3lnqzmmnrlvl5b1f7kqwjjf4nzs9x2bpf91s5zny1"; + rev = version; + sha256 = "0ikwiwp9ycgg7px78nxdkqvg7j97krb6vzqlb8fq8fvbwrj4q4v2"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index fb65f8aceadb5..fe74f692df5e2 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "f0fcf9674f3a627b36e07466d335e82b0f7c4f9e0f7ec39f2a1750b0189d5371"; + sha256 = "46a12331a701e2f21d48548b2828c8b0a7956dbf1cd5347163f537deb24332dd"; }; propagatedBuildInputs = [ isort ]; diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 370416c4aa82c..88b8017e1c092 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "63d418a4fea7d598ac40b659723c00804d16a251d90a5cfbca213eeba5aaf01c"; + sha256 = "1fa55723a4bf1d054fcba1c3bd694215a2a65cc95ab10164f5808afd893f3b11"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix index 8e10cd4f587a8..2d94b26c5327b 100644 --- a/pkgs/development/python-modules/pytest-order/default.nix +++ b/pkgs/development/python-modules/pytest-order/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-order"; - version = "0.9.5"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "9c9e4f1b060414c642e88ad98ca60f1fd37937debd704bd8f4a2ef8e08b9cb6d"; + sha256 = "2da32cb95e63fac6972d34f5ddb53997fc66305355425be0f55f4092d666293d"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 7ab175a893c81..70caefea8953c 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -6,7 +6,7 @@ , psutil , pytest , setuptools_scm -, subprocess32 +, subprocess32 ? null , toml , zc_lockfile }: diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix index 5006ac51150f2..d15df7115fbf8 100644 --- a/pkgs/development/python-modules/pytest-subtesthack/default.nix +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-subtesthack"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x"; + sha256 = "0711e5d04c291ac9ac6c9eff447ec2811b1d23ccdfe1417d16d4f96481efcbe6"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 6e557a7adceb9..5949840d1e815 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "2506d637c4f54c65dd195c1d094abdeedacc9bf0689131d847a324ad0fc951c0"; + sha256 = "59c739edee7f3f2258e7c77989241698e356c552f5efb28bb46b478616888bf6"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 579cfe1271f3a..4c6d76833ed33 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -56,9 +56,12 @@ buildPythonPackage rec { ''; # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 + # test_missing_required_plugins will emit deprecation warning which is treated as error checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py + $out/bin/py.test -x testing/ \ + --ignore=testing/test_junitxml.py \ + -k "not test_collect_pyargs_with_testpaths and not test_missing_required_plugins" # tests leave behind unreproducible pytest binaries in the output directory, remove: find $out/lib -name "*-pytest-${version}.pyc" -delete diff --git a/pkgs/development/python-modules/pytestrunner/2.nix b/pkgs/development/python-modules/pytestrunner/2.nix new file mode 100644 index 0000000000000..d6203276b827f --- /dev/null +++ b/pkgs/development/python-modules/pytestrunner/2.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: + +buildPythonPackage rec { + pname = "pytest-runner"; + version = "5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; + }; + + nativeBuildInputs = [ setuptools_scm pytest ]; + + postPatch = '' + rm pytest.ini + ''; + + checkPhase = '' + py.test tests + ''; + + # Fixture not found + doCheck = false; + + meta = with lib; { + description = "Invoke py.test as distutils command with dependency resolution"; + homepage = "https://github.com/pytest-dev/pytest-runner"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index d6203276b827f..6f68bcd023540 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-runner"; - version = "5.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; + sha256 = "ca3f58ff4957e8be6c54c55d575b235725cbbcf4dc0d5091c29c6444cfc8a5fe"; }; nativeBuildInputs = [ setuptools_scm pytest ]; diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index d8b501d62e5a1..246e253e191d5 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-daemon"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "57c84f50a04d7825515e4dbf3a31c70cc44414394a71608dee6cfde469e81766"; + sha256 = "bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf"; }; nativeBuildInputs = [ twine ]; diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix index 6c6806f043ced..9afa43bf39323 100644 --- a/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/pkgs/development/python-modules/python-frontmatter/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "python-frontmatter"; - version = "0.5.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "eyeseast"; repo = pname; rev = "v${version}"; - sha256 = "1iki3rcbg7zs93m3mgqzncybqgdcch25qpwy84iz96qq8pipfs6g"; + sha256 = "0flyh2pb0z4lq66dmmsgyakvg11yhkp4dk7qnzanl34z7ikp97bx"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 1a2e28d57aba9..4dc3cfb5693f5 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "68b42aafd4b620ab2534ff78a52584c7f799e4e55d5ac297eab4263066e6f74b"; + sha256 = "a862c6874524ab585b725a17b2cd2950fc09d6d74205f40a11be2a4e8f2dcaa1"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index fe68676110709..7189a235dedad 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.4.6"; + version = "0.4.7"; src = fetchPypi { inherit pname version; - sha256 = "3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a"; + sha256 = "2061f56b1942c29b92727bf9aecbd3cea3893acc9cccbdc7eb4604285efe4ac7"; }; # Let's make the library default to our gpg binary diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 53dab817eb275..e641a943f8653 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , pytestCheckHook, mock, pytestcov, coverage -, future, futures, ujson, isPy38 +, future, futures ? null, ujson, isPy38 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index e221f5b1efc11..69fbaa78067e7 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 -, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 +, backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index e9317d3f7c67f..b851ed6b826fc 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "2.1.10"; + version = "3.1.3"; # get full repository inorder to run tests src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr"; + sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf"; }; nativeBuildInputs = [ setuptools_scm pkgconfig pytestrunner ]; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index e0461dd1efe63..b52ad018d5773 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-periphery"; - version = "2.1.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ed07adc27c8b4df9cd40b2d935f86400a7b495b311df5bfaf9ecaeafc5413fd5"; + sha256 = "8a8ec019d9b330a6a6f69a7de61d14b4c98b102d76359047c5ce0263e12246a6"; }; # Some tests require physical probing and additional physical setup diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 1af58300c2f0d..0ea759d92dcfa 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-ptrace"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "b998e3436cec975b6907552af6e7f3ff8779097e32d2b905696e5a9feb09e070"; + sha256 = "1e3bc6223f626aaacde8a7979732691c11b13012e702fee9ae16c87f71633eaa"; }; # requires distorm, which is optionally diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 4ef3b9f837907..63dc4018b27df 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.9.4"; + version = "1.0"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "d79a412d7df30f01d3cb12e0e8863a48cfecd2fd7612719e16bc76eb1b65b332"; + sha256 = "a61fa61e41b0b85ba9e78444242fddcb3be724de1df79314e6b4766b66e4e11c"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index 3e5889b93560f..ec71448fe1d7f 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -11,6 +11,17 @@ , pythonOlder }: +let + # https://github.com/mdz/python-smarttub/issues/10 + pyjwt' = pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.7.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; + }; + }); +in + buildPythonPackage rec { pname = "python-smarttub"; version = "0.0.19"; @@ -26,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp inflection - pyjwt + pyjwt' python-dateutil ]; diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index 06e1185e3430a..05d804bc67704 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-snap7"; - version = "0.11"; + version = "1.0"; src = fetchFromGitHub { owner = "gijzelaerr"; repo = "python-snap7"; - rev = "899a94c6eeca76fb9b18afd5056e5003646d7f94"; - sha256 = "169zd1nxq86nmi6132vxl1f6wxm9w3waihq2wn14kkmld1vkmvfd"; + rev = version; + sha256 = "103drdwf4v3yqvd7sscxx154mmmshb6x19v9yqmkj2lj76m0619s"; }; propagatedBuildInputs = [ setuptools six ]; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index eb912b2bc5938..581813fac4d91 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.14"; + version = "1.16"; pname = "python-stdnum"; src = fetchPypi { inherit pname version; - sha256 = "fd3a92b8ec82a159c41dbaa3c5397934d090090c92b04e346412e0fd7e6a1b1c"; + sha256 = "4248d898042a801fc4eff96fbfe4bf63a43324854efe3b5534718c1c195c6f43"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 60160d270b75f..637c25cc5aab9 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-utils"; - version = "2.4.0"; + version = "2.5.6"; src = fetchPypi { inherit pname version; - sha256 = "12c0glzkm81ljgf6pwh0d4rmdm1r7vvgg3ifzp8yp9cfyngw07zj"; + sha256 = "352d5b1febeebf9b3cdb9f3c87a3b26ef22d3c9e274a8ec1e7048ecd2fac4349"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 5c7faf50cea65..83de3cb459aa2 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2020.4.4"; + version = "2021.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3645ed839cf4d79cb4bf030f37ddaeecd7fe5e2d6698438cc36c24a1d5168809"; + sha256 = "ebbcc38c7a30b1a0ce1a74816c85db9f2556bb4d5b9a71f85f5d88f69ddcb96b"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 0430ab37a6828..285602bce4a88 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "0.9.95"; + version = "0.9.97"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "v${version}"; - sha256 = "1msvs1j3n47762ahm21bnkk2qqabxw8diiyi7s420x4zg24mr23g"; + sha256 = "1hipby54swwpfw50wlxzgbphzqkk1fbs5x44smz4rrngqpsp3g67"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 13c54f6a41e65..a7fcf5e137b87 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.5903"; + version = "9.0.6588"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qhLlRlmb48zhjX2u9w6TVVv2gb0E9kSapabiv+u4J2s="; + sha256 = "a77d29a5fffb8ddeed092a586086c46d489a5214a1b06829f51068486b3b6be3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 260311a51ad6e..d2771da1b525d 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.6"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "cd9649a9ea9dfcb9b34d78f9a64e1870aa8b6b94de546e2c99c6bb53d64ab5d1"; + sha256 = "be63957a49772895ddebeac02c697e1675e0bdf1515824f60fcc261914f23624"; }; propagatedBuildInputs = [ param ]; diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index 5bb8989506f21..a89e0b3789cf4 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -1,22 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage -, coverage, flake8, mock, nose -, http-ece, py-vapid, requests }: +{ lib +, fetchPypi +, buildPythonPackage +, cryptography +, http-ece +, py-vapid +, requests +, six +, coverage +, flake8 +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "pywebpush"; - version = "1.11.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "596c74020f9cbabc99f7964127ab0bb6cc045fcfe781b7c73cffb3ea45947820"; + sha256 = "97ef000a685cd1f63d9d3553568508508904bfe419485df2b83b025d94e9ae54"; }; propagatedBuildInputs = [ - http-ece py-vapid requests + cryptography + http-ece + py-vapid + requests + six ]; checkInputs = [ - coverage flake8 mock nose + coverage + flake8 + mock + pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index c80dfe93aee0c..953a327d1991b 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "20.0.0"; + version = "22.0.3"; src = fetchPypi { inherit pname version; - sha256 = "824ad5888331aadeac772bce27e1c2fbcab82fade92edbd234542c4e12f0dca9"; + sha256 = "f7f63ce127980d40f3e6a5fdb87abf17ce1a7c2bd8bf2c7560e1bbce8ab1f92d"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/qds_sdk/default.nix b/pkgs/development/python-modules/qds_sdk/default.nix index 56b3f36c367c8..af5df9c347eb9 100644 --- a/pkgs/development/python-modules/qds_sdk/default.nix +++ b/pkgs/development/python-modules/qds_sdk/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "qds_sdk"; - version = "1.15.2"; + version = "1.16.1"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "qubole"; repo = "qds-sdk-py"; rev = "V${version}"; - sha256 = "0xxg9s0y6fz7vb1kab4q93q7ryi71z8x6q9qspm6s506yr3mc67l"; + sha256 = "05c7g63rcvvi4fgkcfsxh2a6hwlffbs18dhki222s5rpc49wi8zi"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index da45b37bee95b..47c36fcc126d9 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.0.2"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - sha256 = "404994edfe33c201d6bd0c4bd501b00c16125071573c938533224992bea0b30f"; + sha256 = "c091a35607d2a2432e004c4a112d241ce908086570cf68594176dd52ccaa212d"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index 8ed5c720ef317..f1f3200bb7b00 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "radio_beam"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "0g1nqiikv023ab60gfqrvc13kfjv8m70bpfk264vlliaq6mvxdf2"; + sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd"; }; propagatedBuildInputs = [ astropy ]; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index ef6975b29df71..74f1c05a20106 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.1.3"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "209c4b5ecf233b8bb44fcb8b4548460b0806e347ce50fd8172adcb7d23969a4a"; + sha256 = "2ba023376057c6ba5d07b4fd016ec1d526f1b4fc5ad7a7ce7f0ed8a91dc54bbe"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 8a4754e7a61d4..fae0bf08e54b4 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "2.0.1"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "320ded3cc456347d828f95e9aa5f8bab77ac01943cad024c06012069fe19690a"; + sha256 = "025d191c11abf9174c6aff0006579624047d3371a654333c4bf7a4b421552cdc"; }; # Some kind of trickery with imports that doesn't work. diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index e4d6baeb425ba..efb299161b8e2 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2020.11.13"; + version = "2021.3.17"; src = fetchPypi { inherit pname version; - sha256 = "83d6b356e116ca119db8e7c6fc2983289d87b27b3fac238cfe5dca529d884562"; + sha256 = "4b8a1fb724904139149a43e172850f35aa6ea97fb0545244dc0b805e0154ed68"; }; postCheck = '' diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index ace36423c191e..7b5cc0a8c20a2 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.59"; + version = "3.5.66"; src = fetchPypi { inherit pname version; - sha256 = "a755cca2dcf023130b03bb671670301a992157d5c3151d838c0b68ef89894536"; + sha256 = "63fba51babad0047def4ffaa41d0065248ca39d680e98dc9e3010de5425539b4"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 5589ec683af43..72feafc771e87 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { sha256 = "sha256-J5c91KkEpPE7JjoZyGbBO5KjntHJZGVfAl8/jT11uAQ="; }; + postPatch = '' + # Use latest idna + substituteInPlace setup.py --replace ",<3" "" + ''; + propagatedBuildInputs = [ certifi chardet diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 624094e581e95..6b2bd4ac1978c 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.12.1"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "2e5764325c6b624e42b428688f2111fea166af46623cb0127c05f6afb14d3457"; + sha256 = "cf62ab0f4119b81d485521b2c950d8aa55a885c90126488450b7acb8ee3f77ac"; }; propagatedBuildInputs = [ cookies mock requests six ]; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 64739b3c65c62..52bef42f270f5 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "rich"; - version = "9.10.0"; + version = "9.13.0"; # tests not included in pypi tarball src = fetchFromGitHub { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "1m1rswg16r4pxv7504nk7lpyxrwf16xw4w55rs3jisryx14ccic6"; + sha256 = "0si3rzhg8wfxw4aakkp8sr6nbzfa54rl0w92macd1338q90ha4ly"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index f23979f21fd10..5935c23185fa3 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.7.2"; + version = "0.8.1"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "662e0ce5036a55bcb4cb46ff9741f40c78c670f4fb64cd37714cf83d5fd31774"; + sha256 = "b26f4ae617ff8c4b522fba422b7c8f83545a98aec3e2deb7f1aa53dcd68defe2"; }; buildInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index fbb8cb034a51d..ed2ba7155c7e0 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: buildPythonPackage rec { - version = "3.3.1"; + version = "5.1.3"; pname = "robotframework-seleniumlibrary"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "v${version}"; - sha256 = "0dabc5dwx0pwsyiy74d7wj97k72yl28a17sasjzrdq819pyc3dvq"; + sha256 = "1djlrbrgd7v15xk5w90xk7iy98cr1p2g57k614gvbd298dmnf2wd"; }; propagatedBuildInputs = [ robotframework selenium ]; diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 62fb43e026915..4d72a2b3b0a16 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.5.1"; + version = "3.6.0"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "843af44722d1d4e39f616e5441d6f49e82202cd1a8cc9d16637a6475a8ecb023"; + sha256 = "169c343f4db71e1969169fa6f383ca7fff549aa8f83bdd3d9cbd03cea928b688"; }; # unit tests are impure diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index cc57fa0d0264e..04e8ccf0bcf84 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "robotframework"; - version = "3.2.2"; + version = "4.0"; src = fetchPypi { inherit pname version; - sha256 = "a0786a916d0572bd9d6afe26e95c6021e3df5dcafa0ece6b302e36366e58c24e"; + sha256 = "a02a6f4af3b0830e4396058694c333cb63eb47f50acf6723be34f0f7a4d73ad7"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index c913ab53b2861..0a5dbb8c60db0 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.4.2"; + version = "3.4.3"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "8f7d1348b77bc45425b846a0d625f24a51a1c4f32ef2cd1c07a24222aa64e2e0"; + sha256 = "a39f2d75c24c688d5f48dfb2ef82efc006f2a51591941743026e1182353bf558"; }; patches = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 8ec05aae9d52f..71381e5cf2428 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "rq"; - version = "1.5.2"; + version = "1.7.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = "rq"; rev = "v${version}"; - sha256 = "0ikqmpq0g1qiqwd7ar1286l4hqjb6aj2wr844gihhb8ijzwhp8va"; + sha256 = "1i7cbcrzqx52immwy8h5ps7x46sqfk9r2lgwjf01nv9mkc3ab8cj"; }; # test require a running redis rerver, which is something we can't do yet diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index 7a990061e00ef..247fd2a2a7f8f 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "rsa"; - version = "4.6"; + version = "4.7.2"; src = fetchPypi { inherit pname version; - sha256 = "109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa"; + sha256 = "9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9"; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 6bda50d24ad5d..1eaf86d69c05a 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -2,19 +2,19 @@ , buildPythonPackage , fetchPypi , ruamel_base -, ruamel_ordereddict -, ruamel_yaml_clib +, ruamel_ordereddict ? null +, ruamel_yaml_clib ? null , isPy3k , isPyPy }: buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.16.12"; + version = "0.16.13"; src = fetchPypi { inherit pname version; - sha256 = "076cc0bc34f1966d920a49f18b52b6ad559fbe656a0748e3535cf7b3f29ebf9e"; + sha256 = "bb48c514222702878759a05af96f4b7ecdba9b33cd4efcf25c86b882cef3a942"; }; # Tests use relative paths diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix index 8304f5d7dadc3..c403239d55255 100644 --- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchhg , ruamel_base -, ruamel_ordereddict +, ruamel_ordereddict ? null , isPy3k }: diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 51d3f3ab14acd..0ef7378fbf67c 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -9,16 +9,16 @@ , wheel , unittest2 , botocore -, futures +, futures ? null }: buildPythonPackage rec { pname = "s3transfer"; - version = "0.3.4"; + version = "0.3.6"; src = fetchPypi { inherit pname version; - sha256 = "7fdddb4f22275cf1d32129e21f056337fd2a80b6ccef1664528145b72c49e6d2"; + sha256 = "c5dadf598762899d8cfaecf68eba649cd25b0ce93b6c954b156aaa3eed160547"; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/sacn/default.nix b/pkgs/development/python-modules/sacn/default.nix index 35c7a74432999..9b1e935d6ed95 100644 --- a/pkgs/development/python-modules/sacn/default.nix +++ b/pkgs/development/python-modules/sacn/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sacn"; - version = "1.4.6"; + version = "1.6.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "015wa9nhqgd0kb60bw19g86ga25s9mpvsbqkahi3kw6df6j0wzss"; + sha256 = "2fea82a1dd83b0a67dc0be68a53b1fef1c44b12f3f018e47ac736bd15b36c068"; }; # no tests diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index e5faa440ad8d3..bd9e91837465b 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sanic"; - version = "20.9.1"; + version = "21.3.2"; src = fetchPypi { inherit pname version; - sha256 = "06p0lsxqbfbka2yaqlpp0bg5pf7ma44zi6kq7qbb6hhry48dp1w6"; + sha256 = "84a04c5f12bf321bed3942597787f1854d15c18f157aebd7ced8c851ccc49e08"; }; postPatch = '' diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 2eda0cd6ac985..e6028d2c6cb8c 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "schedule"; - version = "0.6.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "f9fb5181283de4db6e701d476dd01b6a3dd81c38462a54991ddbb9d26db857c9"; + sha256 = "1654cf70860a6d4d58236c98b0f1bb71521cc2a4bbf031b6cc39c96e77d59a91"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index 8705488ba14cf..08101bd2d00d7 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2019.1.30"; + version = "2021.2.2"; src = fetchPypi { inherit pname version; - sha256 = "eb64b6d8e30b8df8f8636d5fc4fd7ca6a9b05938ccd62518c80c1d9e823069dd"; + sha256 = "809e20016e6341e4de29b6be4befc477b7002cfd5e2a11b80deae16005f35670"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 44d2c240ce547..f7d3fd63b17b6 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.17.2"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "bd954c0588f0f7e81d9763dc95e06950e68247d540476e06cb77bcbcd8c2d8b3"; + sha256 = "fbb618ca911867bce45574c1639618cdfb5d94e207432b19bc19563d80d2f171"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index f4a4955a7392b..7580647f5a12c 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "seabreeze"; - version = "0.6.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ap--"; repo = "python-seabreeze"; - rev = "python-seabreeze-v${version}"; - sha256 = "0bc2s9ic77gz9m40w89snixphxlzib60xa4f49n4zasjrddfz1l8"; + rev = "v${version}"; + sha256 = "1lna3w1vsci35dhyi7qjvbb99gxvzk23k195c7by7kkrps844q1j"; }; postInstall = '' diff --git a/pkgs/development/python-modules/sentinel/default.nix b/pkgs/development/python-modules/sentinel/default.nix index 6c69ea26b2a65..0fd10294bbe91 100644 --- a/pkgs/development/python-modules/sentinel/default.nix +++ b/pkgs/development/python-modules/sentinel/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sentinel"; - version = "0.1.2"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "c7aeee3f57c56a8e52771fc64230345deecd62c48debbbe1f1aca453439741d0"; + sha256 = "f28143aa4716dbc8f6193f5682176a3c33cd26aaae05d9ecf66c186a9887cc2d"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/setuptools_scm/2.nix b/pkgs/development/python-modules/setuptools_scm/2.nix new file mode 100644 index 0000000000000..4cf6f16fedfb5 --- /dev/null +++ b/pkgs/development/python-modules/setuptools_scm/2.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, toml }: + +buildPythonPackage rec { + pname = "setuptools_scm"; + version = "5.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-g6DO3TRJ45RjB4EaTHudicS1/UZKL7XuzNCluxWK5cg="; + }; + + propagatedBuildInputs = [ toml ]; + + # Requires pytest, circular dependency + doCheck = false; + pythonImportsCheck = [ "setuptools_scm" ]; + + meta = with lib; { + homepage = "https://github.com/pypa/setuptools_scm/"; + description = "Handles managing your python package versions in scm metadata"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index fa3a3de853281..a4cff6d056b00 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "setuptools_scm"; - version = "4.1.2"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - sha256 = "a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8"; + sha256 = "d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92"; }; propagatedBuildInputs = [ toml ]; diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index abc68709caa4d..5600f4a6aa0f3 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "shap"; - version = "0.36.0"; + version = "0.39.0"; disabled = isPy27; src = fetchFromGitHub { owner = "slundberg"; repo = pname; rev = "v${version}"; - sha256 = "1wxnxvbz6avzzfqjfbcqd4v879hvpq4021v31fhdpccr2q317rr9"; + sha256 = "065c40k6g8sy6ynzk4k8k7iddl18g2b6kb9kg4m6g7npclmn5wvp"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 2f47113408e82..10de67ba0ef2c 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "signedjson"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "python-${pname}"; - rev = "refs/tags/v${version}"; - sha256 = "18s388hm3babnvakbbgfqk0jzq25nnznvhygywd3azp9b4yzmd5c"; + rev = "v${version}"; + sha256 = "0y5c9v4vx9hqpnca892gc9b4xgs4gp5xk6l1wma5ciz8zswp9yfs"; }; propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]; diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 3b6803aa5de20..cd89c1c8aae85 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "0.74.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1n960xgrnmv20l31nm0im7pb4nfa83bmx4x4clqrh2jkpzq3ric0"; + sha256 = "16c34xnqa1xkdfjbxx0q584zb6aqci2z6j4211hmzjqs74ddvysm"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix index 789a24f3e818f..0a9b2353bf1b8 100644 --- a/pkgs/development/python-modules/singledispatch/default.nix +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -2,17 +2,24 @@ , buildPythonPackage , fetchPypi , six +, setuptools-scm +, toml }: buildPythonPackage rec { pname = "singledispatch"; - version = "3.4.0.3"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c"; + sha256 = "58b46ce1cc4d43af0aac3ac9a047bdb0f44e05f0b2fa2eec755863331700c865"; }; + nativeBuildInputs = [ + setuptools-scm + toml + ]; + propagatedBuildInputs = [ six ]; # pypi singledispatch tarbal does not contain tests diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index ad7cc02143937..56e853f73e2e2 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -10,10 +10,10 @@ let pname = "skein"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0nb64p1hzshgi1kfc2jx1v9vn8b0wzs50460wfra3fsxh0ap66ab"; + sha256 = "04208b4be9df2dc68ac5b3e3ae51fd9b589add95ea1b67222a8de754d17b1efa"; }; skeinJar = callPackage ./skeinjar.nix { inherit src version; }; in diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index fd161ecd7531c..3504557b5027f 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "skorch"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "bdce9370153fd80c5c4ec499a639f55eef0620e45d4b15fbf7d7ff2a225a3d40"; + sha256 = "9910f97339e654c8d38e0075d87b735e69e5eb11db59c527fb36705b30c8d0a4"; }; propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 99c9c28a16a8e..4f3423b7df320 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "smart_open"; - version = "4.1.2"; + version = "4.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "4bbb6233364fc1173cc0af6b7a56ed76fce32509514f1978a995a5835f3177f1"; + sha256 = "d9f5a0f173ccb9bbae528db5a3804f57145815774f77ef755b9b0f3b4b2a9dcb"; }; # moto>=1.0.0 is backwards-incompatible and some tests fail with it, diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix index 1b0f310f42517..800cf08425821 100644 --- a/pkgs/development/python-modules/smmap/default.nix +++ b/pkgs/development/python-modules/smmap/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "smmap"; - version = "3.0.5"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "84c2751ef3072d4f6b2785ec7ee40244c6f45eb934d9e543e2c51f1bd3d54c50"; + sha256 = "7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182"; }; checkInputs = [ nosexcover ]; diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 84b2bb2e1435a..5f3029de2a706 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "snowballstemmer"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "df3bac3df4c2c01363f3dd2cfa78cce2840a79b9f1c2d2de9ce8d31683992f52"; + sha256 = "e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"; }; # No tests included diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 0679b25ad417c..fdf984563ea0f 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.3.10"; + version = "2.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ad62bfd31e677d39984449d9c68e233da2776b80894a988a2421aad412e4c44f"; + sha256 = "5c9180e61202a7beb1df83231688423091ca0a04ee559d2a78ff77f9c727baae"; }; postPatch = '' diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 22d1926d8bb4e..954599ffefaa5 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "2.0.1"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "a59dc181727e95d25f781f0eb4fd1825ff45590ec8ff49eadfd7f1a537cc0232"; + sha256 = "052774848f448cf19c7e959adf5566904d525f33a3f8b6ba6f6f8f26ec7de0cc"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index eef7b116b8945..077ac0e6a3bc6 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.3.5"; + version = "3.0.5"; src = fetchPypi { inherit pname version; - sha256 = "315278ab60094643baecd866017c7d4cbd966efd2d517ad0e6c888edf7fa5aef"; + sha256 = "9f7a09fbad53aac2a3cb7696a902de62b94575a15d249dd5e26a98049328060e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 93ffa89c76c43..dc41aaa8e3d4e 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.11.2"; + version = "0.12.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bc5c35dbc81242237feb7a8e1f7d9c5e9dd9bb0910f6ec55f50dcc379082864f"; + sha256 = "2c95c3b8ee00211a5aa4ef5e46006d25bf35009a66e406b7ea9b25b327fb9516"; }; checkInputs = [ pytest dask ]; diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index 94047b359aa94..7d4629be50c77 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinx-autobuild"; - version = "2020.9.1"; + version = "2021.3.14"; src = fetchPypi { inherit pname version; - sha256 = "1vbaf4vrxahylyp8zrlw5dx1d2faajp926c3pl5i1wlkp1yll62b"; + sha256 = "de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05"; }; propagatedBuildInputs = [ sphinx livereload ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 9ce0015cdf865..1c5cc29f41469 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -26,7 +26,7 @@ , sphinxcontrib-qthelp , sphinxcontrib-serializinghtml , sphinxcontrib-websupport -, typing +, typing ? null , setuptools , packaging }: diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 87da4131351d3..3062f35669edd 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinx_rtd_theme"; - version = "0.4.3"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"; + sha256 = "eda689eda0c7301a80cf122dad28b1861e5605cbf455558f3775e1e8200e83a5"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 068c4d5d2e943..c60d99d5e6290 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "1.5.1"; + version = "1.7.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "19m9yvlqwaw3b05lbb1vcla38irn4riw2ij0vjmnc2xq4f1qfl2d"; + sha256 = "48caa054a99c21156e9a1d26559281dc27f86ab8ef8bb6ef160f8cd9f4a0053d"; }; propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 931af4b4dde27..b31c79c3f75fa 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "2.1.4"; + version = "2.2.0"; pname = "sphinxcontrib-bibtex"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f53ec0cd534d2c8f0a51b4b3473ced46e9cb0dd99a7c5019249fe0ef9cbef18e"; + sha256 = "7500843e154d76983c23bca5ca7380965e0725c46b8f484c1322d0b58a6ce3b2"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index e028b6eea80ed..51fd34803dff1 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.19"; + version = "0.20"; src = fetchPypi { inherit pname version; - sha256 = "98b9f02282907b0c5b7a93a446c4649909aaf5785d2da0dd263c8ad68e00e288"; + sha256 = "041d8f79599522949eda129146a60955d0b7544963790411106fff6f9f3daab4"; }; # No tests included. diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 614f64a0fbe1e..410e1ad06163d 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "416534d7504c0f337e6e6e2cbd893d1866ad20d3bec99a94ad617d2fd60699ae"; + sha256 = "a507397f5ff0426cff50f1b67996b191bdc8148583aa565f5dffd3d0111c0262"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index dd65079e6a135..0293699a450c4 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.2.1"; + version = "4.2.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7f93bc5b8b119cc1e195ce3efcc1598386e082c4096334c1fa2b018938ac79b9"; + sha256 = "ec3a6949a3210f7a35142ddd0e8ec529bdd382ae0cae9d1537f2009f557214c8"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix index bf8a9d3bbdbd8..f701da577245c 100644 --- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlalchemy-citext"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "69ba00f5505f92a1455a94eefc6d3fcf72dda3691ab5398a0b4d0d8d85bd6aab"; + sha256 = "a1740e693a9a334e7c8f60ae731083fe75ce6c1605bb9ca6644a6f1f63b15b77"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 6f5fb5578665b..5964e382084f9 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch , mock -, pysqlite +, pysqlite ? null , pytestCheckHook , pytest_xdist }: diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index f3c438342bce7..2335a0204e48d 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SQLObject"; - version = "3.8.1"; + version = "3.9.1"; src = fetchPypi { inherit pname version; - sha256 = "620657105ab5720658222d10ad13c52281fe524137b59ab166eee4427ee2f548"; + sha256 = "45064184decf7f42d386704e5f47a70dee517d3e449b610506e174025f84d921"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix index 6e250cf85f2f4..955eb905ac29f 100644 --- a/pkgs/development/python-modules/sshpubkeys/default.nix +++ b/pkgs/development/python-modules/sshpubkeys/default.nix @@ -4,14 +4,14 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.3.1"; pname = "sshpubkeys"; src = fetchFromGitHub { owner = "ojarva"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "1h4gwmcfn84kkqh83km1vfz8sc5kr2g4gzgzmr8gz704jmqiv7nq"; + rev = version; + sha256 = "1qsixmqg97kyvg1naw76blq4314vaw4hl5f9wi0v111mcmdia1r4"; }; propagatedBuildInputs = [ cryptography ecdsa ]; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 06d614feaacf2..c9ea20440482c 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "3.2.2"; + version = "3.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f845868b3a3a77a2489d226568abe7328b5c2d4f6a011cc759dfa99144a521f0"; + sha256 = "3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee"; }; propagatedBuildInputs = [ pbr setuptools six ] diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 96ac2d208b3d6..4be51c488d426 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.55.2"; + version = "2.56.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e32c68194a47522a10945eb893218e5cb5ee65e3a3c2c4df7efca117a6bf1902"; + sha256 = "2ff904fb8dee0d25f135059468a876852d24dc8cbe0b45d7aff56a028045777c"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 8f7e73a454a44..dc7aea0c3bf9d 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "20.1.0"; + version = "21.1.0"; src = fetchPypi { inherit pname version; - sha256 = "7a48375db6274ed1d0ae6123c486472aa1d0890b08d314d2b016f3aa7f35990b"; + sha256 = "d9d2d890532e8db83c6977a2a676fb1889922ff0c26ad4dc0ecac26f9fafbc57"; }; checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ] diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 3ace2e925cbb4..3be5ffad1c8dc 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "stumpy"; - version = "1.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "TDAmeritrade"; repo = "stumpy"; rev = "v${version}"; - sha256 = "0s2s3y855jjwdb7p55zx8lknplz58ghpw547yzmqisacr968b67w"; + sha256 = "0s7pamn39ymm1lp9z28isbdrd6ix98y9i4lfdk3ii95wvd3y50my"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index e1b3d8c705ebc..9ba073df92284 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "sumo"; - version = "1.0.9"; + version = "2.2.1"; # No tests in Pypi tarball src = fetchFromGitHub { owner = "SMTG-UCL"; repo = "sumo"; rev = "v${version}"; - sha256 = "1zw86qp9ycw2k0anw6pzvwgd3zds0z2cwy0s663zhiv9mnb5hx1n"; + sha256 = "0r88f5w33h9b0mv7shlqc4przwvas5ycgndvl91wqjnm3b2s3ix0"; }; propagatedBuildInputs = [ numpy scipy spglib pymatgen h5py matplotlib seekpath phonopy ]; diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 3ad8b6fea1d76..dfa612a64943c 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "sunpy"; - version = "2.0.7"; + version = "2.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d13ac67c14ea825652dc3e12c4c627e782e8e843e96a1d54440d39dd2ceb6a5c"; + sha256 = "8bbc440e606a4f3fcbd1441150d81da6f0208adace9dc06f6afd2c9cb7c08908"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 93569fe3da73c..a7153b07750f0 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "supervisor"; - version = "4.2.1"; + version = "4.2.2"; src = fetchPypi { inherit pname version; - sha256 = "c479c875853e9c013d1fa73e529fd2165ff1ecaecc7e82810ba57e7362ae984d"; + sha256 = "5b2b8882ec8a3c3733cce6965cc098b6d80b417f21229ab90b18fe551d619f90"; }; # wants to write to /tmp/foo which is likely already owned by another diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 820d4121633b3..e01909fc93a8b 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "svg.path"; - version = "4.0.2"; + version = "4.1"; src = fetchPypi { inherit pname version; - sha256 = "4bd627ec6526cd5da14f3c6a51205d930187db2d8992aed626825492c033b195"; + sha256 = "7e6847ba690ff620e20f152818d52e1685b993aacbc41b321f8fee3d1cb427db"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index f225dd431e585..831583c1324ce 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.6.1"; + version = "0.7.0.post3"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "13fy25qxn4xwzlr2w35v6jhlpd70lv9r6srv4dizc4brj63hnw50"; + sha256 = "1hpwnnv6f7f2wj33zaaj3i2r0d0qj0jwm3fd4ayicj0rvqya50rx"; }; postConfigure = '' diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv_ipc/default.nix index 5d9b5a034c2b7..a58b714a4ac80 100644 --- a/pkgs/development/python-modules/sysv_ipc/default.nix +++ b/pkgs/development/python-modules/sysv_ipc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sysv_ipc"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1p5lx3yz4p40rfb453m80a4hh8341yp4dki2nhhxz7bq2zfi1zwf"; + sha256 = "0f063cbd36ec232032e425769ebc871f195a7d183b9af32f9901589ea7129ac3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index b1427a8133125..5216fc7d0d92f 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "tablib"; - version = "2.0.0"; + version = "3.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1rvvdchdva7j9b29ay0sg8y33pjhpmzynl38wz2rl89pph8gmhlc"; + sha256 = "f83cac08454f225a34a305daa20e2110d5e6335135d505f93bc66583a5f9c10d"; }; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 2d841918f1104..621445b2d516b 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.8"; + version = "0.8.9"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "26f2589d80d332fefd2371d396863dedeb806f51b54bdb4b264579270b621e92"; + sha256 = "eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 9e1ae3302c122..523d3e303b32f 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.3.0"; pname = "taskw"; src = fetchPypi { inherit pname version; - sha256 = "fadd8afc12df026c3c2d39b633c55d3337f7dca95602fce2239455a048bc85fe"; + sha256 = "7673d80b3d5bace5b35eb71f5035e313a92daab6e437694128d8ce7dcdaf66fb"; }; patches = [ ./use-template-for-taskwarrior-install-path.patch ]; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 51f055d066075..c1c0abcec241d 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -1,15 +1,15 @@ { lib, buildPythonPackage, fetchPypi, isPy27, isPy3k -, pbr, six, futures, monotonic, typing, setuptools_scm +, pbr, six, futures ? null, monotonic ? null, typing ? null, setuptools_scm , pytest, sphinx, tornado, typeguard }: buildPythonPackage rec { pname = "tenacity"; - version = "6.3.1"; + version = "7.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0zsdajdpcjd7inrl7r9pwiyh7qpgh9jk7g2bj1iva2d3n0gijkg1"; + sha256 = "5bd16ef5d3b985647fe28dfa6f695d343aa26479a04e8792b9d3c8f49e361ae1"; }; nativeBuildInputs = [ pbr setuptools_scm ]; diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index a95f8e0292850..00ea276845dd2 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "tensorboardx"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; rev = "v${version}"; - sha256 = "0qqalq0fhbx0wnd8wdwhyhkkv2brvj9qbk3373vk3wjxbribf5c7"; + sha256 = "1palz91y0b39pcmwg6wdmqfal38hai99dd6r88i3imqxdbmjghih"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 0f02da4866f24..846c8157b75fb 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "89e6d94b19e4bc9dce0ffd908dfaf55cc78a9bf735934e915a4a96f65ac9704c"; + sha256 = "261c0b7825fecf629666e1820b484a5380f7e54d6b8bd889fa482e99dcf9bde4"; }; propagatedBuildInputs = [ ptyprocess tornado ]; diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index b9803b115083f..cd08fe58dcab1 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.15.0"; + version = "6.17.1"; src = fetchPypi { inherit pname version; - sha256 = "409f77cfbdad822d12a8ce5c4aa8fb4d0bb38073f4a5444fede3702716a2cec2"; + sha256 = "5ec3a0dd6f71cc4c304fbc024a10cc293d3e0b852c868014b9f233203e149bda"; }; checkInputs = [ pytest mock sybil zope_component twisted ]; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 75e1a029a2567..ceefc2fd9d149 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.4.5"; + version = "8.0.2"; src = fetchPypi { inherit pname version; - sha256 = "5743fde41706252ec6ce4737c68d3505f7e1cc3d4431174a17149838d594f8cb"; + sha256 = "20f033b3d9fbd02389d8f828cebcd3a42aee3e17ed4c2d56c6d5163af83a9cee"; }; buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 9383cf947c203..70b815c4ec928 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -5,19 +5,19 @@ , isPy3k , numpy , imagecodecs-lite -, enum34 -, futures -, pathlib +, enum34 ? null +, futures ? null +, pathlib ? null , pytest }: buildPythonPackage rec { pname = "tifffile"; - version = "2020.11.26"; + version = "2021.3.17"; src = fetchPypi { inherit pname version; - sha256 = "c712df6f201385fbd3500e26e45dc20fabcbb0c6c1fbfb4c1e44538a9d0269a8"; + sha256 = "1b72c92ecd2273e52686c0f8792d1d1c4da4109b241dd1723dfe56ef4d1ad612"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 0ba9c4c53d8f6..48aff396aaadb 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "4.5.0"; + version = "5.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "99b0cea5abf304e8738ecf5cceae0c0e5182534843f19638a26a220fa212fbad"; + sha256 = "a374570295a8dbd923630ce85f754e52578e288cb0a9cf575834415e84758352"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index b267fa82854db..892b9a3f76fe6 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.1.1"; + version = "4.4.0"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "msiemens"; repo = pname; rev = "v${version}"; - sha256 = "09cwdmpj91c6q7jympip1lrcd3idbm9cqblgvmrh0v1vy1iv2ki7"; + sha256 = "1z5gnffizgbyhh20jy63bkkjh20ih8d62kcfhiaqa6rvnnffqmnw"; }; nativeBuildInputs = [ poetry ]; diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index acc8b9c567050..9dc09db98f45c 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "titlecase"; - version = "1.1.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "16e279edf085293bc9c44a68ce959c7d6cd5c653e6b5669a3a3640015cb63eb6"; + sha256 = "d6b24c4bfce6b05ee55da48901a1aa39eac20f223160b7872dcf1b8182214bec"; }; propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 27f952386f127..cabe2ebcd5e32 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, enum34, functools32, typing +, enum34, functools32, typing ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 3575921518202..8f3cb085b65db 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "torchvision"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "v${version}"; - sha256 = "0yhpbq7linrk2qp5jxsvlgkmwa5bn38s9kcswy4jzvmx1fjbkpq0"; + sha256 = "0rw186nki7q8igk481p2mvx4n763i3kpn663yp3dibkimddpnf9k"; }; nativeBuildInputs = [ libpng ninja which ]; diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix index 6d889a09d25ef..da86c7037b92b 100644 --- a/pkgs/development/python-modules/tornado/4.nix +++ b/pkgs/development/python-modules/tornado/4.nix @@ -2,11 +2,11 @@ , python , buildPythonPackage , fetchPypi -, backports_abc -, backports_ssl_match_hostname -, certifi -, singledispatch -, futures +, backports_abc ? null +, backports_ssl_match_hostname ? null +, certifi ? null +, singledispatch ? null +, futures ? null , isPy27 }: diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix index da270331978d3..2905f89dc0cca 100644 --- a/pkgs/development/python-modules/tornado/5.nix +++ b/pkgs/development/python-modules/tornado/5.nix @@ -2,11 +2,11 @@ , python , buildPythonPackage , fetchPypi -, backports_abc -, backports_ssl_match_hostname -, certifi -, singledispatch -, futures +, backports_abc ? null +, backports_ssl_match_hostname ? null +, certifi ? null +, singledispatch ? null +, futures ? null , isPy27 }: diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 9dad7d77ff90c..0fc0ffbf2e723 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.20.1"; + version = "3.23.0"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4321052bfe28f9d85082341ca8e233e3ea901fdd14dab8a5d3fbd810269fbaf6"; + sha256 = "05a4dbd5e4d3d8269b72b55600f0b0303e2eb47ad5c6fe76d3576f4c58d93661"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 950a618a52752..2511aba26a7ff 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.58.0"; + version = "4.59.0"; src = fetchPypi { inherit pname version; - sha256 = "1fjvaag1wy70gglxjkfnn0acrya7fbhzi4adbs1bpap8x03wffn2"; + sha256 = "d666ae29164da3e517fcf125e41d4fe96e5bb375cd87ff9763f6b38b5592fe33"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index d9986dd87fe15..e4e82db9e446d 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "traits"; - version = "6.1.1"; + version = "6.2.0"; disabled = isPy27; # setup.py no longer py3 compat src = fetchPypi { inherit pname version; - sha256 = "807da52ee0d4fc1241c8f8a04d274a28d4b23d3a5f942152497d19405482d04f"; + sha256 = "16fa1518b0778fd53bf0547e6a562b1787bf68c8f6b7995a13bd1902529fdb0c"; }; # Use pytest because its easier to discover tests diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 235540209e372..533b34ca343b2 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "3.2.2"; + version = "3.2.4"; src = fetchPypi { inherit pname version; - sha256 = "1y5048109j6z4smzwysvdjfn6cj9698dsxfim9i4nqam4nmw2wi7"; + sha256 = "f852d1afd0f0d4f515fe20f0de94d57b6d2e36cbac45e07da43ea0b6518f535c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 447e2a5b98633..ec648281c89ad 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "20.9.0"; + version = "21.1.0"; src = fetchPypi { inherit pname version; - sha256 = "83cd2ca75aef4f1fbdbe144c186426d930c3e8b20385df8cec9e12d442986da2"; + sha256 = "fdae0c872c444ed96c3cb11be8445d22e4afb731e87fdddae3b00c609e77199f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index d4a021a0e3110..aad81957d72d0 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.7"; + version = "3.9.10"; src = fetchPypi { inherit pname version; - sha256 = "63dd76531a4c6ddd53e00209b971e83d3fbfd9b012f4033a1c4b0f04f1f551e3"; + sha256 = "7ed243bc818f7a9a021d8dd39f69ae7ed366dfd9582b13d686e1b1e8c8326bcf"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 4c99c8e937709..f835509fe9b60 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy3k , cryptography -, futures +, futures ? null , pytest , pyopenssl , service-identity @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "9dfb18b568729d0219f758cddca1a91bab59f62ca41ee0e8acce5e657ec97b6c"; + sha256 = "1fde1dd27052ab5e5693e1fbe3ba091a6496daf1125409d73232561145fca369"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 20394fb2de656..1be8fc18d27fc 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -23,12 +23,12 @@ buildPythonApplication rec { pname = "trytond"; - version = "5.8.4"; + version = "5.8.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "28e467b51f6dc67b8b4ca60afec82614bba8cf78852c1941cc9071d615ba7972"; + sha256 = "62753cebdae2d9e2d6bf8a5dde840ef77540414c4df76c8ed202c0c0d0bedb02"; }; # Tells the tests which database to use diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 1c5535ec079b6..dd11e60aff6ce 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tweepy"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "bfd19a5c11f35f7f199c795f99d9cbf8a52eb33f0ecfb6c91ee10b601180f604"; + sha256 = "76e6954b806ca470dda877f57db8792fff06a0beba0ed43efc3805771e39f06a"; }; doCheck = false; diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index e234084d31dec..36a7edcf7de8e 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "twill"; - version = "2.0.2"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "fc694ac1cb0616cfba2f9db4720e9d354bf656c318e21ef604a7e3caaef83d10"; + sha256 = "01770eddb34f5fe6ee59992b84619968885d359ad3d6d9191e8ba8eec93482aa"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 47f9fe1a034ea..67c66e623c3d0 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "twine"; - version = "3.2.0"; + version = "3.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "34352fd52ec3b9d29837e6072d5a2a7c6fe4290e97bba46bb8d478b5c598f7ab"; + sha256 = "a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 814b6234ee3b9..c2f2c9451bdce 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "txaio"; - version = "20.4.1"; + version = "21.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "17938f2bca4a9cabce61346758e482ca4e600160cbc28e861493eac74a19539d"; + sha256 = "7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 7aced09b33da8..9d00adfea8318 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.10.0"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "d830132dcd544d3f8a2a842ea739eaa0d7c099fcebb9dcdf3802f4c9929d8191"; + sha256 = "33243c1cbfcb9736a06c6db22dd08876b5f297e6344aa272a2862c0f8e669f64"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix index 0d5c2119921a2..823ee2af29e02 100644 --- a/pkgs/development/python-modules/typing/default.nix +++ b/pkgs/development/python-modules/typing/default.nix @@ -1,4 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, python }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, python +, pythonAtLeast }: let testDir = if isPy3k then "src" else "python2"; @@ -12,6 +13,8 @@ in buildPythonPackage rec { sha256 = "1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9"; }; + disabled = pythonAtLeast "3.5"; + # Error for Python3.6: ImportError: cannot import name 'ann_module' # See https://github.com/python/typing/pull/280 # Also, don't bother on PyPy: AssertionError: TypeError not raised diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 65cb0882380fe..3ff2e3b981ed2 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Unidecode"; - version = "1.1.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "a039f89014245e0cad8858976293e23501accc9ff5a7bdbc739a14a2b7b85cdc"; + sha256 = "8d73a97d387a956922344f6b74243c2c6771594659778744b2dbdaad8f6b727d"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix index aca6095d333f4..f5760b974ffd4 100644 --- a/pkgs/development/python-modules/uproot3-methods/default.nix +++ b/pkgs/development/python-modules/uproot3-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.10.0"; + version = "0.10.1"; pname = "uproot3-methods"; src = fetchPypi { inherit pname version; - sha256 = "1rk9i1ra3panli96ghz80ddpqk77xb1kpxs3wf8rw0jy5d88pc26"; + sha256 = "dd68f90be1ea276360b96369836849df29045f7fe4e534f9ac21ea00798ee358"; }; nativeBuildInputs = [ awkward0 ]; diff --git a/pkgs/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix index c692377342773..e5b3903eefa7e 100644 --- a/pkgs/development/python-modules/uproot3/default.nix +++ b/pkgs/development/python-modules/uproot3/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy27 -, awkward0, backports_lzma, cachetools, lz4, pandas +, awkward0, backports_lzma ? null, cachetools, lz4, pandas , pytestCheckHook, pkgconfig, mock , numpy, requests, uproot3-methods, xxhash, zstandard }: diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 2f4710eea46b5..d90bf39f33603 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "uritools"; - version = "3.0.0"; + version = "3.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "405917a31ce58a57c8ccd0e4ea290f38baf2f4823819c3688f5331f1aee4ccb0"; + sha256 = "a3e9c794d44fdbd54642dcb7d6ef3ba9866d953eb34f65aeca3754b7ad5c1ea0"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index 11c50646700d6..3a45230720e29 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestrunner , setuptools_scm -, singledispatch +, singledispatch ? null , pytest , lib }: diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix index 7559ae1ccca5b..bf47297b1c547 100644 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; - version = "2.0"; + version = "2.1"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { inherit pname version; - sha256 = "3cdacd70970a74d163a2417d8581f43a56bb1ac8d31c71a1a6a4348969062d65"; + sha256 = "9d4c6957ec2c4753b5293fb6a60a90d7c27fc01bc5de9b5aa863f7c1e3fb4efc"; }; # requires X server diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index ec22660830bda..bcd672601534c 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.2.2"; + version = "20.4.3"; src = fetchPypi { inherit pname version; - sha256 = "b7a8ec323ee02fb2312f098b6b4c9de99559b462775bc8fe3627a73706603c1b"; + sha256 = "49ec4eb4c224c6f7dd81bb6d0a28a09ecae5894f4e593c89b0db0885f565a107"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 4edd4c6ccffbe..aa09b0068d9ab 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "waitress"; - version = "1.4.4"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1bb436508a7487ac6cb097ae7a7fe5413aefca610550baf58f0940e51ecfb261"; + sha256 = "69e1f242c7f80273490d3403c3976f3ac3b26e289856936d1f620ed48f321897"; }; doCheck = false; diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index ade529e56274f..bda48d3ec5872 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.1.1"; + version = "8.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e6CRkflYLoLYZIKb37qwLfRuJqRqME5Xx/5WUvB/KXo="; + sha256 = "efda751de15201b395b6d6e64e6ae3b6b03dc502a64c3c908aa5cad14c27eee5"; }; propagatedBuildInputs = [ bracex ]; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 861cb38389a8b..3ce15a3fdcea8 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -3,7 +3,7 @@ , cssselect , dateutil , feedparser -, futures +, futures ? null , gdata , gnupg , google-api-python-client diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 8958f37b0f85f..b04dee437b559 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -3,14 +3,14 @@ }: buildPythonPackage rec { - version = "0.8.0"; + version = "0.10.1"; pname = "west"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "672053c3392248846694e5619a7fe6ab4c40f010a8f5be6350821b39f6132a26"; + sha256 = "8306ebc674348f4155d82bfe8501282b41ed86cb44c3fc636a8ccf8e057b1847"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 42402c259ab01..e69e144ccfe9d 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.16.2"; + version = "0.17.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-OOhDnWyRvNW3wPyjSdr44GQ6xohQyYcmLVNSbp19AeQ="; + sha256 = "9c2edad2a4e588f9117c666a4249920b9717fb75703b96998cf65fcd4f60551f"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index d880fd8339656..bc88880f30a36 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -1,23 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "xlrd"; - version = "1.2.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2"; + sha256 = "f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88"; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test -k "not test_tilde_path_expansion" - ''; + # No tests in archive + doCheck = false; meta = with lib; { homepage = "http://www.python-excel.org/"; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index fdf042c2ac290..5b50716f2f198 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.5.0"; + version = "3.6.0"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "3ec836a9545f549707a8c8176038160185b9d08c1dd80304a906527da21bff68"; + sha256 = "a9aa2e7c156a1acb0931086637d31efe9302a771641bc35938383cefbd27ba9d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index e31054e74c139..58d50d7b6cf3e 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.4.1"; + version = "1.5.3"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "1yd7whf74z8bw99gldxlnrs8bjnjzald29b5cf2ka0i144sxbvad"; + sha256 = "0pv8zdz03wjnjwrgjr5pc3q69h7zh51h0iwgwxwl65qi1r6ydk54"; }; propagatedBuildInputs = [ elementpath ]; diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index c8b2d5949cbf7..5126afde05fa6 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "yamlloader"; - version = "0.5.5"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "3KtfFrObsD0Q3aTNTzDJQ2dexMd3GAf8Z+fxuzGb9Mg="; + sha256 = "e96dc3dc6895d814c330c054c966d993fc81ef1dbf5a30a4bdafeb256359e058"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 7ae56cacbb68d..bceac92d79ed0 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.55"; + version = "0.1.56"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "65d39bccf16bef35f6a08bf0df33650c0515b5ce8ea3c53924601f5fe00590cb"; + sha256 = "a6d4c7b939fdd48d983556501f5b387e20aaef86afc8e6ba6f91a49a7e22d2dd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 1dafe8cbb0c53..ccb916a147a7e 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zipp"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"; + sha256 = "3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"; }; nativeBuildInputs = [ setuptools_scm toml ]; diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index 65556c9dc4172..41c15fcd1307f 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "zope.component"; - version = "4.6.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "91628918218b3e6f6323de2a7b845e09ddc5cae131c034896c051b084bba3c92"; + sha256 = "df541a0501c79123f9ac30c6686a9e45c2690c5c3ae4f2b7f4c6fd1a3aaaf614"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 7b5d7abf682fb..15a179c0d643c 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "5.2.0"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24"; + sha256 = "b18a855f8504743e0a2d8b75d008c7720d44e4c76687e13f959e35d9a13eb397"; }; propagatedBuildInputs = [ zope_event ]; diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index 43fab18daeb37..00defd1615090 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.schema"; - version = "6.0.1"; + version = "6.1.0"; src = fetchPypi { inherit pname version; - sha256 = "9b3fc3ac656099aa9ebf3beb2bbd83d2d6ee6f94b9ac6969d6e3993ec9c4a197"; + sha256 = "9fa04d95e8e7e9056091eed9819da6e65dde68de39c2b93617d361d1eb8a7c0c"; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index 2f37f15453da2..ea2d531f76320 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.testing"; - version = "4.7"; + version = "4.9"; src = fetchPypi { inherit pname version; - sha256 = "d66be8d1de37e8536ca58a1d9f4d89a68c9cc75cc0e788a175c8a20ae26003ea"; + sha256 = "475cb847a7af9d547313ee93f5d0b8800bf627e6d0d9a51d11967984083cb54e"; }; doCheck = !isPyPy; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 5ee42c8427534..c3bc0d0bff4d7 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "873d6017abadc213992a0c38c786ed020341b6e0fe78d14bc2a684cf5a70de4b"; + sha256 = "39a5ba631830703ea011383447135063db6d182794487dda9b8c1f515bb70b0f"; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index a80b3155b8ce3..a0f7785ef3a1c 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zopfli"; - version = "0.1.7"; + version = "0.1.8"; src = fetchPypi { inherit pname version; - sha256 = "512892714f0e3dcc9a77222cb509ed519f41ce2b92467e47a4b406a23b48561a"; + sha256 = "8b977dc07e3797907ab59e08096583bcd0b7e6c739849fbbeec09263f6356623"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index fc5f8c3161eda..724a5d9d67941 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.15.1"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "cb7c6a6f7d62350b9f5539045da54422975630e34dd9069584cc776b9917115f"; + sha256 = "52de08355fd5cfb3ef4533891092bb96229d43c2069703d4aff04fdbedf9c92f"; }; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index f24a1f32f884a..53db5f7ed0b94 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -53,7 +53,6 @@ python3.pkgs.buildPythonApplication rec { iso-639 pypdf2 requests - singledispatch sqlalchemy tornado unidecode diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 26574ac4808c0..73b1b5e7afaf9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -43,6 +43,14 @@ let }); }) + # Pinned due to API changes in pyjwt>=2.0 + (mkOverride "pyjwt" "1.7.1" + "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd") + + # Pinned due to API changes in pykmtronic>=0.2.0 + (mkOverride "pykmtronic" "0.0.3" + "sha256-8bxn27DU1XUQUxQFJklEge29DHx1DMu7pJG4hVE1jDU=") + # Pinned due to bug in ring-doorbell 0.7.0 # https://github.com/tchellomello/python-ring-doorbell/issues/240 (mkOverride "ring-doorbell" "0.6.2" diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index e81815b065cc7..5c3382392921f 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -427,6 +427,15 @@ let }; }); + pyjwt = super.pyjwt.overridePythonAttrs(oldAttrs: rec { + version = "1.7.1"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; + }; + }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { version = "0.8.0rc2"; diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 16379820653b3..9acd4c442a7bc 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook , xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk -, pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3 +, pexpect, pygobject3, pyxdg, libappindicator-gtk3 }: buildPythonApplication rec { pname = "xflux-gui"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef0bc05ebaac7..42e8892e2c979 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -96,15 +96,18 @@ let }; }); - disabledIf = x: drv: - if x then throw "${removePythonPrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}" else drv; + disabled = drv: throw "${removePythonPrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}"; + + disabledIf = x: drv: if x then disabled drv else drv; in { + inherit pkgs stdenv; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi; - inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; + inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; inherit buildSetupcfg; @@ -154,10 +157,7 @@ in { recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { }; - setuptools = if isPy27 then - callPackage ../development/python-modules/setuptools/44.0.nix { } - else - callPackage ../development/python-modules/setuptools { }; + setuptools = callPackage ../development/python-modules/setuptools { }; aadict = callPackage ../development/python-modules/aadict { }; @@ -211,8 +211,6 @@ in { affine = callPackage ../development/python-modules/affine { }; - affinity = callPackage ../development/python-modules/affinity { }; - agate = callPackage ../development/python-modules/agate { }; agate-dbf = callPackage ../development/python-modules/agate-dbf { }; @@ -409,10 +407,6 @@ in { ansiwrap = callPackage ../development/python-modules/ansiwrap { }; - antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { - inherit (pkgs) antlr4; - }; - antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { inherit (pkgs) antlr4; }; @@ -435,10 +429,6 @@ in { appdirs = callPackage ../development/python-modules/appdirs { }; - appleseed = disabledIf isPy3k (toPythonModule (pkgs.appleseed.override { inherit (self) python; })); - - application = callPackage ../development/python-modules/application { }; - applicationinsights = callPackage ../development/python-modules/applicationinsights { }; appnope = callPackage ../development/python-modules/appnope { }; @@ -497,10 +487,7 @@ in { asdf = callPackage ../development/python-modules/asdf { }; - ase = if isPy27 then - callPackage ../development/python-modules/ase/3.17.nix { } - else - callPackage ../development/python-modules/ase { }; + ase = callPackage ../development/python-modules/ase { }; asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; @@ -520,10 +507,7 @@ in { astral = callPackage ../development/python-modules/astral { }; - astroid = if isPy3k then - callPackage ../development/python-modules/astroid { } - else - callPackage ../development/python-modules/astroid/1.6.nix { }; + astroid = callPackage ../development/python-modules/astroid { }; astropy = callPackage ../development/python-modules/astropy { }; @@ -901,10 +885,6 @@ in { backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; - backports_lzma = callPackage ../development/python-modules/backports_lzma { }; - - backports_os = callPackage ../development/python-modules/backports_os { }; - backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; @@ -955,10 +935,7 @@ in { bcdoc = callPackage ../development/python-modules/bcdoc { }; - bcrypt = if pythonOlder "3.6" then - callPackage ../development/python-modules/bcrypt/3_1.nix { } - else - callPackage ../development/python-modules/bcrypt { }; + bcrypt = callPackage ../development/python-modules/bcrypt { }; beaker = callPackage ../development/python-modules/beaker { }; @@ -1016,10 +993,6 @@ in { bitbox02 = callPackage ../development/python-modules/bitbox02 { }; - bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; - - bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; - bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; @@ -1056,8 +1029,6 @@ in { blist = callPackage ../development/python-modules/blist { }; - blivet = callPackage ../development/python-modules/blivet { }; - blockchain = callPackage ../development/python-modules/blockchain { }; blockdiag = callPackage ../development/python-modules/blockdiag { }; @@ -1099,8 +1070,6 @@ in { bottleneck = callPackage ../development/python-modules/bottleneck { }; - box2d = callPackage ../development/python-modules/box2d { }; - bpython = callPackage ../development/python-modules/bpython { }; bracex = callPackage ../development/python-modules/bracex { }; @@ -1129,8 +1098,6 @@ in { browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; - browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { }); - bsddb3 = callPackage ../development/python-modules/bsddb3 { }; bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; @@ -1200,15 +1167,9 @@ in { inherit (self) python numpy boost; }); - cairocffi = if isPy3k then - callPackage ../development/python-modules/cairocffi { } - else - callPackage ../development/python-modules/cairocffi/0_9.nix { }; + cairocffi = callPackage ../development/python-modules/cairocffi { }; - cairosvg = if isPy3k then - callPackage ../development/python-modules/cairosvg { } - else - callPackage ../development/python-modules/cairosvg/1_x.nix { }; + cairosvg = callPackage ../development/python-modules/cairosvg { }; caldav = callPackage ../development/python-modules/caldav { }; @@ -1256,10 +1217,6 @@ in { cchardet = callPackage ../development/python-modules/cchardet { }; - CDDB = callPackage ../development/python-modules/cddb { }; - - cdecimal = callPackage ../development/python-modules/cdecimal { }; - celery = callPackage ../development/python-modules/celery { }; cement = callPackage ../development/python-modules/cement { }; @@ -1326,14 +1283,9 @@ in { cheetah3 = callPackage ../development/python-modules/cheetah3 { }; - cheetah = callPackage ../development/python-modules/cheetah { }; - cheroot = callPackage ../development/python-modules/cheroot { }; - cherrypy = if isPy3k then - callPackage ../development/python-modules/cherrypy { } - else - callPackage ../development/python-modules/cherrypy/17.nix { }; + cherrypy = callPackage ../development/python-modules/cherrypy { }; chevron = callPackage ../development/python-modules/chevron { }; @@ -1351,8 +1303,6 @@ in { citeproc-py = callPackage ../development/python-modules/citeproc-py { }; - cjson = callPackage ../development/python-modules/cjson { }; - ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; class-registry = callPackage ../development/python-modules/class-registry { }; @@ -1365,8 +1315,6 @@ in { clf = callPackage ../development/python-modules/clf { }; - cliapp = callPackage ../development/python-modules/cliapp { }; - click = callPackage ../development/python-modules/click { }; clickclick = callPackage ../development/python-modules/clickclick { }; @@ -1411,8 +1359,6 @@ in { clldutils = callPackage ../development/python-modules/clldutils { }; - closure-linter = callPackage ../development/python-modules/closure-linter { }; - cloudflare = callPackage ../development/python-modules/cloudflare { }; cloudpickle = callPackage ../development/python-modules/cloudpickle { }; @@ -1429,8 +1375,6 @@ in { cmdline = callPackage ../development/python-modules/cmdline { }; - cmdtest = callPackage ../development/python-modules/cmdtest { }; - cmigemo = callPackage ../development/python-modules/cmigemo { inherit (pkgs) cmigemo; }; @@ -1453,8 +1397,6 @@ in { cogapp = callPackage ../development/python-modules/cogapp { }; - coilmq = callPackage ../development/python-modules/coilmq { }; - ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; colander = callPackage ../development/python-modules/colander { }; @@ -1493,10 +1435,7 @@ in { configobj = callPackage ../development/python-modules/configobj { }; - configparser = if pythonOlder "3.6" then - callPackage ../development/python-modules/configparser/4.nix { } - else - callPackage ../development/python-modules/configparser { }; + configparser = callPackage ../development/python-modules/configparser { }; configshell = callPackage ../development/python-modules/configshell { }; @@ -1510,10 +1449,7 @@ in { constantly = callPackage ../development/python-modules/constantly { }; - construct = if isPy27 then - callPackage ../development/python-modules/construct/2.10.54.nix { } - else - callPackage ../development/python-modules/construct { }; + construct = callPackage ../development/python-modules/construct { }; consul = callPackage ../development/python-modules/consul { }; @@ -1523,10 +1459,7 @@ in { contextvars = callPackage ../development/python-modules/contextvars { }; - convertdate = if isPy27 then - callPackage ../development/python-modules/convertdate/2.2.x.nix { } - else - callPackage ../development/python-modules/convertdate { }; + convertdate = callPackage ../development/python-modules/convertdate { }; cookiecutter = callPackage ../development/python-modules/cookiecutter { }; @@ -1582,15 +1515,9 @@ in { cryptacular = callPackage ../development/python-modules/cryptacular { }; - cryptography = if isPy27 then - callPackage ../development/python-modules/cryptography/3.3.nix { } - else - callPackage ../development/python-modules/cryptography { }; + cryptography = callPackage ../development/python-modules/cryptography { }; - cryptography_vectors = if isPy27 then - callPackage ../development/python-modules/cryptography/vectors-3.3.nix { } - else - callPackage ../development/python-modules/cryptography/vectors.nix { }; + cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors.nix { }; crytic-compile = callPackage ../development/python-modules/crytic-compile { }; @@ -1657,8 +1584,6 @@ in { daphne = callPackage ../development/python-modules/daphne { }; - darcsver = callPackage ../development/python-modules/darcsver { }; - dash = callPackage ../development/python-modules/dash { }; dash-core-components = callPackage ../development/python-modules/dash-core-components { }; @@ -1715,10 +1640,7 @@ in { datatable = callPackage ../development/python-modules/datatable { }; - dateparser = if isPy27 then - callPackage ../development/python-modules/dateparser/0.x.nix { } - else - callPackage ../development/python-modules/dateparser { }; + dateparser = callPackage ../development/python-modules/dateparser { }; datrie = callPackage ../development/python-modules/datrie { }; @@ -1782,8 +1704,6 @@ in { descartes = callPackage ../development/python-modules/descartes { }; - deskcon = callPackage ../development/python-modules/deskcon { }; - desktop-notifier = callPackage ../development/python-modules/desktop-notifier { }; detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 @@ -1882,8 +1802,6 @@ in { django_environ = callPackage ../development/python-modules/django_environ { }; - django_evolution = callPackage ../development/python-modules/django_evolution { }; - django_extensions = callPackage ../development/python-modules/django-extensions { }; django-filter = callPackage ../development/python-modules/django-filter { }; @@ -1999,10 +1917,7 @@ in { dnslib = callPackage ../development/python-modules/dnslib { }; - dnspython = if isPy3k then - callPackage ../development/python-modules/dnspython { } - else - self.dnspython_1; + dnspython = callPackage ../development/python-modules/dnspython { }; dnspython_1 = callPackage ../development/python-modules/dnspython/1.nix { }; @@ -2018,7 +1933,7 @@ in { docker_pycreds = callPackage ../development/python-modules/docker-pycreds { }; - docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py { }); + docker-py = callPackage ../development/python-modules/docker-py { }; dockerspawner = callPackage ../development/python-modules/dockerspawner { }; @@ -2074,8 +1989,6 @@ in { ds4drv = callPackage ../development/python-modules/ds4drv { }; - dtopt = callPackage ../development/python-modules/dtopt { }; - duckdb = callPackage ../development/python-modules/duckdb { inherit (pkgs) duckdb; }; @@ -2086,10 +1999,7 @@ in { dugong = callPackage ../development/python-modules/dugong { }; - dulwich = if isPy3k then - callPackage ../development/python-modules/dulwich { } - else - callPackage ../development/python-modules/dulwich/0_19.nix { }; + dulwich = callPackage ../development/python-modules/dulwich { }; dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { }; @@ -2176,8 +2086,6 @@ in { enum34 = callPackage ../development/python-modules/enum34 { }; - enum = callPackage ../development/python-modules/enum { }; - enum-compat = callPackage ../development/python-modules/enum-compat { }; envisage = callPackage ../development/python-modules/envisage { }; @@ -2220,8 +2128,6 @@ in { eventlet = callPackage ../development/python-modules/eventlet { }; - eventlib = callPackage ../development/python-modules/eventlib { }; - events = callPackage ../development/python-modules/events { }; evernote = callPackage ../development/python-modules/evernote { }; @@ -2310,17 +2216,12 @@ in { fasttext = callPackage ../development/python-modules/fasttext { }; - faulthandler = if !isPy3k then - callPackage ../development/python-modules/faulthandler { } - else - throw "faulthandler is built into ${python.executable}"; + faulthandler = throw "faulthandler is built into ${python.executable}"; favicon = callPackage ../development/python-modules/favicon { }; fb-re2 = callPackage ../development/python-modules/fb-re2 { }; - fdint = callPackage ../development/python-modules/fdint { }; - fe25519 = callPackage ../development/python-modules/fe25519 { }; feedgen = callPackage ../development/python-modules/feedgen { }; @@ -2329,10 +2230,7 @@ in { inherit (pkgs) glibcLocales; }; - feedparser = if isPy3k then - callPackage ../development/python-modules/feedparser { } - else - callPackage ../development/python-modules/feedparser/5.nix { }; + feedparser = callPackage ../development/python-modules/feedparser { }; fenics = callPackage ../development/libraries/science/math/fenics { pytest = self.pytest_4; @@ -2428,8 +2326,6 @@ in { flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { }; - flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; - flask-limiter = callPackage ../development/python-modules/flask-limiter { }; flask_login = callPackage ../development/python-modules/flask-login { }; @@ -2506,8 +2402,6 @@ in { flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; - flup = callPackage ../development/python-modules/flup { }; - flux-led = callPackage ../development/python-modules/flux-led { }; fn = callPackage ../development/python-modules/fn { }; @@ -2516,10 +2410,10 @@ in { folium = callPackage ../development/python-modules/folium { }; - fontforge = disabledIf (!isPy3k) (toPythonModule (pkgs.fontforge.override { + fontforge = toPythonModule (pkgs.fontforge.override { withPython = true; inherit python; - })); + }); fontmath = callPackage ../development/python-modules/fontmath { }; @@ -2554,10 +2448,7 @@ in { freetype-py = callPackage ../development/python-modules/freetype-py { }; - freezegun = if isPy27 then - callPackage ../development/python-modules/freezegun/0.3.nix { } - else - callPackage ../development/python-modules/freezegun { }; + freezegun = callPackage ../development/python-modules/freezegun { }; fritzconnection = callPackage ../development/python-modules/fritzconnection { }; @@ -2573,8 +2464,6 @@ in { ftputil = callPackage ../development/python-modules/ftputil { }; - fudge = callPackage ../development/python-modules/fudge { }; - funcparserlib = callPackage ../development/python-modules/funcparserlib { }; funcsigs = callPackage ../development/python-modules/funcsigs { }; @@ -2595,19 +2484,12 @@ in { future-fstrings = callPackage ../development/python-modules/future-fstrings { }; - futures = callPackage ../development/python-modules/futures { }; - fuzzyfinder = callPackage ../development/python-modules/fuzzyfinder { }; fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; fx2 = callPackage ../development/python-modules/fx2 { }; - gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { - pythonPackages = self; - pythonSupport = true; - })); # gaia isn't supported with python3 and it's not available from pypi - galario = toPythonModule (pkgs.galario.override { enablePython = true; pythonPackages = self; @@ -2615,29 +2497,25 @@ in { gast = callPackage ../development/python-modules/gast { }; - gateone = callPackage ../development/python-modules/gateone { }; - gcovr = callPackage ../development/python-modules/gcovr { }; gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; }); gdata = callPackage ../development/python-modules/gdata { }; - gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { + gdcm = toPythonModule (pkgs.gdcm.override { inherit (self) python; enablePython = true; - })); + }); gdown = callPackage ../development/python-modules/gdown { }; - gdrivefs = callPackage ../development/python-modules/gdrivefs { }; - ge25519 = callPackage ../development/python-modules/ge25519 { }; - geant4 = disabledIf (!isPy3k) (toPythonModule (pkgs.geant4.override { + geant4 = toPythonModule (pkgs.geant4.override { enablePython = true; python3 = python; - })); + }); geeknote = callPackage ../development/python-modules/geeknote { }; @@ -2671,10 +2549,7 @@ in { geopandas = callPackage ../development/python-modules/geopandas { }; - geopy = if isPy3k then - callPackage ../development/python-modules/geopy { } - else - callPackage ../development/python-modules/geopy/2.nix { }; + geopy = callPackage ../development/python-modules/geopy { }; getmac = callPackage ../development/python-modules/getmac { }; @@ -2739,31 +2614,16 @@ in { gnureadline = callPackage ../development/python-modules/gnureadline { }; - gnutls = callPackage ../development/python-modules/gnutls { }; - goobook = callPackage ../development/python-modules/goobook { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; google-api-core = callPackage ../development/python-modules/google-api-core { }; - google-api-python-client = - let google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; - in if isPy3k then - google-api-python-client - else # Python 2.7 support was deprecated but is still needed by weboob and duplicity - google-api-python-client.overridePythonAttrs (old: rec { - version = "1.7.6"; - src = old.src.override { - inherit version; - sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; - }; - }); + google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { }; - google-apputils = callPackage ../development/python-modules/google-apputils { }; - google-auth = callPackage ../development/python-modules/google-auth { }; google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; @@ -2939,11 +2799,6 @@ in { gremlinpython = callPackage ../development/python-modules/gremlinpython { }; - grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { - enablePython = true; - pythonPackages = self; - })); - grip = callPackage ../development/python-modules/grip { }; grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { }; @@ -2954,10 +2809,7 @@ in { grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; - gsd = if isPy27 then - callPackage ../development/python-modules/gsd/1.7.nix { } - else - callPackage ../development/python-modules/gsd { }; + gsd = callPackage ../development/python-modules/gsd { }; gspread = callPackage ../development/python-modules/gspread { }; @@ -2983,10 +2835,7 @@ in { gumath = callPackage ../development/python-modules/gumath { }; - gunicorn = if isPy27 then - callPackage ../development/python-modules/gunicorn/19.nix { } - else - callPackage ../development/python-modules/gunicorn { }; + gunicorn = callPackage ../development/python-modules/gunicorn { }; guppy3 = callPackage ../development/python-modules/guppy3 { }; @@ -3003,11 +2852,6 @@ in { gviz-api = callPackage ../development/python-modules/gviz-api {}; - gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { - pythonSupport = true; - pythonPackages = self; - })); - gym = callPackage ../development/python-modules/gym { }; gyp = callPackage ../development/python-modules/gyp { }; @@ -3074,12 +2918,8 @@ in { hg-evolve = callPackage ../development/python-modules/hg-evolve { }; - hg-git = callPackage ../development/python-modules/hg-git { }; - hglib = callPackage ../development/python-modules/hglib { }; - hgsvn = callPackage ../development/python-modules/hgsvn { }; - hickle = callPackage ../development/python-modules/hickle { }; hidapi = callPackage ../development/python-modules/hidapi { @@ -3124,14 +2964,9 @@ in { hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; - hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; - hstspreload = callPackage ../development/python-modules/hstspreload { }; - html2text = if isPy3k then - callPackage ../development/python-modules/html2text { } - else - callPackage ../development/python-modules/html2text/2018.nix { }; + html2text = callPackage ../development/python-modules/html2text { }; html5lib = callPackage ../development/python-modules/html5lib { }; @@ -3159,17 +2994,12 @@ in { http-parser = callPackage ../development/python-modules/http-parser { }; - httpretty = if isPy3k then - callPackage ../development/python-modules/httpretty { } - else - callPackage ../development/python-modules/httpretty/0.nix { }; + httpretty = callPackage ../development/python-modules/httpretty { }; httpserver = callPackage ../development/python-modules/httpserver { }; httpsig = callPackage ../development/python-modules/httpsig { }; - http_signature = callPackage ../development/python-modules/http_signature { }; - httptools = callPackage ../development/python-modules/httptools { }; httpx = callPackage ../development/python-modules/httpx { }; @@ -3213,7 +3043,7 @@ in { hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; - hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4; + hypothesis = callPackage ../development/python-modules/hypothesis { }; hypothesmith = callPackage ../development/python-modules/hypothesmith { }; @@ -3257,7 +3087,7 @@ in { ijson = callPackage ../development/python-modules/ijson { }; - imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); + imagecodecs-lite = callPackage ../development/python-modules/imagecodecs-lite { }; imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; @@ -3277,10 +3107,7 @@ in { imap-tools = callPackage ../development/python-modules/imap-tools { }; - imbalanced-learn = if isPy27 then - callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } - else - callPackage ../development/python-modules/imbalanced-learn { }; + imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; imdbpy = callPackage ../development/python-modules/imdbpy { }; @@ -3354,8 +3181,6 @@ in { iowait = callPackage ../development/python-modules/iowait { }; - ipaddr = callPackage ../development/python-modules/ipaddr { }; - ipaddress = callPackage ../development/python-modules/ipaddress { }; ipdb = callPackage ../development/python-modules/ipdb { }; @@ -3370,10 +3195,7 @@ in { ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; - ipykernel = if pythonOlder "3.4" then - callPackage ../development/python-modules/ipykernel/4.nix { } - else - callPackage ../development/python-modules/ipykernel { }; + ipykernel = callPackage ../development/python-modules/ipykernel { }; ipympl = callPackage ../development/python-modules/ipympl { }; @@ -3381,9 +3203,7 @@ in { ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; - ipython = if isPy27 then - callPackage ../development/python-modules/ipython/5.nix { } - else if isPy36 then + ipython = if isPy36 then callPackage ../development/python-modules/ipython/7.16.nix { } else callPackage ../development/python-modules/ipython { }; @@ -3414,11 +3234,7 @@ in { isodate = callPackage ../development/python-modules/isodate { }; - isort = if isPy3k then - callPackage ../development/python-modules/isort { } - else - callPackage ../development/python-modules/isort/4.nix { - }; + isort = callPackage ../development/python-modules/isort { }; isoweek = callPackage ../development/python-modules/isoweek { }; @@ -3442,19 +3258,13 @@ in { jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; - jaraco_functools = if pythonOlder "3.6" then - callPackage ../development/python-modules/jaraco_functools/2.nix { } - else - callPackage ../development/python-modules/jaraco_functools { }; + jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; - jaraco_stream = if pythonOlder "3.6" then - callPackage ../development/python-modules/jaraco_stream/2.nix { } - else - callPackage ../development/python-modules/jaraco_stream { }; + jaraco_stream = callPackage ../development/python-modules/jaraco_stream { }; jaraco_text = callPackage ../development/python-modules/jaraco_text { }; @@ -3556,8 +3366,6 @@ in { jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; - jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; - jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix { }; jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; @@ -3580,15 +3388,9 @@ in { jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { }; - jupyter_client = if isPy3k then - callPackage ../development/python-modules/jupyter_client { } - else - callPackage ../development/python-modules/jupyter_client/5.nix { }; + jupyter_client = callPackage ../development/python-modules/jupyter_client { }; - jupyter_console = if pythonOlder "3.5" then - callPackage ../development/python-modules/jupyter_console/5.nix { } - else - callPackage ../development/python-modules/jupyter_console { }; + jupyter_console = callPackage ../development/python-modules/jupyter_console { }; jupyter_core = callPackage ../development/python-modules/jupyter_core { }; @@ -3666,10 +3468,7 @@ in { inherit (pkgs) kerberos; }; - keyring = if isPy3k then - callPackage ../development/python-modules/keyring { } - else - callPackage ../development/python-modules/keyring/2.nix { }; + keyring = callPackage ../development/python-modules/keyring { }; keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; @@ -3679,9 +3478,9 @@ in { inherit (pkgs) keyutils; }; - kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { + kicad = toPythonModule (pkgs.kicad.override { python3 = python; - }).src); + }).src; kinparse = callPackage ../development/python-modules/kinparse { }; @@ -3693,10 +3492,7 @@ in { kivy-garden = callPackage ../development/python-modules/kivy-garden { }; - kiwisolver = if isPy3k then - callPackage ../development/python-modules/kiwisolver { } - else - callPackage ../development/python-modules/kiwisolver/1_1.nix { }; + kiwisolver = callPackage ../development/python-modules/kiwisolver { }; klaus = callPackage ../development/python-modules/klaus { }; @@ -3711,12 +3507,8 @@ in { knack = callPackage ../development/python-modules/knack { }; - koji = callPackage ../development/python-modules/koji { }; - kombu = callPackage ../development/python-modules/kombu { }; - konfig = callPackage ../development/python-modules/konfig { }; - korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { }; kubernetes = callPackage ../development/python-modules/kubernetes { }; @@ -3733,12 +3525,8 @@ in { langdetect = callPackage ../development/python-modules/langdetect { }; - larch = callPackage ../development/python-modules/larch { }; - lark-parser = callPackage ../development/python-modules/lark-parser { }; - Lasagne = callPackage ../development/python-modules/lasagne { }; - latexcodec = callPackage ../development/python-modules/latexcodec { }; launchpadlib = callPackage ../development/python-modules/launchpadlib { }; @@ -3771,8 +3559,6 @@ in { leather = callPackage ../development/python-modules/leather { }; - le = callPackage ../development/python-modules/le { }; - ledger_agent = callPackage ../development/python-modules/ledger_agent { }; ledgerblue = callPackage ../development/python-modules/ledgerblue { }; @@ -3805,10 +3591,7 @@ in { inherit (pkgs) libasyncns; }; - libcloud = if isPy27 then - callPackage ../development/python-modules/libcloud/2.nix { } - else - callPackage ../development/python-modules/libcloud { }; + libcloud = callPackage ../development/python-modules/libcloud { }; libcst = callPackage ../development/python-modules/libcst { }; @@ -3819,10 +3602,10 @@ in { pythonSupport = true; }); - libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { + libgpiod = toPythonModule (pkgs.libgpiod.override { enablePython = true; python3 = python; - })); + }); libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { boost = self.boost; }; @@ -3855,16 +3638,6 @@ in { inherit (pkgs) libsodium; }; - libnl-python = disabledIf isPy3k (toPythonModule (pkgs.libnl.override { - pythonSupport = true; - inherit python; - })).py; - - libplist = disabledIf isPy3k (toPythonModule (pkgs.libplist.override { - enablePython = true; - inherit python; - })).py; - libpurecool = callPackage ../development/python-modules/libpurecool { }; libredwg = toPythonModule (pkgs.libredwg.override { @@ -3912,10 +3685,7 @@ in { libtmux = callPackage ../development/python-modules/libtmux { }; - libtorrent-rasterbar = if isPy27 then - (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python - else - (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python; + libtorrent-rasterbar = (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python; libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; @@ -3925,14 +3695,9 @@ in { inherit (pkgs) libversion; }; - libvirt = if isPy3k then - (callPackage ../development/python-modules/libvirt { + libvirt = callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt; - }) - else - (callPackage ../development/python-modules/libvirt/5.9.0.nix { - libvirt = pkgs.libvirt_5_9_0; - }); + }; libxml2 = (toPythonModule (pkgs.libxml2.override { pythonSupport = true; @@ -3947,8 +3712,6 @@ in { license-expression = callPackage ../development/python-modules/license-expression { }; - lightblue = callPackage ../development/python-modules/lightblue { }; - lightgbm = callPackage ../development/python-modules/lightgbm { }; lightning = callPackage ../development/python-modules/lightning { }; @@ -3975,9 +3738,9 @@ in { liquidctl = callPackage ../development/python-modules/liquidctl { }; - lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { + lirc = toPythonModule (pkgs.lirc.override { python3 = python; - })); + }); littleutils = callPackage ../development/python-modules/littleutils { }; @@ -4035,10 +3798,6 @@ in { loo-py = callPackage ../development/python-modules/loo-py { }; - lpod = callPackage ../development/python-modules/lpod { }; - - lsi = callPackage ../development/python-modules/lsi { }; - lsassy = callPackage ../development/python-modules/lsassy { }; ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; @@ -4047,8 +3806,6 @@ in { lupa = callPackage ../development/python-modules/lupa { }; - lxc = callPackage ../development/python-modules/lxc { }; - lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; }; @@ -4125,24 +3882,11 @@ in { mapbox = callPackage ../development/python-modules/mapbox { }; - mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; - - marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { }; - - marionette-harness = callPackage ../development/python-modules/marionette-harness { }; - - marisa = callPackage ../development/python-modules/marisa { - inherit (pkgs) marisa; - }; - marisa-trie = callPackage ../development/python-modules/marisa-trie { }; markdown2 = callPackage ../development/python-modules/markdown2 { }; - markdown = if isPy3k then - callPackage ../development/python-modules/markdown { } - else - callPackage ../development/python-modules/markdown/3_1.nix { }; + markdown = callPackage ../development/python-modules/markdown { }; markdown-it-py = callPackage ../development/python-modules/markdown-it-py { }; @@ -4172,12 +3916,7 @@ in { mathlibtools = callPackage ../development/python-modules/mathlibtools { }; - matplotlib = let - path = if isPy3k then - ../development/python-modules/matplotlib/default.nix - else - ../development/python-modules/matplotlib/2.nix; - in callPackage path { + matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; @@ -4219,15 +3958,13 @@ in { meld3 = callPackage ../development/python-modules/meld3 { }; - meliae = callPackage ../development/python-modules/meliae { }; - memcached = callPackage ../development/python-modules/memcached { }; memory_profiler = callPackage ../development/python-modules/memory_profiler { }; - mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { + mercurial = toPythonModule (pkgs.mercurial.override { python3Packages = self; - })); + }); mergedeep = callPackage ../development/python-modules/mergedeep { }; @@ -4239,15 +3976,13 @@ in { meshlabxml = callPackage ../development/python-modules/meshlabxml { }; - meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs + meson = toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs (oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently. setupHook = null; - }))); + })); mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; - metaphone = callPackage ../development/python-modules/metaphone { }; - metar = callPackage ../development/python-modules/metar { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; @@ -4308,10 +4043,7 @@ in { mocket = callPackage ../development/python-modules/mocket { }; - mock = if pythonOlder "3.6" then - callPackage ../development/python-modules/mock/2.nix { } - else - callPackage ../development/python-modules/mock { }; + mock = callPackage ../development/python-modules/mock { }; mockito = callPackage ../development/python-modules/mockito { }; @@ -4327,16 +4059,13 @@ in { mohawk = callPackage ../development/python-modules/mohawk { }; - # Needed here because moinmoin is loaded as a Python library. - moinmoin = callPackage ../development/python-modules/moinmoin { }; - mongodict = callPackage ../development/python-modules/mongodict { }; mongoengine = callPackage ../development/python-modules/mongoengine { }; monkeyhex = callPackage ../development/python-modules/monkeyhex { }; - monosat = disabledIf (!isPy3k) (pkgs.monosat.python { + monosat = (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; }); @@ -4345,10 +4074,7 @@ in { monty = callPackage ../development/python-modules/monty { }; - more-itertools = if isPy27 then - callPackage ../development/python-modules/more-itertools/2.7.nix { } - else - callPackage ../development/python-modules/more-itertools { }; + more-itertools = callPackage ../development/python-modules/more-itertools { }; moretools = callPackage ../development/python-modules/moretools { }; @@ -4364,38 +4090,8 @@ in { mox = callPackage ../development/python-modules/mox { }; - mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { }; - - mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { }; - - mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { }; - - mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { }; - - mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { }; - - mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { }; - - moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { }; - - mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { }; - - mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { }; - - mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { }; - - mozsvc = callPackage ../development/python-modules/mozsvc { }; - - mozterm = callPackage ../development/python-modules/mozterm { }; - - moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { }; - - mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { }; - mpd2 = callPackage ../development/python-modules/mpd2 { }; - mpd = callPackage ../development/python-modules/mpd { }; - mpi4py = callPackage ../development/python-modules/mpi4py { }; mplfinance = callPackage ../development/python-modules/mplfinance { }; @@ -4410,8 +4106,6 @@ in { mpyq = callPackage ../development/python-modules/mpyq { }; - mrbob = callPackage ../development/python-modules/mrbob { }; - msal = callPackage ../development/python-modules/msal { }; msal-extensions = callPackage ../development/python-modules/msal-extensions { }; @@ -4428,8 +4122,6 @@ in { msrest = callPackage ../development/python-modules/msrest { }; - msrplib = callPackage ../development/python-modules/msrplib { }; - mt-940 = callPackage ../development/python-modules/mt-940 { }; mullvad-api = callPackage ../development/python-modules/mullvad-api { }; @@ -4458,23 +4150,12 @@ in { mutag = callPackage ../development/python-modules/mutag { }; - mutagen = if isPy27 then - callPackage ../development/python-modules/mutagen/1.43.nix { } - else - callPackage ../development/python-modules/mutagen { }; + mutagen = callPackage ../development/python-modules/mutagen { }; mutatormath = callPackage ../development/python-modules/mutatormath { }; - muttils = callPackage ../development/python-modules/muttils { }; - mwclient = callPackage ../development/python-modules/mwclient { }; - mwlib = callPackage ../development/python-modules/mwlib { }; - - mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; - - mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; - mwoauth = callPackage ../development/python-modules/mwoauth { }; mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; @@ -4499,8 +4180,6 @@ in { nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; - namebench = callPackage ../development/python-modules/namebench { }; - namedlist = callPackage ../development/python-modules/namedlist { }; nameparser = callPackage ../development/python-modules/nameparser { }; @@ -4531,10 +4210,7 @@ in { nbdime = callPackage ../development/python-modules/nbdime { }; - nbformat = if isPy3k then - callPackage ../development/python-modules/nbformat { } - else - callPackage ../development/python-modules/nbformat/2.nix { }; + nbformat = callPackage ../development/python-modules/nbformat { }; nbmerge = callPackage ../development/python-modules/nbmerge { }; @@ -4570,10 +4246,7 @@ in { netifaces = callPackage ../development/python-modules/netifaces { }; - networkx = if isPy3k then - callPackage ../development/python-modules/networkx { } - else - callPackage ../development/python-modules/networkx/2.2.nix { }; + networkx = callPackage ../development/python-modules/networkx { }; neuron-mpi = pkgs.neuron-mpi.override { inherit python; }; @@ -4581,8 +4254,6 @@ in { neuronpy = callPackage ../development/python-modules/neuronpy { }; - nevow = callPackage ../development/python-modules/nevow { }; - nghttp2 = (toPythonModule (pkgs.nghttp2.override { inherit (self) python cython setuptools; inherit (pkgs) ncurses; @@ -4615,11 +4286,6 @@ in { inherit (pkgs) nix; }; - # This is used for NixOps to make sure we won't break it with the next major version of nixpart. - nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; - - nixpart = callPackage ../tools/filesystems/nixpart { }; - nixpkgs = callPackage ../development/python-modules/nixpkgs { }; nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { }; @@ -4658,14 +4324,10 @@ in { nose-exclude = callPackage ../development/python-modules/nose-exclude { }; - nose-focus = callPackage ../development/python-modules/nose-focus { }; - nose-timer = callPackage ../development/python-modules/nose-timer { }; nosejs = callPackage ../development/python-modules/nosejs { }; - nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; - nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; nose_progressive = callPackage ../development/python-modules/nose_progressive { }; @@ -4676,17 +4338,12 @@ in { nosexcover = callPackage ../development/python-modules/nosexcover { }; - notebook = if isPy3k then - callPackage ../development/python-modules/notebook { } - else - callPackage ../development/python-modules/notebook/2.nix { }; + notebook = callPackage ../development/python-modules/notebook { }; notedown = callPackage ../development/python-modules/notedown { }; notify2 = callPackage ../development/python-modules/notify2 { }; - notify = callPackage ../development/python-modules/notify { }; - notify-py = callPackage ../development/python-modules/notify-py { }; notmuch = callPackage ../development/python-modules/notmuch { @@ -4723,10 +4380,7 @@ in { numpydoc = callPackage ../development/python-modules/numpydoc { }; - numpy = if pythonOlder "3.5" then - callPackage ../development/python-modules/numpy/1.16.nix { } - else - callPackage ../development/python-modules/numpy { }; + numpy = callPackage ../development/python-modules/numpy { }; numpy-stl = callPackage ../development/python-modules/numpy-stl { }; @@ -4736,8 +4390,6 @@ in { nwdiag = callPackage ../development/python-modules/nwdiag { }; - nxt-python = callPackage ../development/python-modules/nxt-python { }; - oath = callPackage ../development/python-modules/oath { }; oauth2 = callPackage ../development/python-modules/oauth2 { }; @@ -4748,10 +4400,7 @@ in { oauthenticator = callPackage ../development/python-modules/oauthenticator { }; - oauthlib = if isPy27 then - callPackage ../development/python-modules/oauthlib/3.1.nix { } - else - callPackage ../development/python-modules/oauthlib { }; + oauthlib = callPackage ../development/python-modules/oauthlib { }; obfsproxy = callPackage ../development/python-modules/obfsproxy { }; @@ -4800,17 +4449,9 @@ in { pythonPackages = self; }); - opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { - enablePython = true; - pythonPackages = self; - })); - openidc-client = callPackage ../development/python-modules/openidc-client { }; - openpyxl = if pythonAtLeast "3.6" then - callPackage ../development/python-modules/openpyxl { } - else - callPackage ../development/python-modules/openpyxl/2.nix { }; + openpyxl = callPackage ../development/python-modules/openpyxl { }; openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; @@ -4826,14 +4467,11 @@ in { openwebifpy = callPackage ../development/python-modules/openwebifpy { }; - openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + openwrt-luci-rpc = callPackage ../development/python-modules/openwrt-luci-rpc { }; openwrt-ubus-rpc = callPackage ../development/python-modules/openwrt-ubus-rpc { }; - opt-einsum = if isPy27 then - callPackage ../development/python-modules/opt-einsum/2.nix { } - else - callPackage ../development/python-modules/opt-einsum { }; + opt-einsum = callPackage ../development/python-modules/opt-einsum { }; optuna = callPackage ../development/python-modules/optuna { }; @@ -4875,9 +4513,7 @@ in { packageurl-python = callPackage ../development/python-modules/packageurl-python { }; - packaging = if isPy3k - then callPackage ../development/python-modules/packaging { } - else callPackage ../development/python-modules/packaging/2.nix { }; + packaging = callPackage ../development/python-modules/packaging { }; packet-python = callPackage ../development/python-modules/packet-python { }; @@ -4885,8 +4521,6 @@ in { pagelabels = callPackage ../development/python-modules/pagelabels { }; - pagerduty = callPackage ../development/python-modules/pagerduty { }; - paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; palettable = callPackage ../development/python-modules/palettable { }; @@ -4898,10 +4532,7 @@ in { pamqp = callPackage ../development/python-modules/pamqp { }; - pandas = if isPy3k then - callPackage ../development/python-modules/pandas { } - else - callPackage ../development/python-modules/pandas/2.nix { }; + pandas = callPackage ../development/python-modules/pandas { }; pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; @@ -4965,8 +4596,6 @@ in { pastel = callPackage ../development/python-modules/pastel { }; - pasteScript = callPackage ../development/python-modules/pastescript { }; - patator = callPackage ../development/python-modules/patator { }; patch = callPackage ../development/python-modules/patch { }; @@ -4981,10 +4610,7 @@ in { pathos = callPackage ../development/python-modules/pathos { }; - pathpy = if isPy3k then - callPackage ../development/python-modules/path.py { } - else - callPackage ../development/python-modules/path.py/2.nix { }; + pathpy = callPackage ../development/python-modules/path.py { }; pathspec = callPackage ../development/python-modules/pathspec { }; @@ -5116,16 +4742,10 @@ in { pillowfight = callPackage ../development/python-modules/pillowfight { }; - pillow = if isPy27 then - callPackage ../development/python-modules/pillow/6.nix { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; - } - else - callPackage ../development/python-modules/pillow { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11 libxcb; - }; + pillow = callPackage ../development/python-modules/pillow { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11 libxcb; + }; pillow-simd = callPackage ../development/python-modules/pillow-simd { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; @@ -5138,10 +4758,7 @@ in { pint = callPackage ../development/python-modules/pint { }; - pip = if isPy3k then - callPackage ../development/python-modules/pip { } - else - callPackage ../development/python-modules/pip/20.nix { }; + pip = callPackage ../development/python-modules/pip { }; pipdate = callPackage ../development/python-modules/pipdate { }; @@ -5270,7 +4887,7 @@ in { poster3 = callPackage ../development/python-modules/poster3 { }; - postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); + postorius = callPackage ../servers/mail/mailman/postorius.nix { }; potr = callPackage ../development/python-modules/potr { }; @@ -5298,10 +4915,7 @@ in { prawcore = callPackage ../development/python-modules/prawcore { }; - praw = if isPy3k then - callPackage ../development/python-modules/praw { } - else - callPackage ../development/python-modules/praw/6.3.nix { }; + praw = callPackage ../development/python-modules/praw { }; precis-i18n = callPackage ../development/python-modules/precis-i18n { }; @@ -5317,10 +4931,7 @@ in { pretend = callPackage ../development/python-modules/pretend { }; - prettytable = if isPy3k then - callPackage ../development/python-modules/prettytable { } - else - callPackage ../development/python-modules/prettytable/1.nix { }; + prettytable = callPackage ../development/python-modules/prettytable { }; primer3 = callPackage ../development/python-modules/primer3 { }; @@ -5328,8 +4939,6 @@ in { prison = callPackage ../development/python-modules/prison { }; - privacyidea = callPackage ../development/python-modules/privacyidea { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; proboscis = callPackage ../development/python-modules/proboscis { }; @@ -5338,8 +4947,6 @@ in { proglog = callPackage ../development/python-modules/proglog { }; - progressbar231 = callPackage ../development/python-modules/progressbar231 { }; - progressbar2 = callPackage ../development/python-modules/progressbar2 { }; progressbar33 = callPackage ../development/python-modules/progressbar33 { }; @@ -5354,12 +4961,7 @@ in { promise = callPackage ../development/python-modules/promise { }; - prompt_toolkit = let - filename = if isPy3k then - ../development/python-modules/prompt_toolkit - else - ../development/python-modules/prompt_toolkit/1.nix; - in callPackage filename { }; + prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; property-manager = callPackage ../development/python-modules/property-manager { }; @@ -5476,8 +5078,6 @@ in { pyalmond = callPackage ../development/python-modules/pyalmond { }; - pyamf = callPackage ../development/python-modules/pyamf { }; - pyamg = callPackage ../development/python-modules/pyamg { }; pyaml = callPackage ../development/python-modules/pyaml { }; @@ -5522,8 +5122,6 @@ in { pyblock = callPackage ../development/python-modules/pyblock { }; - pyblosxom = callPackage ../development/python-modules/pyblosxom { }; - pybluez = callPackage ../development/python-modules/pybluez { }; pybotvac = callPackage ../development/python-modules/pybotvac { }; @@ -5544,18 +5142,14 @@ in { py = callPackage ../development/python-modules/py { }; - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { }); + pycangjie = callPackage ../development/python-modules/pycangjie { }; pycapnp = callPackage ../development/python-modules/pycapnp { }; pycaption = callPackage ../development/python-modules/pycaption { }; - pycarddav = callPackage ../development/python-modules/pycarddav { }; - pycares = callPackage ../development/python-modules/pycares { }; - pycassa = callPackage ../development/python-modules/pycassa { }; - pycategories = callPackage ../development/python-modules/pycategories { }; pycdio = callPackage ../development/python-modules/pycdio { }; @@ -5606,8 +5200,6 @@ in { pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; - pycryptopp = callPackage ../development/python-modules/pycryptopp { }; - pyct = callPackage ../development/python-modules/pyct { }; pycuda = callPackage ../development/python-modules/pycuda { @@ -5617,8 +5209,6 @@ in { pycups = callPackage ../development/python-modules/pycups { }; - pycurl2 = callPackage ../development/python-modules/pycurl2 { }; - pycurl = callPackage ../development/python-modules/pycurl { }; pycxx = callPackage ../development/python-modules/pycxx { }; @@ -5641,15 +5231,9 @@ in { pydispatcher = callPackage ../development/python-modules/pydispatcher { }; - pydns = let - py3 = callPackage ../development/python-modules/py3dns { }; - py2 = callPackage ../development/python-modules/pydns { }; - in if isPy3k then py3 else py2; + pydns = callPackage ../development/python-modules/py3dns { }; - pydocstyle = if isPy27 then - callPackage ../development/python-modules/pydocstyle/2.nix { } - else - callPackage ../development/python-modules/pydocstyle { }; + pydocstyle = callPackage ../development/python-modules/pydocstyle { }; pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; @@ -5665,8 +5249,6 @@ in { pydy = callPackage ../development/python-modules/pydy { }; - pyechonest = callPackage ../development/python-modules/pyechonest { }; - pyedimax = callPackage ../development/python-modules/pyedimax { }; pyee = callPackage ../development/python-modules/pyee { }; @@ -5689,16 +5271,12 @@ in { pyexcel = callPackage ../development/python-modules/pyexcel { }; - pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; - pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; pyexcel-ods = callPackage ../development/python-modules/pyexcel-ods { }; pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; - pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 { })); - pyext = callPackage ../development/python-modules/pyext { }; pyface = callPackage ../development/python-modules/pyface { }; @@ -5767,10 +5345,7 @@ in { pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; - pygments = if isPy3k then - callPackage ../development/python-modules/Pygments { } - else - callPackage ../development/python-modules/Pygments/2_5.nix { }; + pygments = callPackage ../development/python-modules/Pygments { }; pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; @@ -5780,14 +5355,9 @@ in { pygobject2 = callPackage ../development/python-modules/pygobject { }; - pygobject3 = if isPy3k then - callPackage ../development/python-modules/pygobject/3.nix { - inherit (pkgs) meson; - } - else - callPackage ../development/python-modules/pygobject/3.36.nix { - inherit (pkgs) meson; - }; + pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { + inherit (pkgs) meson; + }; pygogo = callPackage ../development/python-modules/pygogo { }; @@ -5803,20 +5373,9 @@ in { pygtail = callPackage ../development/python-modules/pygtail { }; - pygtk = callPackage ../development/python-modules/pygtk { }; - - pyGtkGlade = self.pygtk.override { - inherit (pkgs.gnome2) libglade; - }; - - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; - pygtrie = callPackage ../development/python-modules/pygtrie { }; - pyhamcrest = if isPy3k then - callPackage ../development/python-modules/pyhamcrest { } - else - callPackage ../development/python-modules/pyhamcrest/1.nix { }; + pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; pyhaversion = callPackage ../development/python-modules/pyhaversion { }; @@ -5864,8 +5423,6 @@ in { pykerberos = callPackage ../development/python-modules/pykerberos { }; - pykickstart = callPackage ../development/python-modules/pykickstart { }; - pykira = callPackage ../development/python-modules/pykira { }; pykka = callPackage ../development/python-modules/pykka { }; @@ -5888,10 +5445,7 @@ in { pylev = callPackage ../development/python-modules/pylev { }; - pylibacl = if isPy3k then - callPackage ../development/python-modules/pylibacl { } - else - callPackage ../development/python-modules/pylibacl/0.5.nix { }; + pylibacl = callPackage ../development/python-modules/pylibacl { }; pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; @@ -5913,10 +5467,7 @@ in { pylint-flask = callPackage ../development/python-modules/pylint-flask { }; - pylint = if isPy3k then - callPackage ../development/python-modules/pylint { } - else - callPackage ../development/python-modules/pylint/1.9.nix { }; + pylint = callPackage ../development/python-modules/pylint { }; pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; @@ -6046,11 +5597,6 @@ in { pynzb = callPackage ../development/python-modules/pynzb { }; - pyobjc = if stdenv.isDarwin then - callPackage ../development/python-modules/pyobjc { } - else - throw "pyobjc can only be built on Mac OS"; - pyocr = callPackage ../development/python-modules/pyocr { tesseract = pkgs.tesseract4; }; @@ -6108,8 +5654,6 @@ in { pypdf2 = callPackage ../development/python-modules/pypdf2 { }; - pyPdf = callPackage ../development/python-modules/pypdf { }; - pypeg2 = callPackage ../development/python-modules/pypeg2 { }; pyperclip = callPackage ../development/python-modules/pyperclip { }; @@ -6126,8 +5670,6 @@ in { pyplatec = callPackage ../development/python-modules/pyplatec { }; - pypoppler = callPackage ../development/python-modules/pypoppler { }; - pyppeteer = callPackage ../development/python-modules/pyppeteer { }; pyprind = callPackage ../development/python-modules/pyprind { }; @@ -6218,8 +5760,6 @@ in { pyregion = callPackage ../development/python-modules/pyregion { }; - pyreport = callPackage ../development/python-modules/pyreport { }; - pyres = callPackage ../development/python-modules/pyres { }; pyrisco = callPackage ../development/python-modules/pyrisco { }; @@ -6366,8 +5906,6 @@ in { inherit (pkgs) sqlcipher; }; - pysqlite = callPackage ../development/python-modules/pysqlite { }; - pysqueezebox = callPackage ../development/python-modules/pysqueezebox { }; pysrim = callPackage ../development/python-modules/pysrim { }; @@ -6388,8 +5926,6 @@ in { py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; - pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pysvn = callPackage ../development/python-modules/pysvn { inherit (pkgs) bash subversion apr aprutil expat neon openssl; }; @@ -6416,8 +5952,7 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; - # pytest>=6 is too new for most packages - pytest = if isPy3k then self.pytest_6 else self.pytest_4; + pytest = self.pytest_6; pytest_4 = callPackage ../development/python-modules/pytest/4.nix { @@ -6429,24 +5964,18 @@ in { pytest_5 = callPackage ../development/python-modules/pytest/5.nix { - # hypothesis & pygments tests require pytest that causes dependency cycle + # hypothesis tests require pytest that causes dependency cycle hypothesis = self.hypothesis.override { doCheck = false; }; - pygments = self.pygments.override { - doCheck = false; - }; }; pytest_6 = callPackage ../development/python-modules/pytest { - # hypothesis & pygments tests require pytest that causes dependency cycle + # hypothesis tests require pytest that causes dependency cycle hypothesis = self.hypothesis.override { doCheck = false; }; - pygments = self.pygments.override { - doCheck = false; - }; }; pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec { @@ -6547,10 +6076,7 @@ in { pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; - pytest-mock = if isPy3k then - callPackage ../development/python-modules/pytest-mock { } - else - callPackage ../development/python-modules/pytest-mock/2.nix { }; + pytest-mock = callPackage ../development/python-modules/pytest-mock { }; pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; @@ -6633,18 +6159,13 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pytest-xdist = self.pytest_xdist; # added 2021-01-04 - pytest_xdist = if isPy27 then - callPackage ../development/python-modules/pytest-xdist/1.nix { } - else - callPackage ../development/python-modules/pytest-xdist { }; + pytest_xdist = self.pytest-xdist; # added 2021-01-04 + pytest-xdist = callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; - python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; - python3-openid = callPackage ../development/python-modules/python3-openid { }; python-awair = callPackage ../development/python-modules/python-awair { }; @@ -6721,8 +6242,6 @@ in { inherit (pkgs) igraph; }; - pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; - pythonix = callPackage ../development/python-modules/pythonix { meson = pkgs.meson.override { python3 = self.python; }; }; @@ -6757,8 +6276,6 @@ in { python_magic = callPackage ../development/python-modules/python-magic { }; - pythonmagick = callPackage ../development/python-modules/pythonmagick { }; - python-mapnik = callPackage ../development/python-modules/python-mapnik { }; python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; @@ -6800,8 +6317,6 @@ in { python_openzwave = callPackage ../development/python-modules/python_openzwave { }; - python-otr = callPackage ../development/python-modules/python-otr { }; - python-packer = callPackage ../development/python-modules/python-packer { }; python-pam = callPackage ../development/python-modules/python-pam { @@ -6847,12 +6362,8 @@ in { python-sql = callPackage ../development/python-modules/python-sql { }; - python_statsd = callPackage ../development/python-modules/python_statsd { }; - python-stdnum = callPackage ../development/python-modules/python-stdnum { }; - python-sybase = callPackage ../development/python-modules/sybase { }; - python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; python-toolbox = callPackage ../development/python-modules/python-toolbox { }; @@ -6962,8 +6473,6 @@ in { inherit (pkgs) libusb1; }; - pyutil = callPackage ../development/python-modules/pyutil { }; - pyutilib = callPackage ../development/python-modules/pyutilib { }; pyuv = callPackage ../development/python-modules/pyuv { }; @@ -7008,8 +6517,6 @@ in { inherit (pkgs) libxml2; }; - PyWebDAV = callPackage ../development/python-modules/pywebdav { }; - pywebpush = callPackage ../development/python-modules/pywebpush { }; pywebview = callPackage ../development/python-modules/pywebview { }; @@ -7022,16 +6529,7 @@ in { pywizlight = callPackage ../development/python-modules/pywizlight { }; - pyxattr = let - pyxattr' = callPackage ../development/python-modules/pyxattr { }; - pyxattr_2 = pyxattr'.overridePythonAttrs (oldAttrs: rec { - version = "0.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; - }; - }); - in if isPy3k then pyxattr' else pyxattr_2; + pyxattr = callPackage ../development/python-modules/pyxattr { }; pyworld = callPackage ../development/python-modules/pyworld { }; @@ -7045,8 +6543,6 @@ in { pyxl3 = callPackage ../development/python-modules/pyxl3 { }; - pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); - pyxnat = callPackage ../development/python-modules/pyxnat { }; pyyaml = callPackage ../development/python-modules/pyyaml { }; @@ -7079,8 +6575,6 @@ in { qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; - qpid-python = callPackage ../development/python-modules/qpid-python { }; - qrcode = callPackage ../development/python-modules/qrcode { }; qreactor = callPackage ../development/python-modules/qreactor { }; @@ -7093,8 +6587,6 @@ in { qscintilla = self.qscintilla-qt4; - qserve = callPackage ../development/python-modules/qserve { }; - qtawesome = callPackage ../development/python-modules/qtawesome { }; qtconsole = callPackage ../development/python-modules/qtconsole { }; @@ -7200,8 +6692,6 @@ in { relatorio = callPackage ../development/python-modules/relatorio { }; - remotecv = callPackage ../development/python-modules/remotecv { }; - rencode = callPackage ../development/python-modules/rencode { }; repeated_test = callPackage ../development/python-modules/repeated_test { }; @@ -7286,8 +6776,6 @@ in { rfcat = callPackage ../development/python-modules/rfcat { }; - rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { }); - rich = callPackage ../development/python-modules/rich { }; rig = callPackage ../development/python-modules/rig { }; @@ -7298,9 +6786,9 @@ in { rising = callPackage ../development/python-modules/rising { }; - rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { + rivet = toPythonModule (pkgs.rivet.override { python3 = python; - })); + }); rjsmin = callPackage ../development/python-modules/rjsmin { }; @@ -7324,8 +6812,6 @@ in { robotframework-requests = callPackage ../development/python-modules/robotframework-requests { }; - robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; - robotframework-selenium2library = callPackage ../development/python-modules/robotframework-selenium2library { }; robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { }; @@ -7358,29 +6844,21 @@ in { rpdb = callPackage ../development/python-modules/rpdb { }; - rpkg = callPackage ../development/python-modules/rpkg { }; - rply = callPackage ../development/python-modules/rply { }; - rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { + rpm = toPythonModule (pkgs.rpm.override { inherit python; - })); + }); rpmfluff = callPackage ../development/python-modules/rpmfluff { }; - rpy2 = if isPy3k then - callPackage ../development/python-modules/rpy2 { } - else - callPackage ../development/python-modules/rpy2/2.nix { }; + rpy2 = callPackage ../development/python-modules/rpy2 { }; rpyc = callPackage ../development/python-modules/rpyc { }; rq = callPackage ../development/python-modules/rq { }; - rsa = if isPy3k then - callPackage ../development/python-modules/rsa { } - else - callPackage ../development/python-modules/rsa/4_0.nix { }; + rsa = callPackage ../development/python-modules/rsa { }; rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; @@ -7393,9 +6871,6 @@ in { ruamel-base = self.ruamel_base; ruamel_base = callPackage ../development/python-modules/ruamel_base { }; - ruamel-ordereddict = self.ruamel_ordereddict; - ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { }; - ruamel-yaml = self.ruamel_yaml; ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { }; @@ -7406,8 +6881,6 @@ in { ruffus = callPackage ../development/python-modules/ruffus { }; - runsnakerun = callPackage ../development/python-modules/runsnakerun { }; - runway-python = callPackage ../development/python-modules/runway-python { }; rx = callPackage ../development/python-modules/rx { }; @@ -7448,8 +6921,6 @@ in { samsungtvws = callPackage ../development/python-modules/samsungtvws { }; - sandboxlib = callPackage ../development/python-modules/sandboxlib { }; - sanic-auth = callPackage ../development/python-modules/sanic-auth { }; sanic = callPackage ../development/python-modules/sanic { }; @@ -7462,8 +6933,6 @@ in { scales = callPackage ../development/python-modules/scales { }; - scandir = callPackage ../development/python-modules/scandir { }; - scapy = callPackage ../development/python-modules/scapy { }; schedule = callPackage ../development/python-modules/schedule { }; @@ -7482,11 +6951,9 @@ in { scikitimage = callPackage ../development/python-modules/scikit-image { }; - scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; }; - in if isPy3k then - callPackage ../development/python-modules/scikitlearn args - else - callPackage ../development/python-modules/scikitlearn/0.20.nix args; + scikitlearn = callPackage ../development/python-modules/scikitlearn { + inherit (pkgs) gfortran glibcLocales; + }; scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; @@ -7514,16 +6981,7 @@ in { disabled = !isPy3k; }); - scipy = let - scipy_ = callPackage ../development/python-modules/scipy { }; - scipy_1_2 = scipy_.overridePythonAttrs (oldAttrs: rec { - version = "1.2.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; - }; - }); - in if pythonOlder "3.5" then scipy_1_2 else scipy_; + scipy = callPackage ../development/python-modules/scipy { }; scour = callPackage ../development/python-modules/scour { }; @@ -7547,10 +7005,7 @@ in { sdnotify = callPackage ../development/python-modules/sdnotify { }; - seaborn = if isPy3k then - callPackage ../development/python-modules/seaborn { } - else - callPackage ../development/python-modules/seaborn/0.9.1.nix { }; + seaborn = callPackage ../development/python-modules/seaborn { }; seabreeze = callPackage ../development/python-modules/seabreeze { }; @@ -7560,10 +7015,7 @@ in { inherit (pkgs) secp256k1; }; - secretstorage = if isPy3k then - callPackage ../development/python-modules/secretstorage { } - else - callPackage ../development/python-modules/secretstorage/2.nix { }; + secretstorage = callPackage ../development/python-modules/secretstorage { }; secure = callPackage ../development/python-modules/secure { }; @@ -7577,8 +7029,6 @@ in { selenium = callPackage ../development/python-modules/selenium { }; - semantic = callPackage ../development/python-modules/semantic { }; - semantic-version = callPackage ../development/python-modules/semantic-version { }; semver = callPackage ../development/python-modules/semver { }; @@ -7599,7 +7049,7 @@ in { seqdiag = callPackage ../development/python-modules/seqdiag { }; - sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { + sequoia = disabledIf isPyPy (toPythonModule (pkgs.sequoia.override { pythonPackages = self; pythonSupport = true; })); @@ -7610,14 +7060,10 @@ in { serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; - serversyncstorage = callPackage ../development/python-modules/serversyncstorage { }; - service-identity = callPackage ../development/python-modules/service_identity { }; setproctitle = callPackage ../development/python-modules/setproctitle { }; - setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; - setuptools-git = callPackage ../development/python-modules/setuptools-git { }; setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; @@ -7677,8 +7123,6 @@ in { simanneal = callPackage ../development/python-modules/simanneal { }; - simpleai = callPackage ../development/python-modules/simpleai { }; - simpleaudio = callPackage ../development/python-modules/simpleaudio { }; simplebayes = callPackage ../development/python-modules/simplebayes { }; @@ -7695,8 +7139,6 @@ in { simplekml = callPackage ../development/python-modules/simplekml { }; - simpleparse = callPackage ../development/python-modules/simpleparse { }; - simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { }; @@ -7705,16 +7147,12 @@ in { simpy = callPackage ../development/python-modules/simpy { }; - singledispatch = callPackage ../development/python-modules/singledispatch { }; - signify = callPackage ../development/python-modules/signify { }; sip = callPackage ../development/python-modules/sip { }; sip_5 = callPackage ../development/python-modules/sip/5.x.nix { }; - sipsimple = callPackage ../development/python-modules/sipsimple { }; - six = callPackage ../development/python-modules/six { }; skein = callPackage ../development/python-modules/skein { @@ -7751,12 +7189,8 @@ in { slob = callPackage ../development/python-modules/slob { }; - slowaes = callPackage ../development/python-modules/slowaes { }; - sly = callPackage ../development/python-modules/sly { }; - smartdc = callPackage ../development/python-modules/smartdc { }; - smart_open = callPackage ../development/python-modules/smart_open { }; smartypants = callPackage ../development/python-modules/smartypants { }; @@ -7795,8 +7229,6 @@ in { snscrape = callPackage ../development/python-modules/snscrape { }; - snug = callPackage ../development/python-modules/snug { }; - snuggs = callPackage ../development/python-modules/snuggs { }; soapysdr = toPythonModule (pkgs.soapysdr.override { @@ -7839,10 +7271,7 @@ in { soundfile = callPackage ../development/python-modules/soundfile { }; - soupsieve = if isPy3k then - callPackage ../development/python-modules/soupsieve { } - else - callPackage ../development/python-modules/soupsieve/1.nix { }; + soupsieve = callPackage ../development/python-modules/soupsieve { }; spacy = callPackage ../development/python-modules/spacy { }; @@ -7850,8 +7279,6 @@ in { spake2 = callPackage ../development/python-modules/spake2 { }; - spambayes = callPackage ../development/python-modules/spambayes { }; - spark_parser = callPackage ../development/python-modules/spark_parser { }; SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; @@ -7908,15 +7335,9 @@ in { texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; }; - sphinxcontrib-websupport = if isPy3k then - callPackage ../development/python-modules/sphinxcontrib-websupport { } - else - callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; + sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; - sphinx = if isPy3k then - callPackage ../development/python-modules/sphinx { } - else - callPackage ../development/python-modules/sphinx/2.nix { }; + sphinx = callPackage ../development/python-modules/sphinx { }; sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; @@ -7960,8 +7381,6 @@ in { sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; - sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; - sqlitedict = callPackage ../development/python-modules/sqlitedict { }; sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { }; @@ -7976,8 +7395,6 @@ in { sqlsoup = callPackage ../development/python-modules/sqlsoup { }; - squaremap = callPackage ../development/python-modules/squaremap { }; - srp = callPackage ../development/python-modules/srp { }; srptools = callPackage ../development/python-modules/srptools { }; @@ -8026,8 +7443,6 @@ in { stm32loader = callPackage ../development/python-modules/stm32loader { }; - stompclient = callPackage ../development/python-modules/stompclient { }; - strategies = callPackage ../development/python-modules/strategies { }; stravalib = callPackage ../development/python-modules/stravalib { }; @@ -8062,16 +7477,10 @@ in { subdownloader = callPackage ../development/python-modules/subdownloader { }; - subliminal = callPackage ../development/python-modules/subliminal { }; - - subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; }; - suds = callPackage ../development/python-modules/suds { }; - suds-jurko = callPackage ../development/python-modules/suds-jurko { }; sumo = callPackage ../development/python-modules/sumo { }; @@ -8114,10 +7523,7 @@ in { inherit (pkgs) symengine; }; - sympy = if isPy3k then - callPackage ../development/python-modules/sympy { } - else - callPackage ../development/python-modules/sympy/1_5.nix { }; + sympy = callPackage ../development/python-modules/sympy { }; systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; @@ -8127,10 +7533,7 @@ in { tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; - tables = if isPy3k then - callPackage ../development/python-modules/tables { } - else - callPackage ../development/python-modules/tables/3.5.nix { }; + tables = callPackage ../development/python-modules/tables { }; tablib = callPackage ../development/python-modules/tablib { }; @@ -8142,8 +7545,6 @@ in { tahoma-api = callPackage ../development/python-modules/tahoma-api { }; - tarman = callPackage ../development/python-modules/tarman { }; - tasklib = callPackage ../development/python-modules/tasklib { }; taskw = callPackage ../development/python-modules/taskw { }; @@ -8295,8 +7696,6 @@ in { thrift = callPackage ../development/python-modules/thrift { }; - thumbor = callPackage ../development/python-modules/thumbor { }; - thumborPexif = callPackage ../development/python-modules/thumborpexif { }; tkinter = let @@ -8343,28 +7742,21 @@ in { tmb = callPackage ../development/python-modules/tmb { }; - tmdb3 = callPackage ../development/python-modules/tmdb3 { }; - todoist = callPackage ../development/python-modules/todoist { }; toggl-cli = callPackage ../development/python-modules/toggl-cli { }; - tokenizers = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + tokenizers = toPythonModule (callPackage ../development/python-modules/tokenizers { }); - tokenize-rt = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenize-rt { })); + tokenize-rt = toPythonModule (callPackage ../development/python-modules/tokenize-rt { }); tokenlib = callPackage ../development/python-modules/tokenlib { }; - tokenserver = callPackage ../development/python-modules/tokenserver { }; - toml = callPackage ../development/python-modules/toml { }; tomlkit = callPackage ../development/python-modules/tomlkit { }; - toolz = if isPy3k then - callPackage ../development/python-modules/toolz { } - else - callPackage ../development/python-modules/toolz/2.nix { }; + toolz = callPackage ../development/python-modules/toolz { }; toonapi = callPackage ../development/python-modules/toonapi { }; @@ -8376,10 +7768,7 @@ in { torchvision = callPackage ../development/python-modules/torchvision { }; - tornado = if isPy3k then - callPackage ../development/python-modules/tornado { } - else - callPackage ../development/python-modules/tornado/5.nix { }; + tornado = callPackage ../development/python-modules/tornado { }; # Used by circus and grab-site, 2020-08-29 tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; @@ -8403,10 +7792,7 @@ in { trackpy = callPackage ../development/python-modules/trackpy { }; - traitlets = if pythonOlder "3.7" then - callPackage ../development/python-modules/traitlets/4.nix { } - else - callPackage ../development/python-modules/traitlets { }; + traitlets = callPackage ../development/python-modules/traitlets { }; traits = callPackage ../development/python-modules/traits { }; @@ -8442,20 +7828,14 @@ in { pytestCheckHook = self.pytestCheckHook_6_1; }; - trollius = callPackage ../development/python-modules/trollius { }; - trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme { }; trytond = callPackage ../development/python-modules/trytond { }; - ttystatus = callPackage ../development/python-modules/ttystatus { }; - tunigo = callPackage ../development/python-modules/tunigo { }; - TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - tubeup = callPackage ../development/python-modules/tubeup { }; tumpa = callPackage ../development/python-modules/tumpa { }; @@ -8524,7 +7904,7 @@ in { typesystem = callPackage ../development/python-modules/typesystem { }; - typing = callPackage ../development/python-modules/typing { }; + typing = null; typing-extensions = callPackage ../development/python-modules/typing-extensions { }; @@ -8552,10 +7932,7 @@ in { ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; - ujson = if isPy27 then - callPackage ../development/python-modules/ujson/2.nix { } - else - callPackage ../development/python-modules/ujson { }; + ujson = callPackage ../development/python-modules/ujson { }; ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; @@ -8563,8 +7940,6 @@ in { umap-learn = callPackage ../development/python-modules/umap-learn { }; - umemcache = callPackage ../development/python-modules/umemcache { }; - u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; uncertainties = callPackage ../development/python-modules/uncertainties { }; @@ -8631,12 +8006,9 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber { }; - urllib3 = if isPy3k then - callPackage ../development/python-modules/urllib3 { - pytestCheckHook = self.pytestCheckHook_6_1; - } - else - callPackage ../development/python-modules/urllib3/2.nix { }; + urllib3 = callPackage ../development/python-modules/urllib3 { + pytestCheckHook = self.pytestCheckHook_6_1; + }; urwid = callPackage ../development/python-modules/urwid { }; @@ -8674,10 +8046,7 @@ in { varint = callPackage ../development/python-modules/varint { }; - vcrpy = if isPy27 then - callPackage ../development/python-modules/vcrpy/3.nix { } - else - callPackage ../development/python-modules/vcrpy { }; + vcrpy = callPackage ../development/python-modules/vcrpy { }; vcver = callPackage ../development/python-modules/vcver { }; @@ -8881,8 +8250,6 @@ in { worldengine = callPackage ../development/python-modules/worldengine { }; - wptserve = callPackage ../development/python-modules/wptserve { }; - wrapio = callPackage ../development/python-modules/wrapio { }; wrapt = callPackage ../development/python-modules/wrapt { }; @@ -8895,8 +8262,6 @@ in { wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; - WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; - wsgitools = callPackage ../development/python-modules/wsgitools { }; WSME = callPackage ../development/python-modules/WSME { }; @@ -8914,10 +8279,6 @@ in { wurlitzer = callPackage ../development/python-modules/wurlitzer { }; - wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { - wxGTK = pkgs.wxGTK30; - }; - wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; wxGTK = pkgs.wxGTK30.override { @@ -8933,8 +8294,6 @@ in { }; }; - wxPython = self.wxPython30; - x11_hash = callPackage ../development/python-modules/x11_hash { }; x256 = callPackage ../development/python-modules/x256 { }; @@ -8954,8 +8313,6 @@ in { xboxapi = callPackage ../development/python-modules/xboxapi { }; - xcaplib = callPackage ../development/python-modules/xcaplib { }; - xcffib = callPackage ../development/python-modules/xcffib { }; xdg = callPackage ../development/python-modules/xdg { }; @@ -8964,7 +8321,7 @@ in { xdot = callPackage ../development/python-modules/xdot { }; - xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); + xenomapper = callPackage ../applications/science/biology/xenomapper { }; xgboost = callPackage ../development/python-modules/xgboost { inherit (pkgs) xgboost; @@ -9060,8 +8417,6 @@ in { yeelight = callPackage ../development/python-modules/yeelight { }; - yenc = callPackage ../development/python-modules/yenc { }; - yfinance = callPackage ../development/python-modules/yfinance { }; yoda = toPythonModule (pkgs.yoda.override { inherit python; }); @@ -9079,8 +8434,6 @@ in { inherit (pkgs) jq; }; - yt = callPackage ../development/python-modules/yt { }; - ytmusicapi = callPackage ../development/python-modules/ytmusicapi { }; yubico-client = callPackage ../development/python-modules/yubico-client { }; @@ -9095,8 +8448,6 @@ in { zarr = callPackage ../development/python-modules/zarr { }; - zbase32 = callPackage ../development/python-modules/zbase32 { }; - zc_buildout221 = callPackage ../development/python-modules/buildout { }; zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix @@ -9109,9 +8460,9 @@ in { zdaemon = callPackage ../development/python-modules/zdaemon { }; - zeek = disabledIf (!isPy3k) (toPythonModule (pkgs.zeek.override { + zeek = toPythonModule (pkgs.zeek.override { python3 = python; - })).py; + }).py; zeep = callPackage ../development/python-modules/zeep { }; @@ -9127,8 +8478,6 @@ in { zetup = callPackage ../development/python-modules/zetup { }; - zfec = callPackage ../development/python-modules/zfec { }; - zha-quirks = callPackage ../development/python-modules/zha-quirks { }; zict = callPackage ../development/python-modules/zict { }; @@ -9149,10 +8498,7 @@ in { zipfile36 = callPackage ../development/python-modules/zipfile36 { }; - zipp = if pythonOlder "3.6" then - callPackage ../development/python-modules/zipp/1.nix { } - else - callPackage ../development/python-modules/zipp { }; + zipp = callPackage ../development/python-modules/zipp { }; zipstream = callPackage ../development/python-modules/zipstream { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix new file mode 100644 index 0000000000000..9240c8f67b209 --- /dev/null +++ b/pkgs/top-level/python2-packages.nix @@ -0,0 +1,643 @@ +# Extension with Python 2 packages that is overlayed on top +# of the Python 3 packages set. This way, Python 2+3 compatible +# packages can still be used. + +self: super: + +with self; with super; { + + affinity = callPackage ../development/python-modules/affinity { }; + + antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { + inherit (pkgs) antlr4; + }; + + appleseed = toPythonModule (pkgs.appleseed.override { inherit (self) python; }); + + application = callPackage ../development/python-modules/application { }; + + arrow = callPackage ../development/python-modules/arrow/2.nix { }; + + ase = callPackage ../development/python-modules/ase/3.17.nix { }; + + astroid = callPackage ../development/python-modules/astroid/1.6.nix { }; + + backports_lzma = callPackage ../development/python-modules/backports_lzma { }; + + backports_os = callPackage ../development/python-modules/backports_os { }; + + bcrypt = callPackage ../development/python-modules/bcrypt/3_1.nix { }; + + bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; + + bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; + + blivet = callPackage ../development/python-modules/blivet { }; + + box2d = callPackage ../development/python-modules/box2d { }; + + browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy { }; + + cairocffi = callPackage ../development/python-modules/cairocffi/0_9.nix { }; + + cairosvg = callPackage ../development/python-modules/cairosvg/1_x.nix { }; + + CDDB = callPackage ../development/python-modules/cddb { }; + + cdecimal = callPackage ../development/python-modules/cdecimal { }; + + chardet = callPackage ../development/python-modules/chardet/2.nix { }; + + cheetah = callPackage ../development/python-modules/cheetah { }; + + cherrypi = callPackage ../development/python-modules/cherrypy/17.nix { }; + + cjson = callPackage ../development/python-modules/cjson { }; + + cliapp = callPackage ../development/python-modules/cliapp { }; + + closure-linter = callPackage ../development/python-modules/closure-linter { }; + + cmdtest = callPackage ../development/python-modules/cmdtest { }; + + coilmq = callPackage ../development/python-modules/coilmq { }; + + configparser = callPackage ../development/python-modules/configparser/4.nix { }; + + construct = callPackage ../development/python-modules/construct/2.10.54.nix { }; + + convertdate = callPackage ../development/python-modules/convertdate/2.2.x.nix { }; + + cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { }; + + cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors-3.3.nix { }; + + darcsver = callPackage ../development/python-modules/darcsver { }; + + dateparser = callPackage ../development/python-modules/dateparser/0.x.nix { }; + + deskcon = callPackage ../development/python-modules/deskcon { }; + + django_evolution = callPackage ../development/python-modules/django_evolution { }; + + dnspython = super.dnspython_1; + + docker-py = disabled super.docker-py; + + dtopt = callPackage ../development/python-modules/dtopt { }; + + dulwich = callPackage ../development/python-modules/dulwich/0_19.nix { }; + + enum = callPackage ../development/python-modules/enum { }; + + eventlib = callPackage ../development/python-modules/eventlib { }; + + faulthandler = callPackage ../development/python-modules/faulthandler { }; + + fdint = callPackage ../development/python-modules/fdint { }; + + feedparser = callPackage ../development/python-modules/feedparser/5.nix { }; + + flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; + + flit = disabled super.flit; + + flit-core = disabled super.flit-core; + + flup = callPackage ../development/python-modules/flup { }; + + fontforge = disabled super.fontforge; + + freezegun = callPackage ../development/python-modules/freezegun/0.3.nix { }; + + fudge = callPackage ../development/python-modules/fudge { }; + + futures = callPackage ../development/python-modules/futures { }; + + gdcm = disabled super.gdcm; + + gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { + pythonPackages = self; + pythonSupport = true; + })); # gaia isn't supported with python3 and it's not available from pypi + + geant4 = disabled super.geant4; + + geopy = callPackage ../development/python-modules/geopy/2.nix { }; + + # Python 2.7 support was deprecated but is still needed by weboob and duplicity + google-api-python-client = super.google-api-python-client.overridePythonAttrs (old: rec { + version = "1.7.6"; + src = old.src.override { + inherit version; + sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; + }; + }); + + gateone = callPackage ../development/python-modules/gateone { }; + + gdrivefs = callPackage ../development/python-modules/gdrivefs { }; + + gsd = callPackage ../development/python-modules/gsd/1.7.nix { }; + + gnutls = callPackage ../development/python-modules/gnutls { }; + + google-apputils = callPackage ../development/python-modules/google-apputils { }; + + grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { + enablePython = true; + pythonPackages = self; + })); + + gunicorn = callPackage ../development/python-modules/gunicorn/19.nix { }; + + gwyddion = toPythonModule (pkgs.gwyddion.override { + pythonSupport = true; + pythonPackages = self; + }); + + hg-git = callPackage ../development/python-modules/hg-git { }; + + hgsvn = callPackage ../development/python-modules/hgsvn { }; + + hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; + + html2text = callPackage ../development/python-modules/html2text/2018.nix { }; + + httpretty = callPackage ../development/python-modules/httpretty/0.nix { }; + + http_signature = callPackage ../development/python-modules/http_signature { }; + + hypothesis = super.hypothesis_4; + + idna = callPackage ../development/python-modules/idna/2.nix { }; + + imagecodecs-lite = disabled super.imagecodecs-lite; + + imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn/0.4.nix { }; + + importlib-metadata = callPackage ../development/python-modules/importlib-metadata/2.nix { }; + + ipaddr = callPackage ../development/python-modules/ipaddr { }; + + ipykernel = callPackage ../development/python-modules/ipykernel/4.nix { }; + + ipython = callPackage ../development/python-modules/ipython/5.nix { }; + + isort = callPackage ../development/python-modules/isort/4.nix { }; + + jaraco_functools = callPackage ../development/python-modules/jaraco_functools/2.nix { }; + + jaraco_stream = callPackage ../development/python-modules/jaraco_stream/2.nix { }; + + jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; + + jupyter_client = callPackage ../development/python-modules/jupyter_client/5.nix { }; + + jupyter_console = callPackage ../development/python-modules/jupyter_console/5.nix { }; + + keyring = callPackage ../development/python-modules/keyring/2.nix { }; + + koji = callPackage ../development/python-modules/koji { }; + + konfig = callPackage ../development/python-modules/konfig { }; + + kicad = disabled super.kicad; + + kiwisolver = callPackage ../development/python-modules/kiwisolver/1_1.nix { }; + + larch = callPackage ../development/python-modules/larch { }; + + Lasagne = callPackage ../development/python-modules/lasagne { }; + + le = callPackage ../development/python-modules/le { }; + + libcloud = callPackage ../development/python-modules/libcloud/2.nix { }; + + libgpiod = disabled super.libgpiod; + + libnl-python = toPythonModule (pkgs.libnl.override { + pythonSupport = true; + inherit python; + }).py; + + libplist = toPythonModule (pkgs.libplist.override { + enablePython = true; + inherit python; + }).py; + + libtorrent-rasterbar = (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python; + + libvirt = callPackage ../development/python-modules/libvirt/5.9.0.nix { + libvirt = pkgs.libvirt_5_9_0; + }; + + lightblue = callPackage ../development/python-modules/lightblue { }; + + lirc = disabled super.lirc; + + lpod = callPackage ../development/python-modules/lpod { }; + + lsi = callPackage ../development/python-modules/lsi { }; + + lxc = callPackage ../development/python-modules/lxc { }; + + mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; + + marionette-harness = callPackage ../development/python-modules/marionette-harness { }; + + marisa = callPackage ../development/python-modules/marisa { + inherit (pkgs) marisa; + }; + + marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { }; + + markdown = callPackage ../development/python-modules/markdown/3_1.nix { }; + + matplotlib = callPackage ../development/python-modules/matplotlib/2.nix { + stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + }; + + meliae = callPackage ../development/python-modules/meliae { }; + + mercurial = disabled super.mercurial; + + meson = disabled super.meson; + + metaphone = callPackage ../development/python-modules/metaphone { }; + + mock = callPackage ../development/python-modules/mock/2.nix { }; + + # Needed here because moinmoin is loaded as a Python library. + moinmoin = callPackage ../development/python-modules/moinmoin { }; + + monosat = disabled super.monosat; + + more-itertools = callPackage ../development/python-modules/more-itertools/2.7.nix { }; + + mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { }; + + mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { }; + + mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { }; + + mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { }; + + mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { }; + + mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { }; + + moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { }; + + mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { }; + + mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { }; + + mozterm = callPackage ../development/python-modules/mozterm { }; + + mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { }; + + mozsvc = callPackage ../development/python-modules/mozsvc { }; + + moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { }; + + mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { }; + + mpd = callPackage ../development/python-modules/mpd { }; + + mrbob = callPackage ../development/python-modules/mrbob { }; + + msrplib = callPackage ../development/python-modules/msrplib { }; + + mwlib = callPackage ../development/python-modules/mwlib { }; + + mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; + + mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; + + mutagen = callPackage ../development/python-modules/mutagen/1.43.nix { }; + + muttils = callPackage ../development/python-modules/muttils { }; + + namebench = callPackage ../development/python-modules/namebench { }; + + nbformat = callPackage ../development/python-modules/nbformat/2.nix { }; + + networkx = callPackage ../development/python-modules/networkx/2.2.nix { }; + + nevow = callPackage ../development/python-modules/nevow { }; + + # This is used for NixOps to make sure we won't break it with the next major version of nixpart. + nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; + + nixpart = callPackage ../tools/filesystems/nixpart { }; + + nose-focus = callPackage ../development/python-modules/nose-focus { }; + + nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; + + notebook = callPackage ../development/python-modules/notebook/2.nix { }; + + notify = callPackage ../development/python-modules/notify { }; + + numpy = callPackage ../development/python-modules/numpy/1.16.nix { }; + + nxt-python = callPackage ../development/python-modules/nxt-python { }; + + oauthlib = callPackage ../development/python-modules/oauthlib/3.1.nix { }; + + opencv = toPythonModule (pkgs.opencv.override { + enablePython = true; + pythonPackages = self; + }); + + openpyxl = callPackage ../development/python-modules/openpyxl/2.nix { }; + + openwrt-luci-rpc = disabled super.openwrt-luci-rpc; + + opt-einsum = callPackage ../development/python-modules/opt-einsum/2.nix { }; + + packaging = callPackage ../development/python-modules/packaging/2.nix { }; + + pagerduty = callPackage ../development/python-modules/pagerduty { }; + + pandas = callPackage ../development/python-modules/pandas/2.nix { }; + + pasteScript = callPackage ../development/python-modules/pastescript { }; + + pathpy = callPackage ../development/python-modules/path.py/2.nix { }; + + pillow = callPackage ../development/python-modules/pillow/6.nix { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; + }; + + pip = callPackage ../development/python-modules/pip/20.nix { }; + + postorius = disabled super.postorius; + + praw = callPackage ../development/python-modules/praw/6.3.nix { }; + + prettytable = callPackage ../development/python-modules/prettytable/1.nix { }; + + privacyidea = callPackage ../development/python-modules/privacyidea { }; + + progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + + prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit/1.nix { }; + + pyamf = callPackage ../development/python-modules/pyamf { }; + + pyblosxom = callPackage ../development/python-modules/pyblosxom { }; + + pycangjie = disabled pycangjie; + + pycarddav = callPackage ../development/python-modules/pycarddav { }; + + pycassa = callPackage ../development/python-modules/pycassa { }; + + pycryptopp = callPackage ../development/python-modules/pycryptopp { }; + + pycurl2 = callPackage ../development/python-modules/pycurl2 { }; + + pydns = callPackage ../development/python-modules/pydns { }; + + pydocstyle = callPackage ../development/python-modules/pydocstyle/2.nix { }; + + pyechonest = callPackage ../development/python-modules/pyechonest { }; + + pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; + + pyexiv2 = toPythonModule (callPackage ../development/python-modules/pyexiv2 { }); + + pygments = callPackage ../development/python-modules/Pygments/2_5.nix { }; + + pygobject3 = callPackage ../development/python-modules/pygobject/3.36.nix { + inherit (pkgs) meson; + }; + + pygtk = callPackage ../development/python-modules/pygtk { }; + + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; + + pyGtkGlade = self.pygtk.override { + inherit (pkgs.gnome2) libglade; + }; + + pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { }; + + pykickstart = callPackage ../development/python-modules/pykickstart { }; + + pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { }; + + pylint = callPackage ../development/python-modules/pylint/1.9.nix { }; + + pyobjc = if stdenv.isDarwin then + callPackage ../development/python-modules/pyobjc { } + else + throw "pyobjc can only be built on Mac OS"; + + pyPdf = callPackage ../development/python-modules/pypdf { }; + + pypoppler = callPackage ../development/python-modules/pypoppler { }; + + pyreport = callPackage ../development/python-modules/pyreport { }; + + pyroma = callPackage ../development/python-modules/pyroma/2.nix { }; + + pysqlite = callPackage ../development/python-modules/pysqlite { }; + + pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + + pytest = pytest_4; + + pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { }; + + pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { }; + + pytest_xdist = self.pytest-xdist; # added 2021-01-04 + pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; + + python-otr = callPackage ../development/python-modules/python-otr { }; + + python_statsd = callPackage ../development/python-modules/python_statsd { }; + + python-sybase = callPackage ../development/python-modules/sybase { }; + + python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; + + pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; + + pythonmagick = callPackage ../development/python-modules/pythonmagick { }; + + pyutil = callPackage ../development/python-modules/pyutil { }; + + pyxattr = super.pyxattr.overridePythonAttrs (oldAttrs: rec { + version = "0.6.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; + }; + }); + + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; + + pyxml = callPackage ../development/python-modules/pyxml { }; + + qpid-python = callPackage ../development/python-modules/qpid-python { }; + + qserve = callPackage ../development/python-modules/qserve { }; + + remotecv = callPackage ../development/python-modules/remotecv { }; + + rhpl = callPackage ../development/python-modules/rhpl { }; + + rivet = disabled super.rivet; + + robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; + + ruamel-ordereddict = self.ruamel_ordereddict; + ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { }; + + runsnakerun = callPackage ../development/python-modules/runsnakerun { }; + + rpm = disabled super.rpm; + + rpkg = callPackage ../development/python-modules/rpkg { }; + + rpy2 = callPackage ../development/python-modules/rpy2/2.nix { }; + + rsa = callPackage ../development/python-modules/rsa/4_0.nix { }; + + sandboxlib = callPackage ../development/python-modules/sandboxlib { }; + + scandir = callPackage ../development/python-modules/scandir { }; + + scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix { + inherit (pkgs) gfortran glibcLocales; + }; + + scipy = super.scipy.overridePythonAttrs (oldAttrs: rec { + version = "1.2.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; + }; + }); + + seaborn = callPackage ../development/python-modules/seaborn/0.9.1.nix { }; + + secretstorage = callPackage ../development/python-modules/secretstorage/2.nix { }; + + semantic = callPackage ../development/python-modules/semantic { }; + + serversyncstorage = callPackage ../development/python-modules/serversyncstorage { }; + + sequoia = disabled super.sequoia; + + setuptools = callPackage ../development/python-modules/setuptools/44.0.nix { }; + + setuptools_scm = callPackage ../development/python-modules/setuptools_scm/2.nix { }; + + setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; + + simpleai = callPackage ../development/python-modules/simpleai { }; + + simpleparse = callPackage ../development/python-modules/simpleparse { }; + + singledispatch = callPackage ../development/python-modules/singledispatch { }; + + sipsimple = callPackage ../development/python-modules/sipsimple { }; + + slowaes = callPackage ../development/python-modules/slowaes { }; + + smartdc = callPackage ../development/python-modules/smartdc { }; + + snug = callPackage ../development/python-modules/snug { }; + + soupsieve = callPackage ../development/python-modules/soupsieve/1.nix { }; + + spambayes = callPackage ../development/python-modules/spambayes { }; + + sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; + + sphinx = callPackage ../development/python-modules/sphinx/2.nix { }; + + sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; + + squaremap = callPackage ../development/python-modules/squaremap { }; + + stompclient = callPackage ../development/python-modules/stompclient { }; + + subliminal = callPackage ../development/python-modules/subliminal { }; + + subprocess32 = callPackage ../development/python-modules/subprocess32 { }; + + suds = callPackage ../development/python-modules/suds { }; + + sympy = callPackage ../development/python-modules/sympy/1_5.nix { }; + + tables = callPackage ../development/python-modules/tables/3.5.nix { }; + + tarman = callPackage ../development/python-modules/tarman { }; + + thumbor = callPackage ../development/python-modules/thumbor { }; + + tmdb3 = callPackage ../development/python-modules/tmdb3 { }; + + tokenizers = disabled super.tokenizers; + + tokenize-rt = disabled super.tokenize-rt; + + tokenserver = callPackage ../development/python-modules/tokenserver { }; + + toolz = callPackage ../development/python-modules/toolz/2.nix { }; + + tornado = callPackage ../development/python-modules/tornado/5.nix { }; + + traitlets = callPackage ../development/python-modules/traitlets/4.nix { }; + + trollius = callPackage ../development/python-modules/trollius { }; + + ttystatus = callPackage ../development/python-modules/ttystatus { }; + + TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; + + typing = callPackage ../development/python-modules/typing { }; + + ujson = callPackage ../development/python-modules/ujson/2.nix { }; + + umemcache = callPackage ../development/python-modules/umemcache { }; + + urllib3 = callPackage ../development/python-modules/urllib3/2.nix { }; + + wptserve = callPackage ../development/python-modules/wptserve { }; + + WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; + + wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { + wxGTK = pkgs.wxGTK30; + }; + + wxPython = self.wxPython30; + + vcrpy = callPackage ../development/python-modules/vcrpy/3.nix { }; + + xcaplib = callPackage ../development/python-modules/xcaplib { }; + + xenomapper = disabled super.xenomapper; + + yenc = callPackage ../development/python-modules/yenc { }; + + yt = callPackage ../development/python-modules/yt { }; + + zeek = disablede super.zeek; + + zbase32 = callPackage ../development/python-modules/zbase32 { }; + + zfec = callPackage ../development/python-modules/zfec { }; + + zipp = callPackage ../development/python-modules/zipp/1.nix { }; + +}