diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index f19458fa84fbc..c40f2f45f3128 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -153,7 +153,8 @@ with python.pkgs; buildPythonApplication rec { --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ - --replace "zeroconf==0.37.*" "zeroconf" + --replace "wsproto==1.0.*" "wsproto" \ + --replace "zeroconf==0.38.*" "zeroconf" ''; meta = with lib; { diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 5f55ed5ecaf1a..3843497d94e53 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -356,17 +356,19 @@ def _update_package(path, target): text = _replace_value('hash', sri_hash, text) if fetcher == 'fetchFromGitHub': - # in the case of fetchFromGitHub, it's common to see `rev = version;` - # in which no string value is meant to be substituted. - # Verify that the attribute is set to a variable - regex = '(rev\s+=\s+([_a-zA-Z][_a-zA-Z0-9\.]*);)' + # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` + # in which no string value is meant to be substituted. However, we can just overwrite the previous value. + regex = '(rev\s+=\s+[^;]*;)' regex = re.compile(regex) - value = regex.findall(text) - n = len(value) + matches = regex.findall(text) + n = len(matches) if n == 0: - # value is set to a string, e.g. `rev = "v${version}";` - text = _replace_value('rev', f"{prefix}${{version}}", text) + raise ValueError("Unable to find rev value for {}.".format(pname)) + else: + # forcefully rewrite rev, incase tagging conventions changed for a release + match = matches[0] + text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";') # incase there's no prefix, just rewrite without interpolation text = text.replace('"${version}";', 'version;') diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index e22037cbbb9f2..5ceabe766b867 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -25,11 +25,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.24"; + version = "0.29.28"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zfBNB8NgCGDowuuq1Oj1KsP+shJFPBdkpJrAjIJ+hEM="; + sha256 = "sha256-1vrCNCgCww5RQmgo/ghP9N6xszhzZ8+Yl2uy5ktvjkU="; }; nativeBuildInputs = [ @@ -44,13 +44,6 @@ in buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; patches = [ - # https://github.com/cython/cython/issues/2752, needed by sage (https://trac.sagemath.org/ticket/26855) and up to be included in 0.30 - (fetchpatch { - name = "non-int-conversion-to-pyhash.patch"; - url = "https://github.com/cython/cython/commit/28251032f86c266065e4976080230481b1a1bb29.patch"; - sha256 = "19rg7xs8gr90k3ya5c634bs8gww1sxyhdavv07cyd2k71afr83gy"; - }) - # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series. # it does not affect Python code unless the code explicitly uses the feature. # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267) diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 941beb5447313..3655c7456e586 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "adblock"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,14 +25,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ArniDagur"; repo = "python-adblock"; - rev = version; - sha256 = "sha256-f6PmEHVahQv8t+WOkE8DO2emivHG2t14hUSIf/l8omY="; + rev = "refs/tags/${version}"; + sha256 = "sha256-6FH+AVK7+Yg1a6oKbFV80TuGGE4Y7I3mMVzwVHdHYO4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-x0mcykHWhheD2ycELcfR1ZQ/6WfFQzY+L/LmMipP4Rc="; + hash = "sha256-JI/C+Woi/dJWUGUum8daecjFWiQgxY6BFYZ5MpTcRvU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index fab3a32a6a0ec..83c5e986f099e 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.20.0"; + version = "0.20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N8qiKsWPaFT/t5p1eSHS0BydoXv4AL6y8gP4z4P9fsE="; + sha256 = "sha256-6p3n5tNNQrbwHqGRXYNL4+cf31Blx2e9elxX6/wxj/4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index f6d9b5d97ec72..660e205fb482b 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -75,6 +75,10 @@ buildPythonPackage rec { "test_client_session_timeout_zero" "test_mark_formdata_as_processed" "test_requote_redirect_url_default" + # Disable tests that trigger deprecation warnings in pytest + "test_async_with_session" + "test_session_close_awaitable" + "test_close_run_until_complete_not_deprecated" ] ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/aionotify/default.nix b/pkgs/development/python-modules/aionotify/default.nix index e653f4cca74eb..13ae51d25227f 100644 --- a/pkgs/development/python-modules/aionotify/default.nix +++ b/pkgs/development/python-modules/aionotify/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; + preCheck = '' + substituteInPlace tests/test_usage.py \ + --replace "asyncio.wait_for(task, timeout, loop=self.loop)" "asyncio.wait_for(task, timeout)" + ''; + checkInputs = [ asynctest ]; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 18698a0d68f26..a82cd5e258ae4 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.7.5"; + version = "1.7.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fDKGlKLmjwPulx5jw72IWEZHA3OltTLPLJ8WAcQTsVM="; + sha256 = "sha256-bAwF6XaKiW2AQ4fiCymYgP4BvFZIQkaw3/6AddbT2Ec="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index d198fde80bb82..5847e3ad0f9e8 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -1,17 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "ansi"; - version = "0.2.0"; + version = "0.3.6"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "98e9b27c4bb187867a69480cbc63b843331622fec7e7d090873d806e1b5d8a80"; + src = fetchFromGitHub { + owner = "tehmaze"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-2gu2Dba3LOjMhbCCZrBqzlOor5KqDYThhe8OP8J3O2M="; }; - checkPhase = '' - python -c "import ansi.color" - ''; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ansi.colour" + "ansi.color" + ]; meta = with lib; { description = "ANSI cursor movement and graphics"; diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 50188fe0e4a3a..1f45968974cb7 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -2,13 +2,14 @@ buildPythonPackage rec { pname = "ansi2html"; - version = "1.6.0"; + version = "1.7.0"; + format = "pyproject"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; + sha256 = "sha256-aTFr6MaKyRxVgtOXwokOacmTzHzaUgYqx+Rfy2YNjtw="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 0523b775dab32..334fd20c12567 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "5.3.2"; + version = "5.4.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-m6iG20xE5ZNgvI1mjwvq5hk8Ch/LuedhJwAMo6ztfCg="; + sha256 = "sha256-IWCmC0qwNMBABtcBoXeTQP+w9uKPAw/43pWOEGKoiWI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 382e64ea0f4fb..a9ae447d45ff5 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , setuptools-scm , idna @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.3.4"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,9 +28,17 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-aMnXZ+4dlybId2QhjE/3STY+Sj/vzI6K7wmqqx+P8yE="; + sha256 = "sha256-AZ9M/NBCBlMIUpRJgKbJRL/oReZDUh2Jhwtoxoo0tMs="; }; + patches = [ + (fetchpatch { + # Pytest 7.0 compatibility + url = "https://github.com/agronholm/anyio/commit/fed7cc4f95e196f68251bcb9253da3b143ea8e7e.patch"; + sha256 = "sha256-VmZmiQEmWJ4aPz0Wx+GTMZo7jXRDScnRYf2Hu2hiRVw="; + }) + ]; + preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION=${version} ''; diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 4ac03a8820fb8..948fae7893b85 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -65,13 +65,13 @@ , mkYarnPackage }: let - version = "2.2.3"; + version = "2.2.4"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "02y3az7yj4g4qaamq5s1bcvy3knd6xmvnhbfqs3kbm51irkba1zq"; + sha256 = "sha256-JCcEgCq1sB8lBaeJy7QQbWU00sGAh5vUmJAptF8M9qo="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 2eeebaaea7f8c..b8d1a94eeff0c 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.35.0"; + version = "2.36.0"; disabled = pythonAtLeast "3.10"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "v${version}"; - sha256 = "0qxkas33d8i6yj133plnadbfm74ak7arn7ldpziyiwdav3hj68sy"; + sha256 = "sha256-f+ICbKSwNjkhrTCCZwxbmqZlQ1+dQSTRag1IflWsqYg="; }; patches = [ diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index b74533e0d44b9..ece87d1894e09 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - version = "3.6.0"; + version = "4.0.0"; pname = "approvaltests"; # no tests included in PyPI tarball @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "v${version}"; - sha256 = "sha256-pgGuIoYV6JRM9h7hR8IeNduqsGm+UrKq+P/T1LM30NE="; + sha256 = "sha256-4dg5xTswqLFRBaZagKrkilCvsAnky9donb03MT/PiWM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 46ae3fc34e565..5adee7244dd39 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -29,6 +29,14 @@ buildPythonPackage rec { pytestCheckHook ]; + # Works around the following error by dropping the call to that function + # def print_version_info(write=write): + # > write(" Python " + sys.executable + " " + str(sys.version_info) + "\n") + # E TypeError: 'module' object is not callable + preCheck = '' + sed -i '/print_version_info(write)/d' tests.py + ''; + pytestFlagsArray = [ "tests.py" ]; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index fc66509a194a1..c09610c3be1f7 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.2.1"; + version = "1.2.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840"; + sha256 = "sha256-Bcrx/T2aEaETWytvCYh0IRU7lFWOXvTQkLVntHFzrCs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 1a9ba2dd0963c..122020c271f9f 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.8.3"; + version = "2.10.1"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "de0f70ffb2e0d539461940d6f7529c3548541fa098d8edc37af256af61c09b44"; + sha256 = "sha256-9+Vp8ps3I5Oe/sgWTrLtcnS91ICwsoPXWDPw9Z0QhAk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 78f02e2870ce8..6a61dd1009c69 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -19,7 +19,7 @@ let pname = "astropy"; - version = "5.0"; + version = "5.0.1"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "70203e151e13292586a817b4069ce1aad4643567aff38b1d191c173bc54f3927"; + sha256 = "sha256-Y4LN5qIFqgsWoNXmHAwBMevU8BdNbHPilk9L7hMqkCc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index 73422a0624c8c..11e1f444cb0bb 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.1.1"; + version = "1.1.3"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "v${version}"; - sha256 = "08zpaclg5f9g1pix0jaq42i2ph12xc8djjrmhxz0yygw5rsilgl4"; + sha256 = "sha256-RD/8v3IQb50iGkU6zj5QfHXakjHdcCBWWAkXhCIF6qo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index a088a0120103a..285630db32e9a 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "autobahn"; - version = "21.11.1"; + version = "22.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vW9GMVQZygpb5BCfc3QQIIrV8ZcY9nympKZ0zGbKmxg="; + sha256 = "sha256-YOH0xgKqzQUv/j1GrkC2t1+ChrPEaSLCE7UjFi5YwX4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 461ce9d90d9d6..673b6631cf2ad 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "1.24.5"; + version = "2.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55"; + sha256 = "sha256-+WMv52JIbh51pqLhDnUCzrcbPD5eutzwFcPOhO+nR7s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 2312df1cafaf0..a540ebf0beadd 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.27"; + version = "1.1.28"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9f3f5d991023acbd93050cf53c4e863c6973ded7e236c69e99c8ff5c7bad41ef"; + sha256 = "sha256-SsDNMhTja2obakQmhnIqXYzESWA6qDPz8PQL2oNnBKM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 9a128d8134895..8c343b67430cc 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.21.1"; + version = "1.22.1"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "88d2db5cf9a135a7287dc45fdde6b96f9ca62c9567512a3bb3e20e322ce7deb2"; + sha256 = "sha256-S25AUmijO4cxB3lklc7D8vGx/+k1Ykzg+93/NtONOk0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index ea0696e294a07..44660e56f4268 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { sha256 = "sha256-Ag/w5HFXhS5KrIo62waEGCcUfyepTL50qQRCXY5i2Tw="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "msal-extensions~=0.3.0" "msal-extensions" + ''; + propagatedBuildInputs = [ azure-common azure-core diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix index 4c7233203bb92..4c61b55b666c9 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "3.0.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; + sha256 = "sha256-kmL1TtOH6wg9ja5m0yqN81ZHMZuQK9SYzcN29QoS0VQ="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 947bb4a28ba97..9629c6e7bba06 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -4,7 +4,6 @@ , msrest , msrestazure , azure-common -, azure-mgmt-nspkg , azure-mgmt-core }: @@ -22,7 +21,6 @@ buildPythonPackage rec { msrest msrestazure azure-common - azure-mgmt-nspkg azure-mgmt-core ]; diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix index dd7ed3b19b213..68d14c49ef6a8 100644 --- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-trafficmanager"; - version = "0.51.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fc8ae77022cfe52fda4379a2f31e0b857574d536e41291a7b569b5c0f4104186"; + sha256 = "sha256-R0F2HoA0bE7dTLPycTaOqYBj+ATQFeJFwv4EjtK1lqg="; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index b4e37c33fef9f..a0864529177fc 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.5.0"; + version = "7.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e97a069c6a73fce3042a5ef0d438cc564152cfbcc2e7db6f7a19fbd51bb3555b"; + sha256 = "sha256-uZGxQ1Vl6wpBCMW1+80/CBuqelLV02yXf1sNlNtCpHU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix index 0b4703e265161..d2b6d06c4cdbb 100644 --- a/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub +, pythonAtLeast , pythonOlder , python , substituteAll @@ -12,6 +13,8 @@ buildPythonPackage rec { pname = "backports-zoneinfo"; version = "0.2.1"; + disabled = pythonAtLeast "3.9"; + src = fetchFromGitHub { owner = "pganssle"; repo = "zoneinfo"; diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 30ca58fed319e..6d8dd8a3943b0 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; rev = "v${version}"; - sha256 = "0nwpd6zx2q2fc556ppz71ra6ad9z0d5bz8hcld64i91dcy0f0zs3"; + sha256 = "sha256-onNdOQL4i6GTcuCRel5yanJ2EQ5iYClp+imuBObXF2I="; }; propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ]; diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index a4430b655ce17..932d887754ec4 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "2.1.0"; + version = "2.2.1"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = pname; rev = "v${version}"; - sha256 = "1n677z6rvcny1vyfzwnvcmzbqp9m4kfpdjfvkf1q6310zr2ybp7m"; + sha256 = "sha256-p2JOZAJxQ/nPZ7vjnB24hA3kz3Io4D3HTP/8mqS/XCc="; }; propagatedBuildInputs = [ ecdsa pysha3 ]; diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index d57d4a6585bd4..358a4d163f3e2 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitbox02"; - version = "5.3.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "fe0e8aeb9b32fd7d76bb3e9838895973a74dfd532a8fb8ac174a1a60214aee26"; + sha256 = "sha256-wTateh3dJycFNozLaQbAzXF0avr2ofBdjlqqcOBLr/0="; }; propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index 71b032a34e49a..f3eb86c7bbb11 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -17,7 +17,7 @@ in buildPythonPackage rec { postPatch = '' substituteInPlace bitcoin/core/key.py --replace \ "ctypes.util.find_library('ssl') or 'libeay32'" \ - "'${openssl.out}/lib/libssl.${ext}'" + "'${lib.getLib openssl}/lib/libssl.${ext}'" ''; meta = { diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index ef599d89be2bc..e8b11a6311a4e 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -1,12 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, libev, python }: +{ lib, buildPythonPackage, fetchFromGitHub, libev, python }: buildPythonPackage rec { pname = "bjoern"; - version = "3.1.0"; + version = "3.2.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "01f3b601cf0ab0a9c7cb9c8f944ab7c738baaa6043ca82db20e9bd7a9be5767b"; + # tests are not published to pypi anymore + src = fetchFromGitHub { + owner = "jonashaag"; + repo = pname; + rev = version; + hash = "sha256-d7u/lEh2Zr5NYWYu4Zr7kgyeOIQuHQLYrZeiZMHbpio="; + fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index c2b03d35a21c3..592c36692d0fd 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.19.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "4db0f94e5761aea330b528e84a250027ffe996b5a94bf03e502600c9a5ad7a61"; + sha256 = "sha256-mg0JlpW/Yh1GgN1sc/atVH9qNEL72+gMSx2qHtvEkvw="; }; checkInputs = [ pytest mock glibcLocales ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index c6fdc8c9981c5..d1a104f6ae9b2 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.20.35"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.21.12"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "42dd9fcb9e033ab19c9dfaeaba745ef9d2db6efe4e9f1e1f547b3e3e0b1f4a82"; + sha256 = "sha256-yS7CCmcHIbWhvAE7MFqE2yt/nHFmU7MFbOfi+9KhgO8="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 6d5c11665c2cb..0c69de1c0e084 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.23.35"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.24.12"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "5be6ba6c5ea71c256da8a5023bf9c278847c4b90fdb40f2c4c3bdb21ca11ff28"; + sha256 = "sha256-AXSZmgSwouQkVxBgk6zps2+pR3KkQtm89gdQJj0dBz4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index f7e7dc7c390c1..7b8334ee36c1a 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "Bottleneck"; - version = "1.3.2"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "20179f0b66359792ea283b69aa16366419132f3b6cf3adadc0c48e2e8118e573"; + sha256 = "sha256-F2Sn9K1YxVhyPFQoR+s2erC7ttiApOXV7vMKDs5c7Oo="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index a3f0db80fafe8..dd521523179f7 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.9.9"; + version = "0.9.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Mc6R6ruUVhFs2D0CTJsAiM9aGOusS973hRS5r2kQsy4="; + sha256 = "sha256-Iw6jRhKAroqfWmbXhD7YTn4s8FrE/Iyd31EOP0tMdkQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix index 6db9523477522..ed13a3a3a7ba7 100644 --- a/pkgs/development/python-modules/bsblan/default.nix +++ b/pkgs/development/python-modules/bsblan/default.nix @@ -5,6 +5,8 @@ , aresponses , coverage , mypy +, poetry-core +, pydantic , pytest-asyncio , pytest-cov , pytest-mock @@ -17,22 +19,27 @@ buildPythonPackage rec { pname = "bsblan"; - version = "0.5.0"; - format = "setuptools"; + version = "0.5.5"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "liudger"; repo = "python-bsblan"; - rev = "v.${version}"; - sha256 = "1j41y2njnalcsp1vjqwl508yp3ki82lv8108ijz52hprhrq4fffb"; + rev = "v${version}"; + sha256 = "sha256-kq4cML7D9XC/QRPjGfaWcs0H78OOc2IXGua7qJpWYOQ="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp attrs cattrs + pydantic yarl ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 2836ee24c34a4..5190c1fa74f42 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -92,6 +92,9 @@ let preCheck = '' export LC_ALL="en_US.UTF-8" export PATH="$out/bin:$PATH" + + # remove testfile which is missing configuration file from sdist + rm buildbot/test/integration/test_graphql.py ''; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index a68d73e1242c5..18077ce78cc8e 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-can"; - version = "unstable-2022-01-11"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hardbyte"; repo = pname; - rev = "2e24af08326ecd69fba9f02fed7b9c26f233c92b"; - hash = "sha256-ZP5qtbjDtBZ2uT9DOSvSnfHyTlirr0oCEXhiLO1ydz0="; + rev = version; + hash = "sha256-/z7zBfVbO7x4UtzWOXolH2YrtYWgsvRLObWwz8sqOEc="; }; propagatedBuildInputs = [ @@ -56,6 +56,9 @@ buildPythonPackage rec { # Tests require access socket "BasicTestUdpMulticastBusIPv4" "BasicTestUdpMulticastBusIPv6" + # pytest.approx is not supported in a boolean context (since pytest7) + "test_pack_unpack" + "test_receive" ]; preCheck = '' diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index e3d694d28e3b3..94a357df98bee 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -7,6 +7,7 @@ , motor , msgpack , poetry-core +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml @@ -44,12 +45,17 @@ buildPythonPackage rec { immutables motor msgpack + pytest-xdist pytestCheckHook pyyaml tomlkit ujson ]; + pytestFlagsArray = [ + "--numprocesses $NIX_BUILD_CORES" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" \ @@ -75,6 +81,8 @@ buildPythonPackage rec { disabledTests = [ # orjson is not available as it requires Rust nightly features to compile its requirements "test_orjson" + # tomlkit is pinned to an older version and newer versions raise InvalidControlChar exception + "test_tomlkit" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index cf4813a9d9085..5039872b336f2 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.4.2"; + version = "5.4.2.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4oPnC1WgSf82TMXmSP3lh+TZsOh+SyZkxp5jkTXms7g="; + sha256 = "sha256-nPIdWWBLlSnXh3yOA0Ki66rhoH/o/1aD3HX+wVhHx5c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index e65e6f0d808ed..72a5d8db39d75 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.22.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1wrk5rhds6a69vbs1bda0zhwpvjhd8i20did6j3kydbas3zbr516"; + sha256 = "sha256-XIKFEPQKIV5s6sZ7LRnlTvsb3cF4KIaiVZ36cAN1AwA="; }; sourceRoot = "source/${pname}"; diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 762846ab34c2d..93499d0f56384 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.26.4"; + version = "1.26.6"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = version; - sha256 = "sha256-Xn8OqeEihLxZS9QZtrhzau2zLg9SzQrrigK70PoImhU="; + sha256 = "sha256-6Y5pJg6N/F97zvkyo4r6MoThi79kI53AvlHNOmOCpFA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 28e777e8fdd2c..30a620b5ad6f3 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 = "5.5.0"; + version = "5.6.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "04hsh1z2ngfslmvi8fdzfccssg6i0ziksil84j129f049m96wd51"; + sha256 = "sha256-mf4QASdvO7doV5pKAAEzaKJP66w29osBlbLrJuopUvA="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index e6db689a45c5f..49b36a5c6582c 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { passlib dnspython loguru + toml ]; checkInputs = [ diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 3e2e8b6e24f17..edab4e5caac56 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "click"; - version = "8.0.3"; + version = "8.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QQ6TKwUPXu13PEzalN51lxyJzbMVWnKggxE5p55ey1s="; + sha256 = "sha256-hFjXsSh8X7EoyQ4jOBz5nc3nS+r2x/9jhM6E1v4JCts="; }; postPatch = '' diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 563ad08381c4e..697296d9a200b 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -44,9 +44,15 @@ buildPythonPackage rec { pytest-mock ]; + disabledTests = [ + # uses pytest.approx which is not supported in a boolean context in pytest7 + "test_to_dec" + "test_roundtrip" + ]; + meta = with lib; { - description = "CSV on the Web"; - homepage = "https://github.com/cldf/csvw"; + description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al"; + homepage = "https://github.com/clld/clldutils"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 473f060769833..c0480f2fa714c 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "cma"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "CMA-ES"; repo = "pycma"; rev = "r${version}"; - sha256 = "1bal4kljxrdm6x5ppyi6i109714h0czdxfsna906dlfplrmq52bf"; + sha256 = "sha256-wLUD8HMJusUeCwwp37D/W7yJuJQcDfRwVGVKwBS6sR8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 5f262438fe954..8a7f9a5e1c8ac 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "cmd2"; - version = "2.3.3"; + version = "2.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "750d7eb04d55c3bc2a413e191bc177856f388102de47d11f2210a35266543640"; + sha256 = "sha256-CQkJq2yOzuQIE87HWeYd1ucMgiehqOlggvXysNOUvHc="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/collections-extended/default.nix b/pkgs/development/python-modules/collections-extended/default.nix index 52f73a5554a59..b51a458109c9b 100644 --- a/pkgs/development/python-modules/collections-extended/default.nix +++ b/pkgs/development/python-modules/collections-extended/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { pname = "collections-extended"; - version = "2.0.0"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mlenzen"; repo = pname; rev = "v${version}"; - sha256 = "sha256:1qcr1q49a134b122rpldjiim1fsl32gxs5fpj3232nyb05r68haz"; + sha256 = "sha256-cK13+CQUELKSiLpG747+C+RB5b6luu0mWLLXTT+uGH4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 7a2416728c8e1..ff642c8930e5b 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "commoncode"; version = "30.0.0"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -29,6 +29,11 @@ buildPythonPackage rec { sha256 = "sha256-6SeU4u6pfDuGCgCYAO5fdbWBxW9XN3WvM8j6DwUlFwM="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "intbitset >= 2.3.0, < 3.0" "intbitset >= 2.3.0" + ''; + dontConfigure = true; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 8ae44476eff40..ce6e0a65b3429 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "construct"; - version = "2.10.67"; + version = "2.10.68"; disabled = pythonOlder "3.6"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1nciwim745qk41l1ck4chx3vxpfr6cq4k3a4i7vfnnrd3s6szzsw"; + sha256 = "sha256-bp/YyRFP0rrBHPyhiqnn6o1iC5l61oedShZ2phGeqaw="; }; # not an explicit dependency, but it's imported by an entrypoint diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index cc26142d362b1..cb47546055ece 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "convertdate"; - version = "2.3.2"; + version = "2.4.0"; disabled = isPy27; # Tests are not available in the PyPI tarball so use GitHub instead. @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "0k7j59sbqwyi72vcjx5vsh3qb6hxfnkfjkd2i6f6lckdr1bkh7fz"; + sha256 = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index f1930b88fb8c4..8019fc9496655 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "6.2"; + version = "6.3.2"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"; + sha256 = "sha256-A+KngmCGuR7zRf8YdC7p/Eemg5zNUXBh74+hl25lLOk="; }; # No tests in archive diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 52c1bc4067fbc..987e84ffcee2f 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, flit-core , pythonOlder , fetchPypi , tinycss2 @@ -8,18 +9,23 @@ buildPythonPackage rec { pname = "cssselect2"; - version = "0.4.1"; + version = "0.5.0"; + format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8"; + sha256 = "sha256-2Yp7vdjrxGCTJ5GV1mmjNZvVoj+QwZ6CwZ2e7vMz5hc="; }; postPatch = '' sed -i '/^addopts/d' pyproject.toml ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ tinycss2 ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 90e2608069c40..fb02b0d1ef144 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.9"; + version = "6.10"; src = fetchPypi { inherit pname version; - sha256 = "673aa3199af2ef87fc03a43a30e5d78b27ced2cedde925da89c55b5657da267b"; + sha256 = "sha256-5bcb9XuYgawUL76+riyLDTKUtW9uSKtkAyMh47Giuic="; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 26546c3f7cb01..af638894831d9 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "1.3.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - hash = "sha256-/1kWvhTUS0JT0RwodiivJSUiWIDwQyXxdjF/KUlCNds="; + hash = "sha256-S1bcUCHe4UYJuSHI8LMQZ/reS6YAE0hxrpw+QweFm/8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 7af0eca747e81..ffdca65a606a0 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2022.02.0"; + version = "2022.02.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-tDqpIS8j6a16YbJak+P1GkCEZvJyheWV5vkUrkhScRY="; + hash = "sha256-A8ktvfpow/QKAEEt9SUnkTqYFJCrV1mgnuDIP3gdyrE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index c15e673fa3ed7..7d32650302f4d 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, hatchling , decorator , requests , typing ? null @@ -17,17 +18,22 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.43.0"; + version = "0.44.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1f2123083d9e1add6f238c62714b76ac2fc134d7d1c435cd82b976487b191b96"; + sha256 = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; }; postPatch = '' find . -name '*.pyc' -exec rm {} \; ''; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ decorator requests ] ++ lib.optional (pythonOlder "3.5") typing ++ lib.optional (pythonOlder "3.0") configparser; diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index ab5e929818c6e..baf27639fd4a7 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.17.0"; + version = "1.18.3"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "0bsk3jldvcxak64dhlxkqax7mf83z6qpwfgfk32rni1gpnz5pqbd"; + sha256 = "sha256-2x6DpsDcVF2O5iJKeMEGw/aJwZPc7gSGaK2947c3B6s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 9008270fc79e3..004e47a60b5cc 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -44,15 +44,9 @@ buildPythonPackage rec { LLVM = llvm; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; - pytestFlagsArray = let - # ini file (not included in tarball) required to change python_files setting, - pytestIni = writeText "pytest.ini" '' - [pytest] - python_files = test_*.py test-*.py - ''; - in [ - "-c ${pytestIni}" - ]; + # test suite is very cpu intensive, only run small subset to ensure package is working as expected + pytestFlagsArray = [ "tests/test-sets.py" ]; + disabledTests = [ # skip tests which are irrelevant to our installation or use way too much memory "test_xfunction_paths" diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 67f5347e1e7e2..2601eedc2fa27 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -12,18 +12,21 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "5.6.0"; + version = "5.7.0"; format = "setuptools"; # pypi source does not contain all fixtures required for tests src = fetchFromGitHub { owner = "seperman"; repo = "deepdiff"; - rev = version; - sha256 = "sha256-ysaIeVefsTX7ZubOXaEzeS1kMyBp4/w3SHNFxsGVhzY="; + # 5.7.0 release not tagged https://github.com/seperman/deepdiff/issues/300 + rev = "f2ffdb83b2993f4f0bb7e854620f0acd0bf6339e"; + hash = "sha256-0UBx7sH2iMrLVl5FtHNTwoecLHi8GbInn75G3FSg4gk="; }; postPatch = '' + substituteInPlace requirements.txt \ + --replace "ordered-set==4.0.2" "ordered-set" substituteInPlace tests/test_command.py \ --replace '/tmp/' "$TMPDIR/" ''; diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix index ef19b9a913b01..e9227891e0457 100644 --- a/pkgs/development/python-modules/detect-secrets/default.nix +++ b/pkgs/development/python-modules/detect-secrets/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "detect-secrets"; - version = "1.1.0"; + version = "1.2.0"; disabled = isPy27; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dG2YaWXAMINxBGKNMlVfGTR9QHdnepiZmN+G88X4Wak="; + hash = "sha256-4VcV06iaL3NAj7qF8RyfWV1zgrt928AQfjGeuO2Pbjk="; leaveDotGit = true; }; diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index 5d4f0871bf78f..34004769b1fdf 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -34,11 +34,18 @@ buildPythonPackage rec { pytest-mock ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. + "-W ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests = [ # Test for Windows32 "test_print_subprocess" # sensitive to timing "test_multiple_not_verbose" + # sensitive to interpreter output + "test_simple_vars" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 5414f7522dbea..3a370d3323b95 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -52,6 +52,8 @@ buildPythonPackage rec { "file_does_not_exist" # AssertionError: assert '.c { color:... "test_style_defs" + # uses pytest.approx in a boolean context, which is unsupported since pytest7 + "test_percent_covered" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index ee86418a66514..2055c9de13e39 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.2.0"; + version = "2022.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - hash = "sha256-Gi9u7JczpnAEg53E7N5tXBfAeWZaLBVzRU3SpbU3bZU="; + hash = "sha256-+2KnWvjvM7vhqoCmjAGjOpPBzVozLdAXq0SVW/fs9ls="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index bf8675af941d3..deee452ae1b4a 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distro"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424"; + sha256 = "sha256-FRrsz2DCFkApMrUuQO5HepOfjViJiSc3igKrvoUsHDk="; }; # tests are very targeted at individual linux distributions diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix new file mode 100644 index 0000000000000..66eef9d472886 --- /dev/null +++ b/pkgs/development/python-modules/django-appconf/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, django +, six +, python +}: + +buildPythonPackage rec { + pname = "django-appconf"; + version = "1.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "django-compressor"; + repo = "django-appconf"; + rev = "v${version}"; + hash = "sha256-nS4Hwp/NYg1XGvZO1tiE9mzJA7WFifyvgAjyp3YpqS4="; + }; + + propagatedBuildInputs = [ + django + ]; + + preCheck = '' + # prove we're running tests against installed package, not build dir + rm -r appconf + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m django test --settings=tests.test_settings + runHook postCheck + ''; + + meta = with lib; { + description = "A helper class for handling configuration defaults of packaged apps gracefully"; + homepage = "https://django-appconf.readthedocs.org/"; + license = licenses.bsd2; + maintainers = with maintainers; [ desiderius ]; + }; +} diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 713e7214cfbc6..f590aca527f4f 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -2,9 +2,7 @@ numpy, django_colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: -if lib.versionOlder django.version "2.0" -then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2." -else + buildPythonPackage rec { version = "0.8.1"; pname = "django-raster"; diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 78c807903c4ef..db7d36c899339 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, django, django_appconf }: +{ lib, buildPythonPackage, fetchPypi, django, django-appconf }: buildPythonPackage rec { pname = "django-statici18n"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "dbcdac190d93e0b4eabcab8875c8eb68795eceb442f926843ec5cbe1432fe628"; }; - propagatedBuildInputs = [ django django_appconf ]; + propagatedBuildInputs = [ django django-appconf ]; # pypi package does not contains test harness # source tarball requires setting up a config diff --git a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch deleted file mode 100644 index da154554d1b37..0000000000000 --- a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py ---- a/django/contrib/gis/gdal/libgdal.py -+++ b/django/contrib/gis/gdal/libgdal.py -@@ -17,7 +17,7 @@ try: - lib_path = settings.GDAL_LIBRARY_PATH - except (AttributeError, EnvironmentError, - ImportError, ImproperlyConfigured): -- lib_path = None -+ lib_path = "@gdal@/lib/libgdal@extension@" - - if lib_path: - lib_names = None -diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py ---- a/django/contrib/gis/geos/libgeos.py -+++ b/django/contrib/gis/geos/libgeos.py -@@ -26,7 +26,7 @@ try: - lib_path = settings.GEOS_LIBRARY_PATH - except (AttributeError, EnvironmentError, - ImportError, ImproperlyConfigured): -- lib_path = None -+ lib_path = "@geos@/lib/libgeos_c@extension@" - - # Setting the appropriate names for the GEOS-C library. - if lib_path: diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix deleted file mode 100644 index 727bf304fdb2b..0000000000000 --- a/pkgs/development/python-modules/django/2.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll, - isPy3k, - geos, gdal, pytz, sqlparse, - withGdal ? false -}: - -buildPythonPackage rec { - pname = "django"; - version = "2.2.27"; - - disabled = !isPy3k; - - src = fetchPypi { - pname = "Django"; - inherit version; - sha256 = "sha256-HuNwRrC/K2HoOzoB0GcyNRbsO28rF81JsTJt1LqdyRM="; - }; - - patches = lib.optional withGdal - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ; - - propagatedBuildInputs = [ pytz sqlparse ]; - - # too complicated to setup - doCheck = false; - - meta = with lib; { - description = "A high-level Python Web framework"; - homepage = "https://www.djangoproject.com/"; - license = licenses.bsd3; - maintainers = with maintainers; [ georgewhewell ]; - }; -} diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix deleted file mode 100644 index 5da9ed0ca26da..0000000000000 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: -buildPythonPackage rec { - pname = "django-appconf"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "django-compressor"; - repo = "django-appconf"; - rev = version; - sha256 = "06hwbz7362y0la9np3df25mms235fcqgpd2vn0mnf8dri9spzy1h"; - }; - - propagatedBuildInputs = [ six django ]; - - patches = [ - (fetchpatch { - name = "backport_django_2_2.patch"; - url = "https://github.com/django-compressor/django-appconf/commit/1526a842ee084b791aa66c931b3822091a442853.patch"; - sha256 = "1vl2s6vlf15089s8p4c3g4d5iqm8jva66bdw683r8440f80ixgmw"; - }) - ]; - - checkPhase = '' - # prove we're running tests against installed package, not build dir - rm -r appconf - python -m django test --settings="tests.test_settings" - ''; - - meta = with lib; { - description = "A helper class for handling configuration defaults of packaged apps gracefully"; - homepage = "https://django-appconf.readthedocs.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ desiderius ]; - }; -} diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index a8204eab5fad2..82684b52374ac 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - rcssmin, rjsmin, django_appconf }: + rcssmin, rjsmin, django-appconf }: buildPythonPackage rec { pname = "django_compressor"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # requires django-sekizai, which we don't have packaged yet doCheck = false; - propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; + propagatedBuildInputs = [ rcssmin rjsmin django-appconf ]; meta = with lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index 3f717b0fb5ce1..88bbdfdeddb99 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-contrib-comments"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d82f1d04690550df026553053903deec0c52dc54212e1b79241b08f0355cff2c"; + sha256 = "sha256-SN4A8VZ34BaiFq7/IF1uAOQ5HJpXAhNsZBGcRytzVto="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 1bf4d6b4dab55..f6bc72dc226a5 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "4.0.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XTO6lE2/GccDDJ5w43MSSK40Nozyr+3hDg0I+/ieb4w="; + sha256 = "sha256-C63jw5k4dFEIfwxng14NPRhtdn3mpcW6U6iOr8Pyccg="; }; # tests assume the availability of a mysql/postgresql database diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 14ceebf0a19b3..6f16808be5dbf 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = "v${version}"; - sha256 = "1mdqjcka0m1div63ngba8w8z94id4c1h8xqmnq1xpmgkc79224wa"; + sha256 = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index c7c66fceaa7cd..95b7adc474af0 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -8,6 +8,7 @@ , cloudpickle , pyinotify , macfsevents +, toml }: buildPythonPackage rec { @@ -21,8 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-OIER+Kals7RGIM7rKH0FhZJ8hdDW0/h5DTT7tFwM9sM="; }; - propagatedBuildInputs = [ cloudpickle ] - ++ lib.optional stdenv.isLinux pyinotify + propagatedBuildInputs = [ + cloudpickle + toml + ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; # hangs on darwin diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index dafbcfc2f5cd0..3ee79ae448049 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "dynalite-devices"; - version = "0.1.46"; + version = "0.46"; src = fetchFromGitHub { owner = "ziv1234"; repo = "python-dynalite-devices"; - rev = "v0.46"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 + rev = "v${version}"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 hash = "sha256-Fju2JpFkQBCbOln7r3L+crv82TI2SkdPJ1oaK7PEifo="; }; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index c98a8b572d454..97707e0e9fd43 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.3"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "115rzzr0hx4af4m6krf7dxn8851n4l8jfxahjzjc2r0zq2m8v57v"; + sha256 = "sha256-iFiYMCpXqrlIlz6LXTKkIpOSufstmGqx1P/VkOW6kOw="; }; # No tests diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index 18b8d671c98af..126f9a315001a 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "einops"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "arogozhnikov"; repo = pname; rev = "v${version}"; - sha256 = "0ix094cfh6w4bvx6ymp5dpm35y9nkaibcn1y50g6kwdp4f0473y8"; + sha256 = "sha256-/NnBm5qnTY0BngEj5i5hIb0VCInBZiSiVkIGLhCkffQ="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix index 5b0cb293c0a3e..c98dcd4053449 100644 --- a/pkgs/development/python-modules/elegy/default.nix +++ b/pkgs/development/python-modules/elegy/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "elegy"; - version = "0.8.4"; + version = "0.8.5"; format = "pyproject"; src = fetchFromGitHub { owner = "poets-ai"; repo = pname; rev = version; - sha256 = "11w8lgl31b52w2qri8j8cgzd30sn8i3769g8nkkshvgkjgca9r4g"; + sha256 = "sha256-2qBHiNmdO53rD9/tudnf1z4+6a5ZHH/y2wB4v3/Tqdg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index a26d6ede8904f..1223f3f911dec 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -1,31 +1,36 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi +, flit-core , configparser -, pytest -, isPy3k +, pytestCheckHook }: buildPythonPackage rec { pname = "entrypoints"; - version = "0.3"; + version = "0.4"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"; + sha256 = "sha256-twbt2qkhihnrzWe1aBjwW7J1ibHKno15e3Sv+tTMrNQ="; }; - checkInputs = [ pytest ]; - - propagatedBuildInputs = lib.optional (!isPy3k) configparser; + nativeBuildInputs = [ + flit-core + ]; - checkPhase = '' - py.test tests - ''; + checkInputs = [ + pytestCheckHook + ]; - meta = { + meta = with lib; { description = "Discover and load entry points from installed packages"; homepage = "https://github.com/takluyver/entrypoints"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 048edf64d38f8..728339621f897 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "11.3.0"; + version = "13.3.0"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-rb5WfmTaahCX/qyraZAA4a0W4Xplkqjwrh7gt/vxmIc="; + hash = "sha256-YYsUDHdHV4bb46VAmtU1Ict2dGq3pcd7mcZj8+8bG8I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 0364022fa2864..b1281c686d87d 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -1,47 +1,32 @@ { lib , buildPythonPackage -, fetchPypi -, six -, monotonic +, fetchFromGitHub , diskcache -, more-itertools -, testtools -, isPy3k -, nose -, futures ? null +, pytestCheckHook }: buildPythonPackage rec { pname = "fasteners"; - version = "0.16.3"; + version = "0.17.3"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "b1ab4e5adfbc28681ce44b3024421c4f567e705cc3963c732bf1cba3348307de"; + src = fetchFromGitHub { + owner = "harlowja"; + repo = pname; + rev = version; + hash = "sha256-FVhHp8BZ/wQQyr5AcuDo94LlflixhjZ0SnheSdHuDVQ="; }; - propagatedBuildInputs = [ - six - monotonic - ]; - checkInputs = [ diskcache - more-itertools - testtools - nose - ] ++ lib.optionals (!isPy3k) [ - futures + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - meta = with lib; { description = "A python package that provides useful locks"; homepage = "https://github.com/harlowja/fasteners"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 8eaed65ca73c2..16379ef85e1ef 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.4.2"; + version = "3.6.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80"; + sha256 = "sha256-nNVAqTUuQyxyRqSP5OhxKxCssd8q0fMOjAcLgq4f7YU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix new file mode 100644 index 0000000000000..ad35f379b906b --- /dev/null +++ b/pkgs/development/python-modules/findpython/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build time +, pdm-pep517 + +# runtime +, packaging + +# tests +, pytestCheckHook +}: + +let + pname = "findpython"; + version = "0.1.3"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tVpBa5/PLShyG/vqHOsqbLZ6APmexLlKdtoix6IAKHA="; + }; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + packaging + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "findpython" + ]; + + meta = with lib; { + description = "A utility to find python versions on your system"; + homepage = "https://github.com/frostming/findpython"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index fff330946d168..26e5feca03e39 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,25 +1,43 @@ -{ lib, fetchPypi, buildPythonPackage, flask +{ lib +, fetchPypi +, buildPythonPackage +, setuptools-scm +, flask , brotli +, pytestCheckHook }: buildPythonPackage rec { - version = "1.10.1"; + version = "1.11"; pname = "Flask-Compress"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680"; + sha256 = "sha256-9WnzLERtayXKjjR9UAOgUxgR73MmeABbADb8HJ6xwhw="; }; - postPatch = '' - sed -i -e 's/use_scm_version=.*/version="${version}",/' setup.py - ''; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ flask brotli ]; + propagatedBuildInputs = [ + flask + brotli + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flask_compress" + ]; meta = with lib; { description = "Compress responses in your Flask app with gzip"; - homepage = "https://libwilliam.github.io/flask-compress/"; + homepage = "https://github.com/colour-science/flask-compress"; + changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index ddf5aa05c493b..e88556c07d020 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "4.1.2"; + version = "4.1.3"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "16ws5n08vm7wsa2f7lrkxvc7jl3ah1xfylhhyzb4vvqmlk7x9hw8"; + sha256 = "sha256-mW2NKGeJpyR4Ri7m+KE3ElSg3E+P7qbzNTTCo3cskc8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index cf1079166b085..e7464a38701fd 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { - version = "2.0.2"; + version = "2.0.3"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2"; + sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 50f5e87a29f49..84f2edb721020 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.29.0"; + version = "4.29.1"; # Bump to 3.7 when https://github.com/fonttools/fonttools/pull/2417 is merged disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "LnkpTEpZbbRAyqGPJXdfpHjh4t7n6LkjZGLhirVNl7E="; + sha256 = "sha256-xviNGFcb1wj5WuA6UxHpw3BkpdjSJL3fbsBytJacp8w="; }; # all dependencies are optional, but diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 0ab3778f55cf4..6915ba8d050c9 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.4.14"; + version = "2.4.15"; src = fetchPypi { inherit pname version; - sha256 = "9555dc2bc58c58cac03478ac7e9f622d29fe2d20a4384c24c90ab50de2c7b36c"; + sha256 = "sha256-sJ0CwxH0rdHm4rdXJMRQ6vz+7MkXV5IkyorSHazQoYI="; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 5ea93ec179ecb..d214cb4f0a437 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ftfy"; - version = "6.0.3"; + version = "6.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ba71121a9c8d7790d3e833c6c1021143f3e5c4118293ec3afb5d43ed9ca8e72b"; + sha256 = "sha256-v8IBn4T82FFBkVIyCmN1YEoPFFnCgbWxmbLNDS5yf48="; }; propagatedBuildInputs = [ @@ -29,6 +29,12 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; + disabledTestPaths = [ + # Calls poetry and fails to match output exactly + "tests/test_cli.py" + ]; + + meta = with lib; { description = "Given Unicode text, make its representation consistent and possibly less broken"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index c476960bbf836..be6abbd836443 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "Genshi"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "c12d6c2abf7df0ec661d9ff2e197522eae846e43dc58abd5a36443d05bc41135"; + sha256 = "sha256-NKLOi4DoQ/Ygxbe35ZqqNip2zpdkpvEQMig+2UWMOlk="; }; # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase) diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 691af2eda8497..9d1fdc07d9017 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 = "5.0.1"; + version = "5.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682"; + sha256 = "sha256-kNGTb6mA2XBaljYvpOWaKFEks3NigsiPgmdIgSMKTiU="; }; nativeBuildInputs = [ setuptools pytest-runner ]; diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 1f5c983e14f38..67e1868fb8b1a 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "github3.py"; - version = "3.0.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "a9134cb9efd334b1644ad7c5ee3ff3ff488317c4549ffc0e8d82e4d63383a1a4"; + sha256 = "sha256-Cbcr4Ul9NGsJaM3oNgoNavedwgbQFJpjzT7IbGXDd8w="; }; checkInputs = [ betamax pytest betamax-matchers ] diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 772f45411d397..493bda2f9d5c6 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.35.0"; + version = "2.39.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "038b12979ea86ef0e33962bd33f955c337bc28f0471522bd27a801d52bfb4ae2"; + sha256 = "sha256-QBFpIV7K+1r7aD0/4OQ8BZ62Jccf6hkp8WQD3acqLcE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 1d23af5a3d46c..39aa54a4832d0 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.6"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno="; + sha256 = "sha256-BsTOs6sqk7hbiXa76Gy7gq4dHALS3tPP0IR6i2lVJjs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 55380e3081a7b..629ffa3a47d2c 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.54.0"; + version = "1.55.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pAMdbsbCsbbcPgvn4Qob1y+wsYsH75vntR8sEATOJDc="; + sha256 = "sha256-U+sxMGRzj0XVrGNBVa4gjhIcljZZYnuQ38th71FMA+E="; }; propagatedBuildInputs = [ grpc protobuf ]; diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index 08e27c1948734..d546046192523 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "graphql-relay"; - version = "3.1.0"; + version = "3.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cNWn7lmV6nwqmjflEidmOxpGTx9A6Y/d6VC+VBXf4LQ="; + sha256 = "sha256-En9AkT8Ry4R0Uu95STEmGq47Ii6q+Xb3yEMCmFNOVNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 10e7190d1fde7..1a246461e5f7d 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "graspologic"; - version = "0.3.1"; + version = "1.0.0"; disabled = isPy27; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "v${version}"; - sha256 = "07dmfb1aplha01d22b41js7634dac4v28pv1l3bzssqhi4yyds7h"; + sha256 = "sha256-mzJ3eFo77gnOh/Vs9u68yFDZW3ilXtcCCwKahKyRRmc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index d500c64532133..f703820a4f5c5 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.7.2"; + version = "1.7.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "1xdcnm66b07m7chf04pp58p3khvy547hns1fw1xffd4n51kl42pp"; + sha256 = "sha256-/1YOnG6sCP8G8J3K2/RycTC95rXW9M+U3Mjz4GCt13s="; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 1616343f8b436..aff7d1a297816 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "gym"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "openai"; repo = pname; - rev = "v${version}"; - sha256 = "12b545xz0r2g4z5r7f8amxl7nm0lqymkzwcwhg1bni9h0sxwpv6c"; + rev = version; + sha256 = "sha256-JbPWLuQGo+fErUlCKKpMwWdu0KvXBDuH2MeAHdJCTgM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index f3d37dacfa3c7..be4802566f75d 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "h11"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "0hk0nll6qazsambp3kl8cxxsbl4gv5y9252qadyk0jky0sv2q8j7"; + sha256 = "sha256-cIE8ETUIeiSKTTjMDhoBgf+rIYgUGpPq9WeUDDlX/wY="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index e7732e1f6a426..edf19d0e190ff 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { sed -i 's/"acme.*"/"acme"/' setup.py substituteInPlace setup.py \ --replace "cryptography>=2.8,<4.0" "cryptography" \ - --replace "snitun==" "snitun>=" + --replace "snitun==" "snitun>=" \ + --replace "pycognito==2022.01.0" "pycognito" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 6a0a3793d87b2..b710e5fb2e263 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.3.1"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw="; + sha256 = "sha256-r9EBuaKxc7Vcdfk8zoDpIi2i6yIGc7soSWx+RjG+SZo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix new file mode 100644 index 0000000000000..09cbdead671a3 --- /dev/null +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# runtime +, editables +, importlib-metadata # < 3.8 +, packaging +, pathspec +, pluggy +, tomli + +# tests +, build +, python +, requests +, toml +, virtualenv +}: + +let + pname = "hatchling"; + version = "0.20.1"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-l1VRce5H3CSAwZBeuxRyy7bNpOM6zX5s2L1/DXPo/Bg="; + }; + + # listed in backend/src/hatchling/ouroboros.py + propagatedBuildInputs = [ + editables + packaging + pathspec + pluggy + tomli + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + pythonImportsCheck = [ + "hatchling" + "hatchling.build" + ]; + + # tries to fetch packages from the internet + doCheck = false; + + # listed in /backend/tests/downstream/requirements.txt + checkInputs = [ + build + packaging + requests + toml + virtualenv + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} tests/downstream/integrate.py + runHook postCheck + ''; + + meta = with lib; { + description = "Modern, extensible Python build backend"; + homepage = "https://ofek.dev/hatch/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ofek ]; + }; +} diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index eccdcdaed422a..be3edd3721800 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "hg-git"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "27e6d7686a1548d4632dcc977f2ff3ce2e42d80735339b1f3b389b7481260cc4"; + sha256 = "sha256-guJlIm9HPTgKw5cg/s7rFST/crAXfPxGYGeZxEJ+hcw="; }; propagatedBuildInputs = [ dulwich mercurial ]; diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 17f5126367bf4..bdeff30b76129 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - sha256 = "2a289cf28b31be59fa8ba5d3253d4a2a992401d45a8cdc221ae484fbf390c0d7"; + sha256 = "sha256-a0snIPJ6912pNnq02Q3LAPONozFo322Rf57F3mZw9uE="; }; buildInputs = [ setuptools-scm cython ]; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 79d979b10a97c..7f028c478fc5c 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -12,6 +12,7 @@ , pytest-cov , pytest-httpbin , sniffio +, socksio , trio , trustme , uvicorn @@ -19,22 +20,28 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.14.4"; + version = "0.14.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "19zsg8ijw0s1722ka67mjxx5z07lx9jq36z97l1fa6z1129wq240"; + sha256 = "sha256-h+3MfP1p/ifN0mF/xxrOKPTjD4Q7WzRh94YO4DYSuXE="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "h11>=0.11,<0.13" "h11>=0.11,<0.14" + ''; + propagatedBuildInputs = [ anyio certifi h11 h2 sniffio + socksio ]; checkInputs = [ diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 8f74099a96af9..852bcdff86121 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -52,6 +52,10 @@ buildPythonPackage rec { # ValueError: Unable to load PEM file. # https://github.com/httplib2/httplib2/issues/192#issuecomment-993165140 "test_client_cert_password_verified" + + # improper pytest marking + "test_head_301" + "test_303" ] ++ lib.optionals stdenv.isDarwin [ # fails with "ConnectionResetError: [Errno 54] Connection reset by peer" "test_connection_close" diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index 0a5b510b0ad9c..963a9ff5ebfe2 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.3.0"; + version = "0.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3f9b4856d46ba1f0c850f4e84b264a9a8b4460acb20e865ec00978ad9fbaa4cf"; + sha256 = "sha256-LJqTDDeLPRXWtpX7levP+BpzlbT5d1xPEKB2vrCywf8="; }; # tests are not included in pypi tarball diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index d479cc1f13ced..dbf8d1745c0e5 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.21.3"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - sha256 = "01069b0kj6vnb26xazlz06rj4yncy5nkq76pajvzx0pmpjkniiz9"; + sha256 = "sha256-hQmQodGpVG23IZSsWV7rB1iB6QAudDao/8YshIgpmas="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index cf0b27c6c5b3a..3bbc8ad2669e9 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.1.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "v${version}"; - sha256 = "1pmi76vinwwn0bcxy5hj8pxhzqxdbzp0y3hsd631yyys01s0n6xd"; + sha256 = "sha256-rrkubNy60e/1VcGacYQang4yWxUzIBGySxZyq6G1arw="; }; nativeBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index d0b2464608b94..fa13cdab0c23a 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "3.13.1"; + version = "4.0.0"; pname = "humanize"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jmoiron"; repo = pname; rev = version; - sha256 = "sha256-lgGBvYb3ciqETBOR31gxQVD7YyopTtmr++nCwvm63Zs="; + sha256 = "sha256-v4OdZmUI2LCick4qCSGOHJ7jtWybwKTeTeIcly+QQQQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 89aac153172d7..c928a13950cac 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.35.0"; + version = "6.38.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "08wph7q3c08480ma2p7m7mamy0g7g7r5jqpwdyhdga4cfg734527"; + sha256 = "sha256-JLAM9gBf/Lh+UO7audy6V2jEPg5Cn4DR7moQV7VBwGc="; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 61966bc7de76b..b09d5bd565ff1 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hyppo"; - version = "0.2.2"; + version = "0.3.2"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "neurodata"; repo = pname; rev = "v${version}"; - sha256 = "1wrzrppyjq0pc03bn6qcslxzcnwn7fr2z5lm71gfpli5k05i26nr"; + sha256 = "sha256-DQ5DrQrFBJ3dnGAjD1c/7GCJeR3g+aL2poR4hwOvmPA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 98495932fdaf1..9c449c69b7700 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,26 +1,36 @@ { lib +, stdenv , buildPythonPackage , isPy27 , fetchPypi -, fetchpatch +, substituteAll , imageio-ffmpeg , numpy , pillow , psutil , pytestCheckHook , tifffile +, fsspec +, libGL }: buildPythonPackage rec { pname = "imageio"; - version = "2.14.1"; + version = "2.16.1"; disabled = isPy27; src = fetchPypi { - sha256 = "sha256-cJwY+ACYHkKGq+S9hrbJtbtuKFtrkztboJYu+OeZQFg="; + sha256 = "sha256-fxI8sjp3rFq+jtTnrWpggxqC3ixdEjRj3PHUJ4xHedI="; inherit pname version; }; + patches = [ + (substituteAll { + src = ./libgl-path.patch; + libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + propagatedBuildInputs = [ imageio-ffmpeg numpy @@ -28,34 +38,33 @@ buildPythonPackage rec { ]; checkInputs = [ + fsspec psutil pytestCheckHook tifffile ]; + pytestFlagsArray = [ + "-m 'not needs_internet'" + ]; + preCheck = '' export IMAGEIO_USERDIR="$TMP" - export IMAGEIO_NO_INTERNET="true" - export HOME="$(mktemp -d)" + export HOME=$TMPDIR ''; - disabledTests = [ - # tries to pull remote resources, even with IMAGEIO_NO_INTERNET - "test_png_remote" - # needs git history - "test_mvolread_out_of_bytes" - "test_imiter" - "test_memory_size" - "test_legacy_write_empty" - ]; - disabledTestPaths = [ + # tries to fetch fixtures over the network + "tests/test_freeimage.py" "tests/test_pillow.py" + "tests/test_spe.py" + "tests/test_swf.py" ]; meta = with lib; { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; homepage = "http://imageio.github.io/"; license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/imageio/libgl-path.patch b/pkgs/development/python-modules/imageio/libgl-path.patch new file mode 100644 index 0000000000000..f2a2bbfa093d2 --- /dev/null +++ b/pkgs/development/python-modules/imageio/libgl-path.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_core.py b/tests/test_core.py +index 2cdbb3a..032974c 100644 +--- a/tests/test_core.py ++++ b/tests/test_core.py +@@ -129,7 +129,7 @@ def test_findlib2(): + open(os.path.join(fi_dir, "notalib.test.so"), "wb") + + # Loading libs +- gllib = ctypes.util.find_library("GL") ++ gllib = "@libgl@" + core.load_lib([gllib], []) + # Fail + raises(ValueError, core.load_lib, [], []) # Nothing given diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 3917742a55a90..5a8ef5957a064 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.11.0"; + version = "4.11.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-nl5VO7uhhDy0oAgjAUuQdha+Ru5QPSuboAHSFKjaIY8="; + hash = "sha256-s2/6kl/jE5svb/EdaSX/1Pp7xHhwFl46wmCse0+R5qw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index db98be8276c59..798bdbbd25195 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -1,36 +1,23 @@ { lib , fetchPypi , buildPythonPackage -, six -, nose +, pytestCheckHook }: + buildPythonPackage rec { pname = "intbitset"; - version = "2.4.1"; + version = "3.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "44bca80b8cc702d5a56f0686f2bb5e028ab4d0c2c1761941589d46b7fa2c701c"; + sha256 = "sha256-tDG3CAlTZvz9Pi2pLq0TEPhl3DyYuWQS1N6VNNNokEE="; }; - patches = [ - # fixes compilation on aarch64 and determinism (uses -march=core2 and - # -mtune=native) - ./remove-impure-tuning.patch - ]; - - propagatedBuildInputs = [ - six - ]; - checkInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - pythonImportsCheck = [ "intbitset" ]; diff --git a/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch b/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch deleted file mode 100644 index 4747b87b806c9..0000000000000 --- a/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2ea60bdf4d7b0344fc6ff5c97c675842fedccfa8 Mon Sep 17 00:00:00 2001 -From: Cole Helbling -Date: Fri, 23 Apr 2021 09:02:22 -0700 -Subject: [PATCH] setup.py: remove impure tuning - ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 7840022..3922aa5 100644 ---- a/setup.py -+++ b/setup.py -@@ -48,7 +48,6 @@ setup( - ext_modules=[ - Extension("intbitset", - ["intbitset/intbitset.c", "intbitset/intbitset_impl.c"], -- extra_compile_args=['-O3', '-march=core2', '-mtune=native'] - # For debug -> '-ftree-vectorizer-verbose=2' - ) - ], --- -2.30.1 - diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index 48260398f4907..5e658953fc80e 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,14 +15,15 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.1.4"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "e7b46039311bcbba40224d85eb07eefe1488bd8a6faa893a180e15e65c48b7f5"; + pname = "intensity_normalization"; + inherit version; + sha256 = "sha256-0tc21NBj3Cajklk9mWbKfBzbSwjUrBWs/SlakjEHC1U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 0827e611679e8..746babe0de4de 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.7.0"; + version = "6.9.1"; src = fetchPypi { inherit pname version; - sha256 = "d82b904fdc2fd8c7b1fbe0fa481c68a11b4cd4c8ef07e6517da1f10cc3114d24"; + sha256 = "sha256-+VBwot/TFH+KsZ8Y7kZzMxCBN1hZN0XgfsGPsItAnx0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 3644442f7adaa..08b41e629787d 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.8.7"; + version = "0.8.8"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "11c3d01f0555f855c51a960964e3ab4dff38e6ccd1a4695205fe250341a9eb99"; + sha256 = "sha256-hkaK6q6MCigAfQx/bbuF8rbLmAUWfojU2qdSlWIAkVk="; }; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index c1c0b049dc8c8..24fd28a16f7ca 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.0.1"; + version = "8.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "0x19sj4dlq7r4p1mqnpx9245r8dwvpjwd8n34snfm37a452lsmmb"; + sha256 = "sha256-QsI+kLLequYxJmiF3hZWpRehZz1+HbV+jrOku2zVzhs="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index 35cdf8836a89e..c2050c6f79c07 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "itsdangerous"; - version = "2.0.1"; + version = "2.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly"; + sha256 = "sha256-2Ej8uLx9UHxFRrRIV06KRPxOorqE6/jXgykNU+gZkvU="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 80b0349ed58d3..95d20fd7e6be7 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -4,11 +4,12 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "6.0.3"; + version = "6.2.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1775bfcad5de275a540a36720c5ab34594ea1dbe7ffefa32099b0129c5604608"; + sha256 = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 054f68ba2f244..e1e82df89ea32 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.6.0"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "901d3468eaaa04f1d8a8f141f54b8887bfd943ccba311fc1c1de62c66604dfe0"; + sha256 = "sha256-p/nMG0Sl8wlqIWy9EwtlDHprLJ+ABbAArpfzKSOafAA="; }; pythonNamespaces = [ diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 2b011f56c1e8f..ad7db290d67e6 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,4 +1,5 @@ { lib +, pythonAtLeast , pythonOlder , buildPythonPackage , fetchPypi @@ -28,6 +29,7 @@ buildPythonPackage rec { disabledTests = [ "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests + "test_nested_parallel_warnings" # tests is flaky under load ] ++ lib.optionals stdenv.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. ]; diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 0b6f012098189..fe41d0dd85401 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsondiff"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "5122bf4708a031b02db029366184a87c5d0ddd5a327a5884ee6cf0193e599d71"; + sha256 = "sha256-BM+uvUpeVziUirYVcQ3D7pjvvfhRJV/Tl3xMLuWecxI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index a91e6b3accd29..1ffbbdd5e8954 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 = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"; + sha256 = "sha256-hGhM/FM4pTQXPI3WmAnkDyhl0L4fiit6+EZeW5aNz6k="; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 9cb465947551a..23580f42bf577 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.1.0"; + version = "7.1.2"; src = fetchPypi { inherit pname version; - sha256 = "a5f995a73cffb314ed262713ae6dfce53c6b8216cea9f332071b8ff44a6e1654"; + sha256 = "sha256-TqYQM3Jsjlee21VibY7i5r8KgxWN3zdRuN1GssXNHpY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index a7dd89a1f89a0..b7838ff5915f6 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -2,33 +2,54 @@ , buildPythonPackage , fetchPypi , isPy3k +, fetchpatch +, python , ipython , traitlets , glibcLocales , mock -, pytest +, pytestCheckHook , nose }: buildPythonPackage rec { pname = "jupyter_core"; - version = "4.9.1"; + version = "4.9.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dce8a7499da5a53ae3afd5a9f4b02e5df1d57250cf48f3ad79da23b4778cd6fa"; + sha256 = "sha256-1puuuf+xKLjNJlf88nA/icdp0Wc8hRgSEZ46Kg6TrZo="; }; - checkInputs = [ pytest mock glibcLocales nose ]; + checkInputs = [ pytestCheckHook mock glibcLocales nose ]; propagatedBuildInputs = [ ipython traitlets ]; - patches = [ ./tests_respect_pythonpath.patch ]; + patches = [ + # install jupyter_core/*.py files + (fetchpatch { + url = "https://github.com/jupyter/jupyter_core/pull/253/commits/3bbeaebec0a53520523162d5e8d5c6ca02b1b782.patch"; + sha256 = "sha256-QeAfj7wLz4egVUPMAgrZ9Wn/Tv60LrIXLgHGVoH41wQ="; + }) + ./tests_respect_pythonpath.patch + ]; - checkPhase = '' - HOME=$TMPDIR LC_ALL=en_US.utf8 py.test + preCheck = '' + export HOME=$TMPDIR + export LC_ALL=en_US.utf8 ''; + disabledTests = [ + # creates a temporary script, which isn't aware of PYTHONPATH + "test_argv0" + ]; + + postCheck = '' + $out/bin/jupyter --help > /dev/null + ''; + + pythonImportsCheck = [ "jupyter_core" ]; + meta = with lib; { description = "Jupyter core package. A base package on which Jupyter projects rely"; homepage = "https://jupyter.org/"; diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 9d2907072e62a..dc909f798dafa 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.34.1"; + version = "0.34.2"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "c7a03f526eb19175df73fedd5dee3cdae2d39e0474eef8f55c1c55b219ab26d9"; + sha256 = "sha256-WNBhuHF3rhAWZED4di9B9Loq+shRzpJuaAOOcND1YEE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 2b9a269e280fc..dbdebefdb5a08 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "keras"; - version = "2.7.0"; + version = "2.8.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - sha256 = "0c33ae1f728064ca0d35dfba999e9c316f03623bf5688c82fb83cc74a80ea248"; + sha256 = "sha256-dE053GV33NgP9KTUFUnpK3fWoX4O3VikMdMGVuKbyU4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index c89782d4027e5..27f05d83aa058 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.11.1"; + version = "3.15.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; - rev = "v${version}"; - sha256 = "114h9phvbdknyvqdnjba3pd7i4iznffhgx9d569lq0hfla3hl61a"; + rev = "v.${version}"; + sha256 = "sha256-pJkDC/2EDPWbIw9WqV9kdYmr4X6apXtholzd0IYjgDg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index f88e14d0a3e7c..918cbd2591c20 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , click +, filetype , watchdog , exifread , requests @@ -17,6 +18,7 @@ , pytest-mock , pytest-pylint , pytest-click +, python-slugify , isPy27 , functools32 , setuptools @@ -24,18 +26,19 @@ buildPythonPackage rec { pname = "lektor"; - version = "3.3.1"; + version = "3.3.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "lektor"; repo = "lektor"; - rev = version; - sha256 = "04gn3jybqf9wc6l9mi0djpki60adnk7gppmv987ik676k5x8f1kk"; + rev = "v${version}"; + sha256 = "sha256-PNHQ87aO+b1xseupIOsO7MXdr16s0gjoHGnZhPlKKRY="; }; propagatedBuildInputs = [ - click watchdog exifread requests mistune inifile Babel jinja2 - flask pyopenssl ndg-httpsclient setuptools + click filetype watchdog exifread requests mistune inifile Babel jinja2 + flask pyopenssl python-slugify ndg-httpsclient setuptools ] ++ lib.optionals isPy27 [ functools32 ]; checkInputs = [ diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 64a9a3b5e996b..e5f743e0fe11e 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.17.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "v${version}"; - sha256 = "1a14cw2314jb5lrm979zipzk3av4630lxdr4jzj2wl5qh3yw4w52"; + sha256 = "sha256-3p9LM4tv45bqeTsuyngivqfd5uml7uqGB2ICKqPa0qY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 774cb572e95b2..ebbc17c6ea828 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -5,10 +5,12 @@ , fetchFromGitHub , hypothesis , isort -, pytest +, pytestCheckHook , python , pythonOlder , pyyaml +, rustPlatform +, setuptools-rust , setuptools-scm , typing-extensions , typing-inspect @@ -16,8 +18,8 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.3.23"; - format = "setuptools"; + version = "0.4.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,9 +27,18 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "1r4aiqpndqa75119faknsghi7zxyjrx5r6i7cb3d0liwiqrkzrvx"; + sha256 = "sha256-soAlt1KBpCn5JxM1b2LZ3vOpBn9HPGdbm+BBYbyEkfE="; }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "source/${cargoRoot}"; + name = "${pname}-${version}"; + hash = "sha256:1rz1c0dv3f1h2m5hwdisl3rbqnmifbva4f0c4vygk7rh1q27l515"; + }; + + cargoRoot = "native"; + postPatch = '' # test try to format files, which isn't necessary when consuming releases sed -i libcst/codegen/generate.py \ @@ -37,8 +48,10 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools-rust setuptools-scm - ]; + rustPlatform.cargoSetupHook + ] ++ (with rustPlatform; [ rust.cargo rust.rustc ]); propagatedBuildInputs = [ hypothesis @@ -52,7 +65,7 @@ buildPythonPackage rec { checkInputs = [ black isort - pytest + pytestCheckHook ]; preCheck = '' diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index 4a4ba489e0a62..494e887c79bca 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "libevdev"; - version = "0.9"; + version = "0.10"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "17agnigmzscmdjqmrylg1lza03hwjhgxbpf4l705s6i7p7ndaqrs"; + sha256 = "sha256-9LM2Ftr6qmQYysCxso+XJSthwJdOU01J+yL8ZWbtwRM="; }; patches = [ diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 9a19dda15789a..47738b23dc415 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "2.2.0"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "da6346f0dcf85f17f0f1cc709c3408a3058cf6fee68313c288127c287237b411"; + sha256 = "sha256-1CcNKVkcxezqsZvgU0VaTmGbo5UGJQK94rVoGvfcG+g="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 2c549b6830a16..3ef230eb8e8d1 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "lxml-${version}"; - sha256 = "0xji4kcw1fl3nqg04q6zlympkx2kv2s1r1p18763dshgpisqgiq4"; + sha256 = "sha256-ppyLn8B0YFQivRCOE8TjKGdDDQHbb7UdTUkevznoVC8="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 9e2cc9b31e155..c6966e632f05e 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, python # native inputs , pkgconfig @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "3.1.12"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-fqt9aJGqZpfbiYtU8cmm7UQaixZwbTKFBwRfR1B/qic="; + sha256 = "sha256-9gp67i2fotvFOpkaQZ82/YKnDEs3DnzXfuNCVRJg88I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -50,13 +51,13 @@ buildPythonPackage rec { psutil ]; - # leave build directory, so the installed library gets imported - preCheck = '' - pushd tests - ''; + # for lz4.steam + PYLZ4_EXPERIMENTAL = true; - postCheck = '' - popd + # prevent local lz4 directory from getting imported as it lacks native extensions + preCheck = '' + rm -r lz4 + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; meta = with lib; { diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index 03ca9d7915971..28fa4c9c4e2aa 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -11,12 +11,12 @@ , docstring-parser }: buildPythonPackage rec { pname = "magicgui"; - version = "0.3.0"; + version = "0.3.7"; src = fetchFromGitHub { owner = "napari"; repo = "magicgui"; rev = "v${version}"; - sha256 = "sha256-DvL1szk2RoCrpisjp0BVNL6qFZtYc2oYDenX59Cxbug="; + sha256 = "sha256-LYXNNr5lS3ibQk2NIopZkB8kzC7j3yY8moGMk0Gr+hU="; }; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix index 0c36f2cc6cc6e..2e1bff7e21ef0 100644 --- a/pkgs/development/python-modules/manticore/default.nix +++ b/pkgs/development/python-modules/manticore/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "manticore"; - version = "0.3.6"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = "manticore"; rev = version; - sha256 = "sha256-L112YwrBcdcLBeBsPLWt3C57u2WDvGLq50EzW9ojdyg="; + sha256 = "sha256-+17VBfAtkZZIi3SF5Num1Uqg3WjIpgbz3Jx65rD5zkM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 12845da7e37a8..b0f876ef3e8dc 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "markupsafe"; - version = "2.0.1"; + version = "2.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "MarkupSafe"; inherit version; - sha256 = "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r"; + sha256 = "sha256-gL6vY937xkoEUrhB2ANsoGEeBJZQ4gr8uIL108Jm1l8="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 665167e290ea9..724a1459b7794 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \ + --replace 'h11 = "^0.12.0"' 'h11 = "*"' \ --replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \ --replace 'cachetools = { version = "^4.2.1", optional = true }' 'cachetools = { version = "*", optional = true }' ''; diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 54f8431ba2792..1471ea5b1e5dd 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -6,22 +6,24 @@ , h5py , exdown , pytestCheckHook +, rich }: buildPythonPackage rec { pname = "meshio"; - version = "5.2.2"; + version = "5.3.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "209885ac31b00155e43c27859d1aff0ba7f97f319ee7bed453a8b9e1677a4e52"; + sha256 = "sha256-L1YNRAgoHBvf8SsM++J+k1UNciIw91W1s6IA26I/bYw="; }; propagatedBuildInputs = [ numpy netcdf4 h5py + rich ]; checkInputs = [ diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix index 4a7bf9edc5aea..2c518561b9991 100644 --- a/pkgs/development/python-modules/metar/default.nix +++ b/pkgs/development/python-modules/metar/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook }: @@ -15,6 +16,14 @@ buildPythonPackage rec { sha256 = "sha256-pl2NWRfFCYyM2qvBt4Ic3wgbGkYZvAO6pX2Set8zYW8="; }; + patches = [ + (fetchpatch { + # Fix flapping test; https://github.com/python-metar/python-metar/issues/161 + url = "https://github.com/python-metar/python-metar/commit/716fa76682e6c2936643d1cf62e3d302ef29aedd.patch"; + hash = "sha256-y82NN+KDryOiH+eG+2ycXCO9lqQLsah4+YpGn6lM2As="; + }) + ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "metar" ]; diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 2c78575d3704a..83085d76a367d 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -20,12 +20,12 @@ }: buildPythonPackage rec { - version = "5.1.0"; + version = "5.1.3"; pname = "Mezzanine"; src = fetchPypi { inherit pname version; - sha256 = "ce1117c81416d2e0a77981419312e200aec1cf3cb3ea9630083bd29e74bbb265"; + sha256 = "sha256-G/Oj5g70tFUhnbSVElVk0s9Ka+MEuPsEgj6blcFBOoY="; }; disabled = isPyPy || lib.versionOlder django.version "1.11" diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 477ed47e9dd14..5b142406fab09 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.1.2"; + version = "7.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = version; - sha256 = "sha256-KluSdmhpSSqUTLVdFpIGwre7LOu3A16rt73FvaTmuz8="; + sha256 = "sha256-IzITqo23pRf83SFpnBZdryGHIsxh+7HrLVLM9CT5nQQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index add6ee40de4c7..49d6bd7a3248e 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.23.1"; + version = "1.24.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "03rfyhli7vbb1pz0zw75mdwj9pz3awxi3dadxn5glpwn953w6r5y"; + sha256 = "sha256-6hZwiOuHtB8RFwgyfPeV8plLBPlnAdVP1f1bNah4en4="; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index d609f465e2771..269ebf2ef3cfd 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.23.1"; + version = "0.24.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "1lj33pgdrp4rvjzcg2glvz1f87np1pfnqhlwbdcijav9rxqc0w70"; + sha256 = "sha256-BQSB4SGlejARFreeTfqFMzCWvBc6Vvq9EOMLjhAihdI="; }; propagatedBuildInputs = [ @@ -36,12 +36,15 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "coverage==4.2" "coverage" + --replace "coverage==4.2" "coverage" \ + --replace "pymongo>=3.4,<=4.0" "pymongo" ''; # tests require mongodb running in background doCheck = false; + pythonImportsCheck = [ "mongoengine" ]; + meta = with lib; { description = "MongoEngine is a Python Object-Document Mapper for working with MongoDB"; homepage = "http://mongoengine.org/"; diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix index 9f6ca7e91a785..50ba81d6d5260 100644 --- a/pkgs/development/python-modules/moonraker-api/default.nix +++ b/pkgs/development/python-modules/moonraker-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "moonraker-api"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = pname; rev = "v${version}"; - sha256 = "1hhm3jnl9qm44y4k927fzw1n32c3551kgsk7i57qw25nca9x3k61"; + sha256 = "sha256-PgFsXmdAmHXK0wZ6xLTu94RdME1L2H1Mb6V+qFlGXSk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 1d9d077437982..f920a06488a3f 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,269 +1,115 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# runtime , aws-xray-sdk -, backports_tempfile , boto3 , botocore , cfn-lint +, cryptography , docker , flask , flask-cors -, freezegun +, graphql-core +, idna , jinja2 , jsondiff -, mock -, pyaml +, python-dateutil , python-jose , pytz +, pyyaml , requests , responses -, six , sshpubkeys -, sure , werkzeug , xmltodict -, parameterized -, idna -, nose + +# tests +, freezegun , pytestCheckHook , pytest-xdist +, sure }: buildPythonPackage rec { pname = "moto"; - version = "3.0.2"; + version = "3.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vZ1oofOYUkFETDFKwSmifvvn+bCi/6NQAxu950NYk5k="; + sha256 = "sha256-hfLs4K0DBaoTo5E5zmSKs6/hwEyzKsHbjV5ekRfU0Q4="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "ecdsa<0.15" "ecdsa" \ - --replace "idna<3,>=2.5" "idna" \ - --replace "MarkupSafe<2.0" "MarkupSafe" \ - ''; - propagatedBuildInputs = [ aws-xray-sdk boto3 botocore cfn-lint + cryptography docker - flask # required for server + flask + flask-cors + graphql-core + idna jinja2 jsondiff - mock - pyaml + python-dateutil python-jose pytz - six + pyyaml requests responses sshpubkeys werkzeug xmltodict - idna - ] ++ lib.optionals isPy27 [ backports_tempfile ]; + ]; checkInputs = [ - boto3 - flask-cors freezegun - parameterized - pytestCheckHook pytest-xdist + pytestCheckHook sure ]; - # Multiple test files still import boto, rather than boto3 like - # boto is long-deprecated and broken on python3.9 - # https://github.com/spulec/moto/blob/63ce647123755e4c4693a89f52c254596004c098/tests/test_autoscaling/test_autoscaling.py#L2 - # NOTE: This should change to use disabledTestFiles / disabledTestPaths once that - # feature stabalizes: see #113153 (mostly the discussion therein), #113167, #110700 pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" - "--ignore=tests/test_awslambda/test_policy.py" - "--ignore=tests/test_autoscaling/test_autoscaling.py" - "--ignore=tests/test_autoscaling/test_cloudformation.py" - "--ignore=tests/test_autoscaling/test_elbv2.py" - "--ignore=tests/test_autoscaling/test_launch_configurations.py" - "--ignore=tests/test_autoscaling/test_policies.py" - "--ignore=tests/test_autoscaling/test_server.py" - "--ignore=tests/test_awslambda/test_lambda.py" - "--ignore=tests/test_awslambda/test_lambda_cloudformation.py" - "--ignore=tests/test_batch/test_cloudformation.py" - "--ignore=tests/test_batch/test_server.py" - "--ignore=tests/test_cloudformation/test_cloudformation_depends_on.py" - "--ignore=tests/test_cloudformation/test_cloudformation_stack_crud.py" - "--ignore=tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py" - "--ignore=tests/test_cloudformation/test_cloudformation_stack_integration.py" - "--ignore=tests/test_cloudformation/test_stack_parsing.py" - "--ignore=tests/test_cloudformation/test_validate.py" - "--ignore=tests/test_cloudwatch/test_cloudwatch.py" - "--ignore=tests/test_cognitoidentity/test_server.py" - "--ignore=tests/test_config/test_config.py" - "--ignore=tests/test_core/test_auth.py" - "--ignore=tests/test_core/test_decorator_calls.py" - "--ignore=tests/test_core/test_nested.py" - "--ignore=tests/test_core/test_server.py" - "--ignore=tests/test_datapipeline/test_datapipeline.py" - "--ignore=tests/test_datapipeline/test_server.py" - "--ignore=tests/test_datasync/test_datasync.py" - "--ignore=tests/test_dynamodb/test_dynamodb.py" - "--ignore=tests/test_dynamodb/test_dynamodb_table_with_range_key.py" - "--ignore=tests/test_dynamodb/test_dynamodb_table_without_range_key.py" - "--ignore=tests/test_dynamodb/test_server.py" - "--ignore=tests/test_dynamodb2/test_dynamodb.py" - "--ignore=tests/test_dynamodb2/test_dynamodb_table_with_range_key.py" - "--ignore=tests/test_dynamodb2/test_dynamodb_table_without_range_key.py" - "--ignore=tests/test_dynamodb2/test_server.py" - "--ignore=tests/test_ec2/test_amazon_dev_pay.py" - "--ignore=tests/test_ec2/test_amis.py" - "--ignore=tests/test_ec2/test_availability_zones_and_regions.py" - "--ignore=tests/test_ec2/test_customer_gateways.py" - "--ignore=tests/test_ec2/test_dhcp_options.py" - "--ignore=tests/test_ec2/test_elastic_block_store.py" - "--ignore=tests/test_ec2/test_elastic_ip_addresses.py" - "--ignore=tests/test_ec2/test_elastic_network_interfaces.py" - "--ignore=tests/test_ec2/test_general.py" - "--ignore=tests/test_ec2/test_instances.py" - "--ignore=tests/test_ec2/test_internet_gateways.py" - "--ignore=tests/test_ec2/test_ip_addresses.py" - "--ignore=tests/test_ec2/test_key_pairs.py" - "--ignore=tests/test_ec2/test_monitoring.py" - "--ignore=tests/test_ec2/test_network_acls.py" - "--ignore=tests/test_ec2/test_placement_groups.py" - "--ignore=tests/test_ec2/test_regions.py" - "--ignore=tests/test_ec2/test_reserved_instances.py" - "--ignore=tests/test_ec2/test_route_tables.py" - "--ignore=tests/test_ec2/test_security_groups.py" - "--ignore=tests/test_ec2/test_spot_instances.py" - "--ignore=tests/test_ec2/test_subnets.py" - "--ignore=tests/test_ec2/test_tags.py" - "--ignore=tests/test_ec2/test_virtual_private_gateways.py" - "--ignore=tests/test_ec2/test_vm_export.py" - "--ignore=tests/test_ec2/test_vm_import.py" - "--ignore=tests/test_ec2/test_vpc_peering.py" - "--ignore=tests/test_ec2/test_vpcs.py" - "--ignore=tests/test_ec2/test_vpn_connections.py" - "--ignore=tests/test_ec2/test_vpn_connections.py" - "--ignore=tests/test_ec2/test_windows.py" - "--ignore=tests/test_ecs/test_ecs_boto3.py" - "--ignore=tests/test_elb/test_elb.py" - "--ignore=tests/test_elb/test_server.py" - "--ignore=tests/test_elbv2/test_elbv2.py" - "--ignore=tests/test_elbv2/test_server.py" - "--ignore=tests/test_emr/test_emr.py" - "--ignore=tests/test_emr/test_server.py" - "--ignore=tests/test_glacier/test_glacier_archives.py" - "--ignore=tests/test_glacier/test_glacier_jobs.py" - "--ignore=tests/test_glacier/test_glacier_vaults.py" - "--ignore=tests/test_iam/test_iam.py" - "--ignore=tests/test_iam/test_iam_cloudformation.py" - "--ignore=tests/test_iam/test_iam_groups.py" - "--ignore=tests/test_iam/test_server.py" - "--ignore=tests/test_iot/test_server.py" - "--ignore=tests/test_iotdata/test_server.py" - "--ignore=tests/test_kinesis/test_kinesis.py" - "--ignore=tests/test_kinesis/test_kinesis_cloudformation.py" - "--ignore=tests/test_kinesis/test_server.py" - "--ignore=tests/test_kinesisvideo/test_server.py" - "--ignore=tests/test_kinesisvideoarchivedmedia/test_server.py" - "--ignore=tests/test_kms/test_kms.py" - "--ignore=tests/test_kms/test_server.py" - "--ignore=tests/test_kms/test_utils.py" - "--ignore=tests/test_logs/test_logs.py" - "--ignore=tests/test_polly/test_server.py" - "--ignore=tests/test_rds/test_rds.py" - "--ignore=tests/test_rds/test_server.py" - "--ignore=tests/test_rds2/test_server.py" - "--ignore=tests/test_redshift/test_redshift.py" - "--ignore=tests/test_redshift/test_server.py" - "--ignore=tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py" - "--ignore=tests/test_route53/test_route53.py" - "--ignore=tests/test_s3/test_s3.py" - "--ignore=tests/test_s3/test_s3_cloudformation.py" - "--ignore=tests/test_s3/test_s3_lifecycle.py" - "--ignore=tests/test_s3/test_s3_storageclass.py" - "--ignore=tests/test_s3/test_s3_utils.py" - "--ignore=tests/test_s3bucket_path/test_s3bucket_path.py" - "--ignore=tests/test_s3bucket_path/test_s3bucket_path_combo.py" - "--ignore=tests/test_secretsmanager/test_server.py" - "--ignore=tests/test_ses/test_server.py" - "--ignore=tests/test_ses/test_ses.py" - "--ignore=tests/test_ses/test_ses_boto3.py" - "--ignore=tests/test_ses/test_ses_sns_boto3.py" - "--ignore=tests/test_sns/test_application.py" - "--ignore=tests/test_sns/test_application_boto3.py" - "--ignore=tests/test_sns/test_publishing.py" - "--ignore=tests/test_sns/test_publishing_boto3.py" - "--ignore=tests/test_sns/test_server.py" - "--ignore=tests/test_sns/test_subscriptions.py" - "--ignore=tests/test_sns/test_subscriptions_boto3.py" - "--ignore=tests/test_sns/test_topics.py" - "--ignore=tests/test_sns/test_topics_boto3.py" - "--ignore=tests/test_sqs/test_server.py" - "--ignore=tests/test_sqs/test_sqs.py" - "--ignore=tests/test_ssm/test_ssm_boto3.py" - "--ignore=tests/test_ssm/test_ssm_docs.py" - "--ignore=tests/test_sts/test_server.py" - "--ignore=tests/test_sts/test_sts.py" - "--ignore=tests/test_swf/models/test_activity_task.py" - "--ignore=tests/test_swf/models/test_decision_task.py" - "--ignore=tests/test_swf/models/test_timeout.py" - "--ignore=tests/test_swf/models/test_workflow_execution.py" - "--ignore=tests/test_swf/responses/test_activity_tasks.py" - "--ignore=tests/test_swf/responses/test_activity_types.py" - "--ignore=tests/test_swf/responses/test_decision_tasks.py" - "--ignore=tests/test_swf/responses/test_domains.py" - "--ignore=tests/test_swf/responses/test_timeouts.py" - "--ignore=tests/test_swf/responses/test_workflow_executions.py" - "--ignore=tests/test_swf/responses/test_workflow_types.py" - # attempts web connections - "--ignore=tests/test_appsync/test_appsync_schema.py" - "--ignore=tests/test_awslambda/test_lambda_eventsourcemapping.py" - "--ignore=tests/test_awslambda/test_lambda_invoke.py" - "--ignore=tests/test_batch/test_batch_jobs.py" - "--ignore=tests/**/*_integration.py" + "--numprocesses $NIX_BUILD_CORES" + + # Disable tests that try to access the network + "--deselect=tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed" + "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" + "--deselect=tests/test_core/test_decorator_calls.py::test_context_manager" + "--deselect=tests/test_core/test_decorator_calls.py::test_decorator_start_and_stop" + "--deselect=tests/test_core/test_request_mocking.py::test_passthrough_requests" + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" + "--deselect=tests/test_logs/test_integration.py::test_put_subscription_filter_with_lambda" + "--deselect=tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception" + "--deselect=tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception" + "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names" + "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_list_executions_with_pagination" + + # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) + "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function" + ]; + + disabledTestPaths = [ + # xml.parsers.expat.ExpatError: out of memory: line 1, column 0 + "tests/test_sts/test_sts.py" + # botocore.exceptions.NoCredentialsError: Unable to locate credentials + "tests/test_redshiftdata/test_redshiftdata.py" + # Tries to access the network + "tests/test_appsync/test_appsync_schema.py" + "tests/test_awslambda/test_lambda_eventsourcemapping.py" + "tests/test_awslambda/test_lambda_invoke.py" + "tests/test_batch/test_batch_jobs.py" ]; disabledTests = [ - # these tests rely on the network - "test_server" - "test_managedblockchain_nodes" - "test_swf" - "test_simple_instance" - "test_passthrough_requests" - "test_s3_server_get" - "test_s3_server_bucket_create" - "test_s3_server_post_to_bucket" - "test_s3_server_put_ipv6" - "test_s3_server_put_ipv4" - "test_http_proxying_integration" - "test_submit_job_by_name" - "test_submit_job" - "test_list_jobs" - "test_terminate_job" - "test_idtoken_contains_kid_header" - "test_latest_meta_data" - "test_meta_data_iam" - "test_meta_data_security_credentials" - "test_meta_data_default_role" - "test_reset_api" - "test_data_api" - "test_requests_to_amazon_subdomains_dont_work" - "test_get_records_seq" - "test_stream_with_range_key" - "test_create_notebook_instance_bad_volume_size" - "http_destination" - "test_invoke_function_from_sqs_exception" - "test_state_machine_list_executions_with_pagination" - "test_put_subscription_filter_with_lambda" - "test_create_custom_lambda_resource__verify_cfnresponse_failed" - "test_state_machine_creation_fails_with_invalid_names" - # needs graphql - "test_get_schema_creation_status" # only appears in aarch64 currently, but best to be safe "test_state_machine_list_executions_with_filter" ]; diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index f81395f0245b7..a811018da214b 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "msal-extensions"; - version = "0.3.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d9029af70f2cbdc5ad7ecfed61cb432ebe900484843ccf72825445dbfe62d311"; + sha256 = "sha256-xnarpWsMzjeD3htcXs/oKNuZgWeHUSbKS0fcZDZFE1Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 0ea21ecbe405a..6ee071732691b 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "multidict"; - version = "5.2.0"; + version = "6.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce"; + sha256 = "sha256-X/O9dfOOTEPx9HDy33pNQwuCHEziK+OE4UWctX1rsBM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 33fc3c02daeba..6308b6fceb6f6 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -1,37 +1,74 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi -, isPy27 -, flake8 + +# docs +, python +, sphinx +, sphinx_rtd_theme + +# tests , hypothesis -, pycodestyle -, pyflakes -, pytest -, setuptools -, pkgs +, pytestCheckHook }: buildPythonPackage rec { pname = "mutagen"; version = "1.45.1"; - disabled = isPy27; # abandoned + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1"; }; - propagatedBuildInputs = [ setuptools ]; + outputs = [ + "doc" + "out" + ]; + + nativeBuildInputs = [ + sphinx + sphinx_rtd_theme + ]; + + postInstall = '' + ${python.interpreter} setup.py build_sphinx --build-dir=$doc + ''; + checkInputs = [ - pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis flake8 + hypothesis + pytestCheckHook + ]; + + disabledTests = [ + # Hypothesis produces unreliable results: Falsified on the first call but did not on a subsequent one + "test_test_fileobj_save" + ]; + + disabledTestPaths = [ + # we are not interested in code quality measurements + "tests/quality/test_flake8.py" ]; - LC_ALL = "en_US.UTF-8"; meta = with lib; { - description = "Python multimedia tagging library"; + description = "Python module for handling audio metadata"; + longDescription = '' + Mutagen is a Python module to handle audio metadata. It supports + ASF, FLAC, MP4, Monkey's Audio, MP3, Musepack, Ogg Opus, Ogg FLAC, + Ogg Speex, Ogg Theora, Ogg Vorbis, True Audio, WavPack, OptimFROG, + and AIFF audio files. All versions of ID3v2 are supported, and all + standard ID3v2.4 frames are parsed. It can read Xing headers to + accurately calculate the bitrate and length of MP3s. ID3 and APEv2 + tags can be edited regardless of audio format. It can also + manipulate Ogg streams on an individual packet/page level. + ''; homepage = "https://mutagen.readthedocs.io"; - license = licenses.lgpl2Plus; + changelog = "https://mutagen.readthedocs.io/en/latest/changelog.html#release-${lib.replaceStrings [ "." ] [ "-" ] version}"; + license = licenses.gpl2Plus; platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 74936da4f7254..babdbc4506dc4 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -28,12 +28,12 @@ , wrapQtAppsHook }: mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.12"; + version = "0.4.14"; src = fetchFromGitHub { owner = "napari"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0QSI0mgDjF70/X58fE7uWwlBUCGY5gsvbCm4oJkp2Yk="; + sha256 = "sha256-uDDj5dzsT4tRVV0Y+CYegiCpLM77XFaXEXEZXTnX808="; }; nativeBuildInputs = [ setuptools-scm wrapQtAppsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index c5e3facc06224..52478ad4fd628 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.10"; + version = "0.5.11"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088"; + sha256 = "sha256-dRUWmS80tYFyutVO7x5L9+T0Rg1Y4lXKGk5clklHYAc="; }; inherit doCheck; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index ab91f22acc442..8604698cc2a27 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.4.0"; + version = "6.4.2"; src = fetchPypi { inherit pname version; - sha256 = "5412ec774c6db4fccecb8c4ba07ec5d37d6dcf5762593cb3d6ecbbeb562ebbe5"; + sha256 = "sha256-6ygD2xj2+szmvzsBtoT+R5B5lL0VbRXqzN8BHj1/gWQ="; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/pkgs/development/python-modules/net2grid/default.nix b/pkgs/development/python-modules/net2grid/default.nix index 05b5321a69cfa..ef03d45ab6b86 100644 --- a/pkgs/development/python-modules/net2grid/default.nix +++ b/pkgs/development/python-modules/net2grid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "net2grid"; - version = "3.0.0"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-net2grid"; rev = "v${version}"; - hash = "sha256-nT9qMv4Zr7SjNwHRN3HRR11yl+Oue8VVCfJr2n1D02Q="; + hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index e8769f9efc7dd..c876c0d549dd3 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.6.3"; + version = "2.7"; src = fetchPypi { inherit pname version; - sha256 = "c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51"; + sha256 = "sha256-7/t9nNXDbh4NM/QqOu9brd5QMFNYJqNn1c9gihcK9RU="; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 60f5fcde63fe9..dc0a6d12f0c1b 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , packaging -, pytest +, pytestCheckHook , nose , numpy , h5py @@ -23,11 +23,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; - checkInputs = [ nose pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - pytest - ''; + disabledTests = [ + # https://github.com/nipy/nibabel/issues/951 + "test_filenames" + ]; meta = with lib; { homepage = "https://nipy.org/nibabel"; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index c79ea52f558c5..4b8668f612729 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.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a0489940855130f35bbc4cac0750479a6f82025215ea7b1d778faca064219298"; + sha256 = "sha256-+cjjCt71FImRCux3JLVpneF4Qn065jhz2tmyPdMh/nY="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 7a1902cb21144..586257a4f8db8 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.4.7"; + version = "6.4.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b01da66f11a203b3839d6afa4013674bcfff41c36552f9ad0fbcb2d93c92764a"; + sha256 = "sha256-Hphcncb2eL3/+53GVzBrVGm/pi1z4D906N77920oQxI="; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index d9a340d824918..898d209d91381 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -8,7 +8,6 @@ , mock , peewee , pytest-django -, pytest-pythonpath , pytestCheckHook , six , sqlalchemy @@ -38,7 +37,6 @@ buildPythonPackage rec { mock peewee pytest-django - pytest-pythonpath pytestCheckHook sqlalchemy webtest @@ -54,6 +52,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ + --replace "python_paths" "pythonpath" \ --replace "--cov nplusone --cov-report term-missing" "" ''; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 8bead014e34a7..3a1192d46789e 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,21 +12,22 @@ }: buildPythonPackage rec { - version = "0.55.0"; + version = "0.55.1"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-siHr2ZdmKh3Ld+TwkUDgIvv+dXetB4H8LgIUE126bL0="; + sha256 = "sha256-A+kGmiZm0chPk7ANvXFvuP7d6Lssbvr6LwSEKkZELqM="; }; postPatch = '' + # numpy substituteInPlace setup.py \ - --replace "1.21" "1.22" + --replace "1.22" "2" substituteInPlace numba/__init__.py \ - --replace "(1, 20)" "(1, 21)" + --replace "(1, 21)" "(2, 0)" ''; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 0f57847b3a624..ea092d01dd426 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.1.0"; + version = "1.2"; disabled = isPy27; src = fetchPypi { inherit pname; inherit version; - sha256 = "c36fd6cb7ffdc9b4e165a43f67bf6271a7b024d0bb6b00ac468c9e2bfc76448e"; + sha256 = "sha256-DOwjN0DGsSWRMAXRboqZluBgUor8uLfK0/JwZinf1vc="; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index f4cc9d3140e46..5b974c9b6af29 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.6.2"; + version = "1.7.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "c6f99eaa65935b2c8a3f004025fb3c0309e11655c391d0fcd318d2a8665ca5c4"; + sha256 = "sha256-Tj3zCKDM4IBH9BKonhW9gPFD+lE3Q570Lxfm6b/d5JU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index da0a70aafb4c7..84d56962cc4d9 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -7,7 +7,7 @@ , parameterized , pillow , scipy -, tensorflow-tensorboard +, tensorboard }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { parameterized pillow scipy - tensorflow-tensorboard + tensorboard ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 8da783dbdb278..2ae55df278f3b 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.56.0"; + version = "2.59.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-olrWv4c2DoZ7ddm58Wpb5jZntw8WEKJ6IzAND11tdjk="; + hash = "sha256-qejmfyTdJcJwo30lulF3V0SOUXb8HjD4OcR5LcDRTmo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index d32b82365dc71..e873f3256084d 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.10.2"; + version = "1.11.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-JNc8p9/X5sczmUT4lVS0AQcZiZM3kk/KFEfY8bXbUNY="; + sha256 = "sha256-7KIkx8LI7kByoHQ+SJioSpvfgpe15ZEKJjLkxBgv+yo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 0d48ab04a1dbb..338615a06b143 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -61,6 +61,8 @@ buildPythonPackage rec { disabledTestPaths = [ # AttributeError: 'str' object has no attribute '__name__' "tests/integration/validation" + # requires secrets and additional configuration + "tests/integration/contrib/test_django.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 8251c2cd01751..ced5f8ed68b8a 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.2.0"; + version = "0.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = version; - sha256 = "sha256-HoXtDlXOoYqzsM4FxVfLQdIlpJXaNUcQo8//B4JqJoA="; + sha256 = "sha256-rgl2B55dnbpZszr+gWM0FgeXMKfrkDG7HeZBSw5Eles="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 4e61a86a5013e..7ef70ab3d3ff8 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,17 +1,23 @@ { lib, buildPythonPackage, isPy27, fetchPypi , jsonschema, openapi-schema-validator, pyyaml, six, pathlib -, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools }: +, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools +, poetry-core +, requests +}: buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.3.1"; + version = "0.4.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "3d70e6592754799f7e77a45b98c6a91706bdd309a425169d17d8e92173e198a2"; + sha256 = "sha256-l/JYhQr8l7BI98JlOFXg+I+masEDwr5Qd8eWCsoq1Jo="; }; - propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ] + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools requests ] ++ (lib.optionals (isPy27) [ pathlib ]); checkInputs = [ mock pytest pytest-cov pytest-flake8 tox ]; diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index 78e0c53c9112f..c233f88c73f9c 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "openshift"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "openshift"; repo = "openshift-restclient-python"; rev = "v${version}"; - sha256 = "1di55xg3nl4dwrrfw314p4mfm6593kdi7ia517v1sm6x5p4hjl78"; + sha256 = "sha256-9mMHih2xuQve8hEnc5x4f9Pd4wX7IMy3vrxxGFCG+8o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index 7546566cb3aac..8ea71fd2d901f 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -1,24 +1,39 @@ -{ buildPythonPackage, fetchPypi, lib, isPy27, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, flit-core +, pytestCheckHook +}: buildPythonPackage rec { pname = "ordered-set"; - version = "4.0.2"; - disabled = isPy27; + version = "4.1.0"; + format = "pyproject"; - checkInputs = [ pytest ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "159syfbqnwqnivzjfn3x7ak3xwrxmnzbji7c2qhj1jjv0pgv54xs"; + sha256 = "sha256-aUqORMh2V8WSku3nKJHrkdNBMfZTFGOqswCRkcdzZKg="; }; - checkPhase = '' - py.test test.py - ''; + nativeBuildInputs = [ + flit-core + ]; - meta = { + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ordered_set" + ]; + + meta = with lib; { description = "A MutableSet that remembers its order, so that every entry has an index."; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.MostAwesomeDude ]; + homepage = "https://github.com/rspeer/ordered-set"; + license = licenses.mit; + maintainers = with maintainers; [ MostAwesomeDude ]; }; } diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 95c5e5d6a328e..c218f0d7ae0a1 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -38,7 +38,13 @@ buildPythonPackage rec { ]; checkPhase = '' - stestr run + # tests parse cli output which slightly changed + stestr run -e <(echo " + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_filtering_option_to_parser + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_create + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_set + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_unset + ") ''; pythonImportsCheck = [ "osc_lib" ]; diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index f38b9bb09b39d..7f5fa9b98ca0e 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "oslo.context"; - version = "3.4.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "970f96361c5de9a5dc86d48a648289d77118180ca13ba5eeb307137736ffa953"; + sha256 = "sha256-damnIqVS+6ionooBAo+oKmGQqzF6lZG7gzA6IhCnkUQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 5236cc7bbf8e5..c2d74d0d3c16c 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.9.8.1"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Z14OyAWPoIN6BAUEcXi96mp9C0aWaYP6eeHAoa+rHJ4="; + sha256 = "sha256-hyoENLmkSLP6l1cXEfad0qP7cjRa1myQsX2Cev6oLwk="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 536f883f29a2d..90309ef0b4026 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.3.5"; + version = "1.4.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1e4285f5de1012de20ca46b188ccf33521bff61ba5c5ebd78b4fb28e5416a9f1"; + sha256 = "sha256-jbk+yYrHy1+KwUIMEPXjxDUzFT8lP+f7bYkc9aorgNI="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 757ddc7d97463..bbaff2731020c 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pathlib2"; - version = "2.3.6"; + version = "2.3.7.post1"; src = fetchPypi { inherit pname version; - sha256 = "7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"; + sha256 = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE="; }; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index aa99d5f23f7b7..5649e092634c5 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "0.10.2"; + version = "0.11.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "83bb71a7588df69ea0d77dc6524741c3a1af54ad5f421341428de648bfc03a29"; + sha256 = "sha256-4AC6tDUCwZHXGAiiYw3UTs4wGjGdJuACocrqOnMHzSA="; }; preCheck = '' diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 852ba5ffbcb7c..85a58271b6d38 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.14.8"; + version = "3.14.9"; format = "setuptools"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "sha256-BJSM+7+VdW6SxN4/AXsX8NhQPdIFoYrVRVwR9OsJ3QE="; + sha256 = "sha256-8rwWKsOOYUrk2k1piCurb1LkB9zzmSITq52qWdyx4yk="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 436192e18b8d5..723b3888edb8c 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.7.1"; + version = "4.7.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "getpelican"; repo = pname; rev = version; - sha256 = "0w3r4ifbrl6mhfphabqs048qys7x6k164ds63jr10l3namljm8ad"; + hash = "sha256-ZBGzsyCtFt5uj9mpOpGdTzGJET0iwOAgDTy80P6anRU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index ca8f867e6e30c..a2bb6baec9694 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.9.13"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "nschloe"; repo = pname; rev = "v${version}"; - sha256 = "0ry5x38sv8gh505z6ip90jymm7kfgyf80y3vjb2i6z567bnblam6"; + sha256 = "sha256-5qZolEJWjhqk1JakcGBWZ1hxeP1cLqcB7IZ3ufjOC/o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 308e8c9c8b640..e7b4e62ab575d 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.13.0"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "3847e205b19469f16ded05bda24b4758056d67ade4075a5ded4ce6628a9bad01"; + sha256 = "sha256-1dq5ZpCQgnWRbcLGIu+uIX8ULggWX6NmlJ1By8VlhwE="; }; propagatedBuildInputs = [ @@ -28,6 +28,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # requires a postgresql server + "test_slash_dp_pattern_schema" + ]; + meta = with lib; { description = "Meta-commands handler for Postgres Database"; homepage = "https://pypi.python.org/pypi/pgspecial"; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 9faad1e96de20..92b621e49c640 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.43"; + version = "8.12.44"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HIJwouJX1sZUWKQig/gtPsp/e52SVFSmlm4vBN914c8="; + sha256 = "sha256-Js/QJX0XBP4viMr/LKq7cNFqh3seZbaq5R+fu+EKqM4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 2ddba8f363e34..a4370fbaae576 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "21.3.1"; + version = "22.0.3"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "sha256-A8oePI5VOKGJTY6ZuUhcOhRkz2I2FSdfsS2xIgktCVQ="; + sha256 = "sha256-Wu2QQfb0pehPLLa+za32C4jH1arkBKKc3jlAMRkDV5Q="; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 2be8928f630f4..584d9361fb767 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.5.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-fppwtY8VX8IQ96H930xItO7mS8LlxxHgBcKlwIL5P2E="; + sha256 = "sha256-z6WIwTWLlc/chNRxt3dqqa/IxYj1BBTcQ6OcfliHrvA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index fbe869b07032f..fc24a4c2e6f7f 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.5.0"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "20b8a1a0f0434f9b8d10eb7caa66e947a9a1d698e5a53d40d447bbc0d2ae41f0"; + sha256 = "sha256-2G5E69449HU9/5gqubXgPPhyqrj99TpAPpme03gVQzE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index ae3c4941f6848..70b4421778f3e 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -50,6 +50,14 @@ buildPythonPackage rec { "test_change_env" "test_dictlike" "test_local" + # incompatible with pytest 7 + "test_incorrect_login" + ]; + + disabledTestPaths = [ + # incompatible with pytest7 + # https://github.com/tomerfiliba/plumbum/issues/594 + "tests/test_remote.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index e8632d0ed0782..5922d67fc8b76 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.7"; + version = "1.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0v86x8f8pcbviv2cdn7jjbgj3c994qasx0bqk1kr0mj8m6pjwy9z"; + sha256 = "sha256-cs9SMGD9RdW8Wx/IAMq6gkOUBsney5r19hyGva98grk="; }; postPatch = lib.optionalString (pythonOlder "3.8") '' diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 3b7ddaf280197..238e6ad62230b 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -11,12 +11,13 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.5.2"; + version = "1.6.0"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5969b2f1defbdc405df932767e05e0b536e2771c27f1f95d7f260bc99bf13581"; + sha256 = "sha256-V9IOxLEN1pTSsFu2S8axCcboWmwUBXlM6H7Ys0GrP0Q="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index f914a0f3df449..25d22c2c5a2fd 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.0.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "69fe75d78ac8651e16dd61265b9e19626df5d630ae294fc31687aa6037b97a58"; + sha256 = "sha256-Q8niMnLKJT0Diudv463eiXlOkuf8qy3fW5SzhkLvTyE="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 7af4e2b02faae..9ba5068359bbc 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.12.0"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; rev = "v${version}"; - sha256 = "1a0kllal5vkkdv325k0mx1mha2l9808mcz4dqx6qrgfskz8c2xjl"; + sha256 = "sha256-1sMnlUOvvdlUuh288UalAdlf0a1mpnM+Y/upwlnL1H8="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix index 403f0c0979163..8833689cec122 100644 --- a/pkgs/development/python-modules/promise/default.nix +++ b/pkgs/development/python-modules/promise/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { sha256 = "17mq1bm78xfl0x1g50ng502m5ldq6421rzz35hlqafsj0cq8dkp6"; }; + postPatch = '' + substituteInPlace tests/test_extra.py \ + --replace "assert_exc.traceback[-1].path.strpath" "str(assert_exc.traceback[-1].path)" + ''; + propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index e38560be2eb68..4ec9e381dafbf 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.24"; + version = "3.0.28"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "1bb05628c7d87b645974a1bad3f17612be0c29fa39af9f7688030163f680bad6"; + sha256 = "sha256-nxzRax6GwpaPJRnX+zHdnWaZFvUVYSwmnRTp7VK1FlA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index dd2494729efd7..defc28d9429a3 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.19.8"; + version = "1.20.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bdf45f0e0be71510eb2ec9db4da78afde7b5fb8b0a507a36340a9b6ce8e48e58"; + sha256 = "sha256-8osiW8nmwU4gb7f46Zakb7LM2QJkjlEtSWq7anFqSuU="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index 4bf07b1375eb4..6527f88e4891a 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "proxy-py"; - version = "2.3.1"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "abhinavsingh"; repo = "proxy.py"; rev = "v${version}"; - sha256 = "sha256-qqwb3t8/xicDGfO6l843qRwh0yUfthnOIhgNeKIbEO4="; + sha256 = "sha256-VagX7ATVu6AT4POWoG9btizxFeBh9MLXiLpavtfXnyM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index 1cd7d91ef2593..ae90c21bea9f9 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -2,11 +2,14 @@ , buildPythonPackage , fetchFromGitHub , pkgs +, isPy3k }: buildPythonPackage rec { version = "unstable-20160819"; pname = "pybluez"; + # requires use2to3, which is no longer supported in setuptools>58 + disabled = isPy3k; propagatedBuildInputs = [ pkgs.bluez ]; diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index 375453231b9bc..ff050c15bfe08 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -4,22 +4,25 @@ , envs , fetchFromGitHub , isPy27 +, freezegun , mock +, moto , pytestCheckHook , python-jose , requests +, requests-mock }: buildPythonPackage rec { pname = "pycognito"; - version = "2022.01.0"; + version = "2022.02.1"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = version; - sha256 = "sha256-mmlw3irMC0SFjfEinXHyoPNfTvCcO02zGyqQLj9STSY="; + sha256 = "sha256-0PqeZ8yy2MzvIi1xQNosR7V2Ma3tMT0Q/v4OIv7f1Kg="; }; propagatedBuildInputs = [ @@ -30,8 +33,11 @@ buildPythonPackage rec { ]; checkInputs = [ + freezegun mock + moto pytestCheckHook + requests-mock ]; postPatch = '' diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index f80f900347848..68a19afddba71 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -35,9 +35,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # Those tests take over 1.5 h on hydra. Also, an error and two failures - "tests/test_spdmd.py" + pytestFlagsArray = [ + # test suite takes over 100 vCPU hours, just run small subset of it. + # TODO: Add a passthru.tests with all tests + "tests/test_dmdbase.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index a252cd4505ac2..e47e0366c8631 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pyee"; - version = "8.2.2"; + version = "9.0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XH5g+N+VcQ2+F1UOFs4BU/g5kMAO90SEG0Pzce1T6+o="; + sha256 = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index a2815c3e1e2d2..e356ca563b545 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.6.3.1"; + version = "0.6.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "93adf036a75e08dc9b1dcd59de6a4db2f65a48c603edabe2e499764b6535ed50"; + sha256 = "sha256-e6O9yx30unSfdmWzTmoFKqToQkBqDflebfRxfMEj85I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 29803793fd6f8..63bf4483911a2 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.5.4"; + version = "4.5.5"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5b5951e873f73bf12e3a19d8e4470c4b7962c51df753cf8c4caaf64e24a0a323"; + sha256 = "sha256-iIIe2MJjJxu2alRBmoJZGqEH+yz9pC3I8hWOC+CIWQc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index b8b405a8ecf03..47654ff34c6a8 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.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bixc/1qh5D9DEDSAdhFS9cXWvvQPXB9QyHWKbonmbLY="; + sha256 = "sha256-xehYisrV4y+gWVWCVxBZ5rkOx8SHxYtOU8KADcveRMg="; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index 4c557b2676cdf..22cea8c0709db 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , setuptools-scm , pydantic +, toml , typeguard , mock , pytest-asyncio @@ -13,6 +14,7 @@ buildPythonPackage rec { pname = "pygls"; version = "0.11.3"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { @@ -27,6 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pydantic + toml typeguard ]; # We don't know why an early version of pydantic is required, see: diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 3281a7ceb8735..02226feff2ced 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "PyICU"; - version = "2.8"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "3d80de47045a8163db5aebc947c42b4d429eeea4f0c32af4f40b33981fa872b9"; + sha256 = "sha256-8LlUmof4e6fEE/E2edE3Jx4LN/HzmwEJrOOCV9TRSNY="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 3f93aef0a3f7b..5d8674aac023e 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -10,12 +10,14 @@ , pydocstyle , pyflakes , vulture +, isort +, pylint , pytestCheckHook }: buildPythonPackage rec { pname = "pylama"; - version = "8.3.6"; + version = "8.3.7"; format = "setuptools"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "klen"; repo = "pylama"; rev = version; - hash = "sha256-KU/G+2Fm4G/dUuNhhk8xM0Y8+7YOUUgREONM8CQGugw="; + hash = "sha256-//mrvZb4bT4aATURqa4g1DUagYe9SoP3o3OrwmiEJnI="; }; patches = [ @@ -45,14 +47,22 @@ buildPythonPackage rec { ]; checkInputs = [ + # avoid infinite recursion pylint -> isort -> pylama + (pylint.override { + isort = isort.overridePythonAttrs (old: { + doCheck = false; + }); + }) pytestCheckHook ]; + preCheck = '' + export HOME=$TEMP + ''; + disabledTests = [ - "test_pylint" # infinite recursion "test_quotes" # FIXME package pylama-quotes "test_radon" # FIXME package radon - "test_sort" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 291ef8fba62ef..61d49bd3ba0db 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.5.0"; + version = "2.5.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "1r48dss9qnzlifwy5ylkffdw35aaajmil0486mav056jm1vmi2pr"; + sha256 = "sha256-VgGdV1T154LauclGo6jpLPUrYn5vTOWwvO4IXQ9se7c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index f30b6ea06b4c0..f2055ca9a791f 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pymemcache"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "pinterest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O2qmcLWCUSc1f32irelIZOOuOziOUQXFGcuQJBXPvvM="; + sha256 = "sha256-DKqfv5gf9gzbnEPQSzy2mAaVYJZL9jmTKyGWVzj40T4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index bae4f7c25fb82..ba184f68b4b5a 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.12.2"; + version = "3.12.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "64ea5e97fca1a37f83df9f3460bf63640bc0d725e12f3471e6acbf3a6040dd37"; + sha256 = "sha256-ConK3ABipeU2ZN3gQ/bAlxcrjBxfAJRJAJUoL/mZWl8="; }; # Tests call a running mongodb instance diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index f15cfef63c6e0..79b914f6122cc 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -34,6 +34,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # numpy.core._exceptions._UFuncNoLoopError + "test_sparse_nn_descent_query_accuracy_angular" + "test_nn_descent_query_accuracy_angular" + "test_alternative_distances" + # scipy: ValueError: Unknown Distance Metric: wminkowski + # https://github.com/scikit-learn/scikit-learn/pull/21741 + "test_weighted_minkowski" + ]; + pythonImportsCheck = [ "pynndescent" ]; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index e8d89e9ef2d25..20450cd9effc6 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyomo"; - version = "5.7.3"; + version = "6.3.0"; disabled = isPy27; # unable to import pyutilib.th src = fetchFromGitHub { repo = "pyomo"; owner = "pyomo"; rev = version; - sha256 = "sha256-p0/DdCwyXdzXElzjWewKs0Oi7BMXC+BxgYikdZL0t68="; + sha256 = "sha256-xyjiB5fDRf5y9Av5Cr+8wtU4pHzMHsM45mcmJEOaTWs="; }; checkInputs = [ nose glpk ]; diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index c6839bba98962..195ec563d50f6 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchPypi }: buildPythonPackage rec { pname = "pyopengl-accelerate"; version = "3.1.5"; + disabled = pythonAtLeast "3.10"; # fails to compile src = fetchPypi { pname = "PyOpenGL-accelerate"; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 72d6ae3325837..7370057ad720d 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyopengl"; - version = "3.1.5"; + version = "3.1.6"; src = fetchPypi { pname = "PyOpenGL"; inherit version; - sha256 = "4107ba0d0390da5766a08c242cf0cf3404c377ed293c5f6d701e457c57ba3424"; + sha256 = "sha256-jqbIdzkn7adAW//G9buTvoFWmnsFyMrFDNlOlp3OXic="; }; propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/pyownet/default.nix b/pkgs/development/python-modules/pyownet/default.nix index 2bdc18e1e2440..9a368c26087eb 100644 --- a/pkgs/development/python-modules/pyownet/default.nix +++ b/pkgs/development/python-modules/pyownet/default.nix @@ -14,6 +14,10 @@ buildPythonPackage rec { sha256 = "4f2fa4471c2f806b35090bdc6c092305c6eded3ff3736f8b586d35bdb157de62"; }; + postPatch = '' + sed -i '/use_2to3/d' setup.py + ''; + # tests access network doCheck = false; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 27047cf6eabc4..449c5334e6640 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -11,13 +11,13 @@ let pyparsing = buildPythonPackage rec { pname = "pyparsing"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; rev = "pyparsing_${version}"; - sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a"; + sha256 = "sha256-RyvTTbFshAZgyZPgzqcq31E504RlnMZuf16jJYGqDDI="; }; # circular dependencies if enabled by default diff --git a/pkgs/development/python-modules/pypdf3/default.nix b/pkgs/development/python-modules/pypdf3/default.nix index 4970c0d527bb5..a4273497e3bc4 100644 --- a/pkgs/development/python-modules/pypdf3/default.nix +++ b/pkgs/development/python-modules/pypdf3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pypdf3"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { pname = "PyPDF3"; inherit version; - sha256 = "sha256-DGKpR4p3z8tw4gKi5Hmj09svysD3Hkn4NklhgROmEAU="; + sha256 = "sha256-yUbzJzQZ43JY415yJz9JkEqxVyPYenYcERXvmXmfjF8="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 40a77fc0c7bd1..25cf9906cb44b 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.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "8a85dd42e067131d5b26b71472336da7f7f4b87ff9c97350d89f5ff0de9adedc"; + sha256 = "sha256-SsLiz3JKubUlInw7SmnxarXHFOpbrWHJdODF1XhyOKE="; }; checkInputs = [ nose psutil ] ++ diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index bb15a4d927ab2..a5b618d56902b 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -1,26 +1,10 @@ { lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }: -let - - # the requirements of `pyres` support Redis 3.x (due to a missing upper-bound), - # but it doesn't support Redis 3.x. - redis' = redis.overridePythonAttrs (old: rec { - pname = "redis"; - version = "2.10.6"; - src = fetchPypi { - inherit pname version; - sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52"; - }; - }); - -in - buildPythonPackage rec { pname = "pyres"; version = "1.5"; - # ps is used in Worker.worker_pids method - propagatedBuildInputs = [ simplejson setproctitle redis' pkgs.ps ]; + propagatedBuildInputs = [ simplejson setproctitle redis pkgs.ps ]; checkInputs = [ nose pkgs.redis ]; # PyPI tarball doesn't contain tests so let's use GitHub @@ -44,5 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/binarydud/pyres"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; + broken = true; # not compatible with latest redis }; } diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 75cecc7d70916..5a1b66bfa26c5 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.18.0"; + version = "0.18.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"; + sha256 = "sha256-1NYfi5k6clW6cU3zrKUnAPgSUon4T3BM+AkWUXxG65Y="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 2e6f41aa23327..c424e3195e7d9 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "bfea06179edbfb4bc76a0f470bd3c38e12f00e1023e3ad0373558d07cff102ab"; + sha256 = "sha256-C4E1kmLsbprHjDUzROfeAmAn0UDG3vlJ/w2Aq3D4mlQ="; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 561ec037c0a2a..563042091bf74 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.3.1"; + version = "0.5.0"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f7CR7wMxHNNpxizV7MFCtWci3SSNvdx+W5i/rgOUSxY="; + sha256 = "sha256-CvPvyP7Vi2Ib+ikgUQt8JkVt5fxzapG590TgAehXqHE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 6fcb9f97d32cd..13cfdaea214e1 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -1,12 +1,13 @@ -{ buildPythonPackage, fetchPypi, lib, pillow, tesseract, substituteAll }: +{ buildPythonPackage, fetchPypi, lib, packaging, pillow, tesseract, substituteAll }: buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.8"; + version = "0.3.9"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YUigHkN1dghi6PVupxjiK10TsoFFTfRuqNrJgHeT/Fo="; + sha256 = "sha256-fiuvx/SNG7cUQ85GM6VvXiGSWpjyIKNsM2KX7c0ZVtA="; }; patches = [ @@ -16,8 +17,14 @@ buildPythonPackage rec { }) ]; - buildInputs = [ tesseract ]; - propagatedBuildInputs = [ pillow ]; + buildInputs = [ + tesseract + ]; + + propagatedBuildInputs = [ + packaging + pillow + ]; # the package doesn't have any tests. doCheck = false; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index b8d3dffa3b0b9..da60feb724f8f 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-PE66ogjfzj6cW3+UD5nZHSt6zg7b+j6Q4ACznE4j0j8="; + hash = "sha256-9KN45+Pdz40rJv1NUxuoy8xWtLGt7kz7YcqfjfZ9x4A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index c1c918c4d60c2..767d300f7dd94 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { sha256 = "sha256-H2RtMGYWukowTTfqZSx+hikxzkqw1v5bA4AfZfiVl8U="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "pytest >= 5.0, < 7.0" "pytest >= 5.0" + ''; + propagatedBuildInputs = [ py-cid ]; diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 9536325ade513..569ac8606f6a1 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.17.3"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "sha256-cJRzjNIN9Fc8vcjmndW+akjxDSp+wFahY2MEslgXIwM="; + sha256 = "sha256-9LDbVZgTmfyYAWylUy6Q4KH2gKpAa/o4IhqQV31BVgY="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index e628e6a158c51..c06959b96c419 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 = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "821a8c5c9c4f3a3c52cfa9c541fbe89ac9e28728125125af53724c4c3f129117"; + sha256 = "sha256-T+Sybq0q93ZzDsI/WHDXQh81qs4ipBxOk4WG702Hh8s="; }; propagatedBuildInputs = [ isort ]; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 747411ad74558..b5a5775f56edd 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.13"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "582db6e14315f9b08cbd2df39b136dc344bfe8a27c2f05b995460fb0969ec19e"; + sha256 = "sha256-iE4HjS1TgK9WQzhOIzw1jpZZgl+y2X/9r48YXENMjYk="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 8c52fa2e69889..bec0ee59d0c5b 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.1"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1fa55723a4bf1d054fcba1c3bd694215a2a65cc95ab10164f5808afd893f3b11"; + sha256 = "sha256-n/o79AXBLFxr6ekuIr67arLJG5wy9FsPDJOvRzJpq1w="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-pythonpath/default.nix b/pkgs/development/python-modules/pytest-pythonpath/default.nix deleted file mode 100644 index 8c3fb48b430e6..0000000000000 --- a/pkgs/development/python-modules/pytest-pythonpath/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildPythonPackage, fetchPypi, lib, pytest }: - -buildPythonPackage rec { - pname = "pytest-pythonpath"; - version = "0.7.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ZOGVsjqPjAxjH7Fogtmtb6QTftHylh3dFdUgZc1DXbY="; - }; - - buildInputs = [ pytest ]; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest - ''; - - meta = with lib; { - description = - "Pytest plugin for adding to the PYTHONPATH from command line or configs"; - homepage = "https://github.com/bigsassy/pytest-pythonpath"; - maintainers = with maintainers; [ cript0nauta ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 6866df7b71258..99099d3ac9247 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-STWtZzbvhQ0NsSvl7jh0CjmYjmtRA/LTUQAAaze5Tg4="; + sha256 = "sha256-s+xM2zTo9idgYnXYuDTGXmDhowc+MmuzcnpCcnPQIh0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-runner/default.nix b/pkgs/development/python-modules/pytest-runner/default.nix index d99f72299dd7d..baca23d774913 100644 --- a/pkgs/development/python-modules/pytest-runner/default.nix +++ b/pkgs/development/python-modules/pytest-runner/default.nix @@ -1,20 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pytest +}: buildPythonPackage rec { pname = "pytest-runner"; - version = "5.3.1"; + version = "6.0.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0fce5b8dc68760f353979d99fdd6b3ad46330b6b1837e2077a89ebcf204aac91"; + sha256 = "sha256-tNhTYu0ptMNIZ43nl99Djw8FCUl924xkcJbAKm2HtoU="; }; - nativeBuildInputs = [ setuptools-scm pytest ]; - postPatch = '' rm pytest.ini ''; + nativeBuildInputs = [ + setuptools-scm + pytest + ]; + checkPhase = '' py.test tests ''; diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix index 1376d3e8412f8..bcd4abb4d4100 100644 --- a/pkgs/development/python-modules/pytest-socket/default.nix +++ b/pkgs/development/python-modules/pytest-socket/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytest-socket"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "miketheman"; repo = pname; rev = version; - hash = "sha256-HdGkpIHFsoAG2+8UyL9jSb3Dm8bWkYzREdY3i15ls/Q="; + hash = "sha256-QKHnuq2pqWMVUhF9nnhJggEK6SSyp6zBEfQX9tGND2E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index d5e379b524d5f..b1df1ceaad678 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Pr0wao3PdRM/F0LyiMgvNkJuvPihMtTuiXgtIOhPwTo="; + sha256 = "sha256-lcRMd+P77emEi7iMqQs4SBX8uoCQ75qfVWWasWOxaBw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 1b291778b2ad6..3a39700186525 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.2.2"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e69d5aeac4e371986f94e8ad06e56d70633870d026f2306fca44051f02fcb688"; + sha256 = "sha256-1Qyroq6Dv11EaCGRAj19bKQBfRz26XSh5TJY7xA/vBE="; }; propagatedBuildInputs = [ coverage ]; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index f99340e48b3b2..e380068c59d35 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e6f98b54dafde8d70e4088467ff621260b641eb64895c4195b6e5c8f45638112"; + sha256 = "sha256-wHygdATGEvirviIpSyPDaOLlEEtSHBeQGVVh834aw9k="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 0b1bb2b02030b..109e918285881 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,5 +1,4 @@ { lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy -, pythonAtLeast, fetchpatch , atomicwrites , attrs , hypothesis @@ -13,29 +12,21 @@ , setuptools , setuptools-scm , six -, toml +, tomli , wcwidth , writeText }: buildPythonPackage rec { pname = "pytest"; - version = "6.2.5"; + version = "7.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"; + sha256 = "sha256-4wkFoMEx09lLiWJKHMWv7D4LovvbFRhn2ODr1JhQ8XE="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - (fetchpatch { - # Fix test_errors_in_xfail_skip_expressions for Python 3.10.1, remove after 6.2.5 - url = "https://github.com/pytest-dev/pytest/commit/913439f5e5691f391e2969b3c8f0a49e50dce43a.patch"; - sha256 = "0hsl3lww6bx5k99cp8gj0fy9rg02kcfbwiiwjx2y8vbhwd5ns41p"; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ @@ -48,7 +39,7 @@ buildPythonPackage rec { py setuptools six - toml + tomli wcwidth ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; @@ -95,7 +86,7 @@ buildPythonPackage rec { # - files are not needed after tests are finished pytestRemoveBytecodePhase () { # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/6.2.5/src/_pytest/assertion/rewrite.py#L51-L53 + # https://github.com/pytest-dev/pytest/blob/7.0.1/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } preDistPhases+=" pytestRemoveBytecodePhase" diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index fe421fa55d386..2f08341a2c4f6 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "8.2.0"; + version = "8.3.0"; src = fetchPypi { inherit pname version; - sha256 = "7b2f08a2d1cc05d2c1f84f02fadb2208678b1acb501acfe2de33720078ec7b9f"; + sha256 = "sha256-4AEDh1Ap3IXLtZEx0AzMhTT2kpVqzeMrWjzFr0wkWAs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 074e5699e3d5a..cc12b14aa153e 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -51,6 +51,11 @@ buildPythonPackage rec { }) ]; + disabledTestPaths = [ + # requires removed distutils.command + "test_version.py" + ]; + disabledTests = [ "begin_with_TestCase" "changelog_TestCase" diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 60e6f2e745526..378c58f02364f 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.25.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = version; - sha256 = "0zg2aib0k6hc1vvlbdcmp003m85dvkv7pndzgkc4vv2y9qpi0jp9"; + sha256 = "sha256-kavbWMTgKU/rBIo7RMs9NkwReYQyEdeFwMBSzEM9wa0="; }; prePatch = '' diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 754bac51ea682..3d290ae5eda5e 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -19,11 +19,11 @@ buildPythonApplication rec { pname = "python-glanceclient"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "417b9d814b43e62df4351f26a0d5569b801e9f99f7758bd8c82ef994c3629356"; + sha256 = "sha256-gi1IYtWJL2pltoKTRy5gsHTRwHlp0GHoBMbh1UP5g9o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index 8ba5c7dd21fc8..d78682a8c66cf 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -22,11 +22,11 @@ buildPythonApplication rec { pname = "python-heatclient"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "b610748eb3f18f6bd762e0808accdf872308289a77c3b19ed2d8b9f306393a42"; + sha256 = "sha256-3l7XyxKm18BAM1DhNsCmRwcZR224+8m/jQ1YHrwLHCs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index c193cf7cd1ad9..83449a9285d3a 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonApplication rec { pname = "python-ironicclient"; - version = "4.10.0"; + version = "4.11.0"; src = fetchPypi { inherit pname version; - sha256 = "8f3ad8ae1fc4df524ea05a458ad2567b58144e881807dbbb985e282902d732fd"; + sha256 = "sha256-zGG/3Cq7mARyuGGvqa4KGWFmx/UN+W2KMuy+RNenzXM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index a2da2e4f4a761..09dc46ba9552c 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,11 +22,11 @@ buildPythonApplication rec { pname = "python-manilaclient"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo="; + sha256 = "sha256-JFfkbJHmDQFbiWXw0Wp+0xSLyXowIHnsw7+5irZwhXo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index afc8a51988ed2..e654c75bfe88a 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "17.6.0"; + version = "17.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yRDCCFMQ2mNfs0NYXxBwcS/w+cs8j3nUTKPWMsTyMPU="; + sha256 = "sha256-Trwn9M4GwVW46ZGkRGO5NYWW5oVs8XHJr43HVo2Gi+0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 16c4dc0f23085..2f22a20afb357 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "6.1.0"; + version = "6.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7/GQ5N+sl9L4wYkO5oJwns0jZQdCNhaH24LZXh5eJfU="; + hash = "sha256-AAAzl/TjFBTpIs5WezpNoozxQ2pT0zLJrutRx9jEaf0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index fe4d6ea7bda7d..397fcaa3dd0d1 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -4,35 +4,33 @@ , isPyPy , snappy , cffi -, nose +, python }: buildPythonPackage rec { pname = "python-snappy"; - version = "0.6.0"; + version = "0.6.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "06l9my361ig4x5ycyrmq33q83zcdib3y2zxfxv7k7dlpyp9ri2hn"; + sha256 = "sha256-tqEHqwYgasxTWdTFYyvZsi1EhwKnmzFpsMYuD7gIuyo="; }; buildInputs = [ snappy ]; propagatedBuildInputs = lib.optional isPyPy cffi; - checkInputs = [ nose ]; - checkPhase = '' - rm -r snappy # prevent local snappy from being picked up - nosetests test_snappy.py - '' + lib.optionalString isPyPy '' - nosetests test_snappy_cffi.py + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck ''; meta = with lib; { description = "Python library for the snappy compression library from Google"; homepage = "https://github.com/andrix/python-snappy"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index cb3b5b850e36b..8c1e38ed45e07 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "3.13.0"; + version = "3.13.1"; src = fetchPypi { inherit pname version; - sha256 = "b200dcfbc6842bd4cac29efd0ea9ef34d3b8625957472ba7aa3ae0242437e2cc"; + sha256 = "sha256-LSbJC2OS9r76f7sW/Np75Eqibiropb7icF0dHIE4M/A="; }; propagatedBuildInputs = [ pbr python-keystoneclient ]; diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index a21ee97eca5db..8bc9cf3090f04 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -3,14 +3,14 @@ isodate, lxml, xmlsec, freezegun }: buildPythonPackage rec { pname = "python3-saml"; - version = "1.12.0"; + version = "1.14.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "onelogin"; repo = "python3-saml"; rev = "v${version}"; - sha256 = "sha256-VPUsjuo4FIes8ti0tkR0kT3J3RdUt1wtl4QEahVsc2c="; + sha256 = "sha256-TAfVXh1fSKhNn/lsi7elq4wFyKCxCtCYUTrnH3ytBTw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 271d193ce019f..73c1987fb3c92 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -38,6 +38,14 @@ buildPythonPackage rec { # pelican requires > 2.7 doCheck = !pythonOlder "3.6"; + disabledTests = [ + # incompatible with pytest7 + # https://github.com/bobfang1992/pytomlpp/issues/66 + "test_loads_valid_toml_files" + "test_round_trip_for_valid_toml_files" + "test_decode_encode_binary" + ]; + preCheck = '' cd tests ''; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 7dcd86705a35d..f4710872cbe86 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -3,34 +3,36 @@ , fetchPypi , pythonOlder , decorator -, appdirs -, six , numpy -, pytest +, platformdirs +, pytestCheckHook }: buildPythonPackage rec { pname = "pytools"; - version = "2021.2.9"; + version = "2022.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "db6cf83c9ba0a165d545029e2301621486d1e9ef295684072e5cd75316a13755"; + sha256 = "sha256-GXqs9uH11gxxW5JDh5Kst3Aq7Vnrv7FH+oTtp4DlT+4="; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ decorator - appdirs - six numpy + platformdirs + ]; + + checkInputs = [ + pytestCheckHook ]; - checkPhase = '' - py.test -k 'not test_persistent_dict' - ''; + pythonImportsCheck = [ + "pytools" + "pytools.batchjob" + "pytools.lex" + ]; meta = { homepage = "https://github.com/inducer/pytools/"; diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index de75aa0ae8fbd..d3c9a96551591 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -6,12 +6,12 @@ , pytestCheckHook , pytorch , pyyaml -, tensorflow-tensorboard +, tensorboard , tqdm }: buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.5.8"; + version = "1.5.10"; disabled = isPy27; @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "PyTorchLightning"; repo = pname; rev = version; - sha256 = "161mz66l11z4350q93fmmq3x0jzbp5761lf4fx3yvz17qzp7ygkn"; + sha256 = "sha256-GP6/VZuRv8dS5wKQW7RbtOSa2vV9Af2Jp+ioEW3bIgc="; }; propagatedBuildInputs = [ future pytorch pyyaml - tensorflow-tensorboard + tensorboard tqdm ]; diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index e9728b3d676c5..64dfca2e94b03 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 = "1.1.0"; + version = "1.2.0"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "v${version}"; - sha256 = "0qvlxgdml22fzrs47yzqpfzak8lfdrzayvapawfz93cq8903h7qp"; + sha256 = "sha256-M/iH+pIuamOmvxLtKMzWXiuMCnMXzpVFRb/HfYfCKdc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 46bd35b9cfb85..3c239d970402c 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "v${version}"; - sha256 = "1ch4vhz3zjanj5advqsj51yy7idrp8yvydvcg4ymwa3wsfjrx58g"; + sha256 = "sha256-gB575ZKXZRAy5K5CkBtfG6KG1yQ9WDREIobsy43CEOc="; }; propagatedBuildInputs = [ numpy pytorch typing-extensions ]; diff --git a/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch b/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch new file mode 100644 index 0000000000000..33a2304cb9b1a --- /dev/null +++ b/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c4099..499be0a986 100644 +--- a/third_party/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/third_party/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index c370eaf6a9426..24ba74a1013b2 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python, +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, cudaSupport ? false, cudatoolkit, cudnn, nccl, magma, mklDnnSupport ? true, useSystemNccl ? true, MPISupport ? false, mpi, @@ -12,7 +12,7 @@ numactl, # Propagated build inputs - dataclasses, numpy, pyyaml, cffi, click, typing-extensions, + numpy, pyyaml, cffi, click, typing-extensions, # Unit tests hypothesis, psutil, @@ -25,7 +25,7 @@ ninja, # dependencies for torch.utils.tensorboard - pillow, six, future, tensorflow-tensorboard, protobuf, + pillow, six, future, tensorboard, protobuf, isPy3k, pythonOlder }: @@ -117,9 +117,10 @@ let in buildPythonPackage rec { pname = "pytorch"; # Don't forget to update pytorch-bin to the same version. - version = "1.10.2"; + version = "1.11.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7.0"; outputs = [ "out" # output standard python package @@ -132,10 +133,15 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-QcvoJqpZJXPSc9HLCJHetrp/hMESuC5kYl90d7Id0ZU="; + sha256 = "sha256-CEu63tdRBAF8CTchO3Qu8gUNObQylX6U08yDTI4/c/0="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = [ + # Fix for a breakpad incompatibility with glibc>2.33 + # https://github.com/pytorch/pytorch/issues/70297 + # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e + ./breakpad-sigstksz.patch + ] ++ lib.optionals stdenv.isDarwin [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) # that is available starting with macOS 10.13. However, our current @@ -144,13 +150,6 @@ in buildPythonPackage rec { ./pthreadpool-disable-gcd.diff ]; - # The dataclasses module is included with Python >= 3.7. This should - # be fixed with the next PyTorch release. - postPatch = '' - substituteInPlace setup.py \ - --replace "'dataclasses'" "'dataclasses; python_version < \"3.7\"'" - ''; - preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ @@ -208,7 +207,7 @@ in buildPythonPackage rec { # https://github.com/pytorch/pytorch/issues/22346 # # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: - # https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17 + # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17 NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]; nativeBuildInputs = [ @@ -230,9 +229,8 @@ in buildPythonPackage rec { pyyaml typing-extensions # the following are required for tensorboard support - pillow six future tensorflow-tensorboard protobuf - ] ++ lib.optionals MPISupport [ mpi ] - ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]; + pillow six future tensorboard protobuf + ] ++ lib.optionals MPISupport [ mpi ]; checkInputs = [ hypothesis ninja psutil ]; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index aabf9cd5de521..99c2d03359040 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.22.0"; + version = "0.23.2"; src = fetchPypi { inherit pname version; - sha256 = "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9"; + sha256 = "sha256-Mq41hbMgpRvCg+CgQAD9iiVZnttEVB4vUDT2r+5dFcw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index 2d276c6dccab9..2f1870dd1c852 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub , libuv }: @@ -7,6 +8,7 @@ buildPythonPackage rec { pname = "pyuv"; version = "1.4.0"; + disabled = pythonAtLeast "3.10"; # https://github.com/saghul/pyuv/issues/273 src = fetchFromGitHub { owner = "saghul"; diff --git a/pkgs/development/python-modules/pyvcf/default.nix b/pkgs/development/python-modules/pyvcf/default.nix index 7c513617754fb..919477298b152 100644 --- a/pkgs/development/python-modules/pyvcf/default.nix +++ b/pkgs/development/python-modules/pyvcf/default.nix @@ -28,5 +28,6 @@ buildPythonPackage rec { vcf will attempt to parse the content of each record based on the data types specified in the meta-information lines ''; + broken = true; # uses the 2to3 feature, that got removed in setuptools 0.58 }; } diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix index 8e41d26921fa9..115014a25bbb7 100644 --- a/pkgs/development/python-modules/pyverilog/default.nix +++ b/pkgs/development/python-modules/pyverilog/default.nix @@ -5,7 +5,6 @@ , jinja2 , ply , verilog -, pytest-pythonpath , pytestCheckHook }: @@ -32,8 +31,12 @@ buildPythonPackage rec { verilog ]; + preCheck = '' + substituteInPlace pytest.ini \ + --replace "python_paths" "pythonpath" + ''; + checkInputs = [ - pytest-pythonpath pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index db7bd82b652b6..0547f3edd9386 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pywbem"; - version = "1.4.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "52f668f7ee1f03bdd80485692b648588b3e1909e2dc0754dceca497f5e9cf059"; + sha256 = "sha256-rYu75Kt+eVciwPJ/JlbJL8Zzp+BqFM0VGlDwMGRU0X4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 67f11ed291f5b..2a369ca5704fa 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pywebview"; - version = "3.5"; + version = "3.6.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "r0x0r"; repo = "pywebview"; rev = version; - sha256 = "sha256-+At/ToEylSPcLh/u2NHVTXQpMnw+2/afsevg5YAX/4c="; + sha256 = "sha256-9o9ghqvU9Hnmf2aj/BqX7WBgS9ilRSnicR+qd25OfjI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 51c762c810753..a24ecdb8ff156 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "qiling"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e72dc5856cbda975f962ddf063063a32bd6c3b825f75e0795e94ba6840a7d45f"; + sha256 = "sha256-myUGzNP4bf90d2gY5ZlYbVlTG640dj/Qha8/aMydvuw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 511bc0b2a0bed..ad00a16a880ea 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.3.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "0jycs18apnwrksarpwpmp7scndyx91vnv6fchil4jyx4kym8mnf9"; + sha256 = "sha256-8tnd6+tqofKuK/sBdqmClBtywHbu3VvwLjO9k4YoChA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 5c4984ca3f813..ad5530712f2c2 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "QtPy"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "777e333df4d711b2ec9743117ab319dadfbd743a5a0eee35923855ca3d35cd9d"; + sha256 = "sha256-rf0HP/vS3oHceqoLmDSZ71xZyWrc/cyd6mDULKiF648="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 8d19e360ca4d5..c1f078ecc1381 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -1,57 +1,69 @@ { lib, stdenv, fetchFromGitHub, buildPythonPackage, python, packaging, numpy -, cython, scipy, matplotlib, pytestCheckHook, pytest-rerunfailures }: +, cython, scipy, matplotlib, pytestCheckHook, pytest-rerunfailures +, doCheck ? false +}: -buildPythonPackage rec { - pname = "qutip"; - version = "4.6.3"; +let + self = buildPythonPackage rec { + pname = "qutip"; + version = "4.6.3"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk="; - }; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk="; + }; + + # QuTiP says it needs specific (old) Numpy versions. We overwrite them here + # as the tests work perfectly fine with up-to-date packages. + postPatch = '' + substituteInPlace setup.cfg --replace "numpy>=1.16.6,<1.20" "numpy>=1.16.6" + ''; + + # Disabling OpenMP support on Darwin. + setupPyGlobalFlags = lib.optional (!stdenv.isDarwin) "--with-openmp"; + + propagatedBuildInputs = [ + packaging + numpy + cython + scipy + matplotlib + ]; + + checkInputs = [ + pytestCheckHook + pytest-rerunfailures + ]; + + # test suite is very cpu intensive + inherit doCheck; + # - QuTiP tries to access the home directory to create an rc file for us. + # This of course fails and therefore, we provide a writable temp dir as HOME. + # - We need to go to another directory to run the tests from there. + # This is due to the Cython-compiled modules not being in the correct location + # of the source tree. + # - For running tests, see: + # https://qutip.org/docs/latest/installation.html#verifying-the-installation + checkPhase = '' + export OMP_NUM_THREADS=$NIX_BUILD_CORES + export HOME=$(mktemp -d) + mkdir -p test && cd test + ${python.interpreter} -c "import qutip.testing; qutip.testing.run()" + ''; + + pythonImportsCheck = [ "qutip" ]; + + passthru.tests = { + all-tests = self.override { doCheck = true; }; + }; - # QuTiP says it needs specific (old) Numpy versions. We overwrite them here - # as the tests work perfectly fine with up-to-date packages. - postPatch = '' - substituteInPlace setup.cfg --replace "numpy>=1.16.6,<1.20" "numpy>=1.16.6" - ''; - - # Disabling OpenMP support on Darwin. - setupPyGlobalFlags = lib.optional (!stdenv.isDarwin) "--with-openmp"; - - propagatedBuildInputs = [ - packaging - numpy - cython - scipy - matplotlib - ]; - - checkInputs = [ - pytestCheckHook - pytest-rerunfailures - ]; - - # - QuTiP tries to access the home directory to create an rc file for us. - # This of course fails and therefore, we provide a writable temp dir as HOME. - # - We need to go to another directory to run the tests from there. - # This is due to the Cython-compiled modules not being in the correct location - # of the source tree. - # - For running tests, see: - # https://qutip.org/docs/latest/installation.html#verifying-the-installation - checkPhase = '' - export OMP_NUM_THREADS=$NIX_BUILD_CORES - export HOME=$(mktemp -d) - mkdir -p test && cd test - ${python.interpreter} -c "import qutip.testing; qutip.testing.run()" - ''; - - meta = with lib; { - description = "Open-source software for simulating the dynamics of closed and open quantum systems"; - homepage = "https://qutip.org/"; - license = licenses.bsd3; - maintainers = [ maintainers.fabiangd ]; + meta = with lib; { + description = "Open-source software for simulating the dynamics of closed and open quantum systems"; + homepage = "https://qutip.org/"; + license = licenses.bsd3; + maintainers = [ maintainers.fabiangd ]; + }; }; -} +in self diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 1ec6448d74c16..3e5f7fb4503ae 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,30 +1,84 @@ -{ buildPythonPackage, lib, fetchFromGitHub, isPy3k -, cython, setuptools -, numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pytest-cov, packaging, hypothesis, boto3, mock -, certifi, shapely +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build time +, cython +, gdal + +# runtime +, affine +, attrs +, boto3 +, click +, click-plugins +, cligj +, matplotlib +, numpy +, snuggs + +# tests +, hypothesis +, packaging +, pytest-randomly +, pytestCheckHook +, shapely }: buildPythonPackage rec { pname = "rasterio"; - version = "1.2.6"; + version = "1.2.10"; # not x.y[ab]z, those are alpha/beta versions + format = "pyproject"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { - owner = "mapbox"; + owner = "rasterio"; repo = "rasterio"; rev = version; - sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc="; + hash = "sha256-xVGwQfQvxsqYihUYXENJAz9Qp9xBkhsGc/RheRTJxgo="; }; - checkInputs = [ boto3 pytest pytest-cov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; - nativeBuildInputs = [ cython gdal ]; - propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; + nativeBuildInputs = [ + cython + gdal + ]; + + propagatedBuildInputs = [ + affine + attrs + boto3 + click + click-plugins + cligj + matplotlib + numpy + snuggs + ]; + + preCheck = '' + rm -rf rasterio + ''; + + checkInputs = [ + pytest-randomly + pytestCheckHook + packaging + hypothesis + shapely + ]; + + pytestFlagsArray = [ + "-m 'not network'" + ]; + + pythonImportsCheck = [ + "rasterio" + ]; meta = with lib; { description = "Python package to read and write geospatial raster data"; - license = licenses.bsd3; homepage = "https://rasterio.readthedocs.io/en/latest/"; + license = licenses.bsd3; maintainers = with maintainers; [ mredaelli ]; }; } diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 0731487575b1a..7cd59a5528a7f 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "redis"; - version = "4.1.0"; + version = "4.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IfCiO85weQkHbmuizgdsulm/9g0qsily4GR/32IP/kc="; + sha256 = "sha256-HZoM34n92T+EJhcz4k9Vp7vUE6myGf2vVuPnKMqaIwY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 86e591eaf14f1..512a7162f0e3c 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.1.18"; + version = "2022.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-l/MtwDqAVKTEpatddh7Uhh6CiywgD+vU5GhXBppIORY="; + hash = "sha256-eeWvH/JYvA/gvdb2m8SuM5NaiY48vvu8zyLoiif6BTs="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 82d84dc26a974..629f8d0ec750e 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.6.5"; + version = "3.6.8"; src = fetchPypi { inherit pname version; - sha256 = "d8fe27ad312671c9347cf5997f7c1017833fac17233f33296281ba9fa0de189a"; + sha256 = "sha256-3HZX/LC8PkhcPIaaRN3bUtcRNWoBpFZmS3vvgnIiyYI="; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index aed6576c90dfc..d42de957791e4 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "requests-oauthlib"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0smaxs5ixng4z0k6dsgmm6s972ka3p6a2ykdpnl23mqzlw0ic9ml"; + sha256 = "sha256-db6sSkeIHuuU1epdatMe+IhWr/4jMrmq+1LGRSzPDXo="; }; propagatedBuildInputs = [ oauthlib requests ]; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 01c7a5e78c62e..0033794ef4371 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "d3b10a1fe2ecac537e51ae6d151b223b78de9fafdd50e5eb6b08c243df173c80"; + sha256 = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; }; checkInputs = [ nose testtools ]; diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 63e87609ac25b..74810c7761f53 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robotframework"; repo = "statuschecker"; - rev = version; + rev = "refs/tags/v${version}"; sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz"; }; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index d90d1052282dc..8582c0ac72923 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.1.0"; + version = "2022.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6bafc1f6b4e935ea59512c0f38d5cb9c299dbbfe738e40c3d1de8f67b4ee1fd4"; + sha256 = "sha256-RhHQ9+QeW8nawwCQcOCtN9qHpC9t73W0gTwG9+QEpzg="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 80c4bd92a385a..d18d939be606b 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.75.1"; + version = "2.77.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MN/F7TWaKsQpKMR7Pxx0Vam1+O+PFEJ/H5jLJh3zpe4="; + sha256 = "sha256-RX3QcjGDWYaPC9lKz/nJSMTO3jeXxY7MW98fHYfcLq0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 4bc446c2e1425..3fb60ebaa9e5c 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -1,11 +1,10 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , httpx -, pytest-asyncio , sanic , websockets +, callPackage }: buildPythonPackage rec { @@ -19,11 +18,14 @@ buildPythonPackage rec { sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8"; }; + outputs = [ + "out" + "testsout" + ]; + postPatch = '' - # https://github.com/sanic-org/sanic-testing/issues/19 substituteInPlace setup.py \ - --replace '"websockets==8.1",' '"websockets>=9.1",' \ - --replace "httpx==0.18.*" "httpx" + --replace "httpx>=0.18,<0.22" "httpx" ''; propagatedBuildInputs = [ @@ -32,18 +34,18 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ - pytest-asyncio - pytestCheckHook - ]; + postInstall = '' + mkdir $testsout + cp -R tests $testsout/tests + ''; - # `sanic` is explicitly set to null when building `sanic` itself - # to prevent infinite recursion. In that case we skip running - # the package at all. - doCheck = sanic != null; - dontUsePythonImportsCheck = sanic == null; + # check in passthru.tests.pytest to escape infinite recursion with sanic + doCheck = false; + doInstallCheck = false; - pythonImportsCheck = [ "sanic_testing" ]; + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { description = "Core testing clients for the Sanic web framework"; diff --git a/pkgs/development/python-modules/sanic-testing/tests.nix b/pkgs/development/python-modules/sanic-testing/tests.nix new file mode 100644 index 0000000000000..6a228a9823102 --- /dev/null +++ b/pkgs/development/python-modules/sanic-testing/tests.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, sanic +, sanic-testing +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage { + pname = "sanic-testing-tests"; + inherit (sanic-testing) version; + + src = sanic-testing.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + sanic + ]; + + pythonImportsCheck = [ + "sanic_testing" + ]; +} diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 63c24e9936fcb..460927719ad53 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -40,9 +40,12 @@ buildPythonPackage rec { postPatch = '' # Loosen dependency requirements. substituteInPlace setup.py \ - --replace '"pytest==6.2.5"' '"pytest"' \ - --replace '"gunicorn==20.0.4"' '"gunicorn"' \ - --replace '"pytest-sanic",' "" \ + --replace "pytest==6.2.5" "pytest" \ + --replace "gunicorn==20.0.4" "gunicorn" \ + --replace "multidict>=5.0,<6.0" "multidict" + + sed '/pytest-sanic/d' setup.py + # Patch a request headers test to allow brotli encoding # (we build httpx with brotli support, upstream doesn't). substituteInPlace tests/test_headers.py \ @@ -118,6 +121,8 @@ buildPythonPackage rec { "test_num_workers" "test_server_run" "test_version" + # Sensitive comparison of raw HTTP header fails + "test_raw_headers" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index bea5b766b5c91..f7be7f0107c01 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.2.20220103095339"; + version = "8.2.20220204150214"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "051690a2f89b98e35100cd2cb489406a5169a60c2f27a716f3f287a42d45be2d"; + sha256 = "sha256-PlPb/nE3eWueUTWSDpa7JxPe2ee+KFna5VTR3IsClwQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index bc72f76bf2237..3fefba47cbda6 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.12.0"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "f851382c469bcd9a8c98b1878bcfdd13b68556279d2fd9a329be41956ae5a7fe"; + sha256 = "sha256-XRd0ousVmI4IHFgsJUq0qXUgluajTyNUEct5vWFmDDc="; }; propagatedBuildInputs = [ @@ -66,6 +66,8 @@ buildPythonPackage rec { "test_install_command" # tries to alter out path "test_test_command" # tries to alter out path "test_setup" # tries to install using distutils + "test_pep518" # pip exits with code 1 + "test_dual_pep518" # pip exits with code 1 ]); checkPhase = '' diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index b06c1cb5db48b..45239f64fbef9 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -16,89 +16,98 @@ , imageio , tifffile , pytestCheckHook +, doCheck ? false }: let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; -in buildPythonPackage rec { - pname = "scikit-image"; - version = "0.18.3"; + self = buildPythonPackage rec { + pname = "scikit-image"; + version = "0.18.3"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh"; - }; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh"; + }; + + patches = [ ./add-testing-data.patch ]; - patches = [ ./add-testing-data.patch ]; + nativeBuildInputs = [ cython ]; - nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ + cloudpickle + dask + imageio + matplotlib + networkx + numpy + pillow + pywavelets + scipy + six + tifffile + ]; - propagatedBuildInputs = [ - cloudpickle - dask - imageio - matplotlib - networkx - numpy - pillow - pywavelets - scipy - six - tifffile - ]; + # test suite is very cpu intensive, move to passthru.tests + inherit doCheck; + checkInputs = [ pytestCheckHook ]; - checkInputs = [ pytestCheckHook ]; + # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; + # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed; + # (3) Therefore, tests should be run on the installed package in nix store. - # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; - # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed; - # (3) Therefore, tests should be run on the installed package in nix store. + # See e.g. https://discourse.nixos.org/t/cant-import-cythonized-modules-at-checkphase/14207 on why the following is needed. + preCheck = '' + rm -r skimage + ''; - # See e.g. https://discourse.nixos.org/t/cant-import-cythonized-modules-at-checkphase/14207 on why the following is needed. - preCheck = '' - rm -r skimage - ''; + disabledTestPaths = [ + # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error). + "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py" + ]; + pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) ([ + # These tests require network access + "skimage/data/test_data.py::test_skin" + "skimage/data/tests/test_data.py::test_skin" + "skimage/io/tests/test_io.py::test_imread_http_url" + "skimage/restoration/tests/test_rolling_ball.py::test_ndim" + ] ++ lib.optionals stdenv.isDarwin [ + # Matplotlib tests are broken inside darwin sandbox + "skimage/feature/tests/test_util.py::test_plot_matches" + "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" + "skimage/io/tests/test_mpl_imshow.py::" + ]); - disabledTestPaths = [ - # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error). - "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py" - ]; - pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) ([ - # These tests require network access - "skimage/data/test_data.py::test_skin" - "skimage/data/tests/test_data.py::test_skin" - "skimage/io/tests/test_io.py::test_imread_http_url" - "skimage/restoration/tests/test_rolling_ball.py::test_ndim" - ] ++ lib.optionals stdenv.isDarwin [ - # Matplotlib tests are broken inside darwin sandbox - "skimage/feature/tests/test_util.py::test_plot_matches" - "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" - "skimage/io/tests/test_mpl_imshow.py::" - ]); + # Check cythonized modules + pythonImportsCheck = [ + "skimage" + "skimage._shared" + "skimage.draw" + "skimage.feature" + "skimage.restoration" + "skimage.filters" + "skimage.future.graph" + "skimage.graph" + "skimage.io" + "skimage.measure" + "skimage.morphology" + "skimage.transform" + "skimage.util" + "skimage.segmentation" + ]; - # Check cythonized modules - pythonImportsCheck = [ - "skimage" - "skimage._shared" - "skimage.draw" - "skimage.feature" - "skimage.restoration" - "skimage.filters" - "skimage.future.graph" - "skimage.graph" - "skimage.io" - "skimage.measure" - "skimage.morphology" - "skimage.transform" - "skimage.util" - "skimage.segmentation" - ]; + passthru.tests = { + all-tests = self.override { doCheck = true; }; + }; - meta = { - description = "Image processing routines for SciPy"; - homepage = "https://scikit-image.org"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ yl3dy ]; + meta = { + description = "Image processing routines for SciPy"; + homepage = "https://scikit-image.org"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yl3dy ]; + }; }; -} +in + self diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 9c3b28e0a9aca..85708822cc2bb 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.7.3"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf"; + sha256 = "sha256-MdTy1rckvJqY5Se1hJuKflib8epjDDOqVj7akSyf8L0="; }; nativeBuildInputs = [ cython gfortran pythran ]; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index dbb85c9111029..87c2ebc4b6695 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -126,6 +126,8 @@ buildPythonPackage rec { "tests/integrations/chalice/" # broken since rq-1.10.1: https://github.com/getsentry/sentry-python/issues/1274 "tests/integrations/rq/" + # broken since pytest 7.0.1; AssertionError: previous item was not torn down properly + "tests/utils/test_contextvars.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index d2b36af12a3ba..a9319779060ea 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.11.4"; + version = "1.11.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "17d6g7zfhlgd2n4mimjarl2x4hl7ww2lb4izidlns1hzqm8igg4y"; + sha256 = "sha256-/uaFEQnilcelHKjbmrnyLm5Mzj2V8P4oEH+cgJn+KvI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 5cd8136f84efa..be9cae0e17873 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.5.0"; + version = "6.5.1"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "a1cf8431a8eb9392b3ff6dc61d832d0447bfdcae5b3e4256a5fa74dbc25b0734"; + sha256 = "sha256-IE8CQNuJmadJ1jiph7NRhhhD5pI5uBHsPRiBQSw3BqY="; }; propagatedBuildInputs = [ packaging toml ]; diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index b5d826c8f8efb..562346b1a476f 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.8.3"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m9C+uzwrEOcbkvBQ3Z+to2BsX2i7cLnUiV/+L7hMUdE="; + sha256 = "sha256-u3brP3WsnoqRy3R0OQQkIbq+avS7nemx9GKpvTq+vxg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/socksio/default.nix b/pkgs/development/python-modules/socksio/default.nix new file mode 100644 index 0000000000000..5d42ed6e8ecc5 --- /dev/null +++ b/pkgs/development/python-modules/socksio/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonAtLeast +, flit-core +, pytestCheckHook +}: + +let + pname = "socksio"; + version = "1.0.0"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-+IvrPaW1w4uYkEad5n0MsPnUlLeLEGyhhF+WwQuRxKw="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + # remove coverage configuration + preCheck = '' + rm pytest.ini + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5"; + homepage = "https://github.com/sethmlarson/socksio"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 2f70732caa316..d203f8709c375 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.1.3"; + version = "1.1.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f4f553d3d2a065147a8c1292b5d9adf050c0f78dd15bb05c9614341cf88c5574"; + sha256 = "sha256-G09bZiXTdEuukvKjPOYYTW/B19d406QSRDOU5ZflDDU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index cfeaf08fb33f4..40e393b57d6cf 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 = "5.2.1"; + version = "5.2.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b318a70a75acd200018a547d2ff2d2f55e7507054469d0c77ec6f967ac3c2d28"; + sha256 = "sha256-3DIikQlsc7Ptagi8ddR5ia+u24dXeBdppRkIn/xp3bg="; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 1d6406c5db13c..d379fc9294288 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.31"; + version = "1.4.32"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WCtZ0eV4CkR6raIrRh5QtASp3AV2jaHYc2itgZBGhBg="; + sha256 = "sha256-b90txZMdqrd4wrZbA99q5oN24CijCY62JNCQnZmYhbw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 1084a50be7707..00283cd9ec9ce 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.17.1"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-qT/w7r8PsrauLoBolwCGpxiwhDZo3z6hIqKVXeY5yqA="; + sha256 = "sha256-N2X9pjCiQ6TKRcm6VlyybLLyCdjQuIZHu1vK99gY8rY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 8ea42d1f27953..55f74b58fb520 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -1,34 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi -, coverage +{ lib +, buildPythonPackage +, fetchFromGitHub , mock , ply -, pytest-runner , pytestCheckHook , six }: buildPythonPackage rec { pname = "stone"; - version = "3.2.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0xby5mpsms7b2rv8j6mvxzmzz5i9ii01brb9ylxz6kiv2i08piwv"; + version = "3.3.1"; + + # pypi sdist misses requirements.txt + src = fetchFromGitHub { + owner = "dropbox"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0FWdYbv+paVU3Wj6g9OrSNUB0pH8fLwTkhVIBPeFB/U="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner == 5.2.0" "pytest-runner" \ - --replace "pytest < 5" "pytest" - substituteInPlace test/requirements.txt \ - --replace "coverage==5.3" "coverage" + sed -i '/pytest-runner/d' setup.py ''; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ ply six ]; - checkInputs = [ pytestCheckHook coverage mock ]; + checkInputs = [ pytestCheckHook mock ]; # try to import from `test` directory, which is exported by the python interpreter # and cannot be overriden without removing some py3 to py2 support diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 68e35a1d0eca7..66a9b7e0d82ce 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # whole testsuite is very CPU intensive, only run core tests + # TODO: move entire test suite to passthru.tests + "tests/test_core.py" + ]; + meta = with lib; { description = "A powerful and scalable library that can be used for a variety of time series data mining tasks"; homepage = "https://github.com/TDAmeritrade/stumpy"; diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index af307919387f6..f2776265b067f 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { description = "Lightweight SOAP client (Jurko's fork)"; homepage = "https://bitbucket.org/jurko/suds"; license = licenses.lgpl3; + broken = true; # Uses use2to3, which has been removed in setuptools>=58 }; } diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 4e61f8665ba6a..9c88dc3462aca 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.1.3"; + version = "3.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4acb05a05c7e6a2090cd0bb426b34c7e1620be0de2bf90a95a3f48ba15a5fce2"; + sha256 = "sha256-TDslY1KUohR9zyyJ6+B95MMMsUL1TBl49L+nSCvZ9nI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index 9890a7000a9af..af600f623423c 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -3,21 +3,25 @@ , fetchFromGitHub , setuptools-scm , pyqt5 +, qtpy , typing-extensions , pytest , pytestCheckHook -}: buildPythonPackage rec { +}: + +buildPythonPackage rec { pname = "superqt"; - version = "0.2.5-1"; + version = "0.3.1"; + src = fetchFromGitHub { owner = "napari"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rkTiCJ8mIogS9SDmLPiaAyhhuBx3kk6rXjCc19zbwiM="; + sha256 = "sha256-DPjJxOgybNvZ3YvYHr48fmx59Puck61Dzm2G4M9qKo4="; }; format = "pyproject"; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ pyqt5 typing-extensions ]; + propagatedBuildInputs = [ pyqt5 qtpy typing-extensions ]; checkInputs = [ pytestCheckHook pytest ]; doCheck = false; # Segfaults... SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index c2c223586616b..ea093133ed5c7 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.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "sha256-kz4M4ghR9Mi8Ig5K+pZC4zHt8XxoP3vU4ATImejqbgg="; + sha256 = "sha256-uyYVxBHkIiZVFcKZ1OKhcCQv42CISNKbCrfDCjKCeUA="; }; postConfigure = '' diff --git a/pkgs/development/python-modules/teletype/default.nix b/pkgs/development/python-modules/teletype/default.nix index c3878bf3c8779..47f6357a56831 100644 --- a/pkgs/development/python-modules/teletype/default.nix +++ b/pkgs/development/python-modules/teletype/default.nix @@ -2,11 +2,12 @@ buildPythonPackage rec { pname = "teletype"; - version = "1.1.0"; + version = "1.3.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "02mg0qmdf7hljq6jw1hwaid3hvkf70dfxgrxmpqybaxrph5pfg1y"; + sha256 = "sha256-9q46a4ui2kgSUL/vImR02r4T9huwLFwd70AqGBNJNzs="; }; # no tests diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 6999655c5dc5f..ff837158fc268 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,36 +1,59 @@ -{ lib, buildPythonPackage, fetchPypi -, setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock -, six, pytz, jaraco_functools, pythonOlder -, pytest-flake8, pytest-cov, pytest-black, pytest-mypy +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build time +, setuptools-scm + +# runtime +, pytz +, jaraco_functools + +# tests +, freezegun +, pytest-freezegun +, pytestCheckHook }: buildPythonPackage rec { pname = "tempora"; - version = "5.0.0"; + version = "5.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "aa21dd1956e29559ecb2f2f2e14fcdb950085222fbbf86e6c946b5e1a8c36b26"; + sha256 = "sha256-y6Dxl6ZIg78+c2V++8AyTVvxcXnndpsThbTXXSbNkSc="; }; - disabled = pythonOlder "3.2"; - - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ six pytz jaraco_functools ]; + propagatedBuildInputs = [ + jaraco_functools + pytz + ]; checkInputs = [ - pytest-freezegun pytest freezegun backports_unittest-mock - pytest-flake8 pytest-cov pytest-black pytest-mypy + freezegun + pytest-freezegun + pytestCheckHook ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ + "tempora" + "tempora.schedule" + "tempora.timing" + "tempora.utc" + ]; meta = with lib; { description = "Objects and routines pertaining to date and time"; homepage = "https://github.com/jaraco/tempora"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix similarity index 85% rename from pkgs/development/python-modules/tensorflow-tensorboard/default.nix rename to pkgs/development/python-modules/tensorboard/default.nix index ceebad2a47694..47025bf4a28af 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -22,17 +22,16 @@ # buildBazelPackage. buildPythonPackage rec { - pname = "tensorflow-tensorboard"; - version = "2.6.0"; + pname = "tensorboard"; + version = "2.8.0"; format = "wheel"; - disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { - pname = "tensorboard"; - inherit version format; + inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-99rEzftS0UyeP3RYXOKq+OYgNiCoZOUfr4SYiwn3u9s="; + hash = "sha256-ZaM45EJOkHnyYEkjvb4wF5KtzirOG+aNprPd8AUXDe8="; }; postPatch = '' @@ -42,7 +41,8 @@ buildPythonPackage rec { pushd unpacked/tensorboard-${version} substituteInPlace tensorboard-${version}.dist-info/METADATA \ - --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" + --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" \ + --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)" popd wheel pack ./unpacked/tensorboard-${version} diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index eacb5b4cdc804..7aa29f34baa55 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -13,7 +13,7 @@ , pytorch , six , soundfile -, tensorflow-tensorboard +, tensorboard , torchvision }: @@ -56,7 +56,7 @@ buildPythonPackage rec { pillow pytestCheckHook pytorch - tensorflow-tensorboard + tensorboard torchvision ]; @@ -70,6 +70,8 @@ buildPythonPackage rec { disabledTestPaths = [ # we are not interested in linting errors "tests/test_lint.py" + # missing caffe2 dependency + "tests/test_caffe2.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 98e38bba56ad9..90c9c8b22712c 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -38,13 +38,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.4.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "v${version}"; - sha256 = "11kbpv54nwr0xf7z5mkj2lmrfqfmcdq8qcpapnqck1kiawr3yad6"; + sha256 = "sha256-OZpaY/6BMISq5IeDXyuyu5L/yG+DwlFliw4BsipPOLg="; }; patches = [ diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index 5ad6d0ab6e555..7c7f155adb09b 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.7.0"; + version = "2.8.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - hash = "sha256-MltaIkhkN5JCt7dsaYfKVEI5voJXnTPmjsfCvaV6vJ0="; + hash = "sha256-vujgUgxgrn6vbKjLRsWp9LRXJVMTgNuPvjj8tIR4trs="; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/pkgs/development/python-modules/tensorflow-metadata/build.patch b/pkgs/development/python-modules/tensorflow-metadata/build.patch index ff81c5d1e86cf..5b570bf72062d 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/build.patch +++ b/pkgs/development/python-modules/tensorflow-metadata/build.patch @@ -2,15 +2,6 @@ diff --git a/setup.py b/setup.py index 7a09b2f..94c5aa6 100644 --- a/setup.py +++ b/setup.py -@@ -125,7 +125,7 @@ setup( - ], - namespace_packages=[], - install_requires=[ -- 'absl-py>=0.9,<0.13', -+ 'absl-py>=0.9', - 'googleapis-common-protos>=1.52.0,<2', - 'protobuf>=3.13,<4', - ], @@ -137,8 +137,5 @@ setup( long_description_content_type='text/markdown', keywords='tensorflow metadata tfx', diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 2a80155c4cd9e..b39f1211d0cac 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -2,18 +2,19 @@ , buildPythonPackage , fetchFromGitHub , googleapis-common-protos +, protobuf , lib }: buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "v${version}"; - sha256 = "17p74k6rwswpmj7m16cw9hdam6b4m7v5bahirmc2l1kwfvrn4w33"; + sha256 = "sha256-CQlLEVNcD9u2pojz8r1eLzYzc9i2hjdZfzfYSQ/8Q4k="; }; patches = [ @@ -31,8 +32,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ absl-py googleapis-common-protos + protobuf ]; + # has no tests + doCheck = false; + pythonImportsCheck = [ "tensorflow_metadata" ]; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix deleted file mode 100644 index f58b1a207719a..0000000000000 --- a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k -, numpy -, wheel -, werkzeug -, protobuf -, grpcio -, markdown -, futures -, absl-py -}: - -# tensorflow/tensorboard is built from a downloaded wheel, because -# https://github.com/tensorflow/tensorboard/issues/719 blocks -# buildBazelPackage. - -buildPythonPackage rec { - pname = "tensorflow-tensorboard"; - version = "1.15.0"; - format = "wheel"; - - src = fetchPypi ({ - pname = "tensorboard"; - inherit version format; - } // (if isPy3k then { - python = "py3"; - sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac"; - } else { - python = "py2"; - sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1"; - })); - - propagatedBuildInputs = [ - numpy - werkzeug - protobuf - markdown - grpcio - absl-py - # not declared in install_requires, but used at runtime - # https://github.com/NixOS/nixpkgs/issues/73840 - wheel - ] ++ lib.optional (!isPy3k) futures; - - # in the absence of a real test suite, run cli and imports - checkPhase = '' - $out/bin/tensorboard --help > /dev/null - ''; - - pythonImportsCheck = [ - "tensorboard" - "tensorboard.backend" - "tensorboard.compat" - "tensorboard.data" - "tensorboard.plugins" - "tensorboard.summary" - "tensorboard.util" - ]; - - meta = with lib; { - description = "TensorFlow's Visualization Toolkit"; - homepage = "http://tensorflow.org"; - license = licenses.asl20; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 2556a8039c1b7..2c47f8674e0e9 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -18,7 +18,7 @@ , opt-einsum , backports_weakref , tensorflow-estimator -, tensorflow-tensorboard +, tensorboard , cudaSupport ? false , cudatoolkit , cudnn @@ -74,7 +74,7 @@ in buildPythonPackage { google-pasta wrapt tensorflow-estimator - tensorflow-tensorboard + tensorboard keras-applications keras-preprocessing h5py @@ -168,7 +168,7 @@ in buildPythonPackage { ''; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow - # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # and the propagated input tensorboard, which causes environment collisions. # Another possibility would be to have tensorboard only in the buildInputs # See https://github.com/NixOS/nixpkgs/pull/44381 for more information. postInstall = '' diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 517faef3f8fc7..2d5a302521b48 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,19 +1,19 @@ -{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin +{ stdenv, bazel_4, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin , addOpenGLRunpath, fetchpatch, patchelfUnstable # Python deps , buildPythonPackage, pythonOlder, python # Python libraries -, numpy, tensorflow-tensorboard, absl-py +, numpy, tensorboard, absl-py , setuptools, wheel, keras, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator -, dill, flatbuffers-python, tblib, typing-extensions +, dill, flatbuffers-python, portpicker, tblib, typing-extensions # Common deps , git, pybind11, which, binutils, glibcLocales, cython, perl # Common libraries -, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp +, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp, nsync , curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core -# Upsteam by default includes cuda support since tensorflow 1.15. We could do +# Upstream by default includes cuda support since tensorflow 1.15. We could do # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.7.1"; + version = "2.8.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -94,8 +94,8 @@ let setuptools six tblib + tensorboard tensorflow-estimator - tensorflow-tensorboard termcolor typing-extensions wheel @@ -179,20 +179,15 @@ let stdenv = llvmPackages_11.stdenv; })) { name = "${pname}-${version}"; - bazel = bazel_3; + bazel = bazel_4; src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "1qwzbqq899swrwrwmm6z7mq9sc55gyh0r4ca0mcnchbvn7w0qbkh"; + hash = "sha256-w78ehpsnXElIyYftgZEq3b/+TSrRN1gyWVUVlSZpGFM="; }; - patches = [ - # Patch the sources to compile with protobuf >= 3.16. - ./system-protobuf.patch - ]; - # On update, it can be useful to steal the changes from gentoo # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow @@ -207,20 +202,20 @@ let git # libs taken from system through the TF_SYS_LIBS mechanism - grpc - sqlite boringssl - jsoncpp curl - pybind11 - snappy + double-conversion flatbuffers-core + giflib + grpc icu - double-conversion - libpng + jsoncpp libjpeg_turbo - giflib + libpng lmdb-core + pybind11 + snappy + sqlite ] ++ lib.optionals cudaSupport [ cudatoolkit cudnn @@ -229,6 +224,8 @@ let ] ++ lib.optionals stdenv.isDarwin [ Foundation Security + ] ++ lib.optionals (!stdenv.isDarwin) [ + nsync ]; # arbitrarily set to the current latest bazel version, overly careful @@ -237,7 +234,7 @@ let # Take as many libraries from the system as possible. Keep in sync with # list of valid syslibs in # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl - TF_SYSTEM_LIBS = lib.concatStringsSep "," [ + TF_SYSTEM_LIBS = lib.concatStringsSep "," ([ "absl_py" "astor_archive" "astunparse_archive" @@ -253,7 +250,6 @@ let "cython" "dill_archive" "double_conversion" - "enum34_archive" "flatbuffers" "functools32_archive" "gast_archive" @@ -264,7 +260,6 @@ let "libjpeg_turbo" "lmdb" "nasm" - # "nsync" # not packaged in nixpkgs "opt_einsum_archive" "org_sqlite" "pasta" @@ -277,7 +272,9 @@ let "typing_extensions_archive" "wrapt" "zlib" - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ + "nsync" # fails to build on darwin + ]); INCLUDEDIR = "${includes_joined}/include"; @@ -361,12 +358,12 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "sha256-+szc2mRoImwijzbj3nw6HmZp3DeRjjPRU5yC+5AEbkg=" + "sha256-dQEyfueuQPcGvbhuh8Al45np3nRLDw2PCfC2lEqAH50=" else if stdenv.isDarwin then - "sha256-+bwIzp6t7gRJPcI8B5oyuf9z0AjCAyggUR7x+vv5kFs=" + "sha256-yfnZVtKWqNQGvlfq2owXhem0LmzDYriVfYgf1ZRlaDo=" else - "sha256-5yOYmeGpJq4Chi55H7iblxyRXVktgnePtpYTPvBs538="; + "sha256:12i1ix2xwq77f3h8qr4h57g0aazrdsjjqa536cpwx3n1mvl5p6qi"; }; buildAttrs = { @@ -428,18 +425,20 @@ in buildPythonPackage { # Adjust dependency requirements: # - Relax gast version requirement that doesn't match what we have packaged + # - Relax tf-estimator, that would require a nightly version # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. postPatch = '' sed -i setup.py \ -e "s/'gast[^']*',/'gast',/" \ + -e "s/'tf-estimator-nightly[^']*',/'tensorflow-estimator',/" \ -e "/'libclang[^']*',/d" \ -e "/'keras[^']*',/d" \ -e "/'tensorflow-io-gcs-filesystem[^']*',/d" ''; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow - # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # and the propagated input tensorboard, which causes environment collisions. # Another possibility would be to have tensorboard only in the buildInputs # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 postInstall = '' @@ -452,7 +451,6 @@ in buildPythonPackage { propagatedBuildInputs = [ absl-py astunparse - dill flatbuffers-python gast google-pasta @@ -463,13 +461,12 @@ in buildPythonPackage { opt-einsum protobuf-python six - tblib tensorflow-estimator termcolor typing-extensions wrapt ] ++ lib.optionals withTensorboard [ - tensorflow-tensorboard + tensorboard ]; # remove patchelfUnstable once patchelf 0.14 with https://github.com/NixOS/patchelf/pull/256 becomes the default @@ -486,7 +483,13 @@ in buildPythonPackage { # Actual tests are slow and impure. # TODO try to run them anyway # TODO better test (files in tensorflow/tools/ci_build/builds/*test) - checkInputs = [ keras ]; + # TEST_PACKAGES in tensorflow/tools/pip_package/setup.py + checkInputs = [ + dill + keras + portpicker + tblib + ]; checkPhase = '' ${python.interpreter} < Dict[str, Any]: -+def load(fp: Union[IO, BinaryIO], *, parse_float: ParseFloat = float) -> Dict[str, Any]: - """Parse TOML from a binary file object.""" - s_bytes = fp.read() - try: diff --git a/pkgs/development/python-modules/tomli/tests.nix b/pkgs/development/python-modules/tomli/tests.nix deleted file mode 100644 index 5d3d67dbd128c..0000000000000 --- a/pkgs/development/python-modules/tomli/tests.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildPythonPackage -, tomli -, pytestCheckHook -, python-dateutil -}: - -buildPythonPackage rec { - pname = "tomli-tests"; - inherit (tomli) version; - - src = tomli.testsout; - - dontBuild = true; - dontInstall = true; - - checkInputs = [ - pytestCheckHook - python-dateutil - tomli - ]; -} diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 6c8455f060ec0..22f3ffab29955 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.8.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "29e84a855712dfe0e88a48f6d05c21118dbafb283bb2eed614d46f80deb8e9a1"; + sha256 = "sha256-2ZlGxq7TOHyYuJ2R+57f+PkBv5JVkBCBJmqE+1YErc0="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix index fc53c5ba8232c..2843910613672 100644 --- a/pkgs/development/python-modules/torch-tb-profiler/default.nix +++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -4,7 +4,7 @@ , pandas , pytestCheckHook , pytorch -, tensorflow-tensorboard +, tensorboard , torchvision }: @@ -25,7 +25,7 @@ buildPythonPackage rec { # See https://discourse.nixos.org/t/extracting-sub-directory-from-fetchgit-or-fetchurl-or-any-derivation/8830. src = "${repo}/tb_plugin"; - propagatedBuildInputs = [ pandas tensorflow-tensorboard ]; + propagatedBuildInputs = [ pandas tensorboard ]; checkInputs = [ pytestCheckHook pytorch torchvision ]; diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix index 2f3ba5c1c2aae..f0dc14b5fa2ab 100644 --- a/pkgs/development/python-modules/tornado/5.nix +++ b/pkgs/development/python-modules/tornado/5.nix @@ -3,12 +3,13 @@ , buildPythonPackage , fetchPypi , isPy27 +, pythonAtLeast }: buildPythonPackage rec { pname = "tornado"; version = "5.1.1"; - disabled = isPy27; + disabled = isPy27 || pythonAtLeast "3.10"; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 83215f5e0af37..f2fbf856555fb 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "towncrier"; - version = "21.3.0"; + version = "21.9.0"; src = fetchPypi { inherit pname version; - sha256 = "6eed0bc924d72c98c000cb8a64de3bd566e5cb0d11032b73fcccf8a8f956ddfe"; + sha256 = "sha256-nLb0XBbhoe7J0OdlEWXnvmDNCrgdE6XJbKl6SYrof0g="; }; propagatedBuildInputs = [ @@ -29,12 +29,18 @@ buildPythonPackage rec { # zope.interface collision doCheck = !isPy27; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + checkInputs = [ git mock twisted pytestCheckHook ]; + pythonImportsCheck = [ "towncrier" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 544c1a3084a6e..5cd14c7704d80 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { # Last version on github is 0.2.4, but it looks # like a mistake (it's missing commits from 0.1.9) - version = "0.1.9"; + version = "1.0.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-v5Xth0A3tFnLFg54nvWYL2TD201e/GWv+2y5Qc60CmU="; + sha256 = "sha256-Gx1nIXYuhTmQva9LmtTYvd1nyRH/pBQZ5bJ8OLcc1lo="; }; postPatch = '' substituteInPlace tpm2_pytss/config.py --replace \ diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 3973d68b6c381..2613a2b587d76 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.62.3"; + version = "4.63.0"; src = fetchPypi { inherit pname version; - sha256 = "d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d"; + sha256 = "sha256-HZg17ejjlLuMncv/vKAtcXIXETrcZ5I2hz7qrFvAs80="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index e667f146afc04..f9b325ecc2956 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -13,19 +13,45 @@ , jedi , astor , yapf +, coreutils }: buildPythonPackage rec { pname = "trio"; - version = "0.19.0"; + version = "0.20.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "895e318e5ec5e8cea9f60b473b6edb95b215e82d99556a03eb2d20c5e027efe1"; + sha256 = "sha256-ZwpS0xFdDoeeGsg4pOuZmvMvhYFj46cE/kg53ipnYHA="; }; - checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi yapf ]; + propagatedBuildInputs = [ + attrs + sortedcontainers + async_generator + idna + outcome + sniffio + ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; + + # tests are failing on Darwin + doCheck = !stdenv.isDarwin; + + checkInputs = [ + astor + jedi + pyopenssl + pytestCheckHook + trustme + yapf + ]; + + preCheck = '' + substituteInPlace trio/tests/test_subprocess.py \ + --replace "/bin/sleep" "${coreutils}/bin/sleep" + ''; + # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. disabledTests = [ "getnameinfo" @@ -41,18 +67,6 @@ buildPythonPackage rec { "-W" "ignore::DeprecationWarning" ]; - propagatedBuildInputs = [ - attrs - sortedcontainers - async_generator - idna - outcome - sniffio - ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; - - # tests are failing on Darwin - doCheck = !stdenv.isDarwin; - meta = { description = "An async/await-native I/O library for humans and snake people"; homepage = "https://github.com/python-trio/trio"; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index c332a067a76be..6a52dd869e053 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "trytond"; - version = "6.2.3"; + version = "6.2.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9be5d27aff9ae9b0ab73a8805145b2cc89900b9b513e6d5bfce89e9b7167f8f4"; + sha256 = "sha256-Sof6A9lxU70YnCbboJr56CAdTL0cRbaRNxdvG5Tnqnw="; }; # 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 a3526eb707be9..c97fd85a8be48 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.5.0"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-mRpYPuj2B/kEaaeZlNYYnViGxWiK1xtWfDObHNduIK8="; + sha256 = "sha256-7ogsocRTMTO5yegyY7BADu9NrHK7zMMbihBu8oF4UlQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index ddc94541422c3..4404b743bc50f 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub -, mock -, nose -, pyjwt , pythonOlder + +, pyjwt , pytz , requests + +, mock +, pytestCheckHook }: buildPythonPackage rec { pname = "twilio"; - version = "7.5.0"; + version = "7.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +22,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0h6r9nz7dcvagrjhzvnirpnjazcy9r64cwlr2bnmlrbjhwdni9rq"; + sha256 = "sha256-PxLDAP/6Ddvf58eEyX3DHkdBNuLE5DlLdCEaRguqOy0="; }; propagatedBuildInputs = [ @@ -31,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ mock - nose + pytestCheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 82c157722d285..d6fea5942117a 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "twine"; - version = "3.7.1"; + version = "3.8.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "28460a3db6b4532bde6a5db6755cf2dce6c5020bada8a641bb2c5c7a9b1f35b8"; + sha256 = "sha256-jvpSZY4K53BoahO2dVaTKPH7qYN+XeGGe/5fRqmu/hk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index b09ccebde1988..055fdd441489a 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -17,12 +17,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "21.7.0"; + version = "22.1.0"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - sha256 = "01lh225d7lfnmfx4f4kxwl3963gjc9yg8jfkn1w769v34ia55mic"; + sha256 = "sha256-t5ceyYBbD4Dh3LGjch17+tY21fkJ3mh0MM43OXnWe2E="; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 074e7b8d50915..23c24f3e514a7 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "txaio"; - version = "21.2.1"; + version = "22.2.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fW+JdFaAIz8cTbndt0jfXojSp6N5Yr4XTA/QTI26Hcg="; + sha256 = "sha256-LkWCtw8EsjRZCCVGhKmEIGwNm1DjB0okpMVauiHSTQE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 8b2ff2de5129d..dd3f62527aa23 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -3,7 +3,7 @@ , pythonOlder , lib , setuptools-scm -, pytest +, pytestCheckHook , typing-extensions , glibcLocales }: @@ -26,12 +26,17 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace " --cov" "" ''; - checkInputs = [ pytest typing-extensions ]; + checkInputs = [ pytestCheckHook typing-extensions ]; - # mypy tests aren't passing with latest mypy - checkPhase = '' - py.test . --ignore=tests/mypy - ''; + disabledTestPaths = [ + # mypy tests aren't passing with latest mypy + "tests/mypy" + ]; + + disabledTests = [ + # not compatible with python3.10 + "test_typed_dict" + ]; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 1e29bc9a6160c..97f0d48cecc2a 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.0.1"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-TKCR3qFJ+UXsVq+0ja5xTyHoaS7yKjlSI7zTKJYbag4="; + hash = "sha256-GpRi3MM0enmx8cAnH7556ERYC7WYuvoe0gi5TaPNzUI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index 1e5303b7b09e5..d540160493643 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -3,6 +3,7 @@ , fetchPypi , typing-extensions , mypy-extensions +, pytestCheckHook }: buildPythonPackage rec { @@ -20,6 +21,19 @@ buildPythonPackage rec { mypy-extensions ]; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/ilevkivskyi/typing_inspect/issues/84 + "test_typed_dict_typing_extension" + ]; + + pythonImportsCheck = [ + "typing_inspect" + ]; + meta = with lib; { description = "Runtime inspection utilities for Python typing module"; homepage = "https://github.com/ilevkivskyi/typing_inspect"; diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index a3458b2f332fe..03ebd566b709e 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "2.25.2"; + version = "2.25.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "ooWIHvyMtrht4WcGPiacY8dfjPSb5uitHnTRTKvf2AA="; + sha256 = "sha256-4OuEol+YorvOeK5bj33Po8V9KD0trcgTMXCTQ+J7q94="; }; patches = [ diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 7dfd5c9d276aa..4c776070ae6e5 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.7.0"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447"; + sha256 = "sha256-1fLlOpoA2zIkqMNjSbU4Dg4i0a7GxpSxT7lIPuk8YgU="; }; pythonImportsCheck = [ "unidiff" ]; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index c8d1edc421094..c4ee1f955e440 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -1,18 +1,21 @@ -{lib, fetchPypi, buildPythonPackage, isPy27, six}: +{lib, fetchPypi, buildPythonPackage, isPy27, six, lxml }: buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "3.0.4"; + version = "3.2.0"; disabled = isPy27; - propagatedBuildInputs = [six]; + propagatedBuildInputs = [ + lxml + six + ]; # The tarball from Pypi doesn't actually contain the unit tests doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "984cebba69e889401bfe3adb9088ca376b3a1f923f0590d005126c1bffd1a695"; + sha256 = "sha256-7djTFwtAw6gbjPkQ9GxqMErihH7AEDbQLpwPm4V2LSg="; }; meta = with lib; { homepage = "https://github.com/xmlrunner/unittest-xml-reporting/tree/master/"; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index bf523046c6166..8bf8e67b8e465 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.1.9"; + version = "4.2.0"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; rev = version; - sha256 = "035gljxm18hvpfvc7nsd7lhawwq3np5sg1y86pzcxc680c6rj6lx"; + sha256 = "sha256-ft2VXYGb+iPqRUrtOBvl7SgTPfPR4+IOdYFVTNbQAEw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 4ce9228efee88..a3238d4c5484e 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.16.0"; + version = "0.17.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; + sha256 = "sha256-66wPVnBLy2HK4p0m/b/DRxy12sk8AsVFZoFVcWRkL4s="; }; outputs = [ diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index c463c37747eaa..126bf4e6c6c07 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.13.0"; + version = "20.13.2"; src = fetchPypi { inherit pname version; - sha256 = "d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd"; + sha256 = "sha256-AfX4B0TSSjdDzmGFgSNIjpHLLdHTvfkq2vG7o5/97fA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 9fba5785c4478..1bc471c7287f1 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { --replace "--cov-report=term-missing" "" ''; + disabledTests = [ + # probably failing because of an encoding related issue + "test_create_wrong_encoding" + ]; + disabledTestPaths = [ # Tests are flaky "tests/test_inotify_buffer.py" diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 116f45f16dd34..37d926e505558 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.2.3"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5"; + sha256 = "sha256-YninUGU5VBgoP4h958O+r7OqaNraXKy+SyFOjSbaSZs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index c75c59ac1c9c5..63c3ad1b420bc 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.0.2"; + version = "2.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Werkzeug"; inherit version; - sha256 = "sha256-qiu2/I3ujWxQTArB5/X33FgQqZA+eTtvcVqfAVva25o="; + sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; }; propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [ diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index d4dd7d0899976..803ddd51d9fa8 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "wsproto"; - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.6"; # python versions <3.6 src = fetchPypi { inherit pname version; - sha256 = "868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38"; + sha256 = "sha256-ouVr/Vx82DwTadg7X+zNbTd5i3SHKGbmJhbg7PERvag="; }; propagatedBuildInputs = [ h11 ] ++ lib.optional isPy36 dataclasses; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 5f780a61ffc56..85b8ac799c739 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.20.2"; + version = "2022.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wuvoDKgbEKAkH2h23MNKyWluXFzc30dY2nz0vXMsQfc="; + sha256 = "sha256-OYNEv30XBHeqzv9wIQ4R69aa9rFW/hOXgFTSXEhylEA="; }; SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 3717ca2473c39..f6c63db450517 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -48,7 +48,8 @@ buildPythonPackage { ln -s ${xgboost}/bin/xgboost ../xgboost ''; - pytestFlagsArray = ["../tests/python"]; + # tests are extremely cpu intensive, only run basic tests to ensure package is working + pytestFlagsArray = ["../tests/python/test_basic.py"]; disabledTestPaths = [ # Requires internet access: https://github.com/dmlc/xgboost/blob/03cd087da180b7dff21bd8ef34997bf747016025/tests/python/test_ranking.py#L81 "../tests/python/test_ranking.py" diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 0a9a0af0e543f..76ce32e5e8f38 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "xmlsec"; version = "1.3.12"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -35,7 +36,14 @@ buildPythonPackage rec { # Full git clone required for test_doc_examples checkInputs = [ pytestCheckHook hypothesis ]; - disabledTestPaths = [ "tests/test_doc_examples.py" ]; + + disabledTestPaths = [ + "tests/test_doc_examples.py" + # test_reinitialize_module segfaults python + # https://github.com/mehcode/python-xmlsec/issues/203 + "tests/test_xmlsec.py" + ]; + pythonImportsCheck = [ "xmlsec" ]; diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index df3c0c852696d..f70526da6a106 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "2.0.2"; + version = "3.0.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49"; + sha256 = "sha256-MLLZeq8R+xIgI/a0TruXxpVengDXRhqWQVygMLXOucc="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index b87982b20b65c..5bcbf24dc302e 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "yq"; - version = "2.13.0"; + version = "2.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/RMf2x9WcWrY1EzZ6q99OyLTm6iGHqZKQJzD9K4mPbg="; + sha256 = "sha256-9L8rKZ0eXH69dM+yXR9dm2QBBjusB6LQmhVhRMHWROE="; }; patches = [ diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 11c6f84850bd5..c943f34c52ef3 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.10.3"; + version = "2.11.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "76932665c2146ebdf15f6dba254f9e0030552fbfcf9322dea822bff96fbce693"; + sha256 = "sha256-sIc74nr1aQc4+hWOp6gC6uRUkEwzmVBWGFrMWnQltFE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 1b3e0c5fcdf0c..83ee3f37f7e4e 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -6,6 +6,7 @@ , cached-property , defusedxml , fetchFromGitHub +, fetchpatch , freezegun , httpx , isodate @@ -38,6 +39,14 @@ buildPythonPackage rec { sha256 = "sha256-fJLr2LJpbNQTl183R56G7sJILfm04R39qpJxLogQLoo="; }; + patches = [ + (fetchpatch { + # fixes pytest_httpx test case; https://github.com/mvantellingen/python-zeep/pull/1293 + url = "https://github.com/mvantellingen/python-zeep/commit/2907848185adcb4e6d8c093db6c617c64cb8c8bf.patch"; + hash = "sha256-hpksgMfrBLvYtI1QIs1aHBtFq7C1PWpnAj8BW5ak1/4="; + }) + ]; + propagatedBuildInputs = [ attrs cached-property diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index d350e2040891b..d4c6c6b7e4742 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "sqlalchemyorg"; repo = "zimports"; rev = "v${version}"; - sha256 = "11mg7j7xiypv9hki4qbnp9jsgwgfdrgdzfqyrzk5x0s4hycgi4q0"; + sha256 = "sha256-O8MHUt9yswL9fK9pEddkvnNS2E4vWA/S1BTs1OD1VbU="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index 0586227c61c54..fb1eb07154a08 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.exceptions"; - version = "4.4"; + version = "4.5"; src = fetchPypi { inherit pname version; - sha256 = "0d72886b1bb8af4c346a117a540f28ab122577f5e3a105a261be72cd15776fda"; + sha256 = "sha256-TjW7oEiJxdEU3KpVKXQl1fM/YYqF7323Ehs7dxEAeE4="; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index d7e9cf507f031..1bc880456b6e1 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.9"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "78de3cc08a8efaa8013d61528907d91ac4d6cc014ffd8a41cc10ee75e9e60d7b"; + sha256 = "sha256-x9PzVcSR84TkNNsuYmheq269pmuWTonhdUuxFLLTjOo="; extension = "zip"; }; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2bb6216154743..f070fa1f982c4 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -37,8 +37,11 @@ let version = "0.3.0"; src = oldAttrs.src.override { inherit version; - sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; + hash = "sha256-ySmFQzljeXc3WDhwO2L+9jUoWYvAqdRRY566lfSqpE8="; }; + propagatedBuildInputs = with python3.pkgs; [ aiohttp pytest ]; + doCheck = false; + patches = []; }); aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 @@ -46,11 +49,26 @@ let hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + snitun = super.snitun.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); }) + (self: super: { + hatasmota = super.hatasmota.overridePythonAttrs (oldAttrs: { + version = "0.3.1"; + src = fetchFromGitHub { + owner = "emontnemery"; + repo = "hatasmota"; + rev = "0.3.1"; + sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw="; + }; + }); + }) + (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { version = "1.4.18"; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 11cf6c53076c4..1e82459f4c6a6 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -35,11 +35,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.22.35"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.22.67"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-GsMclLh/VtPaNjD+XDKqTYeSX29R2aRS7If9G918OWY="; + hash = "sha256-ofgxL9V/jTn/itxSOLGYkAmgQXES7aVUM/vM6nWdbBc="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 08fb92e4ea63a..16c547dbeba62 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -33,13 +33,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.4.19"; # N.B: if you change this, change botocore to a matching version too + version = "2.4.23"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-ZOSZBZT4d5jv5lg8KkGoOJqAvStUsGZbiXp3dpsrOpo="; + sha256 = "sha256-zpkphlIfmexqZm0lZgDP3RoQJqTpFdT+5dGtaLiRr/U="; }; propagatedBuildInputs = [ @@ -69,7 +69,6 @@ with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.cfg \ --replace "colorama>=0.2.5,<0.4.4" "colorama" \ - --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \ --replace "docutils>=0.10,<0.16" "docutils" \ --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ --replace "wcwidth<0.2.0" "wcwidth" \ diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index efd1ecfee3c16..01cb5081cf4f2 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.32.0"; + version = "2.34.1"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-PXY32bfuK0bQGI0N+XHs9lakF6K7+WjrHMvuNgDFSJM="; + sha256 = "sha256-BEEwxf3UTShKi3K/uBK1yMxyPCvybL/BbKsu8XAwu0M="; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 9fbb9d3e50a28..5b8732f537514 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -69,7 +69,8 @@ let postPatch = '' substituteInPlace setup.py \ --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \ - --replace "cryptography>=3.2,<3.4" "cryptography" + --replace "cryptography>=3.2,<3.4" "cryptography" \ + --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" ''; checkInputs = with self; [ pytest ]; @@ -117,11 +118,11 @@ let ''; }; - azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip" - "sha256-zl/bDsli7d/oXNgiBekXfLC720RSZXRuOLO7vx8W3HM="; + azure-batch = overrideAzureMgmtPackage super.azure-batch "12.0.0" "zip" + "sha256-GpseF4mEp79JWvZ7zOUfDbHkqKlXr7KeM1VKFKlnTes="; - azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip" - "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr"; + azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "3.0.0" "zip" + "9262f54ed387eb083d8dae66d32a8df35647319b902bd498cdc376f50a12d154"; azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "16.0.0" "zip" "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34"; @@ -156,8 +157,8 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.0.0" "zip" "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.1.0" "zip" - "sha256-Sduw9RAG1VfL0LIpmcuezz6rwr5G2W78xtZRxrM3VLM="; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "25.0.0" "zip" + "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -165,8 +166,8 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.1.0" "zip" "sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA="; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.1.0" "zip" - "sha256-NlTIrOK4ho0OqcTHjHT1HobiMzDH2KY20TIlN0fm8/Q="; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "17.0.0" "zip" + "sha256-oUbWdZryabCCg/gTujchT7p1nS7IDoU5W9MQ4ekJYH8="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "7.0.0b2" "zip" "sha256-hVvYW9gkfTVMwis3IdD0JXYDxdKcyyzIFx3hNk7VMLI="; @@ -183,11 +184,11 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.0.0" "zip" "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.1.0" "zip" - "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.2.0" "zip" + "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM="; - azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.0.0" "zip" - "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; + azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.1.0" "zip" + "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "9.0.0" "zip" "64df73df449a6f3717f3d0963e5869224ed3e6216c79de571493bea7c1b52cb6"; @@ -198,14 +199,14 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "5.1.0" "zip" - "sha256-MGCICI7hDobEzyTMgqnKYZ21zfwNo/ogfQDsf3fwbo4="; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "6.0.1" "zip" + "6ce683587be1638d8d77620b7af118060b8b7dfc4fd23d46a623a66edcb388e1"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "12.0.0" "zip" - "da128a7e0291be7fa2063848df92a9180cf5c16d42adc09d2bc2efd711536bfb"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b2" "zip" + "sha256-j8CyWZGF7Z/5szJ+CD96E0EbNsceJ1SScrlPqWVLjnk="; azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.3.0" "zip" "0b6a1ccdffd76e057ab16a6c319740a0ca68d59fedf7e9c02f2437396e72aa11"; @@ -216,8 +217,8 @@ let azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; - azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "0.1.0" "zip" - "sha256-/2LZgu3aY0o2Fgyx0Vo2epVypay0GeXnrTcejIO9R8c="; + azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "1.0.0" "zip" + "bab9bd532a1c34557f5b0ab9950e431e3f00bb96e8a3ce66df0f6ce2ae19cd73"; azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; @@ -231,8 +232,8 @@ let azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip" "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "4.0.0" "zip" - "sha256-5XQ3qTPn3qmwYY/nkODa3GP5hXc1NhrItfXoBiucKg0="; + azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "6.1.0" "zip" + "c26635089276515b0488fcf014aab50a0446f54800c6e0e5583cc493ac8d738f"; azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.0.0" "zip" "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980"; @@ -291,11 +292,11 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "19.0.0" "zip" - "f05963e5a8696d0fd4dcadda4feecb9b382a380d2e461b3647704ac787d79876"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "19.1.0" "zip" + "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY="; - azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "6.0.0" "zip" - "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; + azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "7.1.0" "zip" + "d8ae7905fb7d3e24822daa20aa7bc5014f41aa18b48ea2d0161e997fc11a3d36"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; @@ -413,12 +414,12 @@ let }); azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs(oldAttrs: rec { - version = "4.5.0b4"; + version = "4.5.0b6"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; extension = "zip"; - sha256 = "sha256-f43ZTMFc0IVIaa69gEZFOLALREcx3RRCFoYDY2FYLrY="; + sha256 = "sha256-WFSRJaia0+WnvGxoMYZIvf81ue51VPYXzTp8huUh1fc="; }; }); diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 7f1655b98437a..90cb08034735b 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -80,6 +80,9 @@ python3Packages.buildPythonApplication rec { # fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" + + # We don't care if the is correctly formatted + "test_code_is_black_clean" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 4e59333ed79bd..cae4431ea65b4 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -24,13 +24,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "1.12.6"; + version = "1.13.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MXKER2ijU+2yPnsBFH0cu/hjHI4uNt++AqggH5rhnaU="; + sha256 = "sha256-5+bjjljmk3AHaDVjYzNuC7lkkvlpLa9/grKgdmERC7k="; }; # this patch allows us to run additional tests that invoke pdm, which checks @@ -41,19 +41,12 @@ buildPythonApplication rec { # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream patches = [ ./check-update.patch - (fetchurl { - # Mark test that require network access - url = "https://github.com/pdm-project/pdm/files/7911962/mark-network-tests.patch.txt"; - hash = "sha256:1dizf9j3z7zk4lxvnszwx63xzd9r68f2iva5sszzf8s8na831dvd"; - }) ]; - postPatch = '' - substituteInPlace pyproject.toml --replace "pdm-pep517>=0.9,<0.10" "pdm-pep517" - ''; propagatedBuildInputs = [ blinker click + findpython installer packaging pdm-pep517 @@ -82,22 +75,19 @@ buildPythonApplication rec { "-m 'not network'" ]; - preCheck = "HOME=$TMPDIR"; + preCheck = '' + export HOME=$TMPDIR + ''; disabledTests = [ # sys.executable and expected executable are different "test_set_non_exist_python_path" # pythonfinder isn't aware of nix's python infrastructure "test_auto_isolate_site_packages" - "test_use_invalid_wrapper_python" "test_use_wrapper_python" - # tries to read/write files without proper permissions - "test_completion_command" - "test_plugin_add" - "test_plugin_list" - "test_plugin_remove" - # tries to treat a gzip file as a zipfile and fails - "test_resolve_local_artifacts" + "test_find_python_in_path" + # calls pip install and exits != 0 + "test_pre_and_post_hooks" ]; meta = with lib; { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39e4c787f5e96..05ebce6357c64 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -50,6 +50,8 @@ mapAliases ({ diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 djangorestframework-jwt = drf-jwt; # added 2021-07-20 + django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 + django_appconf = django-appconf; # added 2022-03-03 django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 django_redis = django-redis; # added 2021-10-11 @@ -90,6 +92,7 @@ mapAliases ({ pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 + pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 @@ -121,6 +124,7 @@ mapAliases ({ tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 tensorflow-build_2 = tensorflow-build; # added 2021-11-25 tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 + tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 topydo = throw "topydo was moved to pkgs.topydo"; # added 2017-09-22 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f563b4faa9d48..989f0680881a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2209,7 +2209,6 @@ in { django = self.django_3; # Current LTS - django_2 = callPackage ../development/python-modules/django/2.nix { }; django_3 = callPackage ../development/python-modules/django/3.nix { }; # Current latest @@ -2219,7 +2218,7 @@ in { django-anymail = callPackage ../development/python-modules/django-anymail { }; - django_appconf = callPackage ../development/python-modules/django_appconf { }; + django-appconf = callPackage ../development/python-modules/django-appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; @@ -2867,6 +2866,8 @@ in { findimports = callPackage ../development/python-modules/findimports { }; + findpython = callPackage ../development/python-modules/findpython { }; + fingerprints = callPackage ../development/python-modules/fingerprints { }; finitude = callPackage ../development/python-modules/finitude { }; @@ -3692,6 +3693,8 @@ in { hatasmota = callPackage ../development/python-modules/hatasmota { }; + hatchling = callPackage ../development/python-modules/hatchling { }; + haversine = callPackage ../development/python-modules/haversine { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; @@ -6981,9 +6984,7 @@ in { pygetwindow = callPackage ../development/python-modules/pygetwindow { }; - pygit2 = callPackage ../development/python-modules/pygit2 { - libgit2 = pkgs.libgit2_1_3_0; - }; + pygit2 = callPackage ../development/python-modules/pygit2 { }; PyGithub = callPackage ../development/python-modules/pyGithub { }; @@ -7890,8 +7891,6 @@ in { pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; - pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; - pytest-qt = callPackage ../development/python-modules/pytest-qt { }; pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; @@ -9311,6 +9310,8 @@ in { sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; + socksio = callPackage ../development/python-modules/socksio { }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; soco = callPackage ../development/python-modules/soco { }; @@ -9777,6 +9778,8 @@ in { tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit { }; + tensorboard = callPackage ../development/python-modules/tensorboard { }; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { @@ -9809,8 +9812,6 @@ in { tensorflow = self.tensorflow-build; - tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; @@ -10082,7 +10083,9 @@ in { trimesh = callPackage ../development/python-modules/trimesh { }; - trio = callPackage ../development/python-modules/trio { }; + trio = callPackage ../development/python-modules/trio { + inherit (pkgs) coreutils; + }; trio-asyncio = callPackage ../development/python-modules/trio-asyncio { };