diff options
Diffstat (limited to 'pkgs/development/python-modules')
959 files changed, 12266 insertions, 6407 deletions
diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix deleted file mode 100644 index bbbdc29d45f15..0000000000000 --- a/pkgs/development/python-modules/Flask-PyMongo/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, flask -, pymongo -, vcversioner -, lib -, pytest -}: - -buildPythonPackage rec { - pname = "flask-pymongo"; - version = "2.3.0"; - - src = fetchPypi { - pname = "Flask-PyMongo"; - inherit version; - sha256 = "051kwdk07y4xm4yawcjhn6bz8swxp9nanv7jj35mz2l0r0nv03k2"; - }; - - nativeCheckInputs = [ pytest ]; - - checkPhase = '' - pytest - ''; - - # Tests seem to hang - doCheck = false; - - propagatedBuildInputs = [ flask pymongo vcversioner ]; - - meta = { - homepage = "https://flask-pymongo.readthedocs.org/"; - description = "PyMongo support for Flask applications"; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index c2c4e125e3287..555a60412bf45 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.12"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-anRNCnLDKHAEfOWi6m1n4R9lvFTlZgw5xxh39exvzH0="; + hash = "sha256-Z85bHM3MtS2MLX9BaKi8VqA13QjO9KdrgqhuyBzjILQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix index 3315df4212ce5..8aaa8b61fda7a 100644 --- a/pkgs/development/python-modules/adafruit-io/default.nix +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "adafruit-io"; - version = "2.7.1"; + version = "2.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adafruit"; repo = "Adafruit_IO_Python"; rev = "refs/tags/${version}"; - hash = "sha256-vfjyU+czLtUA0WDEvc0iYmJ2Tn75o/OsX909clfDsUE="; + hash = "sha256-JBpF08WGe1pMK1y7HZLH/jSQkJtbWdiTGYHWRd39UIk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index baecca21fd5e5..bee4d68d5d738 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.60.0"; + version = "3.62.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-ZE3rETwAuhv7pHA/zYDKtStWONShFG8tWDeN9K8JdG8="; + hash = "sha256-L2CbqWqyOo4mq+KsO8FYAyHClRKFXMLWWtfYEg0SD34="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index 6960b390ed033..dcf232247be9e 100644 --- a/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/pkgs/development/python-modules/aemet-opendata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.4.7"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-kmU2HtNyYhfwWQv6asOtDpLZ6+O+eEICzBNLxUhAwaY="; + hash = "sha256-qj1rXM3yHYDQhtOkHfKEGS2ICjN7B2olD4og3uISjcw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 5205734d4da52..1f3055b4600dd 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "agate-dbf"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; propagatedBuildInputs = [ agate dbf dbfread ]; src = fetchPypi { inherit pname version; - sha256 = "589682b78c5c03f2dc8511e6e3edb659fb7336cd118e248896bb0b44c2f1917b"; + sha256 = "sha256-mKK1N1cTbMdNwpflniEB009tSPQfdBVrtsDeJruiqj8="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/ago/default.nix b/pkgs/development/python-modules/ago/default.nix new file mode 100644 index 0000000000000..ad095c441db26 --- /dev/null +++ b/pkgs/development/python-modules/ago/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, pythonOlder + +, pytestCheckHook + +, setuptools +}: + +buildPythonPackage rec { + pname = "ago"; + version = "0.0.95"; + pyproject = true; + + disabled = pythonOlder "3.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0gEPXqw99UTsSOwRYQLgaFkaNFsaWA8ylz24pQX8p0Q="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "ago" ]; + + meta = with lib; { + description = "Human Readable Time Deltas"; + homepage = "https://git.unturf.com/python/ago"; + license = licenses.publicDomain; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index dab1e05180f91..f2ab45f2ddbc1 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.3.8"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-h9WUHehTXg73qqpw+sMxoQMzOV+io2GvjwXlr4gF2ns="; + hash = "sha256-EcvHwBSHjKvPqwGCPPpannuSZcDI2Lt2hT5NSgkwfq8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index fdded411bee7c..905232c065a36 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.7.4"; + version = "0.7.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-yIkP0eWyEJAZc2tJbwTvlU5b2pDta4SatmsTMPsSDt8="; + hash = "sha256-99Km1zizAA0BF4ZlLmKOBoOQzKS/QdWpWC9dzg2s3lU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioapcaccess/default.nix b/pkgs/development/python-modules/aioapcaccess/default.nix index 3733248482224..6d6c709552519 100644 --- a/pkgs/development/python-modules/aioapcaccess/default.nix +++ b/pkgs/development/python-modules/aioapcaccess/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioapcaccess"; - version = "0.4.2"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "yuxincs"; repo = "aioapcaccess"; rev = "refs/tags/v${version}"; - hash = "sha256-Ig9aQduM9wby3DzPjvbubihopwhdMXHovMo3Id47mRk="; + hash = "sha256-nI8hfHfSLMOKPcG5idYqqa/msJuR/Xt+JmgzdftlN28="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 02e0dcc3d90fd..486781c4c97d8 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.2.7"; + version = "2024.2.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-ij/Webe/YqpAyjCXFpKq0eyvTegiTDJYiMASuUJKc7Q="; + hash = "sha256-NRcLyuU5FFIKJALUrx5iVSihzgO6ljqaqlhbs+y2E4Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix index 231e4bbbe8b2b..6b0f79655717e 100644 --- a/pkgs/development/python-modules/aioboto3/default.nix +++ b/pkgs/development/python-modules/aioboto3/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioboto3"; - version = "12.1.0"; + version = "12.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "terrycain"; repo = "aioboto3"; rev = "refs/tags/v${version}"; - hash = "sha256-CVRDQhymQRi5dyVBLJYTnF3RI4jPBB966dVMT4lOd8g="; + hash = "sha256-GDuxy/V+j0LRJ2lbcRHMEAga+pdCbYIWhEt3ItrHMB4="; }; nativeBuildInputs = [ @@ -37,8 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiobotocore - boto3 - ]; + ] ++ aiobotocore.optional-dependencies.boto3; passthru.optional-dependencies = { chalice = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 006bd358d7c25..21883ceab8aa8 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -7,25 +7,29 @@ , fetchFromGitHub , flask , flask-cors +, awscli , moto +, boto3 +, setuptools , pytest-asyncio , pytestCheckHook +, pythonAtLeast , pythonOlder , wrapt }: buildPythonPackage rec { pname = "aiobotocore"; - version = "2.8.0"; - format = "setuptools"; + version = "2.11.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiobotocore"; rev = "refs/tags/${version}"; - hash = "sha256-mVG3dCz9DnExteUFhvTGjZu81E0KbrObP3OX0w/OVzU="; + hash = "sha256-H9nsLPxjv3H5y6+5piBt6Pb+Wks4vwOitM+WQtyViPs="; }; # Relax version constraints: aiobotocore works with newer botocore versions @@ -34,6 +38,10 @@ buildPythonPackage rec { sed -i "s/'botocore>=.*'/'botocore'/" setup.py ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aioitertools @@ -41,6 +49,15 @@ buildPythonPackage rec { wrapt ]; + passthru.optional-dependencies = { + awscli = [ + awscli + ]; + boto3 = [ + boto3 + ]; + }; + nativeCheckInputs = [ dill flask @@ -80,6 +97,10 @@ buildPythonPackage rec { "test_required_config_not_set" "test_sso_cred_fetcher_raises_helpful_message_on_unauthorized_exception" "test_sso_credential_fetcher_can_fetch_credentials" + ] ++ lib.optionals (pythonAtLeast "3.12.") [ + # AttributeError: 'called_with' is not a valid assertion. Use a spec for the mock if 'called_with' is meant to be an attribute. + "test_max_rate_updated_on_success_response" + "test_max_rate_cant_exceed_20_percent_max" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 215a4029daca3..fd4e5f3a154a3 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -1,28 +1,33 @@ { lib -, aioredis , buildPythonPackage , fetchFromGitHub , msgpack , pythonOlder +, redis +, setuptools }: buildPythonPackage rec { pname = "aiocache"; version = "0.12.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiocache"; rev = "refs/tags/v${version}"; hash = "sha256-yvXDNJL8uxReaU81klVWudJwh1hmvg5GeeILcNpm/YA="; }; + nativeBuildInputs = [ + setuptools + ]; + passthru.optional-dependencies = { redis = [ - aioredis + redis ]; msgpack = [ msgpack diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index 4feb6fc185c4f..af2b220a21c2b 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -1,15 +1,31 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, pygments +, pythonAtLeast , pythonOlder + +# build-system +, setuptools + +# optionals +, cbor2 +, cbor-diag +, cryptography +, filelock +, ge25519 +, dtlssocket +, websockets +, termcolor +, pygments + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "aiocoap"; version = "0.4.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,14 +36,52 @@ buildPythonPackage rec { hash = "sha256-4iwoPfmIwk+PlWUp60aqA5qZgzyj34pnZHf9uH5UhnY="; }; - propagatedBuildInputs = [ - pygments + nativeBuildInputs = [ + setuptools ]; + passthru.optional-dependencies = { + oscore = [ + cbor2 + cryptography + filelock + ge25519 + ]; + tinydtls = [ + dtlssocket + ]; + ws = [ + websockets + ]; + prettyprint = [ + termcolor + cbor2 + pygments + cbor-diag + ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/chrysn/aiocoap/issues/339 + "--deselect=tests/test_server.py::TestServerTCP::test_big_resource" + "--deselect=tests/test_server.py::TestServerTCP::test_empty_accept" + "--deselect=tests/test_server.py::TestServerTCP::test_error_resources" + "--deselect=tests/test_server.py::TestServerTCP::test_fast_resource" + "--deselect=tests/test_server.py::TestServerTCP::test_js_accept" + "--deselect=tests/test_server.py::TestServerTCP::test_manualbig_resource" + "--deselect=tests/test_server.py::TestServerTCP::test_nonexisting_resource" + "--deselect=tests/test_server.py::TestServerTCP::test_replacing_resource" + "--deselect=tests/test_server.py::TestServerTCP::test_root_resource" + "--deselect=tests/test_server.py::TestServerTCP::test_slow_resource" + "--deselect=tests/test_server.py::TestServerTCP::test_slowbig_resource" + "--deselect=tests/test_server.py::TestServerTCP::test_spurious_resource" + "--deselect=tests/test_server.py::TestServerTCP::test_unacceptable_accept" + ]; + disabledTestPaths = [ # Don't test the plugins "tests/test_tls.py" diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 64fd61e2219ad..b9c18196d24a1 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.8.3"; - format = "pyproject"; + version = "0.9.0"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -20,12 +20,12 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-og54xVby9kyLtsIBCmH3KjKSSWaxHtXCH+wvHdrGQAU="; + hash = "sha256-Fjf7mXXUnBTtPfNHHJdFx5ho4eg0N3iHCGsACa4IMjY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiocsv/default.nix b/pkgs/development/python-modules/aiocsv/default.nix index 8960dca9a8d7b..30511eb816761 100644 --- a/pkgs/development/python-modules/aiocsv/default.nix +++ b/pkgs/development/python-modules/aiocsv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiocsv"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "MKuranowski"; repo = "aiocsv"; rev = "refs/tags/v${version}"; - hash = "sha256-5jMmT7XY+1VNbDNciZS6B/oQJFj4XmGvhDITKWHCuOQ="; + hash = "sha256-zHU9NfxiRUOAk0kwsKmvxd01UtNXZTnb700Wlm9DUz4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix new file mode 100644 index 0000000000000..9a860cfb832c9 --- /dev/null +++ b/pkgs/development/python-modules/aiodhcpwatcher/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, poetry-core + +# dependencies +, scapy + +# tests +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiodhcpwatcher"; + version = "0.8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiodhcpwatcher"; + rev = "v${version}"; + hash = "sha256-zZigXYUDSbXjlH810CgLa56xWYKcStBeKUbgsZ5WjOw="; + }; + + postPatch = '' + sed -i "/addopts =/d" pyproject.toml + ''; + + build-system = [ + poetry-core + ]; + + dependencies = [ + scapy + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiodhcpwatcher" + ]; + + meta = with lib; { + description = "Watch for DHCP packets with asyncio"; + homepage = "https://github.com/bdraco/aiodhcpwatcher"; + changelog = "https://github.com/bdraco/aiodhcpwatcher/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 7c81afa0f8b36..ad3ac4f4e5733 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -9,8 +9,10 @@ # dependencies , aiohappyeyeballs +, async-interrupt , async-timeout , chacha20poly1305-reuseable +, cryptography , noiseprotocol , protobuf , zeroconf @@ -23,7 +25,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "21.0.2"; + version = "23.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +34,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uNVf0wnqVntjTxkNTilvb0v6h3VBCjd91wbLQJ6q71g="; + hash = "sha256-iYaRA1Jj9Ew/s/LyS6U+NZ3TsAlXdDq0DAaudgFV5/o="; }; nativeBuildInputs = [ @@ -42,7 +44,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohappyeyeballs + async-interrupt chacha20poly1305-reuseable + cryptography noiseprotocol protobuf zeroconf @@ -56,6 +60,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/esphome/aioesphomeapi/issues/837 + "test_reconnect_logic_stop_callback" + ]; + pythonImportsCheck = [ "aioesphomeapi" ]; diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index 727cf4992810f..c125e2869df96 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -5,12 +5,13 @@ , pytestCheckHook , aiohttp , aiohttp-socks -, aioredis , aiofiles , aresponses , babel , certifi , magic-filter +, pycryptodomex +, pytest-aiohttp , pytest-asyncio , pytest-lazy-fixture , redis @@ -49,8 +50,9 @@ buildPythonPackage rec { nativeCheckInputs = [ aiohttp-socks - aioredis aresponses + pycryptodomex + pytest-aiohttp pytest-asyncio pytest-lazy-fixture pytestCheckHook @@ -58,10 +60,9 @@ buildPythonPackage rec { redis ]; - # import failures - disabledTests = [ - "test_aiohtt_server" - "test_deep_linking" + pytestFlagsArray = [ + "-W" "ignore::pluggy.PluggyTeardownRaisedWarning" + "-W" "ignore::pytest.PytestDeprecationWarning" ]; pythonImportsCheck = [ "aiogram" ]; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 8ea84581873a1..2e6a1957779e5 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.1.4"; + version = "3.1.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-hZhbmEEqmhvoxGD4hvy4SDQWG5Xk1cmzFDSNa742iMs="; + hash = "sha256-F3PhZsuIgT3x1Y3/kx9juPwN2WKxvdbahrRm+r6ZPps="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix index dc5b34aad95ec..c8ff60e64f5a7 100644 --- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -1,17 +1,25 @@ -{ lib, fetchPypi, python3, ...}: +{ lib +, fetchPypi +, buildPythonPackage +, poetry-core +, aiohttp +, attrs +, itsdangerous +, url-normalize +}: -python3.pkgs.buildPythonPackage rec { +buildPythonPackage rec { pname = "aiohttp_client_cache"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-FXU4QNqa8B8ZADmoEyJfd8gsUDI0HEjIR9B2CBP55wU="; + sha256 = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s="; }; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ aiohttp attrs itsdangerous diff --git a/pkgs/development/python-modules/aiomisc-pytest/default.nix b/pkgs/development/python-modules/aiomisc-pytest/default.nix index c3f720cdadeb1..96c77b1d96bad 100644 --- a/pkgs/development/python-modules/aiomisc-pytest/default.nix +++ b/pkgs/development/python-modules/aiomisc-pytest/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "aiomisc-pytest"; - version = "1.1.1"; - format = "pyproject"; + version = "1.1.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "aiomisc_pytest"; inherit version; - hash = "sha256-LDeMQbB4wFdgJ95r9/vFN6fmkoXSPq9NRXONXQ3lbdM="; + hash = "sha256-Zja0cNFrn6mUFlZOtzAtBJ/Gn27akD59qX6p88ytD6w="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest integration for aiomisc"; - homepage = "https://github.com/aiokitchen/aiomisc"; + homepage = "https://github.com/aiokitchen/aiomisc-pytest"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 38a692910d4aa..92e016c786b8a 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.3.41"; - format = "pyproject"; + version = "17.5.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-thJBptiwH3jLQIYw7ucCv4xwaGPXMpE+dUwRvsyURtw="; + hash = "sha256-bpR9HsR/7qVaDcTsHXJypGDyS7/BE/CzFk6eNaQ/C8k="; }; nativeBuildInputs = [ @@ -49,9 +49,7 @@ buildPythonPackage rec { pytestCheckHook raven setproctitle - ] ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.cron - ++ passthru.optional-dependencies.uvloop; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); passthru.optional-dependencies = { aiohttp = [ diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix index 634c031cbd748..16450a8758b99 100644 --- a/pkgs/development/python-modules/aiomqtt/default.nix +++ b/pkgs/development/python-modules/aiomqtt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiomqtt"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sbtinstruments"; repo = "aiomqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-Ww4NdCtT04b4tRmarJjB4xmfRBNIQekP8iARAdpmBH0="; + hash = "sha256-bV1elEO1518LVLwNDN5pzjxRgcG34K1XUsK7fTw8h+8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index 5d92471c472cc..9ba8dae31c8a8 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.11"; + version = "0.3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,12 +24,12 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiomysensors"; rev = "refs/tags/v${version}"; - hash = "sha256-uBmFJFmUClTkaAg8jTThygzmZv7UZDPSt0bXo8BLu00="; + hash = "sha256-7Y7JE/GAX5gQrIGcErZTGQXyaf3QwsTFgviiHLWgGeI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=src --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=src --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index e9d95fcb06a74..918900c34a477 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -3,28 +3,32 @@ , aresponses , buildPythonPackage , certifi +, ciso8601 , fetchFromGitHub +, frozenlist +, mashumaro , poetry-core -, pydantic +, pyjwt , pytest-aiohttp , pytest-asyncio -, pytest-cov , pytestCheckHook +, pytest-cov , pythonOlder +, yarl }: buildPythonPackage rec { pname = "aionotion"; - version = "2023.12.0"; - format = "pyproject"; + version = "2024.03.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "aionotion"; rev = "refs/tags/${version}"; - hash = "sha256-F9Mv8c+QEd+Vi5pdNDAFzRnYoNKZSAN5qbeX7yG6kIk="; + hash = "sha256-BsbfLb5wCVxR8v2U2Zzt7LMl7XJcZWfVjZN47VDkhFc="; }; nativeBuildInputs = [ @@ -34,7 +38,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp certifi - pydantic + ciso8601 + frozenlist + mashumaro + pyjwt + yarl ]; __darwinAllowLocalNetworking = true; @@ -58,7 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Notion Home Monitoring"; homepage = "https://github.com/bachya/aionotion"; - changelog = "https://github.com/bachya/aionotion/releases/tag/${src.rev}"; + changelog = "https://github.com/bachya/aionotion/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiooui/default.nix b/pkgs/development/python-modules/aiooui/default.nix new file mode 100644 index 0000000000000..d26385e284b09 --- /dev/null +++ b/pkgs/development/python-modules/aiooui/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiooui"; + version = "0.1.5"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = "aiooui"; + rev = "refs/tags/v${version}"; + hash = "sha256-/RZ8nZatlfo3AJvg/4JgyAHtrnoj50uxbhqr+ToCTJ4="; + }; + + postPatch = '' + # Remove requirements and build part for the OUI data + substituteInPlace pyproject.toml \ + --replace-fail "-v -Wdefault --cov=aiooui --cov-report=term-missing:skip-covered" "" \ + --replace-fail 'script = "build_oui.py"' "" \ + --replace-fail ", 'requests'" "" \ + --replace-fail '"setuptools>=65.4.1", ' "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiooui" + ]; + + meta = with lib; { + description = "Async OUI lookups"; + homepage = "https://github.com/Bluetooth-Devices/aiooui"; + changelog = "https://github.com/Bluetooth-Devices/aiooui/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 602128265fdc6..853d012577404 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -14,21 +14,21 @@ buildPythonPackage rec { pname = "aiopvpc"; - version = "4.2.2"; - format = "pyproject"; + version = "4.3.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "azogue"; - repo = pname; + repo = "aiopvpc"; rev = "refs/tags/v${version}"; - hash = "sha256-k02lNjFjOcMfHa1jLJlMFUOOVrdTrACNoEXDSZ693K8="; + hash = "sha256-8CNmrE3EMFg/bCrdI+K/8f0MRzKtGI74ILFMuSg1Ivo="; }; postPatch = '' - substituteInPlace pyproject.toml --replace \ - " --cov --cov-report term --cov-report html" "" + substituteInPlace pyproject.toml \ + --replace-fail " --cov --cov-report term --cov-report html" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix index 0d9801df1f82f..071fe70dd962c 100644 --- a/pkgs/development/python-modules/aioquic/default.nix +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -3,6 +3,7 @@ , certifi , cryptography , fetchPypi +, fetchpatch , openssl , pylsqpack , pyopenssl @@ -24,6 +25,13 @@ buildPythonPackage rec { hash = "sha256-cHlceJBTJthVwq5SQHIjSq5YbHibgSkuJy0CHpsEMKM="; }; + patches = [ + (fetchpatch { + url = "https://github.com/aiortc/aioquic/commit/e899593805e0b31325a1d347504eb8e6100fe87d.diff"; + hash = "sha256-TTpIIWX/R4k2KxhsN17O9cRW/dN0AARYnju8JTht3D8="; + }) + ]; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 4e77bc9c6509d..2dfef5a251ad9 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "8.0.1"; + version = "8.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3W5XfSOaKCCBjDHJh8IP/5I48py3j6i2O3FfhbcQzbY="; + hash = "sha256-i2dlcparDQlwM7Wk/HwlBz0mmI38ZRwxVM6jLY0rI+0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 2294960ce59a7..0a92b10bfd29a 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -1,53 +1,44 @@ { lib +, aiohttp , async-timeout , buildPythonPackage , fetchFromGitHub -, fetchpatch , pillow -, pytest-asyncio -, pytestCheckHook , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "aioslimproto"; - version = "2.3.3"; - format = "pyproject"; + version = "3.0.1"; + pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "aioslimproto"; rev = "refs/tags/${version}"; - hash = "sha256-d+PEzCF1Cw/7NmumxIRRlr3hojpNsZM/JMQ0KWdosXk="; + hash = "sha256-K7z34fT0PQ5qcV+66VbhYTUhCjqW/OjPnrygBFKIW1k="; }; - patches = [ - # https://github.com/home-assistant-libs/aioslimproto/pull/189 - (fetchpatch { - name = "unpin-setuptools-version.patch"; - url = "https://github.com/home-assistant-libs/aioslimproto/commit/06fd56987be8903ff147bad38af84b21bc31bc18.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov" "" + ''; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ + aiohttp async-timeout pillow ]; - nativeCheckInputs = [ - pytest-asyncio - pytestCheckHook - ]; + # Module has no tests + doCheck = false; pythonImportsCheck = [ "aioslimproto" diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index ad0863280a06b..bd16b06895a61 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -4,11 +4,12 @@ , flit-core , pytestCheckHook , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "aiosqlite"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,13 +18,17 @@ buildPythonPackage rec { owner = "omnilib"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dm7uqG59FP40hcQt+R7qfQiD8P42AYZ2WcH1RoEC5wQ="; + hash = "sha256-JQ9iNxK7FvBhPyr825d+8P5ZYFztDIX3gOwp4FPfyU4="; }; nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ + typing-extensions + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 245f9f44a3aeb..4534dcf09687d 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -8,6 +8,7 @@ , pytest-resource-path , pytest-sugar , pytestCheckHook +, pythonAtLeast , pythonOlder , time-machine }: @@ -52,6 +53,10 @@ buildPythonPackage rec { "test_schedule_parser_with_a_daily_recurring_enabled_schedule_data" "test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data" "test_schedule_parser_with_a_non_recurring_enabled_schedule_data" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # ssertionError: Expected <'I' format requires 0 <= number <= 4294967295> to be equal to <argument out of range>, but was not. + "test_minutes_to_hexadecimal_seconds_with_a_negative_value_should_throw_an_error" + "test_current_timestamp_to_hexadecimal_with_errornous_value_should_throw_an_error" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 93010f174c7c3..e50bd10281c5e 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "71"; + version = "72"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "aiounifi"; rev = "refs/tags/v${version}"; - hash = "sha256-KmxwCjmvDByCtsSQ+fQtdLS4ZDxtUaqc5zoOF9dsSq8="; + hash = "sha256-PrFI5ncHW4r2Re1BIqRZlz8ns6d5p6y6PASCleSmyNc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index 0456138379027..1c97a430503a4 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonAtLeast , setuptools -, nose +, pynose , coverage , wrapt }: @@ -13,9 +13,6 @@ buildPythonPackage rec { version = "1.4.2"; pyproject = true; - # requires the imp module - disabled = pythonAtLeast "3.12"; - src = fetchFromGitHub { owner = "kwarunek"; repo = pname; @@ -32,12 +29,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pynose coverage ]; checkPhase = '' - nosetests + nosetests -e test_specific_test ''; pythonImportsCheck = [ "aiounittest" ]; diff --git a/pkgs/development/python-modules/airium/default.nix b/pkgs/development/python-modules/airium/default.nix new file mode 100644 index 0000000000000..4d84454a339c9 --- /dev/null +++ b/pkgs/development/python-modules/airium/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, setuptools +, pytestCheckHook +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "airium"; + version = "0.2.6"; + pyproject = true; + + src = fetchFromGitLab { + owner = "kamichal"; + repo = "airium"; + rev = "v${version}"; + hash = "sha256-qAU+rmj2ZHw7KdxVvRyponcPiRcyENfDyW1y9JTiwsY="; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + beautifulsoup4 + ]; + + # tests require internet access, broken in sandbox + disabledTests = [ + "test_get_bad_content_type" + "test_translate_remote_file" + ]; + + meta = with lib; { + description = "Bidirectional HTML-python translator"; + homepage = "https://gitlab.com/kamichal/airium"; + license = licenses.mit; + maintainers = with maintainers; [ hulr ]; + }; +} diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix index b51da08516c00..7153890494e2c 100644 --- a/pkgs/development/python-modules/airly/default.nix +++ b/pkgs/development/python-modules/airly/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -21,6 +22,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; + # aiounittest is not supported on 3.12 + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ aioresponses aiounittest diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index aa418733a6ccd..91ceae7ea2883 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -1,5 +1,6 @@ { lib , async-interrupt +, async-timeout , bleak , bleak-retry-connector , buildPythonPackage @@ -11,21 +12,21 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "vincegio"; - repo = pname; - rev = "refs/tags/v${version}"; + repo = "airthings-ble"; + rev = "refs/tags/${version}"; hash = "sha256-A7Nrg0O+WVoHP+m8pz6idnNcxulwPYmMt9DfhKTHG24="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "-v -Wdefault --cov=airthings_ble --cov-report=term-missing:skip-covered" "" + --replace-fail "-v -Wdefault --cov=airthings_ble --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ @@ -36,6 +37,8 @@ buildPythonPackage rec { async-interrupt bleak bleak-retry-connector + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index 0504f4bc6f6d4..3573990876a2f 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-q2s+wngDKtWm5mxGHNAc63Ed6tiQD9gLHVoQZNWFB0w="; }; + postPatch = '' + substituteInPlace test/test_{ad2,devices,messages}.py \ + --replace-fail assertEquals assertEqual + ''; + propagatedBuildInputs = [ pyftdi pyopenssl diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index e2104641b78d3..6c13bebebdfe7 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -1,12 +1,14 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , numpy , opencv4 , pyyaml , qudida , scikit-image , scipy +, deepdiff , pytestCheckHook , pythonOlder , pythonRelaxDepsHook @@ -14,14 +16,14 @@ buildPythonPackage rec { pname = "albumentations"; - version = "1.3.1"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pqODiP5UbFaAcejIL0FEmOhsntA8CLWOeoizHPeiRMY="; + hash = "sha256-ZJ+KFIlveIs1bsxwCDxPuRvtq0/04rOa0heoJOGJ3tA="; }; nativeBuildInputs = [ @@ -32,7 +34,11 @@ buildPythonPackage rec { "opencv-python" ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ numpy opencv4 pyyaml @@ -42,6 +48,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + deepdiff pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index 1ab81cd86b521..1ead4ce1427cf 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-core"; - version = "2.14.0"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yAaBWkj/24lMxbzhW4JZuaMBLMDNoBvi89+7hE8/TyE="; + hash = "sha256-7cRVVIjYqfHGG9QZx74nsjl0sqBSlxtGFPzSKerus4I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index 719ac71ec5e1b..01f5dde3b562f 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "amaranth-boards"; - version = "unstable-2021-12-17"; + version = "0-unstable-2023-12-13"; format = "setuptools"; # python setup.py --version realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-boards"; - rev = "8e2615765e255144403431ca95c5cdf6c78eb638"; - sha256 = "3EOG8SO5xBNevshXMRrxKWoJUbeaVi8ckbkmqd6Tw70="; + rev = "170675812b71ee722bcf8ccdb88409a9ad97ffe2"; + hash = "sha256-dwZCKMJnEY9RjzkcJ9r3TEC7W+Wfi/P7Hjl4/d60/qo="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Board definitions for Amaranth HDL"; homepage = "https://github.com/amaranth-lang/amaranth-boards"; license = licenses.bsd2; - maintainers = with maintainers; [ emily thoughtpolice ]; + maintainers = with maintainers; [ emily thoughtpolice pbsds ]; }; } diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 11f331d033c7d..b509ec551cf84 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -2,35 +2,34 @@ , buildPythonPackage , fetchFromGitHub , amaranth -, setuptools -, setuptools-scm +, pdm-backend }: buildPythonPackage rec { pname = "amaranth-soc"; - version = "unstable-2023-09-15"; - format = "setuptools"; - # python setup.py --version - realVersion = "0.1.dev70+g${lib.substring 0 7 src.rev}"; + version = "0-unstable-2024-02-16"; + pyproject = true; + # from `pdm show` + realVersion = "0.1a1.dev1+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "cce8a79a37498f4d5900be21a295ba77e51e6c9d"; - sha256 = "sha256-hfkJaqICuy3iSTwLM9lbUPvSMDBLW8GdxqswyAOsowo="; + rev = "9f46553aa4289e2a11788a73fade6410a371b162"; + hash = "sha256-ZllDSrZEu16jZtbQ7crQSj3XCbsthueXtaAvyf45dmY="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ setuptools amaranth ]; + nativeBuildInputs = [ pdm-backend ]; + propagatedBuildInputs = [ amaranth ]; preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" + export PDM_BUILD_SCM_VERSION="${realVersion}" ''; meta = with lib; { description = "System on Chip toolkit for Amaranth HDL"; homepage = "https://github.com/amaranth-lang/amaranth-soc"; license = licenses.bsd2; - maintainers = with maintainers; [ emily thoughtpolice ]; + maintainers = with maintainers; [ emily thoughtpolice pbsds ]; }; } diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index ad2cacb2ced8d..e441daefcd433 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -19,15 +19,14 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - # python -m setuptools_scm - version = "0.4.dev197+g${lib.substring 0 7 src.rev}"; + version = "0.4.3"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; - rev = "11d5bb19eb34463918c07dc5e2e0eac7dbf822b0"; - sha256 = "sha256-Ji5oYfF2hKSunAdAQTniv8Ajj6NE/bvW5cvadrGKa+U="; + rev = "refs/tags/v${version}"; + hash = "sha256-03uAaD4aEMxu/T1D8Hb7XcWvZZuaCK5HmdOD9bx+ZIc="; }; nativeBuildInputs = [ @@ -55,6 +54,6 @@ buildPythonPackage rec { description = "A modern hardware definition language and toolchain based on Python"; homepage = "https://amaranth-lang.org/docs/amaranth"; license = licenses.bsd2; - maintainers = with maintainers; [ emily thoughtpolice ]; + maintainers = with maintainers; [ emily thoughtpolice pbsds ]; }; } diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 899fd02e93925..685fdd59f9693 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.3.5"; + version = "2.3.6"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-zZ3dV2WHDqPFRbbLR6qtXwTZowpijdP82082eijCIIU="; + hash = "sha256-shdKEtytLcLzQuqCh2iY9WigtmxTVoYAv4BXcVj8uhw="; }; patches = [ diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 7a2f7e5e66064..57d1a6b7ebf1b 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.16.3"; + version = "2.16.4"; src = fetchPypi { inherit pname version; - hash = "sha256-dqh2WoWGBk7wc6KZVi4wj6LBgKdbX3Vpu9D2HUFxzbM="; + hash = "sha256-LNIIsJFZSMiL/60zHl0HCXtu3KGHLLUzdeUbZxnmoGA="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index c2ebd3e9d8bbf..af123b9df7775 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "9.2.0"; + version = "9.3.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-ogekoApF5c0Xin+UykKv4m8jydJ75JkB6oxF0YoHt8Y="; + hash = "sha256-f06g5NBlU4h5s+Eegehe7U2ALRlA9lZK2VDp0RoxsDw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index f645a416e8344..f8d992bed39b2 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -12,6 +12,7 @@ , exceptiongroup , idna , sniffio +, typing-extensions # optionals , trio @@ -28,7 +29,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +38,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PEDPliWJX3QypwsvJTAJhrQnJx8lWXQQSdyjN0I8L+I="; + hash = "sha256-9BxzdeQ5Yh4FDXGNVx9kiy7/fBmn8esvZkrK4wW4oGA="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ buildPythonPackage rec { sniffio ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup + typing-extensions ]; passthru.optional-dependencies = { @@ -77,16 +79,7 @@ buildPythonPackage rec { "-m" "'not network'" ]; - disabledTests = [ - # INTERNALERROR> AttributeError: 'NonBaseMultiError' object has no attribute '_exceptions'. Did you mean: 'exceptions'? - "test_exception_group_children" - "test_exception_group_host" - "test_exception_group_filtering" - # timing sensitive - # assert threading.active_count() == initial_count + 1 - # assert 4 == (4 + 1) - "test_run_sync_from_thread_pooling" - ] ++ lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [ # PermissionError: [Errno 1] Operation not permitted: '/dev/console' "test_is_block_device" ]; @@ -98,7 +91,9 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "anyio" ]; + pythonImportsCheck = [ + "anyio" + ]; meta = with lib; { changelog = "https://github.com/agronholm/anyio/blob/${src.rev}/docs/versionhistory.rst"; diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index d12798092413b..fa5a0aa10209d 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.2"; + version = "0.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-S6nB3Df17sD1Zrsp+1Di66FNeaVmE1rqt8hogjI/3I4="; + hash = "sha256-Coae8oretZHhb1c9i5x0Sm1nVruN89kRZSEMyeLibbg="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index e08df2ca1db9f..d39d59325d17a 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , marshmallow , mock , openapi-spec-validator @@ -9,20 +10,25 @@ , pytestCheckHook , pythonOlder , pyyaml +, setuptools }: buildPythonPackage rec { pname = "apispec"; - version = "6.4.0"; - format = "setuptools"; + version = "6.5.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QrimgzzxVMnb0i0Aa1a/nEnJctMtJP5xb9c04Pa3Obg="; + hash = "sha256-wDpNhIrnDpuyJp3U5NMNjsfsBp0k756bQi48vRqf55Q="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 9d3f55bec2834..0ae5af5730a21 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.7.2"; + version = "1.7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CeFZspAI5sjpPX/8PBXUGcC7rkFiBAX48tNDK3Ki6b8="; + hash = "sha256-716DAFEUDUIop1nFvC1oV7zH+GZN8+RPMPZGF84MenM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 497d4a9aa4dd1..32ec4869cae55 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -15,11 +15,12 @@ , pythonOlder , setuptools , testfixtures +, typing-extensions }: buildPythonPackage rec { pname = "approvaltests"; - version = "10.4.0"; + version = "11.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-/UsrUzCd4aYEQ4epZggk2O2esJCUG0DxRseK+s6yJd4="; + hash = "sha256-kVGCAht3ZP6ENhFJG3LoYs6PTH7OSNoj/h5QACwjKG8="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { pyperclip pytest testfixtures + typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 174dbc71a28a7..d9cba7737271f 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.6.2"; + version = "5.6.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-/Un5Jh/3UjhJApL0eQzj545F9q+55xwFsIa5M+U93w0="; + hash = "sha256-Uq0DXrNQRVhQaPXXGNjbnPhOYoPpa8H3WuDdotCKS8c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index df5bcc40836f4..7e2d9aa7b92a2 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchFromGitHub , aiohttp @@ -36,6 +37,18 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # stuck on EpollSelector.poll() + "test_power" + "test_multiple" + "test_invalid_command" + "test_state" + "test_silent_server_request" + "test_silent_server_disconnect" + "test_heartbeat" + "test_cancellation" + ]; + pythonImportsCheck = [ "arcam.fmj" "arcam.fmj.client" diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 7c5bf54369965..2496934d571b3 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.1.6"; + version = "3.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kislyuk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Akwa6dsf8w/Sw0ydUrqKEP5+dzHYX4hS8vcl7Gw4ePc="; + hash = "sha256-gOKuFv04Qv9ry7LEKC9zIe7kJvHNFhTBDUrL+zu8AYk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 336b6f6db8569..0ccca5417a2eb 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.24.0"; + version = "1.25.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2baSX6b2BFYHXKg37WMHcGel3OTGsCJrulvyxmbdBek="; + hash = "sha256-KU67tu14pX1nCRl9k/Na9EqelO3Uz7It1dpFBU2IjZA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 63bf85273811b..edd555a96b166 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -100,6 +100,7 @@ buildPythonPackage rec { "test_plot_ppc_discrete_save_animation" # Assertion error "test_data_zarr" + "test_plot_forest" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 56e2e7fe8991e..8ce547ee08d83 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "7.0.4"; + version = "7.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-eq8VKML50TfOnHZFXr+Ht7FUMm+NHJOksKvv3uMcq3g="; + hash = "sha256-mumnr3jeiinSLagBfYuMVcdUcM5HkUPD8iwvu9YychA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index a9e078b387561..426116f5775a4 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, python , fetchFromGitHub # build system @@ -9,17 +10,31 @@ , pytestCheckHook }: +# Switch version based on python version, as the situation isn't easy: +# https://github.com/wbond/asn1crypto/issues/269 +# https://github.com/MatthiasValvekens/certomancer/issues/12 +with ( + if lib.versionOlder python.version "3.12" then rec { + version = "1.5.1"; + rev = version; + hash = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; + } else { + version = "1.5.1-unstable-2023-11-03"; + rev = "b763a757bb2bef2ab63620611ddd8006d5e9e4a2"; + hash = "sha256-11WajEDtisiJsKQjZMSd5sDog3DuuBzf1PcgSY+uuXY="; + } +); + buildPythonPackage rec { pname = "asn1crypto"; - version = "1.5.1"; pyproject = true; + inherit version; # Pulling from Github to run tests src = fetchFromGitHub { owner = "wbond"; repo = "asn1crypto"; - rev = version; - hash = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; + inherit rev hash; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 6d5c11104315f..fd0812139e3c6 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "3.0.1"; # Check whether the version is compatible with pylint + version = "3.0.2"; # Check whether the version is compatible with pylint pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "astroid"; rev = "refs/tags/v${version}"; - hash = "sha256-z6FmB3I3VmiIx0MSsrkvHmDVv2h3CaaeXlDG3DewGXw="; + hash = "sha256-KTmFJKlymI1ACWk3UhbkZF/dB9W8/h6kaAfKLL3yiCA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 4814e1e70c40b..0dee4e9ed97db 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -72,6 +72,9 @@ buildPythonPackage rec { # May fail due to parallelism, see: # https://github.com/astropy/astropy/issues/15441 "TestUnifiedOutputRegistry" + # More flaky tests, see: https://github.com/NixOS/nixpkgs/issues/294392 + "test_sidereal_lon_independent" + "test_timedelta_full_precision_arithmetic" ]; meta = { diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 0e2da16189bec..3421902ff8309 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.18"; + version = "0.0.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t2AolP0GZ88b0+FqHXHIP1V6TIV61Bvd8wVXpZZltK0="; + hash = "sha256-QQVgIPdonPXwpVl1nH8Cps4nGb2oTfeDvRBY1XgeUUs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index e6b2a2769331f..57306bd01a4dc 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.12.0"; + version = "3.12.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = "asyncstdlib"; rev = "refs/tags/v${version}"; - hash = "sha256-ZINCpUtwXZxGTMolfyZh5cBFZV0h7ODhsRcmkRzBTEI="; + hash = "sha256-F7jS2EHiq+gK4a6+wJ8CA2YvwR37PP3yvbsLp3uE8R8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 7745695436286..3666d8716d960 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -6,7 +6,7 @@ , cryptography , fetchFromGitHub , pyopenssl -, pytest-asyncio +, pytest-asyncio_0_21 , pytest-mock , pytestCheckHook , python-dateutil @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.0.6"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-16OzTxYafK1a/WVH46bL7VhxNI+XpkPHi2agbArpHUk="; + hash = "sha256-tHlo5oNsb8E6r0vmSi0eVbk4RCMg0xe97LITzW9FQWA="; fetchSubmodules = true; }; @@ -60,7 +60,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-asyncio + pytest-asyncio_0_21 pytest-mock ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 429082e442b86..2bfbc16e8f912 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -27,7 +27,7 @@ , pygobject3 , pyopenssl , qrcode -, pytest-asyncio +, pytest-asyncio_0_21 , python-snappy , pytestCheckHook , pythonOlder @@ -72,7 +72,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - pytest-asyncio + pytest-asyncio_0_21 pytestCheckHook ] ++ passthru.optional-dependencies.scram ++ passthru.optional-dependencies.serialization diff --git a/pkgs/development/python-modules/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix index 0897abe77b849..e6f9c94c3f8f1 100644 --- a/pkgs/development/python-modules/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { pname = "autoflake"; - version = "2.2.1"; + version = "2.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Yre2RJppLDybDJFpGbvCFkjacoHoUGvPjT+CgOQx68E="; + hash = "sha256-yYt13FsKhkWcTwGh0yrH60M47EMXpEaVFf8eaH7NkJ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/autoit-ripper/default.nix b/pkgs/development/python-modules/autoit-ripper/default.nix index 0789f6bcc9a76..5b926c18c3c2d 100644 --- a/pkgs/development/python-modules/autoit-ripper/default.nix +++ b/pkgs/development/python-modules/autoit-ripper/default.nix @@ -18,11 +18,6 @@ buildPythonPackage rec { hash = "sha256-+BHWDkeVewoRUgaHln5TyoajpCvJiowCiC2dFYyp1MA="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail "pefile==2019.4.18" "pefile>=2019.4.18" - ''; - nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix index 1b3a7d6521855..46adfc6195ac4 100644 --- a/pkgs/development/python-modules/autologging/default.nix +++ b/pkgs/development/python-modules/autologging/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - pname = "Autologging"; + pname = "autologging"; version = "1.3.2"; src = fetchPypi { - inherit pname version; + pname = "Autologging"; + inherit version; sha256 = "117659584d8aab8cf62046f682f8e57b54d958b8571c737fa8bf15c32937fbb6"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 4bfffd8a780b3..34dd0baa4c99d 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,27 +1,33 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , glibcLocales , pycodestyle , pytestCheckHook , pythonOlder +, setuptools , tomli }: buildPythonPackage rec { pname = "autopep8"; - version = "2.0.4"; - format = "setuptools"; + version = "2.0.4-unstable-2023-10-27"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hhatto"; repo = "autopep8"; - rev = "refs/tags/v${version}"; - hash = "sha256-TuaDnZqn9mRUsoDJkj9JK4ztvzl9JTwAk8nghIkZBvw="; + rev = "af7399d90926f2fe99a71f15197a08fa197f73a1"; + hash = "sha256-psGl9rXxTQGHyXf1VskJ/I/goVH5hRRP5bUXQdaT/8M="; }; + build-system = [ + setuptools + ]; + propagatedBuildInputs = [ pycodestyle ] ++ lib.optionals (pythonOlder "3.11") [ diff --git a/pkgs/development/python-modules/avidtools/default.nix b/pkgs/development/python-modules/avidtools/default.nix index c0edd6033de7e..bcb1ba01c819a 100644 --- a/pkgs/development/python-modules/avidtools/default.nix +++ b/pkgs/development/python-modules/avidtools/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "avidtools"; - version = "0.1.1.2"; + version = "0.1.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-t+ohPjOBwY8i+g7VC30ehEu6SFIsn1SwGR/ICkV9blg="; + hash = "sha256-2YtX+kUryTwaQ4QvExw5OJ4Rx8JoTzBeC8VSyNEL7OY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 4cd972d95b8ce..f728bbb562097 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -2,11 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder - -# build-system , poetry-core - -# tests , pytest-snapshot , pytestCheckHook }: @@ -14,13 +10,13 @@ buildPythonPackage rec { pname = "awesomeversion"; version = "24.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "awesomeversion"; rev = "refs/tags/${version}"; hash = "sha256-bpLtHhpWc1VweVl5G8mM473Js3bXT11N3Zc0jiVqq5c="; }; @@ -28,7 +24,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ - --replace 'version = "0"' 'version = "${version}"' + --replace-fail 'version = "0"' 'version = "${version}"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 18c0be822dea1..ad54fd5e2d883 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "29"; + version = "30"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-r0t4kbeLkDFxvONB6I0q3YQFn6Fn8I6KmTAFmZ0bnRs="; + hash = "sha256-W+lMpzUdjkIcuUeKm3EBb6dnNiH6Ei1HfQsHu2iqfUw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 5c174cb54d2be..a093cb5d8e40c 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.6.1"; + version = "2.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-G9jXAo37mhvXzn7cQ/DEUGauGs+P7JxBntfu7ZPfaHc="; + hash = "sha256-5wUTEB0iVffyCi671y4EsTum+7K1GDeAHlhdLpRgKnQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix index b9186ab1779c5..7cdcc917c8a87 100644 --- a/pkgs/development/python-modules/aws-encryption-sdk/default.nix +++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -1,54 +1,62 @@ { lib -, buildPythonPackage -, fetchPypi , attrs , boto3 +, buildPythonPackage , cryptography -, setuptools -, wrapt +, fetchPypi , mock -, pytest , pytest-mock , pytestCheckHook +, pythonAtLeast +, pythonOlder +, setuptools +, wrapt }: buildPythonPackage rec { pname = "aws-encryption-sdk"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-jV+/AY/GjWscrL5N0Df9gFKWx3Nqn+RX62hNBT9/lWM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs boto3 cryptography - setuptools wrapt ]; - doCheck = true; - nativeCheckInputs = [ mock - pytest pytest-mock pytestCheckHook ]; disabledTestPaths = [ - # requires networking + # Tests require networking "examples" "test/integration" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # AssertionError: Regex pattern did not match, https://github.com/aws/aws-encryption-sdk-python/issues/644 + "test_abstracts" + ]; + meta = with lib; { + description = "Python implementation of the AWS Encryption SDK"; homepage = "https://aws-encryption-sdk-python.readthedocs.io/"; changelog = "https://github.com/aws/aws-encryption-sdk-python/blob/v${version}/CHANGELOG.rst"; - description = "Fully compliant, native Python implementation of the AWS Encryption SDK."; license = licenses.asl20; maintainers = with maintainers; [ anthonyroussel ]; }; diff --git a/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix b/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix index 7e54c030bf1e6..90226ddd99e47 100644 --- a/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix +++ b/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix @@ -1,34 +1,27 @@ { lib +, botocore , buildPythonPackage -, pythonOlder , fetchPypi +, pytestCheckHook +, pythonAtLeast +, pythonOlder , setuptools , setuptools-scm -, botocore -, pytestCheckHook }: buildPythonPackage rec { - pname = "aws_secretsmanager_caching"; + pname = "aws-secretsmanager-caching"; version = "1.1.1.5"; - format = "setuptools"; + pyprject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "5cee2762bb89b72f3e5123feee8e45fbe44ffe163bfca08b28f27b2e2b7772e1"; + pname = "aws_secretsmanager_caching"; + inherit version; + hash = "sha256-XO4nYruJty8+USP+7o5F++RP/hY7/KCLKPJ7Lit3cuE="; }; - nativeBuildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - botocore - setuptools # Needs pkg_resources at runtime. - ]; - patches = [ # Remove coverage tests from the pytest invocation in setup.cfg. ./remove-coverage-tests.patch @@ -36,9 +29,18 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner'," "" + --replace-fail "'pytest-runner'," "" ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + botocore + setuptools # Needs pkg_resources at runtime. + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -48,6 +50,21 @@ buildPythonPackage rec { "test/integ" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # TypeError: 'float' object cannot be interpreted as an integer + "test_calls_hook_binary" + "test_calls_hook_string" + "test_get_secret_binary" + "test_get_secret_string" + "test_invalid_json" + "test_missing_key" + "test_string_with_additional_kwargs" + "test_string" + "test_valid_json_with_mixed_args" + "test_valid_json_with_no_secret_kwarg" + "test_valid_json" + ]; + pythonImportsCheck = [ "aws_secretsmanager_caching" ]; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 31639cb455ffe..b22836dd04b85 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.20.3"; + version = "0.20.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xB5HHDSUKHYGosbCa4/pesx0uJQarp2aEhpHDBmDh1g="; + hash = "sha256-v5zpSzU4M3G6tcvPnR4tLxjEhByDKz73qAor9yEjKdI="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index ba0526837ec26..261d1b5ab5cd4 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -7,23 +7,34 @@ , orjson , packaging , pythonOlder +, setuptools , xmltodict }: buildPythonPackage rec { pname = "axis"; - version = "48"; - format = "setuptools"; + version = "54"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Kane610"; - repo = pname; + repo = "axis"; rev = "refs/tags/v${version}"; - hash = "sha256-/Iz1F40Y00bgJUvNrkPGyA8Kkch92Kijeg8TQ8mostM="; + hash = "sha256-Atx9Lg0WgKcdnXqHieJFadjMPhK1F2qifSa89XxT8J8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==68.0.0" "setuptools" \ + --replace-fail "wheel==0.40.0" "wheel" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ async-timeout attrs diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 44f3c1b81085a..90a16ee098204 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -12,15 +12,16 @@ , pytest-trio , pytestCheckHook , requests +, setuptools , six , trio , typing-extensions }: buildPythonPackage rec { - version = "1.28.0"; + version = "1.30.1"; pname = "azure-core"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,10 +29,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-6e78Zvwf3lbatvBNTl0SxgdU1an6Sb3P2FNPyW7ZNr0="; + hash = "sha256-Jic6JUEx+EJp6OpEZPNWDHMfKcDB9prJkBCEXyOcGo8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests six @@ -99,8 +103,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Core Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/CHANGELOG.md"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-core_${version}/sdk/core/azure-core/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index ba589b8aa5e61..3f0adab003df1 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -1,23 +1,28 @@ { lib +, azure-core , buildPythonPackage , fetchPypi -, azure-core , pythonOlder +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.11.5"; - format = "setuptools"; + version = "5.11.6"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HDdOmQezNIPVCLTHst8p+crGM15dpaGNIYU0+UL01Uw="; + hash = "sha256-89Q1o/cnR64i4Jblypx2w1BTTyrZk5l9EvTO+ZMq58E="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-core typing-extensions diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix index 07d608dfa56f7..a890e435508fc 100644 --- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -1,34 +1,36 @@ { lib +, azure-core , buildPythonPackage , fetchPypi +, isodate , pythonOlder -, azure-common -, azure-core -, msrest -, six +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "azure-keyvault-administration"; - version = "4.3.0"; - format = "setuptools"; + version = "4.4.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-PuKjui0OP0ODNErjbjJ90hOgee97JDrVT2sh+MufxWY="; + hash = "sha256-ems2y59UTzV1D/L6lMg7l7PvIMH+G0JOpoAY7ucD8d8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - azure-common azure-core - msrest - six + typing-extensions + isodate ]; - # no tests in pypi tarball + # Tests require checkout from mono-repo doCheck = false; pythonNamespaces = [ @@ -42,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Key Vault Administration Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-administration"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-administration_${version}/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 77d81c87ec31a..e45f1b241517b 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -3,36 +3,40 @@ , fetchPypi , azure-common , azure-core -, msrest -, msrestazure +, isodate , pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.7.0"; - format = "setuptools"; + version = "4.8.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-nkfZp0gl5QKxPVSByZwYIEDE9Ucj9DNx4AhZQ23888o="; + hash = "sha256-xWEnPkQCwlEUhzSGyYv6GyxHiGIp1BAOh9rxAO4Edyg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-common azure-core - msrest - msrestazure + isodate + typing-extensions ]; pythonNamespaces = [ "azure.keyvault" ]; - # has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -41,7 +45,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Key Vault Certificates Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-certificates"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-certificates_${version}/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index ddb5d440b0b34..56004efa76b63 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -1,41 +1,46 @@ { lib +, azure-core , buildPythonPackage , fetchPypi +, isodate , pythonOlder -, azure-common -, azure-core -, msrest +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.7.0"; - format = "setuptools"; + version = "4.8.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-d+4lNLplGh8wbIXXtQW8PM7o/qd0UOuvr8Jq7BblRF0="; + hash = "sha256-VjbAodiiDjxXmcs8z/1Ovz8NGst8rpUmhhgzr4sP6BQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - azure-common azure-core - msrest + isodate + typing-extensions ]; pythonNamespaces = [ "azure.keyvault" ]; - # requires checkout from mono-repo + # Tests require checkout from mono-repo doCheck = false; meta = with lib; { description = "Microsoft Azure Key Vault Secrets Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-secrets"; + changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-secrets_${version}/sdk/keyvault/azure-keyvault-secrets"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index ee4b29c28a8e7..748f1423e59ea 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -5,24 +5,29 @@ , fetchPypi , isodate , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "5.0.0"; - format = "setuptools"; + version = "6.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WX/lFsU8qGg3Mg5bk+U0SBdR6cQpjtfmbX02Hr8uz7o="; + hash = "sha256-0B+K8u9M/z3edwlc8LNR8DeqV9y6vIVCmevoUIWN0YM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - isodate azure-common azure-mgmt-core + isodate ]; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index a9e55d0e775a1..d64d76abd1fe1 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -5,27 +5,29 @@ , fetchPypi , isodate , pythonOlder -, typing-extensions +, setuptools }: buildPythonPackage rec { pname = "azure-mgmt-network"; - version = "25.2.0"; - format = "setuptools"; + version = "25.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-EUxCktIjsdHiR7Qa9luNWjeTVn5q2/ojB3IFUiP0GCo="; + hash = "sha256-3OLK+xrg5WPgte/FN9yYp8Ctgk1CYeZL7XX3iBlt1cY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-common azure-mgmt-core isodate - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; # Module has no tests @@ -41,7 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure SDK for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-network"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-network_${version}/sdk/network/azure-mgmt-network/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ olcai maxwilson jonringer ]; }; diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index f2f30079954d3..e309643e8c6e8 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , pythonOlder , gitpython , pbr @@ -12,14 +11,14 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.7"; - format = "setuptools"; + version = "1.7.8"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-UnkGvsYIjLSZquMbyWKGS053Vp6dUp7lHfOpO0uKsoo="; + hash = "sha256-Nt5Q9yCFarJKJNuqX+4sZgUO2XwUd+ChFZ3qsXdeq2s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index b3e26b5a55d67..3dd2e761b0976 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; rev = "refs/tags/v${version}"; - hash = "sha256-RlEizHJwSojujqFFi14T5/W5L9juVSHMQepbRlirMeI="; + hash = "sha256-0rTGsphwLy2yGvhO7bcmFqdgysIXXkDBmURwRVw3ZHY="; }; sourceRoot = "${src.name}/packages/basemap"; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index eaee0ef0974cb..86ca3020baccc 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.26"; + version = "0.5.28"; format = "setuptools"; # Python 2 not supported and not some old Python 3 because MPL doesn't support @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NOvuqPKioRIqScd2jC7nakonDEovTo9qKp/uTk9z1BE="; + sha256 = "sha256-0NKxx3dGNNsYc0nD9nIwJ1wpDJHu4Ny+Z/zzj4jys40="; }; nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 0b7d04c69e856..e15cae2562407 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -10,13 +10,14 @@ , pyyaml , requests , responses +, setuptools , unidiff }: buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.30"; - format = "setuptools"; + version = "1.5.4"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,9 +25,13 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-wq+SKOiMcVO7OiK+RdRk4RNsjSAT7lBdAjLHfurSIRo="; + hash = "sha256-Gm8PYN9vqYkGaGKpLZkx0Ehd1P3G2d5LkSjWXxpPerI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyyaml requests diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index fa440cc7fd2d1..9ae71f9ffef6a 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "bcrypt"; - version = "4.0.1"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-J9N1kDrIJhz+QEf2cJ0W99GNObHskqr3KvmJVSplDr0="; + hash = "sha256-3zf1QY1PHNz/hF9g50egFTifpOY3A8kYMwhl4GrYAAc="; }; cargoRoot = "src/_bcrypt"; @@ -35,7 +35,7 @@ buildPythonPackage rec { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-lDWX69YENZFMu7pyBmavUZaalGvFqbHSHfkwkzmDQaY="; + hash = "sha256-QYg1+DsZEdXB74vuS4SFvV0n5GXkuwHkOS9j1ogSTjA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index 58f7515c10d6c..b55b8ce93c69f 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - pname = "Beaker"; + pname = "beaker"; version = "1.11.0"; # The pypy release do not contains the tests diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 3eba6f3317a42..b5091bf519d0c 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook , pythonOlder , typing-extensions @@ -8,16 +9,20 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.16.4"; + version = "0.17.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GtqJzy1usw624Vbu0utUkzV3gpN5ENdDgJGOU8Lq4L8="; + hash = "sha256-6RHhrn3kvM0VdF92Q2CdhzL2TeXC+4ROicu+0cWo1JU="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook typing-extensions diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index f7431e6ea4eb0..e93f810a61f8e 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.38.0"; + version = "0.38.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-7aqzhujTn1TMYBA6+79Ok76yv8hXszuuZ7TjhJ6zbQw="; + hash = "sha256-oxPzjDb+FdHeHsgeGKH3SVvKb0vCB9dIhT7lGzhDcBw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 2ecbd1124685b..f2c2ce7958f11 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -10,13 +10,14 @@ , pytest-benchmark , sortedcollections , sortedcontainers +, typing-extensions , pythonOlder }: buildPythonPackage rec { pname = "bidict"; - version = "0.22.1"; - format = "pyproject"; + version = "0.23.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "jab"; repo = "bidict"; rev = "refs/tags/v${version}"; - hash = "sha256-mPBruasjQwErl5M91OBf71hArztdRVONOCnqos180DY="; + hash = "sha256-WE0YaRT4a/byvU2pzcByuf1DfMlOpYA9i0PPrKXsS+M="; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ buildPythonPackage rec { pytest-benchmark sortedcollections sortedcontainers + typing-extensions ]; pythonImportsCheck = [ "bidict" ]; diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix index 5666f7c1353a0..079653a2aec17 100644 --- a/pkgs/development/python-modules/bip-utils/default.nix +++ b/pkgs/development/python-modules/bip-utils/default.nix @@ -11,12 +11,13 @@ , pynacl , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "bip-utils"; - version = "2.9.1"; - format = "setuptools"; + version = "2.9.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,9 +25,13 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = "bip_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-D+LalbrwsjxwYW8l38D1l4tGAsjrZ+bS+/Ppgaxkzy4="; + hash = "sha256-qK1jSVfkebB9JM0sZjOu7ABc7xMrcybu1r7oQOw3bJo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ecdsa cbor2 diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 52cc36e989cc4..73ce7f8d30fdd 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -5,7 +5,6 @@ , pythonOlder , pytestCheckHook , aiohttp -, aiohttp-cors , click , colorama , hatch-fancy-pypi-readme @@ -19,7 +18,6 @@ , platformdirs , tokenize-rt , tomli -, typed-ast , typing-extensions , uvloop }: @@ -78,6 +76,10 @@ buildPythonPackage rec { parameterized ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + preCheck = '' export PATH="$PATH:$out/bin" diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index ffecee75337a2..0138f8b1d7f3d 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bleak-esphome"; - version = "0.4.1"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "bleak-esphome"; rev = "refs/tags/v${version}"; - hash = "sha256-cLjQg54DL17VtM/NFOQUE0dJThz5EhjipW2t9yhAMQ0="; + hash = "sha256-zz7vh+UIahHtb6ZjR/eRrS9RGur2klqbgKoeJpMrH/k="; }; postPatch = '' @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bleak backend of ESPHome"; homepage = "https://github.com/bluetooth-devices/bleak-esphome"; - changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix index e91abe0b8f06b..3381c0d1ccf84 100644 --- a/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.2.2"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - hash = "sha256-q1plIIcPY94zRD17srz5vMJzkk6K/xbbNIRB6zLlUo0="; + hash = "sha256-nqxbwHzx2cnojw/XX9XQoVvOCCd88tulY0m9xEHU3m4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bless/default.nix b/pkgs/development/python-modules/bless/default.nix index dbe92d76c73f6..3f24aef8bf539 100644 --- a/pkgs/development/python-modules/bless/default.nix +++ b/pkgs/development/python-modules/bless/default.nix @@ -5,24 +5,34 @@ , dbus-next , fetchFromGitHub , numpy +, pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "bless"; - version = "0.2.5"; - format = "setuptools"; + version = "0.2.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kevincar"; - repo = pname; + repo = "bless"; rev = "refs/tags/v${version}"; - hash = "sha256-+rnMLqNfhIJASCKkIfOKpVil3S/d8BcMxnLHmdOcRIY="; + hash = "sha256-dAdA+d75iE6v6t4mfgvwhRsIARLW+IqCGmaMABaDlZg="; }; + postPatch = '' + sed -i "/pysetupdi/d" setup.py + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ bleak dbus-next @@ -31,6 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aioconsole numpy + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 765f4340ceb93..cf6924f2f3d67 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -1,23 +1,24 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, poetry-core , aiohttp +, aiooui , async-timeout , bleak +, buildPythonPackage , dbus-fast +, fetchFromGitHub , mac-vendor-lookup , myst-parser +, poetry-core , pytestCheckHook -, sphinxHook +, pythonOlder , sphinx-rtd-theme +, sphinxHook , usb-devices }: buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-7j55+bCScoqtYJ/1lmqsPk3j+dbs+VfPTzTiwdVg0Pw="; + hash = "sha256-KPmCOPCK7muT0qptJMKQwWU/6tvepkdHwlNYcrvpRLg="; }; postPatch = '' @@ -48,6 +49,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + aiooui async-timeout bleak dbus-fast @@ -65,7 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools to enumerate and find Bluetooth Adapters"; - homepage = "https://bluetooth-adapters.readthedocs.io/"; + homepage = "https://github.com/Bluetooth-Devices/bluetooth-adapters"; changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.home-assistant.members; diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 2a39c28d0fdb4..9a146770fd6d7 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -13,18 +13,23 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.3.0"; - format = "pyproject"; + version = "1.4.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "bluetooth-auto-recovery"; rev = "refs/tags/v${version}"; - hash = "sha256-4DFi7UrEQgU7dckUuGxj/sWyystx8NYb6xK4hyurKKo="; + hash = "sha256-fXR7leW+eXaQZ22IyeVhpS5/MOnuAiunUGMdtfVrlos="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov=bluetooth_auto_recovery --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,11 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=bluetooth_auto_recovery --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "bluetooth_auto_recovery" ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 91760ed463a76..a54608df9fc8f 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.3.3"; + version = "3.3.4"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-bs5vACY/LSBDok6vnbdab4YO/Ioflt9mMYb+PrJpLdM="; + hash = "sha256-c7eYLcK43xW/Zgzd3I04JegpGVxDgBWl0Jgk8acCg2g="; }; src_test = fetchFromGitHub { diff --git a/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/pkgs/development/python-modules/bootstrap/flit-core/default.nix index ab9e52538d341..43fec03901cd8 100644 --- a/pkgs/development/python-modules/bootstrap/flit-core/default.nix +++ b/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -4,11 +4,11 @@ , flit-core }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "${python.libPrefix}-bootstrap-${flit-core.pname}"; inherit (flit-core) version src patches meta; - sourceRoot = "source/flit_core"; + sourceRoot = "${src.name}/flit_core"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index f3fda2ef3c8ba..14e04b17f6042 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.90"; + version = "0.2.91"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = "boschshcpy"; rev = "refs/tags/${version}"; - hash = "sha256-qI8fpQJ7fyZ6CX010cyPuoFj9UQM+jHOJ201GCjIwBU="; + hash = "sha256-lQDYJrla2iDk1MbLHjBGP3ZcZ1djD3bWhz15RaBFMgg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 37931dd6887b3..f1a22d6e91267 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.47"; + version = "1.34.62"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hMeQgnm/btHo/v+Jxo6gWkDPR6TLFp30AVWOu/pLdYs="; + hash = "sha256-0ms6qz8xFWwDST6cMbf1SRVJyasMuqV+Cgnjifscipo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 717bb264283f9..aa9bcd2246b5a 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -1,29 +1,40 @@ { lib +, botocore , buildPythonPackage , fetchFromGitHub -, botocore , jmespath +, pytest-xdist +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , s3transfer , setuptools -, pytestCheckHook }: buildPythonPackage rec { pname = "boto3"; - version = "1.33.6"; # N.B: if you change this, change botocore and awscli to a matching version - format = "pyproject"; + version = "1.34.49"; # N.B: if you change this, change botocore and awscli to a matching version + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "boto"; - repo = pname; - rev = version; - hash = "sha256-oOrUVBh1sbaOibU8A+bGZ4z7IEiE4gjHwZ+8889Hv60="; + repo = "boto3"; + rev = "refs/tags/${version}"; + hash = "sha256-/pgbLSL5RJ5RrKUAfQ1QNJykBdICrpqnuziHOVHt1JI="; }; nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; + pythonRelaxDeps = [ + "botocore" + "s3transfer" + ]; + propagatedBuildInputs = [ botocore jmespath @@ -31,6 +42,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-xdist pytestCheckHook ]; @@ -44,14 +56,16 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - crt = [ botocore.optional-dependencies.crt ]; + crt = [ + botocore.optional-dependencies.crt + ]; }; meta = with lib; { + description = "AWS SDK for Python"; homepage = "https://github.com/boto/boto3"; changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - description = "AWS SDK for Python"; longDescription = '' Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for Python, which allows Python developers to write software that makes use of diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index c885bb212ba12..6dd67db976307 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.47"; + version = "1.34.62"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-zB+sMY47KPTK5PZk2qFZj80dqof+WzErQCE3t2HtHEY="; + hash = "sha256-i0iPzIqL0zsA08frxJB65Eys6o/qk6Tf2sf6tfBlAMg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index ea7ea23fc40d6..89b6dbe07821f 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -1,33 +1,47 @@ { lib +, awscrt , buildPythonPackage , fetchPypi -, python-dateutil , jmespath -, urllib3 -, pytestCheckHook , jsonschema -, awscrt +, pytestCheckHook +, python-dateutil +, pythonOlder +, pythonRelaxDepsHook +, setuptools +, urllib3 }: buildPythonPackage rec { pname = "botocore"; - version = "1.33.6"; # N.B: if you change this, change boto3 and awscli to a matching version - format = "setuptools"; + version = "1.34.49"; # N.B: if you change this, change boto3 and awscli to a matching version + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-k4BWurgxgp+Q4J7NcN1rKVr9UrFIL1WC7noR2CQ9lmE="; + hash = "sha256-2JQQvGBnPq/xaZ8/H9yw46Xh96agSMDYjDzlw1SUM+w="; }; + pythonRelaxDeps = [ + "urllib3" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + propagatedBuildInputs = [ - python-dateutil jmespath + python-dateutil urllib3 ]; nativeCheckInputs = [ - pytestCheckHook jsonschema + pytestCheckHook ]; disabledTestPaths = [ @@ -43,14 +57,16 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - crt = [ awscrt ]; + crt = [ + awscrt + ]; }; meta = with lib; { + description = "A low-level interface to a growing number of Amazon Web Services"; homepage = "https://github.com/boto/botocore"; changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - description = "A low-level interface to a growing number of Amazon Web Services"; maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index e327e135c48cd..677b4a9903622 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bottleneck"; - version = "1.3.7"; + version = "1.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Bottleneck"; inherit version; - hash = "sha256-4UZ+NzrUado0DtD/KDIU1lMcwIv9yiCDNho6pkcGgfg="; + hash = "sha256-Z4DYlpabp/U8iZW6kMh8VIvrPbQ13JDGC5oQ7Rq02Gg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 54bb6bff1b326..60907fe7f1392 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "brother"; - version = "3.0.0"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rRzcWT9DcNTBUYxyYYC7WORBbrkgj0toCp2e8ADUN5s="; + hash = "sha256-n1CIozKuF0+N8Vg3QA2jy5xNLDBJPdnhVT/xg1R+t90="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index faa8582b6b22e..b869d89e8f167 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.5.0"; - format = "pyproject"; + version = "3.8.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-7/09RasnW4cTUbwf3N+9DxsGG9pCaqAODX2UNWvlxZg="; + hash = "sha256-P+37i7E1/OF3XKC828ycxYC9Zw+b8Bw5XrfPbL6sPVY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 232a7f62f44f1..bc61188b5902f 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "btrees"; - version = "5.1"; + version = "5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BTrees"; inherit version; - hash = "sha256-raDzHpMloEeV0dJOAn7ZsrZdpNZqz/i4eVWzUo1/w2k="; + hash = "sha256-bkoK8BpLvslan5Mbr1xUWXn0NBoTp2Yf+KSXr089g4E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index c97947a28596d..a20770673fb53 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.6.1"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-GzpupL+wE2JJPT92O6yZNWZowo6fXzUvkuBDtKL1Hao="; + hash = "sha256-UwlT4a0jzp6vo5ZpB/o3MKJAFHpaDJBcaQvFoctS120="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildcatrust/default.nix b/pkgs/development/python-modules/buildcatrust/default.nix index cb997ab801348..e56d50fb9d4da 100644 --- a/pkgs/development/python-modules/buildcatrust/default.nix +++ b/pkgs/development/python-modules/buildcatrust/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "buildcatrust"; - version = "0.1.3"; + version = "0.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256:0s0m0fy943dakw9cbd40h46qmrhhgrcp292kppyb34m6y27sbagy"; + hash = "sha256-mjX+T5xo6cD1GxJ49Tx7zthPbGPFPYaf2qcNKVHEzJA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 71d535141f0a4..57a739349d5cc 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -2,25 +2,20 @@ , buildPythonPackage , fetchPypi , pythonOlder -, six }: buildPythonPackage rec { pname = "bumps"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-J8NeV9FCUC5dLkosBzVrovxiJJbeuj8Xc50NGEI9Bms="; + hash = "sha256-PhoxjnkeLGL8vgEp7UubXKlS8p44TUkJ3c4SqRjKFJA="; }; - propagatedBuildInputs = [ - six - ]; - # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 5fc21676d261a..c504c0cc77f33 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "bx-python"; - version = "0.10.0"; + version = "0.11.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "refs/tags/v${version}"; - hash = "sha256-j2GKj2IGDBk4LBnISRx6ZW/lh5VSdQBasC0gCRj0Fiw="; + hash = "sha256-evhxh/cCZFSK6EgMu7fC9/ZrPd2S1fZz89ItGYrHQck="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 99a128b0496b2..c40d0b8d4ee5e 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -14,27 +14,20 @@ buildPythonPackage rec { pname = "cachecontrol"; - version = "0.13.1"; - format = "pyproject"; + version = "0.14.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "ionrock"; - repo = pname; + repo = "cachecontrol"; rev = "refs/tags/v${version}"; - hash = "sha256-4N+vk65WxOrT+IJRn+lEnbs5vlWQh9ievVHWWe3BKJ0="; + hash = "sha256-myyqiUGna+5S2GJGnwZTOfLh49NhjfHAvpUB49dQbgY="; }; - postPatch = '' - # https://github.com/ionrock/cachecontrol/issues/297 - substituteInPlace tests/test_etag.py --replace \ - "requests.adapters.HTTPResponse.from_httplib" \ - "urllib3.response.HTTPResponse.from_httplib" - ''; - nativeBuildInputs = [ flit-core ]; @@ -69,6 +62,6 @@ buildPythonPackage rec { homepage = "https://github.com/ionrock/cachecontrol"; changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix index 0cfc20b733970..931279b5a9ac6 100644 --- a/pkgs/development/python-modules/cachier/default.nix +++ b/pkgs/development/python-modules/cachier/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cachier"; - version = "2.3.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-cachier"; repo = "cachier"; - rev = "v${version}"; - hash = "sha256-pgDv0ApFgaNR0amqJNwkTSPlqczOClk9D1uVzZW1B7g="; + rev = "refs/tags/v${version}"; + hash = "sha256-3rKsgcJQ9RQwosVruD7H99msB8iGtAai320okrCZCTI="; }; pythonRemoveDeps = [ "setuptools" ]; diff --git a/pkgs/development/python-modules/cashaddress/default.nix b/pkgs/development/python-modules/cashaddress/default.nix new file mode 100644 index 0000000000000..8458f9b7fba61 --- /dev/null +++ b/pkgs/development/python-modules/cashaddress/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "cashaddress"; + version = "1.0.6-unstable-2015-05-19"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "oskyk"; + repo = "cashaddress"; + rev = "0ca44cff6bd3e63a67b494296c0d1eeaf6cc120d"; + hash = "sha256-4izWD2KZqy1F7CAgdbe1fpjMlMZC0clrkHKS9IIQuoc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cashaddress" + ]; + + meta = with lib; { + description = "Python tool for convert bitcoin cash legacy addresses"; + homepage = "https://github.com/oskyk/cashaddress"; + changelog = "https://github.com/oskyk/cashaddress/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 840c01d876a1a..6795655f48406 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -13,11 +13,11 @@ , wheel }: -buildPythonPackage { +buildPythonPackage rec { inherit (catboost) pname version src meta; format = "pyproject"; - sourceRoot = "source/catboost/python-package"; + sourceRoot = "${src.name}/catboost/python-package"; nativeBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 5523d4f5e0a21..2db51887e21f6 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.5.1"; + version = "5.6.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+eGS9GGp+PYILfKMA1sAbRU5BCE9yGQL7Ypy1yu8lHU="; + hash = "sha256-t1E8LeqIaJkfrX74iZiQ68+LGZubRGHDwR160670gg0="; }; postPatch = '' @@ -44,12 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - # https://github.com/agronholm/cbor2/issues/99 - disabledTests = lib.optionals stdenv.is32bit [ - "test_huge_truncated_bytes" - "test_huge_truncated_string" - ]; - meta = with lib; { changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}"; description = "Python CBOR (de)serializer with extensive tag support"; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index fa7ebb248adb2..587c17b3eca9a 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -79,6 +79,9 @@ buildPythonPackage rec { disabledTests = [ "msgpack" "test_check_privileges_no_fchown" + # seems to only fail on higher core counts + # AssertionError: assert 3 == 0 + "test_setup_security_disabled_serializers" # fails with pytest-xdist "test_itercapture_limit" "test_stamping_headers_in_options" diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index f8dc2c6a3ae0b..1d7f2d57cc1bf 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "cement"; - version = "3.0.8"; + version = "3.0.10"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-rRGmlGZeKtKEV8VgSU9PjDaiX8WOUA1gip2R4E4dMJM="; + hash = "sha256-c9EBXr+bjfE+a8mH7fDUvj8ci0Q4kh7qjWbLtVBK7hU="; }; # Disable test tests since they depend on a memcached server running on diff --git a/pkgs/development/python-modules/certauth/default.nix b/pkgs/development/python-modules/certauth/default.nix index 04a4637bafc98..c69eccf10cd61 100644 --- a/pkgs/development/python-modules/certauth/default.nix +++ b/pkgs/development/python-modules/certauth/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pyopenssl , tldextract , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "certauth"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,9 +25,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "--cov certauth " "" + --replace-fail "--cov certauth " "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyopenssl tldextract @@ -41,6 +46,9 @@ buildPythonPackage rec { ]; disabledTests = [ + # https://github.com/ikreymer/certauth/issues/23 + "test_ca_cert_in_mem" + "test_custom_not_before_not_after" # Tests want to download Public Suffix List "test_file_wildcard" "test_file_wildcard_subdomains" diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix index bccf5c066799d..dd3b161caf5d0 100644 --- a/pkgs/development/python-modules/certipy-ad/default.nix +++ b/pkgs/development/python-modules/certipy-ad/default.nix @@ -14,6 +14,7 @@ , requests , requests-ntlm , unicrypto +, setuptools }: buildPythonPackage rec { @@ -49,6 +50,7 @@ buildPythonPackage rec { requests requests-ntlm unicrypto + setuptools ]; # Project has no tests diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index fcbc6f6f20d5b..9dd92914cb63a 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.8.8"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-memz0VDhxnSHOFaEhFYy/sqRifcu905EGovGduS0YBQ="; + hash = "sha256-MlI5Wx0GOcXPRb/p0sPyAtbf84g3LQKVxCZLBfEIGLo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cffconvert/default.nix b/pkgs/development/python-modules/cffconvert/default.nix new file mode 100644 index 0000000000000..9ca8fb492e5e0 --- /dev/null +++ b/pkgs/development/python-modules/cffconvert/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, click +, requests +, ruamel-yaml +, pykwalify +, jsonschema +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "cffconvert"; + version = "2.0.0-unstable-2024-02-12"; + pyproject = true; + + src = fetchFromGitHub { + owner = "citation-file-format"; + repo = "cffconvert"; + rev = "5295f87c0e261da61a7b919fc754e3a77edd98a7"; + hash = "sha256-/2qhWVNylrqPSf1KmuZQahzq+YH860cohVSfJsDm1BE="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + click + requests + ruamel-yaml + pykwalify + jsonschema + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + # addopts uses --no-cov + pytest-cov + ]; + + disabledTestPaths = [ + # requires network access + "tests/cli/test_rawify_url.py" + ]; + + pythonImportsCheckHook = [ + "cffconvert" + ]; + + meta = { + changelog = "https://github.com/citation-file-format/cffconvert/blob/${src.rev}/CHANGELOG.md"; + description = "Command line program to validate and convert CITATION.cff files"; + homepage = "https://github.com/citation-file-format/cffconvert"; + license = lib.licenses.asl20; + mainProgram = "cffconvert"; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff index fdbec4f6fe4ad..4ef51274aa289 100644 --- a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff +++ b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff @@ -2,15 +2,22 @@ diff --git a/src/c/_cffi_backend.c b/src/c/_cffi_backend.c index 537271f..9c3bf94 100644 --- a/src/c/_cffi_backend.c +++ b/src/c/_cffi_backend.c -@@ -103,7 +103,7 @@ +@@ -103,11 +103,11 @@ # define CFFI_CHECK_FFI_PREP_CIF_VAR 0 # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 0 -#elif defined(__APPLE__) && defined(FFI_AVAILABLE_APPLE) +#elif defined(__APPLE__) - # define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) +-# define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) ++# define CFFI_CHECK_FFI_CLOSURE_ALLOC 1 # define CFFI_CHECK_FFI_CLOSURE_ALLOC_MAYBE 1 +-# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) ++# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC 1 + # define CFFI_CHECK_FFI_PREP_CLOSURE_LOC_MAYBE 1 +-# define CFFI_CHECK_FFI_PREP_CIF_VAR __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) ++# define CFFI_CHECK_FFI_PREP_CIF_VAR 1 + # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 1 @@ -6422,7 +6422,7 @@ static PyObject *b_callback(PyObject *self, PyObject *args) else #endif diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 98f8208335e9a..c98715f9ab027 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -20,16 +20,16 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.83.3"; + version = "0.84.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-0NHD8P+lKsrsEX/ypUS5dIwHOLudQcqkH8zG5RxANxE="; + hash = "sha256-N1bMJdPgl3Ohe4MhmFB5KH2FK4Vp2jB0RUscLFDvi2k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chainstream/default.nix b/pkgs/development/python-modules/chainstream/default.nix new file mode 100644 index 0000000000000..00c10a22e9eeb --- /dev/null +++ b/pkgs/development/python-modules/chainstream/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "chainstream"; + version = "1.0.1"; + + pyproject = true; + + nativeBuildInputs = [ python3Packages.setuptools ]; + + src = fetchPypi { + inherit pname version; + hash = "sha256-302P1BixEmkODm+qTLZwaWLktrlf9cEziQ/TIVfI07c="; + }; + + pythonImportsCheck = [ + "chainstream" + ]; + + meta = with lib; { + description = "Chain I/O streams together into a single stream"; + homepage = "https://github.com/rrthomas/chainstream"; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ cbley ]; + }; +} diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index fccfec53512ea..3c97002f5dcd1 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -1,25 +1,45 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, importlib-metadata +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - pname = "Chameleon"; - version = "3.8.1"; + pname = "chameleon"; + version = "4.5.2"; + pyproject = true; - # tests not included in pypi tarball src = fetchFromGitHub { owner = "malthe"; repo = "chameleon"; - rev = version; - sha256 = "0nf8x4w2vh1a31wdb86nnvlic9xmr23j3in1f6fq4z6mv2jkwa87"; + rev = "refs/tags/${version}"; + hash = "sha256-SVLKT6JeFUpF7gYkq3B7Lm9b9SG2qa6Ekp8i8xM0Xh0="; }; - pythonImportsCheck = [ "chameleon" ]; + build-system = [ + setuptools + ]; + + dependencies = lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "chameleon" + ]; meta = with lib; { - homepage = "https://chameleon.readthedocs.io/"; + changelog = "https://github.com/malthe/chameleon/blob/${version}/CHANGES.rst"; description = "Fast HTML/XML Template Compiler"; + downloadPage = "https://github.com/malthe/chameleon"; + homepage = "https://chameleon.readthedocs.io"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index fc563153a49ca..8987a9695d503 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.18.0"; + version = "5.19.0"; pyproject = true; # chart-studio was split from plotly @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-hY8R4UjcTI5RBaaRU/oR63taKEgYRI3+oOxNuDWzg20="; + hash = "sha256-Xi1Sf07TLPv6TsmsR2WDfY9NYdglpwiu22RjMiktTdw="; }; sourceRoot = "${src.name}/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index b85870572a4c3..bb1a3da46cf56 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "cheetah3"; - version = "3.3.3"; + version = "3.3.3.post1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "CheetahTemplate3"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7L3SBMgNOOLAFvQST8I0gFlrya/6Lwp/umzolfJx3t4="; + hash = "sha256-0NVKie/6Fp8T1O1fvrVorycybLrEXMY1yXZBDyxjpbE="; }; doCheck = false; # Circular dependency diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 51c8b62c97168..903be65bf068e 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , cheroot +, fetchpatch , fetchPypi , jaraco-collections , more-itertools @@ -24,23 +25,34 @@ buildPythonPackage rec { pname = "cherrypy"; - version = "18.8.0"; - format = "setuptools"; + version = "18.9.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "CherryPy"; inherit version; - hash = "sha256-m0jPuoovFtW2QZzGV+bVHbAFujXF44JORyi7A7vH75s="; + hash = "sha256-awbBkc5xqGRh8wVyoatX/8CfQxQ7qOQsEDx7M0ciDrE="; }; + patches = [ + # Replace distutils.spawn.find_executable with shutil.which, https://github.com/cherrypy/cherrypy/pull/2023 + (fetchpatch { + name = "remove-distutils.patch"; + url = "https://github.com/cherrypy/cherrypy/commit/8a19dd5f1e712a326a3613b17e6fc900012ed09a.patch"; + hash = "sha256-fXECX0CdU74usiq9GEkIG9CF+dueszblT4qOeF6B700="; + }) + ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools_scm_git_archive >= 1.1",' "" # Disable doctest plugin because times out substituteInPlace pytest.ini \ - --replace "--doctest-modules" "-vvv" \ - --replace "-p pytest_cov" "" \ - --replace "--no-cov-on-fail" "" + --replace-fail "--doctest-modules" "-vvv" \ + --replace-fail "-p pytest_cov" "" \ + --replace-fail "--no-cov-on-fail" "" sed -i "/--cov/d" pytest.ini ''; @@ -50,10 +62,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cheroot - portend + jaraco-collections more-itertools + portend zc-lockfile - jaraco-collections ]; nativeCheckInputs = [ @@ -126,6 +138,7 @@ buildPythonPackage rec { meta = with lib; { description = "Object-oriented HTTP framework"; homepage = "https://cherrypy.dev/"; + changelog = "https://github.com/cherrypy/cherrypy/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix index e72c3990e367e..37e804c718942 100644 --- a/pkgs/development/python-modules/chispa/default.nix +++ b/pkgs/development/python-modules/chispa/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "chispa"; - version = "0.9.4"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "MrPowers"; repo = "chispa"; rev = "refs/tags/v${version}"; - hash = "sha256-VF7k0u7QpoG3PXvU5M7jrM9pht6xeRUpYH9znMdLOxk="; + hash = "sha256-r3/Uae/Bu/+ZpWt19jetfIRpew1hBB24WWQRJIcYqFs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chroma-hnswlib/default.nix b/pkgs/development/python-modules/chroma-hnswlib/default.nix new file mode 100644 index 0000000000000..31f884e53ba86 --- /dev/null +++ b/pkgs/development/python-modules/chroma-hnswlib/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pybind11 +, setuptools +, wheel +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "chroma-hnswlib"; + version = "0.7.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "chroma-core"; + repo = "hnswlib"; + rev = "refs/tags/${version}"; + hash = "sha256-c4FvymqZy8AZKbh6Y8xZRjKAqYcUyZABRGc1u7vwlsk="; + }; + + nativeBuildInputs = [ + numpy + pybind11 + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hnswlib" + ]; + + meta = with lib; { + description = "Header-only C++/python library for fast approximate nearest neighbors"; + homepage = "https://github.com/chroma-core/hnswlib"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix new file mode 100644 index 0000000000000..37cc44da3f72d --- /dev/null +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -0,0 +1,162 @@ +{ lib +, stdenv +, bcrypt +, build +, buildPythonPackage +, cargo +, chroma-hnswlib +, darwin +, fastapi +, fetchFromGitHub +, grpcio +, hypothesis +, importlib-resources +, kubernetes +, mmh3 +, numpy +, onnxruntime +, openssl +, opentelemetry-api +, opentelemetry-exporter-otlp-proto-grpc +, opentelemetry-instrumentation-fastapi +, opentelemetry-sdk +, orjson +, overrides +, pkg-config +, posthog +, protobuf +, pulsar-client +, pydantic +, pypika +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, pyyaml +, requests +, rustc +, rustPlatform +, setuptools +, setuptools-scm +, tenacity +, tokenizers +, tqdm +, typer +, typing-extensions +, uvicorn +, zstd +}: + +buildPythonPackage rec { + pname = "chromadb"; + version = "0.4.23"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "chroma-core"; + repo = "chroma"; + rev = "refs/tags/${version}"; + hash = "sha256-5gI+FE2jx4G/qahATLcYsONfPZZkk1RFFYK5nrpE0Ug="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-glItbT8gg5SAySnfx3A9TaPyFmd1R46JpAB1JnjBE5M="; + }; + + pythonRelaxDeps = [ + "orjson" + ]; + + nativeBuildInputs = [ + cargo + pkg-config + protobuf + pythonRelaxDepsHook + rustc + rustPlatform.cargoSetupHook + setuptools + setuptools-scm + ]; + + buildInputs = [ + openssl + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + propagatedBuildInputs = [ + bcrypt + build + chroma-hnswlib + fastapi + grpcio + importlib-resources + kubernetes + mmh3 + numpy + onnxruntime + opentelemetry-api + opentelemetry-exporter-otlp-proto-grpc + opentelemetry-instrumentation-fastapi + opentelemetry-sdk + orjson + overrides + posthog + pulsar-client + pydantic + pypika + pyyaml + requests + tenacity + tokenizers + tqdm + typer + typing-extensions + uvicorn + ]; + + nativeCheckInputs = [ + hypothesis + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "chromadb" + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + pytestFlagsArray = [ "-x" ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ + # Tests require network access + "chromadb/test/property/test_cross_version_persist.py" + "chromadb/test/auth/test_simple_rbac_authz.py" + "chromadb/test/ef/test_default_ef.py" + "chromadb/test/test_api.py" + "chromadb/test/property/" + "chromadb/test/stress/" + ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "The AI-native open-source embedding database"; + homepage = "https://github.com/chroma-core/chroma"; + changelog = "https://github.com/chroma-core/chroma/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/clarabel/Cargo.lock b/pkgs/development/python-modules/clarabel/Cargo.lock deleted file mode 100644 index ffc1908e7b752..0000000000000 --- a/pkgs/development/python-modules/clarabel/Cargo.lock +++ /dev/null @@ -1,1487 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "accelerate-src" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415ed64958754dbe991900f3940677e6a7eefb4d7367afd70d642677b0c7d19d" - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "amd" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a679e001575697a3bd195813feb57a4718ecc08dc194944015cbc5f6213c2b96" -dependencies = [ - "num-traits", -] - -[[package]] -name = "anyhow" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "blas" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae980f75c3215bfe8203c349b28149b0f4130a262e072913ccb55f877cd239dc" -dependencies = [ - "blas-sys", - "libc", - "num-complex", -] - -[[package]] -name = "blas-src" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa443ee19b4cde6cdbd49043eb8964f9dd367b6d98d67f04395958ebfa28f39d" -dependencies = [ - "accelerate-src", - "intel-mkl-src", - "netlib-src", - "openblas-src", - "r-src", -] - -[[package]] -name = "blas-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b1b279ceb25d7c4faaea95a5f7addbe7d8c34f9462044bd8e630cebcfc2440" -dependencies = [ - "libc", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clarabel" -version = "0.6.0" -dependencies = [ - "amd", - "blas", - "blas-src", - "cfg-if 1.0.0", - "derive_builder", - "enum_dispatch", - "itertools 0.11.0", - "lapack", - "lapack-src", - "lazy_static", - "libc", - "num-derive", - "num-traits", - "pyo3", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.70+curl-8.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.48.0", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.76", - "quote 1.0.35", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" -dependencies = [ - "darling", - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", -] - -[[package]] -name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "enum_dispatch" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" -dependencies = [ - "once_cell", - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "windows-sys 0.52.0", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "intel-mkl-src" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7260b33a735eaebcb942800728b38c5760b125ea5e4346290d78397b5422b894" -dependencies = [ - "intel-mkl-tool", -] - -[[package]] -name = "intel-mkl-tool" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ada23f955fb7d06cb5db9424863caa7251f8f9b525f4c4816144465f77cfded7" -dependencies = [ - "curl", - "dirs 2.0.2", - "failure", - "glob", - "log", - "pkg-config", - "tar", - "zstd", -] - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] -name = "lapack" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad676a6b4df7e76a9fd80a0c50c619a3948d6105b62a0ab135f064d99c51d207" -dependencies = [ - "lapack-sys", - "libc", - "num-complex", -] - -[[package]] -name = "lapack-src" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c81fcc728418323178fd40407619d0ed26dbbbd1a553693c6290ef5d6698c6" -dependencies = [ - "accelerate-src", - "intel-mkl-src", - "netlib-src", - "openblas-src", - "r-src", -] - -[[package]] -name = "lapack-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447f56c85fb410a7a3d36701b2153c1018b1d2b908c5fbaf01c1b04fac33bcbe" -dependencies = [ - "libc", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall", -] - -[[package]] -name = "libz-sys" -version = "1.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "netlib-src" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f41f36bb4d46906d5a72da5b73a804d9de1a7282eb7c89617201acda7b8212" -dependencies = [ - "cmake", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-derive" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openblas-build" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba42c395477605f400a8d79ee0b756cfb82abe3eb5618e35fa70d3a36010a7f" -dependencies = [ - "anyhow", - "flate2", - "native-tls", - "tar", - "thiserror", - "ureq", - "walkdir", -] - -[[package]] -name = "openblas-src" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e5d8af0b707ac2fe1574daa88b4157da73b0de3dc7c39fe3e2c0bb64070501" -dependencies = [ - "dirs 3.0.2", - "openblas-build", - "vcpkg", -] - -[[package]] -name = "openssl" -version = "0.10.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" -dependencies = [ - "bitflags 2.4.1", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pkg-config" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pyo3" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" -dependencies = [ - "cfg-if 1.0.0", - "indoc", - "libc", - "memoffset", - "parking_lot", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" -dependencies = [ - "proc-macro2 1.0.76", - "pyo3-macros-backend", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2 1.0.76", -] - -[[package]] -name = "r-src" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea397956e1043a8d947ea84b13971d9cb30fce65ca66a921081755ff2e899b6a" - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.38.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "serde" -version = "1.0.195" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.195" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "serde_json" -version = "1.0.111" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", - "unicode-xid 0.2.4", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" - -[[package]] -name = "tempfile" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "thiserror" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "unicode-bidi" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "ureq" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" -dependencies = [ - "base64", - "flate2", - "log", - "native-tls", - "once_cell", - "rustls-native-certs", - "url", -] - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "xattr" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "zstd" -version = "0.5.4+zstd.1.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "2.0.6+zstd.1.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "1.4.18+zstd.1.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81" -dependencies = [ - "cc", - "glob", - "itertools 0.9.0", - "libc", -] diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix index 46cdc7c576114..9d196200f8421 100644 --- a/pkgs/development/python-modules/clarabel/default.nix +++ b/pkgs/development/python-modules/clarabel/default.nix @@ -1,33 +1,30 @@ { lib , stdenv , buildPythonPackage -, fetchFromGitHub +, fetchPypi , rustPlatform , libiconv , numpy , scipy +, nix-update-script }: buildPythonPackage rec { pname = "clarabel"; - version = "0.6.0.post1"; + version = "0.7.1"; pyproject = true; - src = fetchFromGitHub { - owner = "oxfordcontrol"; - repo = "Clarabel.rs"; - rev = "refs/tags/v${version}"; - hash = "sha256-5Mw+3WRMuz3BxLWRdsnXHjetsNrM3EZRZld8lVTNKgo="; + src = fetchPypi { + inherit pname version; + hash = "sha256-owqxNfR1xbx4Mp/X31dSkRVeYFW8rwISTrYQuK0XY5Y="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-Tg9K66WIIAZyua8QlKrlUnpRJRmuxe7ihIr2Vqg79NQ="; }; - postPatch = '' - ln -s ${./Cargo.lock} ./Cargo.lock - ''; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook @@ -52,6 +49,8 @@ buildPythonPackage rec { runHook postCheck ''; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/oxfordcontrol/Clarabel.rs/releases/tag/v${version}/CHANGELOG.md"; description = "Conic Interior Point Solver"; diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 33087975cf819..2503df540047e 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.1.4"; + version = "10.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-cYYAEen/RY5TG2jLxUS38Acehg/X8pni6T1zxhJAi1Y="; + hash = "sha256-8U1e4NOvi2+8GFMXwKiAiCyMYTsfKGW728v0tk6WlgQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 2564b168cfe79..05a86d09ee772 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -1,23 +1,29 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools , clarifai-grpc +, fetchFromGitHub +, inquirerpy +, llama-index-core , numpy , opencv4 +, pandas , pillow +, pycocotools +, pypdf +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , pyyaml , rich , schema +, setuptools , tqdm , tritonclient -, pytestCheckHook }: buildPythonPackage rec { pname = "clarifai"; - version = "9.11.1"; + version = "10.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,36 +32,59 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-fVari/SnrUnEbrYefV9j2yA/EMJoGiLOV7q/DrS0AQ8="; + hash = "sha256-/2PIsSsYr/R7DuTX/ndBAOX7C3IaFqPw16ZAX8E1Vk8="; }; + pythonRelaxDeps = [ + "clarifai-grpc" + ]; + + pythonRemoveDeps = [ + "opencv-python" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; propagatedBuildInputs = [ clarifai-grpc + inquirerpy + llama-index-core numpy - tqdm opencv4 - tritonclient - rich - schema + pandas pillow + pypdf pyyaml + rich + schema + tqdm + tritonclient ]; + passthru.optional-dependencies = { + all = [ + pycocotools + ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ - # require network access and API key + # Test requires network access and API key "test_export_workflow_general" ]; disabledTestPaths = [ - # require network access and API key + # Tests require network access and API key "tests/test_app.py" "tests/test_data_upload.py" "tests/test_model_predict.py" @@ -63,14 +92,18 @@ buildPythonPackage rec { "tests/test_search.py" "tests/workflow/test_create_delete.py" "tests/workflow/test_predict.py" + "tests/test_rag.py" + "clarifai/models/model_serving/repo_build/static_files/base_test.py" ]; - pythonImportsCheck = [ "clarifai" ]; + pythonImportsCheck = [ + "clarifai" + ]; meta = with lib; { description = "Clarifai Python Utilities"; homepage = "https://github.com/Clarifai/clarifai-python"; - changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${src.rev}"; + changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index faf20403e62b3..409f2c004c2cb 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "cli-helpers"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cli_helpers"; inherit version; - hash = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc="; + hash = "sha256-uCqJg87uIfGA5v0N23yo2uQ8QOkglR44F/mWqyBNrmo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index 7711d08e69f1c..a01ef55fd6423 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "clickgen"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ful1e5"; repo = "clickgen"; rev = "refs/tags/v${version}"; - hash = "sha256-mae/bO6aAMyYw42FYNlLMWm/ZC92LDgWVSSRKGR0tFM="; + hash = "sha256-vn30N2BoqqoFjGjWD0KQIuuPoypocIK+R0FI09KwDog="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index b44188ffcc71d..5be944efdb1d3 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.7.0"; + version = "0.7.3"; format = "setuptools"; @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-RpuBKdjjSjJJ9UU7VW20gD9Rouj0oxv72sZZaUa/BfY="; + hash = "sha256-MA902Dyx3a8GTZ52LYY0UrWqNEFmibqIsdz6PFZIkIY="; }; nativeBuildInputs = [ cython_3 ]; diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 738bd890874a4..1bfdafaba5a4a 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.19.0"; + version = "2.19.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tV3I4zE/iD899k5jfB/RpNxy82Mv5m5pCEgBWVFRg9o="; + hash = "sha256-ENS5ayrd7gffo2meChZ9930qjVq3+G5lkOqm6ofW3Bg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index b76de3717bf48..89f5ef6fbf5c2 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.17.0"; + version = "0.18.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "drivendataorg"; repo = "cloudpathlib"; rev = "refs/tags/v${version}"; - hash = "sha256-rj8v4EUMPdB5zmbP4VQli2H6GjDor3BHaA95GwoKS5E="; + hash = "sha256-RrdRUqQ3QyMUpTi1FEsSXK6WS37r77SdPBH1oVVvSw0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 5e6aac6ff13b5..bd17a7791f1bc 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.7"; + version = "2.0.11"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - hash = "sha256-Vw5ifMJ+gwXecYjSe8QKkq+RtrBWxx3B/LdA80ZxuxU="; + hash = "sha256-GwRN3nVMf/OusgJICf/GCCcZ4szEIGl8AZQ7J7LBzro="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index 1efe85a5dca41..ad66af8123bf5 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "cloup"; - version = "3.0.4"; + version = "3.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZYER4vSbglaoItrF+gIFv2QQn978Q185kjSQoysT7Ak="; + hash = "sha256-ySsmHHu34TAEkw8/tLPtrY3i0fEplNzdvgW8IZkEQ8U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 3a00891e60dd2..19571b93ac1e1 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -1,4 +1,6 @@ { lib +, anyio +, async-generator , buildPythonPackage , fetchFromGitHub , cpyparsing @@ -30,6 +32,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + anyio + async-generator cpyparsing ipykernel mypy @@ -50,11 +54,14 @@ buildPythonPackage rec { "coconut/tests/constants_test.py" ]; - pythonImportsCheck = [ "coconut" ]; + pythonImportsCheck = [ + "coconut" + ]; meta = with lib; { - homepage = "http://coconut-lang.org/"; description = "Simple, elegant, Pythonic functional programming"; + homepage = "http://coconut-lang.org/"; + changelog = "https://github.com/evhub/coconut/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fabianhjr ]; }; diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 633b2d2c98479..3f5de521b0a87 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.2.1"; + version = "2024.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-TQ0aC2iFPWh24ce1WoVRluPvnwvBscLtFl8/wcW/Clg="; + hash = "sha256-GdoVb9YtlUlrSx7TWWrdHOqOJJ4M+kJspOllv6HgFXk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index d6140a3f6d2c3..323efb118503f 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "4.47"; + version = "4.52"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1okhIHnBpUW9SXsUPP96pWMoMfps9Bv3rMk7Sm7/uDk="; + hash = "sha256-C2w447+hxsFrjLpV3wrSzptuVb1JTyppq+NUzMCU+Iw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/command_runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix index 67fef574f0941..fb8fd94f80308 100644 --- a/pkgs/development/python-modules/command_runner/default.nix +++ b/pkgs/development/python-modules/command-runner/default.nix @@ -1,12 +1,13 @@ { lib, buildPythonPackage, fetchPypi, psutil }: buildPythonPackage rec { - pname = "command_runner"; + pname = "command-runner"; version = "1.6.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "command_runner"; + inherit version; sha256 = "sha256-lzt1UhhrPqQrBKsRmPhqhtOIfFlCteQqo6sZ6rOut0A="; }; diff --git a/pkgs/development/python-modules/connect_box/default.nix b/pkgs/development/python-modules/connect-box/default.nix index b7ba433478b27..b7ba433478b27 100644 --- a/pkgs/development/python-modules/connect_box/default.nix +++ b/pkgs/development/python-modules/connect-box/default.nix diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index bee00f7d4fa2b..a4bce3f399e46 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -23,7 +23,7 @@ let owner = "twisted"; repo = "constantly"; rev = "refs/tags/${version}"; - hash = "sha256-HTj6zbrCrxvh0PeSkeCSOCloTrVGUX6+o57snrKf6PA="; + hash = "sha256-yXPHQP4B83PuRNvDBnRTx/MaPaQxCl1g5Xrle+N/d7I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix index cd34ebf1da1f0..c475652799ea8 100644 --- a/pkgs/development/python-modules/cpyparsing/default.nix +++ b/pkgs/development/python-modules/cpyparsing/default.nix @@ -1,28 +1,30 @@ { lib , buildPythonPackage , fetchFromGitHub -, cython +, cython_3 , pexpect , python , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "cpyparsing"; version = "2.4.7.2.3.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "evhub"; - repo = pname; + repo = "cpyparsing"; rev = "refs/tags/v${version}"; hash = "sha256-vnzZdJ7pZz1QxlTqw5UKjxB4GVcXuCfKWX4lu3ORWas="; }; nativeBuildInputs = [ - cython + cython_3 + setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index fe60eceb93c83..a7e03d3ecad42 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -1,9 +1,12 @@ { lib , fetchPypi , buildPythonPackage +, fetchpatch , dask , urllib3 , geojson +, verlib2 +, pueblo , pandas , pythonOlder , sqlalchemy @@ -13,20 +16,35 @@ buildPythonPackage rec { pname = "crate"; - version = "0.34.0"; + version = "0.35.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nEWrfCd2MQCcIM6dLkVYc/cWT5wcT/pvYaY2V3wfuto="; + hash = "sha256-4hGACtsK71hvcn8L9ggID7zR+umtTwvskBxSHBpLyME="; }; + patches = [ + # Fix a pandas issue https://github.com/crate/crate-python/commit/db7ba4d0e1f4f4087739a8f9ebe1d71946333979 + (fetchpatch { + url = "https://github.com/crate/crate-python/commit/db7ba4d0e1f4f4087739a8f9ebe1d71946333979.patch"; + hash = "sha256-20g8T0t5gPMbK6kRJ2bzc4BNbB1Dg4hvngXNUPvxi5I="; + name = "python-crate-fix-pandas-error.patch"; + # Patch doesn't apply due to other changes to these files + excludes = [ + "setup.py" + "docs/by-example/sqlalchemy/dataframe.rst" + ]; + }) + ]; propagatedBuildInputs = [ urllib3 sqlalchemy geojson + verlib2 + pueblo ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 6ac6f5db0509e..03f7c636393bb 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "croniter"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0Zmy7D6l6CmI0fcgIkM8X5MCs7Pqnmv9ahUY9upecAo="; + hash = "sha256-i/8Wya9O8ftvBUFpc7j3y1SZfALy+DZSUfm/Hd7ZGGY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock index 58bca2b6e0f77..429622a63cb85 100644 --- a/pkgs/development/python-modules/css-inline/Cargo.lock +++ b/pkgs/development/python-modules/css-inline/Cargo.lock @@ -3,6 +3,15 @@ version = 3 [[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -24,25 +33,31 @@ dependencies = [ ] [[package]] -name = "attohttpc" -version = "0.25.0" +name = "autocfg" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e57d6e7a84f33ff3316e97af3180fe7f86597a6a60161c0be70c0e45f382620" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "flate2", - "http", - "log", - "rustls", - "url", - "webpki", - "webpki-roots", + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", ] [[package]] -name = "autocfg" -version = "1.1.0" +name = "base64" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bitflags" @@ -51,10 +66,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] name = "built" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" dependencies = [ "cargo-lock", "chrono", @@ -62,21 +83,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cargo-lock" @@ -92,9 +113,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -104,89 +128,66 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "winapi", + "windows-targets 0.52.0", ] [[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" +name = "core-foundation" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "cfg-if", + "core-foundation-sys", + "libc", ] [[package]] -name = "crossbeam-channel" -version = "0.5.8" +name = "core-foundation-sys" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "css-inline" -version = "0.10.1" +version = "0.13.0" dependencies = [ - "attohttpc", "cssparser", "html5ever", "indexmap", - "memchr", + "reqwest", + "rustc-hash", "selectors", "smallvec", "url", @@ -194,7 +195,7 @@ dependencies = [ [[package]] name = "css-inline-python" -version = "0.10.1" +version = "0.13.0" dependencies = [ "built", "css-inline", @@ -206,19 +207,15 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.29.6" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" +checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "matches", - "phf 0.10.1", - "proc-macro2", - "quote", + "phf 0.11.2", "smallvec", - "syn 1.0.109", ] [[package]] @@ -228,7 +225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.18", + "syn 2.0.49", ] [[package]] @@ -237,18 +234,16 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case", "proc-macro2", "quote", - "rustc_version", "syn 1.0.109", ] [[package]] name = "dtoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dtoa-short" @@ -261,21 +256,26 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] -name = "flate2" -version = "1.0.26" +name = "encoding_rs" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ - "crc32fast", - "miniz_oxide", + "cfg-if", ] [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -283,9 +283,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -301,6 +301,54 @@ dependencies = [ ] [[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] name = "fxhash" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -311,40 +359,57 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "wasi", ] [[package]] -name = "getrandom" -version = "0.2.10" +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "h2" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", ] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" [[package]] name = "html5ever" @@ -362,9 +427,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -372,17 +437,78 @@ dependencies = [ ] [[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -396,9 +522,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -406,46 +532,52 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] [[package]] name = "indoc" -version = "1.0.9" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "ipnet" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.146" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -453,9 +585,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "mac" @@ -471,23 +603,17 @@ checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" dependencies = [ "log", "phf 0.10.1", - "phf_codegen 0.10.0", + "phf_codegen", "string_cache", "string_cache_codegen", "tendril", ] [[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -499,50 +625,70 @@ dependencies = [ ] [[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] -name = "new_debug_unreachable" -version = "1.0.4" +name = "mio" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "wasi", + "windows-sys", +] [[package]] -name = "nodrop" -version = "0.1.14" +name = "new_debug_unreachable" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", ] [[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" @@ -556,31 +702,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "phf" -version = "0.8.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared 0.8.0", -] +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" @@ -588,19 +725,17 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros", "phf_shared 0.10.0", - "proc-macro-hack", ] [[package]] -name = "phf_codegen" -version = "0.8.0" +name = "phf" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", + "phf_macros", + "phf_shared 0.11.2", ] [[package]] @@ -615,57 +750,68 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", + "phf_shared 0.10.0", + "rand", ] [[package]] name = "phf_generator" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", + "phf_shared 0.11.2", + "rand", ] [[package]] name = "phf_macros" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", + "phf_generator 0.11.2", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.49", ] [[package]] name = "phf_shared" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ "siphasher", ] [[package]] name = "phf_shared" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] [[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -678,25 +824,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.19.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cffef52f74ec3b1a1baf295d9b8fcc3070327aefc39a6d00656b13c1d0b8885c" +checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" dependencies = [ "cfg-if", "indoc", @@ -711,9 +851,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.19.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713eccf888fb05f1a96eb78c0dbc51907fee42b3377272dc902eb38985f418d5" +checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" dependencies = [ "once_cell", "target-lexicon", @@ -727,9 +867,9 @@ checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de" [[package]] name = "pyo3-ffi" -version = "0.19.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b2ecbdcfb01cbbf56e179ce969a048fd7305a66d4cdf3303e0da09d69afe4c3" +checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" dependencies = [ "libc", "pyo3-build-config", @@ -737,69 +877,46 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.19.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78fdc0899f2ea781c463679b20cb08af9247febc8d052de941951024cd8aea0" +checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn 2.0.49", ] [[package]] name = "pyo3-macros-backend" -version = "0.19.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60da7b84f1227c3e2fe7593505de274dcf4c8928b4e0a1c23d551a14e4e80a0f" +checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" dependencies = [ + "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.49", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -809,16 +926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -827,32 +935,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -860,54 +950,95 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "reqwest" +version = "0.11.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", + "getrandom", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys", ] [[package]] -name = "rustc_version" -version = "0.4.0" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustls" -version = "0.21.2" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -916,26 +1047,41 @@ dependencies = [ ] [[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", ] [[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -943,17 +1089,18 @@ dependencies = [ [[package]] name = "selectors" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" +checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" dependencies = [ - "bitflags", + "bitflags 2.4.2", "cssparser", "derive_more", "fxhash", "log", - "phf 0.8.0", - "phf_codegen 0.8.0", + "new_debug_unreachable", + "phf 0.10.1", + "phf_codegen", "precomputed-hash", "servo_arc", "smallvec", @@ -961,69 +1108,110 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.164" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.49", +] + +[[package]] +name = "serde_json" +version = "1.0.113" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +dependencies = [ + "itoa", + "ryu", + "serde", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ + "form_urlencoded", + "itoa", + "ryu", "serde", ] [[package]] name = "servo_arc" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" +checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" dependencies = [ - "nodrop", "stable_deref_trait", ] [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys", +] [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stable_deref_trait" @@ -1070,9 +1258,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" dependencies = [ "proc-macro2", "quote", @@ -1080,10 +1268,37 @@ dependencies = [ ] [[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "target-lexicon" -version = "0.12.8" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tendril" @@ -1112,10 +1327,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "windows-sys", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] name = "toml" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -1125,18 +1380,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "serde", @@ -1146,16 +1401,47 @@ dependencies = [ ] [[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -1168,21 +1454,21 @@ dependencies = [ [[package]] name = "unindent" -version = "0.1.11" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -1196,10 +1482,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +name = "want" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] [[package]] name = "wasi" @@ -1209,9 +1498,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1219,24 +1508,36 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.49", "wasm-bindgen-shared", ] [[package]] +name = "wasm-bindgen-futures" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1244,145 +1545,186 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.49", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "ring", - "untrusted", + "windows-targets 0.52.0", ] [[package]] -name = "webpki-roots" -version = "0.23.1" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "rustls-webpki", + "windows-targets 0.48.5", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-targets" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_aarch64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] -name = "windows" -version = "0.48.0" +name = "windows_aarch64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets", -] +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] -name = "windows-targets" -version = "0.48.0" +name = "windows_aarch64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" +name = "windows_aarch64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" +name = "windows_i686_gnu" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys", +] diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index 9eb36c8bd61bd..44c142b89308d 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "css-inline"; - version = "0.10.1"; - format = "pyproject"; + version = "0.13.0"; + pyproject = true; src = fetchFromGitHub { owner = "Stranger6667"; repo = "css-inline"; rev = "python-v${version}"; - hash = "sha256-oBAJv/hAz/itT2WakIw/1X1NvOHX108NoeS6V7k+aG8="; + hash = "sha256-hhjeOr7EJc4Tmn/eQ1vF0xChSIlgfSmtqi6s7WCUq00="; }; postPatch = '' @@ -41,7 +41,7 @@ buildPythonPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; name = "${pname}-${version}"; - hash = "sha256-SFG1nsP4+I0zH8VeyL1eeaTx0tHNIvmx6M0cko0pqIA="; + hash = "sha256-noYBSwCfdpuwb55toyx4K/16Z4A0NWjnMuzwTi5g8AU="; }; nativeBuildInputs = [ @@ -63,6 +63,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # fails to connect to local server + "test_remote_stylesheet" + ]; + meta = with lib; { description = "Inline CSS into style attributes"; homepage = "https://github.com/Stranger6667/css-inline"; diff --git a/pkgs/development/python-modules/cssbeautifier/default.nix b/pkgs/development/python-modules/cssbeautifier/default.nix index 3144c5114fc29..02f1de52af7e6 100644 --- a/pkgs/development/python-modules/cssbeautifier/default.nix +++ b/pkgs/development/python-modules/cssbeautifier/default.nix @@ -1,34 +1,46 @@ { lib , buildPythonPackage +, editorconfig , fetchPypi -, setuptools , jsbeautifier +, pythonOlder +, setuptools +, six }: buildPythonPackage rec { pname = "cssbeautifier"; - version = "1.14.11"; - format = "pyproject"; + version = "1.15.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QFRMK2K7y2TKpefzegLflWVOXOG8rK2sTKHz3InDFRM="; + hash = "sha256-n3BkNirt1VnFXu7Pa2vtZeBfM0iNy+OQRPBAPCbhwAY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ jsbeautifier ]; + propagatedBuildInputs = [ + editorconfig + jsbeautifier + six + ]; - # has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "cssbeautifier" ]; + pythonImportsCheck = [ + "cssbeautifier" + ]; meta = with lib; { description = "CSS unobfuscator and beautifier"; - homepage = "https://pypi.org/project/cssbeautifier/"; + homepage = "https://github.com/beautifier/js-beautify"; + changelog = "https://github.com/beautifier/js-beautify/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ traxys ]; }; diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index a3c71a2776bcd..4f818bc493399 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.15.13"; + version = "6.15.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cx_Freeze"; inherit version; - hash = "sha256-VeOgoVrga9dPJ0W9S3Ye/9Ff5yEOlP2DlDf0sDUh1yo="; + hash = "sha256-dMCr5ulaBBXLT79VxiW8JQEml4P6wt0tcetNeOk/Ihk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 6d5aa4032c2d0..7b04f68692529 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "6.4.1"; + version = "6.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-IhiH1Vk/Wf6cTxijxE1erkQozY+vOVd5pu6tAVUoDJM="; + hash = "sha256-9enilHkZ07loBisKObUmVLhJeXgY/HUiVrf2scPFB60="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/daff/default.nix b/pkgs/development/python-modules/daff/default.nix new file mode 100644 index 0000000000000..59c2e1bfc38b6 --- /dev/null +++ b/pkgs/development/python-modules/daff/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "daff"; + version = "1.3.46"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ItDan9ajJ1tUySapyXsYD5JYqtZRE+oY8/7FLLrc2Bg="; + }; + + # there are no tests + doCheck = false; + + pythonImportsCheck = [ + "daff" + ]; + + meta = with lib; { + description = "Library for comparing tables, producing a summary of their differences, and using such a summary as a patch file"; + homepage = "https://github.com/paulfitz/daff"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/pkgs/development/python-modules/daqp/default.nix b/pkgs/development/python-modules/daqp/default.nix index 9ef1d3eee8777..2b134f9f723d8 100644 --- a/pkgs/development/python-modules/daqp/default.nix +++ b/pkgs/development/python-modules/daqp/default.nix @@ -8,7 +8,7 @@ , wheel , numpy }: -buildPythonPackage { +buildPythonPackage rec { pname = "daqp"; version = "0.5.1"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage { hash = "sha256-in7Ci/wM7i0csJ4XVfo1lboWOyfuuU+8E+TzGmMV3x0="; }; - sourceRoot = "source/interfaces/daqp-python"; + sourceRoot = "${src.name}/interfaces/daqp-python"; postPatch = '' sed -i 's|../../../daqp|../..|' setup.py diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index b99662660d421..6a9adcad54549 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -19,7 +19,6 @@ , typing-extensions , requests , retrying -, ansi2html , nest-asyncio , celery @@ -37,16 +36,16 @@ buildPythonPackage rec { pname = "dash"; - version = "2.14.2"; + version = "2.16.1"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "plotly"; repo = "dash"; - rev = "v${version}"; - hash = "sha256-EFEsFgd3VbzlIUiz1fBIsKHywgWrL74taDFx0yIM/Ks="; + rev = "refs/tags/v${version}"; + hash = "sha256-IPyGQXrC2FTTSIC4IFGwKTceyzPYAe4jwDoO5C9YeF0="; }; nativeBuildInputs = [ @@ -58,7 +57,7 @@ buildPythonPackage rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/@plotly/dash-jupyterlab/yarn.lock"; - hash = "sha256-mkiyrA0jGiP0zbabSjgHFLEUX3f+LZdJ8eARI5QA8CU="; + hash = "sha256-L/or8jO6uEypI5krwy/ElIxa6jJrXGsCRZ9mh+0kcGA="; }; preBuild = '' @@ -90,7 +89,6 @@ buildPythonPackage rec { typing-extensions requests retrying - ansi2html nest-asyncio ]; diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 0875430cc383d..e24b06a23b68c 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -1,19 +1,26 @@ { lib , awkward , buildPythonPackage +, cachetools , dask +, dask-histogram +, distributed , fetchFromGitHub , hatch-vcs , hatchling +, hist +, pandas , pyarrow , pytestCheckHook , pythonOlder , pythonRelaxDepsHook +, typing-extensions +, uproot }: buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.2.0"; + version = "2024.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +29,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-oBGja1dt9UbHym0c5K/pAMXNErryr3u6IhDRuhwTvG0="; + hash = "sha256-Lkbp/XrDHOekMpT71pbxtuozgzU9iiGF2GJZ+tuV/yM="; }; pythonRelaxDeps = [ @@ -37,13 +44,25 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward + cachetools dask + typing-extensions ]; + passthru.optional-dependencies = { + io = [ + pyarrow + ]; + }; + checkInputs = [ + dask-histogram + distributed + hist + pandas pytestCheckHook - pyarrow - ]; + uproot + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "dask_awkward" @@ -54,6 +73,8 @@ buildPythonPackage rec { "test_remote_double" "test_remote_single" "test_from_text" + # ValueError: not a ROOT file: first four bytes... + "test_basic_root_works" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index 0931cf6060c05..a1a7c64197173 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2024.2.0"; + version = "2024.3.0"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; rev = "refs/tags/${version}"; - hash = "sha256-YU5i7mGOZxj/pvpkZLwohoSuHJgS3zkHYVuj1Vtyrj4="; + hash = "sha256-RqZMAEGFqEXNmNv7SWCyQw9cI+I+Oa6s8O/7Jp+9id8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index e403545839fd0..dc668ea2639ab 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "dask-jobqueue"; - version = "0.8.2"; + version = "0.8.5"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-01QHoFoFNDR8XZWK50m5+FNb7FKYV9ATtuVknN5DkUo="; + hash = "sha256-9pI/nX/4lLlu+/cGEYss03/Td1HVZ+kcIt/T4uqpMgI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 77f702506136a..5fa73cea10f71 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -98,7 +98,9 @@ buildPythonPackage rec { # from panda[test] hypothesis pytest-asyncio - ] ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 + ] + ++ passthru.optional-dependencies.dataframe + ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 pyarrow ]; diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index bbd16ffb126d9..7cd05be5b8e14 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -8,23 +8,28 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools , sqlalchemy }: buildPythonPackage rec { pname = "databases"; - version = "0.8.0"; - format = "setuptools"; + version = "0.9.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "encode"; - repo = pname; + repo = "databases"; rev = "refs/tags/${version}"; - hash = "sha256-e3iMZBPdldZFuS7FyhbGj9SufnH5hBBt8MEUjixXfqA="; + hash = "sha256-Zf9QqBgDhWAnHdNvzjXtri5rdT00BOjc4YTNzJALldM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ sqlalchemy ]; @@ -78,7 +83,5 @@ buildPythonPackage rec { changelog = "https://github.com/encode/databases/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - # https://github.com/encode/databases/issues/530 - broken = lib.versionAtLeast sqlalchemy.version "2.0.0"; }; } diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 7deca5f47152a..2e3132fb5b50f 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "11.3.6"; + version = "11.3.26"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kAUBA9V1st5UxXihrXQjyk+1ahsum/VEcNfDK1he/Pc="; + hash = "sha256-YjUY4i8PtXc+fWcGjvnRbZkiINprKcS1K9HT5+86E8c="; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index b0bd083085f3c..1533055f3c890 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Uvy5/a9YFdPKpZ3B+Yvrvp7uZCY/My45w1lDqX7zJvI="; + hash = "sha256-pwSDDkBcyaT5+qA/W8v5loi0yXK8R0ugASmbalwYw70="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index e50f187c012d5..2718a88379c92 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.6.3"; + version = "0.6.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UVYLyRVLRdt38obSLkSsQdroO95lwpwzerw+gYBIJ7w="; + hash = "sha256-izNDvljUWw60joi5WfCfoqL5SDM8Jz5Pz+lI/RP35n8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index ed25c032881b5..baf905f11fa71 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -9,6 +9,7 @@ , protobuf , pyarrow , Security +, SystemConfiguration }: let @@ -31,7 +32,7 @@ in buildPythonPackage rec { pname = "datafusion"; - version = "25.0.0"; + version = "35.0.0"; format = "pyproject"; src = fetchFromGitHub { @@ -39,13 +40,13 @@ buildPythonPackage rec { owner = "apache"; repo = "arrow-datafusion-python"; rev = "refs/tags/${version}"; - hash = "sha256-oC+fp41a9rsdobpvShZ7sDdtYPJQQ7JLg6MFL+4Pksg="; + hash = "sha256-43XY7j/8x+7SCY4W8nysaeWax2nvTTHZXMmy3hSz6pI="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "datafusion-cargo-deps"; inherit src pname version; - hash = "sha256-0e0ZRgwcS/46mi4c2loAnBA2bsaD+/RiMh7oNg3EvHY="; + hash = "sha256-YWAyEMojw0bc/fu5kIZKMNPEgsAIpWqjVNodWXbgTl4="; }; nativeBuildInputs = with rustPlatform; [ @@ -53,7 +54,11 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = [ protobuf ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ protobuf ] ++ lib.optionals stdenv.isDarwin [ + libiconv + Security + SystemConfiguration + ]; propagatedBuildInputs = [ pyarrow ]; diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index d1dcac893a469..fb7280fd2a168 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , setuptools-scm , six }: @@ -14,6 +15,15 @@ buildPythonPackage rec { hash = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY="; }; + patches = [ + # https://github.com/dateutil/dateutil/pull/1285 + (fetchpatch { + url = "https://github.com/dateutil/dateutil/commit/f2293200747fb03d56c6c5997bfebeabe703576f.patch"; + relative = "src"; + hash = "sha256-BVEFGV/WGUz9H/8q+l62jnyN9VDnoSR71DdL+LIkb0o="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index 9e276cf143f2c..cb1d12bca703d 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -1,29 +1,35 @@ { lib -, buildPythonPackage -, fetchFromGitHub , agate +, buildPythonPackage , dbt-core +, fetchFromGitHub , google-cloud-bigquery -, google-cloud-storage , google-cloud-dataproc +, google-cloud-storage , pytestCheckHook +, pythonOlder , pythonRelaxDepsHook +, setuptools +, urllib3 }: buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.7.2"; - format = "setuptools"; + version = "1.7.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-bigquery"; rev = "refs/tags/v${version}"; - hash = "sha256-CzRcnS/aECBq/9L8U+mLuHYo00HyBtKK6jmU8S03feM="; + hash = "sha256-bF2++Bs4pvqA3GW2xJkRNa1HkqnHBbMnKHHjo1TWboM="; }; nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 3eb4ff8b2927a..b537da2a30551 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -1,13 +1,12 @@ { lib -, python3 -, buildPythonPackage -, fetchFromGitHub , agate +, buildPythonPackage , cffi , click , colorama , dbt-extractor , dbt-semantic-interfaces +, fetchFromGitHub , hologram , idna , isodate @@ -19,10 +18,13 @@ , packaging , pathspec , protobuf +, python3 +, pythonOlder , pythonRelaxDepsHook , pytz , pyyaml , requests +, setuptools , sqlparse , typing-extensions , urllib3 @@ -31,20 +33,23 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.7.4"; - format = "setuptools"; + version = "1.7.10"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-+2tmLclBZrY9SDCKvQ4QNbI4665BtsrEI1sBSY3GVGM="; + hash = "sha256-0cKzQjAnj0JMrHyA/gOgYceM6g1URJFgQtp90m09Nkw="; }; sourceRoot = "${src.name}/core"; nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ @@ -53,6 +58,7 @@ buildPythonPackage rec { "mashumaro" "networkx" "logbook" + "urllib3" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbt-extractor/Cargo.lock b/pkgs/development/python-modules/dbt-extractor/Cargo.lock index 8b297123703a7..1d8c77883f247 100644 --- a/pkgs/development/python-modules/dbt-extractor/Cargo.lock +++ b/pkgs/development/python-modules/dbt-extractor/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" @@ -25,9 +25,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "cc" -version = "1.0.69" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -37,9 +37,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -47,9 +47,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -58,30 +58,29 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ + "autocfg", "cfg-if", "crossbeam-utils", - "lazy_static", "memoffset", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", - "lazy_static", ] [[package]] name = "dbt-extractor" -version = "0.4.1" +version = "0.5.1" dependencies = [ "pyo3", "quickcheck", @@ -94,9 +93,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "env_logger" @@ -110,9 +109,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -121,95 +120,58 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "libc" -version = "0.2.101" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", @@ -217,115 +179,100 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.9.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "instant", "lock_api", "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", - "instant", "libc", "redox_syscall", "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", + "windows-targets", ] [[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "pyo3" -version = "0.15.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf01dbf1c05af0a14c7779ed6f3aa9deac9c3419606ac9de537a2d649005720" +checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" dependencies = [ "cfg-if", "indoc", "libc", + "memoffset", "parking_lot", - "paste", "pyo3-build-config", + "pyo3-ffi", "pyo3-macros", "unindent", ] [[package]] name = "pyo3-build-config" -version = "0.15.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf9e4d128bfbddc898ad3409900080d8d5095c379632fbbfbb9c8cfb1fb852b" +checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" dependencies = [ "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" +dependencies = [ + "libc", + "pyo3-build-config", ] [[package]] name = "pyo3-macros" -version = "0.15.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67701eb32b1f9a9722b4bc54b548ff9d7ebfded011c12daece7b9063be1fd755" +checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" dependencies = [ + "proc-macro2", "pyo3-macros-backend", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pyo3-macros-backend" -version = "0.15.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44f09e825ee49a105f2c7b23ebee50886a9aee0746f4dd5a704138a64b0218a" +checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" dependencies = [ "proc-macro2", - "pyo3-build-config", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -347,75 +294,84 @@ checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "quote" -version = "1.0.9" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "rand_core", ] [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] [[package]] name = "rayon" -version = "1.5.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.5.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", @@ -424,58 +380,75 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "syn" -version = "1.0.75" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] +name = "syn" +version = "2.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" + +[[package]] name = "thiserror" -version = "1.0.26" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.26" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.26", ] [[package]] name = "tree-sitter" -version = "0.19.5" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad726ec26496bf4c083fff0f43d4eb3a2ad1bba305323af5ff91383c0b6ecac0" +checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" dependencies = [ "cc", "regex", @@ -483,49 +456,84 @@ dependencies = [ [[package]] name = "tree-sitter-jinja2" -version = "0.1.0" -source = "git+https://github.com/dbt-labs/tree-sitter-jinja2?tag=v0.1.0#52da7b0b1480b23381ea84cf5ea3bf058dd6d8c4" +version = "0.2.0" +source = "git+https://github.com/dbt-labs/tree-sitter-jinja2?tag=v0.2.0#c9b092eff38bd6943254ad0373006d83c100a8c0" dependencies = [ "cc", "tree-sitter", ] [[package]] -name = "unicode-xid" -version = "0.2.2" +name = "unicode-ident" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unindent" -version = "0.1.7" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-targets" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_x86_64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/development/python-modules/dbt-extractor/default.nix b/pkgs/development/python-modules/dbt-extractor/default.nix index 2656be91086d3..74b1bb4d3d24c 100644 --- a/pkgs/development/python-modules/dbt-extractor/default.nix +++ b/pkgs/development/python-modules/dbt-extractor/default.nix @@ -1,26 +1,29 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchPypi -, rustPlatform , libiconv +, pythonOlder +, rustPlatform }: buildPythonPackage rec { pname = "dbt-extractor"; - version = "0.4.1"; - format = "setuptools"; + version = "0.5.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "dbt_extractor"; inherit version; - hash = "sha256-dbHGZWmewPH/zhuj13b3386AIVbyLnCnucjwtNfoD0I="; + hash = "sha256-zV2VV2qN6kGQJAqvmTajf9dLS3kTymmjw2j8RHK7fhM="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "tree-sitter-jinja2-0.1.0" = "sha256-lzA2iq4AK0iNwkLvbIt7Jm5WGFbMPFDi6i4AFDm0FOU="; + "tree-sitter-jinja2-0.2.0" = "sha256-Hfw85IcxwqFDKjkUxU+Zd9vyL7gaE0u5TZGKol2I9qg="; }; }; @@ -43,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tool that processes the most common jinja value templates in dbt model files"; homepage = "https://github.com/dbt-labs/dbt-extractor"; + changelog = "https://github.com/dbt-labs/dbt-extractor/blob/main/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ mausch tjni ]; }; diff --git a/pkgs/development/python-modules/dbt-postgres/default.nix b/pkgs/development/python-modules/dbt-postgres/default.nix index 0478e748f1c62..b2852ce6d2149 100644 --- a/pkgs/development/python-modules/dbt-postgres/default.nix +++ b/pkgs/development/python-modules/dbt-postgres/default.nix @@ -1,20 +1,28 @@ { lib -, buildPythonPackage , agate +, buildPythonPackage , dbt-core , psycopg2 +, pythonOlder +, setuptools }: buildPythonPackage { pname = "dbt-postgres"; - format = "setuptools"; + pyproject = true; inherit (dbt-core) version src; + disabled = pythonOlder "3.7"; + sourceRoot = "${dbt-core.src.name}/plugins/postgres"; env.DBT_PSYCOPG2_NAME = "psycopg2"; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ agate dbt-core diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index 186e0f1e05468..41906a9362648 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -1,29 +1,31 @@ { lib -, buildPythonPackage -, fetchFromGitHub , agate , boto3 +, buildPythonPackage , dbt-core , dbt-postgres +, fetchFromGitHub , pytestCheckHook , pythonRelaxDepsHook , redshift-connector +, setuptools }: buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.7.1"; - format = "setuptools"; + version = "1.7.4"; + pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-redshift"; rev = "refs/tags/v${version}"; - hash = "sha256-ONXrA8ABTYxkBm56TdFPhzjF/nngUQyecdgr2WO/5mE="; + hash = "sha256-Ny6Nnb5OhtqSQZ0BMOQrb0ic6i29GVywy3hn3UuVtxE="; }; nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 6dc4c6155adfe..a51cb07f099c2 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -1,33 +1,40 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pytestCheckHook , click , dateutils +, dbt-postgres +, fetchFromGitHub , hatchling +, hypothesis , importlib-metadata , jinja2 , jsonschema , more-itertools , pydantic +, pytestCheckHook +, pythonOlder , pyyaml , typing-extensions -, hypothesis -, dbt-postgres }: buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.4.2"; + version = "0.4.4"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-semantic-interfaces"; rev = "refs/tags/v${version}"; - hash = "sha256-Q3aKUyXB+HzPCpwbJ66zDv92n04Gb0w7ivWfga3UX3s="; + hash = "sha256-uvwcnOKjwxEmA+/QRGSRofpoE4jZzmE02mGSDLINrJw="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ click dateutils @@ -40,10 +47,6 @@ buildPythonPackage rec { typing-extensions ]; - nativeBuildInputs = [ - hatchling - ]; - nativeCheckInputs = [ pytestCheckHook hypothesis @@ -59,7 +62,5 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-semantic-interfaces"; license = licenses.asl20; maintainers = with maintainers; [ pbsds ]; - # https://github.com/dbt-labs/dbt-semantic-interfaces/issues/134 - broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index 028050eea7c14..ef3cb866c2b2a 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -1,23 +1,31 @@ { lib , buildPythonPackage -, fetchFromGitHub , dbt-core +, fetchFromGitHub , pytestCheckHook +, pythonOlder +, setuptools , snowflake-connector-python }: buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.7.0"; - format = "setuptools"; + version = "1.7.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-snowflake"; rev = "refs/tags/v${version}"; - hash = "sha256-v+9uxHeROZU7vZvvB7UYUFNM6ez97qiZmgDiunUKf04="; + hash = "sha256-OyUBqSNHMedCDsY280O8VAmxeyeF5J0snk5o6XhE2V4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ dbt-core snowflake-connector-python diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index eb0b89ba9871c..0add3d134ec72 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "debian-inspector"; - version = "31.0.0"; + version = "31.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "debian_inspector"; inherit version; - hash = "sha256-RglPlTRksmm7CYVere7jySy2tIegv6JuulN7Usw9a0c="; + hash = "sha256-68+8FwZPEL07bSEizbyXtxpJSvDruvr5qM6t/osWT5k="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 85389fba2fb2f..2fc23833dafd2 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -111,6 +111,8 @@ buildPythonPackage rec { # testsuite gets stuck at this one "test_attach_pid_client" ]; + # TODO? https://github.com/NixOS/nixpkgs/issues/262000 + doCheck = !stdenv.isLinux; pythonImportsCheck = [ "debugpy" diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 8a96602dcc83b..ef114da4ca02a 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "5.2.2"; + version = "6.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-ybZ8f3tqhj0SPbwjtgTB45y4Tx/lIyNZ5vShYsbIrfU="; + hash = "sha256-PjM2bh79o4bBv3zQyFYehhdlvXKFW8Hk0ZKfZDAuiQU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix index ab0e1f01ffdc0..4840329d75c91 100644 --- a/pkgs/development/python-modules/deepl/default.nix +++ b/pkgs/development/python-modules/deepl/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "deepl"; - version = "1.16.1"; + version = "1.17.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-s01KhkTJ5ip6nCSs/oCgdxe9Cjsr53tjOhDV1P50jc0="; + hash = "sha256-IwBKgkfXXYAgat7E4pAS5f9UNOmY9yRj4ZP85wSt4cs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 8d3f0cf20e11f..4b5b0d8f73627 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -4,13 +4,11 @@ , pkg-config , pkgconfig , setuptools-scm -, wheel , libdeltachat , cffi , imap-tools , requests , pluggy -, setuptools , pytestCheckHook }: @@ -20,15 +18,13 @@ buildPythonPackage rec { sourceRoot = "${src.name}/python"; disabled = pythonOlder "3.7"; - format = "pyproject"; + pyproject = true; nativeBuildInputs = [ cffi pkg-config pkgconfig - setuptools setuptools-scm - wheel ]; buildInputs = [ diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix index 122862e8c29ea..b8c27334a868b 100644 --- a/pkgs/development/python-modules/dep-logic/default.nix +++ b/pkgs/development/python-modules/dep-logic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dep-logic"; - version = "0.0.4"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pdm-project"; repo = "dep-logic"; - rev = version; - hash = "sha256-AFiCNzHlo3BADqbjRBruA80cfM6Ytdb+gReEg5hUmro="; + rev = "refs/tags/${version}"; + hash = "sha256-NB0TR7fCtjSm4cAl+Fy+6c+z1ZBDiRw7nXux/s6ON/c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix new file mode 100644 index 0000000000000..e56495f3899e1 --- /dev/null +++ b/pkgs/development/python-modules/dirigera/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pydantic +, pytestCheckHook +, pythonOlder +, requests +, setuptools +, websocket-client +}: + +buildPythonPackage rec { + pname = "dirigera"; + version = "1.0.10"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Leggin"; + repo = "dirigera"; + rev = "refs/tags/v${version}"; + hash = "sha256-FuytNb+AiimKZPhX7qaxKvM4Y9NofvrzMGLW1PPu3Cw="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pydantic + requests + websocket-client + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dirigera" + ]; + + meta = with lib; { + description = "Module for controlling the IKEA Dirigera Smart Home Hub"; + homepage = "https://github.com/Leggin/dirigera"; + changelog = "https://github.com/Leggin/dirigera/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dirtyjson/default.nix b/pkgs/development/python-modules/dirtyjson/default.nix new file mode 100644 index 0000000000000..7cd4fce0e6509 --- /dev/null +++ b/pkgs/development/python-modules/dirtyjson/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "dirtyjson"; + version = "1.0.8"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kMpKGPP/MM6EnRANz0oAOVPHnTojSO8Fbx2cIiMaJf0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dirtyjson" + ]; + + meta = with lib; { + description = "JSON decoder for Python that can extract data from the muck"; + homepage = "https://github.com/codecobblers/dirtyjson"; + license = with licenses; [ afl21 /* and */ mit]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix index 3d1bc5c20bac0..8b492ae66701d 100644 --- a/pkgs/development/python-modules/dissect-btrfs/default.nix +++ b/pkgs/development/python-modules/dissect-btrfs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-btrfs"; - version = "1.1"; + version = "1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.btrfs"; rev = "refs/tags/${version}"; - hash = "sha256-3k0UUkce7bZ3mZ8Umjms4DX63QeBdRPUXpsdaK0VDyc="; + hash = "sha256-nWgeChHHCAjD5I98h2/1HrO5688aZUM4j2PJiD1xP0g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index acac46050a273..c9aef3e961ec9 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-cim"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cim"; rev = "refs/tags/${version}"; - hash = "sha256-+HHjDUSepAEebMD5ckjXbfgA4AKlNMBYHwxDq+jdhxw="; + hash = "sha256-NbGI6d1C3X7PbTsbDSCS4AUK6ueCBOuQDTNhkULrLYc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index 03284d72cc93f..1007dcc07c62b 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-clfs"; - version = "1.6"; + version = "1.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.clfs"; rev = "refs/tags/${version}"; - hash = "sha256-JdfO9KVuK1TsDyqEQkuHPJtSHDCym63imvLSHsVwQ3k="; + hash = "sha256-DBnZlyk7rjuTpOjgFUmSNxqvIZk8OxACNqyFDcENFHM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index bcc86b1f7588b..a1ed699aef371 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.12"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-67s0Qr/YeQp/K9MZS+btKdp+9J6mIMCwiittIUB9p2w="; + hash = "sha256-QfnvWCI67y8GdCfXIRaehzb26IVZ8N0muUnNpr1NGJo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index b5ddf86dd5480..0a6810749b6d7 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.11"; + version = "3.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-ynrZqP3QXe+SXFB0Uz+tdH2jGj+hpHfarbEN2P1+r/8="; + hash = "sha256-s3ZIK4ZtHU5B3f9ojVTC2Aqn3G7CosTvdV6U3cwEatY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index 1e110a915f9a9..c7b9236c75c33 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-etl"; - version = "3.7"; - format = "pyproject"; + version = "3.8"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.etl"; rev = "refs/tags/${version}"; - hash = "sha256-z6P7XpA+j9JIJJsp/Z4uewFw9OAPSZV+57eJu7rd17I="; + hash = "sha256-yGpDZAaw11Sr5OPWxbY/NpZAV3jJUIgtTgDykCvYDtM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix index 60f9d52cac74d..d8ace92854349 100644 --- a/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-eventlog"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.eventlog"; rev = "refs/tags/${version}"; - hash = "sha256-h1LrBt8f9YFkc1uAAb4WwY3LjPuvsdVFvxji3QxKF0A="; + hash = "sha256-YiWW1olaIKoBfiZfr4TfIEsnj/C4cmn6sYosvjeiEfM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index e60f81e419626..d8f9823634f47 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-evidence"; - version = "3.7"; + version = "3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.evidence"; rev = "refs/tags/${version}"; - hash = "sha256-b7Ls3Xfd0scMe/gccjvRfuADITnz5QpJNLUaIgmZtpI="; + hash = "sha256-/zmMPSVR6F6SIU7xuotErmU2SsKEV43rs/4oTVKAWz0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix index 7b3757d0f3ad5..8511b2df94485 100644 --- a/pkgs/development/python-modules/dissect-executable/default.nix +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -10,8 +10,8 @@ buildPythonPackage rec { pname = "dissect-executable"; - version = "1.4"; - format = "pyproject"; + version = "1.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.executable"; rev = "refs/tags/${version}"; - hash = "sha256-h9eOTWJR0Bd3DY8WDYWqLCl1jYJcqP6cRTgWubf/rKI="; + hash = "sha256-aAalU0TUqXc13WnxJvirG3QzQyMstecOfnXMdFT8IzU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index 0659372ca5cf8..6838350cb8dee 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.extfs"; rev = "refs/tags/${version}"; - hash = "sha256-yM9PTMI4/8oU2bvOCKdh5tT0gw9+6esV1auKSbupL0U="; + hash = "sha256-xZEULUm0I754f9MEIUZEua76SaY/WMFp4Q5BMNZ8fWU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index be5043fd27de5..636265f4129c6 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.7"; + version = "3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-YfWshytfj4p2MqLpzE3b1/RtrL1/+Xd/5+RNbrH/Jfc="; + hash = "sha256-xFfB7QOZ3KjsOPQ1cPTRkqb0hgD4waOq8kkSTJStQ+E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index 3d1afcf31ccbe..f95319ade1353 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ffs"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ffs"; rev = "refs/tags/${version}"; - hash = "sha256-eyqqsOKcRmzOY+fj1FYudh9FUanD0Z59zZPtsNz6I0s="; + hash = "sha256-f7lXYJ2U8M+rZXrlbrAXAjizCVz6rAAZbeSg+iOmKdo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index d8ccf0e0d8fb0..27bf9056e258f 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.11"; + version = "3.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-x7C2h9NZRlkJWAe0+PCmOhOpfHM2/4vc7oEGQqGEPq8="; + hash = "sha256-uQt+oyETjZHPa1QZfswpUX92ZCdzkR5x9deo15J+Fxo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-jffs/default.nix b/pkgs/development/python-modules/dissect-jffs/default.nix index 1fdc2af6cc21d..234f61e007e33 100644 --- a/pkgs/development/python-modules/dissect-jffs/default.nix +++ b/pkgs/development/python-modules/dissect-jffs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-jffs"; - version = "1.0"; + version = "1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.jffs"; rev = "refs/tags/${version}"; - hash = "sha256-Rj8/WRHNl2IQ6zwvLhqEIEMzk8BH1fv7KQkw1NzoDjI="; + hash = "sha256-jzSPR4pkvXRQ3Q/qL7Oa3mLX3hW2IhbXuuO0jTc8Gvg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 97ebe80f18b86..61f3eaa645606 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-BmXYnN8B7r/gz+zEWWS7ClOv29QOiHrm7g2ZNZXlnGU="; + hash = "sha256-gjmxoxz4Qf2FsCP72siEpVLeqlZfvhuFZHSGr1n+cY0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index 3d47252b829f8..1d527d33ab08d 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-ole"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ole"; rev = "refs/tags/${version}"; - hash = "sha256-4shxYKR6IrrMj2BIb5yFD7+C0SNyqsGOoBkWpad1EbI="; + hash = "sha256-Df6OU1vVsQl7d119W8+8YmUiy2+m6Dw3LpKnMVSRRR4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index a2050fe6bd3c0..8f8ae56b383d7 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.8"; + version = "3.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-4tKu7oPkpNcWr2XJvZg94yZZcbTeeXBphPCLoZYzg6U="; + hash = "sha256-NLhZnStcJCtXMBkayLjvuG7aK2aN3sWGZaPKVXIoRew="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 77e1e6344fe29..7b212feee0ce1 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.shellitem"; rev = "refs/tags/${version}"; - hash = "sha256-g8o6W5MZ7E8AKYs5QGQGw3IQhZehrOcY6wJrt9TJf4s="; + hash = "sha256-E5v7WuAd47X/1LSeaje4EUv+GuFq5Ksg4ndOScFreYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 208096a56e52b..275e1a2913d38 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-BHwm88IPtfg/bi5veFGnciQeH4s0asVnxiMVsIi8vV8="; + hash = "sha256-f19l1NxIdkQRaqEAgeTIuloPY079TmnNZ/DLQEXFQIA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index d42058f952cc4..9deecad417732 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-squashfs"; - version = "1.3"; + version = "1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.squashfs"; rev = "refs/tags/${version}"; - hash = "sha256-MJKC05/8NnJFdyBB5YPbqe8mp1zlIoS2FglKEPSSYd8="; + hash = "sha256-y6RXtHJev83m7mYdNLG640TRUPEGbi6l942zlMWXky0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 786b295628745..0e6e14be7239c 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.15"; + version = "3.16"; pyproject = true; disabled = pythonOlder "3.9"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-1uWKlp0t1mVtt3lbjl4U1TMxE2YHN/GzGs8OuoVTRqc="; + hash = "sha256-2c8OFwbgSc7zwbjQm2g8y1ZyiYM0KPFjTEUrk06c174="; }; postPatch = '' @@ -107,6 +107,7 @@ buildPythonPackage rec { ]; disabledTests = [ + "test_cpio" # Test requires rdump "test_exec_target_command" # Issue with tar file @@ -127,7 +128,11 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests are using Windows paths - "tests/plugins/apps/browser/test_browser.py" + "tests/plugins/apps/browser/" + # ValueError: Invalid Locate file magic. Expected /x00LOCATE02/x00 + "tests/plugins/os/unix/locate/" + # Missing plugin support + "tests/tools/test_reg.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index 1e6d36a0cdc6d..6c1a68b64785d 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; - version = "1.6"; + version = "1.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.thumbcache"; rev = "refs/tags/${version}"; - hash = "sha256-q35VL3BUZrxNBB5mHegqVObG76BYG4FAk/KIAvdm6B8="; + hash = "sha256-t5LovLS+YMWQWMCFP6jh3SNiLb/Jy9we4FX6MmsIJmY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index 894b5e35f4e09..255d64dc0ce99 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.14"; + version = "3.15"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-NzqQW6OFv+CtAxa5J2X/XGS9UCFfhMp4elvgcTrA1Wg="; + hash = "sha256-JIrk6YRuW5B30d9fNaRFesO01ajcSy8ErkpFtM1Coaw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index 740b9f668f0c5..147b048aee7d2 100644 --- a/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-vmfs"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.vmfs"; rev = "refs/tags/${version}"; - hash = "sha256-FDxB87TeAMUp0hP9YS/nrqNx71+ZlHf3Bsaqvuwx36U="; + hash = "sha256-HJV7cwNMFvHURt2dk/c1YbgFaHXRESREJ5ucmUsuS78="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 77f69a83730ff..abddcf5d1d611 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.8"; + version = "3.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-hEfURO4ITpjSpfHMlYfzO1cG+tjvqBP5QLYzo2uz8yo="; + hash = "sha256-Bhi3p0joTNx1y/yBhehhG06WmM7gUJhIJbmqZY4DzLQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index af83a91ec22f7..1843ff00f8e0b 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.xfs"; rev = "refs/tags/${version}"; - hash = "sha256-bqpN4Ho5A9j8oLwErPErMVgkanIkdNTqcT3lkdQiw6M="; + hash = "sha256-U/VDFeCyOPlefFL/QVRVknpCBDLuVYvVHI49QSe+QFM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 544deeace888b..6827b7e5f701f 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.12"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-hy5Yr/yR7CC7cp6pA1JP+GKazu+N4AwPqFKwb7zM+N8="; + hash = "sha256-cnNaqXECePP2DmLRAm/Fi9m88rYSsVVMrpcqYd0iL1E="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 4c6751d8f43b5..e415977d86374 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -5,6 +5,7 @@ , djangorestframework , djangorestframework-simplejwt , fetchFromGitHub +, fetchpatch , python , pythonOlder , responses @@ -26,6 +27,15 @@ buildPythonPackage rec { hash = "sha256-TqeNpxXn+v89fEiJ4AVNhp8blCfYQKFQfYmZ6/QlRbQ="; }; + patches = [ + # https://github.com/iMerica/dj-rest-auth/pull/597 + (fetchpatch { + name = "disable-email-confirmation-ratelimit-in-tests-to-support-new-allauth.patch"; + url = "https://github.com/iMerica/dj-rest-auth/commit/c8f19e18a93f4959da875f9c5cdd32f7d9363bba.patch"; + hash = "sha256-Y/YBjV+c5Gw1wMR5r/4VnyV/ewUVG0z4pjY/MB4ca9Y="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "==" ">=" diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 31a7043693655..8a1f6dc8ac06f 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "0.60.0"; + version = "0.61.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "pennersr"; repo = "django-allauth"; rev = "refs/tags/${version}"; - hash = "sha256-hkzZl2eZKti6m06LTtBqVXmsj6IFztsV2Of6tPiej+I="; + hash = "sha256-C9SYlL1yMnSb+Zpi2opvDw1stxAHuI9/XKHyvkM36Cg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 66cff8029757f..b0a11d9044d37 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "django-bootstrap4"; - version = "23.4"; + version = "24.1"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; rev = "refs/tags/v${version}"; - hash = "sha256-ccZ/73u4c6E6pfRv+f3Pu8SorF/d7zQBexGAlFcIwTo="; + hash = "sha256-TCHie5h/VRJ9NSg7wKnWotFHm328kxIp+xFXEa8wL1c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix index f8126f7ed3ad7..2ed27afb27ad7 100644 --- a/pkgs/development/python-modules/django-celery-beat/default.nix +++ b/pkgs/development/python-modules/django-celery-beat/default.nix @@ -1,31 +1,36 @@ { lib -, fetchPypi , buildPythonPackage -, python-crontab +, case , celery , cron-descriptor , django-timezone-field -, tzdata , ephem -, pytest-timeout +, fetchPypi , pytest-django -, case +, pytest-timeout , pytestCheckHook +, python-crontab , pythonOlder +, setuptools +, tzdata }: buildPythonPackage rec { pname = "django-celery-beat"; - version = "2.5.0"; - format = "setuptools"; + version = "2.6.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-zQpH9ZWEAvUawMcVvJQq4z17ULTkjLqRvD8nEr5QXfE="; + hash = "sha256-91stEpcx8SFL6Dg+GPrmv+rNtV3/shFs6EkiLAEG+a0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cron-descriptor python-crontab @@ -54,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Celery Periodic Tasks backed by the Django ORM"; homepage = "https://github.com/celery/django-celery-beat"; + changelog = "https://github.com/celery/django-celery-beat/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix index d8bb73ccdef8c..d1a66ed8f704d 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap4"; - version = "2023.1"; + version = "2024.1"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap4"; rev = "refs/tags/${version}"; - hash = "sha256-4p6dlyQYZGyfBntTuzCjikL8ZG/4xDnTiQ1rCVt0Hbk="; + hash = "sha256-upHrNDhoY+8qD+aeXPcY452xUIyYjW0apf8mVo6pqY4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix index 16609c82d34af..4d14ce5129a72 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap5"; - version = "2023.10"; + version = "2024.2"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap5"; rev = "refs/tags/${version}"; - hash = "sha256-AUMlLj3GmI+0vYw56Dw2+iF5s1l6GF+zV7PRD889ldg="; + hash = "sha256-ehcDwy53pZCqouvUm6qJG2FJzlFZaygTZxNYPOqH1q0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index a301a24940633..ee1a557b8eb06 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "4.2"; + version = "4.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hPO2q3V69kpyahav4cgUHz/3WLxXnZYCyWGetyNS+2Q="; + hash = "sha256-8rwEM+YSO9TtkC1UWS4JrzFH+TlGOHzL+WmxNwMJIWQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-formtools/default.nix b/pkgs/development/python-modules/django-formtools/default.nix index 975085c8f3ef2..94dd9f3708825 100644 --- a/pkgs/development/python-modules/django-formtools/default.nix +++ b/pkgs/development/python-modules/django-formtools/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-formtools"; - version = "2.4.1"; - format = "setuptools"; + version = "2.5.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IfjV2sc38eY2+ooKEJacHDL1JabfonwpWSgnunDZZDo="; + hash = "sha256-R8s0VSxu/KCIhj1pMoTQT8NuqvNQ6yHhodk14N9SPJM="; }; nativeBuildInputs = [ @@ -28,7 +28,11 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck + ${python.interpreter} -m django test --settings=tests.settings + + runHook postCheck ''; pythonImportsCheck = [ @@ -38,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of high-level abstractions for Django forms"; homepage = "https://github.com/jazzband/django-formtools"; + changelog = "https://github.com/jazzband/django-formtools/blob/master/docs/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ greizgh schmittlauch ]; }; diff --git a/pkgs/development/python-modules/django-model-utils/default.nix b/pkgs/development/python-modules/django-model-utils/default.nix index 6c82422cf0e09..36003b6625c2c 100644 --- a/pkgs/development/python-modules/django-model-utils/default.nix +++ b/pkgs/development/python-modules/django-model-utils/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "django-model-utils"; - version = "4.3.1"; + version = "4.4.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jazzband"; repo = "django-model-utils"; rev = "refs/tags/${version}"; - hash = "sha256-p3/JO6wNwZPYX7MIgMj/0caHt5s+uL51Sxa28/VITxo="; + hash = "sha256-/9gLovZGUwdoz3o3LZBfQ7iWr95cpTWq2YqFKoQC9kY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index 5c1dd8f78dda8..6d8776a9528ff 100644 --- a/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "6.2.1"; + version = "6.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "wagtail"; repo = "django-modelcluster"; rev = "refs/tags/v${version}"; - hash = "sha256-y2jGSZvTeSnpWDFJ+aNGofTEtMMlY9TrXZjQeET5OhY="; + hash = "sha256-AUVl2aidjW7Uu//3HlAod7pxzj6Gs1Xd0uTt3NrrqAU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-simple-history/default.nix b/pkgs/development/python-modules/django-simple-history/default.nix index a38671d97c0ff..4c31b8725763d 100644 --- a/pkgs/development/python-modules/django-simple-history/default.nix +++ b/pkgs/development/python-modules/django-simple-history/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-simple-history"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-simple-history"; rev = "refs/tags/${version}"; - hash = "sha256-XY6YNajwX5z3AXkYYGFtrURDqxub9EQwu52jQ7CZwrI="; + hash = "sha256-BW/F+RBf1KvwGRY9IK00+n69Jtx/ndEuvpHSi8/odSE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 1bce8c0d751e1..29b4aff063096 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -1,38 +1,33 @@ { lib -, buildPythonPackage -, fetchFromGitHub - -# build-system -, setuptools - -# dependencies -, django - -# optional-dependencies , azure-storage-blob , boto3 +, buildPythonPackage +, cryptography +, django , dropbox +, fetchFromGitHub , google-cloud-storage , libcloud -, paramiko - -# tests -, cryptography , moto +, paramiko , pytestCheckHook +, pythonOlder , rsa +, setuptools }: buildPythonPackage rec { pname = "django-storages"; - version = "1.14"; - format = "pyproject"; + version = "1.14.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jschneier"; repo = "django-storages"; rev = "refs/tags/${version}"; - hash = "sha256-q+vQm1T5/ueGPfwzuUOmSI/nESchqJc4XizJieBsLWc="; + hash = "sha256-V0uFZvnBi0B31b/j/u3Co6dd9XcdVefiSkl3XmCTJG4="; }; nativeBuildInputs = [ @@ -67,12 +62,6 @@ buildPythonPackage rec { ]; }; - pythonImportsCheck = [ - "storages" - ]; - - env.DJANGO_SETTINGS_MODULE = "tests.settings"; - nativeCheckInputs = [ cryptography moto @@ -80,9 +69,20 @@ buildPythonPackage rec { rsa ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + pythonImportsCheck = [ + "storages" + ]; + + env.DJANGO_SETTINGS_MODULE = "tests.settings"; + + disabledTests = [ + # AttributeError: 'str' object has no attribute 'universe_domain' + "test_storage_save_gzip" + ]; + meta = with lib; { - changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; description = "Collection of custom storage backends for Django"; + changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; downloadPage = "https://github.com/jschneier/django-storages/"; homepage = "https://django-storages.readthedocs.io"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django-treebeard/default.nix b/pkgs/development/python-modules/django-treebeard/default.nix index ec05953eae6e1..6b26ece7dd50e 100644 --- a/pkgs/development/python-modules/django-treebeard/default.nix +++ b/pkgs/development/python-modules/django-treebeard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.7"; + version = "4.7.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-x1Gj+SQVjCiP6omvwlpxUZefrwG/Ef3HvjuFgJnfpW0="; + hash = "sha256-hG5GKQS0NxVfduBJB7pOSEgHFoVfiLiY30Eivc+9bpg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index e2c7a93cf007b..af4f123ee01e2 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.24"; + version = "3.2.25"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-qu6fsPtOvUMRUgiHrS4zMT02iEZgf4KpoO1GHNTDWxg="; + hash = "sha256-fKOKeGVK7nI3hZTWPlFjbAS44oV09VBd/2MIlbVHJ3c="; }; patches = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 365a775c11a64..d7b2097e2e7d2 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch2 , pythonOlder , substituteAll @@ -60,6 +61,12 @@ buildPythonPackage rec { # make sure the tests don't remove packages from our pythonpath # and disable failing tests ./django_4_tests.patch + + (fetchpatch2 { + # fix test on 3.12; https://github.com/django/django/pull/17843 + url = "https://github.com/django/django/commit/bc8471f0aac8f0c215b9471b594d159783bac19b.patch"; + hash = "sha256-g1T9b73rmQ0uk1lB+iQy1XwK3Qin3mf5wpRsyYISJaw="; + }) ] ++ lib.optionals withGdal [ (substituteAll { src = ./django_4_set_geos_gdal_lib.patch; diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 686280dcdd244..7bbc36f27af86 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch2 , pythonOlder , substituteAll @@ -41,15 +42,16 @@ }: buildPythonPackage rec { - pname = "Django"; - version = "5.0.2"; + pname = "django"; + version = "5.0.3"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { - inherit pname version; - hash = "sha256-tbsdEbJRil+RNyooLyRmL1j2Z0lmawooarBXAp9ygIA="; + pname = "Django"; + inherit version; + hash = "sha256-X7N1gNz0omL5JYwfQ3OBmqzKkGQx9QXkaI4386mRld8="; }; patches = [ @@ -61,6 +63,12 @@ buildPythonPackage rec { ./django_5_tests_pythonpath.patch # disable test that excpects timezone issues ./django_5_disable_failing_tests.patch + + (fetchpatch2 { + # fix test on 3.12; https://github.com/django/django/pull/17843 + url = "https://github.com/django/django/commit/bc8471f0aac8f0c215b9471b594d159783bac19b.patch"; + hash = "sha256-g1T9b73rmQ0uk1lB+iQy1XwK3Qin3mf5wpRsyYISJaw="; + }) ] ++ lib.optionals withGdal [ (substituteAll { src = ./django_5_set_geos_gdal_lib.patch; diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index cb97e2f837afe..e35baffb40669 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -23,14 +23,14 @@ let dm-haiku = buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.11"; + version = "0.0.12"; format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; repo = "dm-haiku"; rev = "refs/tags/v${version}"; - hash = "sha256-xve1vNsVOC6/HVtzmzswM/Sk3uUNaTtqNAKheFb/tmI="; + hash = "sha256-aJRXlMq4CNMH3ZSTDP8MgnVltdSc8l5raw4//KccL48="; }; patches = [ diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index 5ba20ff945654..81404145e8b81 100644 --- a/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "dnf-plugins-core"; - version = "4.4.4"; + version = "4.5.0"; format = "other"; outputs = [ "out" "man" ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf-plugins-core"; - rev = version; - hash = "sha256-SGgUozOAU6h87SguXh+13CxV4GnVhdN3SpwKfDPh2GY="; + rev = "refs/tags/${version}"; + hash = "sha256-og20X2AUzoOphwF+508EobGEp/VYLtxWY7N4k327o8o="; }; patches = [ diff --git a/pkgs/development/python-modules/dnf4/default.nix b/pkgs/development/python-modules/dnf4/default.nix index 87bd9a1b7d455..c9b7e5113b8c9 100644 --- a/pkgs/development/python-modules/dnf4/default.nix +++ b/pkgs/development/python-modules/dnf4/default.nix @@ -16,7 +16,7 @@ in buildPythonPackage rec { pname = "dnf4"; - version = "4.18.2"; + version = "4.19.0"; format = "other"; outputs = [ "out" "man" "py" ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "rpm-software-management"; repo = "dnf"; rev = version; - hash = "sha256-WOLVKsrHp0V0wMXXRf1hrxsxuVv2bFOKIw8Aitz0cac="; + hash = "sha256-LY2D3A3la58/8V2zKqPZWbR5iAMkrsG36gP8EvwANaA="; }; patches = [ diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 5bf9981170b18..5c359635ba5ab 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , aioquic , buildPythonPackage , cacert @@ -7,9 +6,10 @@ , curio , fetchPypi , h2 +, httpcore , httpx , idna -, poetry-core +, hatchling , pytestCheckHook , pythonOlder , requests @@ -20,18 +20,18 @@ buildPythonPackage rec { pname = "dnspython"; - version = "2.4.2"; + version = "2.6.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-jc+ujHRgovhLQHLibxyfQQHKIMBxZJy3w06LapPViYQ="; + hash = "sha256-6PD5wjp7fLmd7WTmw6bz5wHXj1DFXgArg53qciXP98w="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; passthru.optional-dependencies = { @@ -40,6 +40,7 @@ buildPythonPackage rec { h2 requests requests-toolbelt + httpcore ]; IDNA = [ idna @@ -70,15 +71,6 @@ buildPythonPackage rec { disabledTests = [ # dns.exception.SyntaxError: protocol not found "test_misc_good_WKS_text" - # fails if IPv6 isn't available - "test_resolver_override" - ] ++ lib.optionals stdenv.isDarwin [ - # Tests that run inconsistently on darwin systems - # 9 tests fail with: BlockingIOError: [Errno 35] Resource temporarily unavailable - "testQueryUDP" - # 6 tests fail with: dns.resolver.LifetimeTimeout: The resolution lifetime expired after ... - "testResolveCacheHit" - "testResolveTCP" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/docstr-coverage/default.nix b/pkgs/development/python-modules/docstr-coverage/default.nix index 2c3289c0f3931..ba0945ad15af5 100644 --- a/pkgs/development/python-modules/docstr-coverage/default.nix +++ b/pkgs/development/python-modules/docstr-coverage/default.nix @@ -8,7 +8,7 @@ , pytest-mock }: let - version = "2.3.0"; + version = "2.3.1"; in buildPythonPackage { pname = "docstr-coverage"; @@ -17,8 +17,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "HunterMcGushion"; repo = "docstr_coverage"; - rev = "v${version}"; - hash = "sha256-eYHhE5zs3hYzK3aAimF0Gx/Kyk1Ot1F/lKf1poR2er0="; + rev = "refs/tags/v${version}"; + hash = "sha256-QmQE6KZ2NdXKQun+uletxYPktWvfkrj6NPAVl/mmpAY="; }; propagatedBuildInputs = [ click pyyaml tqdm ]; diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix index d05c47009f77a..51d799b90f13f 100644 --- a/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/pkgs/development/python-modules/dogpile-cache/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dogpile-cache"; - version = "1.3.0"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "dogpile.cache"; inherit version; - hash = "sha256-Cjh/GTLAce6P2XHS/1H4q6EQbFWUOaUbjHSiB/QOIV0="; + hash = "sha256-T3HcAzOtNRycb3BPW6Kje/Ucbu0EN9Gt9W4HWVmv5js="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix index 6b6dc6454cb61..fc60abddc69f7 100644 --- a/pkgs/development/python-modules/dploot/default.nix +++ b/pkgs/development/python-modules/dploot/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "dploot"; - version = "2.2.4"; + version = "2.2.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-40/5KOlEFvPL9ohCfR3kqoikpKFfJO22MToq3GhamKM="; + hash = "sha256-SINtHw9q1cNqwtvSpPQUgYj6PzEqKXV0WXuKiPvkFQU="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/dsl2html/default.nix b/pkgs/development/python-modules/dsl2html/default.nix new file mode 100644 index 0000000000000..c3c2621ca2a9e --- /dev/null +++ b/pkgs/development/python-modules/dsl2html/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, setuptools +}: + +buildPythonPackage rec { + pname = "dsl2html"; + version = "0.1.5"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LUtTMqQuwahIeMm9QvMe6rdHEw5LEjMQdyZFZvf/HRU="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "dsl" ]; + + meta = with lib; { + description = "Python module for converting DSL dictionary texts into HTML"; + homepage = "https://github.com/Crissium/python-dsl"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index c4c94d330d812..33090ff4be7c7 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -5,6 +5,7 @@ , pyserial , pyserial-asyncio , pytestCheckHook +, pythonAtLeast , pythonOlder , pytz , tailer @@ -36,6 +37,10 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + "test_receive_packet" + ]; + pythonImportsCheck = [ "dsmr_parser" ]; diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index ab82edb0893b7..955334bdf283d 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -14,8 +14,8 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.9.2"; - format = "pyproject"; + version = "0.11.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-T02nGF+YlughRQPinb0I3NC6xsarh4+qRhG8YfhTvhI="; + hash = "sha256-yW1gaZ0B6JNX98KzAxf146goniNmWnkMUmJRrScot1w="; }; patches = [ ./remote_data.patch ]; diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index a7cd1aa36dd45..fd197f9305d63 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , duckdb , fsspec @@ -13,25 +14,24 @@ }: buildPythonPackage rec { - inherit (duckdb) pname version src; - format = "setuptools"; - - # 1. let nix control build cores - # 2. default to extension autoload & autoinstall disabled - # 3. unconstrain setuptools_scm version - patches = (duckdb.patches or []) ++ [ ./setup.patch ]; + inherit (duckdb) patches pname src version; + pyproject = true; postPatch = (duckdb.postPatch or "") + '' # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library cd tools/pythonpkg - substituteInPlace setup.py --subst-var NIX_BUILD_CORES - - # avoid dependency on mypy - rm tests/stubs/test_stubs.py + # 1. let nix control build cores + # 2. default to extension autoload & autoinstall disabled + substituteInPlace setup.py \ + --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \ + --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "" ''; - BUILD_HTTPFS = 1; + env = { + BUILD_HTTPFS = 1; + DUCKDB_BUILD_UNITY = 1; + }; nativeBuildInputs = [ pybind11 @@ -52,21 +52,35 @@ buildPythonPackage rec { pytestCheckHook ]; + # test flags from .github/workflows/Python.yml + pytestFlagsArray = [ + "--verbose" + ] ++ lib.optionals stdenv.isDarwin [ + "tests/fast" + ]; + + disabledTestPaths = [ + # avoid dependency on mypy + "tests/stubs/test_stubs.py" + ]; + disabledTests = [ # tries to make http request "test_install_non_existent_extension" - # test is racy and interrupt can be delivered before or after target point + + # https://github.com/duckdb/duckdb/issues/10702 + # tests are racy and interrupt can be delivered before or after target point + # causing a later test to fail with a spurious KeyboardInterrupt "test_connection_interrupt" + "test_query_interruption" ]; + # remove duckdb dir to prevent import confusion by pytest preCheck = '' export HOME="$(mktemp -d)" + rm -rf duckdb ''; - setupPyBuildFlags = [ - "--inplace" - ]; - pythonImportsCheck = [ "duckdb" ]; diff --git a/pkgs/development/python-modules/duckdb/setup.patch b/pkgs/development/python-modules/duckdb/setup.patch deleted file mode 100644 index 8c8f790a66a1d..0000000000000 --- a/pkgs/development/python-modules/duckdb/setup.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tools/pythonpkg/setup.py b/tools/pythonpkg/setup.py -index 30f1e1ccdd..6784169fcb 100644 ---- a/tools/pythonpkg/setup.py -+++ b/tools/pythonpkg/setup.py -@@ -96,7 +96,7 @@ def parallel_cpp_compile( - return - self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts) - -- list(multiprocessing.pool.ThreadPool(multiprocessing.cpu_count()).imap(_single_compile, objects)) -+ list(multiprocessing.pool.ThreadPool(@NIX_BUILD_CORES@).imap(_single_compile, objects)) - return objects - - -@@ -163,7 +163,6 @@ if 'BUILD_HTTPFS' in os.environ: - for ext in extensions: - toolchain_args.extend(['-DDUCKDB_EXTENSION_{}_LINKED'.format(ext.upper())]) - --toolchain_args.extend(['-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', '-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1']) - - - class get_pybind_include(object): -@@ -348,7 +347,7 @@ setup( - packages=packages, - include_package_data=True, - python_requires='>=3.7.0', -- setup_requires=setup_requires + ["setuptools_scm<7.0.0", 'pybind11>=2.6.0'], -+ setup_requires=setup_requires + ["setuptools_scm", 'pybind11>=2.6.0'], - use_scm_version=setuptools_scm_conf, - tests_require=['google-cloud-storage', 'mypy', 'pytest'], - classifiers=[ diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix new file mode 100644 index 0000000000000..6381da7271eee --- /dev/null +++ b/pkgs/development/python-modules/duden/default.nix @@ -0,0 +1,56 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, crayons +, fetchFromGitHub +, poetry-core +, pyxdg +, pyyaml +, requests +, setuptools +}: + +let + finalAttrs = { + pname = "duden"; + version = "0.19.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "radomirbosak"; + repo = "duden"; + rev = finalAttrs.version; + hash = "sha256-c6IItrjFVbsdYg3sDrExcxv7aRcKhd/M5hiZD+wBZ2Y="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + crayons + pyxdg + pyyaml + requests + setuptools + ]; + + pythonImportsCheck = [ "duden" ]; + + meta = { + homepage = "https://github.com/radomirbosak/duden"; + changelog = "https://github.com/radomirbosak/duden/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + description = "CLI for https://duden.de dictionary written in Python"; + longDescription = '' + duden is a CLI-based program and python module, which can provide + various information about given german word. The provided data are + parsed from german dictionary duden.de. + ''; + license = with lib.licenses; [ mit ]; + mainProgram = "duden"; + maintainers = with lib.maintainers; [ AndersonTorres linuxissuper ]; + }; + }; +in +buildPythonPackage finalAttrs diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix index cc4b2149b1c3d..c336f5a3cc74b 100644 --- a/pkgs/development/python-modules/dvc-studio-client/default.nix +++ b/pkgs/development/python-modules/dvc-studio-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dvc-studio-client"; - version = "0.18.0"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZgjNshF5UFOY5TewNMlJDOajjI1Bfd/a4v7HrAKwaMw="; + hash = "sha256-JLrsbgifoUnN1Mwml9tO3/SkA6miE14AGjxrFwEcRks="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index c469ffcb9754c..d05a37f7ad798 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -18,7 +18,7 @@ , dvc-task , fetchFromGitHub , flatten-dict -, flufl_lock +, flufl-lock , funcy , grandalf , gto @@ -98,7 +98,7 @@ buildPythonPackage rec { dvc-studio-client dvc-task flatten-dict - flufl_lock + flufl-lock funcy grandalf gto diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index f657ab37083c2..cc22a3aad2334 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -32,16 +32,16 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.41.1"; + version = "3.42.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PbgazRK3+CoJISh1ZXGjxDfbKHY/XqSvVrkpycvPi7c="; + hash = "sha256-7MesRCfXr/f2MBokZhraFQqIuOyWCjIDRYZcvzM5Ezc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix index 95759b6a096c0..ef0b31b177ab2 100644 --- a/pkgs/development/python-modules/e3-core/default.nix +++ b/pkgs/development/python-modules/e3-core/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ autoPatchelfHook +, buildPythonPackage , colorama , coverage , distro @@ -6,12 +7,14 @@ , httpretty , lib , mock +, packaging , psutil , pytest , pytest-socket , python-dateutil , pyyaml , requests +, requests-cache , requests-toolbelt , stdenv , setuptools @@ -24,26 +27,40 @@ buildPythonPackage rec { pname = "e3-core"; - version = "22.3.1"; + version = "22.4.0"; pyproject = true; src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-core"; rev = "v${version}"; - hash = "sha256-4StHOJldfeqApdF6D14Euzg9HvZ2e7G4/OQ0UrEbEIw="; + hash = "sha256-dgEk2/qRfAYwUz+e5TWKUy/aPLpmyWZ32OV1i7QM9Fs="; }; - patches = [ ./0001-use-distro-over-ld.patch ]; + patches = [ + ./0001-use-distro-over-ld.patch + ]; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + autoPatchelfHook + setuptools + ]; propagatedBuildInputs = [ - colorama pyyaml python-dateutil requests requests-toolbelt tqdm stevedore + colorama + packaging + pyyaml + python-dateutil + requests + requests-cache + requests-toolbelt + tqdm + stevedore ] ++ lib.optional stdenv.isLinux [ # See setup.py:24. These are required only on Linux. Darwin has its own set # of requirements. - psutil distro + psutil + distro ]; pythonImportsCheck = [ "e3" ]; diff --git a/pkgs/development/python-modules/e3-testsuite/default.nix b/pkgs/development/python-modules/e3-testsuite/default.nix new file mode 100644 index 0000000000000..6c13bbb5a08e3 --- /dev/null +++ b/pkgs/development/python-modules/e3-testsuite/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, e3-core +, fetchFromGitHub +, lib +, setuptools +, stdenv +}: + +buildPythonPackage rec { + pname = "e3-testsuite"; + version = "26.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AdaCore"; + repo = "e3-testsuite"; + rev = "v${version}"; + hash = "sha256-V20tX0zi2DRHO42udUcW/CDMyBxh1uSTgac0zZGubsI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + e3-core + ]; + + pythonImportsCheck = [ "e3" ]; + + meta = with lib; { + changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${src.rev}"; + homepage = "https://github.com/AdaCore/e3-testsuite/"; + description = "Generic testsuite framework in Python"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ heijligen ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix index 2a06fe02d1337..14aae92ef5c4f 100644 --- a/pkgs/development/python-modules/easydict/default.nix +++ b/pkgs/development/python-modules/easydict/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "easydict"; - version = "1.11"; + version = "1.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3LHS7SjrMAyORs03E0A3Orxi98FNbep0/fxvEGkGHHg="; + hash = "sha256-sRNd7bxByAEOK8H3fsl0TH+qQrzhoch0FnkUSdbId4A="; }; doCheck = false; # No tests in archive diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 577fddc3087b5..9fb346b0f135e 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.3"; + version = "0.21.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-tyDRHw3c5Kn9IXm5K7Qpn1xfmu5c3pb9D1mpeqo6SHg="; + hash = "sha256-LzIK4GGVWAp4JXlKE7Mo0cPIH2srnJIlu36bzovNkwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index d3edf67483000..e3ec6adf2f72b 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -2,27 +2,36 @@ , stdenv , fetchFromGitHub , cmake +, doxygen , boost , eigen , numpy +, scipy }: stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-INOg1oL5APMI2YZDe4yOJadhMsG7b+NfEcSr9FsdqeU="; + hash = "sha256-/k5eltoeUW05FTjvStAOw+tguWLUaUced8TArrk4UDI="; }; + cmakeFlags = [ + "-DINSTALL_DOCUMENTATION=ON" + "-DBUILD_TESTING_SCIPY=ON" + ]; + strictDeps = true; nativeBuildInputs = [ cmake + doxygen + scipy ]; buildInputs = [ diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 50aef7a1f66dc..61ad6705fe9b7 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -20,6 +20,7 @@ , pythonOlder , sanic , sanic-testing +, setuptools , starlette , structlog , tornado @@ -30,8 +31,8 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.20.0"; - format = "setuptools"; + version = "6.21.3"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -39,9 +40,13 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-nj035nZTUkVCiGZz+JTibv7LZ9Bws5DwYvqrLrwjQkc="; + hash = "sha256-Ejix31cMyHOc/IGe4bRp/Nchm9Ps1cRYE8jIaIYlJjs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp blinker diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix index db16d913cbdbf..7c90d8a4b9717 100644 --- a/pkgs/development/python-modules/enamlx/default.nix +++ b/pkgs/development/python-modules/enamlx/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "enamlx"; - version = "0.6.2"; + version = "0.6.4"; format = "setuptools"; src = fetchFromGitHub { owner = "frmdstryr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LHqOZ1uLWFbUeQAGKoMH9GljhRq1K4RTVWzgV/pt3g8="; + hash = "sha256-C3/G0bnu1EQh0elqdrpCwkFPZU4qmkUX7WRSRK9nkM4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/enocean/default.nix b/pkgs/development/python-modules/enocean/default.nix index 48fc882a1b723..02db2a6964098 100644 --- a/pkgs/development/python-modules/enocean/default.nix +++ b/pkgs/development/python-modules/enocean/default.nix @@ -4,7 +4,7 @@ , beautifulsoup4 , enum-compat , pyserial -, nose +, pynose }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pynose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 8c179349e18eb..67bca70171e4a 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -4,16 +4,16 @@ , dj-email-url , django-cache-url , fetchFromGitHub +, flit-core , marshmallow , pytestCheckHook , python-dotenv , pythonOlder -, setuptools }: buildPythonPackage rec { pname = "environs"; - version = "10.3.0"; + version = "11.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,11 +22,11 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; rev = "refs/tags/${version}"; - hash = "sha256-D6Kp8aHiUls7+cACJ3DwrS4OftA5uMbAu4l5IyR4F5U="; + hash = "sha256-9BqIlA2HcUlBiyTB7zxaLO0CzBRkx5mKMMdhvdr2Uqg="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 434fc6d8c10d6..60bafffaea2ab 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -3,12 +3,13 @@ , buildPythonPackage , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "eth-typing"; - version = "3.2.0"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-typing"; rev = "refs/tags/v${version}"; - hash = "sha256-klN38pIQ9ZOFV7dzXNvylPGfifR8pXRLTJ3VE579AY0="; + hash = "sha256-JT/2bCPYFSRNt3V7QnHSAJR7HrZ1JpRKdU7gQpoYIn0="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 6d4cbf930f566..8686da98d92a9 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -8,22 +8,27 @@ , isPyPy , pytestCheckHook , pythonOlder +, setuptools , toolz }: buildPythonPackage rec { pname = "eth-utils"; - version = "2.1.1"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; - repo = pname; + repo = "eth-utils"; rev = "v${version}"; - hash = "sha256-Ogp4o99smw5qVwDec6zd/xVqqKMyNk41iBfRNzrwuvE="; + hash = "sha256-k2pHM1eKPzoGxZlU6yT7bZMv4CCWGaZaSnFHSbT76Zo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ eth-hash eth-typing @@ -44,6 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_utils" ]; meta = { + changelog = "https://github.com/ethereum/eth-utils/blob/${src.rev}/docs/release_notes.rst"; description = "Common utility functions for codebases which interact with ethereum"; homepage = "https://github.com/ethereum/eth-utils"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index 36c5ebb71c527..b6990e50330f7 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-xjX70Cp5/tStdoJdMTBrWB0itAZxch2qi8J5z2Mz5Io="; + hash = "sha256-l7aP0l4YVoMhUobvOlTjgZm2JF9f6L5r7cEYm+QlY1A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 07f19e3493d9b..dbdc82bd35acb 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -2,11 +2,11 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonAtLeast # build-system -, setuptools +, hatch-vcs +, hatchling # dependencies , dnspython @@ -15,7 +15,6 @@ , six # tests -, nose3 , iana-etc , pytestCheckHook , libredirect @@ -23,29 +22,19 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.33.3"; + version = "0.35.2"; pyproject = true; src = fetchFromGitHub { owner = "eventlet"; - repo = pname; + repo = "eventlet"; rev = "v${version}"; - hash = "sha256-iSSEZgPkK7RrZfU11z7hUk+JbFsCPH/SD16e+/f6TFU="; + hash = "sha256-jMbCxqIn9f9+16rFwpQdkBHj6NwTNkQxnSVV4qQ1fjM="; }; - patches = [ - # Python 3.12 fixes: - # - remove usage of distutils - # - replace ssl.wrap_socket usage - ./remove-distutils-usage.patch - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/python-eventlet/raw/rawhide/f/python3.12.patch"; - hash = "sha256-MxzprFaVcV1uamjjTeIz+2gPvfPy+Y1QaA20znMdwoA="; - }) - ]; - nativeBuildInputs = [ - setuptools + hatch-vcs + hatchling ]; propagatedBuildInputs = [ @@ -56,13 +45,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - nose3 ]; # libredirect is not available on darwin # tests hang on pypy indefinitely - # nose3 is incompatible with Python 3.12. - doCheck = !stdenv.isDarwin && !isPyPy && !(pythonAtLeast "3.12"); + doCheck = !stdenv.isDarwin && !isPyPy; preCheck = lib.optionalString doCheck '' echo "nameserver 127.0.0.1" > resolv.conf @@ -73,47 +60,14 @@ buildPythonPackage rec { ''; disabledTests = [ + # AssertionError: Expected single line "pass" in stdout + "test_fork_after_monkey_patch" # Tests requires network access - "test_017_ssl_zeroreturnerror" - "test_018b_http_10_keepalive_framing" "test_getaddrinfo" "test_hosts_no_network" - "test_leakage_from_tracebacks" - "test_patcher_existing_locks_locked" - # broken with pyopenssl 22.0.0 - "test_sendall_timeout" - # broken on aarch64 and when using march in gcc - "test_fork_after_monkey_patch" - ]; - - disabledTestPaths = [ - # Tests are out-dated - "tests/stdlib/test_asynchat.py" - "tests/stdlib/test_asyncore.py" - "tests/stdlib/test_ftplib.py" - "tests/stdlib/test_httplib.py" - "tests/stdlib/test_httpservers.py" - "tests/stdlib/test_os.py" - "tests/stdlib/test_queue.py" - "tests/stdlib/test_select.py" - "tests/stdlib/test_SimpleHTTPServer.py" - "tests/stdlib/test_socket_ssl.py" - "tests/stdlib/test_socket.py" - "tests/stdlib/test_socketserver.py" - "tests/stdlib/test_ssl.py" - "tests/stdlib/test_subprocess.py" - "tests/stdlib/test_thread__boundedsem.py" - "tests/stdlib/test_thread.py" - "tests/stdlib/test_threading_local.py" - "tests/stdlib/test_threading.py" - "tests/stdlib/test_timeout.py" - "tests/stdlib/test_urllib.py" - "tests/stdlib/test_urllib2_localnet.py" - "tests/stdlib/test_urllib2.py" ]; - # unfortunately, it needs /etc/protocol to be present to not fail - # pythonImportsCheck = [ "eventlet" ]; + pythonImportsCheck = [ "eventlet" ]; meta = with lib; { changelog = "https://github.com/eventlet/eventlet/blob/v${version}/NEWS"; diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix index ab8fde6f8cc3b..6c2a1847782a3 100644 --- a/pkgs/development/python-modules/exifread/default.nix +++ b/pkgs/development/python-modules/exifread/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "ExifRead"; + pname = "exifread"; version = "3.0.0"; src = fetchPypi { - inherit pname version; + pname = "ExifRead"; + inherit version; hash = "sha256-CsWjZBadvfK9YvlPXAc5cKtmlKMWYXf15EixDJQ+LKQ="; }; diff --git a/pkgs/development/python-modules/expiring-dict/default.nix b/pkgs/development/python-modules/expiring-dict/default.nix index cd3d925088484..be2b5c875d20c 100644 --- a/pkgs/development/python-modules/expiring-dict/default.nix +++ b/pkgs/development/python-modules/expiring-dict/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Python dict with TTL support for auto-expiring caches"; homepage = "https://github.com/dparker2/py-expiring-dict"; license = licenses.mit; - maintainers = with maintainers; [ ajs124 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index 024509dad06b8..44d49ee16edd8 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2402"; + version = "1.3.0.post2403"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - hash = "sha256-MiFNTz3vrN4rMHK7e4ntE35wzgnPt6yczCv7XDcUlO8="; + hash = "sha256-t0Mv8Kae6N+jHeQx57ljDR5lmmbW2mqrlqygtrwGWhY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fairseq/default.nix b/pkgs/development/python-modules/fairseq/default.nix index 35275c32780a1..e784f8ec0b0d4 100644 --- a/pkgs/development/python-modules/fairseq/default.nix +++ b/pkgs/development/python-modules/fairseq/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { disabledTests = [ # this test requires xformers "test_xformers_single_forward_parity" + "test_mask_for_xformers" # this test requires iopath "test_file_io_async" # these tests require network access @@ -105,6 +106,8 @@ buildPythonPackage rec { "test_waitk_checkpoint" "test_sotasty_es_en_600m_checkpoint" "test_librispeech_s2t_conformer_s_checkpoint" + # TODO research failure + "test_multilingual_translation_latent_depth" ]; disabledTestPaths = [ @@ -117,6 +120,7 @@ buildPythonPackage rec { homepage = "https://github.com/pytorch/fairseq"; license = licenses.mit; platforms = platforms.linux; + hydraPlatforms = []; maintainers = with maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 0cdcd90cbe87e..3b087601453f0 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fake-useragent"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fake-useragent"; repo = "fake-useragent"; rev = "refs/tags/${version}"; - hash = "sha256-Jmzq0yIM373bg2T6t0YFymBiH9vSpiCw+UAMfxsMJvY="; + hash = "sha256-EzSofIHNwn7GPhnTNbo/451szB759w5T8poXj8XVNUU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index a63c257fc6808..45a2a512d5137 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -1,8 +1,8 @@ { lib -, aioredis , buildPythonPackage , fetchFromGitHub , hypothesis +, jsonpath-ng , lupa , poetry-core , pybloom-live @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.21.1"; + version = "2.21.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-2+ZZTWhUb6rj7oWPnDP0PJUHj0CJpOD8iZxmtO4xSbo="; + hash = "sha256-GIg+a8G5S0dmbvMKqS/Vn+wzNM6iNIs3bKPqhecsQt4="; }; nativeBuildInputs = [ @@ -49,8 +49,8 @@ buildPythonPackage rec { lua = [ lupa ]; - aioredis = [ - aioredis + json = [ + jsonpath-ng ]; bf = [ pyprobables diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index ca7a90aa647ac..b906a22bea572 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.4.0"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-pene97VKOX8mZEQgHkOBDu72Dpww2D9nDjA94s5F9rM="; + hash = "sha256-Bh1s0IeUEa4EnGElQn5ruBxFSbcOqsrDqbw1nVjdi5s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix index cb2ee2cc26921..81459a8604880 100644 --- a/pkgs/development/python-modules/fastai/default.nix +++ b/pkgs/development/python-modules/fastai/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "fastai"; - version = "2.7.13"; + version = "2.7.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q1KBBAAKrTzq6USRwBjvT23mXpjQT2gjBsxuZ4w54rY="; + hash = "sha256-QiVyYojI/xs7wYl3umhky0j+xzptNS7Fv+fLMRy/4jc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi-sso/default.nix b/pkgs/development/python-modules/fastapi-sso/default.nix index e74cfcd72999d..bde53ac71325b 100644 --- a/pkgs/development/python-modules/fastapi-sso/default.nix +++ b/pkgs/development/python-modules/fastapi-sso/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fastapi-sso"; - version = "0.11.0"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tomasvotava"; repo = "fastapi-sso"; rev = "refs/tags/${version}"; - hash = "sha256-bz4rr7h90d/QkBBqQN1pLF8ANhOiq2v0Vv2pjBGpeTs="; + hash = "sha256-/Mt0pmZYsWp/n9YHCy/bFKUPzmoRFB0cHKCNxEfxMLs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fastecdsa/default.nix b/pkgs/development/python-modules/fastecdsa/default.nix index bd1a8c673e42e..d46bf58d861c2 100644 --- a/pkgs/development/python-modules/fastecdsa/default.nix +++ b/pkgs/development/python-modules/fastecdsa/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fastecdsa"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8ZjORPaUbKuwKYip9J0U78QQ26XiEemDIbqdhzeyP/g="; + hash = "sha256-81JVptPkEQkWa11LCIZtWsu5ny4eZNOn50x3RmTNqEI="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 84761c3bfa067..847afc47a3523 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , fetchFromGitHub +# build-system +, setuptools + # dependencies , av , ctranslate2 @@ -15,17 +18,21 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "0.10.0"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { - owner = "guillaumekln"; + owner = "SYSTRAN"; repo = "faster-whisper"; - rev = "refs/tags/${version}"; - hash = "sha256-qcpPQv5WoUkT92/TZ+MMq452FgPNcm3ZZ+ZNc0btOGE="; + rev = "refs/tags/v${version}"; + hash = "sha256-b8P9fI32ubOrdayA0vnjLhpZ4qffB6W+8TEOA1YLKqo="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ av ctranslate2 huggingface-hub diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 9105fbd406121..1ceeecafb6384 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -20,35 +20,35 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "2023.7.0"; - format = "pyproject"; + version = "2024.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dask"; - repo = pname; - rev = version; - hash = "sha256-pJ0zK0upEV7TyuNMIcozugkwBlYpK/Dg6BdB0kBpn9k="; + repo = "fastparquet"; + rev = "refs/tags/${version}"; + hash = "sha256-e0gnC/HMYdrYdEwy6qNOD1J52xgN2x81oCG03YNsYjg="; }; - nativeBuildInputs = [ - cython - oldest-supported-numpy - setuptools - setuptools-scm - wheel - ]; - postPatch = '' substituteInPlace pyproject.toml \ - --replace '"pytest-runner"' "" + --replace-fail '"pytest-runner"' "" sed -i \ -e "/pytest-runner/d" \ -e '/"git", "status"/d' setup.py ''; + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + setuptools-scm + wheel + ]; + propagatedBuildInputs = [ cramjam fsspec @@ -85,7 +85,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A python implementation of the parquet format"; + description = "Implementation of the parquet format"; homepage = "https://github.com/dask/fastparquet"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/development/python-modules/feedfinder2/default.nix b/pkgs/development/python-modules/feedfinder2/default.nix new file mode 100644 index 0000000000000..bb5528815294f --- /dev/null +++ b/pkgs/development/python-modules/feedfinder2/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, setuptools + +, six +, requests +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "feedfinder2"; + version = "0.0.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-NwHuAabIX4uGWgScMLoLRgiFjIA/6OMNHSif2+idDv4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + six + requests + beautifulsoup4 + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "feedfinder2" ]; + + meta = with lib; { + description = "A Python library for finding feed links on websites"; + homepage = "https://github.com/dfm/feedfinder2"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/filedepot/default.nix b/pkgs/development/python-modules/filedepot/default.nix index b347a1a6bd199..b567a3d8322a7 100644 --- a/pkgs/development/python-modules/filedepot/default.nix +++ b/pkgs/development/python-modules/filedepot/default.nix @@ -2,7 +2,6 @@ , anyascii , buildPythonPackage , fetchFromGitHub -, fetchpatch , flaky , google-cloud-storage , mock @@ -11,13 +10,14 @@ , pytestCheckHook , pythonOlder , requests +, setuptools , sqlalchemy }: buildPythonPackage rec { pname = "filedepot"; - version = "0.10.0"; - format = "setuptools"; + version = "0.11.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,16 +25,11 @@ buildPythonPackage rec { owner = "amol-"; repo = "depot"; rev = "refs/tags/${version}"; - hash = "sha256-vPceky5cvmy3MooWz7dRdy68VoAHN7i3a7egBs4dPE8="; + hash = "sha256-693H/u+Wg2G9sdoUkC6DQo9WkmIlKnh8NKv3ufK/eyQ="; }; - patches = [ - # Add support for Pillow 10, https://github.com/amol-/depot/pull/84 - (fetchpatch { - name = "support-pillow-10.patch"; - url = "https://github.com/amol-/depot/commit/bdb73d1b3898279068b421bc061ecc18c5108fa4.patch"; - hash = "sha256-7+VGrdJstkiy0bYAqA9FjF1NftZiurgyPd8Wlz6GUy8="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 8513c723bf00b..a200ef7efac59 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "fiona"; - version = "1.9.5"; + version = "1.9.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Toblerity"; repo = "Fiona"; rev = "refs/tags/${version}"; - hash = "sha256-fq/BuyzuK4iOxdpE4h+KRH0CxOEk/wdmbb9KgCfJ1cw="; + hash = "sha256-MboM3IwGF8cuz+jMQ3QVZFAHjpspQ6kVJincq7OEkCM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index df89eef07bfbd..de678f787c727 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { hash = "sha256-1u3h47lRBrJ7EUWBl5+RLGW4KHHqXqqrXbboZdy7VPA="; }; + postPatch = '' + substituteInPlace fitbit_tests/test_api.py \ + --replace-fail assertRaisesRegexp assertRaisesRegex + ''; + propagatedBuildInputs = [ python-dateutil requests-oauthlib diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 7a3bd82a51456..9efb1fab948c7 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , mccabe , pycodestyle , pyflakes @@ -10,19 +11,23 @@ buildPythonPackage rec { pname = "flake8"; - version = "6.1.0"; + version = "7.0.0"; disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "PyCQA"; repo = "flake8"; rev = version; - hash = "sha256-N8bufkn1CUREHusVc2mQ1YlNr7lrESEZGmlN68bhgbE="; + hash = "sha256-2oVvchDhH3cX90RTIquYLyr+rzHxzQgYA4k4ReTxpH8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ mccabe pycodestyle @@ -34,8 +39,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Flake8 is a wrapper around pyflakes, pycodestyle and mccabe."; - homepage = "https://github.com/pycqa/flake8"; + description = "The modular source code checker: pep8, pyflakes and co"; + homepage = "https://github.com/PyCQA/flake8"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; mainProgram = "flake8"; diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index ff532ffd12d90..3aab9046cdc8e 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -13,13 +13,14 @@ , pythonOlder , redis , rich +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "flask-limiter"; - version = "3.5.0"; - format = "setuptools"; + version = "3.5.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-ZaHw8+l1sBCeNj0tYdUw1f4BUvEj6plOSoH0GUzNg+0="; + hash = "sha256-U7qgl8yg0ddKDPXqYE2Vqyc2ofxSP+6liWs5j4qD6fM="; }; postPatch = '' @@ -37,6 +38,10 @@ buildPythonPackage rec { sed -i "/import flask_restful/d" tests/test_views.py ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ flask limits diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index be74af2d5f9a8..fdc40c2443039 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, flit-core , flask -, marshmallow -, pytestCheckHook , flask-sqlalchemy +, flit-core +, marshmallow , marshmallow-sqlalchemy +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -33,6 +33,13 @@ buildPythonPackage rec { marshmallow ]; + passthru.optional-dependencies = { + sqlalchemy = [ + flask-sqlalchemy + marshmallow-sqlalchemy + ]; + }; + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.sqlalchemy; @@ -41,12 +48,10 @@ buildPythonPackage rec { "flask_marshmallow" ]; - passthru.optional-dependencies = { - sqlalchemy = [ - flask-sqlalchemy - marshmallow-sqlalchemy - ]; - }; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; meta = { description = "Flask + marshmallow for beautiful APIs"; diff --git a/pkgs/development/python-modules/flask-pymongo/default.nix b/pkgs/development/python-modules/flask-pymongo/default.nix new file mode 100644 index 0000000000000..721de186417f6 --- /dev/null +++ b/pkgs/development/python-modules/flask-pymongo/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, vcversioner +, flask +, pymongo +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "flask-pymongo"; + version = "2.3.0"; + pyproject = true; + + src = fetchPypi { + pname = "Flask-PyMongo"; + inherit version; + hash = "sha256-Yg6wLciAil/LkPJsq2y6nWv0l7FQMq48qZ34A2bjMxQ="; + }; + + nativeBuildInputs = [ + setuptools + vcversioner + ]; + + propagatedBuildInputs = [ + flask + pymongo + six + ]; + + pythonImportsCheck = [ "flask_pymongo" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # requires running MongoDB + doCheck = false; + + meta = { + homepage = "https://github.com/dcrosta/flask-pymongo"; + description = "PyMongo support for Flask applications"; + license = lib.licenses.bsd2; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch b/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch index c12c85e0de254..2506a10268b20 100644 --- a/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch +++ b/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch @@ -1,17 +1,17 @@ -From 001549503eed364d4baaa5804242f67c6236f6c2 Mon Sep 17 00:00:00 2001 +From d3aed2c18cc3a1c88a8052af1f34d7f81f1be11a Mon Sep 17 00:00:00 2001 From: Flakebi <flakebi@t-online.de> -Date: Sat, 2 Dec 2023 16:55:05 +0100 +Date: Wed, 28 Feb 2024 23:24:14 +0100 Subject: [PATCH] Fix with new dependency versions - cookie_jar is private in werkzeug 2.3, so recreate the client instead - set_cookie does not take a hostname argument anymore, use domain instead - Headers need to specify a content type --- - test_seasurf.py | 63 ++++++++++++++++++++++++------------------------- - 1 file changed, 31 insertions(+), 32 deletions(-) + test_seasurf.py | 71 ++++++++++++++++++++++++------------------------- + 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/test_seasurf.py b/test_seasurf.py -index 517b2d7..501f82d 100644 +index 517b2d7..f940b91 100644 --- a/test_seasurf.py +++ b/test_seasurf.py @@ -71,18 +71,18 @@ class SeaSurfTestCase(BaseTestCase): @@ -37,6 +37,15 @@ index 517b2d7..501f82d 100644 self.assertIn(b('403 Forbidden'), rv.data) def test_json_token_validation_bad(self): +@@ -93,7 +93,7 @@ class SeaSurfTestCase(BaseTestCase): + with self.app.test_client() as client: + with client.session_transaction() as sess: + sess[self.csrf._csrf_name] = tokenA +- client.set_cookie('www.example.com', self.csrf._csrf_name, tokenB) ++ client.set_cookie(self.csrf._csrf_name, tokenB, domain='www.example.com') + + rv = client.post('/bar', data=data) + self.assertEqual(rv.status_code, 403, rv) @@ -107,7 +107,7 @@ class SeaSurfTestCase(BaseTestCase): data = {'_csrf_token': token} with self.app.test_client() as client: @@ -55,7 +64,7 @@ index 517b2d7..501f82d 100644 sess[self.csrf._csrf_name] = token # once this is reached the session was stored -@@ -144,7 +144,7 @@ class SeaSurfTestCase(BaseTestCase): +@@ -144,18 +144,18 @@ class SeaSurfTestCase(BaseTestCase): with client.session_transaction() as sess: token = self.csrf._generate_token() @@ -64,6 +73,19 @@ index 517b2d7..501f82d 100644 sess[self.csrf._csrf_name] = token # once this is reached the session was stored +- rv = client.post('/bar', ++ rv = client.post('/bar', content_type='application/json', + data={self.csrf._csrf_name: token}, + base_url='https://www.example.com', + headers={'Referer': 'https://www.example.com/foobar'}) + + self.assertEqual(rv.status_code, 200) + +- rv = client.post(u'/bar/\xf8', ++ rv = client.post(u'/bar/\xf8', content_type='application/json', + data={self.csrf._csrf_name: token}, + base_url='https://www.example.com', + headers={'Referer': 'https://www.example.com/foobar\xf8'}) @@ -167,7 +167,7 @@ class SeaSurfTestCase(BaseTestCase): with client.session_transaction() as sess: token = self.csrf._generate_token() @@ -252,6 +274,15 @@ index 517b2d7..501f82d 100644 self.assertEqual(res2.status_code, 200) def test_header_set_cookie_samesite(self): +@@ -789,7 +788,7 @@ class SeaSurfTestCaseGenerateNewToken(BaseTestCase): + client.get('/foo') + tokenA = self.csrf._get_token() + +- client.set_cookie('www.example.com', self.csrf._csrf_name, tokenA) ++ client.set_cookie(self.csrf._csrf_name, tokenA, domain='www.example.com') + with client.session_transaction() as sess: + sess[self.csrf._csrf_name] = tokenA + -- -2.42.0 +2.43.0 diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index fa0f053f86de1..b906ba9d4322f 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,24 +1,26 @@ { lib , buildPythonPackage +, cloudpickle +, einops , fetchFromGitHub -, jaxlib -, pythonRelaxDepsHook -, setuptools-scm , jax +, jaxlib +, keras +, matplotlib , msgpack , numpy , optax +, orbax-checkpoint +, pytest-xdist +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , pyyaml , rich +, setuptools-scm +, tensorflow , tensorstore , typing-extensions -, matplotlib -, cloudpickle -, einops -, keras -, pytest-xdist -, pytestCheckHook -, tensorflow }: buildPythonPackage rec { @@ -26,6 +28,8 @@ buildPythonPackage rec { version = "0.7.5"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "google"; repo = "flax"; @@ -44,6 +48,7 @@ buildPythonPackage rec { msgpack numpy optax + orbax-checkpoint pyyaml rich tensorstore @@ -75,7 +80,6 @@ buildPythonPackage rec { disabledTestPaths = [ # Docs test, needs extra deps + we're not interested in it. "docs/_ext/codediff_test.py" - # The tests in `examples` are not designed to be executed from a single test # session and thus either have the modules that conflict with each other or # wrong import paths, depending on how they're invoked. Many tests also have @@ -83,12 +87,15 @@ buildPythonPackage rec { # `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them # would be limited anyway. "examples/*" - # See https://github.com/google/flax/issues/3232. "tests/jax_utils_test.py" + # Requires tree + "tests/tensorboard_test.py" + ]; - # Requires orbax which is not packaged as of 2023-07-27. - "tests/checkpoints_test.py" + disabledTests = [ + # ValueError: Checkpoint path should be absolute + "test_overwrite_checkpoints0" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index fc4d6479caee0..a4e0716cf344a 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { inherit (flit) src patches; - sourceRoot = "source/flit_core"; + sourceRoot = "${src.name}/flit_core"; # Tests are run in the "flit" package. doCheck = false; diff --git a/pkgs/development/python-modules/floret/cstdint.patch b/pkgs/development/python-modules/floret/cstdint.patch new file mode 100644 index 0000000000000..f30f557cb7013 --- /dev/null +++ b/pkgs/development/python-modules/floret/cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/src/args.cc b/src/args.cc +index a8975e81624c..99854c919341 100644 +--- a/src/args.cc ++++ b/src/args.cc +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + ++#include <cstdint> + #include <iostream> + #include <stdexcept> + #include <string> diff --git a/pkgs/development/python-modules/floret/default.nix b/pkgs/development/python-modules/floret/default.nix index 72248cf8dbaa2..6ca020ac81df1 100644 --- a/pkgs/development/python-modules/floret/default.nix +++ b/pkgs/development/python-modules/floret/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { hash = "sha256-7vkw6H0ZQoHEwNusY6QWh/vPbSCdP1ZaaqABHsZH6hQ="; }; + patches = [./cstdint.patch ]; + nativeBuildInputs = [ pybind11 setuptools diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix index 81d2d4840cf13..7c6738bc3cd65 100644 --- a/pkgs/development/python-modules/flufl/bounce.nix +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -1,14 +1,49 @@ -{ buildPythonPackage, fetchPypi, atpublic, zope-interface, nose2 }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, atpublic +, zope-interface +, pytestCheckHook +}: buildPythonPackage rec { - pname = "flufl.bounce"; + pname = "flufl-bounce"; version = "4.0"; - - buildInputs = [ nose2 ]; - propagatedBuildInputs = [ atpublic zope-interface ]; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "flufl.bounce"; + inherit version; hash = "sha256-JVBK65duwP5aGc1sQTo0EMtRT9zb3Kn5tdjTQ6hgODE="; }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + atpublic + zope-interface + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flufl.bounce" + ]; + + pythonNamespaces = [ + "flufl" + ]; + + meta = with lib; { + description = "Email bounce detectors"; + homepage = "https://gitlab.com/warsaw/flufl.bounce"; + changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${version}/flufl/bounce/NEWS.rst"; + maintainers = with maintainers; [ ]; + license = licenses.asl20; + }; } diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index 57a33e233cf60..bd5bcb62fe6c7 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -1,26 +1,45 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , atpublic , pdm-pep517 +, pytestCheckHook +, sybil }: buildPythonPackage rec { - pname = "flufl.i18n"; + pname = "flufl-i18n"; version = "4.1.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "flufl.i18n"; + inherit version; + hash = "sha256-wKz6aggkJ9YBJ+o75XjC4Ddnn+Zi9hlYDnliwTc7DNs="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=flufl --cov-report=term --cov-report=xml" "" + ''; nativeBuildInputs = [ pdm-pep517 ]; - propagatedBuildInputs = [ atpublic ]; - doCheck = false; + propagatedBuildInputs = [ atpublic ]; pythonImportsCheck = [ "flufl.i18n" ]; - src = fetchPypi { - inherit pname version; - hash = "sha256-wKz6aggkJ9YBJ+o75XjC4Ddnn+Zi9hlYDnliwTc7DNs="; - }; + nativeCheckInputs = [ + pytestCheckHook + sybil + ]; + + pythonNamespaces = [ + "flufl" + ]; meta = with lib; { description = "A high level API for internationalizing Python libraries and applications"; diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 1b4a575e760a5..8a3e391fee15d 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,15 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder , atpublic, psutil, pytest-cov, sybil , pdm-pep517 }: buildPythonPackage rec { - pname = "flufl.lock"; + pname = "flufl-lock"; version = "7.1.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "flufl.lock"; + inherit version; hash = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0="; }; @@ -22,11 +25,19 @@ buildPythonPackage rec { # relevant to the user. pytestFlagsArray = [ "--no-cov" ]; + pythonImportsCheck = [ + "flufl.lock" + ]; + + pythonNamespaces = [ + "flufl" + ]; + meta = with lib; { homepage = "https://flufllock.readthedocs.io/"; description = "NFS-safe file locking with timeouts for POSIX and Windows"; + changelog = "https://gitlab.com/warsaw/flufl.lock/-/blob/${version}/docs/NEWS.rst"; maintainers = with maintainers; [ qyliss ]; license = licenses.asl20; - platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 06ff0d1c7dcc3..7e26460455185 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage -, cython +, cython_3 +, expandvars , fetchFromGitHub +, pep517 , pytestCheckHook , pythonOlder , setuptools @@ -10,27 +12,33 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.4.0"; - format = "pyproject"; + version = "1.4.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "frozenlist"; rev = "refs/tags/v${version}"; - hash = "sha256-sI6jnrTxDbW0sNVodpCjBnA31VAAmunwMp9s8GkoHGI="; + hash = "sha256-ICPJKN6P9ezTiDVoEVBQvJlXqF7aHE6aXFx0jzntdEA="; }; + postPatch = '' + rm pytest.ini + ''; + nativeBuildInputs = [ - cython + expandvars + cython_3 + pep517 setuptools wheel ]; - postPatch = '' - sed -i "/addopts =/d" pytest.ini - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; preBuild = '' cython frozenlist/_frozenlist.pyx @@ -40,13 +48,10 @@ buildPythonPackage rec { "frozenlist" ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - meta = with lib; { description = "Python module for list-like structure"; homepage = "https://github.com/aio-libs/frozenlist"; + changelog = "https://github.com/aio-libs/frozenlist/blob/v${version}/CHANGES.rst"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gassist-text/default.nix b/pkgs/development/python-modules/gassist-text/default.nix index b413c19d40932..a8e7b14de8925 100644 --- a/pkgs/development/python-modules/gassist-text/default.nix +++ b/pkgs/development/python-modules/gassist-text/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gassist-text"; - version = "0.0.10"; + version = "0.0.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "gassist_text"; rev = "refs/tags/${version}"; - hash = "sha256-BSMflCSYNAaQVTOqKWyr9U9Q70ley1jjF6ndOVum+GA="; + hash = "sha256-XFHyI48TuPBJjHA4dLSpYv62Y5zK0knrIqNKBoWnEeU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gawd/default.nix b/pkgs/development/python-modules/gawd/default.nix new file mode 100644 index 0000000000000..c5a8eb964067b --- /dev/null +++ b/pkgs/development/python-modules/gawd/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, ruamel-yaml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gawd"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pooya-rostami"; + repo = "gawd"; + rev = version; + hash = "sha256-DCcU7vO5VApRsO+ljVs827TrHIfe3R+1/2wgBEcp1+c="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + ruamel-yaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "gawd" ]; + + meta = { + changelog = "https://github.com/pooya-rostami/gawd/releases/tag/${version}"; + description = "Gawd is a Python library and command-line tool for computing syntactic differences between two GitHub Actions workflow files"; + homepage = "https://github.com/pooya-rostami/gawd"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix index a623a21eb8c49..d7a906af82b88 100644 --- a/pkgs/development/python-modules/gekko/default.nix +++ b/pkgs/development/python-modules/gekko/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { pname = "gekko"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WNyEdJXBXfhrD1LywBBJ3Ehk+CnUS8VYbJFK8mpKV20="; + hash = "sha256-MXoxrejg+QJgajFv8DgZw44NeJuTHNBBK/lsWgmymJY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index bb4eb7ca664ef..7920c53b8f577 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.14.4"; + version = "0.14.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; rev = "refs/tags/${version}"; - hash = "sha256-zMd/hHobFBPre0bZA1e2S9gPWnIkeImZhSySlIDxYsg="; + hash = "sha256-s3+w6LtewjR725O8ENl7jRer979fRZDqsnbAYJOWcIY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index 15002c77f7bb3..5c3b095a2c3f2 100644 --- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -1,26 +1,33 @@ { lib , buildPythonPackage +, dateparser , fetchFromGitHub , georss-client , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.6"; - format = "setuptools"; + version = "0.8"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; rev = "refs/tags/v${version}"; - hash = "sha256-OLX6Megl5l8KDnd/G16QJ/wQn5AQc2cZ+LCbjuHFbwo="; + hash = "sha256-geIxF4GumxRoetJ6mIZCzI3pAvWjJJoY66aQYd2Mzik="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + dateparser georss-client ]; diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix index a85302544d09a..6e346b402c723 100644 --- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix +++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix @@ -4,22 +4,27 @@ , georss-client , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "georss-qld-bushfire-alert-client"; - version = "0.6"; - format = "setuptools"; + version = "0.7"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-qld-bushfire-alert-client"; - rev = "v${version}"; - hash = "sha256-7KVR0hdLwyCj7MYJoRvQ6wTeJQAmCUarYxJXEFaN8Pc="; + rev = "refs/tags/v${version}"; + hash = "sha256-ajCw1m7Qm1kZE/hOsBzFXPWAxl/pFD8pOOQo6qvachE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ georss-client ]; @@ -35,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing Queensland Bushfire Alert feed"; homepage = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client"; + changelog = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index 667206fa58ead..16b4d2d21cfc1 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.6.5"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - hash = "sha256-mh2l63Nt9YMCPM3AplKWPx5HQZi2/cm+dUS56JB8fGA="; + hash = "sha256-9SNq8jKzgzFzonyMYoyjGbz4NDL83dPKWID9m3HZ7B8="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index a94b33e9b4448..7b58f851acdcf 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.5.2"; + version = "0.5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-njzyaFPXTRvZmWfB0uYufMNqhTBBN7fkKtS7bUyA8ME="; + hash = "sha256-XBhXXrzbIiKoFPew/UdUD673AUPb96rm9LudyVcY3H8="; }; propagatedBuildInputs = [ 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 b6f73cc406ebc..fa7086b7719d6 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,16 +13,20 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.109.0"; - format = "setuptools"; + version = "2.120.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0GOQwlR3w2HVJjn+AO+RLD+rja/H+/KVgMEUTpJSOnk="; + hash = "sha256-oMh2nK2VdnaLyzGRyx9VD2qzKQy6BCutsPsXu6A/cMw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-auth google-auth-httplib2 @@ -30,7 +34,6 @@ buildPythonPackage rec { httplib2 uritemplate oauth2client - setuptools ]; # No tests included in archive diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 2754c32c3c973..d9f5f38c36ece 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.4.1"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mQXHwww8K77dCxMuKycfyCRzM+vJMdLSOvG7vRG0Nf4="; + hash = "sha256-+1BOYZn+jehbqp0xzs9ndod4Uf5Yhn3mAzF+x8xzmYc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 71075ad7f60d1..07e965918652c 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -1,27 +1,38 @@ { buildPythonPackage , fetchPypi , google-api-core +, google-auth , grpc-google-iam-v1 , lib +, proto-plus +, protobuf , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.11.1"; - format = "setuptools"; + version = "1.11.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EjwBVYq7V39ab/VQEmysfiuwEbMkjCXq5o+jM31NrwI="; + hash = "sha256-wsSeFbtZHWXeoiyC2lUUjFE09xkZuu+OtNNb4dHLIM0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core + google-auth grpc-google-iam-v1 + proto-plus + protobuf ] ++ google-api-core.optional-dependencies.grpc; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index ab2ae150eb3de..9adf04e4344f5 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.24.1"; + version = "3.25.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aNTCDqj/0/qm4gwZrIKrn2yhgKshv1XwGlHd4zhzMgI="; + hash = "sha256-JiPKFOew9Pd2NuY7wDlFQ/N06m9IRutWO+d/YJspry0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 0cb6f8350dd4c..34b49c9b19990 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.13.1"; + version = "2.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AhZ5KdSpxJS8jHfwJfLztMtyGZOnCwhb/lalrPZ9jog="; + hash = "sha256-iRqQgurt6xe8W7ck/BULdwLGhNdCD58irj98X8YRxxo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 50346213b2533..ce3ddc189ada3 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.14.1"; + version = "3.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v9gBSb9TYvaqF1/g7dJshSkJ2RlCAWXGdf7yPlne0I4="; + hash = "sha256-2A0v6UBFHeP0fsU71e22Aau7HfQYnN4fo4bYD3G+p2I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 85e60259a6c59..da43db7a3cc44 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.4.1"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HryKL26J6H2xW/EEPVceWd0ZATP7QAuolU77sw3QrWM="; + hash = "sha256-7RqwaSthQcwGebhi5F/V//WxBIp5upVS0ToDDsjyURY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index b59372f294a03..0a7c67ec7aa72 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.17.1"; + version = "3.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CuB7kNUFK6OilqIhCiFEwoRpMA1x9vRViB+Uwt9UMFc="; + hash = "sha256-dPD8bwupR3+AjSWSTcigUsVffKkQZOg+FtPuX7fKd6s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index ffe81f753aa74..e3f504e500931 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.16.1"; + version = "1.18.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P/A08nd3ZP4GsySd3Q6TM+kuXRabcnnI1aFd+svMz5E="; + hash = "sha256-QSI3GDh36yg4qm4Izaps8X85lFGhZuOpqjOuiUzBWh0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 014d68c191688..c30f659da4b97 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.40.0"; + version = "2.43.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4yTrV0OtvCmd9+5rNaTOJBAS/s52hyjwA7O1/lLyFtE="; + hash = "sha256-RfGhQv1wr5fMMHleMamwSKQ2opv3nppGSvUe4UdFiT0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 018eb4a26cb46..17f57f9430999 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.18.1"; + version = "3.18.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xjf6yWXgfJFEHw1lYSryfe86UMsM1Y4fGRffDTne20U="; + hash = "sha256-d4MTAZgseV5iI83A7lSkbe/SEgX9ZfQ0pLHfYBStfp4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index b481bff3f750d..6e22cb60c2672 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.9.1"; + version = "5.9.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qDc6E6d6hIHgRBNDGUHaJ7ROP24xDUXK1rkXTX187g0="; + hash = "sha256-l9ZHiR5/TNJfa4Oa5XzTVYCd8so5ZlPtJK9itO8C9BI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 90e28d3e65a18..f3895b8e3ef17 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.15.1"; + version = "3.16.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kZjw+TBXVX5O/OufGN/Y/J0NDX30RiqFqwndnGkUjBE="; + hash = "sha256-DWmh96XviHVsmeVrivTDnq5A0hBog/DieUxcs2QmltU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 81de0310b126e..8f987bf238c03 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.14.0"; + version = "2.15.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mr+3U+s89wB2uc/whvcdOYwJfAsbD9ll1a8n1a5K5AE="; + hash = "sha256-WJzknGuNcxWiSDJ+ShJKRBQ/WlMU6naPfIUWYMIeYyE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 1a3c2c96b44f4..bea85e0283890 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.3.1"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4O62hAl6uRz74up/AIwq22VSDQDlTwmm8ywKAik4QrQ="; + hash = "sha256-99YYGGrI8zg+cwdVKqFVneL0jTzO7GJq91O/Kk0lGJM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 32949b14c332c..deab86952e76f 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.19.2"; - format = "setuptools"; + version = "2.21.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F6UDRZLoXvADHSW75YlL2y1xlGCFWYC/62iqTo/8Er0="; + hash = "sha256-8GrZ38gBVE+6EYN4i5ZPawF0g6Zgkapoa1Gr0HSAbIQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core @@ -36,9 +41,11 @@ buildPythonPackage rec { pytestCheckHook ]; - # Disable tests that need credentials disabledTests = [ + # Disable tests that need credentials "test_list_global_key_rings" + # Tests require PROJECT_ID + "test_list_ekm_connections" ]; pythonImportsCheck = [ @@ -48,8 +55,8 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Key Management Service (KMS) API API client library"; - homepage = "https://github.com/googleapis/python-kms"; - changelog = "https://github.com/googleapis/python-kms/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-kms-v${version}/packages/google-cloud-kms/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 66b032e856c39..98f4355facbd6 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.13.1"; + version = "2.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8ZU9aJPTXNQ9CLK1UgwWWnAOSt584lyiKEAXiQsOWhU="; + hash = "sha256-Vp01Jgr5Bt4luOKna2Nk4FgJuEU6/Ynac41KT8uQhG8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 9fecd41cec589..f230ac19194bc 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.19.1"; + version = "2.19.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P4vdD1zCDzDn0ydEXCw2C/aEFnJYR13knOM91eDFcZw="; + hash = "sha256-N2QeU3mG/SIn+HOLh51gWozfTDFc3GDobhCTR6scodc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix new file mode 100644 index 0000000000000..902593045eb46 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-netapp"; + version = "0.3.8"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-va5Ql8GPMLszgjjSkI6am6IGQnEqvi+YSBcTFeu254U="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + google-auth + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.cloud.netapp" + "google.cloud.netapp_v1" + ]; + + meta = with lib; { + description = "Python Client for NetApp API"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-netapp"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-v${version}/packages/google-cloud-netapp/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 7d67e77c4c975..7abcde5174c0c 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.17.1"; + version = "1.17.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0DXo2h2gqO1z5quUyWI1Qb/CNaqyy1SNinyaPyRWuR0="; + hash = "sha256-oKOqWVmAP14dKpbVDlcX2KSRceTqVES/UGlLsYtnWHA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index c9be11ab058f5..5c4ce89104c2a 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -12,20 +12,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.19.4"; - format = "setuptools"; + version = "2.20.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pfkoBZjwxKWBm7YwpQxF3IrNoMlK/srgoYNovMv6JlE="; + hash = "sha256-ttBvGCeWgnPEK1egn2QkYmSclQTcD4dW+Zdw9OPnVa0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 351acb6181011..588a156d745dc 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.15.1"; + version = "2.15.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RTDYMmkRjkP5VhN74Adlvm/vpqXd9lnu3ckjmItIi+Y="; + hash = "sha256-5qIx5FEHA4z+SY360fba0sp73KOpMTI3ML4Dq3oACo8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 56f4b5018ebe1..299f2f1f3a804 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.12.1"; + version = "1.12.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JbMRLJhO9qJWnKcEcWCyNBxSjHDh0uct65loaqLhZ90="; + hash = "sha256-gJhRgkEZg05PIxCyxPOGIcHRayuxTVufEy5px501Xn8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 32304fad221f0..69009eb546781 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.18.1"; + version = "2.18.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MQVV88jLl39KRtRFTsosg/7WoJ88SzW4T2+h+P71UCQ="; + hash = "sha256-HbL0CTJFNuNPmFCB04njl0yjo2aN94RcrQvgOrjA+n0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 1e0c86b61a739..a553d67e06703 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.26.1"; + version = "1.29.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oZWY7n/8638/WkIG9s/9LN4NKWSfhnrQp+9Pydq103E="; + hash = "sha256-4c7tuLxO3+B8ZojVpSKWcl35doqoqHrofY6n80t9UrY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix new file mode 100644 index 0000000000000..e2dd38444b563 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-shell/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-shell"; + version = "1.9.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-33TZcRsOWP8PBAXFHy9DQn20bVECwD2wv7hcaYl0E8Y="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + google-auth + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.cloud.shell" + "google.cloud.shell_v1" + ]; + + meta = with lib; { + description = "Python Client for Cloud Shell"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-shell"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-shell-v${version}/packages/google-cloud-shell/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 69cc1914c5ab6..27794f0cc9585 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.42.0"; + version = "3.43.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E7arqGBZ/QPzbAMsQUMnTWiD054tMr91PgrT0tzQjhI="; + hash = "sha256-BmLpX+MUZ0o7iy+jwZ6B5UTZT1hMppZbmMlQg6iGQiI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 016b569492bfc..1fc4624e85091 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.24.1"; + version = "2.25.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aPW5m1cZNXpbiWCUQs104QH+/rVueanW0yE5TCdgWoQ="; + hash = "sha256-W3RwqUn1p3xAURw2ZKwzn+CkcESC+bazorpVS30rLNw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 525af0451f1c0..b999d28147f83 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.14.0"; + version = "2.15.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LSP89ZtV57RTNnKcFIuxxGRGjGnV77ruMPcgHdkOuX4="; + hash = "sha256-dWCjxIoD1mxVPcVSFdNYg8aA/gq0TCOqSDKADMyFXHQ="; }; nativeBuildInputs = [ @@ -72,6 +72,7 @@ buildPythonPackage rec { "test_open" "test_anonymous_client_access_to_public_bucket" "test_ctor_w_custom_endpoint_use_auth" + "test_ctor_w_api_endpoint_override" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index bc6cf42b27c7e..a76e4e50f7f00 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.16.0"; + version = "2.16.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oybkbzeqE4sW6RN5P7AFJV3rahTCykwJndQ8uAmhiCE="; + hash = "sha256-2JH+cAbbTWEig4qm3krKbgB3urIk7crmhGZq4+MDxF8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index f65f1de888065..76b0c2a1f269c 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -8,20 +8,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.16.1"; - format = "setuptools"; + version = "2.16.3"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8Mgf83pd3FFokpnb1g8DDthVBBY+hvBMmjdf2fpQswQ="; + hash = "sha256-+rwxUDLRN9oHELtMJoc00zYhLY+oMWsjsnfdOoTOchw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index bca3d89819f03..4a276b5f05a72 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.13.1"; + version = "1.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KJpHnWbmrFVcixfvKQ/nvDWLy4Sn1lVDVsjkS/2+p5w="; + hash = "sha256-NqwuM94NsBf/0vY9jWTct1vpETzPpN5JYvRzfv1srIA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index bc5ab67b018c1..2eb65c2a61a23 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -10,20 +10,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.12.1"; - format = "setuptools"; + version = "3.15.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zhy4h5qjxjovclo+po+QGZvTVMlcoWnMLoOlEFmH0p4="; + hash = "sha256-7Vh6HmDPhHw7Gt1rKCVuLRci+nOkKFM09excqTPmFvI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core google-cloud-core @@ -34,8 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ google-cloud-testutils mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; preCheck = '' @@ -50,6 +55,11 @@ buildPythonPackage rec { "google.cloud.translate_v3beta1" ]; + disabledTests = [ + # Tests require PROJECT_ID + "test_list_glossaries" + ]; + meta = with lib; { description = "Google Cloud Translation API client library"; homepage = "https://github.com/googleapis/python-translate"; diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index b020e1201fcd4..d7d39587fe5a0 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.13.1"; + version = "2.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nZQVoV6ciXHZfbr26U4PKFU/sHJPoZNB5j7covnE9aw="; + hash = "sha256-FGByHYEgZhxHfAGvDt09sDhFhX9SFGpKOfFrSs+zb20="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index ea56c08b30578..a771cba345074 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.7.0"; + version = "3.7.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uHIhWpihTxcV28zv3OZrGf4mj26aBaR2isycRMtMeNM="; + hash = "sha256-BEMwrWGMgQMz/yKWzSf/0UXySWONGzWycN5rRgsA6NI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix new file mode 100644 index 0000000000000..0c6bbf6ace671 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-vpc-access"; + version = "1.10.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-mkDYB4HFJEu1ZRKo58s5a9lZjQ0pUs6nOBMnm27ajeM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + google-auth + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.cloud.vpcaccess" + "google.cloud.vpcaccess_v1" + ]; + + meta = with lib; { + description = "Python Client for Virtual Private Cloud"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-vpc-access"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-vpc-access-v${version}/packages/google-cloud-vpc-access/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix new file mode 100644 index 0000000000000..8457ab9180d03 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-webrisk"; + version = "1.14.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VrfIVy3qGEMfFUiJ27zZPjBaWIPZX/qraga/+FfJol4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + google-auth + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.cloud.webrisk" + "google.cloud.webrisk_v1" + "google.cloud.webrisk_v1beta1" + ]; + + meta = with lib; { + description = "Python Client for Web Risk"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-webrisk"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-webrisk-v${version}/packages/google-cloud-webrisk/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 1f9b27f06f285..4703ba3aadb0e 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.14.1"; + version = "1.14.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+RupyR6W5fYR1n28anASGIXI6J53CU4WG1QC+HIZi/Y="; + hash = "sha256-Wp88cJqlAaAkaemHzkgKuhU4v4dFpgn5Sf+uqGKTeWQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix new file mode 100644 index 0000000000000..bc54419923f33 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-workflows"; + version = "1.14.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-IUC5f3gDe5Z9QYVXaIZ3L+F7530q6ZltIHozTtWnf/4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.workflows" + "google.cloud.workflows_v1" + "google.cloud.workflows_v1beta" + ]; + + meta = with lib; { + description = "Python Client for Cloud Workflows"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-workflows"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-workflows-v${version}/packages/google-cloud-workflows/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix new file mode 100644 index 0000000000000..1341eae06f2aa --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, grpc-google-iam-v1 +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-workstations"; + version = "0.5.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-K6Qq243bX3waymyGcirLAANqmP0UAUgFS3kidwCFYBE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + google-auth + grpc-google-iam-v1 + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.cloud.workstations" + "google.cloud.workstations_v1" + "google.cloud.workstations_v1beta" + ]; + + meta = with lib; { + description = "Python Client for Cloud Workstations"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-workstations"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-workstations-v${version}/packages/google-cloud-workstations/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/gpiozero/default.nix b/pkgs/development/python-modules/gpiozero/default.nix index 929ce0e24f5b5..3aaa5ba775067 100644 --- a/pkgs/development/python-modules/gpiozero/default.nix +++ b/pkgs/development/python-modules/gpiozero/default.nix @@ -1,17 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder + +# build-system +, setuptools + +# docs , sphinx-rtd-theme , sphinxHook + +# dependencies , colorzero -, pythonOlder + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "gpiozero"; - version = "2.0"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +28,7 @@ buildPythonPackage rec { owner = "gpiozero"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6qSB9RMypNXNj+Ds1nyzB7iaeHXvF0swSubrJSn2L34="; + hash = "sha256-ifdCFcMH6SrhKQK/TJJ5lJafSfAUzd6ZT5ANUzJGwxI="; }; postPatch = '' @@ -33,6 +42,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ + setuptools sphinx-rtd-theme sphinxHook ]; diff --git a/pkgs/development/python-modules/gpuctypes/0001-fix-dlopen-cuda.patch b/pkgs/development/python-modules/gpuctypes/0001-fix-dlopen-cuda.patch new file mode 100644 index 0000000000000..bc9f6c7ec64b9 --- /dev/null +++ b/pkgs/development/python-modules/gpuctypes/0001-fix-dlopen-cuda.patch @@ -0,0 +1,44 @@ +From d448321436e8314d3e2a6a09d4017c4bc10f612d Mon Sep 17 00:00:00 2001 +From: Gaetan Lepage <gaetan@glepage.com> +Date: Sat, 17 Feb 2024 17:37:22 +0100 +Subject: [PATCH] fix-dlopen-cuda + +--- + gpuctypes/cuda.py | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/gpuctypes/cuda.py b/gpuctypes/cuda.py +index acba81c..091f7f7 100644 +--- a/gpuctypes/cuda.py ++++ b/gpuctypes/cuda.py +@@ -143,9 +143,25 @@ def char_pointer_cast(string, encoding='utf-8'): + + + ++NAME_TO_PATHS = { ++ "libcuda.so": ["@driverLink@/lib/libcuda.so"], ++ "libnvrtc.so": ["@libnvrtc@"], ++} ++def _try_dlopen(name): ++ try: ++ return ctypes.CDLL(name) ++ except OSError: ++ pass ++ for candidate in NAME_TO_PATHS.get(name, []): ++ try: ++ return ctypes.CDLL(candidate) ++ except OSError: ++ pass ++ raise RuntimeError(f"{name} not found") ++ + _libraries = {} +-_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda')) +-_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) ++_libraries['libcuda.so'] = _try_dlopen('libcuda.so') ++_libraries['libnvrtc.so'] = _try_dlopen('libnvrtc.so') + + + cuuint32_t = ctypes.c_uint32 +-- +2.43.0 + diff --git a/pkgs/development/python-modules/gpuctypes/default.nix b/pkgs/development/python-modules/gpuctypes/default.nix new file mode 100644 index 0000000000000..e5987f78ee07e --- /dev/null +++ b/pkgs/development/python-modules/gpuctypes/default.nix @@ -0,0 +1,127 @@ +{ lib +, config +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, addDriverRunpath +, cudaSupport ? config.cudaSupport +, rocmSupport ? config.rocmSupport +, cudaPackages +, setuptools +, ocl-icd +, rocmPackages +, pytestCheckHook +, gpuctypes +, testCudaRuntime ? false +, testOpenclRuntime ? false +, testRocmRuntime ? false +}: +assert testCudaRuntime -> cudaSupport; +assert testRocmRuntime -> rocmSupport; + +buildPythonPackage rec { + pname = "gpuctypes"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + repo = "gpuctypes"; + owner = "tinygrad"; + rev = "refs/tags/${version}"; + hash = "sha256-xUMvMBK1UhZaMZfik0Ia6+siyZGpCkBV+LTnQvzt/rw="; + }; + + patches = [ + (substituteAll { + src = ./0001-fix-dlopen-cuda.patch; + inherit (addDriverRunpath) driverLink; + libnvrtc = + if cudaSupport + then "${lib.getLib cudaPackages.cuda_nvrtc}/lib/libnvrtc.so" + else "Please import nixpkgs with `config.cudaSupport = true`"; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + postPatch = '' + substituteInPlace gpuctypes/opencl.py \ + --replace "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'" + '' + # hipGetDevicePropertiesR0600 is a symbol from rocm-6. We are currently at rocm-5. + # We are not sure that this works. Remove when rocm gets updated to version 6. + + lib.optionalString rocmSupport '' + substituteInPlace gpuctypes/hip.py \ + --replace "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \ + --replace "/opt/rocm/lib/libhiprtc.so" "${rocmPackages.clr}/lib/libhiprtc.so" \ + --replace "hipGetDevicePropertiesR0600" "hipGetDeviceProperties" + + substituteInPlace gpuctypes/comgr.py \ + --replace "/opt/rocm/lib/libamd_comgr.so" "${rocmPackages.rocm-comgr}/lib/libamd_comgr.so" + ''; + + pythonImportsCheck = [ "gpuctypes" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = lib.optionals (!testOpenclRuntime) [ + "test/test_opencl.py" + ] ++ lib.optionals (!rocmSupport) [ + "test/test_hip.py" + ] ++ lib.optionals (!cudaSupport) [ + "test/test_cuda.py" + ]; + + # Require GPU access to run (not available in the sandbox) + pytestFlagsArray = lib.optionals (!testCudaRuntime) [ + "-k" "'not TestCUDADevice'" + ] ++ lib.optionals (!testRocmRuntime) [ + "-k" "'not TestHIPDevice'" + ] ++ lib.optionals (testCudaRuntime || testOpenclRuntime || testRocmRuntime) [ + "-v" + ]; + + # Running these tests requires special configuration on the builder. + # e.g. https://github.com/NixOS/nixpkgs/pull/256230 implements a nix + # pre-build hook which exposes the devices and the drivers in the sandbox + # based on requiredSystemFeatures: + requiredSystemFeatures = lib.optionals testCudaRuntime [ + "cuda" + ] ++ lib.optionals testOpenclRuntime [ + "opencl" + ] ++ lib.optionals testRocmRuntime [ + "rocm" + ]; + + passthru.gpuChecks = { + cuda = gpuctypes.override { + cudaSupport = true; + testCudaRuntime = true; + }; + opencl = gpuctypes.override { + testOpenclRuntime = true; + }; + rocm = gpuctypes.override { + rocmSupport = true; + testRocmRuntime = true; + }; + }; + + preCheck = lib.optionalString (cudaSupport && !testCudaRuntime) '' + addToSearchPath LD_LIBRARY_PATH ${lib.getLib cudaPackages.cuda_cudart}/lib/stubs + ''; + + # If neither rocmSupport or cudaSupport is enabled, no tests are selected + dontUsePytestCheck = !(rocmSupport || cudaSupport) && (!testOpenclRuntime); + + meta = with lib; { + description = "Ctypes wrappers for HIP, CUDA, and OpenCL"; + homepage = "https://github.com/tinygrad/gpuctypes"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage matthewcroughan wozeparrot ]; + }; +} diff --git a/pkgs/development/python-modules/gpuctypes/fix-dlopen-cuda.patch b/pkgs/development/python-modules/gpuctypes/fix-dlopen-cuda.patch new file mode 100644 index 0000000000000..8d3b69e35e110 --- /dev/null +++ b/pkgs/development/python-modules/gpuctypes/fix-dlopen-cuda.patch @@ -0,0 +1,32 @@ +diff --git a/gpuctypes/cuda.py b/gpuctypes/cuda.py +index acba81c..aac5fc7 100644 +--- a/gpuctypes/cuda.py ++++ b/gpuctypes/cuda.py +@@ -143,9 +143,25 @@ def char_pointer_cast(string, encoding='utf-8'): + + + ++NAME_TO_PATHS = { ++ "libcuda.so": ["@driverLink@/lib/libcuda.so"], ++ "libnvrtc.so": ["@libnvrtc@"], ++} ++def _try_dlopen(name): ++ try: ++ return ctypes.CDLL(name) ++ except OSError: ++ pass ++ for candidate in NAME_TO_PATHS.get(name, []): ++ try: ++ return ctypes.CDLL(candidate) ++ except OSError: ++ pass ++ raise RuntimeError(f"{name} not found") ++ + _libraries = {} +-_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda')) +-_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) ++_libraries['libcuda.so'] = _try_dlopen('libcuda.so') ++_libraries['libnvrtc.so'] = _try_dlopen('libnvrtc.so') + + + cuuint32_t = ctypes.c_uint32 diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 1d7223e6a2485..8ad76a907581b 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "0.7.3"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,10 +36,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; - #rev = "refs/tags/v${gradio.version}"; - rev = "dc131b64f05062447643217819ca630e483a11df"; # v4.9.1 is not tagged... + rev = "refs/tags/gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-Zp1Zl53Va0pyyZEHDUpnldi4dtH2uss7PZQD+Le8+cA="; + hash = "sha256-cRsYqNMmzuybJI823lpUOmNcTdcTO8dJkp3cpjATZQU="; }; prePatch = '' cd client/python diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index bead2da9dfd79..c87c41631291c 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.9.1"; + version = "4.19.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -66,7 +66,7 @@ buildPythonPackage rec { # and upstream has stopped tagging releases since 3.41.0 src = fetchPypi { inherit pname version; - hash = "sha256-KosxlmU5pYvuy5zysscuWM25IGXin7RLGEM9V2xPQrU="; + hash = "sha256-b+WBW7Tfru0fx0Ijv/2R2nChtGMVivjF4D0BuwkGih0="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -81,6 +81,12 @@ buildPythonPackage rec { "tomlkit" ]; + pythonRemoveDeps = [ + # our package is presented as a binary, not a python lib - and + # this isn't a real runtime dependency + "ruff" + ]; + nativeBuildInputs = [ pythonRelaxDepsHook hatchling @@ -164,6 +170,9 @@ buildPythonPackage rec { # shap is too often broken in nixpkgs "test_shapley_text" + + # fails without network + "test_download_if_url_correct_parse" ]; disabledTestPaths = [ # 100% touches network @@ -193,7 +202,6 @@ buildPythonPackage rec { gradio-pdf = null; })).overridePythonAttrs (old: { pname = old.pname + "-sans-client"; - nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pythonRelaxDepsHook ]; pythonRemoveDeps = (old.pythonRemoveDeps or []) ++ [ "gradio-client" ]; doInstallCheck = false; doCheck = false; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 8f145c13e7220..8a5286c656091 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , fetchpatch , substituteAll -, graphviz +, graphviz-nox , xdg-utils , makeFontsConf , freefont_ttf @@ -34,7 +34,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./paths.patch; - inherit graphviz; + graphviz = graphviz-nox; xdgutils = xdg-utils; }) # https://github.com/xflr6/graphviz/issues/209 diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix index ada5f4096216e..2f328434c0677 100644 --- a/pkgs/development/python-modules/greynoise/default.nix +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "greynoise"; - version = "2.0.1"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GreyNoise-Intelligence"; repo = "pygreynoise"; - rev = "v${version}"; - hash = "sha256-zevom7JqXnZuotXfGtfPOmQNh32dANS4Uc6tHUuq08s="; + rev = "refs/tags/v${version}"; + hash = "sha256-bMQfGkCjMBimNaYzSi78GaLiDiLdmxMB8RfFCVTxD5U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index d3e9ca2ae7f4d..be71df310f9d8 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.40.1"; - format = "pyproject"; + version = "0.42.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mkdocstrings"; - repo = pname; + repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-DaLxGEwR2Z9IEkKbLkOy7Q3dvvmwTNBNMzYxNoeZMJE="; + hash = "sha256-gleVVwi2exSHz+u8zHhH3nF1duz7qDOpiZBm228ZsSs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index e94278fec3104..98f550a047f68 100644 --- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -1,19 +1,22 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools -, grpcio +, fetchFromGitHub , googleapis-common-protos +, grpcio +, pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "grpc-google-iam-v1"; - version = "0.12.7"; + version = "0.13.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-AJGXp/HqqiIUnJbl4FSsWTS6ckGXTpJmPY01KKISA9E="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-grpc-google-iam-v1"; + rev = "refs/tags/v${version}"; + hash = "sha256-pmwHDzOaXrgqXZiaxIn01CtiAG+XRBGr8BgzbG/F1uw="; }; nativeBuildInputs = [ @@ -25,17 +28,24 @@ buildPythonPackage rec { googleapis-common-protos ]; - # no tests run - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "google.iam" "google.iam.v1" ]; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + meta = with lib; { description = "GRPC library for the google-iam-v1 service"; - homepage = "https://github.com/googleapis/googleapis"; + homepage = "https://github.com/googleapis/python-grpc-google-iam-v1"; + changelog = "https://github.com/googleapis/python-grpc-google-iam-v1/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 522bf49fafd9c..ba66ffe4e3440 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.60.1"; + version = "1.62.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-eAYWHTlyThrJ9vTumXPDeEcyk5OC8tfI12K073heF6A="; + hash = "sha256-e+8XBt/tt4lNbgNGemBjrBCxUAR7aWXi+0gU1MKmQkU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index 7873404d65146..dbadab9432191 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.60.1"; + version = "1.62.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-fC5Izp1b2xmtV7er40ONR+verVB4ZpORQHILPijGJbM="; + hash = "sha256-nlYYCpQbHTKgd9dJHgYR0Eg8OWNYr9U0m/ABUmEuRYM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 713fec8af4cdf..799a805ba564a 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.60.1"; + version = "1.62.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-v+1JYUE4IcEbTfECyesFWsjENUYm2dyxEKJz79TPfZg="; + hash = "sha256-q9RTABmRhxAxMV7y2Cr/6TCAwEM/o6AHvjS/Qn4oqIo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index fa3f65ebc9248..eb91900864cae 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.60.1"; + version = "1.62.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YbWquJiUmOiqFCwguIgp6l2Q0YwYyFO5+ebUB9N7+LQ="; + hash = "sha256-DWk+nAmIDa6qwGDQw9uhrkcKQ8meXSDf6v1iz34IqF0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 2fc0e47dd29c8..c5cdf76a5ef67 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -5,25 +5,30 @@ , protobuf , pythonOlder , pythonRelaxDepsHook +, setuptools }: buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.60.1"; - format = "setuptools"; + version = "1.62.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vvrZX0fes/OTTr1VEpl0jqo/Y+44btlq1pemZFNWixc="; + hash = "sha256-yyaVEAqykAtRz9vbVv4SEA1JWA8QrgZ6LKsRfo/HRu0="; }; postPatch = '' substituteInPlace setup.py \ - --replace '"grpcio>={version}".format(version=grpc_version.VERSION)' '"grpcio"' + --replace-fail '"grpcio>={version}".format(version=grpc_version.VERSION)' '"grpcio"' ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ grpcio protobuf diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 0437e16a89236..62eae894a2670 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.60.1"; + version = "1.62.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-2ggiSrhnXG1GS5iL2MoCzM0r8Cdbzu/o9iGb/UpPXoU="; + hash = "sha256-f8puz7vwVJBYuyncxuQ12IW4eNB3Aed6xY4eH1kXNtw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 497a4d725e500..934ac1077ce4f 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "grpcio"; format = "setuptools"; - version = "1.60.1"; + version = "1.62.0"; src = fetchPypi { inherit pname version; - hash = "sha256-3R06jR0uUK2bWeEKp/B8fRvis2fz8tM8X63pbtVGCWI="; + hash = "sha256-dISWr5I4rHjc2YzOZUIfGtzijDl5OT42CWg/zX84gNc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 03062ea264be9..7b557a605a5b7 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.22.8"; + version = "1.22.9"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-1cuPFEBUoqEQ5mcr1RLksV1bG42YecGSuXI1Ne+3C48="; + hash = "sha256-P51cb/79omhwN0S1kqazmDqmcjJzsSIOy8tiwqWAAAk="; }; # Python 2.x is not supported. diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix index a8d382310d605..732a107f2a399 100644 --- a/pkgs/development/python-modules/guidance/default.nix +++ b/pkgs/development/python-modules/guidance/default.nix @@ -8,22 +8,24 @@ , wheel , aiohttp , diskcache +, fastapi , gptcache , msal -, nest-asyncio , numpy , openai , ordered-set , platformdirs +, protobuf , pyformlang , requests , tiktoken , torch +, uvicorn }: buildPythonPackage rec { pname = "guidance"; - version = "0.1.6"; + version = "0.1.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,28 +34,33 @@ buildPythonPackage rec { owner = "guidance-ai"; repo = "guidance"; rev = "refs/tags/${version}"; - hash = "sha256-Z3EuHAQPPXf/i0HnbDhGv5KBUBP0aZDHTwpff7g2E3g="; + hash = "sha256-dvIJeSur3DdNBhrEPNPghxqmDEEig59Iz83LWksim6U="; }; nativeBuildInputs = [ pybind11 + ]; + + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp diskcache + fastapi gptcache msal - nest-asyncio numpy openai ordered-set platformdirs + protobuf pyformlang requests tiktoken + uvicorn ]; nativeCheckInputs = [ @@ -86,6 +93,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "guidance" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A guidance language for controlling large language models"; homepage = "https://github.com/guidance-ai/guidance"; diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index cd6a4bfcd25b0..59d0da14b17dc 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "24.1.0"; + version = "24.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "gvm-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-4uYOhsnprYybt5EB/b4LW8/9cn0Nahc1lYQ+DwPNlOU="; + hash = "sha256-LLXMdT1q6IWsbsRjflpGN5pcjUCXWzdFK3gMw4mBm0U="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index f5413e5448432..64be91a04fd9c 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "h3"; - version = "3.7.6"; + version = "3.7.7"; format = "setuptools"; # pypi version does not include tests @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "uber"; repo = "h3-py"; rev = "refs/tags/v${version}"; - hash = "sha256-QNiuiHJ4IMxpi39iobPSSlYUUj5oxpxO4B2+HXVQ/Zk="; + hash = "sha256-wXQaSMXQI0f7zfyj37mubxdqGFv7vhHQd6rH08H57d4="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 0da05c75f2dbe..5a11243d594ed 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -3,20 +3,25 @@ , fetchPypi , pythonOlder , async-timeout +, setuptools }: buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "3.1.0"; - format = "setuptools"; + version = "3.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sheNYtmp1panthglpEqJTdaCgGBTUJRswikl5hu9k7s="; + hash = "sha256-FW8WlrhVL+ryupHAKii8fKBku/6uxdw1uLCKUszkP50="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ async-timeout ]; diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index 8450386c26772..51dcfdcc91c7e 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "habanero"; - version = "1.2.3"; + version = "1.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sckott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IQp85Cigs0in3X07a9d45nMC3X2tAkPzl5hFVhfr00o="; + hash = "sha256-Pw0TgXxDRmR565hdNGipfDZ7P32pxWkmPWfaYK0RaI4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix index 7462624b93d40..5e01610d69652 100644 --- a/pkgs/development/python-modules/habitipy/default.nix +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -5,7 +5,7 @@ , requests , setuptools , hypothesis -, nose +, pynose , responses }: @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - nose + pynose responses ]; diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index e37c6a6807422..e84fa94ae0c12 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.4.0"; + version = "2.4.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-bZtcvidjUhlb9ML1UIP00yqJ+KnJig5i0j/tAZSK7+Y="; + hash = "sha256-IoVXmq9ShwLpGtoxVOtoirSirJJ1DqBI/mP7PmK7OUs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 93a38ab9346cf..dae2aae43bf21 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.2.4"; + version = "2024.3.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-p1LUF57wH8zWCwPo4pYeOGRBEYCNUv8CnYBGNYzKCgE="; + hash = "sha256-/ulqUyplNu8YTHJKcfNPYzyzPvGkLFtoJDu5SqvfQrs="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index 1e1803c9061fa..86145ee03ab4d 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hg-git"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-btEamGLqCC5PRigxHbe49/bnJNVGm6Czf852JaAdB38="; + hash = "sha256-r04Q6zbt8VM1jYkoGOdJZqKPPxXy4jC1X1d9nJ+fEWY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 539caf7083d82..0ed4d2555673a 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.42"; + version = "0.44"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-oVuzX/H5jj/c4dbPGmXUnZeDbgSd9v9qP2dXe6+PaUQ="; + hash = "sha256-RwM4RtFIUSaM/e4kiHOMg97lZ4VknB1pOqGRuIe2ns8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 132d01fa355cd..74f7b2dd9debb 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.18.1"; + version = "1.18.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gFxzU65S6XdT5/BmiwUaCGQQ4tLBPI/ilOu0zdArIyQ="; + hash = "sha256-V44w6J1ydU+XqD6+CBmP7I6HzH5JslufMew5P5OcpQA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 44fb32e25c2d2..6ffdda58a6cee 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2024.1.0"; + version = "2024.2.1"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-4btkqAHbwAsyGV1LjngEoeTT5qyI8dtqFVTp0lIFwmg="; + hash = "sha256-QMsfs9gUWeaz1LfMZF5J2OFVCPnuckZvvF9x5bQ5uZY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 88ec84d88359d..b3d5a232c10a7 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -8,8 +8,8 @@ , autoPatchelfHook # runtime +, glib , libnl -, openssl_1_1 # propagates , aenum @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2024.1.0"; + version = "2024.2.1"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -37,11 +37,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-UiikZ2DVhTqX6WYfiE8sp2e52BMlyoQnDjLap/efmNc="; + hash = "sha256-gHnTuiyCD9A9Ru8xhniNEpCyn+W9zYnCAoTJeGOW7TI="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-/+gegUMd2n7MpJvdilS5VWefXc0tuRcLrXBBXSH35b0="; + hash = "sha256-gKZKcCXQ8PvZAPV2QRQl+u+r95CVLBDDDgtC0MT7xw4="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); in fetchPypi { @@ -59,8 +59,8 @@ buildPythonPackage rec { ]; buildInputs = [ + glib libnl - openssl_1_1 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index badfd107962d5..30ebd93208eab 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.2.1"; + version = "2024.3.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-e0PQpnzYWl8IMtLFdnYPMCBioriumc3vc1ExRjCYoc8="; + hash = "sha256-TlPZg1IbgOODbkgJHWI6dNdk3jsyL2L/3qhLtXvQjqI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index c859952214ef2..e1ecf2764e4f7 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "html-sanitizer"; - version = "2.3"; - format = "pyproject"; + version = "2.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "matthiask"; - repo = pname; + repo = "html-sanitizer"; rev = "refs/tags/${version}"; - hash = "sha256-lQ8E3hdHX0YR3HJUTz1pVBegLo4lhvyiylLVFMDY1+s="; + hash = "sha256-NWJLD70783Ie6efyCvGopxMIlP3rLz0uM/D1rLQwBXE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix index 83719397fda90..0f69315edb6d1 100644 --- a/pkgs/development/python-modules/http-ece/default.nix +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -1,20 +1,30 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder -, coverage, flake8, mock, nose, importlib-metadata -, cryptography }: +{ lib +, buildPythonPackage +, cryptography +, fetchPypi +, mock +, pynose +}: buildPythonPackage rec { - pname = "http_ece"; + pname = "http-ece"; version = "1.2.0"; src = fetchPypi { - inherit pname version; + pname = "http_ece"; + inherit version; sha256 = "sha256-tZIPjvuOG1+wJXE+Ozb9pUM2JiAQY0sm3B+Y+F0es94="; }; - propagatedBuildInputs = [ cryptography ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"nose",' "" \ + --replace-fail '"coverage",' "" + ''; - nativeCheckInputs = [ coverage flake8 mock nose ]; + propagatedBuildInputs = [ cryptography ]; + + nativeCheckInputs = [ mock pynose ]; meta = with lib; { description = "Encipher HTTP Messages"; diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix index bc3351feb3d84..b9ccede6714eb 100644 --- a/pkgs/development/python-modules/http-message-signatures/default.nix +++ b/pkgs/development/python-modules/http-message-signatures/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "http-message-signatures"; - version = "0.4.4"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyauth"; repo = pname; rev = "v${version}"; - hash = "sha256-acTziJM5H5Td+eG/LNrlNwgpVvFDyl/tf6//YuE1XZk="; + hash = "sha256-Jsivw4lNA/2oqsOGGx8D4gUPftzuys877A9RXyapnSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index d9fd192b7bd1b..212db973e9e0a 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { pname = "httpcore"; - version = "1.0.2"; - format = "pyproject"; + version = "1.0.4"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "encode"; repo = "httpcore"; rev = "refs/tags/${version}"; - hash = "sha256-gjAScRBzAuNiTSxspX6vzwTAdBIwVQbaSLEUFV1QP+E="; + hash = "sha256-DK5avYEtQcTFogpdEjw0NB4qkzDm5cZKPjAE8MC6Sng="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/httpx-auth/default.nix b/pkgs/development/python-modules/httpx-auth/default.nix index dc159c7b0ee46..a21e05a567efa 100644 --- a/pkgs/development/python-modules/httpx-auth/default.nix +++ b/pkgs/development/python-modules/httpx-auth/default.nix @@ -1,19 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, setuptools -, setuptools-scm -, wheel , httpx , pyjwt +, pytest-asyncio , pytest-httpx , pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +, time-machine }: buildPythonPackage rec { pname = "httpx-auth"; - version = "0.19.0"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,13 +23,12 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "httpx_auth"; rev = "refs/tags/v${version}"; - hash = "sha256-ptxM0gabr+NmfkXqYlWd+G0c0yClJawRNKjbtPKSGFY="; + hash = "sha256-tKEYFoIHxiBG18JWyCHzQEwUvrWk/zuCWqj1uYsmh84="; }; nativeBuildInputs = [ setuptools setuptools-scm - wheel ]; propagatedBuildInputs = [ @@ -37,11 +37,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pyjwt + pytest-asyncio pytest-httpx pytestCheckHook + time-machine ]; - pythonImportsCheck = [ "httpx_auth" ]; + pythonImportsCheck = [ + "httpx_auth" + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 1daf600f4d842..65dedd26c02fc 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -23,16 +23,16 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.8.1"; - format = "pyproject"; + version = "0.9.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "romis2012"; - repo = pname; + repo = "httpx-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-L2nyVADDjPrHwhZRm+RAvfBdpP9sIvc9cakDiLVA7xw="; + hash = "sha256-9v5DfxEtM7jq+b8wR0M1klTSnSdFjQ4aDl8ZSZWxbFA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 17ad769329c73..f206bebc4e1bf 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -1,7 +1,8 @@ { lib -, fetchFromGitHub , buildPythonPackage , pythonOlder +, fetchFromGitHub +, setuptools , filelock , fsspec , packaging @@ -13,8 +14,8 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.20.3"; - format = "setuptools"; + version = "0.21.4"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,9 +23,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-21Ay8RVS2vtQIh4bBUxE8jFk6F+yeFBJ3XgvRRNtNgI="; + hash = "sha256-SN0FDOuXvgDqxpK4RRRXQDTPG5/BV3DJsiEq2q5WvsY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ filelock fsspec @@ -47,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/huggingface_hub"; changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ kira-bruneau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/hurry-filesize/default.nix b/pkgs/development/python-modules/hurry-filesize/default.nix new file mode 100644 index 0000000000000..62bd1f810f9d5 --- /dev/null +++ b/pkgs/development/python-modules/hurry-filesize/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, pythonOlder + +, setuptools +}: + +buildPythonPackage rec { + pname = "hurry-filesize"; + version = "0.9"; + pyproject = true; + + disabled = pythonOlder "3.3"; + + src = fetchPypi { + pname = "hurry.filesize"; + inherit version; + hash = "sha256-9TaDKa2++GrM07yUkFIjQLt5JgRVromxpCwQ9jgBuaY="; + }; + + # project has no repo... + # fix implicit namespaces (PEP 420) warning + patches = [ ./use-pep-420-implicit-namespace-package.patch ]; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "hurry.filesize" ]; + + meta = with lib; { + description = "A simple Python library for human readable file sizes (or anything sized in bytes)"; + homepage = "https://pypi.org/project/hurry.filesize/"; + license = licenses.zpl21; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/hurry-filesize/use-pep-420-implicit-namespace-package.patch b/pkgs/development/python-modules/hurry-filesize/use-pep-420-implicit-namespace-package.patch new file mode 100644 index 0000000000000..788c603ac5303 --- /dev/null +++ b/pkgs/development/python-modules/hurry-filesize/use-pep-420-implicit-namespace-package.patch @@ -0,0 +1,24 @@ +diff --git a/setup.py b/setup.py +index 9ec6f2e..607b680 100644 +--- a/setup.py ++++ b/setup.py +@@ -29,7 +29,6 @@ setup( + license='ZPL 2.1', + packages=find_packages('src'), + package_dir= {'':'src'}, +- namespace_packages=['hurry'], + include_package_data=True, + zip_safe=False, + install_requires=[ +diff --git a/src/hurry/__init__.py b/src/hurry/__init__.py +index 2e2033b..e69de29 100644 +--- a/src/hurry/__init__.py ++++ b/src/hurry/__init__.py +@@ -1,7 +0,0 @@ +-# this is a namespace package +-try: +- import pkg_resources +- pkg_resources.declare_namespace(__name__) +-except ImportError: +- import pkgutil +- __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index d8e6936e8dc35..bc9cddc48bf03 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { - pname = "Hypercorn"; + pname = "hypercorn"; version = "0.14.3"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchFromGitHub { owner = "pgjones"; - repo = pname; + repo = "Hypercorn"; rev = version; hash = "sha256-ECREs8UwqTWUweUrwnUwpVotCII2v4Bz7ZCk3DSAd8I="; }; diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index 1f0f799d587f2..acbc955f10891 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -1,5 +1,6 @@ { lib , aiohttp +, aiooui , buildPythonPackage , fetchFromGitHub , home-assistant-bluetooth @@ -11,21 +12,21 @@ buildPythonPackage rec { pname = "ibeacon-ble"; - version = "1.0.1"; - format = "pyproject"; + version = "1.2.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "ibeacon-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-iYgGflM0IpSIMNgPpJAFAl9FYoMfRinM3sP6VRcBSMc="; + hash = "sha256-1liSWxduYpjIMu7226EH4bsc7gca5g/fyL79W4ZMdU4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + aiooui home-assistant-bluetooth mac-vendor-lookup ]; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 8c2e49a6e4e5a..c6d68d83dbff2 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -17,7 +17,7 @@ , geopandas , google-cloud-bigquery , google-cloud-bigquery-storage -, graphviz-nox +, graphviz , hypothesis , multipledispatch , numpy @@ -25,15 +25,17 @@ , packaging , pandas , parsy +, pins , poetry-core , poetry-dynamic-versioning , polars -, pooch , psycopg2 , pyarrow +, pyarrow-hotfix , pydata-google-auth , pydruid , pymysql +, pyodbc , pyspark , pytest-benchmark , pytest-httpserver @@ -63,7 +65,7 @@ let name = "ibis-testing-data"; owner = "ibis-project"; repo = "testing-data"; - # https://github.com/ibis-project/ibis/blob/7.1.0/nix/overlay.nix#L20-L26 + # https://github.com/ibis-project/ibis/blob/8.0.0/nix/overlay.nix#L20-L26 rev = "2c6a4bb5d5d525058d8d5b2312a9fee5dafc5476"; hash = "sha256-Lq503bqh9ESZJSk6yVq/uZwkAubzmSmoTBZSsqMm0DY="; }; @@ -71,8 +73,8 @@ in buildPythonPackage rec { pname = "ibis-framework"; - version = "7.1.0"; - format = "pyproject"; + version = "8.0.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -81,7 +83,7 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = "refs/tags/${version}"; - hash = "sha256-E7jryoidw6+CjTIex4wcTXcU+8Kg8LDwg7wJvcwj+7Q="; + hash = "sha256-KcNZslqmSbu8uPYKpkyvd7d8Fsf0nQt80y0auXsI8fs="; }; nativeBuildInputs = [ @@ -94,25 +96,24 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic bidict - filelock multipledispatch numpy pandas parsy - pooch pyarrow + pyarrow-hotfix python-dateutil pytz rich sqlglot toolz typing-extensions - ] - ++ pooch.optional-dependencies.progress - ++ pooch.optional-dependencies.xxhash; + ]; nativeCheckInputs = [ pytestCheckHook + black + filelock hypothesis pytest-benchmark pytest-httpserver @@ -126,35 +127,28 @@ buildPythonPackage rec { "--dist=loadgroup" "-m" "'${lib.concatStringsSep " or " testBackends} or core'" + ]; + + disabledTests = [ # breakage from sqlalchemy2 truediv changes - "--deselect=ibis/tests/sql/test_sqlalchemy.py::test_tpc_h17" + "test_tpc_h17" # tries to download duckdb extensions - "--deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite" - "--deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite" - + "test_register_sqlite" + "test_read_sqlite" # duckdb does not respect sample_size=2 (reads 3 lines of csv). - "--deselect=ibis/backends/tests/test_register.py::test_csv_reregister_schema" - + "test_csv_reregister_schema" # duckdb fails with: # "This function can not be called with an active transaction!, commit or abort the existing one first" - "--deselect=ibis/backends/tests/test_udf.py::test_vectorized_udf" - "--deselect=ibis/backends/tests/test_udf.py::test_map_merge_udf" - "--deselect=ibis/backends/tests/test_udf.py::test_udf" - "--deselect=ibis/backends/tests/test_udf.py::test_map_udf" - - # pyarrow13 is not supported yet. - "--deselect=ibis/backends/tests/test_temporal.py::test_date_truncate" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_interval_add_cast_column" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_filter_before_window" - "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_window_udf" - "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_window_udf" - "--deselect=ibis/backends/tests/test_aggregation.py::test_aggregate_grouped" + "test_vectorized_udf" + "test_s3_403_fallback" + "test_map_merge_udf" + "test_udf" + "test_map_udf" + # DataFusion error + "datafusion" + # pluggy.PluggyTeardownRaisedWarning + "test_repr_png_is_not_none_in_not_interactive" + "test_interval_arithmetic" ]; # patch out tests that check formatting with black @@ -162,7 +156,6 @@ buildPythonPackage rec { find ibis/tests -type f -name '*.py' -exec sed -i \ -e '/^ *assert_decompile_roundtrip/d' \ -e 's/^\( *\)code = ibis.decompile(expr, format=True)/\1code = ibis.decompile(expr)/g' {} + - substituteInPlace pyproject.toml --replace 'sqlglot = ">=10.4.3,<12"' 'sqlglot = "*"' ''; preCheck = '' @@ -188,20 +181,22 @@ buildPythonPackage rec { dask = [ dask regex ]; datafusion = [ datafusion ]; druid = [ pydruid sqlalchemy ]; - duckdb = [ duckdb duckdb-engine packaging sqlalchemy sqlalchemy-views ]; + duckdb = [ duckdb duckdb-engine sqlalchemy sqlalchemy-views ]; flink = [ ]; geospatial = [ geoalchemy2 geopandas shapely ]; + mssql = [ sqlalchemy pyodbc sqlalchemy-views ]; mysql = [ sqlalchemy pymysql sqlalchemy-views ]; oracle = [ sqlalchemy oracledb packaging sqlalchemy-views ]; pandas = [ regex ]; - polars = [ polars ]; + polars = [ polars packaging ]; postgres = [ psycopg2 sqlalchemy sqlalchemy-views ]; - pyspark = [ pyspark sqlalchemy ]; - snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views ]; - sqlite = [ regex sqlalchemy sqlite sqlalchemy-views ]; + pyspark = [ pyspark sqlalchemy packaging ]; + snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views packaging ]; + sqlite = [ regex sqlalchemy sqlalchemy-views ]; trino = [ trino-python-client sqlalchemy sqlalchemy-views ]; - visualization = [ graphviz-nox ]; + visualization = [ graphviz ]; decompiler = [ black ]; + examples = [ pins ] ++ pins.optional-dependencies.gcs; }; }; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 5d27b9d490e16..46a5eb3e36912 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.19.1"; + version = "3.19.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oPDcQSWNWG9wauSVW7srXN85+UeF6Q0CRlaSyqh2W/Q="; + hash = "sha256-qodN9ALyAfzsrCAiPT3t02JJRCBqFCNVWlsQP+4d3do="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 522b7b13cc1cb..c15ec2005a297 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "7.0.1"; + version = "8.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-f/nf9WFiUNDQBkFNMV16EznCw0TN9L4fDIPQ/j4B1Sc="; + hash = "sha256-p2LyR7Fxd0Ny6QCypAWIusnINuhWAhWOnRfZ14FKvro="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index d95a34fbbc849..43b810c1d5527 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -6,40 +6,32 @@ , tzdata , pyparsing , pydantic -, pytest-asyncio , pytest-benchmark -, pytest-golden , pytestCheckHook , pythonOlder -, pythonRelaxDepsHook , python-dateutil -, pyyaml , setuptools +, syrupy }: buildPythonPackage rec { pname = "ical"; - version = "6.1.1"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; - repo = pname; + repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-pFmJYXIhc9jhpc9ZjSNaol5h5Jb8ZvxuQsQL/2Rjryc="; + hash = "sha256-kvZZfmrE42uoB9v0PuXopH3g9Cf0hwLkCvaNi6CGX8M="; }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; - pythonRelaxDeps = [ - "tzdata" - ]; - propagatedBuildInputs = [ python-dateutil tzdata @@ -50,11 +42,9 @@ buildPythonPackage rec { nativeCheckInputs = [ emoji freezegun - pytest-asyncio pytest-benchmark - pytest-golden pytestCheckHook - pyyaml + syrupy ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index 5fee7d5c9f0d5..e6950edaa1278 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.11.1"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-nduag5ubgwhOcprdZppLIPQPDE06dk9OzniIIJpM12s="; + hash = "sha256-TQ+DBFpG+IeZ4/dN+YKMw3AM4Dl1rpqA1kRcb3Tb3jA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/imagededup/default.nix b/pkgs/development/python-modules/imagededup/default.nix index 94d06f6becbd8..7b5be6e31709b 100644 --- a/pkgs/development/python-modules/imagededup/default.nix +++ b/pkgs/development/python-modules/imagededup/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage +, cython , fetchFromGitHub , fetchurl -, cython +, matplotlib +, pillow +, pytest-mock +, pytestCheckHook +, pythonOlder +, pywavelets +, scikit-learn +, setuptools , torch , torchvision -, pillow , tqdm -, scikit-learn -, pywavelets -, matplotlib -, pytestCheckHook -, pytest-mock }: let MobileNetV3 = fetchurl { @@ -23,50 +25,57 @@ let hash = "sha256-msG1N42ZJ71sg3TODNVX74Dhs/j7wYWd8zLE3J0P2CU="; }; EfficientNet = fetchurl { - url = "https://download.pytorch.org/models/efficientnet_b4_rwightman-7eb33cd5.pth"; + url = "https://download.pytorch.org/models/efficientnet_b4_rwightman-23ab8bcd.pth"; hash = "sha256-I6uLzVvb72GnpDuRrcrYH2Iv1/NvtJNaVpgo13iIxE4="; }; in buildPythonPackage rec { pname = "imagededup"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "idealo"; - repo = pname; - rev = "v${version}"; + repo = "imagededup"; + rev = "refs/tags/v${version}"; hash = "sha256-B2IuNMTZnzBi6IxrHBoMDsmIcqGQpznd/2f1XKo1Oa4="; }; nativeBuildInputs = [ cython + setuptools ]; propagatedBuildInputs = [ + matplotlib + pillow + pywavelets + scikit-learn torch torchvision - pillow tqdm - scikit-learn - pywavelets - matplotlib ]; - nativeCheckInputs = [ pytestCheckHook pytest-mock ]; + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; preCheck = '' - # checks fail with: error: [Errno 13] Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) - # checks with CNN are preloaded to avoid downloads in check-phase + # Checks with CNN are preloaded to avoid downloads in the check phase mkdir -p $HOME/.cache/torch/hub/checkpoints/ ln -s ${MobileNetV3} $HOME/.cache/torch/hub/checkpoints/${MobileNetV3.name} ln -s ${ViT} $HOME/.cache/torch/hub/checkpoints/${ViT.name} ln -s ${EfficientNet} $HOME/.cache/torch/hub/checkpoints/${EfficientNet.name} ''; - pythonImportsCheck = [ "imagededup" ]; + pythonImportsCheck = [ + "imagededup" + ]; meta = with lib; { homepage = "https://idealo.github.io/imagededup/"; diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index 6a066fad36d80..5c1530263d224 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "4.1.0"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "corenting"; repo = "immutabledict"; rev = "refs/tags/v${version}"; - hash = "sha256-c76apNW6nlxL9paevqKpPw5RpDLMpYnbVabCCIrW3pw="; + hash = "sha256-NpNS8HAacgXm3rFtyd5uFgSURNbDf+YVS1aFx51kwEA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix new file mode 100644 index 0000000000000..42182cadc0811 --- /dev/null +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -0,0 +1,45 @@ +{ lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + pytestCheckHook, + astunparse, + setuptools +}: +buildPythonPackage rec { + pname = "import-expression"; + version = "1.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ioistired"; + repo = "import-expression-parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-mll2NePB7fthzltLOk6D9BgaDpH6GaW4psqcGun/0qM="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/ioistired/import-expression-parser/commit/3daf968c3163b64685aa529740e132f0df5ab262.patch"; + hash = "sha256-2Ubv3onor2D26udZbDDMb3iNLopEIRnIcO/X6WUVmJU="; + }) + ]; + + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ astunparse ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests.py" ]; + + pythonImportsCheck = [ + "import_expression" + "import_expression._codec" + ]; + + meta = { + description = "Transpiles a superset of python to allow easy inline imports"; + homepage = "https://github.com/ioistired/import-expression-parser"; + license = with lib.licenses; [ mit psfl ]; + mainProgram = "import-expression"; + maintainers = with lib.maintainers; [ lychee ]; + }; +} diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 4e3b4294991cd..8d2823356e32a 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pytestCheckHook , pkg-config +, setuptools , libjpeg , libpng , libtiff @@ -11,20 +12,50 @@ }: buildPythonPackage rec { - pname = "python-imread"; + pname = "imread"; version = "0.7.5"; + pyproject = true; src = fetchPypi { inherit version; pname = "imread"; - sha256 = "sha256-GiWpA128GuLlbBW1CQQHHVVeoZfu9Yyh2RFzSdtHDbc="; + hash = "sha256-GiWpA128GuLlbBW1CQQHHVVeoZfu9Yyh2RFzSdtHDbc="; }; + nativeBuildInputs = [ + pkg-config + setuptools + ]; + + buildInputs = [ + libjpeg + libpng + libtiff + libwebp + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ nose libjpeg libpng libtiff libwebp ]; propagatedBuildInputs = [ numpy ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + # verbose build outputs needed to debug hard-to-reproduce hydra failures + "-v" + "--pyargs" "imread" + ]; + + pythonImportsCheck = [ + "imread" + ]; + + preCheck = '' + cd $TMPDIR + export HOME=$TMPDIR + export OMP_NUM_THREADS=1 + ''; + meta = with lib; { description = "Python package to load images as numpy arrays"; homepage = "https://imread.readthedocs.io/en/latest/"; diff --git a/pkgs/development/python-modules/indexed-bzip2/default.nix b/pkgs/development/python-modules/indexed-bzip2/default.nix index d6c82e3aec9a5..b75a10b982224 100644 --- a/pkgs/development/python-modules/indexed-bzip2/default.nix +++ b/pkgs/development/python-modules/indexed-bzip2/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "indexed_bzip2"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tKf9odadfQZQYJz//vWYpeB99Z8VLg+hEPvfEHXgdnM="; + hash = "sha256-3HUiigZR91/nbOAMOuSHGcPtqkkEaj3VepyMhmKOHpI="; }; # has no tests diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 6fb8974642ee2..d95aa2b2323a0 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.40.0"; + version = "1.41.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+I5DxcxNxIRDwtfYXLvXPl8Z3FKcSWyaYtv1KHT9QO4="; + hash = "sha256-wrgbc8sMISJvXxefGl2PBsJ3d308BXVH7wYIeaFmdZ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 991dcb3203140..ca962f4e47929 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -4,7 +4,7 @@ , fetchPypi , mock , msgpack -, nose +, pynose , pandas , pytestCheckHook , pytz @@ -26,7 +26,12 @@ buildPythonPackage rec { postPatch = '' for f in influxdb/tests/dataframe_client_test.py influxdb/tests/influxdb08/dataframe_client_test.py; do substituteInPlace "$f" \ - --replace "pandas.util.testing" "pandas.testing" + --replace-fail "pandas.util.testing" "pandas.testing" + done + + for f in influxdb/tests/influxdb08/client_test.py influxdb/tests/client_test.py; do + substituteInPlace "$f" \ + --replace-fail "assertRaisesRegexp" "assertRaisesRegex" done ''; @@ -44,7 +49,7 @@ buildPythonPackage rec { pytestCheckHook requests-mock mock - nose + pynose pandas ]; @@ -62,6 +67,10 @@ buildPythonPackage rec { # Pandas API changes cause it to no longer infer datetimes in the expected manner "test_multiquery_into_dataframe" "test_multiquery_into_dataframe_dropna" + # FutureWarning: 'H' is deprecated and will be removed in a future version, please use 'h' instead. + "test_write_points_from_dataframe_with_tag_escaped" + # AssertionError: 2 != 1 : <class 'influxdb.tests.helper_test.TestSeriesHelper.testWarnBulkSizeNoEffect.<locals>.WarnBulkSizeNoEffect'> call should have generated one warning. + "testWarnBulkSizeNoEffect" ]; pythonImportsCheck = [ "influxdb" ]; diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 4d04618ec3e6b..e6c1b5da2806f 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -70,7 +70,8 @@ buildPythonPackage { cd share/extensions substituteInPlace pyproject.toml \ - --replace 'scour = "^0.37"' 'scour = ">=0.37"' + --replace-fail 'scour = "^0.37"' 'scour = ">=0.37"' \ + --replace-fail 'lxml = "^4.5.0"' 'lxml = "^4.5.0 || ^5.0.0"' ''; meta = { diff --git a/pkgs/development/python-modules/intake-parquet/default.nix b/pkgs/development/python-modules/intake-parquet/default.nix index 9ef6affb5119e..809d9efcc7cac 100644 --- a/pkgs/development/python-modules/intake-parquet/default.nix +++ b/pkgs/development/python-modules/intake-parquet/default.nix @@ -5,20 +5,34 @@ , dask , fastparquet , pyarrow +, setuptools +, pythonOlder }: buildPythonPackage rec { pname = "intake-parquet"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "intake"; - repo = pname; - rev = version; - sha256 = "sha256-zSwylXBKOM/tG5mwYtc0FmxwcKJ6j+lw1bxJqf57NY8="; + repo = "intake-parquet"; + rev = "refs/tags/${version}"; + hash = "sha256-zSwylXBKOM/tG5mwYtc0FmxwcKJ6j+lw1bxJqf57NY8="; }; + postPatch = '' + # Break circular dependency + substituteInPlace requirements.txt \ + --replace-fail "intake" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandas dask @@ -26,12 +40,6 @@ buildPythonPackage rec { pyarrow ]; - postPatch = '' - # Break circular dependency - substituteInPlace requirements.txt \ - --replace "intake" "" - ''; - doCheck = false; #pythonImportsCheck = [ "intake_parquet" ]; diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index d4f9c66806ce4..b15e90cda27fc 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , appdirs , bokeh , buildPythonPackage @@ -19,14 +20,15 @@ , pythonOlder , pyyaml , requests -, stdenv +, setuptools +, setuptools-scm , tornado }: buildPythonPackage rec { pname = "intake"; - version = "0.7.0"; - format = "setuptools"; + version = "2.0.3"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -34,9 +36,14 @@ buildPythonPackage rec { owner = "intake"; repo = "intake"; rev = "refs/tags/${version}"; - hash = "sha256-LK4abwPViEFJZ10bbRofF2aw2Mj0dliKwX6dFy93RVQ="; + hash = "sha256-Fyv85HkoE9OPOoSHR1sgCG0iAFuSiQMT7cyZcQyLvv0="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ appdirs dask @@ -73,11 +80,6 @@ buildPythonPackage rec { ]; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - ''; - __darwinAllowLocalNetworking = true; preCheck = '' @@ -85,6 +87,20 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; + disabledTestPaths = [ + # Missing plusins + "intake/catalog/tests/test_alias.py" + "intake/catalog/tests/test_gui.py" + "intake/catalog/tests/test_local.py" + "intake/catalog/tests/test_reload_integration.py" + "intake/source/tests/test_csv.py" + "intake/source/tests/test_derived.py" + "intake/source/tests/test_npy.py" + "intake/source/tests/test_text.py" + "intake/tests/test_config.py" + "intake/tests/test_top_level.py" + ]; + disabledTests = [ # Disable tests which touch network "http" @@ -103,23 +119,10 @@ buildPythonPackage rec { "test_remote_cat" "test_remote_env" # ValueError - "test_mlist_parameter" - # ImportError - "test_dataframe" - "test_ndarray" - "test_python" + "test_datasource_python_to_dask" + "test_catalog_passthrough" # Timing-based, flaky on darwin and possibly others "test_idle_timer" - # arrow-cpp-13 related - "test_read" - "test_pickle" - "test_read_dask" - "test_read_list" - "test_read_list_with_glob" - "test_to_dask" - "test_columns" - "test_df_transform" - "test_pipeline_apply" ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ # Flaky with older low-res mtime on darwin < 10.13 (#143987) "test_second_load_timestamp" diff --git a/pkgs/development/python-modules/interegular/default.nix b/pkgs/development/python-modules/interegular/default.nix new file mode 100644 index 0000000000000..e1f0fc79c0915 --- /dev/null +++ b/pkgs/development/python-modules/interegular/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "interegular"; + version = "0.3.3"; + src = fetchPypi { + inherit pname version; + hash = "sha256-2baXshs0iEcROZug8DdpFLgYmc5nADJIbQ0Eg0SnZgA="; + }; + + pythonImportsCheck = [ + "interegular" + ]; + + meta = with lib; { + description = "A library to check a subset of python regexes for intersections"; + homepage = "https://github.com/MegaIng/interegular"; + license = licenses.mit; + maintainers = with maintainers; [ lach ]; + }; +} diff --git a/pkgs/development/python-modules/iocsearcher/default.nix b/pkgs/development/python-modules/iocsearcher/default.nix new file mode 100644 index 0000000000000..a3f7e910664c9 --- /dev/null +++ b/pkgs/development/python-modules/iocsearcher/default.nix @@ -0,0 +1,70 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, base58 +, bech32 +, cashaddress +, cbor +, eth-hash +, intervaltree +, langdetect +, lxml +, pdfminer-six +, phonenumbers +, python-magic +, readabilipy +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "iocsearcher"; + version = "2.3-unstable-2024-03-04"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "malicialab"; + repo = "iocsearcher"; + rev = "5f7b87761f2195eb358006f3492f0beac7ecc4b0"; + hash = "sha256-SYh0+JEZa95iBznNzXut/9Vwof6VFeSlt0/g+XmMPC0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + base58 + beautifulsoup4 + bech32 + cashaddress + cbor + eth-hash + intervaltree + langdetect + lxml + pdfminer-six + phonenumbers + python-magic + readabilipy + ] ++ eth-hash.optional-dependencies.pycryptodome; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "iocsearcher" + ]; + + meta = with lib; { + description = "Library and command line tool for extracting indicators of compromise (IOCs)"; + homepage = "https://github.com/malicialab/iocsearcher"; + changelog = "https://github.com/malicialab/iocsearcher/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix index 748b7a14570c5..64021cc051b10 100644 --- a/pkgs/development/python-modules/iodata/default.nix +++ b/pkgs/development/python-modules/iodata/default.nix @@ -2,22 +2,20 @@ buildPythonPackage rec { pname = "iodata"; - version = "0.1.7"; + version = "1.0.0a2"; format = "setuptools"; src = fetchFromGitHub { owner = "theochem"; repo = pname; rev = version; - hash = "sha256-Qn2xWFxdS12K92DhdHVzYrBjPRV+vYo7Cs27vkeCaxM="; + hash = "sha256-GFTCYE19Re7WLhV8eU+0i8OMp/Tsms/Xj9DRTcgjcz4="; }; - leaveDotGit = true; - nativeBuildInputs = [ cython nose ]; propagatedBuildInputs = [ numpy scipy attrs ]; - pythonImportsCheck = [ "iodata" "iodata.overlap_accel" ]; + pythonImportsCheck = [ "iodata" ]; doCheck = false; # Requires roberto or nose and a lenghtly setup to find the cython modules meta = with lib; { diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/ipy/default.nix index f8291ee8ac5b4..8a2f64ce3638b 100644 --- a/pkgs/development/python-modules/IPy/default.nix +++ b/pkgs/development/python-modules/ipy/default.nix @@ -1,12 +1,13 @@ { lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { - pname = "IPy"; + pname = "ipy"; version = "1.01"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "IPy"; + inherit version; sha256 = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a"; }; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index ff10be0092ca3..1caa71211c5fd 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.29.2"; + version = "6.29.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-O63igATj/2JO1Xl0lIEWZwYErF9nbRIzlpPzFCF20/A="; + hash = "sha256-4UwlDR+eo5iUkCJcwaVCeBsJWhihlEf88rXq99CsW9I="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 2507e7e5fc585..c2211226f078e 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.10.1"; + version = "1.10.2"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-IGFc6GulFs8Leq2EzGB+TiyRBCMulUzQ7MvzNTCl4dQ="; + hash = "sha256-qZc1hvouKWUQ2aJLk1oiokUKzKBXtd6fC6tm7LHDOrQ="; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index 28b39f74c4b9a..499d6a0438548 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -2,20 +2,44 @@ , buildPythonPackage , fetchPypi # Python Inputs +, jupyter-packaging +, jupyterlab +, setuptools +, wheel , ipyvue }: buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.8.10"; - format = "setuptools"; + version = "1.9.0"; + pyproject = true; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - hash = "sha256-m6RCeUefM/XLg69AaqgTBQ7pYgGVXCy6CH/SOoQ9W04="; + hash = "sha256-nFN+IYKZ3jIZSx2pSda5a//mwA82u2A1QJ8khf64gec="; }; + # drop pynpm which tries to install node_modules + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "jupyter_packaging~=0.7.9" "jupyter_packaging" \ + --replace-fail "jupyterlab~=3.0" "jupyterlab" \ + --replace-fail '"pynpm"' "" + + substituteInPlace setup.py \ + --replace-fail "from pynpm import NPMPackage" "" \ + --replace-fail "from generate_source import generate_source" "" \ + --replace-fail 'setup(cmdclass={"egg_info": js_prerelease(egg_info)})' 'setup()' + ''; + + nativeBuildInputs = [ + jupyter-packaging + jupyterlab + setuptools + wheel + ]; + propagatedBuildInputs = [ ipyvue ]; doCheck = false; # no tests on PyPi/GitHub diff --git a/pkgs/development/python-modules/iteration-utilities/default.nix b/pkgs/development/python-modules/iteration-utilities/default.nix index dcfc86c3aa2c1..59399e39aca4a 100644 --- a/pkgs/development/python-modules/iteration-utilities/default.nix +++ b/pkgs/development/python-modules/iteration-utilities/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "iteration-utilities"; - version = "0.12.0"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MSeifert04"; repo = "iteration_utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-KdL0lwlmBEG++JRociR92HdYxzArTeL5uEyUjvvwi1Y="; + hash = "sha256-BiBbmZHo5B/u//LItqEcKtGXOA6xK+T1zoitR9XIiSU="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 0450f73e639b2..d41987c9a539e 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -1,6 +1,7 @@ { lib , blas , buildPythonPackage +, callPackage , setuptools , importlib-metadata , fetchFromGitHub @@ -126,6 +127,23 @@ buildPythonPackage rec { pythonImportsCheck = [ "jax" ]; + # Test CUDA-enabled jax and jaxlib. Running CUDA-enabled tests is not + # currently feasible within the nix build environment so we have to maintain + # this script separately. See https://github.com/NixOS/nixpkgs/pull/256230 + # for a possible remedy to this situation. + # + # Run these tests with eg + # + # NIXPKGS_ALLOW_UNFREE=1 nixglhost -- nix run --impure .#python3Packages.jax.passthru.tests.test_cuda_jaxlibBin + passthru.tests = { + test_cuda_jaxlibSource = callPackage ./test-cuda.nix { + jaxlib = jaxlib.override { cudaSupport = true; }; + }; + test_cuda_jaxlibBin = callPackage ./test-cuda.nix { + jaxlib = jaxlib-bin.override { cudaSupport = true; }; + }; + }; + meta = with lib; { description = "Differentiate, compile, and transform Numpy code"; homepage = "https://github.com/google/jax"; diff --git a/pkgs/development/python-modules/jax/test-cuda.nix b/pkgs/development/python-modules/jax/test-cuda.nix new file mode 100644 index 0000000000000..d156061f38495 --- /dev/null +++ b/pkgs/development/python-modules/jax/test-cuda.nix @@ -0,0 +1,17 @@ +{ jax +, jaxlib +, pkgs +}: + +pkgs.writers.writePython3Bin "jax-test-cuda" { libraries = [ jax jaxlib ]; } '' + import jax + from jax import random + + assert jax.devices()[0].platform == "gpu" + + rng = random.PRNGKey(0) + x = random.normal(rng, (100, 100)) + x @ x + + print("success!") +'' diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 0bcf055a8766d..199b352b2aa27 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -2,16 +2,7 @@ # backend will require some additional work. Those wheels are located here: # https://storage.googleapis.com/jax-releases/libtpu_releases.html. -# For future reference, the easiest way to test the GPU backend is to run -# NIX_PATH=.. nix-shell -p python3 python3Packages.jax "python3Packages.jaxlib-bin.override { cudaSupport = true; }" -# export XLA_FLAGS=--xla_gpu_force_compilation_parallelism=1 -# python -c "from jax.lib import xla_bridge; assert xla_bridge.get_backend().platform == 'gpu'" -# python -c "from jax import random; random.PRNGKey(0)" -# python -c "from jax import random; x = random.normal(random.PRNGKey(0), (100, 100)); x @ x" -# There's no convenient way to test the GPU backend in the derivation since the -# nix build environment blocks access to the GPU. See also: -# * https://github.com/google/jax/issues/971#issuecomment-508216439 -# * https://github.com/google/jax/issues/5723#issuecomment-913038780 +# See `python3Packages.jax.passthru` for CUDA tests. { absl-py , autoPatchelfHook @@ -32,12 +23,21 @@ }: let - inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudatoolkit cudnn cudaVersion; + inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudaVersion; version = "0.4.24"; inherit (python) pythonVersion; + cudaLibPath = lib.makeLibraryPath (with cudaPackagesGoogle; [ + cuda_cudart.lib # libcudart.so + cuda_cupti.lib # libcupti.so + cudnn.lib # libcudnn.so + libcufft.lib # libcufft.so + libcusolver.lib # libcusolver.so + libcusparse.lib # libcusparse.so + ]); + # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the # official instructions recommend installing CPU-only versions via PyPI. cpuSrcs = @@ -189,18 +189,12 @@ buildPythonPackage { # autoPatchelfHook. That means we need to sneak them into rpath. This step # must be done after autoPatchelfHook and the automatic stripping of # artifacts. autoPatchelfHook runs in postFixup and auto-stripping runs in the - # patchPhase. Dependencies: - # * libcudart.so.11.0 -> cudatoolkit_11.lib - # * libcublas.so.11 -> cudatoolkit_11 - # * libcuda.so.1 -> opengl driver in /run/opengl-driver/lib + # patchPhase. preInstallCheck = lib.optional cudaSupport '' shopt -s globstar for file in $out/**/*.so; do - rpath=$(patchelf --print-rpath $file) - # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to - # <cudatoolkit_11.lib>/lib which is different from <cudatoolkit_11>/lib. - patchelf --set-rpath "$rpath:${cudatoolkit}/lib:${lib.makeLibraryPath [ cudatoolkit.lib cudnn ]}" $file + patchelf --add-rpath "${cudaLibPath}" "$file" done ''; @@ -211,12 +205,14 @@ buildPythonPackage { scipy ]; - # Note that cudatoolkit is snecessary since jaxlib looks for "ptxas" in $PATH. - # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for - # more info. + # jaxlib looks for ptxas at runtime, eg when running `jax.random.PRNGKey(0)`. + # Linking into $out is the least bad solution. See + # * https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 + # * https://github.com/NixOS/nixpkgs/pull/288829#discussion_r1493852211 + # for more info. postInstall = lib.optional cudaSupport '' - mkdir -p $out/bin - ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas + mkdir -p $out/${python.sitePackages}/jaxlib/cuda/bin + ln -s ${lib.getExe' cudaPackagesGoogle.cuda_nvcc "ptxas"} $out/${python.sitePackages}/jaxlib/cuda/bin/ptxas ''; inherit (jaxlib-build) pythonImportsCheck; @@ -229,8 +225,8 @@ buildPythonPackage { maintainers = with maintainers; [ samuela ]; platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ]; broken = - !(cudaSupport -> (cudaPackagesGoogle ? cudatoolkit) && lib.versionAtLeast cudatoolkit.version "11.1") - || !(cudaSupport -> (cudaPackagesGoogle ? cudnn) && lib.versionAtLeast cudnn.version "8.2") + !(cudaSupport -> lib.versionAtLeast cudaVersion "11.1") + || !(cudaSupport -> lib.versionAtLeast cudaPackagesGoogle.cudnn.version "8.2") || !(cudaSupport -> stdenv.isLinux) || !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}")); }; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index d1e9d8a9ad285..657a6e52c0846 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -12,6 +12,7 @@ , curl , cython , fetchFromGitHub +, fetchpatch , git , IOKit , jsoncpp @@ -47,14 +48,19 @@ # MKL: , mklSupport ? true -}: +}@inputs: let - inherit (cudaPackagesGoogle) backendStdenv cudatoolkit cudaFlags cudnn nccl; + inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudaFlags cudaVersion cudnn nccl; pname = "jaxlib"; version = "0.4.24"; + # It's necessary to consistently use backendStdenv when building with CUDA + # support, otherwise we get libstdc++ errors downstream + stdenv = throw "Use effectiveStdenv instead"; + effectiveStdenv = if cudaSupport then cudaPackagesGoogle.backendStdenv else inputs.stdenv; + meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; homepage = "https://github.com/google/jax"; @@ -65,25 +71,51 @@ let # however even with that fix applied, it doesn't work for everyone: # https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129 # NOTE: We always build with NCCL; if it is unsupported, then our build is broken. - broken = stdenv.isDarwin || nccl.meta.unsupported; + broken = effectiveStdenv.isDarwin || nccl.meta.unsupported; }; - cudatoolkit_joined = symlinkJoin { - name = "${cudatoolkit.name}-merged"; - paths = [ - cudatoolkit.lib - cudatoolkit.out - ] ++ lib.optionals (lib.versionOlder cudatoolkit.version "11") [ - # for some reason some of the required libs are in the targets/x86_64-linux - # directory; not sure why but this works around it - "${cudatoolkit}/targets/${stdenv.system}" + # These are necessary at build time and run time. + cuda_libs_joined = symlinkJoin { + name = "cuda-joined"; + paths = with cudaPackagesGoogle; [ + cuda_cudart.lib # libcudart.so + cuda_cudart.static # libcudart_static.a + cuda_cupti.lib # libcupti.so + libcublas.lib # libcublas.so + libcufft.lib # libcufft.so + libcurand.lib # libcurand.so + libcusolver.lib # libcusolver.so + libcusparse.lib # libcusparse.so + ]; + }; + # These are only necessary at build time. + cuda_build_deps_joined = symlinkJoin { + name = "cuda-build-deps-joined"; + paths = with cudaPackagesGoogle; [ + cuda_libs_joined + + # Binaries + cudaPackagesGoogle.cuda_nvcc.bin # nvcc + + # Headers + cuda_cccl.dev # block_load.cuh + cuda_cudart.dev # cuda.h + cuda_cupti.dev # cupti.h + cuda_nvcc.dev # See https://github.com/google/jax/issues/19811 + cuda_nvml_dev # nvml.h + cuda_nvtx.dev # nvToolsExt.h + libcublas.dev # cublas_api.h + libcufft.dev # cufft.h + libcurand.dev # curand.h + libcusolver.dev # cusolver_common.h + libcusparse.dev # cusparse.h ]; }; - cudatoolkit_cc_joined = symlinkJoin { - name = "${cudatoolkit.cc.name}-merged"; + backend_cc_joined = symlinkJoin { + name = "cuda-cc-joined"; paths = [ - backendStdenv.cc + effectiveStdenv.cc binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip ]; }; @@ -137,8 +169,44 @@ let arch = # KeyError: ('Linux', 'arm64') - if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.linuxArch == "arm64" then "aarch64" - else stdenv.hostPlatform.linuxArch; + if effectiveStdenv.hostPlatform.isLinux && effectiveStdenv.hostPlatform.linuxArch == "arm64" then "aarch64" + else effectiveStdenv.hostPlatform.linuxArch; + + xla = effectiveStdenv.mkDerivation { + pname = "xla-src"; + version = "unstable"; + + src = fetchFromGitHub { + owner = "openxla"; + repo = "xla"; + # Update this according to https://github.com/google/jax/blob/jaxlib-v${version}/third_party/xla/workspace.bzl. + rev = "12eee889e1f2ad41e27d7b0e970cb92d282d3ec5"; + hash = "sha256-68kjjgwYjRlcT0TVJo9BN6s+WTkdu5UMJqQcfHpBT90="; + }; + + patches = [ + # Resolves "could not convert ‘result’ from ‘SmallVector<[...],6>’ to + # ‘SmallVector<[...],4>’" compilation error. See https://github.com/google/jax/issues/19814#issuecomment-1945141259. + (fetchpatch { + url = "https://github.com/openxla/xla/commit/7a614cd346594fc7ea2fe75570c9c53a4a444f60.patch"; + hash = "sha256-RtuQTH8wzNiJcOtISLhf+gMlH1gg8hekvxEB+4wX6BM="; + }) + ]; + + dontBuild = true; + + # This is necessary for patchShebangs to know the right path to use. + nativeBuildInputs = [ python ]; + + # Main culprits we're targeting are third_party/tsl/third_party/gpus/crosstool/clang/bin/*.tpl + postPatch = '' + patchShebangs . + ''; + + installPhase = '' + cp -r . $out + ''; + }; bazel-build = buildBazelPackage rec { name = "bazel-build-${pname}-${version}"; @@ -162,7 +230,7 @@ let wheel build which - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals effectiveStdenv.isDarwin [ cctools ]; @@ -181,15 +249,13 @@ let six snappy zlib - ] ++ lib.optionals cudaSupport [ - cudatoolkit - cudnn - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals effectiveStdenv.isDarwin [ IOKit - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!effectiveStdenv.isDarwin) [ nsync ]; + # We don't want to be quite so picky regarding bazel version postPatch = '' rm -f .bazelversion ''; @@ -204,50 +270,80 @@ let removeRulesCC = false; - GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; - GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; + GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${backend_cc_joined}/bin"; + GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${backend_cc_joined}/bin/gcc"; # The version is automatically set to ".dev" if this variable is not set. # https://github.com/google/jax/commit/e01f2617b85c5bdffc5ffb60b3d8d8ca9519a1f3 JAXLIB_RELEASE = "1"; - preConfigure = '' - # dummy ldconfig - mkdir dummy-ldconfig - echo "#!${stdenv.shell}" > dummy-ldconfig/ldconfig - chmod +x dummy-ldconfig/ldconfig - export PATH="$PWD/dummy-ldconfig:$PATH" - cat <<CFG > ./.jax_configure.bazelrc - build --strategy=Genrule=standalone - build --repo_env PYTHON_BIN_PATH="${python}/bin/python" - build --action_env=PYENV_ROOT - build --python_path="${python}/bin/python" - build --distinct_host_configuration=false - build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" - '' + lib.optionalString (stdenv.hostPlatform.avxSupport && stdenv.hostPlatform.isUnix) '' - build --config=avx_posix - '' + lib.optionalString mklSupport '' - build --config=mkl_open_source_only - '' + lib.optionalString cudaSupport '' - build --action_env CUDA_TOOLKIT_PATH="${cudatoolkit_joined}" - build --action_env CUDNN_INSTALL_PATH="${cudnn}" - build --action_env TF_CUDA_PATHS="${cudatoolkit_joined},${cudnn},${nccl}" - build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudatoolkit.version}" - build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" - build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}" - '' + '' - CFG - ''; + preConfigure = + # Dummy ldconfig to work around "Can't open cache file /nix/store/<hash>-glibc-2.38-44/etc/ld.so.cache" error + '' + mkdir dummy-ldconfig + echo "#!${effectiveStdenv.shell}" > dummy-ldconfig/ldconfig + chmod +x dummy-ldconfig/ldconfig + export PATH="$PWD/dummy-ldconfig:$PATH" + '' + + + # Construct .jax_configure.bazelrc. See https://github.com/google/jax/blob/b9824d7de3cb30f1df738cc42e486db3e9d915ff/build/build.py#L259-L345 + # for more info. We assume + # * `cpu = None` + # * `enable_nccl = True` + # * `target_cpu_features = "release"` + # * `rocm_amdgpu_targets = None` + # * `enable_rocm = False` + # * `build_gpu_plugin = False` + # * `use_clang = False` (Should we use `effectiveStdenv.cc.isClang` instead?) + # + # Note: We should try just running https://github.com/google/jax/blob/ceb198582b62b9e6f6bdf20ab74839b0cf1db16e/build/build.py#L259-L266 + # instead of duplicating the logic here. Perhaps we can leverage the + # `--configure_only` flag (https://github.com/google/jax/blob/ceb198582b62b9e6f6bdf20ab74839b0cf1db16e/build/build.py#L544-L548)? + '' + cat <<CFG > ./.jax_configure.bazelrc + build --strategy=Genrule=standalone + build --repo_env PYTHON_BIN_PATH="${python}/bin/python" + build --action_env=PYENV_ROOT + build --python_path="${python}/bin/python" + build --distinct_host_configuration=false + build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" + '' + lib.optionalString cudaSupport '' + build --config=cuda + build --action_env CUDA_TOOLKIT_PATH="${cuda_build_deps_joined}" + build --action_env CUDNN_INSTALL_PATH="${cudnn}" + build --action_env TF_CUDA_PATHS="${cuda_build_deps_joined},${cudnn},${nccl}" + build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudaVersion}" + build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" + build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}" + '' + + # Note that upstream conditions this on `wheel_cpu == "x86_64"`. We just + # rely on `effectiveStdenv.hostPlatform.avxSupport` instead. So far so + # good. See https://github.com/google/jax/blob/b9824d7de3cb30f1df738cc42e486db3e9d915ff/build/build.py#L322 + # for upstream's version. + lib.optionalString (effectiveStdenv.hostPlatform.avxSupport && effectiveStdenv.hostPlatform.isUnix) '' + build --config=avx_posix + '' + lib.optionalString mklSupport '' + build --config=mkl_open_source_only + '' + + '' + CFG + ''; # Make sure Bazel knows about our configuration flags during fetching so that the # relevant dependencies can be downloaded. bazelFlags = [ "-c opt" - ] ++ lib.optionals stdenv.cc.isClang [ + # See https://bazel.build/external/advanced#overriding-repositories for + # information on --override_repository flag. + "--override_repository=xla=${xla}" + ] ++ lib.optionals effectiveStdenv.cc.isClang [ # bazel depends on the compiler frontend automatically selecting these flags based on file # extension but our clang doesn't. # https://github.com/NixOS/nixpkgs/issues/150655 - "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" + "--cxxopt=-x" + "--cxxopt=c++" + "--host_cxxopt=-x" + "--host_cxxopt=c++" ]; # We intentionally overfetch so we can share the fetch derivation across all the different configurations @@ -257,40 +353,34 @@ let bazelTargets = [ bazelRunTarget "@mkl_dnn_v1//:mkl_dnn" ]; bazelFlags = bazelFlags ++ [ "--config=avx_posix" + "--config=mkl_open_source_only" ] ++ lib.optionals cudaSupport [ # ideally we'd add this unconditionally too, but it doesn't work on darwin # we make this conditional on `cudaSupport` instead of the system, so that the hash for both # the cuda and the non-cuda deps can be computed on linux, since a lot of contributors don't # have access to darwin machines "--config=cuda" - ] ++ [ - "--config=mkl_open_source_only" ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-c0avcURLAYNiLASjIeu5phXX3ze5TR812SW5SCG/iwk="; + x86_64-linux = "sha256-IEKoHjCOtKZKvU/DUUjbvXldORFJuyO1R3F6CZZDXxM="; } else { - x86_64-linux = "sha256-1hrQ9ehFy3vBJxKNUzi/T0l+eZxo26Th7i5VRd/9U+0="; - aarch64-linux = "sha256-3QVYJOj1lNHgYVV9rOzVdfhq5q6GDwpcWCjKNrSZ4aU="; - }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); + x86_64-linux = "sha256-IE4+Tk4llo85u3NjakvY04tPw4R1bidyecPpQ4gknR8="; + aarch64-linux = "sha256-NehnpA4m+Fynvh0S6WKy/v9ab81487NE9ahvbS70wjY="; + }).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); }; buildAttrs = { outputs = [ "out" ]; - TF_SYSTEM_LIBS = lib.concatStringsSep "," (tf_system_libs ++ lib.optionals (!stdenv.isDarwin) [ + TF_SYSTEM_LIBS = lib.concatStringsSep "," (tf_system_libs ++ lib.optionals (!effectiveStdenv.isDarwin) [ "nsync" # fails to build on darwin ]); - # Note: we cannot do most of this patching at `patch` phase as the deps are not available yet. - # 1) Link protobuf from nixpkgs (through TF_SYSTEM_LIBS when using gcc) to prevent crashes on - # loading multiple extensions in the same python program due to duplicate protobuf DBs. - # 2) Patch python path in the compiler driver. - preBuild = lib.optionalString cudaSupport '' - patchShebangs ../output/external/xla/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl - '' + lib.optionalString stdenv.isDarwin '' - # Framework search paths aren't added by bintools hook - # https://github.com/NixOS/nixpkgs/pull/41914 + # Note: we cannot do most of this patching at `patch` phase as the deps + # are not available yet. Framework search paths aren't added by bintools + # hook. See https://github.com/NixOS/nixpkgs/pull/41914. + preBuild = lib.optionalString effectiveStdenv.isDarwin '' export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \ --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" @@ -302,13 +392,13 @@ let inherit meta; }; platformTag = - if stdenv.hostPlatform.isLinux then + if effectiveStdenv.hostPlatform.isLinux then "manylinux2014_${arch}" - else if stdenv.system == "x86_64-darwin" then + else if effectiveStdenv.system == "x86_64-darwin" then "macosx_10_9_${arch}" - else if stdenv.system == "aarch64-darwin" then + else if effectiveStdenv.system == "aarch64-darwin" then "macosx_11_0_${arch}" - else throw "Unsupported target platform: ${stdenv.hostPlatform}"; + else throw "Unsupported target platform: ${effectiveStdenv.hostPlatform}"; in buildPythonPackage { @@ -319,20 +409,18 @@ buildPythonPackage { let cp = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; in "${bazel-build}/jaxlib-${version}-${cp}-${cp}-${platformTag}.whl"; - # Note that cudatoolkit is necessary since jaxlib looks for "ptxas" in $PATH. - # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for - # more info. + # Note that jaxlib looks for "ptxas" in $PATH. See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 + # for more info. postInstall = lib.optionalString cudaSupport '' mkdir -p $out/bin - ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas + ln -s ${cudaPackagesGoogle.cuda_nvcc.bin}/bin/ptxas $out/bin/ptxas find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - addOpenGLRunpath "$lib" - patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnn}/lib:${nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" + patchelf --add-rpath "${lib.makeLibraryPath [cuda_libs_joined cudnn nccl]}" "$lib" done ''; - nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; + nativeBuildInputs = lib.optionals cudaSupport [ autoAddOpenGLRunpathHook ]; propagatedBuildInputs = [ absl-py diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index cb73681bc2760..b64ab981913ac 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , hatchling +, pythonRelaxDepsHook , numpy , typeguard , typing-extensions @@ -19,7 +20,7 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.25"; + version = "0.2.28"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,16 +29,12 @@ let owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-+JqpI5xrM7o73LG6oMix88Jr5aptmWYjJQcqUNo7icg="; + hash = "sha256-xDFrgPecUIfCACg/xkMQ8G1+6hNiUUDg9eCZKNpNfzs="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "typeguard>=2.13.3,<3" "typeguard" - ''; - nativeBuildInputs = [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -46,6 +43,10 @@ let typing-extensions ]; + pythonRelaxDeps = [ + "typeguard" + ]; + nativeCheckInputs = [ cloudpickle equinox diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix new file mode 100644 index 0000000000000..e758f4c691ebf --- /dev/null +++ b/pkgs/development/python-modules/jishaku/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + setuptools, + discordpy, + click, + braceexpand, + import-expression, + tabulate, + pytestCheckHook, + pytest-asyncio, + youtube-dl +}: +buildPythonPackage rec { + pname = "jishaku"; + version = "2.5.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Gorialis"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-BWnuk6h80cKwRECyTuRvnYnTC78219oraeTNoqWDd1c="; + }; + + patches = [ + (fetchpatch { + # add entrypoint for install script + url = "https://github.com/Gorialis/jishaku/commit/b96cd55a1c2fd154c548f08019ccd6f7be9c7f90.patch"; + hash = "sha256-laPoupwCC1Zthib8G+c1BXqTwZK0Z6up1DKVkhFicJ0="; + }) + ]; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + discordpy + click + braceexpand + tabulate + import-expression + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + youtube-dl + ]; + + pythonImportsCheck = [ + "jishaku" + "jishaku.repl" + "jishaku.features" + ]; + + meta = { + description = "A debugging and testing cog for discord.py bots"; + homepage = "https://jishaku.readthedocs.io/en/latest"; + changelog = "https://github.com/Gorialis/jishaku/releases/tag/${version}"; + maintainers = with lib.maintainers; [ lychee ]; + mainProgram = "jishaku"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index d3801bff9f028..d3fc765f4c865 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jsbeautifier"; - version = "1.14.11"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a2Mlgepg3RwTPNJaSK0Ye0uR9SZiPEsPtUQ++AUlBQU="; + hash = "sha256-69cztWBwTGAtdE6vyDnbYKHukybjCiqAxK24cYrcGyQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index b131e347393c9..9ded628f77495 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.0.2"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-EpWFsVWCi/6IOuM/zgPIer3arMDGjPPxhm/tZC4aji4="; + hash = "sha256-Ptc83sPZCMB6gqyr3cN/Lb2if5ps29aQBArLe6CtUMI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix index 51161435e9171..0822b1cbcc763 100644 --- a/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jupyter-lsp"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-JW0kYgVCrku6BKUPwfb/4ggJOgfY5pf+oKjRuMobfls="; + hash = "sha256-M9vLxd8kI3/1yLaWsE/0aJ/NMWy41JV9Yg/lUE19LD8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index 4eed7af804c03..4e542e8ebf9f4 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupyterlab-server"; - version = "2.25.2"; + version = "2.25.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_server"; inherit version; - hash = "sha256-vQ7HqZ687ci8/5Oe+G5Sw3jkTCcH4FP82B0EbOl57mM="; + hash = "sha256-hG8SWooZZWYR31sD5ZEsg5POppAIWbqmT6UV62So3EA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 7bd3126b093e7..2c00e2be9f8d3 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -3,26 +3,36 @@ , fetchPypi , cryptography , deprecated +, pytestCheckHook , pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "jwcrypto"; - version = "1.5.1"; - format = "setuptools"; + version = "1.5.6"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-SLub9DN3cTYlNXnlK3X/4PmkpyHRM9AfRaC5HtX08a4="; + hash = "sha256-dxqHdioMCBrmFmlYqVT4CEiCCyqwZpN9yLg3nWWxsDk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography deprecated + typing-extensions ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jwcrypto" ]; diff --git a/pkgs/development/python-modules/kanidm/default.nix b/pkgs/development/python-modules/kanidm/default.nix index fc53fc81ed709..88b98a1b5e797 100644 --- a/pkgs/development/python-modules/kanidm/default.nix +++ b/pkgs/development/python-modules/kanidm/default.nix @@ -22,7 +22,7 @@ let pname = "kanidm"; version = "0.0.3-unstable-2023-08-23"; in -buildPythonPackage { +buildPythonPackage rec { inherit pname version; pyproject = true; @@ -35,7 +35,7 @@ buildPythonPackage { hash = "sha256-5qQb+Itguw2v1Wdvc2vp00zglfvNd3LFEDvaweRJcOc="; }; - sourceRoot = "source/pykanidm"; + sourceRoot = "${src.name}/pykanidm"; nativeBuildInputs = [ poetry-core diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index a934b793c60e7..6746fd6eb710a 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -3,15 +3,16 @@ , buildPythonPackage , fetchFromGitHub , orjson -, unittestCheckHook , pythonOlder , redis +, setuptools +, unittestCheckHook }: buildPythonPackage rec { pname = "karton-core"; - version = "5.3.2"; - format = "setuptools"; + version = "5.3.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-/MPD83sBo9n/dI1uXbHbjvz6upJSJrssMGmGwfQ+KE8="; + hash = "sha256-RVHhMKoQAqsddziK/vWGynSL9mxMuccNEGzoJTx8KAA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ boto3 orjson diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index ec41ce9f27f94..2c14e72bcf96a 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -1,36 +1,38 @@ { lib +, azure-storage-blob +, boto3 , buildPythonPackage , fetchFromGitHub +, python-dotenv , pythonOlder - -# build +, requests +, responses , setuptools , setuptools-git-versioning , setuptools-scm - -# propagates -, azure-storage-blob -, boto3 -, requests - -# tests -, responses , unittestCheckHook +, urllib3 }: + buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.7.1"; - format = "pyproject"; + version = "0.7.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "keboola"; - repo = pname; + repo = "sapi-python-client"; rev = "refs/tags/${version}"; - hash = "sha256-74sChw6eMkBtfHV6hiaaLNOr/J0Sa73LB93Z8muLaiI="; + hash = "sha256-uZo2kEq7zIMGRlhX36kZyihQPZegw5XgVzgVQQOmpc4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "urllib3<2.0.0" "urllib3" + ''; + nativeBuildInputs = [ setuptools setuptools-git-versioning @@ -40,18 +42,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-storage-blob boto3 + python-dotenv requests + responses + urllib3 ]; # Requires API token and an active Keboola bucket # ValueError: Root URL is required. doCheck = false; - nativeCheckInputs = [ - unittestCheckHook - responses - ]; - pythonImportsCheck = [ "kbcstorage" "kbcstorage.buckets" diff --git a/pkgs/development/python-modules/keyring-pass/default.nix b/pkgs/development/python-modules/keyring-pass/default.nix index c9ac11c9313a8..6c8d5f1e915b5 100644 --- a/pkgs/development/python-modules/keyring-pass/default.nix +++ b/pkgs/development/python-modules/keyring-pass/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "keyring-pass"; - version = "0.9.2"; + version = "0.9.3"; disabled = pythonOlder "3.6"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nazarewk"; repo = "keyring_pass"; rev = "refs/tags/v${version}"; - hash = "sha256-Sf7eDOB3prH2s6BzdBtxewSweC0ibLXVxNHBJRRaJe4="; + hash = "sha256-EsM+RUhYtelslRpxR5NQbqpOt8KaeCsFqkqZ1ZFx0I0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index dd04b97010dda..d9b8e23fe4165 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - pname = "Kivy"; + pname = "kivy"; version = "2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/krakenex/default.nix b/pkgs/development/python-modules/krakenex/default.nix index 04b114194f68b..59b0984e956bb 100644 --- a/pkgs/development/python-modules/krakenex/default.nix +++ b/pkgs/development/python-modules/krakenex/default.nix @@ -1,21 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , requests }: buildPythonPackage rec { pname = "krakenex"; - version = "2.1.0"; - format = "setuptools"; + version = "2.2.1"; + pyproject = true; src = fetchFromGitHub { owner = "veox"; repo = "python3-krakenex"; rev = "v${version}"; - sha256 = "0j8qmpk6lm57h80i5njhgvm1qnxllm18dlqxfd4kyxdb93si4z2p"; + hash = "sha256-aWALkM79VOm2/EQdp2rD1sm0NxhLKZOXzAs8m+t7M0s="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; @@ -26,6 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "krakenex" ]; meta = with lib; { + changelog = "https://github.com/veox/python3-krakenex/blob/${src.rev}/CHANGELOG.rst"; description = "Kraken.com cryptocurrency exchange API"; homepage = "https://github.com/veox/python3-krakenex"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 76c51b77a92db..25314acd50267 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.58.1"; + version = "3.65"; pyproject = true; disabled = pythonOlder "3.7"; @@ -33,8 +33,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; - rev = "refs/tags/v.${version}"; - hash = "sha256-H6fn+TpfYbu/warhr9XcQjfxSThIjBp9XwelA5ZvTBE="; + rev = "refs/tags/v${version}"; + hash = "sha256-i0hbVxGrb2C/bMcVPNzaPBxhKm+5r3o1GlToZvIS35k="; }; postPatch = '' @@ -99,7 +99,5 @@ buildPythonPackage rec { changelog = "https://github.com/Labelbox/labelbox-python/blob/v.${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; - # https://github.com/Labelbox/labelbox-python/issues/1246 - broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/laces/default.nix b/pkgs/development/python-modules/laces/default.nix new file mode 100644 index 0000000000000..d29396658150b --- /dev/null +++ b/pkgs/development/python-modules/laces/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, flit-core +, python3 +}: + +buildPythonPackage rec { + pname = "laces"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tbrlpld"; + repo = "laces"; + rev = "v${version}"; + hash = "sha256-N3UUJomlihdM+6w9jmn9t10Q2meIqEOjW/rf3ZLrD78="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + django + ]; + + pythonImportsCheck = [ "laces" ]; + + meta = with lib; { + description = "Django components that know how to render themselves"; + homepage = "https://github.com/tbrlpld/laces"; + changelog = "https://github.com/tbrlpld/laces/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 0c3b7b59f61a4..0f0492c1c4b42 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.0.21"; + version = "0.0.27"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_community"; inherit version; - hash = "sha256-HDEKfiZj1fZGSkM5gVBIlPl8Eng8vri99BWaV0+IwY0="; + hash = "sha256-Jm3/vUwWZtsYicrZU/pRAtTev/eCM1NTtteGNqdhd40="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 27252c4b3938d..ad212e9156813 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.24"; + version = "0.1.31"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-znD0uXaV61VjfgDuM9SA//xtsflXJvmbB2tVyxpCkn0="; + hash = "sha256-1mDPIJu2zmHLHIUxB7CRqqgJAVpV3Ongzhm1HUyPKnA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix new file mode 100644 index 0000000000000..81cb942e51553 --- /dev/null +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, langchain-core +, lxml +, pythonOlder +}: + +buildPythonPackage rec { + pname = "langchain-text-splitters"; + version = "0.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "langchain_text_splitters"; + inherit version; + hash = "sha256-rEWfqYeZ9RF61UJakzCyGWEyHjC8GaKi+fdh3a3WKqE="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + langchain-core + lxml + ]; + + # PyPI source does not have tests + doCheck = false; + + pythonImportsCheck = [ + "langchain_text_splitters" + ]; + + meta = with lib; { + description = "Build context-aware reasoning applications"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 50d86398ebcf8..a0153b28ef7ba 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -11,6 +11,7 @@ , langsmith , langchain-core , langchain-community +, langchain-text-splitters , numpy , pydantic , pyyaml @@ -51,7 +52,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.1.8"; + version = "0.1.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -60,7 +61,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-zZkz7KlRikUySLlGyoc2a+DRhPahjytV5AowpU8yiRg="; + hash = "sha256-I7H8W85WJCt8Dkep5UvFRVuhJS8uAeg0xF9mNPZwm2g="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -79,6 +80,7 @@ buildPythonPackage rec { jsonpatch langchain-community langchain-core + langchain-text-splitters langsmith numpy pydantic diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 5f3bb399f99ad..5ab6970da9fbf 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -3,17 +3,19 @@ , buildPythonPackage , fetchFromGitHub , freezegun +, orjson , poetry-core , pydantic , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests }: buildPythonPackage rec { pname = "langsmith"; - version = "0.1.3"; + version = "0.1.23"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,16 +24,22 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-apczSNhj39Av5gsIM0QPF9eus3Z4eCv/ztxjHDgG8E0="; + hash = "sha256-AiXTIk20T9symFUenCxnOUXhyNAkffbEt8acEU0EMBg="; }; sourceRoot = "${src.name}/python"; + pythonRelaxDeps = [ + "orjson" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ + orjson pydantic requests ]; diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index 5366311fed3ca..50f74dc2d811a 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , regex , pytestCheckHook +, pythonOlder , js2py , setuptools }: @@ -33,6 +34,9 @@ buildPythonPackage rec { "lark.grammars" ]; + # Js2py is not supported on 3.12 + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ js2py pytestCheckHook diff --git a/pkgs/development/python-modules/ldfparser/default.nix b/pkgs/development/python-modules/ldfparser/default.nix index f4657dce8458e..4b83fb53252ea 100644 --- a/pkgs/development/python-modules/ldfparser/default.nix +++ b/pkgs/development/python-modules/ldfparser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ldfparser"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "c4deszes"; repo = "ldfparser"; rev = "refs/tags/v${version}"; - hash = "sha256-gSjTuMndkzFUDcixJCohuCChhztFXnLpbK/zTOjEBpg="; + hash = "sha256-+7L2WCQEDpWPDBPVt4ddoz0U4YkJ9GqQqp0cKj2fAXM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ledger-bitcoin/default.nix b/pkgs/development/python-modules/ledger-bitcoin/default.nix index c2ad7b47f6c10..8298da004ccff 100644 --- a/pkgs/development/python-modules/ledger-bitcoin/default.nix +++ b/pkgs/development/python-modules/ledger-bitcoin/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "ledger-bitcoin"; - version = "0.2.2"; + version = "0.3.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "ledger_bitcoin"; - hash = "sha256-MEZuwIthIOwBkRdR7dEsEznO+GVBeOf7/5xmwNW1SvI="; + hash = "sha256-rZzerzOkVWK71brmdRAluGmi+B1usCZ90GKgH1klpNU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 43f2e11ef3df3..da2f4525e3d63 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "libarchive-c"; - version = "5.0"; + version = "5.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Changaco"; repo = "python-${pname}"; rev = "refs/tags/${version}"; - sha256 = "sha256-8e3Tnek5q5NJneSVIrbFNTQPjHZ7Ieb14uiKjQwufTE="; + sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk="; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index f79e4d638eba1..96f900f2dd355 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.4"; + version = "3.3.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KRxc34lqOGuYJM2mUsYrjfiVCQNBxcQyO30wPLf17+Q="; + hash = "sha256-nEeDawZ/kChHQA3qoEKy+R+Uy7ogNL3ows3Yzs5OhpY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index c0df7019ed963..fbccd1be73634 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.25.0"; - format = "pyproject"; + version = "0.31.0"; + pyproject = true; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cAogRdhJdXC0lMQRlWwSHQj205mG9uwd1XkFJYsAetA="; + hash = "sha256-MzHS/HzEZ4vDfNRpJ9AU9vFkw7LwloltxyibxEGWRSw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lingua/default.nix b/pkgs/development/python-modules/lingua/default.nix index c218e4a5376f7..7b1f6ba720057 100644 --- a/pkgs/development/python-modules/lingua/default.nix +++ b/pkgs/development/python-modules/lingua/default.nix @@ -15,6 +15,11 @@ buildPythonPackage rec { hash = "sha256-DhqUZ0HbKIpANhrQT/OP4EvwgZg0uKu4TEtTX+2bpO8="; }; + postPatch = '' + substituteInPlace src/lingua/extract.py \ + --replace-fail SafeConfigParser ConfigParser + ''; + nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/linien-client/default.nix b/pkgs/development/python-modules/linien-client/default.nix index 0cbd9b2d9adb0..8997c3454a387 100644 --- a/pkgs/development/python-modules/linien-client/default.nix +++ b/pkgs/development/python-modules/linien-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { inherit (linien-common) src version; - sourceRoot = "source/linien-client"; + sourceRoot = "${src.name}/linien-client"; preBuild = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix index 605fdd6f740e3..f0fd4b920707b 100644 --- a/pkgs/development/python-modules/linien-common/default.nix +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-ZgAp1SEiHijyjK74VZyRLYY3Hzfc3BQ6cnoO3hZzvbE="; }; - sourceRoot = "source/linien-common"; + sourceRoot = "${src.name}/linien-common"; preBuild = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/linknlink/default.nix b/pkgs/development/python-modules/linknlink/default.nix index 7bd25ff015455..44a2a15a8f819 100644 --- a/pkgs/development/python-modules/linknlink/default.nix +++ b/pkgs/development/python-modules/linknlink/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "linknlink"; - version = "0.1.9"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "xuanxuan000"; repo = "python-linknlink"; rev = "refs/tags/${version}"; - hash = "sha256-msKunZsAxA9xpCJmG4MVXuJDMEqrCeShvAqOw8zjSPM="; + hash = "sha256-MOZw+7oFHeH7Vaj6pylR7wqe3ZyHcsiG+n8jnRAQ8PA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index e15ddf71a009f..8f33fcdce4e15 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.23.9"; + version = "1.31.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-5VqYo9JhRwtPnk0z7w7jFKN8/E2JhZ50Zi4HgbFiyhE="; + hash = "sha256-OwIOggEfhvGKVTNiVWAt2osGk3R80U0wmcU6KAshpGw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix new file mode 100644 index 0000000000000..5663e9f118289 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-llms-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-agent-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/agent/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-llms-openai + ]; + + pythonImportsCheck = [ + "llama_index.agent.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix new file mode 100644 index 0000000000000..de4aacdd5adcd --- /dev/null +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-embeddings-openai +, llama-index-llms-openai +, llama-index-vector-stores-chroma +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-cli"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-embeddings-openai + llama-index-llms-openai + llama-index-vector-stores-chroma + ]; + + pythonImportsCheck = [ + "llama_index.cli" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix new file mode 100644 index 0000000000000..8a71591eb27d1 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -0,0 +1,115 @@ +{ lib +, aiohttp +, buildPythonPackage +, dataclasses-json +, deprecated +, dirtyjson +, fetchFromGitHub +, fsspec +, llamaindex-py-client +, nest-asyncio +, networkx +, nltk +, numpy +, openai +, pandas +, pillow +, poetry-core +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, tree-sitter +, sqlalchemy +, tenacity +, tiktoken +, typing-inspect +}: + +buildPythonPackage rec { + pname = "llama-index-core"; + version = "0.10.18"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "run-llama"; + repo = "llama_index"; + rev = "refs/tags/v${version}"; + hash = "sha256-xNPvaXODY159x8Fl3HRdYCdYeFNIieX5TsLTfup8Dtg="; + }; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + dataclasses-json + deprecated + dirtyjson + fsspec + llamaindex-py-client + nest-asyncio + networkx + nltk + numpy + openai + pandas + pillow + pyyaml + requests + sqlalchemy + tenacity + tiktoken + typing-inspect + ]; + + nativeCheckInputs = [ + tree-sitter + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/agent/" + "tests/callbacks/" + "tests/chat_engine/" + "tests/evaluation/" + "tests/indices/" + "tests/ingestion/" + "tests/memory/" + "tests/node_parser/" + "tests/objects/" + "tests/playground/" + "tests/postprocessor/" + "tests/query_engine/" + "tests/question_gen/" + "tests/response_synthesizers/" + "tests/retrievers/" + "tests/selectors/" + "tests/test_utils.py" + "tests/text_splitter/" + "tests/token_predictor/" + "tests/tools/" + ]; + + meta = with lib; { + description = "Data framework for your LLM applications"; + homepage = "https://github.com/run-llama/llama_index/"; + changelog = "https://github.com/run-llama/llama_index/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix new file mode 100644 index 0000000000000..6b371c8169834 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, google-generativeai +, llama-index-core +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-gemini"; + version = "0.1.3"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + google-generativeai + llama-index-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.embeddings.gemini" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix new file mode 100644 index 0000000000000..6cf2d1772163a --- /dev/null +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, google-generativeai +, llama-index-core +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-google"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + google-generativeai + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.embeddings.google" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix new file mode 100644 index 0000000000000..41e3843220f5d --- /dev/null +++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.embeddings.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix new file mode 100644 index 0000000000000..c778fb0e0512a --- /dev/null +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, llama-index-core +}: + +buildPythonPackage rec { + pname = "llama-index-indices-managed-llama-cloud"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/indices/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.indices.managed.llama_cloud" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix new file mode 100644 index 0000000000000..e490c3db7e88d --- /dev/null +++ b/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, llama-index-core +}: + +buildPythonPackage rec { + pname = "llama-index-legacy"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; +} diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix new file mode 100644 index 0000000000000..c0b10abd02510 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, llama-index-core +}: + +buildPythonPackage rec { + pname = "llama-index-llms-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/llms/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.llms.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix new file mode 100644 index 0000000000000..825b001f5c613 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-llms-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-multi-modal-llms-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/multi_modal_llms/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-llms-openai + ]; + + pythonImportsCheck = [ + "llama_index.multi_modal_llms.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix new file mode 100644 index 0000000000000..d30bb7fb709ca --- /dev/null +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-agent-openai +, llama-index-core +, llama-index-llms-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-program-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/program/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-agent-openai + llama-index-core + llama-index-llms-openai + ]; + + pythonImportsCheck = [ + "llama_index.program.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix new file mode 100644 index 0000000000000..a1dadcd941f84 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-llms-openai +, llama-index-program-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-question-gen-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/question_gen/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-llms-openai + llama-index-program-openai + ]; + + pythonImportsCheck = [ + "llama_index.question_gen.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix new file mode 100644 index 0000000000000..4c5503c66071f --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -0,0 +1,52 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +, pymupdf +, pypdf +, pytestCheckHook +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "llama-index-readers-file"; + version = "0.1.7"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + pythonRelaxDeps = [ + "beautifulsoup4" + "pymupdf" + "pypdf" + ]; + + pythonRemoveDeps = [ + "bs4" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + llama-index-core + pymupdf + pypdf + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.readers.file" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix new file mode 100644 index 0000000000000..c29dcd78c4337 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "llama-index-readers-json"; + version = "0.1.2"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.readers.json" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix new file mode 100644 index 0000000000000..b9dfde0273e22 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-parse +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-readers-llama-parse"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-parse + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.readers.llama_parse" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix new file mode 100644 index 0000000000000..773c737f342dd --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +, pyowm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "llama-index-readers-weather"; + version = "0.1.4"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + pyowm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.readers.weather" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix new file mode 100644 index 0000000000000..62e89093066d7 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, chromadb +, fetchFromGitHub +, llama-index-core +, onnxruntime +, poetry-core +, pythonRelaxDepsHook +, tokenizers +}: + +buildPythonPackage rec { + pname = "llama-index-vector-stores-chroma"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/vector_stores/${pname}"; + + pythonRelaxDeps = [ + "onnxruntime" + "tokenizers" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + chromadb + llama-index-core + onnxruntime + tokenizers + ]; + + pythonImportsCheck = [ + "llama_index.vector_stores.chroma" + ]; +} diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix new file mode 100644 index 0000000000000..4e269039722fb --- /dev/null +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, llama-index-agent-openai +, llama-index-cli +, llama-index-core +, llama-index-embeddings-openai +, llama-index-indices-managed-llama-cloud +, llama-index-legacy +, llama-index-llms-openai +, llama-index-multi-modal-llms-openai +, llama-index-program-openai +, llama-index-question-gen-openai +, llama-index-readers-file +, llama-index-readers-llama-parse +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-agent-openai + llama-index-cli + llama-index-core + llama-index-embeddings-openai + llama-index-indices-managed-llama-cloud + llama-index-legacy + llama-index-llms-openai + llama-index-multi-modal-llms-openai + llama-index-program-openai + llama-index-question-gen-openai + llama-index-readers-file + llama-index-readers-llama-parse + ]; + + pythonImportsCheck = [ + "llama_index" + ]; +} diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix new file mode 100644 index 0000000000000..284f03f67a590 --- /dev/null +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-parse"; + version = "0.3.9"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_parse"; + inherit version; + hash = "sha256-vra6Tbt6V3CKtvEPfVMUFZjjneGgQKYeb1pxw6XVaxM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_parse" + ]; + + meta = with lib; { + description = "Parse files into RAG-Optimized formats"; + homepage = "https://pypi.org/project/llama-parse/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llamaindex-py-client/default.nix b/pkgs/development/python-modules/llamaindex-py-client/default.nix new file mode 100644 index 0000000000000..d46e070c9517e --- /dev/null +++ b/pkgs/development/python-modules/llamaindex-py-client/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httpx +, poetry-core +, pydantic +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llamaindex-py-client"; + version = "0.1.13"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llamaindex_py_client"; + inherit version; + hash = "sha256-O9m0Ne4KeBceukEt6lZ02BPrW/NuV308fH6Q7cVJANk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + httpx + pydantic + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "llama_index_client" + ]; + + meta = with lib; { + description = "Client for LlamaIndex"; + homepage = "https://pypi.org/project/llamaindex-py-client/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index ac74a6e3403b4..2184236130edb 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -15,17 +15,16 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.41.1"; + version = "0.42.0"; pyproject = true; - # uses distutils in setup.py - disabled = isPyPy || pythonAtLeast "3.12"; + disabled = isPyPy || pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "numba"; repo = "llvmlite"; rev = "refs/tags/v${version}"; - hash = "sha256-RBgs8L5kOJ8BhEDLB8r8/iVhwuVIPT/rUSmwmBWm4D0="; + hash = "sha256-vN2npyAyN6C340l69YSRtRJrAe4EHSqh4SCgWfeSQaQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix index f8389fc46fcdc..46d362d7a848f 100644 --- a/pkgs/development/python-modules/lomond/default.nix +++ b/pkgs/development/python-modules/lomond/default.nix @@ -47,6 +47,9 @@ buildPythonPackage rec { # Makes HTTP requests "test_proxy" "test_live" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/wildfoundry/dataplicity-lomond/issues/91 + "test_that_on_ping_responds_with_pong" ]; disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [ diff --git a/pkgs/development/python-modules/loqedapi/default.nix b/pkgs/development/python-modules/loqedapi/default.nix index 332edd1c01124..96370c07aac41 100644 --- a/pkgs/development/python-modules/loqedapi/default.nix +++ b/pkgs/development/python-modules/loqedapi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "loqedapi"; - version = "2.1.8"; + version = "2.1.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cpolhout"; repo = "loqedAPI"; rev = "refs/tags/v${version}"; - hash = "sha256-9ekZ98GazH1tna4JT5SEUETKR227UYRIBBghdj+TFB4="; + hash = "sha256-IYzrGqql6mmm+FmasxFJvKgHvg7n81WOu+GGAEQ1+Os="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 6587f99d81186..3d14dbf313e09 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.4"; + version = "1.19.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-aVOviCeYi/oj1Xv7I0d4U+JBU0w3wbjORXOim/g5S7U="; + hash = "sha256-oYwbCpX2mD1RMk/0ymxaA8NF9kaJ+pGQdUKk3l5Jmrs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index a9bdff4e46df9..2ce4565ecf829 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.3.9"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-nZDcSVHR8IKlGBa5ljd3MmgzUPvG7Hv76WRfXxMsndY="; + hash = "sha256-sEim7bCLLkHo6A1onbDQruyNigVKtim5DDAQI8CYUVo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lxml-stubs/default.nix b/pkgs/development/python-modules/lxml-stubs/default.nix index 8df03f5268967..abb0d17f3918e 100644 --- a/pkgs/development/python-modules/lxml-stubs/default.nix +++ b/pkgs/development/python-modules/lxml-stubs/default.nix @@ -1,35 +1,42 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools -, pytestCheckHook -, pytest-mypy-plugins , lxml +, pytest-mypy-plugins +, pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "lxml-stubs"; - version = "0.4.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml-stubs"; - rev = version; - hash = "sha256-RRH/taLtgaXOl0G/ve2Ad7Xy8WRDUG2/k26EFMv1PRM="; + rev = "refs/tags/${version}"; + hash = "sha256-OwaPnCr0vylhdAvMMUfGV6DjZEh7Q71pgMOt66urg5I="; }; nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ lxml ]; + nativeCheckInputs = [ pytestCheckHook pytest-mypy-plugins ]; + disabledTests = [ + # Output difference, https://github.com/lxml/lxml-stubs/issues/101 + "etree_element_iterchildren" + ]; + meta = with lib; { description = "Type stubs for the lxml package"; homepage = "https://github.com/lxml/lxml-stubs"; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 7cfef1d56cfd6..e6d7234a59ce0 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -1,5 +1,13 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub -, cython +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, cython_3 +, setuptools + +# native dependencies , libxml2 , libxslt , zlib @@ -8,25 +16,30 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.9.4"; - format = "setuptools"; + version = "5.1.0"; + pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "lxml"; + repo = "lxml"; rev = "refs/tags/lxml-${version}"; - hash = "sha256-qS20wb83eFapiPZe25BViHpYkjgvnCIZpiYkPNIPHZg="; + hash = "sha256-eWLYzZWatYDmhuBTZynsdytlNFKKmtWQ1XIyzVD8sDY="; }; - patches = [ - # fix compile error with libxml 2.12 - # backport of: https://github.com/lxml/lxml/commit/b0861bea17769584a85f57eb00235ce0ca9811af - ./libxml-2.12.patch - ]; - # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs - nativeBuildInputs = [ libxml2.dev libxslt.dev cython ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; - buildInputs = [ libxml2 libxslt zlib ]; + nativeBuildInputs = [ + libxml2.dev + libxslt.dev + cython_3 + setuptools + ] ++ lib.optionals stdenv.isDarwin [ + xcodebuild + ]; + buildInputs = [ + libxml2 + libxslt + zlib + ]; env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; @@ -35,9 +48,13 @@ buildPythonPackage rec { # tests are meant to be ran "in-place" in the same directory as src doCheck = false; - pythonImportsCheck = [ "lxml" "lxml.etree" ]; + pythonImportsCheck = [ + "lxml" + "lxml.etree" + ]; meta = with lib; { + changelog = "https://github.com/lxml/lxml/blob/lxml-${version}/CHANGES.txt"; description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 4041a1aa3035b..d7be3fabfab72 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.5.1"; + version = "3.5.2"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Python-Markdown"; repo = "markdown"; rev = "refs/tags/${version}"; - hash = "sha256-OeCr72N3ygYYJnI+bIXCt63tSLDFLKznYekTk1sYHZI="; + hash = "sha256-YLOLDiS93zpjJWzkWXcutjZw9iB/FfbjxQXjau2B+JQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index e63af344a3a00..17f8ce118e5b1 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -1,28 +1,54 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi +, pythonOlder + +# build-system +, setuptools + +# tests , pytestCheckHook + +# reverse dependencies +, jinja2 +, mkdocs +, quart +, werkzeug }: buildPythonPackage rec { pname = "markupsafe"; - version = "2.1.3"; - format = "setuptools"; + version = "2.1.5"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "MarkupSafe"; inherit version; - hash = "sha256-r1mO0y1q6G8bdHuCeDlYsaSrj2F7Bv5oeVx/Amq73K0="; + hash = "sha256-0oPTeokLpMGuc/+t+ARkNcdue8Ike7tjwAvRpwnGVEs="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "markupsafe" ]; + pythonImportsCheck = [ + "markupsafe" + ]; + + passthru.tests = { + inherit + jinja2 + mkdocs + quart + werkzeug + ; + }; meta = with lib; { changelog = "https://markupsafe.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${replaceStrings [ "." ] [ "-" ] version}"; diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index 3e4faf8c60313..933f5cc4c8b91 100644 --- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -4,26 +4,29 @@ , marshmallow , pytestCheckHook , pythonOlder -, setuptools +, flit-core }: buildPythonPackage rec { pname = "marshmallow-oneofschema"; - version = "3.0.2"; - format = "setuptools"; + version = "3.1.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marshmallow-code"; - repo = pname; - rev = version; - hash = "sha256-Em2jQmvI5IiWREeOX/JAcdOQlpwP7k+cbCirkh82sf0="; + repo = "marshmallow-oneofschema"; + rev = "refs/tags/${version}"; + hash = "sha256-HXuyUxU8bT5arpUzmgv7m+X2fNT0qHY8S8Rz6klOGiA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ marshmallow - setuptools ]; nativeCheckInputs = [ @@ -35,8 +38,8 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/marshmallow-code/marshmallow-oneofschema/blob/${src.rev}/CHANGELOG.rst"; description = "Marshmallow library extension that allows schema (de)multiplexing"; + changelog = "https://github.com/marshmallow-code/marshmallow-oneofschema/blob/${version}/CHANGELOG.rst"; homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema"; license = licenses.mit; maintainers = with maintainers; [ ivan-tkatchev ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 880e3c869aabf..bbb336884c192 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -1,17 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core +, packaging , pytestCheckHook , pythonOlder , pytz , simplejson -, packaging -, setuptools }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.20.2"; + version = "3.21.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,11 +20,11 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = "marshmallow"; rev = "refs/tags/${version}"; - hash = "sha256-z6Quf6uTelGwB/uYayVXtVmculwaoI5LL8I0kKiM/e8="; + hash = "sha256-KhXasYKooZRokRoFlWKOaQzSUe6tXDtUlrf65eGGUi8="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix index 3db893042d885..cbd95d35fbf35 100644 --- a/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/pkgs/development/python-modules/mdformat-admon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-admon"; - version = "1.0.2"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KyleKing"; repo = "mdformat-admon"; - rev = "v${version}"; - hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU="; + rev = "refs/tags/v${version}"; + hash = "sha256-MRcNExMPH/HIXB2DmN9fA89plo0IZPWXryySK9OZHg8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index 61c57c8e47d5b..e5e47b934fd33 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.30.0"; + version = "0.31.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-gcDJUTg84JugytbUzQzvm3I9YAIboiyvcHe4AcBmpFM="; + hash = "sha256-mgslzRd2hvDI0SbQR3eY2vzvaaOVI6mUihdNPKe4jcg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 53d44ee85d749..cecddbb6eec92 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.42.0"; + version = "1.43.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PZ875cjJUUE92aBoKfgQ3tY8tVN3ksB7nITc8MK0g+w="; + hash = "sha256-llKC5bBVDlSfVDML0a9HEijM+3H5pQVuLxdukJ6sPR0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 2d86a55bd2462..313c1bd0920e3 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "meshio"; - version = "5.3.4"; + version = "5.3.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4kBpLX/yecErE8bl17QDYpqGrStE6SMJWLPwDB7DafA="; + hash = "sha256-8h8Bq9nym6BuoRkwSz055hBCHP6Tud0jNig0kZ+HWG0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index bbc125443e3a1..c531b78130bc4 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.22"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-bAg7Rr17Q+a+S0ZuHcFmmTM0sRcX2w0zRClKdFwix30="; + hash = "sha256-HiksPxV5VTIOV71J0zlC8iiXmF85a0dTYjjnWthhdGY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix new file mode 100644 index 0000000000000..1ffc27845241a --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, opentelemetry-api +, opentelemetry-sdk +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, std-uritemplate +}: + +buildPythonPackage rec { + pname = "microsoft-kiota-abstractions"; + version = "1.3.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-abstractions-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-AsJHKoA50JZBDQ7vob4lI0gEmfhRUELKtgq17tHegUY="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + opentelemetry-api + opentelemetry-sdk + std-uritemplate + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kiota_abstractions" + ]; + + meta = with lib; { + description = "Abstractions library for Kiota generated Python clients"; + homepage = "https://github.com/microsoft/kiota-abstractions-python"; + changelog = "https://github.com/microsoft/kiota-abstractions-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix new file mode 100644 index 0000000000000..5526fab6ceaec --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix @@ -0,0 +1,59 @@ +{ lib +, aiohttp +, azure-core +, buildPythonPackage +, fetchFromGitHub +, flit-core +, microsoft-kiota-abstractions +, opentelemetry-api +, opentelemetry-sdk +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "microsoft-kiota-authentication-azure"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-authentication-azure-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-RA0BbIwDs3cXiH4tQsvCGUO1OAg+DWjEeWd7MEVIC8E="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + aiohttp + azure-core + microsoft-kiota-abstractions + opentelemetry-api + opentelemetry-sdk + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kiota_authentication_azure" + ]; + + meta = with lib; { + description = "Kiota Azure authentication provider"; + homepage = "https://github.com/microsoft/kiota-authentication-azure-python"; + changelog = "https://github.com/microsoft/kiota-authentication-azure-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix new file mode 100644 index 0000000000000..a84613b82e3b2 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, httpx +, microsoft-kiota-abstractions +, opentelemetry-api +, opentelemetry-sdk +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, urllib3 +}: + +buildPythonPackage rec { + pname = "microsoft-kiota-http"; + version = "1.3.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-http-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-I16WARk6YBr8KgE9MtHcA5VdsnLXBKcZOaqRL/eqwKE="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + httpx + microsoft-kiota-abstractions + opentelemetry-api + opentelemetry-sdk + ] ++ httpx.optional-dependencies.http2; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + urllib3 + ]; + + pythonImportsCheck = [ + "kiota_http" + ]; + + meta = with lib; { + description = "HTTP request adapter implementation for Kiota clients for Python"; + homepage = "https://github.com/microsoft/kiota-http-python"; + changelog = "https://github.com/microsoft/kiota-http-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix new file mode 100644 index 0000000000000..40840436fa015 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, microsoft-kiota-abstractions +, pendulum +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "kiota-serialization-json"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-serialization-json-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-DhuDIRTm6xATnXpQ+xLpMuaBcWxZHdr8dO1Rl8OvCKQ="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + microsoft-kiota-abstractions + pendulum + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kiota_serialization_json" + ]; + + disabledTests = [ + # Test compare an output format + "test_parse_union_type_complex_property1" + ]; + + meta = with lib; { + description = "JSON serialization implementation for Kiota clients in Python"; + homepage = "https://github.com/microsoft/kiota-serialization-json-python"; + changelog = "https://github.com/microsoft/kiota-serialization-json-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix new file mode 100644 index 0000000000000..64e00d4778757 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, microsoft-kiota-abstractions +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, python-dateutil +, pythonOlder +}: + +buildPythonPackage rec { + pname = "kiota-serialization-text"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-serialization-text-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-jPuRfvqO4n5/PjSOS5NMCawaYRhXmrZtfg6LgYFCv7o="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + microsoft-kiota-abstractions + python-dateutil + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kiota_serialization_text" + ]; + + meta = with lib; { + description = "Text serialization implementation for Kiota generated clients in Python"; + homepage = "https://github.com/microsoft/kiota-serialization-text-python"; + changelog = "https://github.com/microsoft/kiota-serialization-text-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index ddb2905bc1d95..e86f1ae1d7bc4 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -11,6 +11,7 @@ , certifi , urllib3 , pycryptodome +, typing-extensions # test , faker @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.0"; + version = "7.2.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,9 +30,14 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-hZn1T75JbnJ5lIyWnX3f8r6OET/d6ZltuRr6jjYOp2o="; + hash = "sha256-Xb6XaGI/bwkhp6YKgoqi5Tbs74pSXc6aJpWVUgG5uR4="; }; + postPatch = '' + substituteInPlace tests/unit/crypto_test.py \ + --replace-fail "assertEquals" "assertEqual" + ''; + nativeBuildInputs = [ setuptools ]; @@ -41,6 +47,7 @@ buildPythonPackage rec { certifi urllib3 pycryptodome + typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 4dd3baeb614c6..860900902794a 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.2.2"; + version = "10.2.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-oxhpaFW++on3eRXm0anXZDRo6g/X5IflTcZkFF8Kcps="; + hash = "sha256-6TPhxprrP6Bgc1yAhN3pBdr98WpvfGnVNvkNtFxROgE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix index 473520177177c..64e1f45d29de2 100644 --- a/pkgs/development/python-modules/mixpanel/default.nix +++ b/pkgs/development/python-modules/mixpanel/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mixpanel"; - version = "4.10.0"; + version = "4.10.1"; format = "setuptools"; src = fetchFromGitHub { owner = "mixpanel"; repo = "mixpanel-python"; rev = "refs/tags/v${version}"; - hash = "sha256-jV2NLEc23uaI5Q7ZXDwGaZV9iAKQLMAETRTw8epZwQA="; + hash = "sha256-i5vT5FTnw+BanHHrlRsPJ3EooZjQcaosbaHoh/uPRmQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 317271a10d559..0aeb5cbe34214 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.6"; + version = "9.5.13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-t+kS/MZ6kfga+LPSBj0h+vkY/u/bd3iqRUyOHXfrwDU="; + hash = "sha256-SFLCNFJNlyJ09d4VsWsxdw7Ctyv1pFHXdqPgBflH294="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index d73ccba230410..de1ae5e6c72e0 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-beLZpf0Zjk6LjveD7c+1XEi4SpQnmmZZOM8dIvzqZGI="; + hash = "sha256-RzyOhlfjLtiG5jelrRG8yS7AWQJuaJMVuNkGpNBGO64="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 219f0e63c7b1f..39f18a39b0050 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.24.0"; + version = "0.24.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-UqX2jNNYwDNhb71qGdjHNoo2MmSxjf/bZiUoSxlE2XQ="; + hash = "sha256-6Th/HckxcCIupQWQglK+4ReXB6sdIDE8/nWgP42iqIQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 1ec7760eaeb7c..1bed42479c8a8 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -6,11 +6,11 @@ , databricks-cli , docker , entrypoints -, fetchpatch , fetchPypi , flask , gitpython , gorilla +, graphene , gunicorn , importlib-metadata , markdown @@ -28,9 +28,9 @@ , pyyaml , querystring-parser , requests +, setuptools , scikit-learn , scipy -, shap , simplejson , sqlalchemy , sqlparse @@ -38,25 +38,23 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.10.2"; - format = "setuptools"; + version = "2.11.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Pd8yuiwB2seeTQd9S7ntRtgqCC3JkiMgfVYsfua+5nE="; + hash = "sha256-ouwp7oYvGZVSCPuOBeUeXp0u3HF143zxNtlDuYGoJOk="; }; - postPatch = '' - substituteInPlace requirements/core-requirements.txt \ - --replace "gunicorn<21" "gunicorn" - ''; - # Remove currently broken dependency `shap`, a model explainability package. # This seems quite unprincipled especially with tests not being enabled, # but not mlflow has a 'skinny' install option which does not require `shap`. - nativeBuildInputs = [ pythonRelaxDepsHook ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; pythonRemoveDeps = [ "shap" ]; pythonRelaxDeps = [ "pytz" "pyarrow" ]; @@ -70,6 +68,7 @@ buildPythonPackage rec { flask gitpython gorilla + graphene gunicorn importlib-metadata markdown diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index dd4e9095325fa..347d22d569e05 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -69,6 +69,10 @@ buildPythonPackage rec { disabledTestPaths = [ # AttributeError "tests/test_fileio/test_backends/test_petrel_backend.py" + # Freezes forever? + "tests/test_runner/test_activation_checkpointing.py" + # missing dependencies + "tests/test_visualizer/test_vis_backend.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index f142d1288ef37..e4f67df674013 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,27 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: +{ lib +, buildPythonPackage +, fetchPypi +, hatchling +, numpy +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "1.4.0"; - format = "setuptools"; pname = "mockito"; + version = "1.5.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QJq2BMnr4bt9wY7GsO2YqK1RJ7CCc/WASyL00bUeUiI="; + hash = "sha256-A2Eo2n2vLaiaC2N71zMh6ZL/ZbqKOYdsojPuwX63fo8="; }; - propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; - nativeCheckInputs = [ pytest numpy ]; + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + numpy + pytestCheckHook + ]; - # tests are no longer packaged in pypi tarball - doCheck = false; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "mockito" ]; meta = with lib; { description = "Spying framework"; homepage = "https://github.com/kaste/mockito-python"; + changelog = "https://github.com/kaste/mockito-python/blob/${version}/CHANGES.txt"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index 34b1b650da08a..34b1b650da08a 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 80256a11bfdb4..77c7547e0b69f 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "monty"; - version = "2024.2.2"; + version = "2024.2.26"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = "monty"; rev = "refs/tags/v${version}"; - hash = "sha256-tKt0IMUmx1WvnQ27PyeyEEGekOKGY33YX4af1/ipbk4="; + hash = "sha256-+NxgZ8JCoAih4nHq+KP4jym0xnKCjUXJqs+xPpKZPbs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index f6b2fc5fb241d..7d8aa5a784006 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.21"; + version = "0.6.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - hash = "sha256-zWEVgBEjxc0mg9KhlU1UvAd7HzQ2Rvsnsa2Q+/KxrHw="; + hash = "sha256-f5R58p6tMVqmXAjybae8qjeNI3vxtGJ7qxZOl9H5iKw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 7f5b42e4d2f04..071b7f3ddb647 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "moto"; - version = "4.2.11"; + version = "4.2.13"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LaYtUuqnZd/idiySDwqIpY86CeBFgckduWfZL67ISPE="; + hash = "sha256-Aa72pImnJcjXJb09xvcP8b7a7j4mQXUuS0cf8O3ktNc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index 64c6d8dd1ad12..436baf50202e7 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.33"; + version = "0.3.41"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-YTqiZCM5Dvsse+isQ4WSQgHfDGAVtmYVLHPR4Mmme6Q="; + hash = "sha256-1L9e2A2u+4+QEWJW2ikuENLD0x5Khjfr7I6p+Vt4nwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix index 97cd5fd78e85b..0a28d82f74ad4 100644 --- a/pkgs/development/python-modules/mrjob/default.nix +++ b/pkgs/development/python-modules/mrjob/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub # propagates @@ -25,7 +26,9 @@ buildPythonPackage rec { pname = "mrjob"; version = "0.7.4"; - format = "setuptools"; + + # https://github.com/Yelp/mrjob/issues/2222 + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "Yelp"; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index fb6eff799fbfa..6b983174f05f3 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.26.0"; + version = "1.27.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IkdWB5/jOL6DhzdoK0n468IKh8HF7q9ZDarkUyuD3hU="; + hash = "sha256-MQlQPAOLprMHFSsOjTT5gRPy56eJhuKNC69bUwOv2lI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mscerts/default.nix b/pkgs/development/python-modules/mscerts/default.nix index 400e0c2774e8c..9dc16828c8697 100644 --- a/pkgs/development/python-modules/mscerts/default.nix +++ b/pkgs/development/python-modules/mscerts/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "mscerts"; - version = "2023.11.29"; + version = "2024.2.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ralphje"; repo = "mscerts"; rev = "refs/tags/${version}"; - hash = "sha256-TNwpWxknCUcvXFy3UInrEx4iFZi/hLS7exvJBv3DlWo="; + hash = "sha256-ReUDpax4tvw4ZCH8zOipelIPtHi7BdgLHI/r3FNpo1c="; }; # extras_require contains signify -> circular dependency diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 3463931a1cb6c..5f4f9869e3047 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -9,16 +9,18 @@ , isodate , pytest-aiohttp , pytestCheckHook +, pythonAtLeast , pythonOlder , requests , requests-oauthlib +, setuptools , trio }: buildPythonPackage rec { pname = "msrest"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-1EXXXflhDeU+erdI+NsWxSX76ooDTl3+MyQwRzm2xV0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-core aiodns @@ -56,6 +62,12 @@ buildPythonPackage rec { "test_conf_async_requests" "test_conf_async_requests" "test_conf_async_trio_requests" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: 'TestAuthentication' object has no attribute... + "test_apikey_auth" + "test_cs_auth" + "test_eventgrid_auth" + "test_eventgrid_domain_auth" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index e564a0fd5959d..b997cd9b5065c 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -1,41 +1,52 @@ -{ pkgs -, lib +{ lib +, adal , buildPythonPackage , fetchFromGitHub -, isPy3k -, adal -, msrest -, mock , httpretty -, pytest +, mock +, msrest , pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { - version = "0.6.4"; - format = "setuptools"; pname = "msrestazure"; + version = "0.6.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # Pypi tarball doesnt include tests - # see https://github.com/Azure/msrestazure-for-python/pull/133 src = fetchFromGitHub { owner = "Azure"; repo = "msrestazure-for-python"; - rev = "v${version}"; - sha256 = "0ik81f0n6r27f02gblgm0vl5zl3wc6ijsscihgvc1fgm9f5mk5b5"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZZVZi0v1ucD2g5FpLaNhfNBf6Ab10fUEcEdkY4ELaEY="; }; - propagatedBuildInputs = [ adal msrest ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + adal + msrest + ]; - nativeCheckInputs = [ httpretty mock pytest ] - ++ lib.optionals isPy3k [ pytest-asyncio ]; + nativeCheckInputs = [ + httpretty + mock + pytest-asyncio + pytestCheckHook + ]; - checkPhase = '' - pytest tests/ - ''; + pythonImportsCheck = [ + "msrest" + ]; - meta = with pkgs.lib; { - description = "The runtime library 'msrestazure' for AutoRest generated Python clients."; + meta = with lib; { + description = "The runtime library 'msrestazure' for AutoRest generated Python clients"; homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.mit; maintainers = with maintainers; [ bendlas jonringer ]; diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index ed60720643a71..098e2a768cc00 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mujoco"; - version = "3.1.2"; + version = "3.1.3"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-U1MLwakZA/P9Sx6ZgYzDj72ZEXANspssn8g58jv6y7g="; + hash = "sha256-9wDQdAMQYLRhEd22BDLQBCX4Ie7q8MzHbtldR4Yb1N4="; }; nativeBuildInputs = [ cmake setuptools ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 79646183fa18b..5588fcbdc5b0d 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,35 +1,44 @@ { lib -, stdenv , fetchPypi , buildPythonPackage , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "multidict"; - version = "6.0.4"; + version = "6.0.5"; disabled = pythonOlder "3.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-NmaQZJLvt2RTwOe5fyz0WbBoLnQCwEialUhJZdvB2kk="; + hash = "sha256-9+MBB17a9QUA8LNBVDxBGU2N865cr0cC8glfPKc92No="; }; postPatch = '' - sed -i '/^addopts/d' setup.cfg + substituteInPlace pytest.ini \ + --replace-fail "-p pytest_cov" "" + sed -i '/--cov/d' pytest.ini + # `python3 -I -c "import multidict"` fails with ModuleNotFoundError + substituteInPlace tests/test_circular_imports.py \ + --replace-fail '"-I",' "" ''; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ - # error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' - "-Wno-error=int-conversion" + nativeBuildInputs = [ + setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + # import from $out + rm -r multidict + ''; + pythonImportsCheck = [ "multidict" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index a51b5df67c23b..e02abac1b4f88 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.23.1"; + version = "7.23.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-dbf2rHDQSeHEIN31yIm1142Z7AxTZzMf9FGvrWsJblA="; + hash = "sha256-v5/3TCEtDXbmitb3e15XWkW8VO5nJk8TCVvVyh5rAMs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 070e93de7c53c..fd96cc0aa78ae 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1,9 +1,10 @@ { lib , boto3 , buildPythonPackage +, fetchPypi , pythonOlder +, setuptools , typing-extensions -, fetchPypi }: let toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str; @@ -12,7 +13,7 @@ let buildPythonPackage rec { pname = "mypy-boto3-${serviceName}"; inherit version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,6 +21,10 @@ let inherit pname version hash; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ boto3 ] ++ lib.optionals (pythonOlder "3.12") [ @@ -42,39 +47,39 @@ let }; in rec { - mypy-boto3-accessanalyzer = buildMypyBoto3Package "accessanalyzer" "1.34.0" "sha256-pdbHDyL7zVOJ38WvH9c9pxhDZhJvAyEuH6C+x9QChdE="; + mypy-boto3-accessanalyzer = buildMypyBoto3Package "accessanalyzer" "1.34.54" "sha256-ZglQkseFlqe160S+v5baZ3rfI5QqKsh9IIRPOJEcD3E="; mypy-boto3-account = buildMypyBoto3Package "account" "1.34.0" "sha256-C2iAiA83tZ/7XRlccf1iddDfDNkuO2F0B5aOxKbHy2Q="; mypy-boto3-acm = buildMypyBoto3Package "acm" "1.34.0" "sha256-SvDBi8A9414Hxb8twcM/6Y2OoUz+/LbZZJ86lu/zmmo="; - mypy-boto3-acm-pca = buildMypyBoto3Package "acm-pca" "1.34.0" "sha256-vQ3bj9v52Xjjs3tjUZoDpCwcN7q6tpn8bZJAyyIaX5w="; + mypy-boto3-acm-pca = buildMypyBoto3Package "acm-pca" "1.34.28" "sha256-4x4M49/Ot/HDZrA30PCu0OzXn3636dxCO4exR3lJAUs="; mypy-boto3-alexaforbusiness = buildMypyBoto3Package "alexaforbusiness" "1.34.0" "sha256-wrMSoM3F0HgajmM9X6P+3i6mqD55TWGVv8eJ7XqNjrw="; - mypy-boto3-amp = buildMypyBoto3Package "amp" "1.34.0" "sha256-zdXxnk9+cNRSj4cZLIJiFVRaBZaXOf/C+UaTp6JkZ0U="; + mypy-boto3-amp = buildMypyBoto3Package "amp" "1.34.39" "sha256-XOousDfEQsZ9z48iH2wVHuUaIwoECwbkHvIAlV3+zu4="; - mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.34.0" "sha256-dWI0x6Ro0FOIeraID9XVLOKMWdKxQy5ywVathCQz2Pc="; + mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.34.45" "sha256-hV0fg6Y39NkZ6Qa6GyIYicMERjCBAjZYcSsJ+1jXAfA="; mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.34.0" "sha256-wP6fOHAUg4dvrlQ2rUNk/lgIr6JnpWu/0Tr2prTckOk="; - mypy-boto3-amplifyuibuilder = buildMypyBoto3Package "amplifyuibuilder" "1.34.0" "sha256-1G/VwrU4zUrIw7mojXX5rHxdDUI77iOE2Kl7LJmPjz0="; + mypy-boto3-amplifyuibuilder = buildMypyBoto3Package "amplifyuibuilder" "1.34.51" "sha256-umxA1d0jlSysBkUFP8VPRMwuwYxdsRz0yRH7lgr/Hhc="; - mypy-boto3-apigateway = buildMypyBoto3Package "apigateway" "1.34.0" "sha256-PHJBIJccdPtlqU635LkqOkso32xwygSgBwcubHP27ac="; + mypy-boto3-apigateway = buildMypyBoto3Package "apigateway" "1.34.56" "sha256-WrFdsw1zAZg4TWRF1QzB/smDYbhTZt0JKxDpufShoss="; mypy-boto3-apigatewaymanagementapi = buildMypyBoto3Package "apigatewaymanagementapi" "1.34.0" "sha256-911Sd+7hnHpAhDFE2lDhl+b3Pewd5QWWOPdg+TcZ6VU="; mypy-boto3-apigatewayv2 = buildMypyBoto3Package "apigatewayv2" "1.34.0" "sha256-ydpZ3osSSMwTtGsnRn1SygX5d9Kq8jHwqdQDKcmKXTY="; - mypy-boto3-appconfig = buildMypyBoto3Package "appconfig" "1.34.0" "sha256-mhA3LnS9upyI89XPjdTOaTKWbHMRF/xIhnYl432s6x4="; + mypy-boto3-appconfig = buildMypyBoto3Package "appconfig" "1.34.58" "sha256-f073cXEkDyzkPeOPclhS0O6ZVvEmYPkGPMXrAD8LkE4="; - mypy-boto3-appconfigdata = buildMypyBoto3Package "appconfigdata" "1.34.0" "sha256-W0hEQ5i8Ef+cuAZZ5nBRaJhAzUC/iDqwbB16RXC1dq0="; + mypy-boto3-appconfigdata = buildMypyBoto3Package "appconfigdata" "1.34.24" "sha256-pSo1Qw6ZKN0XzERlCRmCtvJEOjgyd+a82t6Q3pPaU8Q="; mypy-boto3-appfabric = buildMypyBoto3Package "appfabric" "1.34.0" "sha256-wjvOtCvFrj+YPvyqvR8cKIvwvC6x15WeSX6PkNp4OWg="; mypy-boto3-appflow = buildMypyBoto3Package "appflow" "1.34.0" "sha256-XruMwzBrjV7QTHOcHKqszt75cHX+578wbTwFMwyXHzE="; - mypy-boto3-appintegrations = buildMypyBoto3Package "appintegrations" "1.34.0" "sha256-dh804kGi00kWB2mCj7SPpdDh675A77KkxU9A0TjenmU="; + mypy-boto3-appintegrations = buildMypyBoto3Package "appintegrations" "1.34.6" "sha256-iVaOlWOiCeocOJpcsxF0hlzKhGE3iq6Z7OifLWA3kkM="; mypy-boto3-application-autoscaling = buildMypyBoto3Package "application-autoscaling" "1.34.0" "sha256-xW+Rc6yjDBviNDBDB63ssg0aPZFytaVfrVlA32wY/D4="; @@ -84,19 +89,19 @@ rec { mypy-boto3-appmesh = buildMypyBoto3Package "appmesh" "1.34.0" "sha256-AXJ4z/54qPQeHKbZF6Is4OXt9/gZNacmYnLwfxPcn+E="; - mypy-boto3-apprunner = buildMypyBoto3Package "apprunner" "1.34.0" "sha256-w6gwD3m+nbsVvNaWbBnTjktLfkL08XsawNJWYzEgMLI="; + mypy-boto3-apprunner = buildMypyBoto3Package "apprunner" "1.34.11" "sha256-p4txQ08e6jpYiJmjG/JIXyObXhTnlXB8S5QDtUPUFt0="; - mypy-boto3-appstream = buildMypyBoto3Package "appstream" "1.34.0" "sha256-wSUalYAu+1FHxM67tZdodL3PqBV4du07p+6yHYRmFNE="; + mypy-boto3-appstream = buildMypyBoto3Package "appstream" "1.34.5" "sha256-1m9YDw1fzoe4Y37yW6a1545SR2QGSrr5qbqYfXEax7o="; - mypy-boto3-appsync = buildMypyBoto3Package "appsync" "1.34.0" "sha256-5PjtOGmd/65OE57chi0Uk2rUtd9Dr2i4ZaeSv92AxBo="; + mypy-boto3-appsync = buildMypyBoto3Package "appsync" "1.34.49" "sha256-J2qTVaXhqsfdupN6eLgpyGTHkPRRC1TZGNP2PRKF0v0="; mypy-boto3-arc-zonal-shift = buildMypyBoto3Package "arc-zonal-shift" "1.34.0" "sha256-FhQaiu0Sc4HkkaRuhtgvUBMOgj80DbIBzZLEbZB41Cs="; - mypy-boto3-athena = buildMypyBoto3Package "athena" "1.34.0" "sha256-tBvQLE3zxj/4y1Yj05DoZ7pJgQxOJom+S5WnOo/afrE="; + mypy-boto3-athena = buildMypyBoto3Package "athena" "1.34.23" "sha256-PDvz2+2XcNi/nYkGjOeb8t1JbIN+SxSSifU6sDXoNyc="; mypy-boto3-auditmanager = buildMypyBoto3Package "auditmanager" "1.34.0" "sha256-22Xkl1A5wzKDpRQcr/lp7gQsDPtQjvjK3nBm5O2ZS+k="; - mypy-boto3-autoscaling = buildMypyBoto3Package "autoscaling" "1.34.0" "sha256-zXvepguIpLfim5EOBOG7Rr86AmW8twHqF+mRj5mkLjs="; + mypy-boto3-autoscaling = buildMypyBoto3Package "autoscaling" "1.34.54" "sha256-MGACE7CeturY9BN6Gq3VAvz4TqeoQ/ASlSdbX9LLTbQ="; mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.34.0" "sha256-16siojcxNe5MuSZSRJXPAz2UudJozEEyCYUrsGNDAM8="; @@ -106,15 +111,15 @@ rec { mypy-boto3-backupstorage = buildMypyBoto3Package "backupstorage" "1.34.0" "sha256-Y8kjZ+ov8OsiJ8Sm1LlvP8YbgVc+AkLkbZIhOh4y7ZY="; - mypy-boto3-batch = buildMypyBoto3Package "batch" "1.34.0" "sha256-prxGVwUz+e2fS2hxwiPdvRaWrfNaE+GnzQoauz/eit8="; + mypy-boto3-batch = buildMypyBoto3Package "batch" "1.34.59" "sha256-rsXdh8f3KRAROftePejdLxChRqtiaDFsJyhctX7jRUQ="; - mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.34.0" "sha256-quSSSSS54q41Y3I5KLT/siGjdvTtIich6joF/jye07M="; + mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.34.1" "sha256-uXxQkoe2u3idcYta9YFbjxoK8HsvUiRQSyYrYhVi1kU="; - mypy-boto3-braket = buildMypyBoto3Package "braket" "1.34.0" "sha256-32tO2+oW3RgsVU8LVhKTKUcHLfeamcjslyuy9gDMUko="; + mypy-boto3-braket = buildMypyBoto3Package "braket" "1.34.39" "sha256-laMrKu9oN5a9yvB8lyhdjpq5hm1HGAFn3iJ0lReRpOI="; mypy-boto3-budgets = buildMypyBoto3Package "budgets" "1.34.0" "sha256-gs8JYnpFNOMWppBO2R3DO+c6RecQC0vzaox5DqXCKOA="; - mypy-boto3-ce = buildMypyBoto3Package "ce" "1.34.0" "sha256-P91yDeobSBrtSnkwTp1bATY/kxJn3unGsdO1SlUtqLE="; + mypy-boto3-ce = buildMypyBoto3Package "ce" "1.34.52" "sha256-KHimN6KC8V6nyp6ZQbv0XAuWMjGZkg/bPrQ6do5QQE0="; mypy-boto3-chime = buildMypyBoto3Package "chime" "1.34.0" "sha256-/IBkHJf4t1K/Ubdf/hUw5XToNBTCziMfTSdksxMwA2Q="; @@ -122,7 +127,7 @@ rec { mypy-boto3-chime-sdk-media-pipelines = buildMypyBoto3Package "chime-sdk-media-pipelines" "1.34.0" "sha256-h5RD+anRtH0UQ5pFjhygN9oZDFdIRZMfGXSKlT2HuSY="; - mypy-boto3-chime-sdk-meetings = buildMypyBoto3Package "chime-sdk-meetings" "1.34.0" "sha256-WgkY9NZsDxKc38kzlUFciLj/rqJ6S/rxFPOzerCsS84="; + mypy-boto3-chime-sdk-meetings = buildMypyBoto3Package "chime-sdk-meetings" "1.34.4" "sha256-AmwzLd8iLGdmo1Ajv4IVrxwyf/UljG0I06um2S3PG+E="; mypy-boto3-chime-sdk-messaging = buildMypyBoto3Package "chime-sdk-messaging" "1.34.0" "sha256-8Pq48GBFKQRdmoAu9qxAR14xRSP8/roBrZHxzaTBB54="; @@ -130,13 +135,13 @@ rec { mypy-boto3-cleanrooms = buildMypyBoto3Package "cleanrooms" "1.34.0" "sha256-gucAudT1eWqm/y/gynY7pgBXbs5n7fnzfeSlVQad7HI="; - mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.34.0" "sha256-uX7dER+xkJj38UtmtLpg17CAdaUQi6/CVoRzU/J87v0="; + mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.34.24" "sha256-fryD7UfO5cdFS7vMxmZaT9LW4nNSGTQCd3NyD60f9wA="; mypy-boto3-cloudcontrol = buildMypyBoto3Package "cloudcontrol" "1.34.0" "sha256-81M2llb46sviZ874/vHVaqOU1PvQs+Zdil8bxr1pEWM="; mypy-boto3-clouddirectory = buildMypyBoto3Package "clouddirectory" "1.34.0" "sha256-lWJQClNEhyq9CN8ThcHtVcEsowIp+V8RXh4rgHAclfM="; - mypy-boto3-cloudformation = buildMypyBoto3Package "cloudformation" "1.34.0" "sha256-myXfnvFdncjk6JLMB6qTQ/FfLtXrfTPrXrZa36Y/U48="; + mypy-boto3-cloudformation = buildMypyBoto3Package "cloudformation" "1.34.61" "sha256-fT48eggnNyP/cPXoXvm386zWKfmuyhAyxrtUGwOem0c="; mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.34.0" "sha256-3n/WEiQdcE253J+CFsskoYlNMXASdzkhPTWneSHDKoM="; @@ -148,19 +153,19 @@ rec { mypy-boto3-cloudsearchdomain = buildMypyBoto3Package "cloudsearchdomain" "1.34.0" "sha256-jhhwFXH80aZjVqVMZulwoCvu3EmXj4BbJ3DQ6eJPS4E="; - mypy-boto3-cloudtrail = buildMypyBoto3Package "cloudtrail" "1.34.0" "sha256-24CHnUhqXR0cBPFbdvLGBNO77kKNM5FUnQ+FjQ7QZlg="; + mypy-boto3-cloudtrail = buildMypyBoto3Package "cloudtrail" "1.34.59" "sha256-0gwq1zhZcLc8gVGo337AqqC39w8MJR6JK948No/yzVA="; mypy-boto3-cloudtrail-data = buildMypyBoto3Package "cloudtrail-data" "1.34.0" "sha256-ACiJrI+VTHr06i8PKgDY/K8houFUZQNS1lluouadCTQ="; - mypy-boto3-cloudwatch = buildMypyBoto3Package "cloudwatch" "1.34.0" "sha256-zBiqKxqJ60iYpsIT21lKv2L+mvym6Ma9mqBLmZYZNjU="; + mypy-boto3-cloudwatch = buildMypyBoto3Package "cloudwatch" "1.34.40" "sha256-M/C3Rzie5dcv6TGVl7ilI5WiT1uYFrCGL+7Fga+xSLw="; mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.34.0" "sha256-iUgoanqMSyxRopVctyFLiu+otFSgRvdgQPw4mKX3QIk="; - mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.0" "sha256-d77ekJZom4AmSFKjIdVxMPJjCrl+yxpOLvkmOFp08x4="; + mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.59" "sha256-dkX5QeHjfBrY8mU+/5tKVkJlqAodBYqkW8oei1iqTl0="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.34.0" "sha256-TsXVy8bx6kaj84PJiNNU+075Tx3WW0mrtZFOyLx9yT4="; - mypy-boto3-codecommit = buildMypyBoto3Package "codecommit" "1.34.0" "sha256-uxOfWHCeWBYWnNgWaopcJkS0GH/CaW4J4FoXhPvh3VM="; + mypy-boto3-codecommit = buildMypyBoto3Package "codecommit" "1.34.6" "sha256-wCw6e7yvMjM+A6jXfB2D4Z+i9s3e/F9Ih/VxD6iiwws="; mypy-boto3-codedeploy = buildMypyBoto3Package "codedeploy" "1.34.0" "sha256-Sxtcl/fO+A2/s/6O3VC1BPIJ3dDamshEEmKXqyg4fN8="; @@ -170,39 +175,39 @@ rec { mypy-boto3-codeguruprofiler = buildMypyBoto3Package "codeguruprofiler" "1.34.0" "sha256-pAZL9m0SHRYiIrXzBf+IeEkQOXS4/6OJqoDI6og3N5s="; - mypy-boto3-codepipeline = buildMypyBoto3Package "codepipeline" "1.34.0" "sha256-3GNLNY7OYm3bonTrMenNrGiUJiFWEKbv2mBZWMUlTmc="; + mypy-boto3-codepipeline = buildMypyBoto3Package "codepipeline" "1.34.43" "sha256-omGtS0+5qBDBxCcKoOM+dsraE22m129zYUJB2yRxBtQ="; mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.34.0" "sha256-BAueRLlYZGDiF6DtjxL24twLYYZqD3ErdJ73fsFoG1k="; - mypy-boto3-codestar-connections = buildMypyBoto3Package "codestar-connections" "1.34.0" "sha256-FTz1h4fD+P6L+tgTXs+4iyeowYIejH2o/TwMyby9CXE="; + mypy-boto3-codestar-connections = buildMypyBoto3Package "codestar-connections" "1.34.60" "sha256-WH/cN8BXG7c79gGR/0m3xvEPNdPAFRosInmO9DeAVdM="; mypy-boto3-codestar-notifications = buildMypyBoto3Package "codestar-notifications" "1.34.0" "sha256-JmXEpHbOhcO9F++G+ohXPuXoNILbcL9r5qyH4OooCtc="; mypy-boto3-cognito-identity = buildMypyBoto3Package "cognito-identity" "1.34.0" "sha256-6UlyNX0a1wG5FR/WHMZOwysikGffNCX6Fo1MYvFuFwM="; - mypy-boto3-cognito-idp = buildMypyBoto3Package "cognito-idp" "1.34.0" "sha256-WVg6clR26IqKS/GhAjK++6wrlzdDpM8Y1hovoTjNoQw="; + mypy-boto3-cognito-idp = buildMypyBoto3Package "cognito-idp" "1.34.59" "sha256-kZpXb5MzK4IceWnNs9tWWLhQnysfWGuOLf00J4/ypvw="; mypy-boto3-cognito-sync = buildMypyBoto3Package "cognito-sync" "1.34.0" "sha256-JTkmpEHwKN5IyoGVs4beVAEOr1fZPxBoYjzNBgjTEY0="; - mypy-boto3-comprehend = buildMypyBoto3Package "comprehend" "1.34.0" "sha256-C3KrC4tHmNHLe0Hl5TIE0vWZsB9z8wDNRr1SXSsH4e0="; + mypy-boto3-comprehend = buildMypyBoto3Package "comprehend" "1.34.30" "sha256-G7mSJWcr0ntPX6WoaeTWPw/uB32yn6xXPyyQvDVfa8s="; mypy-boto3-comprehendmedical = buildMypyBoto3Package "comprehendmedical" "1.34.0" "sha256-4KzL56xU474te8tW5xVZo6D5Pwe3GLRQbQfX8CXTz9g="; mypy-boto3-compute-optimizer = buildMypyBoto3Package "compute-optimizer" "1.34.0" "sha256-k/4Ixaf9n4J8Y5ELjuMZ2dn7DgKftmwQZfdHhYDMc6w="; - mypy-boto3-config = buildMypyBoto3Package "config" "1.34.0" "sha256-Yr0Cp6vDk/+lGc6ehCIncSbNGxexR3t8ZaH7abEc8DI="; + mypy-boto3-config = buildMypyBoto3Package "config" "1.34.45" "sha256-LN1CcIOj9cgzSNCvnUVwLRNPXlitHAlt+5jj6wu6i8E="; - mypy-boto3-connect = buildMypyBoto3Package "connect" "1.34.0" "sha256-bAJDjrOQMLJx/iVT8r6nl4x6DGb8vqHeOOVcw4LukOI="; + mypy-boto3-connect = buildMypyBoto3Package "connect" "1.34.61" "sha256-LbiRcZWmULytWtEy0J2mXqQtHofbbfbRV2PyvEFcRfA="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.34.0" "sha256-Wx9vcjlgXdWZ2qP3Y/hTY2LAeTd+hyyV5JSIuKQ5I5k="; - mypy-boto3-connectcampaigns = buildMypyBoto3Package "connectcampaigns" "1.34.0" "sha256-acfJ74LRwrfpwnBA2JjoqhiRrHjlaNUXLBvKP0RiAiA="; + mypy-boto3-connectcampaigns = buildMypyBoto3Package "connectcampaigns" "1.34.16" "sha256-CR1FuVJgYODKEhDmmwcWrjPyZm7HsFRlzq3HlnKe81E="; - mypy-boto3-connectcases = buildMypyBoto3Package "connectcases" "1.34.0" "sha256-U9cPqrV5xnLZoJR0ilBQnOccShQOYRR3e2+tZruL7qY="; + mypy-boto3-connectcases = buildMypyBoto3Package "connectcases" "1.34.24" "sha256-a3P7wPx2FQ3V5T68B4fYzuq2juiqs7R8K5WSbyWu5ug="; - mypy-boto3-connectparticipant = buildMypyBoto3Package "connectparticipant" "1.34.0" "sha256-kyQhp8/a0H26U6DLBVF9IiCXoT74STsI8ApxVHy0xSQ="; + mypy-boto3-connectparticipant = buildMypyBoto3Package "connectparticipant" "1.34.44" "sha256-kP4ovwHfJoeRjSyfeL0M1U70aJoApMUUWOLFRpt6H+w="; - mypy-boto3-controltower = buildMypyBoto3Package "controltower" "1.34.0" "sha256-TaqzVvy2qGCvb5Orrxk1g8hyPQVHPEre8Zt2qH0D0dY="; + mypy-boto3-controltower = buildMypyBoto3Package "controltower" "1.34.42" "sha256-HwVES0lu75XkBPE7WQMSP2tOSogAqO3yr+cIeWaw9Is="; mypy-boto3-cur = buildMypyBoto3Package "cur" "1.34.0" "sha256-vwMILmIX7uzAGXdl1Z5mxVMJlgZCtA3Svp8mFmoZ6tQ="; @@ -214,11 +219,11 @@ rec { mypy-boto3-datapipeline = buildMypyBoto3Package "datapipeline" "1.34.0" "sha256-Amn6pdW5i8+yBzuSRAmj0EnTYEGjzguQxaoLmhFFXck="; - mypy-boto3-datasync = buildMypyBoto3Package "datasync" "1.34.0" "sha256-B1xHynvQcy/CrL/wgANVpZisD3TfXfP5S7s+RVUSvwg="; + mypy-boto3-datasync = buildMypyBoto3Package "datasync" "1.34.37" "sha256-uVZsnbghzbjDAuR+d6l7EET6S9fvx2NYGEllCPLtIXQ="; mypy-boto3-dax = buildMypyBoto3Package "dax" "1.34.0" "sha256-DH5kqV+C4vbZ8fbvAtR93jd5YB22hkYe/xgOF4oru1Y="; - mypy-boto3-detective = buildMypyBoto3Package "detective" "1.34.0" "sha256-tKVKacFOFqRPbqIXBfbuqD2yC+Mh2cfTxqKFV4tvT1A="; + mypy-boto3-detective = buildMypyBoto3Package "detective" "1.34.43" "sha256-VevmUTgN0UKhWAtGfSbQoqAhgv19XiOBBoNNsHfHezg="; mypy-boto3-devicefarm = buildMypyBoto3Package "devicefarm" "1.34.0" "sha256-X0D4Am4GUDFl703FmdrPcHXihFdzuch/eQBofDTameQ="; @@ -232,21 +237,21 @@ rec { mypy-boto3-dms = buildMypyBoto3Package "dms" "1.34.0" "sha256-xGGMtqja+ipLpWRMXO1VzxHqjlaZDZ31p634u5kmyNs="; - mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.34.0" "sha256-BuGkdlbgE40NOaa2Uy5ZTa0vdNv7d4OwPI6pTsNsBy4="; + mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.34.13" "sha256-oh6mrgHSr64TK/iYypOYZtqEEFtNfaIWpqj6sFatP18="; - mypy-boto3-docdb-elastic = buildMypyBoto3Package "docdb-elastic" "1.34.0" "sha256-7LeK49HTNBf4AZ6Lba0N42/6oTEh6RopgMHm+TfdY5k="; + mypy-boto3-docdb-elastic = buildMypyBoto3Package "docdb-elastic" "1.34.53" "sha256-sNoS7ujT0rMi4WAFXwIfwkoGP3c88+l6cW7eliHheJ4="; - mypy-boto3-drs = buildMypyBoto3Package "drs" "1.34.0" "sha256-AFAsrg/ZByd39VCotrmgvVsbtccl6+o0kxRB7vPjQDM="; + mypy-boto3-drs = buildMypyBoto3Package "drs" "1.34.50" "sha256-UWqnQAyxBnQjGYofZMOD3nhnqxTMh2U7/FNtMId1isk="; mypy-boto3-ds = buildMypyBoto3Package "ds" "1.34.0" "sha256-qVtMpsnVLF2rN4WaEhrqlTvWvW28RcHIBjsZYwmYapc="; - mypy-boto3-dynamodb = buildMypyBoto3Package "dynamodb" "1.34.0" "sha256-wNmNfoOwvCLlA59wOIn7liAtgYFxxCBv0x5mWjdlToQ="; + mypy-boto3-dynamodb = buildMypyBoto3Package "dynamodb" "1.34.57" "sha256-itDqozgR636w+OK8wtvO+obJHXohsTr1AMOousvpnbA="; mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.34.0" "sha256-Zx5cJE+fU9NcvK5rLR966AGIKUvfIwdpLaWWdLmuDzc="; mypy-boto3-ebs = buildMypyBoto3Package "ebs" "1.34.0" "sha256-xIrrXOayZed+Jcn4CFXXNgKz/G+RdiuwA04wq+Ry/fs="; - mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.0" "sha256-8Z1P6bSuQXOvbshB0dLTjlOwxe7E9Ob8utBtBljhMHA="; + mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.61" "sha256-rRK8Q3zUJuelfYvaUhrqxbsFUn1Xl6oxCahaRhI3+W8="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.34.0" "sha256-95TXW9HJHciM+lZCdlUYOwcLhkKE8RJpRx9/dEnu3FU="; @@ -254,15 +259,15 @@ rec { mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.34.0" "sha256-38ZiRVPr9L+KUF6oL23xsIiKMW0pT/nIngFkhSS3z2Y="; - mypy-boto3-ecs = buildMypyBoto3Package "ecs" "1.34.0" "sha256-o16Lui5CP/yNs2FPWk6+vMh0Whw9LNcmylOc5GGoU+o="; + mypy-boto3-ecs = buildMypyBoto3Package "ecs" "1.34.39" "sha256-s3YTAoZSgDHenHa54DwSNRRAnfCNMcdmZP1FX0hTygE="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.34.0" "sha256-VAK7mfnPBPDC8Azm6Bxl86E8CkeArTmfgqYkIcSblYA="; - mypy-boto3-eks = buildMypyBoto3Package "eks" "1.34.0" "sha256-nJec25u+np9bwuVP+lsRchVXul3LOphQ+Y1RUGNhpng="; + mypy-boto3-eks = buildMypyBoto3Package "eks" "1.34.53" "sha256-bmd/gv3krZZSeQDCYca/AFHkSBL4PTvx3ZEjItQ43QQ="; mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.34.0" "sha256-gbWKw0zDQf3qBlp1KeO7MX1j/GqRUpFAxLG0BKFrHBk="; - mypy-boto3-elasticache = buildMypyBoto3Package "elasticache" "1.34.0" "sha256-ArUBQ5XbBz4kTABHwgpE6VoRCu2ILVSEvLb2yQWMbvU="; + mypy-boto3-elasticache = buildMypyBoto3Package "elasticache" "1.34.60" "sha256-D3WLH1FS8dddD6WKUmQApvtehGMmjWYzdaMwTHzvzYk="; mypy-boto3-elasticbeanstalk = buildMypyBoto3Package "elasticbeanstalk" "1.34.0" "sha256-ftVFUwY81mg/9zJ4xxVjhXF1HgKpzj1koIS32cMKRLw="; @@ -270,9 +275,9 @@ rec { mypy-boto3-elb = buildMypyBoto3Package "elb" "1.34.0" "sha256-5Eh5D872pVDd7Q+DDh3zpGMVgS8fUJsV+63H1fet73s="; - mypy-boto3-elbv2 = buildMypyBoto3Package "elbv2" "1.34.0" "sha256-p3rJM3/6flZvJxg5FbkPFQP5PTXNRTMXqO3mB6akpHU="; + mypy-boto3-elbv2 = buildMypyBoto3Package "elbv2" "1.34.32" "sha256-jDrQb4A0PVBSxH7vuPXehpEYdU8Hwgv2Sc2+j0OGVJg="; - mypy-boto3-emr = buildMypyBoto3Package "emr" "1.34.0" "sha256-QWxYOAS5JTS1zEC5Mn0RF9Ys7cuwCs2xv/nLyYSvWIE="; + mypy-boto3-emr = buildMypyBoto3Package "emr" "1.34.44" "sha256-zM1VpAaBSxqdZiSrNiaAKfvliNRXMLEmvFvXcFmkZO0="; mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.34.0" "sha256-tGHWoMVrfH35hLgzDGMSJs5kRTWQqjM/e0IAPe4EfiU="; @@ -280,17 +285,17 @@ rec { mypy-boto3-entityresolution = buildMypyBoto3Package "entityresolution" "1.34.0" "sha256-qfRZtRaxysW+Ev16gnj48CePZzLBWrXmrq3tEGtfNbM="; - mypy-boto3-es = buildMypyBoto3Package "es" "1.34.0" "sha256-h1ALh7JaoeLbfrkrvFuNsqMbNFN9ERcr/m4hKTVrqlU="; + mypy-boto3-es = buildMypyBoto3Package "es" "1.34.36" "sha256-uVLB1fjZRhlqJ/isKl5TDORmIN4ffKKqzyGZcEffa5g="; - mypy-boto3-events = buildMypyBoto3Package "events" "1.34.0" "sha256-1nQVOsAXZ92z1ImWhZcm9HpucFYB5jkMC6wnfS6woxY="; + mypy-boto3-events = buildMypyBoto3Package "events" "1.34.17" "sha256-L/78a975mFWw5xBH4et01j4Ba9/aGb5NUK7d/bPtsJU="; mypy-boto3-evidently = buildMypyBoto3Package "evidently" "1.34.0" "sha256-MkBB5iTYJYg2cWFYHR3Qu7TcsDglLPEw0MnoHqij6+A="; - mypy-boto3-finspace = buildMypyBoto3Package "finspace" "1.34.0" "sha256-zYESrekQFm9mU7i4puR+T/dJ7zqen1HYhWLIfCSRfYI="; + mypy-boto3-finspace = buildMypyBoto3Package "finspace" "1.34.24" "sha256-GMHF1MWsAt0EfwcK/OSG14AP80L+9dLNsWygvpU5344="; mypy-boto3-finspace-data = buildMypyBoto3Package "finspace-data" "1.34.0" "sha256-8mND5BbdKY5srFwdpxSyfCUTIP4fa9hztP4daUJOB8k="; - mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.34.0" "sha256-JC+78vL78ro7BmV8SP32l9XgS3Xq5sjmF0Oj1tl+EO4="; + mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.34.46" "sha256-Fgs7wrwKPK79cYduCR/RYQ2FEZvghDuWI1hXKzFLfJo="; mypy-boto3-fis = buildMypyBoto3Package "fis" "1.34.0" "sha256-0TJ7iAF9hTOiKoW305p8a5fE0lZrdtoFDj/jjZzfdf0="; @@ -302,9 +307,9 @@ rec { mypy-boto3-frauddetector = buildMypyBoto3Package "frauddetector" "1.34.0" "sha256-EjiFEFpLKN0NmrNY43CFhQZHN+COTwRXx513X6X7vlE="; - mypy-boto3-fsx = buildMypyBoto3Package "fsx" "1.34.0" "sha256-ldLsj0dqNfvmcmqoikBI6qHPKIljkjfttrm3Rg8VKrE="; + mypy-boto3-fsx = buildMypyBoto3Package "fsx" "1.34.55" "sha256-XsIX4C8sF1m8jGbwrDWGoV7onHA9tRlI5Dki43bf9FM="; - mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.34.0" "sha256-O9k5Ve7aZte3gwk2FS9i8k/sRsMKj+HIfI/rk9MlI70="; + mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.34.1" "sha256-EUdVrcriXRUqjcyKzyuoIdDTxMSAdyKcnbJ96s/Y8Uc="; mypy-boto3-gamesparks = buildMypyBoto3Package "gamesparks" "1.28.36" "sha256-6lQXNJ55FYvkFA14rgJGhRMjBHA3YrOybnsKNecX7So="; @@ -312,9 +317,9 @@ rec { mypy-boto3-globalaccelerator = buildMypyBoto3Package "globalaccelerator" "1.34.0" "sha256-hvQeuu1TuLO9aB1+lWTGPgpGqoZlC8d3Ru5S4OVLgys="; - mypy-boto3-glue = buildMypyBoto3Package "glue" "1.34.0" "sha256-ZUe+WMSvYT0v5aXEbYAX5ZitSV9kv9FKVtfeQGIEG6U="; + mypy-boto3-glue = buildMypyBoto3Package "glue" "1.34.35" "sha256-+Kvk8uB9KZp7mw3sMAM6mHdBTnkO5J8nSVClttndMDY="; - mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.34.0" "sha256-J8ccxvUnjvC6aITCuLHnEXMlQ3Bdh6HxP+Spu326ZwA="; + mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.34.58" "sha256-dr+fCDf0DcWGxPPLMnzqrOCRMfoLhznyv6n679fFU/0="; mypy-boto3-greengrass = buildMypyBoto3Package "greengrass" "1.34.0" "sha256-ZU/xVWGlMngX0JiAhy9NEFDoXS4fsZvmLAkWqv2pocQ="; @@ -322,29 +327,29 @@ rec { mypy-boto3-groundstation = buildMypyBoto3Package "groundstation" "1.34.0" "sha256-CR3w42iyXmyGMzjCM7M1LKqsIROMjXxxGM8coSTtJ3o="; - mypy-boto3-guardduty = buildMypyBoto3Package "guardduty" "1.34.0" "sha256-pXyZFdO9so979yfWaRDI+InxBHBEt1XDEdam3lOUad0="; + mypy-boto3-guardduty = buildMypyBoto3Package "guardduty" "1.34.59" "sha256-Q5itLyYcSK7tzlYjT4Dgdcm4bE2Dr+bl5kfHqV4D9Pg="; mypy-boto3-health = buildMypyBoto3Package "health" "1.34.0" "sha256-st3ygy9yZbAbh1ZWnT8XDZTBz1qWhRWXCEfr5ILQHpo="; - mypy-boto3-healthlake = buildMypyBoto3Package "healthlake" "1.34.0" "sha256-DtMeHx0XiVW9uU8krAhbfnihKpGRd6V82sSF59uTc6U="; + mypy-boto3-healthlake = buildMypyBoto3Package "healthlake" "1.34.43" "sha256-Xci7f0/o60v1TAazFC34GjpzOBQlD+SvAMCF4xM3ymI="; mypy-boto3-honeycode = buildMypyBoto3Package "honeycode" "1.34.0" "sha256-HNp/STFuMLoO4qyL0iaYeiPpnMV3uzNBNFUDgzrHt9s="; - mypy-boto3-iam = buildMypyBoto3Package "iam" "1.34.0" "sha256-JIXnU8/hOOzpS6scSYPQ203HbiUxTT/9ub3lxyrRqSw="; + mypy-boto3-iam = buildMypyBoto3Package "iam" "1.34.8" "sha256-b69oz4ABgpJGh7ZxGz+a+o2UCtmT8lmjuR5V6CiS1kE="; mypy-boto3-identitystore = buildMypyBoto3Package "identitystore" "1.34.0" "sha256-OdJsMjraTe4qhpblBOuwr++4QfiMXtaaMHDAEOTBII4="; - mypy-boto3-imagebuilder = buildMypyBoto3Package "imagebuilder" "1.34.0" "sha256-eDAlL/p9iBVDQyKuDggxdyE3Jz6ch/l5ECn3cNiL9Uo="; + mypy-boto3-imagebuilder = buildMypyBoto3Package "imagebuilder" "1.34.57" "sha256-r11JVMvO/IL1d2+fGZoc4nt1JnyUXir38a8i7IsZmLQ="; mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.34.0" "sha256-GnIzCaCuRLPdvaAmmID62uY/te1Lx5DFGin2zJuDdAM="; mypy-boto3-inspector = buildMypyBoto3Package "inspector" "1.34.0" "sha256-85aAE1+azKZ9sFYxLOpVR4SkqrnfFQ1gXgGpzOBK1PE="; - mypy-boto3-inspector2 = buildMypyBoto3Package "inspector2" "1.34.0" "sha256-W7+5M3OJ0U5irl0mVrKYGG5ae3XRM9fJDfVP4eqbUSc="; + mypy-boto3-inspector2 = buildMypyBoto3Package "inspector2" "1.34.29" "sha256-ZMdNVgKXQnEHyK4tV/XegvFX7xdk5A1AiSfpTKWCtcY="; - mypy-boto3-internetmonitor = buildMypyBoto3Package "internetmonitor" "1.34.0" "sha256-IWPylBWqk4uNn4LhwTkc17lbYn1xP1rxVzAGG3V659U="; + mypy-boto3-internetmonitor = buildMypyBoto3Package "internetmonitor" "1.34.48" "sha256-tJ5Hu8ojUahG1YbNHgwDjYWqbSPCZEUyYM/dOObmArg="; - mypy-boto3-iot = buildMypyBoto3Package "iot" "1.34.0" "sha256-E7ilb7HmEBYm+cvWIDmkvfaR72nlu8QqMr9HJBOeVro="; + mypy-boto3-iot = buildMypyBoto3Package "iot" "1.34.52" "sha256-YWGotOPKljY4B0JL1I+axk4MJZIk84rVxoZu9tzBGss="; mypy-boto3-iot-data = buildMypyBoto3Package "iot-data" "1.34.0" "sha256-N6UoHopsT3FM7bU01eWuqRSyyyaLBekkM+hsOU1byIM="; @@ -360,13 +365,13 @@ rec { mypy-boto3-iotdeviceadvisor = buildMypyBoto3Package "iotdeviceadvisor" "1.34.0" "sha256-DBI4dJXxprfHO3ipLIVb5Ii5NK7qWJRuWjzVfHTnqO4="; - mypy-boto3-iotevents = buildMypyBoto3Package "iotevents" "1.34.0" "sha256-cRFcD4DvPzCXS6WeXeaxLj2HY0eQelel5Lju3UAYgcA="; + mypy-boto3-iotevents = buildMypyBoto3Package "iotevents" "1.34.47" "sha256-ppsjLI2yY9+6SmAh1mfVBuZz+gHNNZS6eKDr3fHHmJM="; mypy-boto3-iotevents-data = buildMypyBoto3Package "iotevents-data" "1.34.0" "sha256-K7yAnxjpJfSh6bWnmcdySkCQhhVFt42zU6REiy3zKrk="; mypy-boto3-iotfleethub = buildMypyBoto3Package "iotfleethub" "1.34.0" "sha256-wNm6OJUgAhvrXhtGaty19Tyva+nvonDOHsj9RT37FbY="; - mypy-boto3-iotfleetwise = buildMypyBoto3Package "iotfleetwise" "1.34.0" "sha256-SlCLEpSDXygGaK5EfIei/qk/l3CoCZWyEm3yJUPHqxQ="; + mypy-boto3-iotfleetwise = buildMypyBoto3Package "iotfleetwise" "1.34.20" "sha256-Pe5Pw19H2y6koJxajW46oazxoFL5UHSOQHgXnhfIQJk="; mypy-boto3-iotsecuretunneling = buildMypyBoto3Package "iotsecuretunneling" "1.34.0" "sha256-E8658X3yWpIcRKDTtnacjuAAWqr/qnmYXFRJ/7uyKm8="; @@ -378,25 +383,25 @@ rec { mypy-boto3-iotwireless = buildMypyBoto3Package "iotwireless" "1.34.0" "sha256-g2Ab6AQ0fvmEuSqAHlvAPe3TYSz/Nai1U8srjT0QWHw="; - mypy-boto3-ivs = buildMypyBoto3Package "ivs" "1.34.0" "sha256-iYt/bJaAH7TGN+FeKg9K8/T5QlTB3mhxb+P+53KBSQg="; + mypy-boto3-ivs = buildMypyBoto3Package "ivs" "1.34.45" "sha256-Ilrtk6ZF1p3GNuZrtiEiNXi3bHI3MYNr6bDpJ8sf4Fg="; - mypy-boto3-ivs-realtime = buildMypyBoto3Package "ivs-realtime" "1.34.0" "sha256-x+B14roN4jNXeLp+Tmwtj28OMeGe80qLMaIbVCzulbY="; + mypy-boto3-ivs-realtime = buildMypyBoto3Package "ivs-realtime" "1.34.62" "sha256-/8P/S2xdYub8/tC0yaUbUfcxfDKpDnfAvmqneXFcAOo="; mypy-boto3-ivschat = buildMypyBoto3Package "ivschat" "1.34.0" "sha256-eNwL7uUI7x30KJwNO5U/0XSV1O4YZYu/zYvGQgz7p+8="; - mypy-boto3-kafka = buildMypyBoto3Package "kafka" "1.34.0" "sha256-fBTouiFX1z8WvIECcu8gocENiWMl50hbCEk7K+4OCV0="; + mypy-boto3-kafka = buildMypyBoto3Package "kafka" "1.34.61" "sha256-nXd3Qi8IZsQN595vnsMLSn6pfZU70yPb6Ebhv4SijfE="; - mypy-boto3-kafkaconnect = buildMypyBoto3Package "kafkaconnect" "1.34.0" "sha256-RcUs+Gy7ck1oV7moI3JjHYhkrjcrLW6QQ1WtTt13ass="; + mypy-boto3-kafkaconnect = buildMypyBoto3Package "kafkaconnect" "1.34.50" "sha256-frPPAQeFyO92uMqqzBcSC3MVK4V4hbdO9tx4awAKAUU="; mypy-boto3-kendra = buildMypyBoto3Package "kendra" "1.34.0" "sha256-j1fph9WwqBns2BpZjoKTpXC9gUJ4lu+poPBV6LIOusM="; mypy-boto3-kendra-ranking = buildMypyBoto3Package "kendra-ranking" "1.34.0" "sha256-hbemz5ECtfP3oi645lZT7CCx31yg8MNqbAD32Am6l1U="; - mypy-boto3-keyspaces = buildMypyBoto3Package "keyspaces" "1.34.0" "sha256-Hii5uKPqWNwm/dRYFtdQni1F+WsAB49yeY+cjaJsMH4="; + mypy-boto3-keyspaces = buildMypyBoto3Package "keyspaces" "1.34.45" "sha256-Ucmttfi8oQIPpdfr3KPvrX1Tj3zbYxHGoYH0JNYX5UM="; mypy-boto3-kinesis = buildMypyBoto3Package "kinesis" "1.34.0" "sha256-9ATnW63Vl36fCXQbdpuIiIVL3UEcYxNEaGq4ie/ph0E="; - mypy-boto3-kinesis-video-archived-media = buildMypyBoto3Package "kinesis-video-archived-media" "1.34.0" "sha256-QXuYhv4wLd+3X+IG3ynOVVDIVbesn0OiiSojtBC3Hc8="; + mypy-boto3-kinesis-video-archived-media = buildMypyBoto3Package "kinesis-video-archived-media" "1.34.10" "sha256-B66x9erx5SlnDmTBpf4izGckF4GysChy+VRXy9tWSf4="; mypy-boto3-kinesis-video-media = buildMypyBoto3Package "kinesis-video-media" "1.34.0" "sha256-YgkG14UzymthRLg4cga80ZDK9cxZzFBTISmnfTPt8nM="; @@ -406,21 +411,21 @@ rec { mypy-boto3-kinesisanalytics = buildMypyBoto3Package "kinesisanalytics" "1.34.0" "sha256-eEoSmwMTa/hsbKbuKuzAZv4jHljGKq3b5Rw7K2Pgc50="; - mypy-boto3-kinesisanalyticsv2 = buildMypyBoto3Package "kinesisanalyticsv2" "1.34.0" "sha256-ZxVW6BKUdgnWKk4J3B2I0vlSLZRR+Dua3Sb/mzIDFNE="; + mypy-boto3-kinesisanalyticsv2 = buildMypyBoto3Package "kinesisanalyticsv2" "1.34.62" "sha256-bL6EKRjfIIUUIMSpoE0BWeAg3xb2xbKi8NBpHSaEEFg="; - mypy-boto3-kinesisvideo = buildMypyBoto3Package "kinesisvideo" "1.34.0" "sha256-mbvYhX3mrYQUBOHNe1N4ybz9jnVz9C2+eEwb0CFAp9w="; + mypy-boto3-kinesisvideo = buildMypyBoto3Package "kinesisvideo" "1.34.48" "sha256-uYSkwOuYKF3B+sj5IWbDL789Xue2yNY9g14j/2b6k6w="; - mypy-boto3-kms = buildMypyBoto3Package "kms" "1.34.0" "sha256-0/rxLiZeadSPkzmVqx/TGMaFMAdIAXS82FcXf8BSUpg="; + mypy-boto3-kms = buildMypyBoto3Package "kms" "1.34.14" "sha256-fGuTdVCmgdqaYdJcEJY7vhvNw+Qi1NXYFST16mXp0UA="; - mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.34.0" "sha256-xIQAyiytQRYcLFWGoEfZJY+4Ga9NeRBuN8MQOZmOypc="; + mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.34.7" "sha256-/IPOF44ohg59XX+lmMbx8WsaHFpBaMH440Wm5jgrKD4="; - mypy-boto3-lambda = buildMypyBoto3Package "lambda" "1.34.0" "sha256-50wM5UjadHqMbmQ8OdrYqlTWfgV/V3QOx4Cn5WVZBic="; + mypy-boto3-lambda = buildMypyBoto3Package "lambda" "1.34.58" "sha256-kDgix0vRs0dI6y1y6rDxMvvDs5LIBBqo/k2VUqRLDGU="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.34.0" "sha256-LkD3CCjJYGwlSYRP0meJUCEdVSGGdSRrL9uBtimX4GU="; mypy-boto3-lex-runtime = buildMypyBoto3Package "lex-runtime" "1.34.0" "sha256-oFUSsfT7RXHRAVUUk014lqPylPa+TZuyNuvHRixIxt8="; - mypy-boto3-lexv2-models = buildMypyBoto3Package "lexv2-models" "1.34.0" "sha256-tNe2tLSSupXGHp6u65zeYNSciCC2Wbj/R4ZkDKT5cS8="; + mypy-boto3-lexv2-models = buildMypyBoto3Package "lexv2-models" "1.34.53" "sha256-xeuLY+rMoqtJc75pf2A/DYcsG86qqsIDO225QIwjlDw="; mypy-boto3-lexv2-runtime = buildMypyBoto3Package "lexv2-runtime" "1.34.0" "sha256-V1OkUcwFYp8TVS2ASFjARJUrIKAx/9zcfQbQMngU5Uc="; @@ -430,13 +435,13 @@ rec { mypy-boto3-license-manager-user-subscriptions = buildMypyBoto3Package "license-manager-user-subscriptions" "1.34.0" "sha256-PR+u+i5zSHFTN6+GuOcWBcON1E2SNABbPavByXz3unE="; - mypy-boto3-lightsail = buildMypyBoto3Package "lightsail" "1.34.0" "sha256-+VLq0hfyQS1IpzEMfB5mhp+gxL76CWh5q1wgJKffWQ8="; + mypy-boto3-lightsail = buildMypyBoto3Package "lightsail" "1.34.41" "sha256-Y7Zg/eorUegxh+Br+ULbedzGskkHKR2opnEEDpfBVk0="; - mypy-boto3-location = buildMypyBoto3Package "location" "1.34.0" "sha256-SDz6L3ePAAA8V99pJrB55/4i+piQY0KpTbsKEJyVpS0="; + mypy-boto3-location = buildMypyBoto3Package "location" "1.34.18" "sha256-rsjIGenXgdEdgxvilA3IKJkYkpDDQNDfjDQRoj/mxSU="; - mypy-boto3-logs = buildMypyBoto3Package "logs" "1.34.0" "sha256-qFK/bEhzOlHDJMqX2gQr/kxmsNM6q+BC+yfTCSVy1Vs="; + mypy-boto3-logs = buildMypyBoto3Package "logs" "1.34.36" "sha256-FUm1TaiKhphSRY4YbliUSdU6eAU1S1r9fVO00nXFPC4="; - mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.34.0" "sha256-tcwlzJzbFBJXhAoHpw+V5TC3Na3SbD+nkpdOf9RhDZU="; + mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.34.47" "sha256-M7NaoRHxlH5/zkuMnOlrco2BCPXErv/N7TAVwv2oZuA="; mypy-boto3-lookoutmetrics = buildMypyBoto3Package "lookoutmetrics" "1.34.0" "sha256-2SRBUd8fZ7i2GbDgBWJcYS0Fbr/U65UmrLbHx57IZ5A="; @@ -446,37 +451,37 @@ rec { mypy-boto3-machinelearning = buildMypyBoto3Package "machinelearning" "1.34.0" "sha256-DeiBu3PQMageEUlVdjH/1uELsPwo4IVhYzDlJFBohKg="; - mypy-boto3-macie = buildMypyBoto3Package "macie" "1.28.36" "sha256-T7zd6G5Z4fz1/ZiCOwf+kWbXWCy35JaE3f2OUpWGNpE="; + mypy-boto3-macie = buildMypyBoto3Package "macie" "1.29.0" "sha256-lFOPbIBrGuv9W83fsyzyI5fyOleXf4j3sCh9IM0gaQ4="; - mypy-boto3-macie2 = buildMypyBoto3Package "macie2" "1.34.0" "sha256-5PO/Zcpo7e1crJTprlKVGYTlzRxZ+0ShNRLLVVjQ5GA="; + mypy-boto3-macie2 = buildMypyBoto3Package "macie2" "1.34.20" "sha256-erqa/ptOBMd8x+N1A6ibSULfBH75gEWsKDd/jhc/9tg="; mypy-boto3-managedblockchain = buildMypyBoto3Package "managedblockchain" "1.34.0" "sha256-gUPuS8/ygIdsfCx6S1zpxP936Ah0o5BT4TaDiEW4wPQ="; - mypy-boto3-managedblockchain-query = buildMypyBoto3Package "managedblockchain-query" "1.34.0" "sha256-nQxUZ9L1Cs/9bn5Re4Q6/0X/UoJ3CkHsoUbVxzTDV/U="; + mypy-boto3-managedblockchain-query = buildMypyBoto3Package "managedblockchain-query" "1.34.33" "sha256-HByCyc+gnBu2+5qdtRw6LuRWCu7sVVXxmOJJZgWMFsI="; - mypy-boto3-marketplace-catalog = buildMypyBoto3Package "marketplace-catalog" "1.34.0" "sha256-lzl/UK3PULZu+XXbt8wGc6xwmJZBsj3Zfjiq/awWVzI="; + mypy-boto3-marketplace-catalog = buildMypyBoto3Package "marketplace-catalog" "1.34.41" "sha256-SZqNZO/36iGuf0jqNIZrbD1BOE7p6xMWhs5Y5VkUl8c="; mypy-boto3-marketplace-entitlement = buildMypyBoto3Package "marketplace-entitlement" "1.34.0" "sha256-yGaeDZLEmp/Nap++wI6GgQvVW3HxQFcM+ipk7RAuG4g="; mypy-boto3-marketplacecommerceanalytics = buildMypyBoto3Package "marketplacecommerceanalytics" "1.34.0" "sha256-Gzmd4GQnM2sRrL4/FE9kI0R9ItKJ5xdaC/cCGqQ0XAY="; - mypy-boto3-mediaconnect = buildMypyBoto3Package "mediaconnect" "1.34.0" "sha256-mR45JCaKUwScSb63vyw5dUZmVm2qwkN/e2gp+zBHHpo="; + mypy-boto3-mediaconnect = buildMypyBoto3Package "mediaconnect" "1.34.7" "sha256-A8Sal8qNijZ/PdwLLC3mGAt8btMGOHXzOAOVFn+JDtU="; - mypy-boto3-mediaconvert = buildMypyBoto3Package "mediaconvert" "1.34.0" "sha256-R3ZE6Uam8sqSVyNqV7jMMfYQa1LgB6kdtNpdTsHNC20="; + mypy-boto3-mediaconvert = buildMypyBoto3Package "mediaconvert" "1.34.33" "sha256-7OwfjcWDE1AHvpyOu3fE5YBwjQscpa+VnE7eylk1unA="; - mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.34.0" "sha256-iOqhX6q/6NnCnqOEs2OfMFXfHcroZI5wQAaPv5uWwDc="; + mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.34.47" "sha256-kE93r3oDtz+uwUDeWBJA2yQBx4HFAL49FdpIexVMbrc="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.34.0" "sha256-4DJ2zVk0satmVn+TZdDExx/+ClJpc1bdmbvl72Joe5U="; mypy-boto3-mediapackage-vod = buildMypyBoto3Package "mediapackage-vod" "1.34.0" "sha256-XwGc3+WD8o/MUfcBocl52TPK/RhiCjEb2qDqcuYwB+g="; - mypy-boto3-mediapackagev2 = buildMypyBoto3Package "mediapackagev2" "1.34.0" "sha256-8UYtTNJDsu0CkxQguWOtNI0viERJ4bRBKNa/In4iIA0="; + mypy-boto3-mediapackagev2 = buildMypyBoto3Package "mediapackagev2" "1.34.60" "sha256-tm54AEKAAuhp8+KeoW/yesl0M8utg7iIbkOpLyotpa8="; mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.34.0" "sha256-v2G2wDXGJwMalYnHTRGvdRTUv41bm8adIOj9tgQV0ys="; mypy-boto3-mediastore-data = buildMypyBoto3Package "mediastore-data" "1.34.0" "sha256-bYlKkBh7Kq4PsToHQ4+K5B3h8+IwyS+7ngEJ5AALBus="; - mypy-boto3-mediatailor = buildMypyBoto3Package "mediatailor" "1.34.0" "sha256-PD40mNQDdTmdlbaljPfflhojclRRWgFlE6l66SWpwSM="; + mypy-boto3-mediatailor = buildMypyBoto3Package "mediatailor" "1.34.45" "sha256-r1rzW4TQ2pZ/Bw+ina6sSLUTEk9+fakZEWYA5gOxXhY="; mypy-boto3-medical-imaging = buildMypyBoto3Package "medical-imaging" "1.34.0" "sha256-3lAWDWzf1MjTDh0+HDnewq0Yo3bUuhSGSSKJvJf6k8g="; @@ -492,7 +497,7 @@ rec { mypy-boto3-migrationhub-config = buildMypyBoto3Package "migrationhub-config" "1.34.0" "sha256-feqiUjFrwYaAyRh1MZ96VILeEa/WBzUytsnRxXZMxoQ="; - mypy-boto3-migrationhuborchestrator = buildMypyBoto3Package "migrationhuborchestrator" "1.34.0" "sha256-XY1Ji/aYarPeIBh9r7Hv33b9L4iA3QE9zKTxDKPQ+vQ="; + mypy-boto3-migrationhuborchestrator = buildMypyBoto3Package "migrationhuborchestrator" "1.34.53" "sha256-kreU8blZ61EaKmKJpZ17iS6xFUig5FrMnOs5/1JTn4s="; mypy-boto3-migrationhubstrategy = buildMypyBoto3Package "migrationhubstrategy" "1.34.0" "sha256-N/NcnXF14SAs9F1ZwUYxc/5kp7iUWIFJisUfZxMStLU="; @@ -502,7 +507,7 @@ rec { mypy-boto3-mturk = buildMypyBoto3Package "mturk" "1.34.0" "sha256-qhyVd+9KIaL4hxjjDnw7qdyJdcT6ApCxhoTggOVDr80="; - mypy-boto3-mwaa = buildMypyBoto3Package "mwaa" "1.34.0" "sha256-a0p1hoTP8iNP6OPkrq0dlWptYNQNA9hit2tvgCI1+W8="; + mypy-boto3-mwaa = buildMypyBoto3Package "mwaa" "1.34.57" "sha256-D0W/03zhllRLYGyXQ/XvMBlcsKuEb2MPr0hmyUVy5xc="; mypy-boto3-neptune = buildMypyBoto3Package "neptune" "1.34.0" "sha256-oMS6e1cPfOZhh+obhOZTMjmwScEzwCBtvmjtpPIjltA="; @@ -516,9 +521,9 @@ rec { mypy-boto3-oam = buildMypyBoto3Package "oam" "1.34.0" "sha256-/0ou6QtLQerkqJ+alocpYxUfe9jRHoOgQy9R6sxZAFo="; - mypy-boto3-omics = buildMypyBoto3Package "omics" "1.34.0" "sha256-HZqOWNHgRX8EKEGtvtbnuFH0BDrOpJpJd32NBpe4RWA="; + mypy-boto3-omics = buildMypyBoto3Package "omics" "1.34.7" "sha256-Mtb11Oe2j28u+MFaycvMMNiqi7ZdVDcKQV/X/7npze4="; - mypy-boto3-opensearch = buildMypyBoto3Package "opensearch" "1.34.0" "sha256-DRo52YCDLBfE7n+huUyzf89G6yybntFTk0A9w5QLa8o="; + mypy-boto3-opensearch = buildMypyBoto3Package "opensearch" "1.34.43" "sha256-EOl56YqzuIUWlSewnVCtEdzt3Ei5yueP4emtTQq3QrA="; mypy-boto3-opensearchserverless = buildMypyBoto3Package "opensearchserverless" "1.34.0" "sha256-YpbQWnVIXMqTzieWya4MiFz9HpN5YYSSmBjUvmO0VMo="; @@ -526,25 +531,25 @@ rec { mypy-boto3-opsworkscm = buildMypyBoto3Package "opsworkscm" "1.34.0" "sha256-HsUXwbXRPmEaSJjs4EezSHugssLtP2g/NvaI0CnGStA="; - mypy-boto3-organizations = buildMypyBoto3Package "organizations" "1.34.0" "sha256-HQrlenaKsc49ugEcKSSRJkAyXwLOJ1Ymq1fTDoXSKXY="; + mypy-boto3-organizations = buildMypyBoto3Package "organizations" "1.34.56" "sha256-iVOUgkTI0sNixbfr/Z/H9Hsc2thCqDCqHrlthneZLVU="; mypy-boto3-osis = buildMypyBoto3Package "osis" "1.34.0" "sha256-2mSI1VTmQWuwxsCgQtmr1w8xE3zIcwztvMuKMqXFF3k="; - mypy-boto3-outposts = buildMypyBoto3Package "outposts" "1.34.0" "sha256-IqGeCqd6Nc9MaMEldqVohTNcmf7WvIiEnFGORzpoB0A="; + mypy-boto3-outposts = buildMypyBoto3Package "outposts" "1.34.27" "sha256-nkXVo8Qr2k+pV3SChRezoiU0e2kT9kz1vr2J8MLfm+0="; mypy-boto3-panorama = buildMypyBoto3Package "panorama" "1.34.0" "sha256-Pw0yRgawY5TC0OIgcYmzK3KEQusyRf3coThpeHL4X30="; - mypy-boto3-payment-cryptography = buildMypyBoto3Package "payment-cryptography" "1.34.0" "sha256-/VwWLFCNWMpppAEAjAGMa4d1SfWAxHxs+17lboZGcC0="; + mypy-boto3-payment-cryptography = buildMypyBoto3Package "payment-cryptography" "1.34.20" "sha256-WdyhWl00Khf3gA6OeWeKrlgFnTvWhk+AFoS2UhM5Haw="; - mypy-boto3-payment-cryptography-data = buildMypyBoto3Package "payment-cryptography-data" "1.34.0" "sha256-+A49ZU8ITWkdUmGf57szMwIGzEHe6cx9egBEMDPsUKY="; + mypy-boto3-payment-cryptography-data = buildMypyBoto3Package "payment-cryptography-data" "1.34.58" "sha256-mc4NO3yjdLlXc9TBkmIsGFqNfW2RT7/jVMC9uhug4tc="; mypy-boto3-pca-connector-ad = buildMypyBoto3Package "pca-connector-ad" "1.34.0" "sha256-pSGVZPLuj8xcSfLqa+xvf4UL/l2Xb5t43KuXlTCfskc="; - mypy-boto3-personalize = buildMypyBoto3Package "personalize" "1.34.0" "sha256-pg36s61onSuPDyQeC4otrSEpVxVFwrFwU6NgbOt1fKY="; + mypy-boto3-personalize = buildMypyBoto3Package "personalize" "1.34.20" "sha256-1Q+rXczO15oM/KXRLVP8D96HW4nILpxig4stjT1KwuY="; mypy-boto3-personalize-events = buildMypyBoto3Package "personalize-events" "1.34.0" "sha256-dklttvls5In+d9uWONxmhfSOP1TQf+4VMW56JjKICr4="; - mypy-boto3-personalize-runtime = buildMypyBoto3Package "personalize-runtime" "1.34.0" "sha256-ncMVAU7pwfB1zZ+xAPFNtiIlGimFbsowHugEUrlbybs="; + mypy-boto3-personalize-runtime = buildMypyBoto3Package "personalize-runtime" "1.34.20" "sha256-sKEXkOlMb7t4jBQrLLx90wFhCN1R4ZOk8w9kMpKI0os="; mypy-boto3-pi = buildMypyBoto3Package "pi" "1.34.0" "sha256-97giGYtpINPHxtcUU6cE/mPF0/r6YfLixAdcC/LGKC0="; @@ -558,39 +563,39 @@ rec { mypy-boto3-pipes = buildMypyBoto3Package "pipes" "1.34.0" "sha256-c/N5SaT4BS0Ldv/P6yi43gB4LzDeqB9y1Xx1UAHf6dU="; - mypy-boto3-polly = buildMypyBoto3Package "polly" "1.34.0" "sha256-kAbx8YHata0ehTTqI/z3YPB6Px3d0ON1ek3a9aY8amU="; + mypy-boto3-polly = buildMypyBoto3Package "polly" "1.34.43" "sha256-rx5sW32N6H47fpy5yGvwlKKVKS/uIKOtLfsjoGoNPJg="; - mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.34.0" "sha256-qS9ghI37MKtDIdUuzSVJ02CrB6z2PiIsT8ekEDb6oVM="; + mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.34.39" "sha256-SdIK9pWjyY6rcK9Kak5r66hP6tc/OVp+gQ9wo7HKVms="; mypy-boto3-privatenetworks = buildMypyBoto3Package "privatenetworks" "1.34.0" "sha256-WFX0KaJRo0LCPKEAq8LES0P3WJkt6ywLXqTlOFZyZ1w="; mypy-boto3-proton = buildMypyBoto3Package "proton" "1.34.0" "sha256-wRBMw/7PWi0s9sJTfnDq3MXcbA5pKwogMDC3UZtLJoY="; - mypy-boto3-qldb = buildMypyBoto3Package "qldb" "1.34.0" "sha256-WQeLaZFGqmU1OYIWsjzttkZDIT1vqrnVLfdo2DBMwGg="; + mypy-boto3-qldb = buildMypyBoto3Package "qldb" "1.34.49" "sha256-yiqWryr4vKt/6k+dVoDMDdtL6yP4ClVY0rFwZDDcvWY="; mypy-boto3-qldb-session = buildMypyBoto3Package "qldb-session" "1.34.0" "sha256-JHePiaFCfIJPxZzvC1U38xrBGkDvB9+yKwPecaZl7BY="; - mypy-boto3-quicksight = buildMypyBoto3Package "quicksight" "1.34.0" "sha256-mhGxgfq/DDcmfuEcKTKm/9aq8jxICSqubJhiW36/YgU="; + mypy-boto3-quicksight = buildMypyBoto3Package "quicksight" "1.34.53" "sha256-aN1W1Hu/gyV181x68VNkbBp2Ua4jpJB3H/vmQ0HO1Nw="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.34.0" "sha256-9sOspEfirpVQ8cT9ILUSWypxBswpAD75A0hHRV7glNg="; mypy-boto3-rbin = buildMypyBoto3Package "rbin" "1.34.0" "sha256-Y+a/p3r5IgWk4oH6MOeq0e7rMiNvLCqoz1ZE+xXNtOw="; - mypy-boto3-rds = buildMypyBoto3Package "rds" "1.34.0" "sha256-mQn18jzLAYMCYqLhbJ6KGazEYCHXVIOAmde9spWRHpQ="; + mypy-boto3-rds = buildMypyBoto3Package "rds" "1.34.58" "sha256-P3s5qNAV9UG6fMSxvkUevKACU3FGjhOne1D0LRi/eMk="; - mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.34.0" "sha256-qpRaxeJt30Vb108E48E80vX0nmjyVSJNN6tozbkI9Yk="; + mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.34.6" "sha256-d+WXt3cSUe5ZxynSjPSJxXgv6evP/rhZrX1ua9rtSx8="; - mypy-boto3-redshift = buildMypyBoto3Package "redshift" "1.34.0" "sha256-xxiPF1JjFfKudYw/96qxKK5K0lDQRdiJ1vMSBWsdXxU="; + mypy-boto3-redshift = buildMypyBoto3Package "redshift" "1.34.57" "sha256-MDhI9DW5I6SWXIAnENiPqSanDjCB3vf2n24eVxzmtso="; mypy-boto3-redshift-data = buildMypyBoto3Package "redshift-data" "1.34.0" "sha256-NdBZxkLTwnY7fgmoqGZKTN/lhCyY/3VGFWWOGeCf//0="; - mypy-boto3-redshift-serverless = buildMypyBoto3Package "redshift-serverless" "1.34.0" "sha256-Ken/63gkGvC8ZnWilgccQYAealKWgpftw67QLLPMSe0="; + mypy-boto3-redshift-serverless = buildMypyBoto3Package "redshift-serverless" "1.34.16" "sha256-ag5tKb1+4cHiG99OszDNGdnX9RPRPraaqM8p3IqgLBg="; - mypy-boto3-rekognition = buildMypyBoto3Package "rekognition" "1.34.0" "sha256-hf6rSVe2fxK8MR5zUz4Drq7qP5+QTTNUAWs4rmqfzIQ="; + mypy-boto3-rekognition = buildMypyBoto3Package "rekognition" "1.34.20" "sha256-zKJX/AlDoDKUbrI1LZq2kk5fr+SNqES6gniM0FQGeaM="; mypy-boto3-resiliencehub = buildMypyBoto3Package "resiliencehub" "1.34.0" "sha256-F/ZRCp/M/6kBI4Apb3mISzqe1Zi4Y7gq/vu0dvyyTvM="; - mypy-boto3-resource-explorer-2 = buildMypyBoto3Package "resource-explorer-2" "1.34.0" "sha256-5CKBpBoU3pZBXD0/Kz69TAM+51zmnd+314Ou1DOdaso="; + mypy-boto3-resource-explorer-2 = buildMypyBoto3Package "resource-explorer-2" "1.34.41" "sha256-Q4MCAvEZkYRnDLEF9d8x+FOMUJ9O2eCb2mZr/e8Ut24="; mypy-boto3-resource-groups = buildMypyBoto3Package "resource-groups" "1.34.0" "sha256-Wz1Oo/Ze6ROHkg5EAas7ZKLOWE6RS+uKpNea79WUrLY="; @@ -600,7 +605,7 @@ rec { mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.34.0" "sha256-U/j/u6pqoHpfNP3GbQ8SZb+qIL842ZcwwdBr1QQhlj0="; - mypy-boto3-route53 = buildMypyBoto3Package "route53" "1.34.0" "sha256-pXDmqrT5sN7pfkuVStBEC59b9+lLhMuXILiTeWlVFFs="; + mypy-boto3-route53 = buildMypyBoto3Package "route53" "1.34.31" "sha256-MtmEtt57vhFRG1O+VnFXFUhSWAQ7JrnV3hBZx4TpOh8="; mypy-boto3-route53-recovery-cluster = buildMypyBoto3Package "route53-recovery-cluster" "1.34.0" "sha256-1IUmycikAtBBNykch2aj7tI6XLRjN7D56YwJn6QRmIQ="; @@ -608,25 +613,25 @@ rec { mypy-boto3-route53-recovery-readiness = buildMypyBoto3Package "route53-recovery-readiness" "1.34.0" "sha256-DyNRWZ9daJ6VFa7moTjgEIdxcCRgjvZ2n7UKyNfr9z4="; - mypy-boto3-route53domains = buildMypyBoto3Package "route53domains" "1.34.0" "sha256-xsWqPNO6N5JRHWfST9cVLgHu8B7sNn4cXKylhQbnO88="; + mypy-boto3-route53domains = buildMypyBoto3Package "route53domains" "1.34.40" "sha256-N81sytOFacuG3pHSk35QbxVxUVEZUx8DK4Y7uUonyh4="; - mypy-boto3-route53resolver = buildMypyBoto3Package "route53resolver" "1.34.0" "sha256-RnMZIG4PDcZZX34oZMs+I3uCWaJ2XcxVqB7GNvmrqFA="; + mypy-boto3-route53resolver = buildMypyBoto3Package "route53resolver" "1.34.15" "sha256-ER9jhGIeEeHc0llpy4aqRnI9iFfubJFIik04gB81vr0="; - mypy-boto3-rum = buildMypyBoto3Package "rum" "1.34.0" "sha256-T2OTu4dpOqZq+sxoU/nyXQXNxW6KbIFjIE3+VtfSEwg="; + mypy-boto3-rum = buildMypyBoto3Package "rum" "1.34.49" "sha256-Mq2H+13cjxYRwFfxJpWTAb+W5bx+Vew+jl+zbreRIkQ="; - mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.34.0" "sha256-dkSgDgluuxwyklUQWfZP+DKWJdrNQIJ87ZSBsU1kxzM="; + mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.34.62" "sha256-HWDLEJB667VrTYZYircK5C23oRSGnwWLu7tNWG6yLm0="; - mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.34.0" "sha256-PEGAPyCB/LovPfAsItH3nGnK/I63wEcsfb6MkPAitbY="; + mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.34.18" "sha256-53s5ii1gFX9toigiazEtS5Jogg3VFFr+1/uiLzoU7Uo="; mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.34.0" "sha256-xLuGP9Fe0S7zRimt1AKd9KOrytmNd/GTRg5OVi5Xpos="; - mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.0" "sha256-tpGOwQ4THqjaZZG5fsZ+qO/ZDT6tr3kr20tzQQJ13Rc="; + mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.53" "sha256-IgZzJstoOg1wzucKqPBx47baLbagrUk1kW4P8cI++cg="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.34.0" "sha256-jMZ3aWKQPhNec4A/02S1waQi6Mx9JVdENc3kblhsKjA="; mypy-boto3-sagemaker-edge = buildMypyBoto3Package "sagemaker-edge" "1.34.0" "sha256-F3IN/KA7uzS16HZydXmFXlXseNIdhCais6Abfq7gRdI="; - mypy-boto3-sagemaker-featurestore-runtime = buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.34.0" "sha256-3ptV7rCUIdKGG04zOTNzMfHVysxJ57FSbgfT8IPAw9M="; + mypy-boto3-sagemaker-featurestore-runtime = buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.34.22" "sha256-4dFjwJSTgudHHgpVl2TxUl8fWskuzWO+BhTqa5k+4mw="; mypy-boto3-sagemaker-geospatial = buildMypyBoto3Package "sagemaker-geospatial" "1.34.0" "sha256-9hKKH/025QQYLrlXCOAQoxuWzTMQlmLSov/hVsubF7M="; @@ -642,17 +647,17 @@ rec { mypy-boto3-sdb = buildMypyBoto3Package "sdb" "1.34.0" "sha256-13BuAQD8uDwwDhCw+8O3V882H6/oor5Z8mBmjb7HHAU="; - mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.34.0" "sha256-98GpmijmUKyRg022mo2r5nNPms6S8dei02YWChFAETM="; + mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.34.43" "sha256-q79WB3XC/g3Dg7f3DBahv3U9mz/8DKpeNUR+aFeDpos="; - mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.34.0" "sha256-cY47F8hkhfZUOvTSiwROOByGSKoIDICEd+HaFbaFuFE="; + mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.34.20" "sha256-EcLY5SXSN2kJEuo8s2sYJJfq/X78BM1msyI9TfYD7Xw="; - mypy-boto3-securitylake = buildMypyBoto3Package "securitylake" "1.34.0" "sha256-h5xo9+FzzQvsyvwwFlmVUesHIEkcJQC8/veieACKvS8="; + mypy-boto3-securitylake = buildMypyBoto3Package "securitylake" "1.34.53" "sha256-O/RHRoeUYT5DerEXIQ1NL288bcgA6bGdI29sN7WoQac="; mypy-boto3-serverlessrepo = buildMypyBoto3Package "serverlessrepo" "1.34.0" "sha256-abWCJqFbD/AyPV+7hmY4OlsedFs+p8WpNSXG7hjrj3s="; mypy-boto3-service-quotas = buildMypyBoto3Package "service-quotas" "1.34.0" "sha256-wWbm/udCn5Je1gJZ+uDJ4LE8NbQlq1yHVQc6eQ2umIw="; - mypy-boto3-servicecatalog = buildMypyBoto3Package "servicecatalog" "1.34.0" "sha256-K/h4NTDQFrsSs+S42MXvj3RrY4v/ThHCwql2Z2rUYNo="; + mypy-boto3-servicecatalog = buildMypyBoto3Package "servicecatalog" "1.34.13" "sha256-60XUP/uZDAkB0RaJgUD4wk+DknbsuygMnTmc3bKlr3U="; mypy-boto3-servicecatalog-appregistry = buildMypyBoto3Package "servicecatalog-appregistry" "1.34.0" "sha256-XYqa3aiC9pasmkMDXFmHKuK/PWwi6fZs/pt7rXuRFDw="; @@ -660,7 +665,7 @@ rec { mypy-boto3-ses = buildMypyBoto3Package "ses" "1.34.0" "sha256-ieFDjZ8tTPM5wCRWFjNNUuDKOj8K4s4NH1SiJXxbnaQ="; - mypy-boto3-sesv2 = buildMypyBoto3Package "sesv2" "1.34.0" "sha256-36/TWOTB4FsjkBRpi72SLnVAJXyd4NY0+ZtCBj+zYU0="; + mypy-boto3-sesv2 = buildMypyBoto3Package "sesv2" "1.34.56" "sha256-xW5M8RMTSqRvRfbb3+zeL3i3tWO3w8+G9eMgbhI6K9I="; mypy-boto3-shield = buildMypyBoto3Package "shield" "1.34.0" "sha256-w0D4JKdlitCBIF3NaKn+POYch5CPGIiUZXqBoFzjzz4="; @@ -674,13 +679,13 @@ rec { mypy-boto3-snow-device-management = buildMypyBoto3Package "snow-device-management" "1.34.0" "sha256-buPLN3Qu+asEf2qrv1Jvhu3gKN6aBrK55jB8IxPoFMs="; - mypy-boto3-snowball = buildMypyBoto3Package "snowball" "1.34.0" "sha256-xw/tnkf0iJ7gC0MxRo4NTeRRKJDYUzGu5ZMBBKHMEhg="; + mypy-boto3-snowball = buildMypyBoto3Package "snowball" "1.34.58" "sha256-z60jinh1shgZv2Q4uW2eFphJXRC0ONVN5bPE1UBgC9Y="; - mypy-boto3-sns = buildMypyBoto3Package "sns" "1.34.0" "sha256-q6P+uPdyHjtZYznBwtWmjSbBdwj35Qx2kdDH35XgATI="; + mypy-boto3-sns = buildMypyBoto3Package "sns" "1.34.44" "sha256-qYW1KB0AoVbdfJCT5YE8EMTqa5Hy67cVZ/57t7IQplI="; mypy-boto3-sqs = buildMypyBoto3Package "sqs" "1.34.0" "sha256-C/iZX1iRmrKVOYEA5y6qfaiYrc/Z0zmkLzxIzkc0GdU="; - mypy-boto3-ssm = buildMypyBoto3Package "ssm" "1.34.0" "sha256-roKTbXdJb3lY3CXV231I9jsWTKwDaGxgR1xwkQfer+w="; + mypy-boto3-ssm = buildMypyBoto3Package "ssm" "1.34.61" "sha256-TLyZ9CtpE8U2xsxBwC0/Flkg0ee6u5uxd4K0EFVs3gA="; mypy-boto3-ssm-contacts = buildMypyBoto3Package "ssm-contacts" "1.34.0" "sha256-wkKPGLm24/zgMKitcF9ZaPt/W4m+yHerR1wbEqJALBM="; @@ -696,7 +701,7 @@ rec { mypy-boto3-stepfunctions = buildMypyBoto3Package "stepfunctions" "1.34.0" "sha256-BtIpbO51DRfLYhcUIO6kYU8g8pvkXuNhhU+LWZpugRA="; - mypy-boto3-storagegateway = buildMypyBoto3Package "storagegateway" "1.34.0" "sha256-CIUoGQeMvaGErpr0FnYhBLQ5DS7JIxkqKo6sWLXdGrQ="; + mypy-boto3-storagegateway = buildMypyBoto3Package "storagegateway" "1.34.27" "sha256-iKn048AdvM6XSOqT/w6edWoe0VMi3V305oHMth/QkF0="; mypy-boto3-sts = buildMypyBoto3Package "sts" "1.34.0" "sha256-s0fgozbWAWLdlAdNnRD2FPKwmkVcm0JBWFDVTWduIGc="; @@ -718,11 +723,11 @@ rec { mypy-boto3-transcribe = buildMypyBoto3Package "transcribe" "1.34.0" "sha256-cKiJ306Y96xLHB7vX46uaw145BPLK/1g3OrMIMB0pPo="; - mypy-boto3-transfer = buildMypyBoto3Package "transfer" "1.34.0" "sha256-mYyymy+TUlt7bjuZMSqmO9dfcIzqod2t4gFEwMGPuzo="; + mypy-boto3-transfer = buildMypyBoto3Package "transfer" "1.34.59" "sha256-bx3Ur5TzB/1kxfYT91Aww148ppFmcvjs2rdM/1bWBUo="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.34.0" "sha256-4tjjmwMtIPpMwKZ3yqB96XEb1WidCxMIj2Cfjn0nTy8="; - mypy-boto3-verifiedpermissions = buildMypyBoto3Package "verifiedpermissions" "1.34.0" "sha256-ymLrwwRtiAGezcfhz/j77y+5L+37vKpcqPm48nqUMr4="; + mypy-boto3-verifiedpermissions = buildMypyBoto3Package "verifiedpermissions" "1.34.57" "sha256-odSCs7qud4UQ9/ZZOLEg9k/9fb0ZJQqY2A9sV9s5CPA="; mypy-boto3-voice-id = buildMypyBoto3Package "voice-id" "1.34.0" "sha256-c6HseKIqRPs8NmFZYsg+9jWCMGpMi+VpvM9BiWq16PY="; @@ -732,11 +737,11 @@ rec { mypy-boto3-waf-regional = buildMypyBoto3Package "waf-regional" "1.34.0" "sha256-zv/IPDU6lqmmIfTq57d7VH3SyA7UkgWW2Hysk2zamcM="; - mypy-boto3-wafv2 = buildMypyBoto3Package "wafv2" "1.34.0" "sha256-5UQSZwFRzQEmlkAQqr493G0RGSLS/Jf0w2EveIbQQbg="; + mypy-boto3-wafv2 = buildMypyBoto3Package "wafv2" "1.34.58" "sha256-gPNY3XJr/50nejQFzti9igktryZHsgQDiB9BOYnT94I="; mypy-boto3-wellarchitected = buildMypyBoto3Package "wellarchitected" "1.34.0" "sha256-tzXpOWC6/WJ+/wUgwYtgI7scq7wRpACW8q1z9RwyhbA="; - mypy-boto3-wisdom = buildMypyBoto3Package "wisdom" "1.34.0" "sha256-b3WtzCoQgLlfex22Nux3PrQkfO+QmJ5l6Bv3lFGx4Jk="; + mypy-boto3-wisdom = buildMypyBoto3Package "wisdom" "1.34.16" "sha256-VhRrQLqmrHn/uWI6lWFJ27hiSmZbW1y+VE2Uf8ssrOw="; mypy-boto3-workdocs = buildMypyBoto3Package "workdocs" "1.34.0" "sha256-96V+xgJ+DvqA4A7teCEpVVirlTVxCehXzNcPWUojPH4="; @@ -746,7 +751,7 @@ rec { mypy-boto3-workmailmessageflow = buildMypyBoto3Package "workmailmessageflow" "1.34.0" "sha256-e4wgFvtlfx0u6eGphRU7viGzZ4gbZijj4vjziPLPWX8="; - mypy-boto3-workspaces = buildMypyBoto3Package "workspaces" "1.34.0" "sha256-tWpSNHiUbaBwmhg7FfY58ZJKxIt3lGwpV1/9AXhfh64="; + mypy-boto3-workspaces = buildMypyBoto3Package "workspaces" "1.34.58" "sha256-EtAL93MtIZppL57xP4JDGoWT/SqgptRgCJyq/3bm9ts="; mypy-boto3-workspaces-web = buildMypyBoto3Package "workspaces-web" "1.34.0" "sha256-RImlbT5Lpu2IoTrEQv5Bzk3NnkMV9jQjHGDnxCK3x18="; diff --git a/pkgs/development/python-modules/mypy-boto3/update.sh b/pkgs/development/python-modules/mypy-boto3/update.sh index 09ed48adc8254..f45789baecb29 100644 --- a/pkgs/development/python-modules/mypy-boto3/update.sh +++ b/pkgs/development/python-modules/mypy-boto3/update.sh @@ -1,12 +1,10 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update +#!nix-shell -i bash -p curl jq nix-update xmlstarlet set -eu -o pipefail source_file=pkgs/development/python-modules/mypy-boto3/default.nix -version="1.34.0" - nix-update python311Packages.botocore-stubs --commit --build packages=( @@ -367,20 +365,27 @@ packages=( mypy-boto3-xray) for package in "${packages[@]}"; do - echo "Updating ${package}" + echo "Updating ${package} ..." - url="https://pypi.io/packages/source/m/${package}/${package}-${version}.tar.gz" - hash=$(nix-prefetch-url --type sha256 $url) - sri_hash="$(nix hash to-sri --type sha256 $hash)" + old_version=$(awk -v pkg="$package" -F'"' '$1 ~ pkg " = " {print $4}' ${source_file}) + version=$(curl -s https://pypi.org/pypi/${package}/json | jq -r '.info.version') - awk -i inplace -v package="$package" -v new_version="$version" -v new_sha256="$sri_hash" ' - $1 == package { - $5 = "\"" new_version "\""; - $6 = "\"" new_sha256 "\";"; - } - {print} - ' $source_file + if [ "${version}" != "${old_version}" ]; then + url="https://pypi.io/packages/source/m/${package}/${package}-${version}.tar.gz" + hash=$(nix-prefetch-url --type sha256 $url) + sri_hash="$(nix hash to-sri --type sha256 $hash)" -done + awk -i inplace -v package="$package" -v new_version="$version" -v new_sha256="$sri_hash" ' + $1 == package { + $5 = "\"" new_version "\""; + $6 = "\"" new_sha256 "\";"; + } + {print} + ' $source_file + + nixpkgs-fmt ${source_file} -nixpkgs-fmt $source_file + git commit ${source_file} -m "python311Packages.${package}: ${old_version} -> ${version}" + fi + +done diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 0087fa650d7a8..97d7c86e7d901 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder # build-system @@ -30,7 +31,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.5.1"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -39,7 +40,7 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-qs+axm2+UWNuWzLW8CI4qBV7k7Ra8gBajid8mYKDsso="; + hash = "sha256-1YgAswqLadOVV5ZSi5ZXWYK3p114882IlSx0nKChGPs="; }; nativeBuildInputs = [ @@ -100,6 +101,11 @@ buildPythonPackage rec { tomli ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # requires distutils + "test_c_unit_test" + ]; + disabledTestPaths = [ # fails to find tyoing_extensions "mypy/test/testcmdline.py" diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index e43129a94fcf4..e27ee3f7c7be2 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.2.1"; + version = "2.2.4"; format = "setuptools"; nativeBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-LHrRW4cpOxL9RLR8RoeeyV7GR/RWfoZszXC4M3WE6bI="; + hash = "sha256-M7yfs0ZOfXwQser3M2xf+PKj07iLq0MhFq0kkL6zv0E="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/myuplink/default.nix b/pkgs/development/python-modules/myuplink/default.nix index f1df3644841ae..5b4e11a51c6fe 100644 --- a/pkgs/development/python-modules/myuplink/default.nix +++ b/pkgs/development/python-modules/myuplink/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "myuplink"; - version = "0.3.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,9 +17,14 @@ buildPythonPackage rec { owner = "pajzo"; repo = "myuplink"; rev = "refs/tags/${version}"; - hash = "sha256-XDsQmgP3VvWpuZWGBVW5pBsxTRZT2cl3kp1i2sb+LnM="; + hash = "sha256-UJGRQqgtbYBwfjys2sYiC3dx8Doesu34EBys5Y++qBY="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "%%VERSION_NO%%" "${version}" + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 3c384b8c57841..93cb33f9fd07d 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.7.0"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-spKz0rKTI8hWdO6r8VLtP3G8tS9ANsjYRbinXOARCOQ="; + hash = "sha256-5lvdt1JbOmdts0CYU00bSmv0LsMQsOe//yUgyevBULE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 27d977173e3e5..8897d75a893fe 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -33,14 +33,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.16.0"; + version = "7.16.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gT5lU3ljYkia5XLjm6G/+XhTYZL7UY4QgmsOjK3wPsg="; + hash = "sha256-555qB09Juj7SlCjthkh79RUJ2aq2E72FIqwI9tKP1/0="; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 582d46b521089..3f58201e2c927 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -1,20 +1,11 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, hypothesis -, setuptools-scm -, six -, attrs -, py -, setuptools -, pytest-timeout -, pytest-tornado -, mock -, tabulate +, fetchPypi +, hatch-jupyter-builder +, hatchling +, jupyterlab , nbformat -, jsonschema -, pytestCheckHook , colorama , pygments , tornado @@ -22,14 +13,16 @@ , gitpython , jupyter-server , jupyter-server-mathjax -, notebook , jinja2 +, git +, pytest-tornado +, pytestCheckHook }: buildPythonPackage rec { pname = "nbdime"; version = "4.0.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -39,48 +32,42 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools-scm + hatch-jupyter-builder + hatchling + jupyterlab ]; propagatedBuildInputs = [ - attrs - py - setuptools - six - jupyter-server-mathjax nbformat colorama pygments tornado requests gitpython - notebook + jupyter-server + jupyter-server-mathjax jinja2 ]; nativeCheckInputs = [ - hypothesis - pytest-timeout + git pytest-tornado - jsonschema - mock - tabulate pytestCheckHook ]; disabledTests = [ - "test_apply_filter_no_repo" - "test_diff_api_checkpoint" - "test_filter_cmd_invalid_filter" - "test_inline_merge_source_add" - "test_inline_merge_source_patches" - "test_inline_merge_source_replace" - "test_inline_merge_cells_insertion" - "test_inline_merge_cells_replacement" - "test_interrogate_filter_no_repo" - "test_merge_input_strategy_inline" + "test_git_diffdriver" + "test_git_difftool" + "test_git_mergedriver" + "test_git_mergetool" ]; + preCheck = '' + export HOME="$TEMP" + git config --global user.email "janedoe@example.com" + git config --global user.name "Jane Doe" + ''; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ @@ -89,7 +76,8 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/jupyter/nbdime"; - description = "Tools for diffing and merging of Jupyter notebooks."; + changelog = "https://github.com/jupyter/nbdime/blob/${version}/CHANGELOG.md"; + description = "Tools for diffing and merging of Jupyter notebooks"; license = licenses.bsd3; maintainers = with maintainers; [ tbenst ]; }; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index d070b4317eeda..22cc74504f671 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "4.5.3"; + version = "4.5.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-vAuHfG2/DVUDCxUb7UMRejIh4fQHGl67A+dncvcJ8jQ="; + hash = "sha256-n5Pzw8aikzCml+dOhkLoHR0ytFkEb4AYpw/bIpo6Wd4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 4db2398c25b50..ba7a84d02ec50 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.17.0"; + version = "5.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-BZo4TzFrH1ATl09zRXy+1AFJSBopmByDHe7oITZy7pA="; + hash = "sha256-rp0N2k23WZ86hqqz4ByW5gdyU2eYLVppyEJEdY/Yk8w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index fcd74efe9237d..3daac2f31d161 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -1,27 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, pythonAtLeast +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { - version = "1.5.6"; - pname = "nest_asyncio"; - disabled = !(pythonAtLeast "3.5"); + pname = "nest-asyncio"; + version = "1.6.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-0mfMH/eUQD999pKWTR0qP6lBj/6io/aFmkOf9IL+8pA="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "erdewit"; + repo = "nest_asyncio"; + rev = "refs/tags/v${version}"; + hash = "sha256-5I5WItOl1QpyI4OXZgZf8GiQ7Jlo+SJbDicIbernaU4="; }; - # tests not packaged with source dist as of 1.3.2/1.3.2, and - # can't check tests out of GitHub easily without specific commit IDs (no tagged releases) - doCheck = false; - pythonImportsCheck = [ "nest_asyncio" ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nest_asyncio" + ]; meta = with lib; { description = "Patch asyncio to allow nested event loops"; homepage = "https://github.com/erdewit/nest_asyncio"; + changelog = "https://github.com/erdewit/nest_asyncio/releases/tag/v${version}"; license = licenses.bsdOriginal; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 1824852538759..c7a1580ba9515 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; rev = "refs/tags/v${version}"; - hash = "sha256-ocajE7E4xIatEmv58/9gEpWF2plJdiZXjk6ajD2vTzw="; + hash = "sha256-B2epTqG0PzcD876Bk222nDSorHHB8Znepp+cgl1++gY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 808427e241d9c..af5b5374b5b04 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -1,12 +1,13 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, twisted }: buildPythonPackage rec { - pname = "Nevow"; + pname = "nevow"; version = "0.14.5"; disabled = isPy3k; src = fetchPypi { - inherit version pname; + pname = "Nevow"; + inherit version; sha256 = "afb6ba85a5351953578c018fcdb9dfbd62f29a8d46c58bc9652bc000a27223f3"; }; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 3bccab3447418..7d8e021fd0cfb 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "nibabel"; - version = "5.2.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Pfjxq5gdG9kvQzHVZVKNEmq5cX/b1M/mj0P80cK/P1I="; + hash = "sha256-tsgLLnKOS8K2XxFC2bjSKHqRAqi/hHfhFe8NgzRVmXU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 4dbaa2c94d3d4..d065f93ade21f 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.8.0"; + version = "2.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-baw2uJn2M0tcP897+h88aMkVul6l170Vyz6qwFHZ8+s="; + hash = "sha256-j8P/lhBjlsmnOc4Cv/a2Hdf2EPO8CEpT4IOQHtiBgQA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nikola/default.nix b/pkgs/development/python-modules/nikola/default.nix index e4990ff4af319..461d65a00f8fc 100644 --- a/pkgs/development/python-modules/nikola/default.nix +++ b/pkgs/development/python-modules/nikola/default.nix @@ -1,11 +1,12 @@ { lib +, stdenv , aiohttp , babel , blinker , buildPythonPackage -, python-dateutil , docutils , doit +, feedparser , fetchPypi , freezegun , ghp-import @@ -28,10 +29,11 @@ , pyphen , pyrss2gen , pytestCheckHook +, python-dateutil , pythonOlder , requests , ruamel-yaml -, stdenv +, setuptools , toml , typogrify , unidecode @@ -41,24 +43,33 @@ buildPythonPackage rec { pname = "nikola"; - version = "8.2.4"; - format = "setuptools"; + version = "8.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "Nikola"; inherit version; - hash = "sha256-LNVk2zfNwY4CC4qulqfNXwi3mWyFxzWIeMykh6gFOL8="; + hash = "sha256-VYuhiGLMTHcOZM8/bGZT7Xx5BOHo9gsMPjufYglrBL0="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--cov nikola --cov-report term-missing" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp babel blinker - python-dateutil docutils doit + feedparser ghp-import hsluv html5lib @@ -77,6 +88,7 @@ buildPythonPackage rec { pygments pyphen pyrss2gen + python-dateutil requests ruamel-yaml toml @@ -92,11 +104,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov nikola --cov-report term-missing" "" - ''; - disabledTests = [ # AssertionError "test_compiling_markdown" @@ -107,7 +114,9 @@ buildPythonPackage rec { "test_format_date_locale_variants" ]; - pythonImportsCheck = [ "nikola" ]; + pythonImportsCheck = [ + "nikola" + ]; meta = with lib; { description = "Static website and blog generator"; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 3c21b0b62e518..ce7cdee635b3e 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.10.2"; + version = "0.10.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-A+9Npy0a6HsuPyi3cdx+BUZKoXliblfDAFlWJahlQnM="; + hash = "sha256-d4GTMTFMTKXBXAdjT2n4Vfr9+a3QUbGILjpgCtUnV9g="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index 494a834c937aa..4760543847173 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "niworkflows"; - version = "1.10.0"; + version = "1.10.1"; pyproject = true; src = fetchFromGitHub { owner = "nipreps"; repo = "niworkflows"; rev = "refs/tags/${version}"; - hash = "sha256-wQPk9imDvomg+NTWk+VeW1TE2QlvMyi1YYVVaznhktU="; + hash = "sha256-ZOn3KSaPAA8zTdyexrjF9Wkb5C5qA/5eSJahg2DcX20="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index a722c4b6823c4..2b7b4533ee30b 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.6"; + version = "0.4.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-23TIBSWOYgo7xEilB4raNMbEWIyPFHAh9jsVzh40S8I="; + hash = "sha256-a8fLfTJePf+pejDTqYNXCZda24LaNtOwxwEmEMAnB0I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index 3bdb11416863b..c352bd00083c2 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "notebook-shim"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook_shim"; rev = "refs/tags/v${version}"; - hash = "sha256-eAYZuNYqOMKC6joDbbKk4Q4nrfdbO7b+yZeSvMdWWrI="; + hash = "sha256-CWnXOKE1xvr+a/qWNY6XCTB5+G/fg2O/glgeLzYD+Zc="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index cbf8fa40d78ca..ad72dca6cf514 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { # Using an untagged version, with numpy 1.25 support, when it's released # also drop the versioneer patch in postPatch - version = "0.58.1"; + version = "0.59.0"; pname = "numba"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "numba"; @@ -50,7 +50,7 @@ in buildPythonPackage rec { # use `forceFetchGit = true;`.` If in the future we'll observe the hash # changes too often, we can always use forceFetchGit, and inject the # relevant strings ourselves, using `sed` commands, in extraPostFetch. - hash = "sha256-1Tj2GFoUwRRCWBFxhreF+0Mr+Tjyb7+X4peO+T0qGNs="; + hash = "sha256-wd4TujPhV2Jy/HUUXLHAlcbVFm4gfQNWxWFXD+jeZC4="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 6316ba29356c9..4de1e4a7de05a 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.8.7"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-WW7rO7/ryRL0tuqvhCthunIs69uLxC3++mV9OnSVOEk="; + hash = "sha256-8h0S9sQyzjSQieuVNCur9mKa67P93xh6RJLTqtqtqvA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 039e571695f8b..d25d436d9fdd3 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -53,20 +53,17 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.26.2"; + version = "1.26.4"; pyproject = true; disabled = pythonOlder "3.9" || pythonAtLeast "3.13"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-9lc4RHZ2q1d38R5ru9uM4Rt4XhBfaQvEWWZXSBa20+o="; + hash = "sha256-KgKrqe0S5KxOs+qUIcQgMBoMZGDZgw10qd+H76SRIBA="; }; patches = [ - # Remove last usage of distutils to enable numpy on Python 3.12 - ./0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch - # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]` # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and # 80-bit long double complex numbers. @@ -167,6 +164,9 @@ in buildPythonPackage rec { "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'> ] ++ lib.optionals stdenv.isAarch64 [ "test_big_arrays" # OOM on a 16G machine + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # can fail on virtualized machines confused over their cpu identity + "test_dispatcher" ]; passthru = { diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index 90c0db931e4c9..a38b43b2d8f96 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "numpyro"; - version = "0.13.2"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit version pname; - hash = "sha256-Um8LFVGAlMeOaN9uMwycHJzqEnTaxp8FYXIk+m2VTug="; + hash = "sha256-PkPqqchDRz166TnBg+ENsU4ju0KwrR3pCuFaRRF23kg="; }; propagatedBuildInputs = [ @@ -62,9 +62,6 @@ buildPythonPackage rec { "test_zero_inflated_logits_probs_agree" # NameError: unbound axis name: _provenance "test_model_transformation" - # Using deprecated (removed in jax==0.4.24) jax.core.safe_map - # https://github.com/pyro-ppl/numpyro/issues/1733 - "test_beta_bernoulli" ]; # TODO: remove when tensorflow-probability gets fixed. diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index ca327c3e54e0a..b375d6111ae0a 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,12 +1,10 @@ { lib -, aiohttp , platformdirs , buildPythonPackage , docutils , fetchFromGitHub , flaky , installShellFiles -, packaging , pycurl , pytest-asyncio , pytest-httpbin @@ -20,31 +18,29 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.12"; - format = "pyproject"; + version = "2.13.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - hash = "sha256-6mhVDC2jpIIOZeoKz4AxxU7jj8dqPVBKRWupbuY/T7E="; + hash = "sha256-q+az9oaxxIOv/vLFpkT3cF5GDJsa0Cid4oPWEKg5s7M="; }; nativeBuildInputs = [ + setuptools docutils installShellFiles ]; propagatedBuildInputs = [ - aiohttp - platformdirs - packaging - pycurl - setuptools structlog + platformdirs tornado + pycurl ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; diff --git a/pkgs/development/python-modules/nvidia-ml-py/0001-locate-libnvidia-ml.so.1-on-NixOS.patch b/pkgs/development/python-modules/nvidia-ml-py/0001-locate-libnvidia-ml.so.1-on-NixOS.patch index 3db9030c0ee5f..79f3e8f705c9b 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/0001-locate-libnvidia-ml.so.1-on-NixOS.patch +++ b/pkgs/development/python-modules/nvidia-ml-py/0001-locate-libnvidia-ml.so.1-on-NixOS.patch @@ -11,7 +11,7 @@ index 9a424de..669afe0 100644 + nvmlLib = CDLL("libnvidia-ml.so.1") + except OSError: + # Assume NixOS -+ nvmlLib = CDLL("/run/opengl-driver/lib/libnvidia-ml.so.1") ++ nvmlLib = CDLL("@driverLink@/lib/libnvidia-ml.so.1") except OSError as ose: _nvmlCheckReturn(NVML_ERROR_LIBRARY_NOT_FOUND) if (nvmlLib == None): diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index a8c327a080764..b5c8f5a53d689 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -1,6 +1,8 @@ { lib , fetchPypi , buildPythonPackage +, substituteAll +, addOpenGLRunpath }: buildPythonPackage rec { @@ -15,7 +17,10 @@ buildPythonPackage rec { }; patches = [ - ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch + (substituteAll { + src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch; + inherit (addOpenGLRunpath) driverLink; + }) ]; # no tests diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 9bc3ced1208bf..de26b60caac2a 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -10,12 +10,13 @@ , pytest-asyncio , pytestCheckHook , requests-mock +, setuptools }: buildPythonPackage rec { pname = "oauthenticator"; version = "16.2.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,9 +27,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=oauthenticator" "" + --replace-fail " --cov=oauthenticator" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jupyterhub ]; @@ -56,6 +61,16 @@ buildPythonPackage rec { # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 "test_azuread" "test_mediawiki" + # Tests require network access + "test_allowed" + "test_auth0" + "test_bitbucket" + "test_cilogon" + "test_github" + "test_gitlab" + "test_globus" + "test_google" + "test_openshift" ]; pythonImportsCheck = [ @@ -67,5 +82,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyterhub/oauthenticator"; changelog = "https://github.com/jupyterhub/oauthenticator/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 424e35c5d3a91..9f240535256af 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -7,6 +7,7 @@ , pyjwt , pytestCheckHook , pythonOlder +, setuptools # for passthru.tests , django-allauth @@ -18,27 +19,31 @@ buildPythonPackage rec { pname = "oauthlib"; version = "3.2.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "oauthlib"; + repo = "oauthlib"; rev = "v${version}"; hash = "sha256-KADS1pEaLYi86LEt2VVuz8FVTBANzxC8EeQLgGMxuBU="; }; - propagatedBuildInputs = [ - blinker - cryptography - pyjwt + nativeBuildInputs = [ + setuptools ]; + passthru.optional-dependencies = { + rsa = [ cryptography ]; + signedtoken = [ cryptography pyjwt ]; + signals = [ blinker ]; + }; + nativeCheckInputs = [ mock pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "oauthlib" @@ -53,8 +58,9 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://github.com/oauthlib/oauthlib/blob/${src.rev}/CHANGELOG.rst"; description = "Generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; - homepage = "https://github.com/idan/oauthlib"; + homepage = "https://github.com/oauthlib/oauthlib"; license = licenses.bsd3; maintainers = with maintainers; [ prikhi ]; }; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 15d4ec26e0a35..f385d5a7c8a59 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.121.1"; + version = "2.124.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-oOy0gOTekPXv557dl0A0b8TJVGSUYPq38h2Fu8PN03o="; + hash = "sha256-tiTtBJIohUW80PLMGkdgsC8m4QF0lzmfqErNNb0Ede4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 9f8f810b4be9c..a9a2770efd6b2 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, pythonRelaxDepsHook , pythonOlder , pytest-asyncio , pytestCheckHook @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "odp-amsterdam"; - version = "6.0.0"; + version = "6.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,17 +22,22 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-dAyKypc8bMWkXhYa7BlGGAGqPaPJHFHwXd/UK80BGoE="; + hash = "sha256-teLjiclkbjlG226gMUgqc2IUEWqKcSm6xIekw+AQPU4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' + --replace-fail '"0.0.0"' '"${version}"' sed -i '/addopts/d' pyproject.toml ''; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pytz" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index e8ab9a2802cb9..57750768e4dba 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.2.1"; + version = "3.3.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-UHBr6O0eV4A2yS04/gtPplp5rI+YfizQhYMUE2AZ41I="; + hash = "sha256-+u0whEnzA5XZlqgTpQtGH25/krLLvNPycWXzBUedMRc="; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/onnx/1.15.0-CVE-2024-27318.patch b/pkgs/development/python-modules/onnx/1.15.0-CVE-2024-27318.patch new file mode 100644 index 0000000000000..3b95d1fc588c9 --- /dev/null +++ b/pkgs/development/python-modules/onnx/1.15.0-CVE-2024-27318.patch @@ -0,0 +1,360 @@ +Based on upstream 66b7fb630903fdcf3e83b6b6d56d82e904264a20, adjusted to +apply to 1.15.0 & avoid implicit inclusion of changes from other +intermediate commits + +diff --git a/onnx/checker.cc b/onnx/checker.cc +index fac56f56..c9fda9b2 100644 +--- a/onnx/checker.cc ++++ b/onnx/checker.cc +@@ -13,7 +13,6 @@ + #include <vector> + + #include "onnx/common/file_utils.h" +-#include "onnx/common/path.h" + #include "onnx/defs/schema.h" + #include "onnx/defs/tensor_proto_util.h" + #include "onnx/proto_utils.h" +@@ -135,85 +134,7 @@ void check_tensor(const TensorProto& tensor, const CheckerContext& ctx) { + for (const StringStringEntryProto& entry : tensor.external_data()) { + if (entry.has_key() && entry.has_value() && entry.key() == "location") { + has_location = true; +-#ifdef _WIN32 +- auto file_path = std::filesystem::path(utf8str_to_wstring(entry.value())); +- if (file_path.is_absolute()) { +- fail_check( +- "Location of external TensorProto ( tensor name: ", +- tensor.name(), +- ") should be a relative path, but it is an absolute path: ", +- entry.value()); +- } +- auto relative_path = file_path.lexically_normal().make_preferred().wstring(); +- // Check that normalized relative path contains ".." on Windows. +- if (relative_path.find(L"..", 0) != std::string::npos) { +- fail_check( +- "Data of TensorProto ( tensor name: ", +- tensor.name(), +- ") should be file inside the ", +- ctx.get_model_dir(), +- ", but the '", +- entry.value(), +- "' points outside the directory"); +- } +- std::wstring data_path = path_join(utf8str_to_wstring(ctx.get_model_dir()), relative_path); +- struct _stat64 buff; +- if (_wstat64(data_path.c_str(), &buff) != 0) { +- fail_check( +- "Data of TensorProto ( tensor name: ", +- tensor.name(), +- ") should be stored in ", +- entry.value(), +- ", but it doesn't exist or is not accessible."); +- } +-#else // POSIX +- if (entry.value().empty()) { +- fail_check("Location of external TensorProto ( tensor name: ", tensor.name(), ") should not be empty."); +- } else if (entry.value()[0] == '/') { +- fail_check( +- "Location of external TensorProto ( tensor name: ", +- tensor.name(), +- ") should be a relative path, but it is an absolute path: ", +- entry.value()); +- } +- std::string relative_path = clean_relative_path(entry.value()); +- // Check that normalized relative path contains ".." on POSIX +- if (relative_path.find("..", 0) != std::string::npos) { +- fail_check( +- "Data of TensorProto ( tensor name: ", +- tensor.name(), +- ") should be file inside the ", +- ctx.get_model_dir(), +- ", but the '", +- entry.value(), +- "' points outside the directory"); +- } +- std::string data_path = path_join(ctx.get_model_dir(), relative_path); +- // use stat64 to check whether the file exists +-#if defined(__APPLE__) || defined(__wasm__) || !defined(__GLIBC__) +- struct stat buffer; // APPLE, wasm and non-glic stdlibs do not have stat64 +- if (stat((data_path).c_str(), &buffer) != 0) { +-#else +- struct stat64 buffer; // All POSIX under glibc except APPLE and wasm have stat64 +- if (stat64((data_path).c_str(), &buffer) != 0) { +-#endif +- fail_check( +- "Data of TensorProto ( tensor name: ", +- tensor.name(), +- ") should be stored in ", +- data_path, +- ", but it doesn't exist or is not accessible."); +- } +- // Do not allow symlinks or directories. +- if (!S_ISREG(buffer.st_mode)) { +- fail_check( +- "Data of TensorProto ( tensor name: ", +- tensor.name(), +- ") should be stored in ", +- data_path, +- ", but it is not regular file."); +- } +-#endif ++ resolve_external_data_location(ctx.get_model_dir(), entry.value(), tensor.name()); + } + } + if (!has_location) { +@@ -1054,6 +975,93 @@ void check_model(const ModelProto& model, bool full_check, bool skip_opset_compa + } + } + ++std::string resolve_external_data_location( ++ const std::string& base_dir, ++ const std::string& location, ++ const std::string& tensor_name) { ++#ifdef _WIN32 ++ auto file_path = std::filesystem::path(utf8str_to_wstring(location)); ++ if (file_path.is_absolute()) { ++ fail_check( ++ "Location of external TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be a relative path, but it is an absolute path: ", ++ location); ++ } ++ auto relative_path = file_path.lexically_normal().make_preferred().wstring(); ++ // Check that normalized relative path contains ".." on Windows. ++ if (relative_path.find(L"..", 0) != std::string::npos) { ++ fail_check( ++ "Data of TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be file inside the ", ++ base_dir, ++ ", but the '", ++ location, ++ "' points outside the directory"); ++ } ++ std::wstring data_path = path_join(utf8str_to_wstring(base_dir), relative_path); ++ struct _stat64 buff; ++ if (_wstat64(data_path.c_str(), &buff) != 0) { ++ fail_check( ++ "Data of TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be stored in ", ++ location, ++ ", but it doesn't exist or is not accessible."); ++ } ++ return wstring_to_utf8str(data_path); ++#else // POSIX ++ if (location.empty()) { ++ fail_check("Location of external TensorProto ( tensor name: ", tensor_name, ") should not be empty."); ++ } else if (location[0] == '/') { ++ fail_check( ++ "Location of external TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be a relative path, but it is an absolute path: ", ++ location); ++ } ++ std::string relative_path = clean_relative_path(location); ++ // Check that normalized relative path contains ".." on POSIX ++ if (relative_path.find("..", 0) != std::string::npos) { ++ fail_check( ++ "Data of TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be file inside the ", ++ base_dir, ++ ", but the '", ++ location, ++ "' points outside the directory"); ++ } ++ std::string data_path = path_join(base_dir, relative_path); ++ // use stat64 to check whether the file exists ++#if defined(__APPLE__) || defined(__wasm__) || !defined(__GLIBC__) ++ struct stat buffer; // APPLE, wasm and non-glic stdlibs do not have stat64 ++ if (stat((data_path).c_str(), &buffer) != 0) { ++#else ++ struct stat64 buffer; // All POSIX under glibc except APPLE and wasm have stat64 ++ if (stat64((data_path).c_str(), &buffer) != 0) { ++#endif ++ fail_check( ++ "Data of TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be stored in ", ++ data_path, ++ ", but it doesn't exist or is not accessible."); ++ } ++ // Do not allow symlinks or directories. ++ if (!S_ISREG(buffer.st_mode)) { ++ fail_check( ++ "Data of TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be stored in ", ++ data_path, ++ ", but it is not regular file."); ++ } ++ return data_path; ++#endif ++} ++ + std::set<std::string> experimental_ops = { + "ATen", + "Affine", +diff --git a/onnx/checker.h b/onnx/checker.h +index 6796acab..83012213 100644 +--- a/onnx/checker.h ++++ b/onnx/checker.h +@@ -160,7 +160,10 @@ void check_model_local_functions( + + void check_model(const ModelProto& model, bool full_check = false, bool skip_opset_compatibility_check = false); + void check_model(const std::string& model_path, bool full_check = false, bool skip_opset_compatibility_check = false); +- ++std::string resolve_external_data_location( ++ const std::string& base_dir, ++ const std::string& location, ++ const std::string& tensor_name); + bool check_is_experimental_op(const NodeProto& node); + + } // namespace checker +diff --git a/onnx/common/path.h b/onnx/common/path.h +index 6eaf5e67..09212747 100644 +--- a/onnx/common/path.h ++++ b/onnx/common/path.h +@@ -31,11 +31,22 @@ inline std::wstring utf8str_to_wstring(const std::string& utf8str) { + if (utf8str.size() > INT_MAX) { + fail_check("utf8str_to_wstring: string is too long for converting to wstring."); + } +- int size_required = MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), (int)utf8str.size(), NULL, 0); ++ int size_required = MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), static_cast<int>(utf8str.size()), NULL, 0); + std::wstring ws_str(size_required, 0); +- MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), (int)utf8str.size(), &ws_str[0], size_required); ++ MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), static_cast<int>(utf8str.size()), &ws_str[0], size_required); + return ws_str; + } ++inline std::string wstring_to_utf8str(const std::wstring& ws_str) { ++ if (ws_str.size() > INT_MAX) { ++ fail_check("wstring_to_utf8str: string is too long for converting to UTF-8."); ++ } ++ int size_required = ++ WideCharToMultiByte(CP_UTF8, 0, ws_str.c_str(), static_cast<int>(ws_str.size()), NULL, 0, NULL, NULL); ++ std::string utf8str(size_required, 0); ++ WideCharToMultiByte( ++ CP_UTF8, 0, ws_str.c_str(), static_cast<int>(ws_str.size()), &utf8str[0], size_required, NULL, NULL); ++ return utf8str; ++} + + #else + std::string path_join(const std::string& origin, const std::string& append); +diff --git a/onnx/cpp2py_export.cc b/onnx/cpp2py_export.cc +index bc2594db..83cea68f 100644 +--- a/onnx/cpp2py_export.cc ++++ b/onnx/cpp2py_export.cc +@@ -545,6 +545,8 @@ PYBIND11_MODULE(onnx_cpp2py_export, onnx_cpp2py_export) { + "full_check"_a = false, + "skip_opset_compatibility_check"_a = false); + ++ checker.def("_resolve_external_data_location", &checker::resolve_external_data_location); ++ + // Submodule `version_converter` + auto version_converter = onnx_cpp2py_export.def_submodule("version_converter"); + version_converter.doc() = "VersionConverter submodule"; +diff --git a/onnx/external_data_helper.py b/onnx/external_data_helper.py +index bbc2717f..05c486c6 100644 +--- a/onnx/external_data_helper.py ++++ b/onnx/external_data_helper.py +@@ -8,6 +8,7 @@ import uuid + from itertools import chain + from typing import Callable, Iterable, Optional + ++import onnx.onnx_cpp2py_export.checker as c_checker + from onnx.onnx_pb import AttributeProto, GraphProto, ModelProto, TensorProto + + +@@ -39,9 +40,9 @@ def load_external_data_for_tensor(tensor: TensorProto, base_dir: str) -> None: + base_dir: directory that contains the external data. + """ + info = ExternalDataInfo(tensor) +- file_location = _sanitize_path(info.location) +- external_data_file_path = os.path.join(base_dir, file_location) +- ++ external_data_file_path = c_checker._resolve_external_data_location( # type: ignore[attr-defined] ++ base_dir, info.location, tensor.name ++ ) + with open(external_data_file_path, "rb") as data_file: + if info.offset: + data_file.seek(info.offset) +@@ -259,14 +260,6 @@ def _get_attribute_tensors(onnx_model_proto: ModelProto) -> Iterable[TensorProto + yield from _get_attribute_tensors_from_graph(onnx_model_proto.graph) + + +-def _sanitize_path(path: str) -> str: +- """Remove path components which would allow traversing up a directory tree from a base path. +- +- Note: This method is currently very basic and should be expanded. +- """ +- return path.lstrip("/.") +- +- + def _is_valid_filename(filename: str) -> bool: + """Utility to check whether the provided filename is valid.""" + exp = re.compile('^[^<>:;,?"*|/]+$') +diff --git a/onnx/test/test_external_data.py b/onnx/test/test_external_data.py +index 63f6b4ef..bb14d279 100644 +--- a/onnx/test/test_external_data.py ++++ b/onnx/test/test_external_data.py +@@ -3,6 +3,7 @@ + # SPDX-License-Identifier: Apache-2.0 + from __future__ import annotations + ++import itertools + import os + import pathlib + import tempfile +@@ -204,6 +205,52 @@ class TestLoadExternalDataSingleFile(TestLoadExternalDataBase): + attribute_tensor = new_model.graph.node[0].attribute[0].t + np.testing.assert_allclose(to_array(attribute_tensor), self.attribute_value) + ++ @parameterized.parameterized.expand(itertools.product((True, False), (True, False))) ++ def test_save_external_invalid_single_file_data_and_check( ++ self, use_absolute_path: bool, use_model_path: bool ++ ) -> None: ++ model = onnx.load_model(self.model_filename, self.serialization_format) ++ ++ model_dir = os.path.join(self.temp_dir, "save_copy") ++ os.mkdir(model_dir) ++ ++ traversal_external_data_dir = os.path.join( ++ self.temp_dir, "invlid_external_data" ++ ) ++ os.mkdir(traversal_external_data_dir) ++ ++ if use_absolute_path: ++ traversal_external_data_location = os.path.join( ++ traversal_external_data_dir, "tensors.bin" ++ ) ++ else: ++ traversal_external_data_location = "../invlid_external_data/tensors.bin" ++ ++ external_data_dir = os.path.join(self.temp_dir, "external_data") ++ os.mkdir(external_data_dir) ++ new_model_filepath = os.path.join(model_dir, "model.onnx") ++ ++ def convert_model_to_external_data_no_check(model: ModelProto, location: str): ++ for tensor in model.graph.initializer: ++ if tensor.HasField("raw_data"): ++ set_external_data(tensor, location) ++ ++ convert_model_to_external_data_no_check( ++ model, ++ location=traversal_external_data_location, ++ ) ++ ++ onnx.save_model(model, new_model_filepath, self.serialization_format) ++ if use_model_path: ++ with self.assertRaises(onnx.checker.ValidationError): ++ _ = onnx.load_model(new_model_filepath, self.serialization_format) ++ else: ++ onnx_model = onnx.load_model( ++ new_model_filepath, self.serialization_format, load_external_data=False ++ ) ++ with self.assertRaises(onnx.checker.ValidationError): ++ load_external_data_for_model(onnx_model, external_data_dir) ++ + + @parameterized.parameterized_class( + [ diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 7d5e27138ecc1..bcfd0cf6e3cf2 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , cmake , fetchFromGitHub +, fetchpatch , gtest , nbval , numpy @@ -35,6 +36,15 @@ in buildPythonPackage rec { hash = "sha256-Jzga1IiUO5LN5imSUmnbsjYtapRatTihx38EOUjm9Os="; }; + patches = [ + ./1.15.0-CVE-2024-27318.patch + (fetchpatch { + name = "CVE-2024-27319.patch"; + url = "https://github.com/onnx/onnx/commit/08a399ba75a805b7813ab8936b91d0e274b08287.patch"; + hash = "sha256-9X92N9i/hpQjDGe4I/C+FwUcTUTtP2Nf7+pcTA2sXoA="; + }) + ]; + nativeBuildInputs = [ cmake pybind11 diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index dab58b533265b..fb05e0a18dd35 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.13.2"; + version = "1.13.3"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-3otPmMVV/Wx7k/oec5c1r6GcZGzhMSKifJB8S5nBSZw="; + hash = "sha256-8SHXUrPLZ7lgvB0jqZlcvKq5Zv2d2UqXjJpgiBpR8P8="; }; nativeBuildInputs = [ @@ -74,6 +74,10 @@ buildPythonPackage rec { dirty-equals ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + disabledTests = [ # Tests make network requests "test_streaming_response" diff --git a/pkgs/development/python-modules/openllm-client/default.nix b/pkgs/development/python-modules/openllm-client/default.nix index 7c0c1d80fc5bb..0b1e742121046 100644 --- a/pkgs/development/python-modules/openllm-client/default.nix +++ b/pkgs/development/python-modules/openllm-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - sourceRoot = "source/openllm-client"; + sourceRoot = "${src.name}/openllm-client"; postPatch = '' substituteInPlace pyproject.toml \ @@ -29,20 +29,20 @@ buildPythonPackage rec { --replace-fail "hatch-vcs==0.3.0" "hatch-vcs" ''; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ anyio distro httpx openllm-core ]; - passthru.optional-dependencies = { + optional-dependencies = { grpc = [ bentoml ] ++ bentoml.optional-dependencies.grpc; @@ -54,7 +54,7 @@ buildPythonPackage rec { # diffusers soundfile ] ++ transformers.optional-dependencies.agents; - full = passthru.optional-dependencies.grpc ++ passthru.optional-dependencies.agents; + full = optional-dependencies.grpc ++ optional-dependencies.agents; }; # there is no tests diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index c807f668b2711..f5fb0ad6e6bf2 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "openllm-core"; - version = "0.4.41"; + version = "0.4.44"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,15 +33,12 @@ buildPythonPackage rec { owner = "bentoml"; repo = "OpenLLM"; rev = "refs/tags/v${version}"; - hash = "sha256-9mr6sw4/h5cYSmo1CDT2SKq4NVz1ZcoyqnYOwhlfaiQ="; + hash = "sha256-kRR715Vnt9ZAmxuWvtH0z093crH0JFrEKPtbjO3QMRc="; }; - sourceRoot = "source/openllm-core"; + sourceRoot = "${src.name}/openllm-core"; nativeBuildInputs = [ - hatch-fancy-pypi-readme - hatch-vcs - hatchling pythonRelaxDepsHook ]; @@ -55,7 +52,13 @@ buildPythonPackage rec { "cattrs" ]; - propagatedBuildInputs = [ + build-system = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + dependencies = [ attrs cattrs # not listed in pyproject.toml, but required at runtime @@ -67,7 +70,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { vllm = [ # vllm ]; @@ -83,7 +86,7 @@ buildPythonPackage rec { # trl ] ++ transformers.optional-dependencies.torch ++ transformers.optional-dependencies.tokenizers; - full = with passthru.optional-dependencies; ( + full = with optional-dependencies; ( vllm # use absolute path to disambiguate with derivbation argument ++ passthru.optional-dependencies.bentoml diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/development/python-modules/openllm/default.nix index d889860e4e674..8a37e257ffa98 100644 --- a/pkgs/development/python-modules/openllm/default.nix +++ b/pkgs/development/python-modules/openllm/default.nix @@ -51,12 +51,9 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - sourceRoot = "source/openllm-python"; + sourceRoot = "${src.name}/openllm-python"; nativeBuildInputs = [ - hatch-fancy-pypi-readme - hatch-vcs - hatchling pythonRelaxDepsHook ]; @@ -65,7 +62,13 @@ buildPythonPackage rec { "cuda-python" ]; - propagatedBuildInputs = [ + build-system = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + dependencies = [ accelerate bentoml bitsandbytes @@ -79,14 +82,13 @@ buildPythonPackage rec { safetensors scipy sentencepiece - tabulate transformers ] ++ bentoml.optional-dependencies.io ++ tabulate.optional-dependencies.widechars ++ transformers.optional-dependencies.tokenizers ++ transformers.optional-dependencies.torch; - passthru.optional-dependencies = { + optional-dependencies = { agents = [ # diffusers soundfile @@ -142,13 +144,13 @@ buildPythonPackage rec { vllm = [ # vllm ]; - full = with passthru.optional-dependencies; ( + full = with optional-dependencies; ( agents ++ awq ++ baichuan ++ chatglm ++ ctranslate ++ falcon ++ fine-tune ++ ggml ++ gptq ++ mpt # disambiguate between derivation input and passthru field - ++ passthru.optional-dependencies.openai + ++ optional-dependencies.openai ++ playground ++ starcoder ++ vllm ); - all = passthru.optional-dependencies.full; + all = optional-dependencies.full; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 5b7a0bc0f8f21..3e801b5827975 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,14 +1,14 @@ { lib , fetchFromGitHub }: rec { - version = "3.6.1"; + version = "3.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - hash = "sha256-bboTRZqJq5tKeBQuiEQAXxTHYvoldDQlwbfehjDA8EE="; + hash = "sha256-tjVWvJxcZ2maR99VRwMGCa+IK+1CjCc7jxAj4XkDUEw="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 1dca33bba9e11..f6cc42e67f754 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "2.1.0"; + version = "3.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dsm3QKLNYl/MbpJBYU7vKgk0y3I1SlxYcWj4+t7y5nQ="; + hash = "sha256-sMf5oCXV2pKtTHYpQeasxMtTkwoH/3OamuvMXlpySuY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index 148f76d03529c..c3f16f7d9ef67 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -50,6 +50,7 @@ buildPythonPackage { openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForStatus.test_callback openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 5b59d43e7816f..135518ce3f8c4 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -14,30 +14,32 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.22.0"; - disabled = pythonOlder "3.7"; + version = "1.23.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-6BmBmooVaH1FOpgXpFlYth0r9XaNtmb9UezeP8hWEok="; + hash = "sha256-Ge/DjVG7ajoS0nJLZxtfn4Mmx0SffAE/91dViA5qWAA="; }; sourceRoot = "${src.name}/opentelemetry-api"; - format = "pyproject"; - nativeBuildInputs = [ - hatchling pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + build-system = [ + hatchling + ]; + + dependencies = [ deprecated importlib-metadata - setuptools ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 8a43e9b4cda42..bc8bbec64e976 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -2,10 +2,8 @@ , buildPythonPackage , pythonOlder , hatchling -, backoff , opentelemetry-api , opentelemetry-proto -, opentelemetry-sdk , opentelemetry-test-utils , pytestCheckHook }: @@ -13,19 +11,17 @@ buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-common"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-common"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-common"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ - backoff - opentelemetry-sdk + dependencies = [ opentelemetry-proto ]; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index b727d16b8e65e..9f1fe62dfbb47 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -1,35 +1,37 @@ { lib , buildPythonPackage , pythonOlder -, backoff +, deprecated , googleapis-common-protos , grpcio , hatchling , opentelemetry-api -, opentelemetry-test-utils , opentelemetry-exporter-otlp-proto-common -, pytest-grpc +, opentelemetry-proto +, opentelemetry-test-utils , pytestCheckHook }: buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-grpc"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-grpc"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-grpc"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ - backoff + dependencies = [ + deprecated googleapis-common-protos grpcio + opentelemetry-api opentelemetry-exporter-otlp-proto-common + opentelemetry-proto ]; nativeCheckInputs = [ @@ -43,6 +45,8 @@ buildPythonPackage { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ]; + __darwinAllowLocalNetworking = true; + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-grpc"; description = "OpenTelemetry Collector Protobuf over gRPC Exporter"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index 2478826cd67e8..8c82d0b8b5808 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage , pythonOlder -, backoff +, deprecated , googleapis-common-protos , hatchling , opentelemetry-api , opentelemetry-exporter-otlp-proto-common +, opentelemetry-proto +, opentelemetry-sdk , opentelemetry-test-utils , requests , responses @@ -15,20 +17,23 @@ buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-http"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-http"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-http"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ - backoff + dependencies = [ + deprecated googleapis-common-protos + opentelemetry-api opentelemetry-exporter-otlp-proto-common + opentelemetry-proto + opentelemetry-sdk requests ]; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index 7dcc282e15368..75748e3b70ac0 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -1,33 +1,34 @@ { lib , buildPythonPackage , pythonOlder -, backoff , hatchling , opentelemetry-api , opentelemetry-exporter-otlp-proto-grpc , opentelemetry-exporter-otlp-proto-http +, opentelemetry-test-utils , pytestCheckHook }: buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-exporter-otlp-proto-grpc opentelemetry-exporter-otlp-proto-http ]; nativeCheckInputs = [ + opentelemetry-test-utils pytestCheckHook ]; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index 7708b404a980c..1ccd6b472e183 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -10,19 +10,20 @@ }: buildPythonPackage { - inherit (opentelemetry-api) version src; + inherit (opentelemetry-api) src; pname = "opentelemetry-exporter-prometheus"; - disabled = pythonOlder "3.7"; + version = "0.44b0"; + pyproject = true; - sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-prometheus"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-prometheus"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-api opentelemetry-sdk prometheus-client diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index cdd40d4470503..df5a9b037652a 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -15,23 +15,23 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-aiohttp-client"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-aiohttp-client"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-aiohttp-client"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ + aiohttp opentelemetry-api opentelemetry-instrumentation opentelemetry-semantic-conventions opentelemetry-util-http wrapt - aiohttp ]; # missing https://github.com/ezequielramos/http-server-mock diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 952824cd1b72b..7eb2a66797459 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -14,17 +14,17 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-asgi"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-asgi"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-asgi"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ asgiref opentelemetry-instrumentation opentelemetry-api diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 39058d16e2594..9e27e60e2ddec 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -13,33 +13,36 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-django"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-django"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-django"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ django opentelemetry-api opentelemetry-instrumentation - opentelemetry-instrumentation-asgi opentelemetry-instrumentation-wsgi opentelemetry-semantic-conventions opentelemetry-util-http ]; + passthru.optional-dependencies = { + asgi = [ opentelemetry-instrumentation-asgi ]; + }; + nativeCheckInputs = [ opentelemetry-test-utils pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.asgi; pythonImportsCheck = [ "opentelemetry.instrumentation.django" ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix new file mode 100644 index 0000000000000..a4da7665172e9 --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fastapi +, hatchling +, httpx +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-instrumentation-asgi +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, opentelemetry-util-http +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-fastapi"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-fastapi"; + + build-system = [ + hatchling + ]; + + dependencies = [ + fastapi + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-asgi + opentelemetry-semantic-conventions + opentelemetry-util-http + ]; + + nativeCheckInputs = [ + httpx + opentelemetry-test-utils + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ + "opentelemetry.instrumentation.fastapi" + ]; + + meta = opentelemetry-instrumentation.meta // { + description = "OpenTelemetry Instrumentation for fastapi"; + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-fastapi"; + }; +} diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix index 71860dd8fd741..0e1daa3f3a91c 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix @@ -7,6 +7,7 @@ , opentelemetry-semantic-conventions , opentelemetry-test-utils , opentelemetry-util-http +, packaging , pytestCheckHook , pythonOlder }: @@ -14,21 +15,22 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-flask"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-flask"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-flask"; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ flask opentelemetry-api opentelemetry-instrumentation opentelemetry-instrumentation-wsgi opentelemetry-semantic-conventions opentelemetry-util-http + packaging ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index ad408c3dfbaa0..2a2cae6f6de43 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , hatchling @@ -15,17 +16,17 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-grpc"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-grpc"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-grpc"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-api opentelemetry-instrumentation opentelemetry-sdk @@ -43,8 +44,15 @@ buildPythonPackage { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # RuntimeError: Failed to bind to address + "TestOpenTelemetryServerInterceptorUnix" + ]; + pythonImportsCheck = [ "opentelemetry.instrumentation.grpc" ]; + __darwinAllowLocalNetworking = true; + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc"; description = "OpenTelemetry Instrumentation for grpc"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index 0b1fda0276c97..2e3d60b28442a 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -13,17 +13,17 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-wsgi"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-wsgi"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-wsgi"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-instrumentation opentelemetry-api opentelemetry-semantic-conventions diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index f5e76507d3ab1..965276da78f11 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , hatchling , opentelemetry-api -, opentelemetry-sdk , opentelemetry-test-utils , setuptools , wrapt @@ -13,28 +12,27 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.43b0"; - disabled = pythonOlder "3.7"; + version = "0.44b0"; + pyproject = true; + + disabled = pythonOlder "3.8"; # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-fUyA3cPXAxO506usEWxOUX9xiapc8Ocnbx73LP6ghRE="; + hash = "sha256-r+k/YdK7YqYme8nKoy3ig3krvZjxYRKgLBkcdEtFy3k="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-api - opentelemetry-sdk setuptools wrapt ]; diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index 21b84dd5898fe..58869327a1aeb 100644 --- a/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -10,17 +10,17 @@ buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-proto"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-proto"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-proto"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ protobuf ]; diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index ba5e7de5db83c..bee9dc01e6b0c 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -15,20 +15,19 @@ let self = buildPythonPackage { inherit (opentelemetry-api) version src; pname = "opentelemetry-sdk"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-sdk"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-sdk"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-api opentelemetry-semantic-conventions - setuptools typing-extensions ]; diff --git a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix index d57a7f13fa535..a2a88906ec073 100644 --- a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix +++ b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix @@ -7,15 +7,16 @@ }: buildPythonPackage { - inherit (opentelemetry-api) version src; + inherit (opentelemetry-api) src; pname = "opentelemetry-semantic-conventions"; - disabled = pythonOlder "3.7"; + version = "0.44b0"; + pyproject = true; - sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-semantic-conventions"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-semantic-conventions"; - nativeBuildInputs = [ + build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index 4e2405058b86f..d255845658c22 100644 --- a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , buildPythonPackage , pythonOlder , asgiref @@ -9,19 +8,20 @@ }: buildPythonPackage { - inherit (opentelemetry-api) version src; + inherit (opentelemetry-api) src; pname = "opentelemetry-test-utils"; - disabled = pythonOlder "3.7"; + version = "0.44b0"; + pyproject = true; - sourceRoot = "${opentelemetry-api.src.name}/tests/opentelemetry-test-utils"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-api.src.name}/tests/opentelemetry-test-utils"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ asgiref opentelemetry-api opentelemetry-sdk diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index e14338ffcbce0..128f503d832d1 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -3,8 +3,6 @@ , pythonOlder , hatchling , opentelemetry-instrumentation -, opentelemetry-sdk -, opentelemetry-semantic-conventions , opentelemetry-test-utils , pytestCheckHook }: @@ -12,23 +10,18 @@ buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-util-http"; - disabled = pythonOlder "3.7"; + pyproject = true; - sourceRoot = "${opentelemetry-instrumentation.src.name}/util/opentelemetry-util-http"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/util/opentelemetry-util-http"; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ - opentelemetry-instrumentation - opentelemetry-sdk - opentelemetry-semantic-conventions - ]; - nativeCheckInputs = [ + opentelemetry-instrumentation opentelemetry-test-utils pytestCheckHook ]; @@ -41,6 +34,8 @@ buildPythonPackage { pythonImportsCheck = [ "opentelemetry.util.http" ]; + __darwinAllowLocalNetworking = true; + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/util/opentelemetry-util-http"; description = "Web util for OpenTelemetry"; diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index f97a9f425ecd4..590bae1823c97 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -28,6 +28,7 @@ , bison , qt6 , python +, darwin }: let # Matches the pyside6-uic implementation @@ -46,6 +47,11 @@ buildPythonPackage rec { hash = "sha256-5zQrfB14kXs75WbL3s4eyhxELglhLNxU2L2aVXiyVjg="; }; + stdenv = if python.stdenv.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + python.stdenv; + outputs = ["out" "doc"]; format = "other"; @@ -72,9 +78,9 @@ buildPythonPackage rec { "-DPXR_BUILD_PYTHON_DOCUMENTATION=ON" "-DPXR_BUILD_EMBREE_PLUGIN=ON" "-DPXR_BUILD_ALEMBIC_PLUGIN=ON" - "-DPXR_ENABLE_OSL_SUPPORT=ON" "-DPXR_BUILD_DRACO_PLUGIN=ON" "-DPXR_BUILD_MONOLITHIC=ON" # Seems to be commonly linked to monolithically + (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.isDarwin)) ]; nativeBuildInputs = [ @@ -100,8 +106,12 @@ buildPythonPackage rec { boost draco qt6.qtbase - qt6.qtwayland - ]; + ] + ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + Cocoa + ]) + ; pythonImportsCheck = [ "pxr" "pxr.Usd" ]; diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index 7c507cba15e0f..b1e47f13c4369 100644 --- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openwrt-luci-rpc"; - version = "1.1.16"; + version = "1.1.17"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ZvPMJbYCNKMXuTrHwXQvBZ/mMenYTsV1X4COiVxvJGY="; + hash = "sha256-RFZCnQTDs3vre0qbedIEnng7lGo3Ikp0Bw4+7sbPRJk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 6e5225d17337c..306f0431bfae7 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -5,13 +5,14 @@ , fetchFromGitHub , pyotp , pytestCheckHook +, python-dotenv , pythonOlder , setuptools }: buildPythonPackage rec { pname = "opower"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-YqNHjGJ0BkF8/1LVDqbw9QoJgPgwbA1sIPJUuP4TTJY="; + hash = "sha256-O+yIxEFqD6hel1H9aUnSz/wJoEhVrg6DDZptNcJVkSw="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { aiohttp arrow pyotp + python-dotenv ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index fe7f775541822..1c4531254ae8c 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -4,7 +4,10 @@ , buildPythonPackage , chardet , copyDesktopItems +, pythonRelaxDepsHook , cython +, catboost +, xgboost , fetchFromGitHub , fetchurl , httpx @@ -45,7 +48,7 @@ let self = buildPythonPackage rec { pname = "orange3"; version = "3.36.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -58,15 +61,17 @@ let postPatch = '' substituteInPlace pyproject.toml \ - --replace "setuptools>=41.0.0,<50.0" "setuptools" - sed -i 's;\(scikit-learn\)[^$]*;\1;g' requirements-core.txt - sed -i 's;pyqtgraph[^$]*;;g' requirements-gui.txt # TODO: remove after bump with a version greater than 0.13.1 + --replace-fail 'cython>=3.0' 'cython' + + # disable update checking + echo -e "def check_for_updates():\n\tpass" >> Orange/canvas/__main__.py ''; nativeBuildInputs = [ copyDesktopItems - cython + pythonRelaxDepsHook oldest-supported-numpy + cython qt5.wrapQtAppsHook recommonmark setuptools @@ -76,13 +81,18 @@ let enableParallelBuilding = true; + pythonRelaxDeps = [ "scikit-learn" ]; + propagatedBuildInputs = [ numpy scipy chardet + catboost + xgboost openpyxl opentsne qtconsole + setuptools bottleneck matplotlib joblib @@ -107,6 +117,9 @@ let # FIXME: ImportError: cannot import name '_variable' from partially initialized module 'Orange.data' (most likely due to a circular import) (/build/source/Orange/data/__init__.py) doCheck = false; + # FIXME: pythonRelaxDeps is not relaxing the scikit-learn version constraint, had to disable this + dontCheckRuntimeDeps = true; + pythonImportsCheck = [ "Orange" "Orange.data._variable" ]; desktopItems = [ diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix new file mode 100644 index 0000000000000..c1787fe86747d --- /dev/null +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -0,0 +1,78 @@ +{ lib +, absl-py +, buildPythonPackage +, cached-property +, etils +, fetchPypi +, flit-core +, importlib-resources +, jax +, jaxlib +, msgpack +, nest-asyncio +, numpy +, protobuf +, pytest-xdist +, pytestCheckHook +, pythonOlder +, pyyaml +, tensorstore +, typing-extensions +}: + +buildPythonPackage rec { + pname = "orbax-checkpoint"; + version = "0.5.5"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "orbax_checkpoint"; + inherit version; + hash = "sha256-zry5byLxFzah+e52x4yIi6roU3Jox/9mY62cujB2xlU="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + absl-py + cached-property + etils + importlib-resources + jax + jaxlib + msgpack + nest-asyncio + numpy + protobuf + pyyaml + tensorstore + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + ]; + + pythonImportsCheck = [ + "orbax" + ]; + + disabledTestPaths = [ + # Circular dependency flax + "orbax/checkpoint/transform_utils_test.py" + "orbax/checkpoint/utils_test.py" + ]; + + meta = with lib; { + description = "Orbax provides common utility libraries for JAX users"; + homepage = "https://github.com/google/orbax/tree/main/checkpoint"; + changelog = "https://github.com/google/orbax/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [fab ]; + }; +} diff --git a/pkgs/development/python-modules/orgparse/default.nix b/pkgs/development/python-modules/orgparse/default.nix new file mode 100644 index 0000000000000..67988d5529ff9 --- /dev/null +++ b/pkgs/development/python-modules/orgparse/default.nix @@ -0,0 +1,22 @@ +{ lib, python3Packages, fetchPypi }: + +python3Packages.buildPythonPackage rec { + pname = "orgparse"; + version = "0.4.20231004"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-pOOK6tq/mYiw9npmrNCCedGCILy8QioSkGDCiQu6kaA="; + }; + + nativeBuildInputs = [ python3Packages.setuptools-scm ]; + + pyproject = true; + + meta = with lib; { + homepage = "https://github.com/karlicoss/orgparse"; + description = "orgparse - Emacs org-mode parser in Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ twitchy0 ]; + }; +} diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index fb81938bc0917..ede3b10fc718c 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -1,39 +1,55 @@ { lib , stdenv +, buildPythonPackage +, fetchFromGitHub , pythonOlder + +# build-system , rustPlatform -, fetchFromGitHub -, buildPythonPackage , cffi + +# native dependencies , libiconv + +# tests , numpy , psutil , pytestCheckHook , python-dateutil , pytz , xxhash +, python + +# for passthru.tests +, falcon +, fastapi +, gradio +, mashumaro +, ufolib2 }: buildPythonPackage rec { pname = "orjson"; - version = "3.9.10"; - format = "pyproject"; + version = "3.9.15"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; - repo = pname; + repo = "orjson"; rev = "refs/tags/${version}"; - hash = "sha256-MkcuayNDt7/GcswXoFTvzuaZzhQEQV+V7OfKqgJwVIQ="; + hash = "sha256-6fcj64d/uFCxaez+xxOdHd+NqILKOPqK+YlxYX7D0DI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2eRV+oZQvsWWJ4AUTeuE0CHtTHC6jNZiX/y5uXuwvns="; + hash = "sha256-/Aa3saUP4QjSBIS9T8Vd0yggiJn2SIk7dYMA5icb1yA="; }; + maturinBuildFlags = [ "--interpreter ${python.executable}" ]; + nativeBuildInputs = [ cffi ] ++ (with rustPlatform; [ @@ -58,6 +74,16 @@ buildPythonPackage rec { "orjson" ]; + passthru.tests = { + inherit + falcon + fastapi + gradio + mashumaro + ufolib2 + ; + }; + meta = with lib; { description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"; homepage = "https://github.com/ijl/orjson"; diff --git a/pkgs/development/python-modules/osc-diagram/default.nix b/pkgs/development/python-modules/osc-diagram/default.nix new file mode 100644 index 0000000000000..6f9b9b68b4680 --- /dev/null +++ b/pkgs/development/python-modules/osc-diagram/default.nix @@ -0,0 +1,39 @@ +{ + lib + , buildPythonPackage + , diagrams + , fetchFromGitHub + , osc-sdk-python + , setuptools +}: + +buildPythonPackage { + pname = "osc-diagram"; + version = "unstable-2023-08-07"; + pyproject = true; + + src = fetchFromGitHub { + owner = "outscale-mgo"; + repo = "osc-diagram"; + rev = "8531233b8a95da03aca9106064b91479197f888d"; + hash = "sha256-2Iaar2twemw4xv1GGqHd3xiNCHrZLsZXtP7e9tNVpEU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + diagrams + osc-sdk-python + ]; + + pythonImportsCheck = [ "osc_diagram" ]; + + meta = with lib; { + description = "Build Outscale cloud diagrams"; + homepage = "https://github.com/outscale-mgo/osc-diagram"; + license = licenses.free; + maintainers = with maintainers; [ nicolas-goudry ]; + }; +} diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix new file mode 100644 index 0000000000000..74d617efe5008 --- /dev/null +++ b/pkgs/development/python-modules/osc-sdk-python/default.nix @@ -0,0 +1,57 @@ +{ + lib + , buildPythonPackage + , fetchFromGitHub + , pytestCheckHook + , requests + , ruamel-yaml + , setuptools +}: + +buildPythonPackage rec { + pname = "osc-sdk-python"; + version = "0.27.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "outscale"; + repo = "osc-sdk-python"; + rev = "v${version}"; + hash = "sha256-dp4yE8cTeXAPoixJ6ZtsvcTSKdYpDIebHkddUiqJe5Q="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ruamel-yaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "ruamel.yaml==0.17.32" "ruamel.yaml" + ''; + + # Only keep test not requiring access and secret keys + pytestFlagsArray = [ + "tests/test_net.py" + ]; + + pythonImportsCheck = [ + "osc_sdk_python" + ]; + + meta = with lib; { + description = "SDK to perform actions on Outscale API"; + homepage = "http://github.com/outscale/osc-sdk-python"; + license = licenses.bsd3; + maintainers = with maintainers; [ nicolas-goudry ]; + }; +} diff --git a/pkgs/development/python-modules/oscscreen/default.nix b/pkgs/development/python-modules/oscscreen/default.nix new file mode 100644 index 0000000000000..c0eab771d148b --- /dev/null +++ b/pkgs/development/python-modules/oscscreen/default.nix @@ -0,0 +1,33 @@ +{ + lib + , buildPythonPackage + , fetchFromGitHub + , setuptools +}: + +buildPythonPackage rec { + pname = "oscscreen"; + version = "unstable-2023-03-23"; + pyproject = true; + + src = fetchFromGitHub { + owner = "outscale"; + repo = "npyscreen"; + rev = "e2a97e4a201e2d7d5de3ee033071a7f93592b422"; + hash = "sha256-0Im1kVFa11AW+7Oe95XvkfxSlaux6bkKaHSQy6hJCN8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ "oscscreen" ]; + + meta = with lib; { + description = "Framework for developing console applications using Python and curses"; + homepage = "http://github.com/outscale/npyscreen"; + changelog = "https://github.com/outscale/npyscreen/blob/${src.rev}/CHANGELOG"; + license = licenses.bsd2; + maintainers = with maintainers; [ nicolas-goudry ]; + }; +} diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index ef388c34a18f3..a42e9950066c2 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.3.0"; + version = "6.0.0"; format = "setuptools"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - hash = "sha256-yqaSBw0hVZ73H/WQeAb3USoXgsRby1ChlP4+DNeNfe0="; + hash = "sha256-tS8CtORvXydLkfuOG/xcv5pBjfzUqDvggDRUlePSboo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index 902c244c488b9..ce9b5d6dcf994 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 = "5.3.0"; + version = "5.5.0"; src = fetchPypi { inherit pname version; - hash = "sha256-xRBxQcYotq5W1P62MiucSnAJL9ahgekfq+relKCeTjg="; + hash = "sha256-6uAxeymSjxk030xguGD+hiUkfLKXxcxi/vjrWCexL6w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 0e7a5abedda57..b4dce2cc09b5e 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "14.1.0"; + version = "15.0.0"; pyproject = true; src = fetchPypi { pname = "oslo.db"; inherit version; - hash = "sha256-UFilywqwhXaGnle8K5VNdZqMvhklkTMdHPMDMvz62h8="; + hash = "sha256-6QJDUgX1xQtw7mNYY8i06lS9Hr4ABpXAZeMN1C2Xb/o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 64df3dc82e478..d8904b0cdefc4 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.4.0"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-LrNVtYVw8lgR2nb6gUU7h1x8lEoZoj0sMFtKTf670iM="; + hash = "sha256-TO3RZpx94o2OZrZ6X21sb+g5KFNfqHzWm/ZhG1n1Z+c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index 9a3677ccfd6df..1399503c0f9d9 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - hash = "sha256-IoiY9PM7feq8dCibMrvTAqZZw5z23akEhRD5MPxPdu0="; + hash = "sha256-MVyzRl6ZxoXLCRuQNly3Ab7nFA4gS6Pl/C2KILTsbnY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index fec12037e20b5..0800d71a8dfbd 100644 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -4,6 +4,7 @@ , folium , gdal , geopandas +, hatchling , matplotlib , networkx , numpy @@ -19,18 +20,22 @@ buildPythonPackage rec { pname = "osmnx"; - version = "1.3.0"; - format = "setuptools"; + version = "1.9.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "gboeing"; - repo = pname; + repo = "osmnx"; rev = "refs/tags/v${version}"; - hash = "sha256-17duWrg48Qb4ojYYFX4HBpPLeVgHn1WV84KVATvBnzY="; + hash = "sha256-od/0IuiK2CvrD0lfcTzkImK/5hcm6m61ULYzEtv/YeA="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ geopandas matplotlib @@ -55,7 +60,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; + description = "Package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX"; homepage = "https://github.com/gboeing/osmnx"; changelog = "https://github.com/gboeing/osmnx/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix new file mode 100644 index 0000000000000..23ee7852f43be --- /dev/null +++ b/pkgs/development/python-modules/outlines/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, setuptools-scm +, interegular +, cloudpickle +, diskcache +, joblib +, jsonschema +, pydantic +, lark +, nest-asyncio +, numba +, scipy +, torch +, transformers +}: + +buildPythonPackage rec { + pname = "outlines"; + version = "0.0.34"; + pyproject = true; + + src = fetchFromGitHub { + owner = "outlines-dev"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-iIlthrhmCm3n0PwUSa1n7CL04sDc1Cs+rVboPY4nH78="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + interegular + cloudpickle + diskcache + joblib + jsonschema + pydantic + lark + nest-asyncio + numba + scipy + torch + transformers + ]; + + pythonImportsCheck = [ + "outlines" + ]; + + meta = with lib; { + description = "Structured text generation"; + homepage = "https://github.com/outlines-dev/outlines"; + license = licenses.asl20; + maintainers = with maintainers; [ lach ]; + }; +} diff --git a/pkgs/development/python-modules/overrides/default.nix b/pkgs/development/python-modules/overrides/default.nix index 8109a428140d9..220f7dcbed147 100644 --- a/pkgs/development/python-modules/overrides/default.nix +++ b/pkgs/development/python-modules/overrides/default.nix @@ -4,22 +4,27 @@ , pythonAtLeast , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "overrides"; - version = "7.4.0"; - format = "setuptools"; + version = "7.6.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mkorpela"; - repo = pname; + repo = "overrides"; rev = "refs/tags/${version}"; - hash = "sha256-7fbuBcb47BTVxAoKokZmGdIwHSyfyfSiCAZ4XZjWz60="; + hash = "sha256-UdahbhmRfuxKTxb6Afjny/hMgXX1UuDUrIcLjZ0Jtak="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 5e5e5a07b9c51..8bf7b8bcbe857 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "owslib"; - version = "0.29.3"; + version = "0.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "geopython"; repo = "OWSLib"; rev = "refs/tags/${version}"; - hash = "sha256-yAJXknSsGXcerzaOVSrFO4j5E6B/4/0JfoSxZ+Szmws="; + hash = "sha256-miKAgZBiqZ6+0qDvlf8+VZ6omH5hlImO0E7AVK7FuD0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 6fa2978ceb4ba..c0a753f5c02a1 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.1.4.231227"; + version = "2.2.0.240218"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-AkgMesDesKkVkwxNnGYG71IuIgF3G+BecpfWNWVucC8="; + hash = "sha256-416vyaHcSfTfkSNKZ05edozfsMmNKcpOZAoPenCLFzQ="; }; nativeBuildInputs = [ @@ -70,55 +70,11 @@ buildPythonPackage rec { disabledTests = [ # AttributeErrors, missing dependencies, error and warning checks - "test_aggregate_frame_combinations" - "test_aggregate_series_combinations" - "test_all_read_without_lxml_dtype_backend" - "test_arrow_dtype" - "test_attribute_conflict_warning" - "test_categorical_conversion_warning" - "test_clipboard_iterator" - "test_clipboard" - "test_closed_file_error" - "test_compare_150_changes" - "test_crosstab_args" - "test_css_warning" - "test_data_error" - "test_database_error" - "test_dummies" - "test_from_dummies_args" - "test_hdf_context_manager" - "test_hdfstore" - "test_incompatibility_warning" - "test_index_astype" - "test_indexing_error" - "test_invalid_column_name" - "test_isetframe" - "test_join" - "test_numexpr_clobbering_error" - "test_orc_buffer" - "test_orc_bytes" - "test_orc_columns" - "test_orc_path" + "test_types_groupby" + "test_frame_groupby_resample" "test_orc" - "test_possible_data_loss_error" - "test_possible_precision_loss" - "test_pyperclip_exception" - "test_quantile_150_changes" - "test_read_hdf_iterator" - "test_read_sql_via_sqlalchemy_connection" - "test_read_sql_via_sqlalchemy_engine" - "test_resample_150_changes" - "test_reset_index_150_changes" - "test_reset_index" - "test_rolling_step_method" - "test_setting_with_copy_error" - "test_setting_with_copy_warning" + "test_all_read_without_lxml_dtype_backend" "test_show_version" - "test_specification_error" - "test_types_assert_series_equal" - "test_types_rank" - "test_undefined_variable_error" - "test_value_label_type_mismatch" ] ++ lib.optionals stdenv.isDarwin [ "test_plotting" # Fatal Python error: Illegal instruction ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 7351e6536416a..30d35747ee62f 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -6,7 +6,6 @@ , pythonOlder # build-system -, cython , cython_3 , meson-python , meson @@ -65,7 +64,7 @@ let pandas = buildPythonPackage rec { pname = "pandas"; - version = "2.1.3"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -74,19 +73,18 @@ let pandas = buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-okGYzPJC3mpG+Sq4atjWwLlocUDnpjgGRPmQ+4ehQX0="; + hash = "sha256-PMrqniyyFYRnAeFBruPrTrGKzX2dRxMRct8AHeghstA="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "Cython>=0.29.33,<3" "Cython" \ - --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ - --replace "meson==1.2.1" "meson>=1.2.1" + --replace-fail "Cython==3.0.5" "Cython>=3.0.5" \ + --replace-fail "meson-python==0.13.1" "meson-python>=0.13.1" \ + --replace-fail "meson==1.2.1" "meson>=1.2.1" ''; nativeBuildInputs = [ - # TODO: hack to support pandas on python3.12, remove with pandas 2.2.0 - (if pythonAtLeast "3.12" then cython_3 else cython) + cython_3 meson-python meson numpy diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index f6bbbf3b78ffb..638a3182ca1b5 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -40,6 +40,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + pythonImportsCheck = [ "param" ]; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 728ed09b735c0..b5f8afce9d3b2 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -1,14 +1,24 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, fetchFromGitHub +, fetchpatch2 +, pythonOlder + +# build-system , setuptools -, pytest + +# dependencies , locket +, toolz + +# optional-dependencies +, blosc2 , numpy , pandas , pyzmq -, toolz + +# tests +, pytestCheckHook }: buildPythonPackage rec { @@ -16,25 +26,44 @@ buildPythonPackage rec { version = "1.4.1"; pyproject = true; - disabled = isPy27; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-VsJd1J5v6lcn5zEgPEZsbgkvMI2PACThmdAvaqIWf2c="; + src = fetchFromGitHub { + owner = "dask"; + repo = "partd"; + rev = "refs/tags/${version}"; + hash = "sha256-EK+HNSPh2b7jwpc6jwH/n+6HDgHhRfBeaRuiDIWVG28="; }; + patches = [ + (fetchpatch2 { + # python 3.12 support; https://github.com/dask/partd/pull/70 + url = "https://github.com/dask/partd/pull/70/commits/c96a034367cb9fee0a0900f758b802aeef8a8a41.patch"; + hash = "sha256-QlSIrFQQQo9We/gf7WSgmWrxdt3rxXQcyvJnFm8R5cM="; + }) + ]; + nativeBuildInputs = [ setuptools ]; - nativeCheckInputs = [ pytest ]; + propagatedBuildInputs = [ + locket + toolz + ]; - propagatedBuildInputs = [ locket numpy pandas pyzmq toolz ]; + passthru.optional-dependencies = { + complete = [ + blosc2 + numpy + pandas + pyzmq + ]; + }; - checkPhase = '' - rm partd/tests/test_zmq.py # requires network & fails - py.test -k "not test_serialize" - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = { description = "Appendable key-value storage"; diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix index ae4022f860020..48797d05142b0 100644 --- a/pkgs/development/python-modules/patsy/default.nix +++ b/pkgs/development/python-modules/patsy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "patsy"; - version = "0.5.4"; + version = "0.5.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-favFJ1lzCN4OjxiPqiCvfgaom9qjBnVt/HeDaT6havQ="; + hash = "sha256-lcbUenIiU1+Ev/f2PXMD8uKXdHpZjbic9cZ/DAx9LNs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index fed9e7cd81fe3..dbf6afe6f3302 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pythonAtLeast , setuptools , callPackage }: @@ -33,7 +32,6 @@ buildPythonPackage rec { description = "Python Build Reasonableness"; homepage = "https://github.com/openstack/pbr"; license = licenses.asl20; - broken = pythonAtLeast "3.12"; # uses removed distutils maintainers = teams.openstack.members; }; } diff --git a/pkgs/development/python-modules/pdm-backend/setup-hook.sh b/pkgs/development/python-modules/pdm-backend/setup-hook.sh index aca0c555c76cc..c8b2fda6d99ac 100644 --- a/pkgs/development/python-modules/pdm-backend/setup-hook.sh +++ b/pkgs/development/python-modules/pdm-backend/setup-hook.sh @@ -1,8 +1,10 @@ -version-pretend-hook() { - echo "Setting PDM_BUILD_SCM_VERSION to $version" - export PDM_BUILD_SCM_VERSION=$version +pdm-version-pretend-hook() { + if [ -z "${PDM_BUILD_SCM_VERSION-}" ]; then + echo "Setting PDM_BUILD_SCM_VERSION to $version" + export PDM_BUILD_SCM_VERSION="$version" + fi } if [ -z "${dontSetPdmBackendVersion-}" ]; then - preBuildHooks+=(version-pretend-hook) + preBuildHooks+=(pdm-version-pretend-hook) fi diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index f0213c041ec2b..16b73cb1792b3 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.7.1"; + version = "19.7.7"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BVUnSKmLOF6DKirAI2lv8/tpcSGus2XZTPn3WSJjwgg="; + hash = "sha256-HJ+8EpxcMhUPJILapNk9esA0iUm8PiHPDm3MmBQDny4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 1345242c20510..d1936afe375ff 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.7.1"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sdv9rMj5Qh2/QtBVSxHMAP/Tk+ZyrHtNfX/4q8/Qw3A="; + hash = "sha256-RdWCIR28OqmpA92/5OWA5sCCPQCAWpUzCZpkHvNMj6M="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pendulum/3.nix b/pkgs/development/python-modules/pendulum/3.nix index 78e9c675ea8db..31e15af6de529 100644 --- a/pkgs/development/python-modules/pendulum/3.nix +++ b/pkgs/development/python-modules/pendulum/3.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { cargoRoot = "rust"; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/rust"; + sourceRoot = "${src.name}/rust"; name = "${pname}-${version}"; hash = "sha256-6fw0KgnPIMfdseWcunsGjvjVB+lJNoG3pLDqkORPJ0I="; postPatch = '' diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 869fb6146f2e9..45114af407c40 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "persim"; - version = "0.3.2"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-p6Vumfr+vRDr0D9PnEZItp9vNlCLIb59HpBg1KdyHGE="; + hash = "sha256-qyly3kIx9HQ7zDT0SfUlsqZGqibdXsfW1dL9HNpQZJg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index a5c5ff601bcd1..6260a921ffa83 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.162"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XeAOEhmNEACr+KrIYaclDH7EW2XQeobIAQvm99hn24M="; + hash = "sha256-g5D9v1CZ70viP0C/9lWwJvterJ2KH3oUCKRsxEr9Neg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix index e9ca2003fa81c..a953b575b591d 100644 --- a/pkgs/development/python-modules/pgmpy/default.nix +++ b/pkgs/development/python-modules/pgmpy/default.nix @@ -23,7 +23,7 @@ }: let pname = "pgmpy"; - version = "0.1.24"; + version = "0.1.25"; # optional-dependencies = { # all = [ daft ]; # }; @@ -38,7 +38,7 @@ buildPythonPackage { owner = "pgmpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IMlo4SBxO9sPoZl0rQGc3FcvvIN/V/WZz+1BD7aBfzs="; + hash = "sha256-d2TNcJQ82XxTWdetLgtKXRpFulAEEzrr+cyRewoA6YI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix index 0e14d34151a00..0997f7987ada8 100644 --- a/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/pkgs/development/python-modules/phx-class-registry/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "class-registry"; - version = "4.0.6"; + version = "4.1.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "todofixthis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kSEHgzBgnAq5rMv2HbmGl+9CUzsmzUzPQWr+5q8mcsA="; + hash = "sha256-kJbyUzyklVSvW6bBxTTTrY+WhfcV0GUf/+Pzyv+7sEA="; }; nativeCheckInputs = [ @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Factory and registry pattern for Python classes"; homepage = "https://class-registry.readthedocs.io/en/latest/"; license = licenses.mit; - maintainers = with maintainers; [ kevincox ]; + maintainers = with maintainers; [ hrdinka tomhoule ]; }; } diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index ece887f143285..51ed9b136f3f6 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.19.0"; + version = "0.20.0"; format = "setuptools"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-pGMOc/GSh3q2HW1mfW+XFgpOyiXd3cdh56cvXatseuc="; + hash = "sha256-/I6Q///oZ1OlSQEOwQ4KtUuj73ra6poyDhfhiF5nJrE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 386f64718eb09..bfcd4c0589c29 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.11.2"; + version = "8.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-mxUXXD7/ERC6mfmLLo+zdsVblIplrlcnzTNQ7YUk3Q4="; + hash = "sha256-6HCFPHIQ6+SHt4Zu6CZ0R2Ah+jFnztGOCMhQfvR6FxY="; }; patches = [ diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 2496bd1b36096..e846109a31def 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -7,6 +7,7 @@ , cmake , nasm , pkg-config +, setuptools # native dependencies , libheif @@ -26,14 +27,14 @@ buildPythonPackage rec { pname = "pillow-heif"; - version = "0.14.0"; - format = "setuptools"; + version = "0.15.0"; + pyproject = true; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; rev = "refs/tags/v${version}"; - hash = "sha256-HFcywrH687CBGTbZQ2rQrr/AdJ2+pFoI+NvYhUCanic="; + hash = "sha256-zSPbOb7+U45Vmad6IwNtkunLXdT3ledKAE4QWlSeP0g="; }; postPatch = '' @@ -44,6 +45,7 @@ buildPythonPackage rec { cmake nasm pkg-config + setuptools ]; dontUseCmakeConfigure = true; @@ -55,6 +57,9 @@ buildPythonPackage rec { x265 ]; + # clang-16: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index d3b3e4e669495..86edb6e597cb8 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "3.0.3"; + version = "3.1.0"; pyproject = true; src = fetchPypi { pname = "pinecone_client"; inherit version; - hash = "sha256-KtPvdiftxNnuJI2XgYYcQ0HW0noVvAX2vvU9lYg303Q="; + hash = "sha256-RbggYBP5GpgrmU8fuqOefoyZ0w7zd4qfMZxDuMmS/EI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ping3/default.nix b/pkgs/development/python-modules/ping3/default.nix index c5dd49ba0d596..133775eb7915a 100644 --- a/pkgs/development/python-modules/ping3/default.nix +++ b/pkgs/development/python-modules/ping3/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ping3"; - version = "4.0.4"; + version = "4.0.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-HqEqz2dS1GZmFjQf18Y5PGZM/8UQxpPvBvc2+yZ6E7o="; + hash = "sha256-HwkYXokyFDZSSZayEtID08q1rSJofedGRXDxx/udwFE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 187852b39b2fd..3537c151e6f49 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.14.0"; + version = "2.16.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-FkqpBF5JDSzUp3VrFuCohUhpWOl38cnFQVFYKY9qupQ="; + hash = "sha256-aOAFM8b0kOZT5/afZigZjJDvS2CyqghY6GATzeyySB4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index f40be0758ba55..6cfaf7eccb73d 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-Figg5yaPo6QqB4lldmyJZtd/Ar584IyETVJfWZ+gjDE="; + hash = "sha256-5qOOklwjTGrlvaPg7hVYLAAHvQ7633VAt3L2PHw2V9U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index a1822fe5157dc..70a57168b12a9 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "plac"; - version = "1.4.0"; + version = "1.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ialbert"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BH6NKbDMhlNuo+orIEweABNSVZv1K9VrZBrCIs6H6BU="; + hash = "sha256-EWwDtS2cRLBe4aZuH72hgg2BQnVJQ39GmPx05NxTNjE="; }; # tests are broken, see https://github.com/ialbert/plac/issues/74 diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 388688c19f974..a49adbc2acbfe 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "18.4.0"; + version = "19.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-bspTjaTATICk58YHxnq2ZM1N5PNS2o0nVQDWUeUvVAc="; + hash = "sha256-mwWE5AZjqoUkPzyvuARotcRU2mKnqkoBh6priXLzE/I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index fa44670965eb3..af402da40045f 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-qhmo1Ckc4OUzWCnjCNQvwsExB98/BCKydMZdB/yfOY0="; + hash = "sha256-VgR7T8pDrVMBYqtvTfRmFwW61IREYiRCMXbpCOj/a4Q="; }; nativeBuildInputs = [ @@ -87,6 +87,7 @@ buildPythonPackage rec { "tests/test_geom_smooth.py" "tests/test_geom_text_label.py" "tests/test_geom_violin.py" + "tests/test_layout.py" "tests/test_position.py" "tests/test_qplot.py" "tests/test_scale_internals.py" diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 567aff8f51b0f..b778a2dd17219 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -10,26 +10,17 @@ buildPythonPackage rec { pname = "plux"; - version = "1.4.0"; - format = "pyproject"; + version = "1.5.0"; + pyproject = true; # Tests are not available from PyPi src = fetchFromGitHub { owner = "localstack"; repo = "plux"; rev = "refs/tags/v${version}"; - hash = "sha256-AybMHkCUNJsL51XwiskkIltEtqZ27fGHrpyct8IUjmo="; + hash = "sha256-XHRQTgvxXJCjCD/9Invf/5OCtp12A5poRUv8tR9DJsk="; }; - patches = [ - # https://github.com/localstack/plux/pull/8 - (fetchpatch { - name = "remove-pytest-runner.patch"; - url = "https://github.com/localstack/plux/commit/3cda22e51f43a86304d0dedd7e554b21aa82c8b0.patch"; - hash = "sha256-ZFHUTkUYFSTgKbx+c74JQzre0la+hFW9gNOxOehvVoE="; - }) - ]; - nativeBuildInputs = [ setuptools wheel diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock index 505a370fb5868..caba522cc1432 100644 --- a/pkgs/development/python-modules/polars/Cargo.lock +++ b/pkgs/development/python-modules/polars/Cargo.lock @@ -25,9 +25,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "const-random", @@ -90,15 +90,15 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "apache-avro" @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "argminmax" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202108b46429b765ef483f8a24d5c46f48c14acfdacc086dd4ab6dddf6bcdbd2" +checksum = "52424b59d69d69d5056d508b260553afd91c57e21849579cd1f50ee8b8b88eaa" dependencies = [ "num-traits", ] @@ -224,7 +224,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -235,7 +235,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -277,9 +277,9 @@ dependencies = [ [[package]] name = "aws-config" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b30c39ebe61f75d1b3785362b1586b41991873c9ab3e317a9181c246fb71d82" +checksum = "0b96342ea8948ab9bef3e6234ea97fc32e2d8a88d8fb6a084e52267317f94b6b" dependencies = [ "aws-credential-types", "aws-runtime", @@ -296,7 +296,7 @@ dependencies = [ "bytes", "fastrand", "hex", - "http 0.2.11", + "http 0.2.12", "hyper", "ring", "time", @@ -307,9 +307,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cc49dcdd31c8b6e79850a179af4c367669150c7ac0135f176c61bec81a70f7" +checksum = "273fa47dafc9ef14c2c074ddddbea4561ff01b7f68d5091c0e9737ced605c01d" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -319,9 +319,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb031bff99877c26c28895766f7bb8484a05e24547e370768d6cc9db514662aa" +checksum = "6e38bab716c8bf07da24be07ecc02e0f5656ce8f30a891322ecdcb202f943b85" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -333,7 +333,7 @@ dependencies = [ "aws-types", "bytes", "fastrand", - "http 0.2.11", + "http 0.2.12", "http-body", "percent-encoding", "pin-project-lite", @@ -343,9 +343,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.14.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951f7730f51a2155c711c85c79f337fbc02a577fa99d2a0a8059acfce5392113" +checksum = "93d35d39379445970fc3e4ddf7559fff2c32935ce0b279f9cb27080d6b7c6d94" dependencies = [ "aws-credential-types", "aws-runtime", @@ -361,7 +361,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", - "http 0.2.11", + "http 0.2.12", "http-body", "once_cell", "percent-encoding", @@ -372,9 +372,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.12.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f486420a66caad72635bc2ce0ff6581646e0d32df02aa39dc983bfe794955a5b" +checksum = "d84bd3925a17c9adbf6ec65d52104a44a09629d8f70290542beeee69a95aee7f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -386,7 +386,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http 0.2.11", + "http 0.2.12", "once_cell", "regex-lite", "tracing", @@ -394,9 +394,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.12.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ddccf01d82fce9b4a15c8ae8608211ee7db8ed13a70b514bbfe41df3d24841" +checksum = "2c2dae39e997f58bc4d6292e6244b26ba630c01ab671b6f9f44309de3eb80ab8" dependencies = [ "aws-credential-types", "aws-runtime", @@ -408,7 +408,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http 0.2.11", + "http 0.2.12", "once_cell", "regex-lite", "tracing", @@ -416,9 +416,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.12.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a591f8c7e6a621a501b2b5d2e88e1697fcb6274264523a6ad4d5959889a41ce" +checksum = "17fd9a53869fee17cea77e352084e1aa71e2c5e323d974c13a9c2bcfd9544c7f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -431,7 +431,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "http 0.2.11", + "http 0.2.12", "once_cell", "regex-lite", "tracing", @@ -439,9 +439,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c371c6b0ac54d4605eb6f016624fb5c7c2925d315fdf600ac1bf21b19d5f1742" +checksum = "8ada00a4645d7d89f296fe0ddbc3fe3554f03035937c849a05d37ddffc1f29a1" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -453,8 +453,8 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "http 0.2.11", - "http 1.0.0", + "http 0.2.12", + "http 1.1.0", "once_cell", "p256", "percent-encoding", @@ -468,9 +468,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ee2d09cce0ef3ae526679b522835d63e75fb427aca5413cd371e490d52dcc6" +checksum = "fcf7f09a27286d84315dfb9346208abb3b0973a692454ae6d0bc8d803fcce3b4" dependencies = [ "futures-util", "pin-project-lite", @@ -479,9 +479,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.60.4" +version = "0.60.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2acd1b9c6ae5859999250ed5a62423aedc5cf69045b844432de15fa2f31f2b" +checksum = "0fd4b66f2a8e7c84d7e97bda2666273d41d2a2e25302605bcf906b7b2661ae5e" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -489,7 +489,7 @@ dependencies = [ "crc32c", "crc32fast", "hex", - "http 0.2.11", + "http 0.2.12", "http-body", "md-5", "pin-project-lite", @@ -511,9 +511,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.4" +version = "0.60.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dab56aea3cd9e1101a0a999447fb346afb680ab1406cebc44b32346e25b4117d" +checksum = "b6ca214a6a26f1b7ebd63aa8d4f5e2194095643023f9608edf99a58247b9d80d" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -521,7 +521,7 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http 0.2.11", + "http 0.2.12", "http-body", "once_cell", "percent-encoding", @@ -532,18 +532,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.60.4" +version = "0.60.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3898ca6518f9215f62678870064398f00031912390efd03f1f6ef56d83aa8e" +checksum = "1af80ecf3057fb25fe38d1687e94c4601a7817c6a1e87c1b0635f7ecb644ace5" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.60.4" +version = "0.60.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda4b1dfc9810e35fba8a620e900522cd1bd4f9578c446e82f49d1ce41d2e9f9" +checksum = "eb27084f72ea5fc20033efe180618677ff4a2f474b53d84695cfe310a6526cbc" dependencies = [ "aws-smithy-types", "urlencoding", @@ -551,9 +551,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fafdab38f40ad7816e7da5dec279400dd505160780083759f01441af1bbb10ea" +checksum = "fbb5fca54a532a36ff927fbd7407a7c8eb9c3b4faf72792ba2965ea2cad8ed55" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -562,7 +562,7 @@ dependencies = [ "bytes", "fastrand", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "hyper", "hyper-rustls", @@ -576,14 +576,15 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c18276dd28852f34b3bf501f4f3719781f4999a51c7bff1a5c6dc8c4529adc29" +checksum = "22389cb6f7cac64f266fb9f137745a9349ced7b47e0d2ba503e9e40ede4f7060" dependencies = [ "aws-smithy-async", "aws-smithy-types", "bytes", - "http 0.2.11", + "http 0.2.12", + "http 1.1.0", "pin-project-lite", "tokio", "tracing", @@ -592,15 +593,15 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb3e134004170d3303718baa2a4eb4ca64ee0a1c0a7041dca31b38be0fb414f3" +checksum = "f081da5481210523d44ffd83d9f0740320050054006c719eae0232d411f024d3" dependencies = [ "base64-simd", "bytes", "bytes-utils", "futures-core", - "http 0.2.11", + "http 0.2.12", "http-body", "itoa", "num-integer", @@ -615,24 +616,24 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.4" +version = "0.60.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8604a11b25e9ecaf32f9aa56b9fe253c5e2f606a3477f0071e96d3155a5ed218" +checksum = "0fccd8f595d0ca839f9f2548e66b99514a85f92feb4c01cf2868d93eb4888a42" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789bbe008e65636fe1b6dbbb374c40c8960d1232b96af5ff4aec349f9c4accf4" +checksum = "d07c63521aa1ea9a9f92a701f1a08ce3fd20b46c6efc0d5c8947c1fd879e3df1" dependencies = [ "aws-credential-types", "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "http 0.2.11", + "http 0.2.12", "rustc_version", "tracing", ] @@ -747,15 +748,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.1" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" dependencies = [ "bytemuck_derive", ] @@ -768,7 +769,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -816,9 +817,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", @@ -832,22 +833,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.33" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] name = "chrono-tz" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d7b79e99bfaa0d47da0687c43aa3b7381938a62ad3a6498599039321f660b7" +checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" dependencies = [ "chrono", "chrono-tz-build", @@ -894,18 +895,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstyle", "clap_lex", @@ -913,9 +914,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cmake" @@ -946,9 +947,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-random" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -1015,18 +1016,18 @@ checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" [[package]] name = "crc32c" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" +checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" dependencies = [ "rustc_version", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -1069,9 +1070,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] @@ -1214,9 +1215,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" @@ -1232,9 +1233,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elliptic-curve" @@ -1274,7 +1275,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -1434,7 +1435,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -1498,9 +1499,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git2" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" dependencies = [ "bitflags 2.4.2", "libc", @@ -1537,7 +1538,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.11", + "http 0.2.12", "indexmap", "slab", "tokio", @@ -1547,9 +1548,9 @@ dependencies = [ [[package]] name = "half" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "cfg-if", "crunchy", @@ -1558,11 +1559,11 @@ dependencies = [ [[package]] name = "halfbrown" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5681137554ddff44396e5f149892c769d45301dd9aa19c51602a89ee214cb0ec" +checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.3", "serde", ] @@ -1600,9 +1601,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1630,9 +1631,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1641,9 +1642,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1657,7 +1658,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] @@ -1690,7 +1691,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "httparse", "httpdate", @@ -1710,7 +1711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 0.2.11", + "http 0.2.12", "hyper", "log", "rustls", @@ -1721,9 +1722,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1754,9 +1755,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1783,12 +1784,12 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", + "libc", "windows-sys 0.52.0", ] @@ -1844,26 +1845,27 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] -name = "jsonpath_lib" -version = "0.3.0" -source = "git+https://github.com/ritchie46/jsonpath?branch=improve_compiled#24eaf0b4416edff38a4d1b6b17bc4b9f3f047b4b" +name = "jsonpath_lib_polars_vendor" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4bd9354947622f7471ff713eacaabdb683ccb13bba4edccaab9860abf480b7d" dependencies = [ "log", "serde", @@ -1992,9 +1994,9 @@ dependencies = [ [[package]] name = "libgit2-sys" -version = "0.16.1+1.7.1" +version = "0.16.2+1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" dependencies = [ "cc", "libc", @@ -2004,12 +2006,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -2068,9 +2070,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lz4" @@ -2153,18 +2155,18 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -2251,9 +2253,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] @@ -2266,19 +2268,18 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -2299,9 +2300,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -2343,9 +2344,9 @@ dependencies = [ [[package]] name = "object_store" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d139f545f64630e2e3688fd9f81c470888ab01edeb72d13b4e86c566f1130000" +checksum = "b8718f8b65fdf67a45108d1548347d4af7d71fb81ce727bbf9e3b2535e079db3" dependencies = [ "async-trait", "base64", @@ -2355,13 +2356,14 @@ dependencies = [ "humantime", "hyper", "itertools 0.12.1", + "md-5", "parking_lot", "percent-encoding", "quick-xml", "rand", "reqwest", "ring", - "rustls-pemfile 2.0.0", + "rustls-pemfile 2.1.1", "serde", "serde_json", "snafu", @@ -2516,9 +2518,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "planus" @@ -2559,27 +2561,38 @@ dependencies = [ [[package]] name = "polars" -version = "0.37.0" +version = "0.38.1" dependencies = [ "ahash", + "apache-avro", + "avro-schema", + "either", + "ethnum", + "futures", "getrandom", + "polars-arrow", "polars-core", + "polars-error", "polars-io", "polars-lazy", "polars-ops", + "polars-parquet", "polars-plan", "polars-sql", "polars-time", + "polars-utils", + "proptest", "rand", + "tokio", + "tokio-util", "version_check", ] [[package]] name = "polars-arrow" -version = "0.37.0" +version = "0.38.1" dependencies = [ "ahash", - "apache-avro", "arrow-array", "arrow-buffer", "arrow-data", @@ -2619,7 +2632,7 @@ dependencies = [ "regex-syntax 0.8.2", "ryu", "sample-arrow2", - "sample-std", + "sample-std 0.1.1", "sample-test", "serde", "simdutf8", @@ -2645,7 +2658,7 @@ dependencies = [ [[package]] name = "polars-compute" -version = "0.37.0" +version = "0.38.1" dependencies = [ "bytemuck", "either", @@ -2653,13 +2666,14 @@ dependencies = [ "polars-arrow", "polars-error", "polars-utils", + "rand", "strength_reduce", "version_check", ] [[package]] name = "polars-core" -version = "0.37.0" +version = "0.38.1" dependencies = [ "ahash", "arrow-array", @@ -2694,7 +2708,7 @@ dependencies = [ [[package]] name = "polars-doc-examples" -version = "0.37.0" +version = "0.38.1" dependencies = [ "aws-config", "aws-sdk-s3", @@ -2707,7 +2721,7 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.37.0" +version = "0.38.1" dependencies = [ "avro-schema", "object_store", @@ -2719,7 +2733,7 @@ dependencies = [ [[package]] name = "polars-ffi" -version = "0.37.0" +version = "0.38.1" dependencies = [ "polars-arrow", "polars-core", @@ -2727,7 +2741,7 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.37.0" +version = "0.38.1" dependencies = [ "ahash", "async-trait", @@ -2771,7 +2785,7 @@ dependencies = [ [[package]] name = "polars-json" -version = "0.37.0" +version = "0.38.1" dependencies = [ "ahash", "chrono", @@ -2790,7 +2804,7 @@ dependencies = [ [[package]] name = "polars-lazy" -version = "0.37.0" +version = "0.38.1" dependencies = [ "ahash", "bitflags 2.4.2", @@ -2816,7 +2830,7 @@ dependencies = [ [[package]] name = "polars-ops" -version = "0.37.0" +version = "0.38.1" dependencies = [ "ahash", "aho-corasick", @@ -2829,7 +2843,7 @@ dependencies = [ "hashbrown 0.14.3", "hex", "indexmap", - "jsonpath_lib", + "jsonpath_lib_polars_vendor", "memchr", "num-traits", "polars-arrow", @@ -2851,7 +2865,7 @@ dependencies = [ [[package]] name = "polars-parquet" -version = "0.37.0" +version = "0.38.1" dependencies = [ "ahash", "async-stream", @@ -2878,7 +2892,7 @@ dependencies = [ [[package]] name = "polars-pipe" -version = "0.37.0" +version = "0.38.1" dependencies = [ "crossbeam-channel", "crossbeam-queue", @@ -2897,12 +2911,13 @@ dependencies = [ "rayon", "smartstring", "tokio", + "uuid", "version_check", ] [[package]] name = "polars-plan" -version = "0.37.0" +version = "0.38.1" dependencies = [ "ahash", "bytemuck", @@ -2933,8 +2948,9 @@ dependencies = [ [[package]] name = "polars-row" -version = "0.37.0" +version = "0.38.1" dependencies = [ + "bytemuck", "polars-arrow", "polars-error", "polars-utils", @@ -2942,7 +2958,7 @@ dependencies = [ [[package]] name = "polars-sql" -version = "0.37.0" +version = "0.38.1" dependencies = [ "hex", "polars-arrow", @@ -2958,7 +2974,7 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.37.0" +version = "0.38.1" dependencies = [ "atoi", "chrono", @@ -2977,7 +2993,7 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.37.0" +version = "0.38.1" dependencies = [ "ahash", "bytemuck", @@ -2986,6 +3002,8 @@ dependencies = [ "num-traits", "once_cell", "polars-error", + "rand", + "raw-cpuid", "rayon", "smartstring", "sysinfo", @@ -2993,6 +3011,12 @@ dependencies = [ ] [[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] name = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3054,7 +3078,7 @@ dependencies = [ [[package]] name = "py-polars" -version = "0.20.7" +version = "0.20.15" dependencies = [ "ahash", "built", @@ -3085,9 +3109,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" dependencies = [ "cfg-if", "indoc", @@ -3095,6 +3119,7 @@ dependencies = [ "libc", "memoffset", "parking_lot", + "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -3103,9 +3128,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" dependencies = [ "once_cell", "target-lexicon", @@ -3119,9 +3144,9 @@ checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de" [[package]] name = "pyo3-ffi" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" dependencies = [ "libc", "pyo3-build-config", @@ -3129,26 +3154,27 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" dependencies = [ "heck", "proc-macro2", + "pyo3-build-config", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3247,6 +3273,15 @@ dependencies = [ ] [[package]] +name = "raw-cpuid" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +dependencies = [ + "bitflags 2.4.2", +] + +[[package]] name = "rawpointer" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3254,9 +3289,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -3298,7 +3333,7 @@ checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3315,9 +3350,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -3354,7 +3389,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "hyper", "hyper-rustls", @@ -3398,16 +3433,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3439,9 +3475,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.2", "errno", @@ -3485,9 +3521,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" dependencies = [ "base64", "rustls-pki-types", @@ -3495,9 +3531,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.1.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" [[package]] name = "rustls-webpki" @@ -3517,9 +3553,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -3532,12 +3568,12 @@ dependencies = [ [[package]] name = "sample-arrow2" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "722050f91586506195398fd22d834eb8768716084f6ebf9f32b917ed422b6afb" +checksum = "502b30097ae5cc57ee8359bb59d8af349db022492de04596119d83f561ab8977" dependencies = [ "arrow2", - "sample-std", + "sample-std 0.2.1", ] [[package]] @@ -3554,13 +3590,26 @@ dependencies = [ ] [[package]] +name = "sample-std" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "948bd219c6eb2b2ca1e004d8aefa8bbcf12614f60e0139b1758b49f9a94358c8" +dependencies = [ + "casey", + "quickcheck", + "rand", + "rand_regex", + "regex", +] + +[[package]] name = "sample-test" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713e500947ff19fc1ae2805afa33ef45f3bb2ec656c77d92252d24cf9e3091b2" dependencies = [ "quickcheck", - "sample-std", + "sample-std 0.1.1", "sample-test-macros", ] @@ -3572,7 +3621,7 @@ checksum = "df1a2c832a259aae95b6ed1da3aa377111ffde38d4282fa734faa3fff356534e" dependencies = [ "proc-macro2", "quote", - "sample-std", + "sample-std 0.1.1", "syn 1.0.109", ] @@ -3640,9 +3689,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -3655,29 +3704,29 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "indexmap", "itoa", @@ -3834,12 +3883,12 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3910,7 +3959,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3932,9 +3981,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -3949,9 +3998,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sysinfo" -version = "0.30.5" +version = "0.30.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" +checksum = "0c385888ef380a852a16209afc8cfad22795dd8873d69c9a14d2e2088f118d18" dependencies = [ "cfg-if", "core-foundation-sys", @@ -3990,48 +4039,47 @@ checksum = "cfb5fa503293557c5158bd215fdc225695e567a77e453f5d4452a50a193969bd" [[package]] name = "target-lexicon" -version = "0.12.13" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "time" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe80ced77cbfb4cb91a94bf72b378b4b6791a0d9b7f09d0be747d1bdff4e68bd" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "num-conv", @@ -4093,9 +4141,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -4117,7 +4165,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -4204,7 +4252,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -4239,7 +4287,7 @@ checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -4268,9 +4316,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -4286,9 +4334,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -4331,6 +4379,7 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ + "getrandom", "serde", ] @@ -4366,9 +4415,9 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4391,9 +4440,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4401,24 +4450,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -4428,9 +4477,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4438,22 +4487,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" @@ -4470,9 +4519,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -4516,7 +4565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4525,7 +4574,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4543,7 +4592,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4563,17 +4612,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -4584,9 +4633,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -4596,9 +4645,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -4608,9 +4657,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -4620,9 +4669,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -4632,9 +4681,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -4644,9 +4693,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -4656,15 +4705,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.36" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "818ce546a11a9986bc24f93d0cdf38a8a1a400f1473ea8c82e59f6e0ffab9249" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -4687,9 +4736,9 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xxhash-rust" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61" +checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" [[package]] name = "zerocopy" @@ -4708,7 +4757,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index 2dca53b7bb6c3..4d1d1c0f14d06 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -13,12 +13,12 @@ }: let pname = "polars"; - version = "0.20.7"; + version = "0.20.15"; rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-R3by/e28HE+1xq+HQd9wYy/iK+fDM6/IfKuc563atX4="; + hash = "sha256-N/VIi0s5unYWqlR5Mpaq9cqXl2ccbzWPuOtE2UbmQw8="; }; rust-jemalloc-sys' = rust-jemalloc-sys.override { jemalloc = jemalloc.override { @@ -43,9 +43,6 @@ buildPythonPackage { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; - outputHashes = { - "jsonpath_lib-0.3.0" = "sha256-NKszYpDGG8VxfZSMbsTlzcMGFHBOUeFojNw4P2wM3qk="; - }; }; buildAndTestSubdir = "py-polars"; @@ -77,6 +74,7 @@ buildPythonPackage { ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; # nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index ddff63f6fa7e4..f1477f5b24247 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "24.2.1"; + version = "24.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; rev = "refs/tags/v${version}"; - hash = "sha256-lvmi/aYDGDHbiioFWovDpTCcqgh9hu97Wk2Lcqfd6qk="; + hash = "sha256-EYfhbIFD2p6ZZ4i6NCA22LS6mAZoJCJSYlTmRExWgw4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 1a96522844d4e..fffca3cccaaee 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -3,8 +3,9 @@ , buildPythonPackage , fetchFromGitHub , furl +, hatchling , jsonschema -, nose +, pytest-asyncio , pytestCheckHook , pythonOlder , requests @@ -13,17 +14,22 @@ buildPythonPackage rec { pname = "pook"; - version = "1.1.1"; - format = "setuptools"; - disabled = pythonOlder "3.5"; + version = "1.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "h2non"; - repo = pname; + repo = "pook"; rev = "refs/tags/v${version}"; - hash = "sha256-nLeJAAsJUKFAetZSAQmOtXP+3ZRHvCTFAzycSkK+kiI="; + hash = "sha256-0sS2QJcshMuxxCGlrcVHeIQnVMZbBoJfLsRIxpvl7pM="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ aiohttp furl @@ -33,7 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pytest-asyncio pytestCheckHook ]; @@ -41,8 +47,15 @@ buildPythonPackage rec { "pook" ]; + disabledTestPaths = [ + # Don't test integrations + "tests/integration/" + # Tests require network access + "tests/unit/interceptors/" + ]; + meta = with lib; { - description = "HTTP traffic mocking and testing made simple in Python"; + description = "HTTP traffic mocking and testing"; homepage = "https://github.com/h2non/pook"; changelog = "https://github.com/h2non/pook/blob/v${version}/History.rst"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 6795ebf1f691d..03372065aedd9 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.4.2"; + version = "3.5.0"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-PhZBpcMwU7fjmE0g+l83zHm+95N60Sbd9pNNc4Roa2A="; + hash = "sha256-+nYMQxqI9RZ5vVL6KgiRLcx0JHWJTs/rZ6U6jIuaz+w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index cd801f497a8cc..3c721320d995b 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.7.6.7"; + version = "1.7.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qzRDaBTi8YI481aI/YabJkGy0tjcoiuNJG9nAd/JVMg="; + hash = "sha256-dqQpp9e3TE10P226g1HljWK2Qy7WXfn+IEeQFg2rmW0="; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed and parallel Python"; homepage = "https://ppft.readthedocs.io/"; - changelog = "https://github.com/uqfoundation/ppft/releases/tag/ppft-${version}"; + changelog = "https://github.com/uqfoundation/ppft/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/prometheus-api-client/default.nix b/pkgs/development/python-modules/prometheus-api-client/default.nix new file mode 100644 index 0000000000000..842b4c0b22ab0 --- /dev/null +++ b/pkgs/development/python-modules/prometheus-api-client/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, dateparser +, httmock +, matplotlib +, numpy +, pandas +, requests +}: + +buildPythonPackage rec { + pname = "prometheus-api-client"; + version = "0.5.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "4n4nd"; + repo = "prometheus-api-client-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-tUu0+ZUOFxBCj//lHhNm88rhFbS01j1x508+nqIkCfQ="; + }; + + propagatedBuildInputs = [ + dateparser + matplotlib + numpy + pandas + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + httmock + ]; + + disabledTestPaths = [ + "tests/test_prometheus_connect.py" + ]; + + pythonImportsCheck = [ + "prometheus_api_client" + ]; + + + meta = with lib; { + description = "A Python wrapper for the Prometheus HTTP API"; + longDescription = '' + The prometheus-api-client library consists of multiple modules which + assist in connecting to a Prometheus host, fetching the required metrics + and performing various aggregation operations on the time series data. + ''; + homepage = "https://github.com/4n4nd/prometheus-api-client-python"; + changelog = "https://github.com/4n4nd/prometheus-api-client-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/development/python-modules/prometrix/default.nix b/pkgs/development/python-modules/prometrix/default.nix new file mode 100644 index 0000000000000..58b3ac27361e3 --- /dev/null +++ b/pkgs/development/python-modules/prometrix/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, boto3 +, botocore +, dateparser +, matplotlib +, numpy +, pandas +, poetry-core +, prometheus-api-client +, pydantic_1 +, requests +}: + +buildPythonPackage rec { + pname = "prometrix"; + version = "unstable-2024-02-20"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "robusta-dev"; + repo = "prometrix"; + rev = "ab2dad2192ed3df91c1a25446a4f54b8f2f6742f"; + hash = "sha256-/72Qkd2BojYgiQi5rq7dVsEje7M0aQQXhenvIM7lSy4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'pydantic = "^1.8.1"' 'pydantic = "*"' + ''; + + propagatedBuildInputs = [ + boto3 + botocore + dateparser + matplotlib + numpy + pandas + prometheus-api-client + pydantic_1 + requests + ]; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ + "prometrix" + ]; + + meta = with lib; { + description = "Unified Prometheus client"; + longDescription = '' + This Python package provides a unified Prometheus client that can be used + to connect to and query various types of Prometheus instances. + ''; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index 07ee3e76021b9..5c1e079612044 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { hash = "sha256-liTg5Hm+FPpRQajBnnJKBh3JPGyu0Hflntf0isj1FiQ="; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; env.PROPHET_REPACKAGE_CMDSTAN = "false"; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index ca237ed8bbd54..3563aa2ecc895 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -128,8 +128,8 @@ buildPythonPackage rec { # Introduce this file necessary for the docs build via environment var LIBPQ_DOCS_FILE = fetchurl { - url = "https://raw.githubusercontent.com/postgres/postgres/REL_14_STABLE/doc/src/sgml/libpq.sgml"; - hash = "sha256-yn09fR9+7zQni8SvTG7BUmYRD7MK7u2arVAznWz2oAw="; + url = "https://raw.githubusercontent.com/postgres/postgres/496a1dc44bf1261053da9b3f7e430769754298b4/doc/src/sgml/libpq.sgml"; + hash = "sha256-JwtCngkoi9pb0pqIdNgukY8GbG5pUDZvrGAHZqjFOw4"; }; inherit patches; diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 88f3a8b24483e..54d2ec7493339 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -5,6 +5,7 @@ , isPyPy , fetchPypi , postgresql +, postgresqlTestHook , openssl , sphinxHook , sphinx-better-theme @@ -48,9 +49,18 @@ buildPythonPackage rec { sphinxRoot = "doc/src"; - # Requires setting up a PostgreSQL database + # test suite breaks at some point with: + # current transaction is aborted, commands ignored until end of transaction block doCheck = false; + nativeCheckInputs = [ + postgresqlTestHook + ]; + + env = { + PGDATABASE = "psycopg2_test"; + }; + pythonImportsCheck = [ "psycopg2" ]; diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix index 411630135acc9..f791f953d3f0a 100644 --- a/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -1,4 +1,12 @@ -{ buildPythonPackage, cffi, fetchFromGitHub, lib, postgresql, pytestCheckHook, six }: +{ buildPythonPackage +, cffi +, fetchFromGitHub +, lib +, postgresql +, postgresqlTestHook +, pytestCheckHook +, six +}: buildPythonPackage rec { pname = "psycopg2cffi"; @@ -22,12 +30,19 @@ buildPythonPackage rec { }; nativeBuildInputs = [ postgresql ]; + propagatedBuildInputs = [ six cffi ]; - nativeCheckInputs = [ pytestCheckHook ]; - # NB: The tests need a postgres instance running to test against, and so we - # disable them. - doCheck = false; + nativeCheckInputs = [ postgresqlTestHook pytestCheckHook ]; + + disabledTests = [ + # AssertionError: '{}' != [] + "testEmptyArray" + ]; + + env = { + PGDATABASE = "psycopg2_test"; + }; pythonImportsCheck = [ "psycopg2cffi" ]; diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index a987db97d547a..17a961620da5f 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -2,16 +2,21 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "ptyprocess"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"; + hash = "sha256-XF0KO0jO7gtISF4MJgN8Cs19KXZco/u1yzgx00dCMiA="; }; patches = [ @@ -22,9 +27,23 @@ buildPythonPackage rec { }) ]; - meta = { + nativeBuildInputs = [ + flit-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ptyprocess" + ]; + + meta = with lib; { description = "Run a subprocess in a pseudo terminal"; homepage = "https://github.com/pexpect/ptyprocess"; - license = lib.licenses.isc; + changelog = "https://github.com/pexpect/ptyprocess/releases/tag/${version}"; + license = licenses.isc; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 747fd171f3b3f..b0682b5e8a43e 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240214"; + version = "0.10.0.20240312"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RaIGxfnB7M8ThIEoDPsKZ8LMr8eC74nH/W3GxDViMP4="; + hash = "sha256-ApEvPghPrWfiRjNl/UMVRJIdnbP1H21DzqcWnIax8Yg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 4ffe4f45b3e84..174139f5aaf48 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.4.0"; + version = "7.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-XYovKAk2GEMi7GE/DVtLjMbww7guGkZzDOHC7Z6ZpJo="; + hash = "sha256-fmRFxSVzKN2ynuXJlpZcuIt4XIe7XHU4HSzSN1kCi2g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pueblo/default.nix b/pkgs/development/python-modules/pueblo/default.nix new file mode 100644 index 0000000000000..6b11cdad611dc --- /dev/null +++ b/pkgs/development/python-modules/pueblo/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, versioningit +, platformdirs +}: + +buildPythonPackage rec { + pname = "pueblo"; + version = "0.0.9"; + pyproject = true; + + # This tarball doesn't include tests unfortuneatly, and the GitHub tarball + # could have been an alternative, but versioningit fails to detect the + # version of it correctly, even with setuptools-scm and + # SETUPTOOLS_SCM_PRETEND_VERSION = version added. Since this is a pure Python + # package, we can rely on upstream to run the tests before releasing, and it + # should work for us as well. + src = fetchPypi { + inherit pname version; + hash = "sha256-Ea5tzutZtuf1a5s46JJND6ovKi3C5UruR8e1RZucPRc="; + }; + + nativeBuildInputs = [ + setuptools + versioningit + ]; + + propagatedBuildInputs = [ + # contextlib-chdir + # importlib-metadata + platformdirs + ]; + + pythonImportsCheck = [ "pueblo" ]; + + meta = with lib; { + description = "Pueblo - a Python toolbox library"; + homepage = "https://pypi.org/project/pueblo/"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/pulsar-client/default.nix b/pkgs/development/python-modules/pulsar-client/default.nix new file mode 100644 index 0000000000000..075fe4b99d844 --- /dev/null +++ b/pkgs/development/python-modules/pulsar-client/default.nix @@ -0,0 +1,120 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, python +}: +let + version = "3.4.0"; + + inherit (python) pythonVersion; + + Srcs = + let + getSrcFromPypi = { platform, dist, hash }: fetchPypi { + inherit version platform dist hash; + pname = "pulsar_client"; + format = "wheel"; + python = dist; + abi = dist; + }; + in + { + "3.9-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp39"; + hash = "sha256-1P5ArMoLZiUkHUoQ/mJccbNj5/7el/op+Qo6cGQ33xE="; + }; + "3.9-aarch64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; + dist = "cp39"; + hash = "sha256-11JQZRwMLtt7sK/JlCBqqRyfTVIAVJFN2sL+nAkQgvU="; + }; + "3.9-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp39"; + hash = "sha256-dwTGZKosgBr0wtOljp2P+u7xLOig9xcS6Rh/mpbahW8="; + }; + "3.9-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp39"; + hash = "sha256-dwTGZKosgBr0wtOljp2P+u7xLOig9xcS6Rh/mpbahW8="; + }; + "3.10-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp310"; + hash = "sha256-swp1kuQsdgNOmo1k1C3VurNhQl+GneVi6cytaY4ZzYg="; + }; + "3.10-aarch64-linux" = getSrcFromPypi { + platform = "musllinux_1_1_aarch64"; + dist = "cp310"; + hash = "sha256-1ZYwkKeKVkS6JfQdo6bUnqPwDJcrCVuv82WRbcJGQmo="; + }; + "3.10-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp310"; + hash = "sha256-6/mdtSRP9pR5KDslYhsHBJKsxLtkPRYthrkDh8tv2yo="; + }; + "3.10-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp310"; + hash = "sha256-6/mdtSRP9pR5KDslYhsHBJKsxLtkPRYthrkDh8tv2yo="; + }; + "3.11-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp311"; + hash = "sha256-M1cd6ZzYmDSfF5eLpi4rg56gJ1+3Bn8xv19uv+rgmH0="; + }; + "3.11-aarch64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; + dist = "cp311"; + hash = "sha256-+HQ8MgqpZ5jSDK+pjql6aMQpX8SHLCOs1eAS/TbLBro="; + }; + "3.11-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp311"; + hash = "sha256-EZUvsCLuct6/U7Fp9EgvncXIkL4BSa6Yd5hks6IfG9M="; + }; + "3.11-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp311"; + hash = "sha256-EZUvsCLuct6/U7Fp9EgvncXIkL4BSa6Yd5hks6IfG9M="; + }; + "3.12-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp312"; + hash = "sha256-xgbATzVzQQQvpsdUd959IgT3rlCqKcL3SyTlTIX0f5Y="; + }; + "3.12-aarch64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; + dist = "cp312"; + hash = "sha256-8gK4Th9oPWRnLdGXERRgCuLlw3NVhyhv+b+0MThfCOg="; + }; + "3.12-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp312"; + hash = "sha256-9/jw/wr1oUD9pOadVAaMRL081iVMUXwVgnUMcG1UNvE="; + }; + "3.12-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp312"; + hash = "sha256-9/jw/wr1oUD9pOadVAaMRL081iVMUXwVgnUMcG1UNvE="; + }; + }; + +in buildPythonPackage { + pname = "pulsar-client"; + inherit version; + + format = "wheel"; + + src = Srcs."${pythonVersion}-${stdenv.hostPlatform.system}" + or (throw "Unsupported '${pythonVersion}-${stdenv.hostPlatform.system}' target"); + + meta = with lib; { + description = "Client for pulsar"; + homepage = "https://pypi.org/project/pulsar-client/"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 453cbd96cde6b..72f0dfc4dde75 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.20"; + version = "1.21"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Iyf/Vf1uqdtHlaP9Petpp88aIGCGmHu//cH6bindL6c="; + hash = "sha256-ObJp3+gk1tf1+9wBpvzs0wwP7ptDlfGwX9b4wlCb1RI="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pushbullet-py/default.nix b/pkgs/development/python-modules/pushbullet-py/default.nix index 472f4dcc5853c..1ef8728d0614e 100644 --- a/pkgs/development/python-modules/pushbullet-py/default.nix +++ b/pkgs/development/python-modules/pushbullet-py/default.nix @@ -1,33 +1,52 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , requests , websocket-client , python-magic , cryptography , pytestCheckHook +, pythonAtLeast }: buildPythonPackage rec { pname = "pushbullet-py"; version = "0.12.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; }; - propagatedBuildInputs = [ cryptography requests websocket-client python-magic ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cryptography + python-magic + requests + websocket-client + ]; preCheck = '' export PUSHBULLET_API_KEY="" ''; - nativeCheckInputs = [ pytestCheckHook ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + disabledTests = [ "test_auth_fail" "test_auth_success" "test_decryption" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: 'called_once_with' is not a valid assertion. Use a spec for the mock if 'called_once_with' is meant to be an attribute.. Did you mean: 'assert_called_once_with'? + "test_new_device_ok" + "test_new_chat_ok" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 4fcb8588147ff..db91bf50182e5 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -29,12 +29,12 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.11.1"; + version = "4.12.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7hnjX721t0YzKcJ75R+tEfUI6E9bxMYXUEtI56GDZP0="; + hash = "sha256-MgKFvZJmFS/bo7gd46MeYaJQdmRVB6ONhfNOGxWZjrE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix index 7845bfe175014..d7769ea4873d9 100644 --- a/pkgs/development/python-modules/py-ecc/default.nix +++ b/pkgs/development/python-modules/py-ecc/default.nix @@ -4,38 +4,55 @@ , cached-property , eth-typing , eth-utils -, mypy-extensions , pytestCheckHook +, pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "py-ecc"; - version = "6.0.0"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "7.0.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ethereum"; repo = "py_ecc"; rev = "v${version}"; - hash = "sha256-638otYA3e/Ld4mcM69yrqHQnGoK/Sfl/UA9FWnjgO/U="; + hash = "sha256-DKe+bI1GEzXg4Y4n5OA1/hWYz9L3X1AvaOFPEnCaAfs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cached-property eth-typing eth-utils - mypy-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/ethereum/py_ecc/issues/133 + "test_FQ2_object" + "test_pairing_bilinearity_on_G1" + "test_pairing_bilinearity_on_G2" + "test_pairing_composit_check" + "test_pairing_is_non_degenerate" + "test_pairing_negative_G1" + "test_pairing_negative_G2" + "test_pairing_output_order" + ]; + pythonImportsCheck = [ "py_ecc" ]; meta = with lib; { + changelog = "https://github.com/ethereum/py_ecc/blob/${src.rev}/CHANGELOG.rst"; description = "ECC pairing and bn_128 and bls12_381 curve operations"; homepage = "https://github.com/ethereum/py_ecc"; license = licenses.mit; diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index fd2fb808bb437..7cb4ab94761c8 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.4.2"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-EV5Md7dAkHcBbfF4DhmUHwKxjlXI4Jbb1VryeOwRTWo="; + hash = "sha256-b18PY5LCU2NOSmzOHh0NBFQFCJ2N9oAhusn6QTdlb7o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index 0954993ccd1ff..2834aeaf53d98 100644 --- a/pkgs/development/python-modules/py-serializable/default.nix +++ b/pkgs/development/python-modules/py-serializable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-OsgFzT5qGyszO4jFYWIAgGY41s0ZBEMwCbWZeY189h4="; + hash = "sha256-RhipoPTewPaYwspTnywLr5FvFVUaFixfRQk6aUMvB4w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index 111e702455d20..25dd99816d0f0 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -1,10 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, flake8 , mock -, nose -, pytest +, pytestCheckHook , cryptography , pythonOlder }: @@ -26,10 +24,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - flake8 mock - nose - pytest + pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 00552787cc50f..004487bebbcd1 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.55"; + version = "3.56"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HGOHJQWEvTTL+GXVb8ZS8DlL9dHWuS0PioP1bZ32PhI="; + hash = "sha256-dHc5t8QO4wtwFlLkiaSu5Ern/MsxNHZMd5aeqWdKwNo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 7e9e2c47d3b5a..496ebc4e8fa7f 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -5,6 +5,7 @@ , coloredlogs , fastapi , fetchFromGitHub +, hatchling , pillow , psutil , pytestCheckHook @@ -18,8 +19,8 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.15.2"; - format = "setuptools"; + version = "4.16.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,9 +28,13 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-Xw+edPs2CKJdpgDp+JB3L2W4oAIAk/IpQAD7c2kF3gk="; + hash = "sha256-w039aPK+PdOiiOj5ZZAUfyHQ6QDrKySVIijcOw+GIOk="; }; + nativeBuildInputs = [ + hatchling + ]; + passthru.optional-dependencies = { json = [ ujson diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 70c660e0daad4..825568da73a8f 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyaml"; - version = "23.9.7"; + version = "23.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WB6k6Z8OMIhkQH4EwDxgkkGu+joV37qJZNp2RLrzshc="; + hash = "sha256-zm9kjv37GzpVefjO2wT6zw+h6PZIRrY5MJtYW7MitOU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 053b280c500eb..7c19bdefd4f67 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml setup.py \ --replace "setuptools_scm < 8.0.0" "setuptools_scm" + '' + lib.optionalString (pythonAtLeast "3.12") '' + substituteInPlace ./cmake_modules/FindPython3Alt.cmake --replace-fail \ + "from distutils import sysconfig" \ + "import sysconfig" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyasyncore/default.nix b/pkgs/development/python-modules/pyasyncore/default.nix index d5ebd86a7d952..1d02c8ae66405 100644 --- a/pkgs/development/python-modules/pyasyncore/default.nix +++ b/pkgs/development/python-modules/pyasyncore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pyasyncore"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "simonrob"; repo = "pyasyncore"; rev = "refs/tags/v${version}"; - hash = "sha256-e1iHC9mbQYlfpIdLk033wvoA5z5WcHjOZm6oFTfpRTA="; + hash = "sha256-ptqOsbkY7XYZT5sh6vctfxZ7BZPX2eLjo6XwZfcmtgk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index d584b410d7cdc..a422e45057b8f 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -18,6 +18,7 @@ , pytest-timeout , pytestCheckHook , pythonRelaxDepsHook +, pythonAtLeast , pythonOlder , requests , setuptools @@ -95,6 +96,9 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/postlund/pyatv/issues/2307 "test_zeroconf_service_published" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/postlund/pyatv/issues/2365 + "test_simple_dispatch" ] ++ lib.optionals (stdenv.isDarwin) [ # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False "test_stream_retransmission" diff --git a/pkgs/development/python-modules/pybrowsers/default.nix b/pkgs/development/python-modules/pybrowsers/default.nix index 07b686d2df69e..859b1faa4b4e2 100644 --- a/pkgs/development/python-modules/pybrowsers/default.nix +++ b/pkgs/development/python-modules/pybrowsers/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "pybrowsers"; - version = "0.5.2"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "roniemartinez"; repo = "browsers"; - rev = version; - hash = "sha256-bsmOUa33VzqWCv2jhu6oukdRhWfpkeAM3FBjiBBwjSQ="; + rev = "refs/tags/${version}"; + hash = "sha256-hjaQUfH7pNwC6+6liOUQQZU6NdhxLmtabvDD7JnQ3GU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index 3384ad516b5fc..c6d65db362aef 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.5"; + version = "2.2.4"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pbs"; repo = "pycaption"; rev = "refs/tags/${version}"; - hash = "sha256-zI5zRjvtsVgiIgWsQQgBQHhbYSGRBB6RLYgpbZWJQHs="; + hash = "sha256-aUhNvqeSNtbnRVp4yxsk4q3szNfR0m1zo0MpkBOCokY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 2abbe4a4e7701..f5e6029e85603 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -4,32 +4,39 @@ , fetchPypi , pythonOlder , protobuf -, requests +, setuptools +, wheel , zeroconf }: buildPythonPackage rec { pname = "pychromecast"; - version = "13.1.0"; - format = "setuptools"; + version = "14.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchPypi { pname = "PyChromecast"; inherit version; - hash = "sha256-COYai1S9IRnTyasewBNtPYVjqpfgo7V4QViLm+YMJnY="; + hash = "sha256-3E+LBS52CpeNqbJWi3kCDLea9gigJkZfB1RM/+Q5c88="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "protobuf>=3.19.1,<4" "protobuf>=3.19.1" + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=65.6" "setuptools" \ + --replace-fail "wheel~=0.37.1" "wheel" \ + --replace-fail "protobuf>=4.25.1" "protobuf" ''; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ casttube protobuf - requests zeroconf ]; diff --git a/pkgs/development/python-modules/pyctr/default.nix b/pkgs/development/python-modules/pyctr/default.nix index 0ce889fdb7397..cf225369b3958 100644 --- a/pkgs/development/python-modules/pyctr/default.nix +++ b/pkgs/development/python-modules/pyctr/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyctr"; - version = "0.7.4"; + version = "0.7.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1nPP+rz/8BiFHu3nGcHuqCPwyyR55LUhoBprHFTudWQ="; + hash = "sha256-fiDJWcypFabnUoS313f56ypDuDrLASHrkk0Em8bymmw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index 4569ea3286b8d..8efa37dd65fa1 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -17,14 +17,14 @@ let pydantic-core = buildPythonPackage rec { pname = "pydantic-core"; - version = "2.14.5"; + version = "2.14.6"; format = "pyproject"; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-core"; rev = "refs/tags/v${version}"; - hash = "sha256-UguZpA3KEutOgIavjx8Ie//0qJq+4FTZNQTwb/ZIgb8="; + hash = "sha256-Y3RdDqFrH5C8Jt45FV6jLRV8G9odkqM1fBz6axeXF+4="; }; patches = [ @@ -34,7 +34,7 @@ let cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mMgw922QjHmk0yimXfolLNiYZntTsGydQywe7PTNnwc="; + hash = "sha256-tx8eS+MciP1C6U8FrKdTgelHb/yxU2eSdSydIMKh4rs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index e1fc840f0ee14..42ce2745d7270 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -6,6 +6,7 @@ , pytest-mock , pytestCheckHook , python-dotenv +, pythonAtLeast , pythonOlder , setuptools , typing-extensions @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.10.13"; + version = "1.10.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; rev = "refs/tags/v${version}"; - hash = "sha256-ruDVcCLPVuwIkHOjYVuKOoP3hHHr7ItIY55Y6hUgR74="; + hash = "sha256-tcaHSPZggVwyzCgDmwOgcGqUmUrJOmkdSNudJTFQ3bc="; }; nativeBuildInputs = [ @@ -62,6 +63,15 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # depends on distuils + "test_cython_function_untouched" + # AssertionError on exact types and wording + "test_model_subclassing_abstract_base_classes_without_implementation_raises_exception" + "test_partial_specification_name" + "test_secretfield" + ]; + enableParallelBuilding = true; pythonImportsCheck = [ "pydantic" ]; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index d58ec6e53f5f5..c81b46a205861 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; rev = "refs/tags/v${version}"; - hash = "sha256-D0gYcyrKVVDhBgV9sCVTkGq/kFmIoT9l0i5bRM1qxzM="; + hash = "sha256-YTNV67uKGRag6ICkNjjY9YrOiKFB1hSZkKcUXjSrhwM="; }; buildInputs = lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 9a322790f8656..f64913c32d336 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "114"; + version = "115"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-XN6di3pxB7lhZ5TQnyHr7nKA0STBi0CVzGnhvRDsbFY="; + hash = "sha256-NjzONVSJ4GEaIeC5ytnTi8JpZY1yIq3LN8vbMy3n0vs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 560a623485419..9da4ff12b7713 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.18"; + version = "1.12.19"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = "pydeps"; rev = "refs/tags/v${version}"; - hash = "sha256-89RrAf09n42mRiWOUdHFNP4JoCP9bXMofkISyVqd+4I="; + hash = "sha256-3z/7pkeP6R8GsWvSaCChcf0DZPrC3KdwLeGdNm4m6Jc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index 81364bd203aea..9dd93cd5fa625 100644 --- a/pkgs/development/python-modules/pydevccu/default.nix +++ b/pkgs/development/python-modules/pydevccu/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.7"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wzltcerAGh/QfHGg+M7Hlw4SfDEg23K2plSyrmz/m7E="; + hash = "sha256-WguSTtWxkiDs5nK5eiaarfD0CBxzIxQR9fxjuW3wMGc="; }; # Module has no tests diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix index 3c87b6b6f3a1a..f671ec1e5e60f 100644 --- a/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/pkgs/development/python-modules/pydiscovergy/default.nix @@ -1,21 +1,22 @@ { lib , authlib , buildPythonPackage -, dataclasses-json , fetchFromGitHub , httpx -, marshmallow +, mashumaro +, orjson , pytest-httpx , poetry-core , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pytz , respx }: buildPythonPackage rec { pname = "pydiscovergy"; - version = "2.0.5"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -23,19 +24,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jpbede"; repo = "pydiscovergy"; - rev = "refs/tags/${version}"; - hash = "sha256-u2G+o/vhPri7CPSnekC8rUo/AvuvePpG51MR+FdH2XA="; + rev = "refs/tags/v${version}"; + hash = "sha256-ArcH/4ZyOtIGmoXArU+oEd357trJnS9umlN9B+U0dBI="; }; + postPatch = '' + sed -i '/addopts =/d' pyproject.toml + ''; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ authlib - dataclasses-json httpx - marshmallow + mashumaro + orjson pytz ]; @@ -52,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async Python 3 library for interacting with the Discovergy API"; homepage = "https://github.com/jpbede/pydiscovergy"; - changelog = "https://github.com/jpbede/pydiscovergy/releases/tag/${version}"; + changelog = "https://github.com/jpbede/pydiscovergy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index adddc92dbc1ab..2d3d12ca87494 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.1.1"; + version = "2024.3.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-fMwWGE6WfgENti4H+WSfd8ZSHqxHyBVATUhng/o8qeY="; + hash = "sha256-sL0/LZ7ggUg2OGkIauNLHR7i3l3k4NGvyY2ea1O1m3E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index e1631f74f94e7..7ec3da3531cf2 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -1,43 +1,59 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub - -# tests +, fetchpatch , ffmpeg-full -, python +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pydub"; version = "0.25.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; - repo = pname; - rev = "v${version}"; - sha256 = "0xskllq66wqndjfmvp58k26cv3w480sqsil6ifwp4gghir7hqc8m"; + repo = "pydub"; + rev = "refs/tags/v${version}"; + hash = "sha256-FTEMT47wPXK5i4ZGjTVAhI/NjJio3F2dbBZzYzClU3c="; }; + patches = [ + # Fix test assertions, https://github.com/jiaaro/pydub/pull/769 + (fetchpatch { + name = "fix-assertions.patch"; + url = "https://github.com/jiaaro/pydub/commit/66c1bf7813ae8621a71484fdcdf609734c0d8efd.patch"; + hash = "sha256-3OIzvTgGK3r4/s5y7izHvouB4uJEmjO6cgKvegtTf7A="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + ffmpeg-full + pytestCheckHook + ]; + pythonImportsCheck = [ "pydub" "pydub.audio_segment" "pydub.playback" ]; - nativeCheckInputs = [ - ffmpeg-full + pytestFlagsArray = [ + "test/test.py" ]; - checkPhase = '' - ${python.interpreter} test/test.py - ''; - meta = with lib; { description = "Manipulate audio with a simple and easy high level interface"; homepage = "http://pydub.com"; + changelog = "https://github.com/jiaaro/pydub/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix index 0cf3c5677cdcb..1e9d2584a20f8 100644 --- a/pkgs/development/python-modules/pydyf/default.nix +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydyf"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-sise8BYUG1SUGtZu1OA2p73/OcCzYJk7KDh1w/hU3Zo="; + hash = "sha256-1bJE6PwkEZznvV1R6i1nc8D/iKqBWX21VrxEDGuIBhA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 4826806c19f12..53add2582f9e1 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.19.0"; + version = "1.19.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-Wj2CkOvH5mS+DaIcbrqHjK+0mG3gfyF5M9tFImeJ/ko="; + hash = "sha256-opzoIYNsFERS5R40vm64o92PYz4+1e3ACFv3W6+EYsc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyexiftool/default.nix b/pkgs/development/python-modules/pyexiftool/default.nix new file mode 100644 index 0000000000000..e7240658ef330 --- /dev/null +++ b/pkgs/development/python-modules/pyexiftool/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, exiftool +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyexiftool"; + version = "0.5.6"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "sylikc"; + repo = "pyexiftool"; + rev = "refs/tags/v${version}"; + hash = "sha256-dgQkbpCbdq2JbupY0DyQbHPR9Bg+bwDo7yN03o3sX+A="; + }; + + postPatch = '' + substituteInPlace exiftool/constants.py \ + --replace-fail 'DEFAULT_EXECUTABLE = "exiftool"' \ + 'DEFAULT_EXECUTABLE = "${lib.getExe exiftool}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ "exiftool" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/sylikc/pyexiftool/blob/${src.rev}/CHANGELOG.md"; + description = "Python wrapper for exiftool"; + homepage = "https://github.com/sylikc/pyexiftool"; + license = with lib.licenses; [ bsd3 /* or */ gpl3Plus ]; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 2da0f2698685a..c0ef2f45f2b7e 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,23 +1,30 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "pyflakes"; - version = "3.1.0"; + version = "3.2.0"; disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-oKrgNMRE2wBxqgd5crpHaNQMgw2VOf1Fv0zT+PaZLvw="; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = "pyflakes"; + rev = version; + hash = "sha256-ouCkkm9OrYob00uLTilqgWsTWfHhzaiZp7sa2C5liqk="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -26,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/PyCQA/pyflakes"; - changelog = "https://github.com/PyCQA/pyflakes/blob/${version}/NEWS.rst"; + changelog = "https://github.com/PyCQA/pyflakes/blob/${src.rev}/NEWS.rst"; description = "A simple program which checks Python source files for errors"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/pyfume/default.nix b/pkgs/development/python-modules/pyfume/default.nix index 308f5eeeb5299..5f3db44b0f114 100644 --- a/pkgs/development/python-modules/pyfume/default.nix +++ b/pkgs/development/python-modules/pyfume/default.nix @@ -6,28 +6,35 @@ , pandas , pythonOlder , scipy +, setuptools , simpful +, typing-extensions }: buildPythonPackage rec { pname = "pyfume"; - version = "0.2.25"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyFUME"; inherit version; - hash = "sha256-uD1IHFyNd9yv3eyHPZ4pg6X2+rLTY5sYsQysuIXbvfA="; + hash = "sha256-8J9qhSaTlb/KiCjegmc8iaGaZOXJ0Pk1EquOTEUUtW0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ fst-pso numpy pandas scipy simpful + typing-extensions ]; # Module has not test @@ -40,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python package for fuzzy model estimation"; homepage = "https://github.com/CaroFuchs/pyFUME"; + changelog = "https://github.com/CaroFuchs/pyFUME/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index ab5727b33add7..6bc41339d9275 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -59,12 +59,14 @@ buildPythonPackage rec { "${lib.getLib dep}/lib" ]) buildInputs); }) + # Skip tests that should be disabled without video driver + ./skip-surface-tests.patch ]; postPatch = '' substituteInPlace src_py/sysfont.py \ - --replace 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ - --replace /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list + --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ + --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list ''; nativeBuildInputs = [ @@ -102,7 +104,6 @@ buildPythonPackage rec { # No audio or video device in test environment export SDL_VIDEODRIVER=dummy export SDL_AUDIODRIVER=disk - export SDL_DISKAUDIOFILE=/dev/null ${python.interpreter} -m pygame.tests -v --exclude opengl,timing --time_out 300 diff --git a/pkgs/development/python-modules/pygame/skip-surface-tests.patch b/pkgs/development/python-modules/pygame/skip-surface-tests.patch new file mode 100644 index 0000000000000..21d9c9060f3b8 --- /dev/null +++ b/pkgs/development/python-modules/pygame/skip-surface-tests.patch @@ -0,0 +1,26 @@ +diff --git a/test/surface_test.py b/test/surface_test.py +index 5ce78b6e..8b8f7ed5 100644 +--- a/test/surface_test.py ++++ b/test/surface_test.py +@@ -1091,6 +1091,10 @@ class GeneralSurfaceTests(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf( ++ os.environ.get("SDL_VIDEODRIVER") == "dummy", ++ 'requires a non-"dummy" SDL_VIDEODRIVER', ++ ) + def test_convert_init(self): + """Ensure initialization exceptions are raised + for surf.convert().""" +@@ -1118,6 +1122,10 @@ class GeneralSurfaceTests(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf( ++ os.environ.get("SDL_VIDEODRIVER") == "dummy", ++ 'requires a non-"dummy" SDL_VIDEODRIVER', ++ ) + def test_convert_alpha_init(self): + """Ensure initialization exceptions are raised + for surf.convert_alpha().""" diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 2f3cde9a51d88..1325a31fe1339 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-LRzyZAusCo4uZlXFWoRPIfPgAGO4sP0KCGYOICNZ6f4="; + hash = "sha256-Uw65+YOnln+IOyT+RgqMEWt5cOZsaeS8Nu8U6ooivWA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pygltflib/default.nix b/pkgs/development/python-modules/pygltflib/default.nix index e88437eb15a9a..7212192b260fc 100644 --- a/pkgs/development/python-modules/pygltflib/default.nix +++ b/pkgs/development/python-modules/pygltflib/default.nix @@ -20,7 +20,7 @@ in buildPythonPackage rec { pname = "pygltflib"; - version = "1.16.1"; + version = "1.16.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "dodgyville"; repo = "pygltflib"; - rev = "da1c687f5ea88d6063616857d54d195fa0739b37"; # no tags in repo, only on PyPI - hash = "sha256-aoYVglpQ0Qaq6gEqZ455GlkL2/C1Q5YjQASVLplsWbs="; + rev = "refs/tags/v${version}"; + hash = "sha256-rUAg05M5biVsdG2yEH0Olng/0jH1R/Jo5/+j4ToKkTI="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for reading and writing basic glTF files"; homepage = "https://gitlab.com/dodgyville/pygltflib"; - changelog = "https://gitlab.com/dodgyville/pygltflib/-/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://gitlab.com/dodgyville/pygltflib/-/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index d311df0a45304..c829ff91f6969 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -18,13 +18,13 @@ toPythonModule (stdenv.mkDerivation rec { pname = "pygmo"; - version = "2.19.5"; + version = "2.19.6"; src = fetchFromGitHub { owner = "esa"; repo = "pygmo2"; rev = "refs/tags/v${version}"; - hash = "sha256-szQyw5kYfrQEeXRQzjQ0hzULuzTfmGod6ZxG9PDRj5M="; + hash = "sha256-umXK8LGJJ6Xj6UbJ5k/DM/nYayjl+jBXtjar5/dWqFM="; }; cmakeFlags = [ diff --git a/pkgs/development/python-modules/pygnmi/default.nix b/pkgs/development/python-modules/pygnmi/default.nix index a5218555b36bf..aa0607a4c023c 100644 --- a/pkgs/development/python-modules/pygnmi/default.nix +++ b/pkgs/development/python-modules/pygnmi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pygnmi"; - version = "0.8.13"; + version = "0.8.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "akarneliuk"; repo = "pygnmi"; rev = "refs/tags/v${version}"; - sha256 = "sha256-NkByimHk1DoBjMMD7ywplo38VxBpp1pnClYUzhtKwY4="; + sha256 = "sha256-ncp/OwELy/QOvGhLUZW2qTQZsckWI4CGrlEAZ20RtQI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 89d261d5f8de6..cc2d41147bca7 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; buildInputs = [ - # # .so files link to this + cairo glib ] ++ lib.optionals stdenv.isDarwin [ ncurses @@ -50,7 +50,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycairo - cairo ]; mesonFlags = [ diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index f584358109913..2765f457991ba 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast +, setuptools , certifi , click , keyring @@ -17,7 +19,7 @@ buildPythonPackage rec { pname = "pyicloud"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "picklepete"; @@ -26,6 +28,10 @@ buildPythonPackage rec { hash = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ certifi click @@ -43,14 +49,10 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - sed -i \ - -e 's!click>=.*!click!' \ - -e 's!keyring>=.*!keyring!' \ - -e 's!keyrings.alt>=.*!keyrings.alt!' \ - -e 's!tzlocal==.*!tzlocal!' \ - requirements.txt - ''; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/picklepete/pyicloud/issues/446 + "test_storage" + ]; meta = with lib; { description = "PyiCloud is a module which allows pythonistas to interact with iCloud webservices"; diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index 609e75806678b..bfeb5e4a5eeef 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyipp"; - version = "0.14.4"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ctalkington"; repo = "python-ipp"; - rev = version; - hash = "sha256-xE0fdT+Ffdf4iOHWZzRa7YWtHt92lFdA/sbwjblMR40="; + rev = "refs/tags/${version}"; + hash = "sha256-k7NSCmugGov+lJXWeopUwKkGKL/EGhvxSSiby4CcmFM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyipv8/default.nix b/pkgs/development/python-modules/pyipv8/default.nix index 6d0f618df8d29..24f0ba95c0638 100644 --- a/pkgs/development/python-modules/pyipv8/default.nix +++ b/pkgs/development/python-modules/pyipv8/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyipv8"; - version = "2.12.0"; + version = "2.13.0"; src = fetchPypi { inherit pname version; - hash = "sha256-FXvMykUko3v0GmAZYUt5esBuTbxqpjOL4YxrRfE3u5o="; + hash = "sha256-Qp5vqMa7kfSp22C5KAUvut+4YbSXMEZRsHsLevB4QvE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykaleidescape/default.nix b/pkgs/development/python-modules/pykaleidescape/default.nix index b11f99b741129..eac53807b5d4c 100644 --- a/pkgs/development/python-modules/pykaleidescape/default.nix +++ b/pkgs/development/python-modules/pykaleidescape/default.nix @@ -5,23 +5,29 @@ , fetchFromGitHub , pytest-asyncio , pytestCheckHook +, pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pykaleidescape"; - version = "2022.2.3"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SteveEasley"; - repo = pname; + repo = "pykaleidescape"; rev = "refs/tags/v${version}"; - hash = "sha256-h5G7wV4Z+sf8Qq4GNFsp8DVDSgQgS0dLGf+DzK/egYM="; + hash = "sha256-KM/gtpsQ27QZz2uI1t/yVN5no0zp9LZag1duAJzK55g="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp dnspython @@ -39,6 +45,10 @@ buildPythonPackage rec { disabledTests = [ # Test requires network access "test_resolve_succeeds" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # stuck in EpollSelector.poll() + "test_manual_disconnect" + "test_concurrency" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 2b482295e4222..da2e8d5bc837b 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,32 +1,51 @@ -{ lib, fetchFromGitHub, buildPythonPackage -, lxml, pycryptodomex, construct -, argon2-cffi, python-dateutil -, python +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, argon2-cffi +, construct +, lxml +, pycryptodomex +, pyotp +, unittestCheckHook }: buildPythonPackage rec { - pname = "pykeepass"; - version = "4.0.6"; - - format = "setuptools"; + pname = "pykeepass"; + version = "4.0.7"; + pyproject = true; src = fetchFromGitHub { owner = "libkeepass"; repo = "pykeepass"; rev = "v${version}"; - hash = "sha256-832cTVzI/MFdwiw6xWzRG35z3iwqb5Qpf6W6XYBIFWs="; + hash = "sha256-qUNMjnIhQpUSQY0kN9bA4IxQx8fiFIA6p8rPqNqdjNo="; }; + postPatch = '' + # https://github.com/libkeepass/pykeepass/pull/378 + substituteInPlace pyproject.toml \ + --replace-fail 'packages = ["pykeepass"]' 'packages = ["pykeepass", "pykeepass.kdbx_parsing"]' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - lxml pycryptodomex construct - argon2-cffi python-dateutil + argon2-cffi + construct + lxml + pycryptodomex + setuptools ]; propagatedNativeBuildInputs = [ argon2-cffi ]; - checkPhase = '' - ${python.interpreter} -m unittest tests.tests - ''; + nativeCheckInputs = [ + pyotp + unittestCheckHook + ]; pythonImportsCheck = [ "pykeepass" ]; diff --git a/pkgs/development/python-modules/pylsp-rope/default.nix b/pkgs/development/python-modules/pylsp-rope/default.nix index 4204499b16c39..fd4d1f9ba5f5a 100644 --- a/pkgs/development/python-modules/pylsp-rope/default.nix +++ b/pkgs/development/python-modules/pylsp-rope/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pylsp-rope"; - version = "0.1.11"; + version = "0.1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SKrfmT2vpej8oRCLSlQxMUz4C8eM/91WQA6tnEB1U74="; + hash = "sha256-0f0WzJcVOfH1abJnvZCLM5/W1JfVxSDAH+Z1ADA6kUQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index c95a36aa8ecac..0abbd2eaa5172 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = "pylutron-caseta"; rev = "refs/tags/v${version}"; - hash = "sha256-/xTHtzXEFGL2/oP1oVxJj7GO3fSZ5CwjXDdp6OLhlzM="; + hash = "sha256-7uUNLlVrMEgah2YvTECC4S2WArAQjeAyfgDd62sQsYA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix index ee860eb6f1058..3d94d0db35996 100644 --- a/pkgs/development/python-modules/pylxd/default.nix +++ b/pkgs/development/python-modules/pylxd/default.nix @@ -1,35 +1,51 @@ { lib , buildPythonPackage -, fetchFromGitHub , cryptography +, ddt +, fetchFromGitHub +, mock-services +, pytestCheckHook , python-dateutil +, pythonOlder , requests +, urllib3 +, pythonRelaxDepsHook , requests-toolbelt , requests-unixsocket +, setuptools , ws4py -, ddt -, mock-services -, pytestCheckHook }: buildPythonPackage rec { pname = "pylxd"; version = "2.3.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "lxc"; + owner = "canonica"; repo = "pylxd"; rev = "refs/tags/${version}"; hash = "sha256-Q4GMz7HFpJNPYlYgLhE0a7mVCwNpdbw4XVcUGQ2gUJ0="; }; + pythonRelaxDeps = [ + "urllib3" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + propagatedBuildInputs = [ cryptography python-dateutil requests requests-toolbelt requests-unixsocket + urllib3 ws4py ]; @@ -44,11 +60,14 @@ buildPythonPackage rec { "migration" ]; - pythonImportsCheck = [ "pylxd" ]; + pythonImportsCheck = [ + "pylxd" + ]; meta = with lib; { - description = "A Python library for interacting with the LXD REST API"; - homepage = "https://pylxd.readthedocs.io/en/latest/"; + description = "Library for interacting with the LXD REST API"; + homepage = "https://pylxd.readthedocs.io/"; + changelog = "https://github.com/canonical/pylxd/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 545310ec0ade5..cccf04f3a21ab 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,8 +1,11 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub +, ase , cython , glibcLocales +, joblib , matplotlib , monty , networkx @@ -12,10 +15,13 @@ , plotly , pybtex , pydispatcher +, pytestCheckHook +, pytest-xdist , pythonOlder , requests , ruamel-yaml , scipy +, seekpath , spglib , sympy , tabulate @@ -24,7 +30,7 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.3.29"; + version = "2024.2.23"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -33,7 +39,7 @@ buildPythonPackage rec { owner = "materialsproject"; repo = "pymatgen"; rev= "v${version}"; - hash = "sha256-B2piRWx9TfKlGTPOAAGsq2GxyfHIRBVFpk6dxES0WF0="; + hash = "sha256-eswoup9ACj/PHVW3obcnZjD4tWemsmROZFtwGGigEYE="; }; nativeBuildInputs = [ @@ -60,14 +66,37 @@ buildPythonPackage rec { uncertainties ]; - # Tests are not detected by pytest - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + preCheck = '' + # hide from tests + mv pymatgen _pymatgen + # ensure tests can find these + export PMG_TEST_FILES_DIR="$(realpath ./tests/files)" + # some tests cover the command-line scripts + export PATH=$out/bin:$PATH + ''; + disabledTests = [ + # presumably won't work with our dir layouts + "test_egg_sources_txt_is_complete" + # borderline precision failure + "test_thermal_conductivity" + ]; + + passthru.optional-dependencies = { + ase = [ ase ]; + joblib = [ joblib ]; + seekpath = [ seekpath ]; + }; pythonImportsCheck = [ "pymatgen" ]; meta = with lib; { + broken = stdenv.isDarwin; # tests segfault. that's bad. description = "A robust materials analysis code that defines core object representations for structures and molecules"; homepage = "https://pymatgen.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 185250bddda56..5afa718726c85 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -23,9 +23,14 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-bOrWgZaSOXXalw251cm5JUDkAARGaxmUk+z3SY6Git8="; + hash = "sha256-tiOXbryY2TmeBVrG5cIMeDJ4alolBQ5LosdfH3tpVOA="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail ', "pytest-cov"' "" + ''; + propagatedBuildInputs = [ arviz cachetools @@ -37,11 +42,6 @@ buildPythonPackage rec { typing-extensions ]; - postPatch = '' - substituteInPlace setup.py \ - --replace ', "pytest-cov"' "" - ''; - # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; diff --git a/pkgs/development/python-modules/pymicrobot/default.nix b/pkgs/development/python-modules/pymicrobot/default.nix index 947c065fc32c1..22581f493b73b 100644 --- a/pkgs/development/python-modules/pymicrobot/default.nix +++ b/pkgs/development/python-modules/pymicrobot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pymicrobot"; - version = "0.0.16"; + version = "0.0.22"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMicroBot"; inherit version; - hash = "sha256-W1i1kKDM6DimcerhS5L7yEa32+cB032DrCAfhMCso4A="; + hash = "sha256-8Nkkgznt4JzImJSAbdaX6znhvmgqwOIBjAXVhaMorLk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index a9c425dfabef4..c044b58920bab 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -19,18 +19,23 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.6.4"; + version = "3.6.6"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pymodbus-dev"; - repo = pname; + repo = "pymodbus"; rev = "refs/tags/v${version}"; - hash = "sha256-SYdjM3wFZD+bAOd0vRFe6N5UwF+1Wv97ooihJjKV8K0="; + hash = "sha256-CnMCHFwzNyzTgVyFDSlE7ggI6eXXYbtGuERIomUa3uA="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov-report html " "" + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 2dc7e9f36ebc3..7837e99cf424c 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.1.2"; + version = "7.1.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-iyLJ3kr0O9wa6ipgMgntH8VbSo1a6btYoQZOaogAfKw="; + hash = "sha256-9oS/iBuAWQ3COlnhgeN0e7CFj6VNbkfpPe35tO0BSpo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix index 67c35da582182..28c7117d680a7 100644 --- a/pkgs/development/python-modules/pynuki/default.nix +++ b/pkgs/development/python-modules/pynuki/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "pynuki"; - version = "1.6.2"; - format = "pyproject"; + version = "1.6.3"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pschmitt"; - repo = pname; + repo = "pynuki"; rev = "refs/tags/${version}"; - hash = "sha256-I0eAhgThSBEmJF6mYw+0Bh1kCUqEMFnCx+4n7l3Hf14="; + hash = "sha256-PF5FmAuPcJXq8gQ8HyzdtL2HiiUjueT+LAS1lYRvrwM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index 7a280bfed9038..f73f5bd7d56df 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -1,21 +1,24 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , substituteAll , pythonOlder -, cudatoolkit , addOpenGLRunpath +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "pynvml"; version = "11.5.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-0CeyG5WxCIufwngRf59ht8Z/jjOnh+n4P3NfD3GsMtA="; + src = fetchFromGitHub { + owner = "gpuopenanalytics"; + repo = "pynvml"; + rev = "refs/tags/${version}"; + hash = "sha256-K3ZENjgi+TVDxr55dRK1y8SwzfgVIzcnD4oEI+KHRa4="; }; patches = [ @@ -25,14 +28,22 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ cudatoolkit ]; + nativeBuildInputs = [ + setuptools + ]; - doCheck = false; # no tests in PyPi dist pythonImportsCheck = [ "pynvml" "pynvml.smi" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + # OSError: /run/opengl-driver/lib/libnvidia-ml.so.1: cannot open shared object file: No such file or directory + doCheck = false; + meta = with lib; { description = "Python bindings for the NVIDIA Management Library"; - homepage = "https://www.nvidia.com"; + homepage = "https://github.com/gpuopenanalytics/pynvml"; license = licenses.bsd3; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/pkgs/development/python-modules/pyocd-pemicro/default.nix b/pkgs/development/python-modules/pyocd-pemicro/default.nix new file mode 100644 index 0000000000000..74dee58903cdf --- /dev/null +++ b/pkgs/development/python-modules/pyocd-pemicro/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools-scm +, pyocd +, pypemicro +}: + +buildPythonPackage rec { + pname = "pyocd-pemicro"; + version = "1.1.5"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pyocd"; + repo = "pyocd-pemicro"; + rev = "refs/tags/v${version}"; + hash = "sha256-qi803s8fkrLizcCLeDRz7CTQ56NGLQ4PPwCbxiRigwc="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + pyocd + pypemicro + ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/pyocd/pyocd-pemicro/releases/tag/v${version}"; + description = "PEMicro probe plugin for pyOCD"; + homepage = "https://github.com/pyocd/pyocd-pemicro"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 30f1a4115079a..8667ed08fe767 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.7.0"; + version = "6.7.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-HoTtvda97ghQ0SQBZFGkDAwD2WNtZpIum2m1khivEK4="; + hash = "sha256-eTItw+wYo5lCla4oKSF97N4TFajjFtCMMq4DU9ahi1U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 86bcf10bcf3dd..bf1efac9de74f 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.7"; + version = "1.13.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-wH4LCfjnxAwub/BCe27osyJVUZSOMDjjxItv0aEa8Ic="; + hash = "sha256-tvS7aPfBTs75Rq1WGslWDMv1pOTVt7MtwpXPRJtqbuk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyp/default.nix b/pkgs/development/python-modules/pyp/default.nix deleted file mode 100644 index b9bcb978be853..0000000000000 --- a/pkgs/development/python-modules/pyp/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, coreutils -, pythonOlder -, astunparse -, flit-core -, jq -, bc -}: - -buildPythonPackage rec { - pname = "pyp"; - version = "1.1.0"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "hauntsaninja"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-A1Ip41kxH17BakHEWEuymfa24eBEl5FIHAWL+iZFM4I="; - }; - - nativeBuildInputs = [ - flit-core - ]; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ - astunparse - ]; - - preCheck = '' - export PATH=$out/bin:$PATH - ''; - - nativeCheckInputs = [ - pytestCheckHook - coreutils - jq - bc - ]; - - pythonImportsCheck = [ - "pyp" - ]; - - meta = with lib; { - description = "Easily run Python at the shell! Magical, but never mysterious"; - homepage = "https://github.com/hauntsaninja/pyp"; - license = licenses.mit; - maintainers = with maintainers; [ rmcgibbo ]; - }; -} diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 16ff853422bfd..567f54e1712ec 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.6.2"; + version = "2.6.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ZNj63OanT0ePKYMsHqoqBIVmVev/FyktUjf8gxfDo8U="; + hash = "sha256-l1L+dJwh5GClZLs/Uvwxm4ksYu5hxROLSpu/lK0nVeY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index f42315c331981..a109612fd75ec 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.50.0"; + version = "0.51.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - hash = "sha256-9RnuC9AvTlUtZqep6kn5y1xQcq/dzA9jTZXAsMpKZWc="; + hash = "sha256-kbUVif3a3L7BHj1b37FME5wicalK/iild0pvwPawr6Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 242e80bc4a4e7..11ec1ef47ad47 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -83,6 +83,9 @@ buildPythonPackage rec { "test_sync_download__directory" "test_sync_download__system_directory" "test_transformer_group__download_grids" + + # proj-data grid required + "test_azimuthal_equidistant" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index db37cab6ac1a5..92984dadc7964 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -22,14 +22,15 @@ }: buildPythonPackage rec { - pname = "PyQt6"; + pname = "pyqt6"; version = "6.6.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "PyQt6"; + inherit version; hash = "sha256-nxWKop0gUULFbw810HeEuN8L4oN40gqXvNqL1k/9A3k="; }; diff --git a/pkgs/development/python-modules/pyqt5-stubs/default.nix b/pkgs/development/python-modules/pyqt5-stubs/default.nix index 505c642539712..957a2ac56c937 100644 --- a/pkgs/development/python-modules/pyqt5-stubs/default.nix +++ b/pkgs/development/python-modules/pyqt5-stubs/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - pname = "PyQt5-stubs"; + pname = "pyqt5-stubs"; version = "5.15.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pyqt6-charts.nix b/pkgs/development/python-modules/pyqt6-charts/default.nix index 258a9c2eb8f4f..fd969f6a805a6 100644 --- a/pkgs/development/python-modules/pyqt6-charts.nix +++ b/pkgs/development/python-modules/pyqt6-charts/default.nix @@ -10,14 +10,15 @@ }: buildPythonPackage rec { - pname = "PyQt6_Charts"; + pname = "pyqt6-charts"; version = "6.6.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "PyQt6_Charts"; + inherit version; sha256 = "sha256-FMxuXRnK6AEpUkpC+mMy0NXa2kKCqUI0Jea5rhtrxW0="; }; diff --git a/pkgs/development/python-modules/pyqt6-webengine.nix b/pkgs/development/python-modules/pyqt6-webengine/default.nix index 1b42da5731e8e..637a686f00cbc 100644 --- a/pkgs/development/python-modules/pyqt6-webengine.nix +++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix @@ -12,14 +12,15 @@ }: buildPythonPackage rec { - pname = "PyQt6_WebEngine"; + pname = "pyqt6-webengine"; version = "6.6.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "PyQt6_WebEngine"; + inherit version; hash = "sha256-1QuYTD+F5AnmkrFWEychUi1OjPm2wl4M+Sfuot+zlIc="; }; diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 4ad16f6ea0a6f..ec15596b4048f 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -9,14 +9,15 @@ let inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 sip pyqt-builder; inherit (darwin) autoSignDarwinBinariesHook; in buildPythonPackage (rec { - pname = "PyQtWebEngine"; + pname = "pyqtwebengine"; version = "5.15.6"; format = "pyproject"; disabled = isPy27; src = fetchPypi { - inherit pname version; + pname = "PyQtWebEngine"; + inherit version; sha256 = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; }; diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 44d4e83794fa4..bca013babd9e9 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -18,30 +18,32 @@ , requests , requests-mock , responses +, setuptools }: buildPythonPackage rec { pname = "pyrainbird"; - version = "4.0.1"; - format = "setuptools"; + version = "4.0.2"; + pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; - repo = pname; + repo = "pyrainbird"; rev = "refs/tags/${version}"; - hash = "sha256-OcCg6Q+FJnmrYf70uNLWTg/tfWVJpiQlnyKfREcP2YM="; + hash = "sha256-4AoxLZv0u8wCG3ihw0JqsqsO5zG5UyP4ebSX99ve8sg="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace "--cov=pyrainbird --cov-report=term-missing" "" - - substituteInPlace setup.cfg \ - --replace "pycryptodome>=3.16.0" "pycryptodome" + --replace-fail "--cov=pyrainbird --cov-report=term-missing" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp-retry ical diff --git a/pkgs/development/python-modules/pyramid-jinja2/default.nix b/pkgs/development/python-modules/pyramid-jinja2/default.nix index 801ad816641b1..0eab257384e47 100644 --- a/pkgs/development/python-modules/pyramid-jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid-jinja2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyramid-jinja2"; - version = "2.10"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyramid_jinja2"; inherit version; - hash = "sha256-8nEGnZ6ay6x622kSGQqEj2M49+V6+68+lSN/6DzI9NI="; + hash = "sha256-jFCMs1wTX5UUnKI2EQ+ciHU0NXV0DRbFy3OlDvHCFnc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 26c52f87c8817..a9da74ca7e84c 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.30.1"; + version = "0.31.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = "refs/tags/${version}"; - hash = "sha256-sxxGu1ON5fhUCaONYJdsUFHraTh5NAdXzj7Cai9k5yc="; + hash = "sha256-0t5pPBk8Mzdm6STGtqGMljPjDoW2DTT7x21MEnG512w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index 62b23795d5020..77c1e99332619 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.5.9"; + version = "0.5.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pyrisco"; rev = "refs/tags/v${version}"; - hash = "sha256-qapJcYesOddXFChApFT7hvxLblUigDW40zRe6CYWx+s="; + hash = "sha256-3wa6hayyjWdDVqbLPCqIZ4lgcy1/EdFH4ZVggSRizZU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index 9dbd71e83acf6..d96f124f6f643 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -13,6 +13,7 @@ , torch , scikit-learn , seaborn +, setuptools , torchvision , tqdm , wget @@ -20,16 +21,20 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.8.6"; - format = "setuptools"; + version = "1.9.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version pname; - hash = "sha256-ANL03ailPmbZVRJNxuSektz1cM071waCUJHbdk2TzQc="; + hash = "sha256-QfTABRWVaCgPvFEWSJYKmKKxpBACfYvQpDIgrJsQLN8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyro-api torch diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index b8ace412614c6..7f27356422538 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -3,7 +3,8 @@ , cryptography , defusedxml , fetchFromGitHub -, importlib-resources +, fetchPypi +, paste , poetry-core , pyasn1 , pymongo @@ -11,27 +12,30 @@ , pytestCheckHook , python-dateutil , pythonOlder +, pythonRelaxDepsHook , pytz +, repoze-who , requests , responses , setuptools , substituteAll , xmlschema , xmlsec +, zope-interface }: buildPythonPackage rec { pname = "pysaml2"; - version = "7.4.2"; + version = "7.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "IdentityPython"; - repo = pname; + repo = "pysaml2"; rev = "refs/tags/v${version}"; - hash = "sha256-f8qd1Mfy32CYH9/PshfMMBviDg7OhOPlwz69bPjlYbg="; + hash = "sha256-M/tdKGu6K38TeBZc8/dt376bHhPB0svHB3iis/se0DY="; }; patches = [ @@ -46,8 +50,13 @@ buildPythonPackage rec { sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml ''; + pythonRelaxDeps = [ + "xmlschema" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -59,10 +68,16 @@ buildPythonPackage rec { requests setuptools xmlschema - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources ]; + passthru.optional-dependencies = { + s2repoze = [ + paste + repoze-who + zope-interface + ]; + }; + nativeCheckInputs = [ pyasn1 pymongo diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 4903dbbbc2417..0ab7010f09238 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, substituteAll, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }: buildPythonPackage rec { - pname = "PySDL2"; + pname = "pysdl2"; version = "0.9.16"; # The tests use OpenGL using find_library, which would have to be @@ -12,7 +12,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sdl2" ]; src = fetchPypi { - inherit pname version; + pname = "PySDL2"; + inherit version; hash = "sha256-ECdAa62+zdMP5W6AClp2rX1ycaOuwLes94DuJqAPLUA="; }; diff --git a/pkgs/development/python-modules/pysignalclirestapi/default.nix b/pkgs/development/python-modules/pysignalclirestapi/default.nix index b3dd6f696006c..a2eff3fc4ad89 100644 --- a/pkgs/development/python-modules/pysignalclirestapi/default.nix +++ b/pkgs/development/python-modules/pysignalclirestapi/default.nix @@ -3,20 +3,20 @@ , fetchFromGitHub , setuptools , requests -, future +, six }: buildPythonPackage rec { pname = "pysignalclirestapi"; - version = "0.3.22"; + version = "0.3.23"; pyproject = true; src = fetchFromGitHub { owner = "bbernhard"; repo = "pysignalclirestapi"; - rev = version; - hash = "sha256-m8Sihf5vTDntd5Tbaa5o55G/k/rqtmjWreoTab58CHU="; + rev = "refs/tags/${version}"; + hash = "sha256-DI6dPh8TJElDSk2ExMk4w32ROYgc33cwWNmc3pIBADM="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests - future + six ]; # upstream has no tests @@ -34,6 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pysignalclirestapi" ]; meta = with lib; { + changelog = "https://github.com/bbernhard/pysignalclirestapi/releases/tag/${version}"; description = "Small python library for the Signal Cli REST API"; homepage = "https://github.com/bbernhard/pysignalclirestapi"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pysim/default.nix b/pkgs/development/python-modules/pysim/default.nix index 37e7591c37782..542b0049ccd35 100644 --- a/pkgs/development/python-modules/pysim/default.nix +++ b/pkgs/development/python-modules/pysim/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , pytest-asyncio , colorlog -, smpp_pdu +, smpp-pdu , pyscard , packaging , gsm0338 @@ -53,7 +53,7 @@ buildPythonPackage { pyserial pytlv pyyaml - smpp_pdu + smpp-pdu termcolor ]; diff --git a/pkgs/development/python-modules/pysmi-lextudio/default.nix b/pkgs/development/python-modules/pysmi-lextudio/default.nix index 657cb927a40bd..1ca9e1bd02c9b 100644 --- a/pkgs/development/python-modules/pysmi-lextudio/default.nix +++ b/pkgs/development/python-modules/pysmi-lextudio/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, jinja2 , ply , poetry-core , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "pysmi-lextudio"; - version = "1.1.13"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "lextudio"; repo = "pysmi"; rev = "refs/tags/v${version}"; - hash = "sha256-P1uu1+EcqA7K+oJWFyHTyQqUvqZjZTU0owLKoxjaQhc="; + hash = "sha256-GApjr7KUd7KkdxsbLTzFNdWWol7b/8udrY9q/lls2ro="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + jinja2 ply requests ]; @@ -40,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "SNMP MIB parser"; homepage = "https://github.com/lextudio/pysmi"; - changelog = "https://github.com/lextudio/pysmi/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/lextudio/pysmi/blob/v${version}/CHANGES.rst"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysnmp-lextudio/default.nix b/pkgs/development/python-modules/pysnmp-lextudio/default.nix index 4e7d123d49cbb..89df55d5fd706 100644 --- a/pkgs/development/python-modules/pysnmp-lextudio/default.nix +++ b/pkgs/development/python-modules/pysnmp-lextudio/default.nix @@ -7,7 +7,6 @@ # dependencies , pyasn1 -, pyasyncore , pysmi-lextudio , pysnmpcrypto @@ -18,14 +17,14 @@ buildPythonPackage rec { pname = "pysnmp-lextudio"; - version = "5.0.33"; + version = "6.0.6"; pyproject = true; src = fetchFromGitHub { owner = "lextudio"; repo = "pysnmp"; rev = "v${version}"; - hash = "sha256-IXYpR7JnuHmcjtdCs1C+rPHS9IZ93MN/Zuw4Pu1l/4A="; + hash = "sha256-Mbzpe2wVoW4m7hnfsdcSO/8uOgWl5f1sLLqvdpQP2gU="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyasn1 - pyasyncore pysmi-lextudio pysnmpcrypto ]; @@ -50,11 +48,15 @@ buildPythonPackage rec { "test_send_notification" "test_send_trap" "test_send_v3_inform_notification" + "test_send_v3_inform_sync" "test_usm_sha_aes128" "test_v1_get" "test_v1_next" "test_v1_set" "test_v2c_bulk" + # pysnmp.smi.error.MibNotFoundError + "test_send_v3_trap_notification" + "test_addAsn1MibSource" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index b735601681db7..9763ed00cda57 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.5.0"; + version = "3.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1Bqbdr0qyjcKYQDQdcAp4iukTFlAknh36UNaOpxWZVg="; + hash = "sha256-3WVp5Uc2Xq3E+Ie/V/FT5NWCpoxLSQ3kddVbmYFmSRA="; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 7c9425a9d02ac..31748f890765f 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytest-asyncio , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -34,6 +35,11 @@ buildPythonPackage rec { "pysqueezebox" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: 'has_calls' is not a valid assertion. Use a spec for the mock if 'has_calls' is meant to be an attribute. + "test_verified_pause" + ]; + disabledTestPaths = [ # Tests require network access "tests/test_integration.py" diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index f6c26a60b338a..7b7f23cda452e 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytado"; - version = "0.17.4"; + version = "0.17.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; rev = "refs/tags/${version}"; - hash = "sha256-Wdd9HdsQjaYlL8knhMuO87+dom+aTsmrLRK0UdrpsbQ="; + hash = "sha256-FjdqZc4Zt2sLYJpnD/MAzr8Y9lGHteHB5psQqheS84I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix index f4ce2c7bcd896..a5f7b25491850 100644 --- a/pkgs/development/python-modules/pytedee-async/default.nix +++ b/pkgs/development/python-modules/pytedee-async/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pytedee-async"; - version = "0.2.13"; + version = "0.2.16"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pytedee_async"; rev = "refs/tags/v${version}"; - hash = "sha256-3W+eqkniDMoDKeute5w1QyklOc/aren/Q8txBEI/4ys="; + hash = "sha256-MoAh5YYaZLF99fTFgErXunaLGT9hgInaZTjlDJcpSEw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index e373e5b1f6544..fd81aab3838a3 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.21.1"; # N.B.: when updating, tests bleak and aioesphomeapi tests - format = "pyproject"; + version = "0.23.5"; # N.B.: when updating, tests bleak and aioesphomeapi tests + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pytest-dev"; - repo = pname; + repo = "pytest-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-Wpo8MpCPGiXrckT2x5/yBYtGlzso/L2urG7yGc7SPkA="; + hash = "sha256-sA9ix69oywr1D6ByAxzAFWrAPHJOuq4C8UMiMNkmGJs="; }; outputs = [ diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index f9011b6d721bb..dc2c271371691 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -14,16 +14,16 @@ , pytestCheckHook , pytest-xdist , pythonOlder -, isPy311 +, setuptools }: buildPythonPackage rec { pname = "pytest-benchmark"; version = "4.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; - format = "setuptools"; src = fetchFromGitHub { owner = "ionelmc"; @@ -33,10 +33,24 @@ buildPythonPackage rec { }; patches = [ + # replace distutils.spawn.find_executable with shutil.which (fetchpatch { url = "https://github.com/ionelmc/pytest-benchmark/commit/728752d2976ef53fde7e40beb3e55f09cf4d4736.patch"; hash = "sha256-WIQADCLey5Y79UJUj9J5E02HQ0O86xBh/3IeGLpVrWI="; }) + # fix tests with python3.11+; https://github.com/ionelmc/pytest-benchmark/pull/232 + (fetchpatch { + url = "https://github.com/ionelmc/pytest-benchmark/commit/b2f624afd68a3090f20187a46284904dd4baa4f6.patch"; + hash = "sha256-cylxPj/d0YzvOGw+ncVSCnQHwq2cukrgXhBHePPwjO0="; + }) + (fetchpatch { + url = "https://github.com/ionelmc/pytest-benchmark/commit/2b987f5be1873617f02f24cb6d76196f9aed21bd.patch"; + hash = "sha256-92kWEd935Co6uc/1y5OGKsc5/or81bORSdaiQFjDyTw="; + }) + ]; + + nativeBuildInputs = [ + setuptools ]; buildInputs = [ @@ -64,24 +78,23 @@ buildPythonPackage rec { mercurial pytestCheckHook pytest-xdist - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; preCheck = '' export PATH="$out/bin:$PATH" ''; - disabledTests = [ + disabledTests = lib.optionals (pythonOlder "3.12") [ # AttributeError: 'PluginImportFixer' object has no attribute 'find_spec' "test_compare_1" "test_compare_2" "test_regression_checks" + "test_regression_checks_inf" "test_rendering" - ] - # tests are broken in 3.11 - # https://github.com/ionelmc/pytest-benchmark/issues/231 - ++ lib.optionals isPy311 [ - "test_abort_broken" - "test_clonefunc" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix index 8a53bc17f12b4..03df14e8c7b96 100644 --- a/pkgs/development/python-modules/pytest-examples/default.nix +++ b/pkgs/development/python-modules/pytest-examples/default.nix @@ -2,6 +2,7 @@ , black , buildPythonPackage , fetchFromGitHub +, fetchpatch , hatchling , pytest , pytestCheckHook @@ -24,6 +25,17 @@ buildPythonPackage rec { hash = "sha256-jCxOGDJlFkMH9VtaaPsE5zt+p3Z/mrVzhdNSI51/nVM="; }; + patches = [ + (fetchpatch { + url = "https://github.com/pydantic/pytest-examples/commit/551ba911713c2859caabc91b664723dd6bc800c5.patch"; + hash = "sha256-Y3OU4fNyLADhBQGwX2jY0gagVV2q2dcn3kJRLUyCtZI="; + }) + (fetchpatch { + url = "https://github.com/pydantic/pytest-examples/commit/3bef5d644fe3fdb076270833768e4c6df9148530.patch"; + hash = "sha256-pf+WKzZNqgjbJiblMMLHWk23kjg4W9nm+KBmC8rG8Lw="; + }) + ]; + postPatch = '' # ruff binary is used directly, the ruff Python package is not needed substituteInPlace pytest_examples/lint.py \ diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 186c81a93c602..85eabe87a76d2 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -8,11 +8,12 @@ , pythonOlder , pythonRelaxDepsHook , setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.27.0"; + version = "0.30.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,12 +22,13 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-5CDmIjehW9/aBxoFVbo8W2fAwgIrPPxEqHQjxsTPlpY="; + hash = "sha256-JfyqeOCHNHO4IEHVrh47TdWvb8lcy/1Prqnfphs0ufM="; }; nativeBuildInputs = [ pythonRelaxDepsHook setuptools + setuptools-scm ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index 63771bf4cf3c1..2246c58267250 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -22,14 +22,14 @@ let self = buildPythonPackage rec { pname = "pytest-jupyter"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pytest-jupyter"; rev = "refs/tags/v${version}"; - hash = "sha256-ND51UpPsvZGH6LdEaNFXaBLoCMB4n7caPoo1/Go9fNs="; + hash = "sha256-8pQNtzMylW9b3vk0kp7NcJnXAJKYeoFsHy/lyQFCNzc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index f4c809218fb01..fecc713721597 100644 --- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -11,23 +11,28 @@ , pythonOlder , pyyaml , regex +, setuptools , tomlkit }: buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "3.0.0"; - format = "setuptools"; + version = "3.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "typeddjango"; - repo = pname; + repo = "pytest-mypy-plugins"; rev = "refs/tags/${version}"; - hash = "sha256-kIA2tVOsKsav4tRqZiWCMcRgbRnxAEo7SpmxC2pt9B0="; + hash = "sha256-kZbTCdZM+809yFkKWMpeyBOq6hcqcYk7rEYqee9hZwk="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix new file mode 100644 index 0000000000000..b20006641057c --- /dev/null +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonRelaxDepsHook +, attrs +, jsonschema +, nbclient +, nbdime +, nbformat +, pytest +, black +, coverage +, ipykernel +, pytest-cov +, pytest-regressions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-notebook"; + version = "0.10.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chrisjsewell"; + repo = "pytest-notebook"; + rev = "refs/tags/v${version}"; + hash = "sha256-LoK0wb7rAbVbgyURCbSfckWvJDef3tPY+7V4YU1IBRU="; + }; + + nativeBuildInputs = [ + flit-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "attrs" + "nbclient" + ]; + + propagatedBuildInputs = [ + attrs + jsonschema + nbclient + nbdime + nbformat + ]; + + buildInputs = [ + pytest + ]; + + pythonImportsCheck = [ "pytest_notebook" ]; + + nativeCheckInputs = [ + black + coverage + ipykernel + pytest-cov + pytest-regressions + pytestCheckHook + ]; + + preCheck = '' + export HOME="$TEMP" + ''; + + disabledTests = [ + "test_diff_to_string" + "test_execute_notebook_with_coverage" + "test_regression_coverage" + ]; + + meta = { + changelog = "https://github.com/chrisjsewell/pytest-notebook/blob/${src.rev}/docs/source/changelog.md"; + description = "Pytest plugin for regression testing and regenerating Jupyter Notebooks"; + homepage = "https://github.com/chrisjsewell/pytest-notebook"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index de9b9eb84ba12..1996265365e15 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytest-qt"; - version = "4.3.1"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-AlYEGveAgt/AjiLM+GCqqHjYApVX8D9L/CAH/CkbHmE="; + hash = "sha256-dolhQqlApChTOQCNaSijbUvnSv7H5jRXfoQsnMXFaEQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 91094c81ab411..0b6a8f8f87b57 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -1,25 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, isPy3k -, requests +, fetchFromGitHub +, fetchpatch , psutil +, pylibmc , pytest +, pytestCheckHook +, pythonOlder +, requests +, setuptools , setuptools-scm , toml +, mysqlclient , zc-lockfile }: buildPythonPackage rec { pname = "pytest-services"; version = "2.2.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "2da740487d08ea63dfdf718f5d4ba11e590c99ddf5481549edebf7a3a42ca536"; + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-services"; + rev = "refs/tags/${version}"; + hash = "sha256-E/VcKcAb1ekypm5jP4lsSz1LYJTcTSed6i5OY5ihP30="; }; + patches = [ + # Replace distutils.spawn.find_executable with shutil.which, https://github.com/pytest-dev/pytest-services/pull/46 + (fetchpatch { + name = "replace-distutils.patch"; + url = "https://github.com/pytest-dev/pytest-services/commit/e0e2a85434a2dcbcc0584299c5b2b751efe0b6db.patch"; + hash = "sha256-hvr7EedfjfonHDn6v2slwUBqz1xQoF7Ez/kqAhZRXEc="; + }) + ]; + nativeBuildInputs = [ setuptools-scm toml @@ -33,14 +51,27 @@ buildPythonPackage rec { zc-lockfile ]; - # no tests in PyPI tarball - doCheck = false; + nativeCheckInputs = [ + mysqlclient + pylibmc + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_services" + ]; - pythonImportsCheck = [ "pytest_services" ]; + disabledTests = [ + # Tests require binaries and additional parts + "test_memcached" + "test_mysql" + "test_xvfb " + ]; meta = with lib; { description = "Services plugin for pytest testing framework"; homepage = "https://github.com/pytest-dev/pytest-services"; + changelog = "https://github.com/pytest-dev/pytest-services/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 3c0b0ec629b43..9bceb430820ed 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "2.1.0"; + version = "2.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tarpas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M4636yqzChRI37UdGPOZTjj8POLdrOoJtzmECtZZi4k="; + hash = "sha256-zbMX9r9lftdm9hzXMZRZZ/GEDViGk9QiYYUhO9ZcEAc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 9b6ffe4e0fe89..1757de4c851b6 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.33.1"; + version = "0.33.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = "python-benedict"; rev = "refs/tags/${version}"; - hash = "sha256-QRWyMqHW4C3+718mgp9z/dQ1loesm0Vaf2TzW3yqF3A="; + hash = "sha256-1/eLJFXACn1W5Yz43BIhdqqUVk3t9285d8aLwH+VmAE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index ea79dcf2f80b3..baff1ddce3fe8 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "9.4.0"; + version = "9.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-pT5kcKUWYntZ0iUFIioMhXlL4afyd06HeWEFvUfulpU="; + hash = "sha256-G51xev+TytQgBF+2xS9jdqty8IX4GTEwiSAg7EbJNVU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index b335a8a9831c7..0854d354c2fe7 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qN+WA0qubS1QpOvoIWMmxhw+tkg2d2UE/MpBDlk3o7o="; + hash = "sha256-4yTukKAj2AjxlZxGvLwERGoQztJ3eD3G7gmYfDfsEMo="; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index 9a1416e0dbd67..7eab74cb280e9 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -5,11 +5,12 @@ let fontDirectories = [ freefont_ttf ]; }; in buildPythonPackage rec { - pname = "Python-fontconfig"; + pname = "python-fontconfig"; version = "0.5.1"; src = fetchPypi { - inherit pname version; + pname = "Python-fontconfig"; + inherit version; sha256 = "154rfd0ygcbj9y8m32n537b457yijpfx9dvmf76vi0rg4ikf7kxp"; }; diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index 2af9483dd2640..2319ecda0bfe8 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "python-heatclient"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ggfhDJW2qn0o4Wi5cdPsEpoHb9miZbr4Ba8mgLkStvI="; + hash = "sha256-B1F40HYHFF91mkxwySR/kqCvlwLLtBgqwUvw2byOc9g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 66d97a4b33b95..20bd7409f6cd6 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = "python-homewizard-energy"; rev = "refs/tags/v${version}"; - hash = "sha256-5e2PzH+kDOopH4LYOq49SlHsfBbZZk60U1BSN8OnrKI="; + hash = "sha256-LpxXTzUb+N15lGno3pAhRSEJCb4NmwBcGQ/PshI9gYA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-idzip/default.nix b/pkgs/development/python-modules/python-idzip/default.nix new file mode 100644 index 0000000000000..6c64bb6c257e6 --- /dev/null +++ b/pkgs/development/python-modules/python-idzip/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + +, pythonOlder + +, setuptools + +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-idzip"; + version = "0.3.9"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bauman"; + repo = "python-idzip"; + rev = "refs/tags/${version}"; + hash = "sha256-ChzwC/Afn0qeo5anq4anIu2eI9i6XDnSvB7jAwY7rSw="; + }; + + patches = [ + # fix collision + # https://github.com/bauman/python-idzip/pull/23 + (fetchpatch { + name = "fix-bin-folder-collisions.patch"; + url = "https://patch-diff.githubusercontent.com/raw/bauman/python-idzip/pull/23.patch"; + hash = "sha256-4fPhLdY9MaH1aX6tqMT+NNNNDsyv87G0xBh4MC+5yQE="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # need third-party files + # https://github.com/bauman/python-idzip/blob/master/.github/workflows/test.yaml#L2https://github.com/bauman/python-idzip/blob/master/.github/workflows/test.yaml#L288 + "test/test_compressor.py" + "test/test_decompressor.py" + "test/test_lucky_cache.py" + "test/test_readline.py" + "test/test_seek_read_behavior.py" + "test/test_zero_cache.py" + ]; + + disabledTests = [ + # Terminated + # pop_var_context: head of shell_variables not a function context + "test_bufferedio_compat" + ]; + + meta = with lib; { + description = "Seekable, gzip compatible, compression format"; + homepage = "https://github.com/bauman/python-idzip"; + changelog = "https://github.com/bauman/python-idzip/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index 1f65e5b6e3cc6..b6ded2ff8c2cf 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -3,37 +3,40 @@ , fetchFromGitHub , future , mock -, nose , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.4"; - format = "setuptools"; + version = "0.5.5"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kontron"; - repo = pname; + repo = "python-ipmi"; rev = "refs/tags/${version}"; - hash = "sha256-IXEq3d1nXGEndciQw2MJ1Abc0vmEYez+k6aWGSWEzWA="; + hash = "sha256-G5FcFHtyN8bXMjj/yfJgzcfmV1mxQ9lu3GM3XMeTWVU="; }; postPatch = '' substituteInPlace setup.py \ - --replace "version=version," "version='${version}'," + --replace-fail "version=version," "version='${version}'," ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ future ]; nativeCheckInputs = [ mock - nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 10af09c067201..5839498bbe96d 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.4.0"; + version = "5.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Q9yGuYf9TS7RCo9aV1hnNSrHoll7AOUiSpzRYxi+JXU="; + hash = "sha256-JlO487QSPsBJZqPYRhsQYFA7noIN2q/stH4eZXAFLnY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index 74ef6316e23c5..81d3d3d217a72 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vF53GfQVZCXex311w6eZGOPQtRk3ihbY1++ohJ5MKnk="; + hash = "sha256-srS9vp2vews1O4gHZy7u0B+H3QO0+LQtDQYbCbiTH0E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix index a8e4af984de34..695574698e134 100644 --- a/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-lsp-ruff"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "python-lsp-ruff"; - hash = "sha256-uvTSmoY9rVGEruxY20wOPVgR2JTBDzbn5S7ccDz3zBU="; + hash = "sha256-Z8FAZ/drw9Fr1Uc6V04NezvUItcjti0rKoM1borwUds="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 9d5630a22360f..881e7e33d91bb 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.10.0"; + version = "1.10.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dh33m7wgOwUETjdNqqDKZnpTgbrYCg9/XXC296tHm4w="; + hash = "sha256-tY+BE8DAajZKwlZ2D7uCr9LC7D61ULkhV8Z9EpRu6j0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 3a6648373fb1a..4a79b823ef05a 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.7.0"; + version = "4.8.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-blkE+pLzZQ8BCHAmk6yNjzqbBAlK2ab1FySGFB/kN2c="; + hash = "sha256-TwvDtbYGkDZFIsr0GgwD2R0Il7pV2GCuDw3OZXxDXso="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 570ee23fcbf43..a451aed79092c 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -2,9 +2,12 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, stdenvNoCC +, substituteAll # build , setuptools +, pythonRelaxDepsHook # propagates , aiohttp @@ -27,9 +30,32 @@ , pytestCheckHook }: +let + paaCerts = stdenvNoCC.mkDerivation rec { + pname = "matter-server-paa-certificates"; + version = "1.2.0.1"; + + src = fetchFromGitHub { + owner = "project-chip"; + repo = "connectedhomeip"; + rev = "refs/tags/v${version}"; + hash = "sha256-p3P0n5oKRasYz386K2bhN3QVfN6oFndFIUWLEUWB0ss="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp $src/credentials/development/paa-root-certs/* $out/ + + runHook postInstall + ''; + }; +in + buildPythonPackage rec { pname = "python-matter-server"; - version = "5.5.3"; + version = "5.8.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -38,16 +64,29 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-8daAABR5l8ZEX+PR4XrxRHlLllgnOVE4Q9yY/7UQXHw="; + hash = "sha256-iisDEopaKklLvvGDTo2fv0Fpkhuhd+7KoNnQA+QmjB8="; }; + patches = [ + (substituteAll { + src = ./link-paa-root-certs.patch; + paacerts = paaCerts; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace '--cov' "" ''; nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "home-assistant-chip-clusters" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch b/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch new file mode 100644 index 0000000000000..217fe42339eca --- /dev/null +++ b/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch @@ -0,0 +1,45 @@ +diff --git a/matter_server/server/const.py b/matter_server/server/const.py +index 2a6140b..275353a 100644 +--- a/matter_server/server/const.py ++++ b/matter_server/server/const.py +@@ -15,7 +15,8 @@ DATA_MODEL_SCHEMA_VERSION = 6 + # and always uses the development subfolder + # regardless of anything you pass into instantiating the controller + # revisit this once matter 1.1 is released +-PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = ( ++PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = pathlib.Path("@paacerts@") ++( + pathlib.Path(__file__) + .parent.resolve() + .parent.resolve() +diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py +index d186be1..d2cef54 100644 +--- a/matter_server/server/helpers/paa_certificates.py ++++ b/matter_server/server/helpers/paa_certificates.py +@@ -62,6 +62,8 @@ async def fetch_dcl_certificates( + fetch_production_certificates: bool = True, + ) -> int: + """Fetch DCL PAA Certificates.""" ++ return 0 ++ + LOGGER.info("Fetching the latest PAA root certificates from DCL.") + fetch_count: int = 0 + base_urls = set() +@@ -121,6 +123,8 @@ async def fetch_dcl_certificates( + + async def fetch_git_certificates() -> int: + """Fetch Git PAA Certificates.""" ++ return 0 ++ + fetch_count = 0 + LOGGER.info("Fetching the latest PAA root certificates from Git.") + +@@ -162,6 +166,8 @@ async def fetch_certificates( + fetch_production_certificates: bool = True, + ) -> int: + """Fetch PAA Certificates.""" ++ return 0 ++ + loop = asyncio.get_running_loop() + + if not PAA_ROOT_CERTS_DIR.is_dir(): diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index 3c04398e56d48..f65beeed10d56 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -6,17 +6,24 @@ , mock , pyyaml , six + +# for passthru.tests +, asgi-csrf +, connexion +, fastapi +, gradio +, starlette }: buildPythonPackage rec { pname = "python-multipart"; - version = "0.0.6"; - format = "pyproject"; + version = "0.0.9"; + pyproject = true; src = fetchPypi { pname = "python_multipart"; inherit version; - hash = "sha256-6ZJagLtmhSnxtnx/2wpdrN18v8b7C/8+pEP+Ir3WITI="; + hash = "sha256-A/VGiMZj8beXcQXwIQQ7B5MVHkyxwanUoR/BPWIsQCY="; }; nativeBuildInputs = [ @@ -31,22 +38,26 @@ buildPythonPackage rec { "multipart" ]; - preCheck = '' - # https://github.com/andrew-d/python-multipart/issues/41 - substituteInPlace multipart/tests/test_multipart.py \ - --replace "yaml.load" "yaml.safe_load" - ''; - nativeCheckInputs = [ pytestCheckHook mock pyyaml ]; + passthru.tests = { + inherit + asgi-csrf + connexion + fastapi + gradio + starlette + ; + }; + meta = with lib; { description = "A streaming multipart parser for Python"; homepage = "https://github.com/andrew-d/python-multipart"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index 1bad0f4e69306..4568c94ebb649 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "18.4.0"; + version = "18.6.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-a2tq4sEescEI469V6qchGw/JGZk1oimmuj4N5RTBK1A="; + hash = "sha256-VzwQqkILCJjTX7FG7di7AFgGv/8BMa4rWjDKIqyJR3s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index ef8c7cb59faef..79306e4d11abf 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -11,6 +11,7 @@ , python-novaclient , requests-mock , sphinx +, sphinxcontrib-apidoc , stestr }: @@ -28,6 +29,7 @@ buildPythonPackage rec { installShellFiles openstackdocstheme sphinx + sphinxcontrib-apidoc ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 790f1e58c2958..496987c94e4a4 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -1,27 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, six +, setuptools }: buildPythonPackage rec { pname = "python-ptrace"; - version = "0.9.8"; - format = "setuptools"; + version = "0.9.9"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1e3bc6223f626aaacde8a7979732691c11b13012e702fee9ae16c87f71633eaa"; + hash = "sha256-Vrv+9E6vOne+SBOMyldnzfRx6CeP4Umfm3LxUZB/Jc8="; }; + nativeBuildInputs = [ + setuptools + ]; + # requires distorm, which is optionally doCheck = false; - propagatedBuildInputs = [ six ]; - meta = with lib; { description = "Python binding of ptrace library"; homepage = "https://github.com/vstinner/python-ptrace"; + changelog = "https://github.com/vstinner/python-ptrace/blob/${version}/doc/changelog.rst"; license = licenses.gpl2; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index c131a3b0c0eb9..6c6aea0f161cd 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -6,7 +6,8 @@ , rapidjson , pytestCheckHook , pytz -, glibcLocales +, setuptools +, substituteAll }: let @@ -25,25 +26,30 @@ let hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; }) ]; - # valgrind_unittest failed - cmakeFlags = old.cmakeFlags ++ [ "-DCMAKE_CTEST_ARGUMENTS=-E;valgrind_unittest" ]; }); in buildPythonPackage rec { - version = "1.14"; + version = "1.16"; pname = "python-rapidjson"; disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "python-rapidjson"; repo = "python-rapidjson"; rev = "refs/tags/v${version}"; - hash = "sha256-fCC6jYUIB89HlEnbsmL0MeCBOO4NAZtePuPgZKYxoM8="; + hash = "sha256-4Z8cNu6tK5/yAu6b9Vb/EdXQj+fQgeT0QIszTEUurVM="; }; - setupPyBuildFlags = [ - "--rj-include-dir=${lib.getDev rapidjson'}/include" + patches = [ + (substituteAll { + src = ./rapidjson-include-dir.patch; + rapidjson = lib.getDev rapidjson'; + }) + ]; + + nativeBuildInputs = [ + setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/python-rapidjson/rapidjson-include-dir.patch b/pkgs/development/python-modules/python-rapidjson/rapidjson-include-dir.patch new file mode 100644 index 0000000000000..da15fec61ac6c --- /dev/null +++ b/pkgs/development/python-modules/python-rapidjson/rapidjson-include-dir.patch @@ -0,0 +1,25 @@ +diff --git a/setup.py b/setup.py +index e86b1b2..9d34d0d 100644 +--- a/setup.py ++++ b/setup.py +@@ -29,19 +29,7 @@ if sys.version_info < (3, 6): + + ROOT_PATH = os.path.abspath(os.path.dirname(__file__)) + +-rj_include_dir = './rapidjson/include' +- +-for idx, arg in enumerate(sys.argv[:]): +- if arg.startswith('--rj-include-dir='): +- sys.argv.pop(idx) +- rj_include_dir = arg.split('=', 1)[1] +- break +-else: +- if not os.path.isdir(os.path.join(ROOT_PATH, 'rapidjson', 'include')): +- raise RuntimeError("RapidJSON sources not found: if you cloned the git" +- " repository, you should initialize the rapidjson submodule" +- " as explained in the README.rst; in all other cases you may" +- " want to report the issue.") ++rj_include_dir = '@rapidjson@/include' + + with open('version.txt', encoding='utf-8') as f: + VERSION = f.read() diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 1346e9b35b7a2..ec103fc421a4d 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.39.1"; + version = "0.40.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-iFLzrjbCwBuV9RQSHoP5LOG0PIPjiTMCpvk3wqGtMgk="; + hash = "sha256-H4xwgulNLs3R1Q5GhvQffpAZ1CWXZUJAja8BskW+YJk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index e34bad425b3cc..8c0239e2bc506 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-swiftclient"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-p32Xqw5AEsZ4cy5XW9/u0oKzSJuRdegsRqR6yEke7oQ="; + hash = "sha256-8qCIflo5KXq8BDJRrj+QiRTOFEei+NLcpWcWGGCBQr0="; }; # remove duplicate script that will be created by setuptools from the diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 60247f15d95bd..acfd14d7d5ef3 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-tado"; - version = "0.17.4"; + version = "0.17.5"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; rev = "refs/tags/${version}"; - hash = "sha256-Wdd9HdsQjaYlL8knhMuO87+dom+aTsmrLRK0UdrpsbQ="; + hash = "sha256-FjdqZc4Zt2sLYJpnD/MAzr8Y9lGHteHB5psQqheS84I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 30803442d0815..6e2e3fe795108 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-utils"; - version = "3.8.1"; + version = "3.8.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "WoLpH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HoKdMDs67lsuVRb5d51wx6qyEjEM973yD6O6qMO+7MI="; + hash = "sha256-2scWyj0Fz39Thu0T0+UirT+he6tPYKGsvmYzzpD+/ls="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index 94b1dbba5628f..24eefdce0fe6f 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "python-vipaccess"; - version = "0.14.1"; + version = "0.14.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vBFCRXwZ91C48GuOet2Obbo7gM02M2c9+7rhp0l6w54="; + hash = "sha256-TFSX8iL6ChaL3Fj+0VCHzafF/314Y/i0aTI809Qk5hU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytm/default.nix b/pkgs/development/python-modules/pytm/default.nix index be8f5089466ed..5f5722159a1cb 100644 --- a/pkgs/development/python-modules/pytm/default.nix +++ b/pkgs/development/python-modules/pytm/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "pytm"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "izar"; repo = pname; - rev = "v${version}"; - sha256 = "1bx4s9a5kdyr2xvpw0smmh7zi9w38891yfqzdj1bmnsjl57x6qrg"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-R/MDz6lCvUxtn6IJ8STHlWzkSjnUJziO+oPnaYhrr7U="; }; propagatedBuildInputs = [ pydal graphviz pandoc plantuml ]; diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index fdced71d178a3..f7a50ce337fcd 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.1.3"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-3ELx4ukYlmsWvzK+GxEXM/0xFPPcZZcMv566jOXfcMs="; + hash = "sha256-H2gbVCvGKbeHZVlvz6SmKI8Gzw649DxcwYgfGcehsmg="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index 6bd4c17f50ea3..3af3cb33e96d7 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytraccar"; - version = "2.0.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = "pytraccar"; rev = "refs/tags/${version}"; - hash = "sha256-7QGgI+DDYbordBx4LbtCvPWyEh6ur2RrSKMuDlwRlTo="; + hash = "sha256-WTRqYw66iD4bbb1aWJfBI67+DtE1FE4oiuUKpfVqypE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytweening/default.nix b/pkgs/development/python-modules/pytweening/default.nix index 32a433cafbf12..1c7535f4405ef 100644 --- a/pkgs/development/python-modules/pytweening/default.nix +++ b/pkgs/development/python-modules/pytweening/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { pname = "pytweening"; - version = "1.0.7"; + version = "1.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-dnE08b9Xt2wc6faS3Rz8d22aJ53mck6NBIVFCP1+3ts="; + hash = "sha256-JDMYt3NmmAZsXzYuxcK2Q07PQpfDyOfKqKv+avTKxxs="; }; pythonImportsCheck = [ "pytweening" ]; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 8d4bcfbb3c6f7..359c7c142d5e1 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -1,16 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, unittestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, unittestCheckHook +}: buildPythonPackage rec { pname = "pytz"; - version = "2023.3.post1"; - - format = "setuptools"; + version = "2024.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-e0/dvrlKHrpLVX2iTxn9+dtXUZJUQnCpEB2FCfn0PXs="; + hash = "sha256-KilzXqnBi68UtEiEa95aSAMO0mdXhHLYlVzQ50Q6mBI="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "pytz/tests" ]; @@ -18,6 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytz" ]; meta = with lib; { + changelog = "https://launchpad.net/pytz/+announcements"; description = "World timezone definitions, modern and historical"; homepage = "https://pythonhosted.org/pytz"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index cc846a024d8e7..79b940d5be1d7 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.23.3"; + version = "4.23.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "briis"; repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-QWIiBuKDhSNYVyEm45QV4a2UxADDrBdiCBeJI+a6v7c="; + hash = "sha256-sBdu4XJkEtHf6dlHgJKFQvONp1x89NiS2EgxMiJFX7A="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 58d538ec98ade..d64213c2c540d 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-zsa4TGDvvPAogOC0ljXC9uwWC9mteldUYprLmwrXNMQ="; + hash = "sha256-UFAKLrZ1ZrTmFXwVuyTCPVo3Y1YIDOvkx5krpsz71BM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 59fb541503e02..263971e93321a 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyvlx"; - version = "0.2.22"; + version = "0.2.23"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Julius2342"; repo = "pyvlx"; rev = "refs/tags/${version}"; - hash = "sha256-Ne/mEgvD2ANb5ER0y3eSW4TsPmrqDX1Pvki+0cb+t7w="; + hash = "sha256-J+oJQHsULrJQNdZqYsl2hufNubMwV1KtG10jZH0jbU4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index c2058a374a31d..6ebabd1b73405 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyvo"; - version = "1.5"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-heTWWyxmRaDlI9NHzZab5OLOBIbVdb45v67Rq5ckzc8="; + hash = "sha256-ByCBD+e3ZrpT0Q6dnkuyO8lnwVGm85LiKmy/4NRTpjI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index 778148178cfb7..a4d8117fc3720 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -9,12 +9,13 @@ }: buildPythonPackage rec { - pname = "PyWavelets"; + pname = "pywavelets"; version = "1.4.1"; disabled = isPy27; src = fetchPypi { - inherit pname version; + pname = "PyWavelets"; + inherit version; hash = "sha256-ZDevPd8IMRjCbY+Xq0OwckuVbJ+Vjp6niGWfaig0upM="; }; diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index 3bbbbedf1d22b..2c1cbc8d5164c 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2024.1.58"; + version = "2024.2.59"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-6JyU9mr0xfRLB7AJOcnPc+PpF0EWi/R/Wy3lCKanAmA="; + hash = "sha256-227vnOJmYcrbYd8MjTG8c82sf3awNOF/bxAby0JlSfA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 27b453c497dc0..149e6b671e1d5 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.7.3"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VU2/kK7zpiuHbPtt1Qh8pdgen4KoIIKsyC479LATO84="; + hash = "sha256-Q+Iyjru4viAxJLDQdbNtsYctnXj8N4glItt44D9HPd8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index e534704a7c4ab..59e03f836899c 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -13,14 +13,15 @@ }: buildPythonPackage rec { - pname = "QtPy"; + pname = "qtpy"; version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "QtPy"; + inherit version; hash = "sha256-2y1QgWeqYQZ4FWXI2lxvFIfeusujNRnO3DX6iZfUJNQ="; }; diff --git a/pkgs/development/python-modules/quaternion/default.nix b/pkgs/development/python-modules/quaternion/default.nix index 3b3e6a1ea790c..6307334edfdf8 100644 --- a/pkgs/development/python-modules/quaternion/default.nix +++ b/pkgs/development/python-modules/quaternion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "quaternion"; - version = "2023.0.2"; + version = "2023.0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "moble"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-G5Xbo6Ns98oqtY/AKz9CE7nt8j2b6+Hv14ZoKtlDCMQ="; + hash = "sha256-vSkFHYXcT14aW3OTfqYymVQbpWnKFEVkhh3IQTi5xS4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 3dcffdd2ecc53..60900c8ce1780 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.6.1"; + version = "3.6.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,12 +27,12 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-QJVRT+d/IIGxkWfSNoXFSmbW017+8CTKuWD4W+TzvBs="; + hash = "sha256-rezyw0v1VijMe78ip3U+Jd+NQExW+gQXjs8qkcPNcUk="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "Cython==3.0.3" "Cython" + --replace-fail "Cython >=3.0.9, <3.1.0" "Cython" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 0e216ce185087..324c658494334 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -106,7 +106,10 @@ buildPythonPackage rec { "-m 'not network'" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # flaky + "test_outer_boundless_pixel_fidelity" + ] ++ lib.optionals stdenv.isDarwin [ "test_reproject_error_propagation" ]; diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index f07b28bec4f40..cc235710a6891 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ratarmount"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-P+p0h+KuOsunPsXbRwxzAhr1XcEqMjQxHeHmA29+pDQ="; + hash = "sha256-TrOYf9kbcRM8E9vq6sjswK2BQ0eA5zSGAIiNAfIZtnk="; }; propagatedBuildInputs = [ ratarmountcore fusepy ]; diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 8a29bc837cfaf..2d5af44a068d5 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -42,7 +42,7 @@ let in buildPythonPackage rec { pname = "rdkit"; - version = "2023.09.4"; + version = "2023.09.5"; pyproject = false; src = @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - hash = "sha256-yPpt7F3w17tZEe+HECODZ7p27QidNt1sd5f/T2V87NE="; + hash = "sha256-ZYNAHNBHQPx8rBJSvEWFEpdSpYyXcoqJ+nBA7tpHwQs="; }; unpackPhase = '' diff --git a/pkgs/development/python-modules/readabilipy/default.nix b/pkgs/development/python-modules/readabilipy/default.nix new file mode 100644 index 0000000000000..0bf33623cb869 --- /dev/null +++ b/pkgs/development/python-modules/readabilipy/default.nix @@ -0,0 +1,66 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, html5lib +, lxml +, pytestCheckHook +, pythonOlder +, regex +, setuptools +}: + +buildPythonPackage rec { + pname = "readabilipy"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "alan-turing-institute"; + repo = "ReadabiliPy"; + rev = "refs/tags/v${version}"; + hash = "sha256-XrmdQjLFYdadWeO5DoKAQeEdta+6T6BqfvGlDkzLMyM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + html5lib + lxml + regex + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "readabilipy" + ]; + + disabledTests = [ + # AssertionError + "test_extract_simple_article_with_readability_js" + "test_extract_article_from_page_with_readability_js" + "test_plain_element_with_comments" + "test_content_digest_on_filled_and_empty_elements" + ]; + + disabledTestPaths = [ + # Exclude benchmarks + "tests/test_benchmarking.py" + ]; + + meta = with lib; { + description = "HTML content extractor"; + homepage = "https://github.com/alan-turing-institute/ReadabiliPy"; + changelog = "https://github.com/alan-turing-institute/ReadabiliPy/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index 30d0efc834323..70a852bfb1a01 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.54.0"; + version = "14.55.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-Q7ubT7SBHNxyvfqFhDmBjnW7ssoXBsMZR+eYg5CntHY="; + hash = "sha256-HjR4Lwlcrpeqv6BXI+aYCL9e7ZTaTa522z0lSW03wW0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index d76c06fe5d343..9c8cd8053f5f7 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2024.01.0"; + version = "2024.03.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "regenmaschine"; rev = "refs/tags/${version}"; - hash = "sha256-Vd8ACF2AXbT7FE/b0koIPUrNd9DgmjgS5unBuRiq784="; + hash = "sha256-RdmK6oK92j4xqLoAjjqlONYu3IfNNWudo4v7jcc+VGU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix index 6581fc6189bea..e7ed4b1c356df 100644 --- a/pkgs/development/python-modules/remotezip/default.nix +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -1,36 +1,35 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , requests , tabulate , pytestCheckHook , requests-mock }: -buildPythonPackage { +buildPythonPackage rec { pname = "remotezip"; - version = "0.12.2"; - format = "setuptools"; + version = "0.12.3"; + pyproject = true; src = fetchFromGitHub { owner = "gtsystem"; repo = "python-remotezip"; - # upstream does not tag releases, determined with git blame - # pypi archive lacks files for tests - rev = "3723724d6d877d3166d52f4528ffa7bd5bf6627f"; - hash = "sha256-iYxHW8RdLFrpjkcEvpfF/NWBnw7Dd5cx2ghpof2XFn4="; + rev = "refs/tags/v${version}"; + hash = "sha256-TNEM7Dm4iH4Z/P/PAqjJppbn1CKmyi9Xpq/sU9O8uxg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests - tabulate ]; nativeCheckInputs = [ pytestCheckHook - ]; - - checkInputs = [ requests-mock ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 08b6cd42da1c8..b1fb08c4bdf33 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -5,13 +5,14 @@ , fetchFromGitHub , orjson , pythonOlder +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "reolink-aio"; - version = "0.8.8"; - format = "setuptools"; + version = "0.8.9"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-W6F8Wr7iUMpyEFGLk07argmk+Wimagq5cOWU9yy9qU0="; + hash = "sha256-MUhB8A51dj+FA3+lvBrFyAWizKq5CpYwo38E1euJsHs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aiortsp diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index af73624d1ae6a..ef0a575789e75 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, chardet , fetchPypi , freetype , pillow @@ -13,15 +14,15 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "4.0.7"; - format = "pyproject"; + version = "4.1.0"; + pyproject = true; # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit disabled = isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-lnx38A79kYzCMc+LbY9OR33Jc7XBZVfjvRjfrrWnAjQ="; + hash = "sha256-Opn69BJpEVnAaLP/AcFTB84v0s9rhgGZQ0h04AIECoQ="; }; postPatch = '' @@ -44,6 +45,7 @@ in buildPythonPackage rec { ]; propagatedBuildInputs = [ + chardet pillow ]; @@ -61,7 +63,7 @@ in buildPythonPackage rec { meta = with lib; { description = "An Open Source Python library for generating PDFs and graphics"; - homepage = "http://www.reportlab.com/"; + homepage = "https://www.reportlab.com/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 1f35854766f04..9da827f9253b1 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.9"; + version = "0.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-CjTedIl7ZkSFfKKhHmCadTd7zdz3gP7Q4uCscv5An38="; + hash = "sha256-7jFS3GCaPeGBBxB++XTtIYh+m0uXTm5NHuLeIen0KYc="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index 63f9984c5fa35..f3a37488a2255 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -9,11 +9,12 @@ , python , pythonOlder , pythonRelaxDepsHook +, xmlschema }: buildPythonPackage rec { pname = "reqif"; - version = "0.0.35"; + version = "0.0.40"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "strictdoc-project"; repo = "reqif"; rev = "refs/tags/${version}"; - hash = "sha256-3yOLOflPqzJRv3qCQXFK3rIFftBq8FkYy7XhOfWH82Y="; + hash = "sha256-VQvwynFv/DN5RHT00rxtDcJ9wsEpKdsh3rdyUakBr2Q="; }; postPatch = '' @@ -40,6 +41,7 @@ buildPythonPackage rec { beautifulsoup4 lxml jinja2 + xmlschema ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix index 5cc57d86a57f5..af5304341b287 100644 --- a/pkgs/development/python-modules/requests-ratelimiter/default.nix +++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "requests-ratelimiter"; - version = "0.4.2"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "JWCook"; repo = "requests-ratelimiter"; - rev = "v${version}"; - hash = "sha256-w4cBQRpk9UTuGA0lPDsqpQ3UEIQdYe38NYXz+V4+Lvc="; + rev = "refs/tags/v${version}"; + hash = "sha256-ctCD+vlV90KCO7DdPUZJipBC/lz6NXx0gYuHHrs22IY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index 7c6c13be63a2b..6ab9c8a758a05 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -54,8 +54,8 @@ buildPythonPackage { torch ]; - inherit (rerun) addBuildInputRunpathsPhase; - postPhases = lib.optionals stdenv.isLinux [ "addBuildInputRunpathsPhase" ]; + inherit (rerun) addDlopenRunpaths addDlopenRunpathsPhase; + postPhases = lib.optionals stdenv.isLinux [ "addDlopenRunpathsPhase" ]; disabledTestPaths = [ # "fixture 'benchmark' not found" diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index 0fc371a76d2d8..5ce129dd67160 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "resend"; - version = "0.7.2"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; rev = "refs/tags/v${version}"; - hash = "sha256-3wX2xNz/6Erv97TlQCuF0Sha0fbJJX1LK9dx8xYG4M0="; + hash = "sha256-6cQtI3it2AS8UdT83fp3y3IcbjSyPmBlQuymN74fBNo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 169e28773b42b..64dbb30168290 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "7.0"; + version = "7.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-U3BK+7w1D9yPskVEE2e+Zxyfg4CGkgGy6EUudPzj2xQ="; + hash = "sha256-h1rrUcE51440zvhgXcZTCbRJFoBg3QhVGh/p7bR8uaU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 570ad4690a276..202494659d5bc 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.7.3"; + version = "1.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ewels"; repo = "rich-click"; rev = "refs/tags/v${version}"; - hash = "sha256-ZTUJbW39SBaqgVG+ytmnPG6DK7J2XGPwmC2w3TCodBo="; + hash = "sha256-eqpxNurMHn4ClD0KjTQ7Yfny61tcYBRKlW74axjLI8A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 0b65e8c1c4876..6e847e4836365 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.6.4"; + version = "0.6.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-eps+lCCGnFDfhemkRskSuK+BYh5iyhr4+UksYzW35ZQ="; + hash = "sha256-UuxI1bA6H8s2D9xWVwCecXEHkCV0rhkxuoooaer/a8A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index e9641817a1eb7..0df16e875cf18 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.7.1"; + version = "0.7.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-o4+wHkkH0jUzq6Co0bru7NwvVxiV6xrggfHlQsjsWso="; + hash = "sha256-QcYjqqeXBKx+Ef00Bw1OJMWDMdQgp/fqh3r5yhsa0Kg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 613b47a8e6018..afcdf0ed3599d 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -10,12 +10,13 @@ }: buildPythonPackage rec { - pname = "RoboMachine"; + pname = "robomachine"; version = "0.10.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "RoboMachine"; + inherit version; hash = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k="; }; diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index f9f6bc5cf0011..0a204c11be28a 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.19.1"; + version = "0.19.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-lBsfSiG1xSf+blNjQTLtTaG04ezE9eNVjqSAHVy57oY="; + hash = "sha256-L6uedckc2lEQ6CUlQGEyDhnuVsxRRgDQJUEsZTfm2sU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 02fdef0c54b06..d40bb33fddc1e 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -5,41 +5,40 @@ , orjson , paho-mqtt , poetry-core +, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "roombapy"; - version = "1.6.10"; - format = "pyproject"; + version = "1.7.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pschmitt"; repo = "roombapy"; rev = "refs/tags/${version}"; - hash = "sha256-aGNSySSKCx/8GYUdDWMSAhMBex738UACqnqj/Qx1m38="; + hash = "sha256-vB6+cGqeHFthCbz4q75EwsHb8w1H2vPSaKdtvquh5Kc="; }; - postPatch = '' - # hbmqtt was replaced by amqtt - substituteInPlace tests/test_roomba_integration.py \ - --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker" - - substituteInPlace pyproject.toml \ - --replace 'orjson = ">=3.8.7"' 'orjson = "*"' - ''; - nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "orjson" ]; propagatedBuildInputs = [ orjson paho-mqtt + pydantic ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index c014314685b99..ad5cad2dd8cb3 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "rope"; - version = "1.9.0"; - format = "pyproject"; + version = "1.12.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-rope"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j65C3x3anhH23D4kic5j++r/Ft0RqgZ/jFrNrNHVcXA="; + hash = "sha256-j/9q2S2B3DzmEqMOBLG9iHwnLqZipcPxLaKppysJffA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rova/default.nix b/pkgs/development/python-modules/rova/default.nix index 5f419615dd539..32c0c97b3494e 100644 --- a/pkgs/development/python-modules/rova/default.nix +++ b/pkgs/development/python-modules/rova/default.nix @@ -4,22 +4,27 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "rova"; - version = "0.3.0"; - format = "setuptools"; + version = "0.4.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "GidoHakvoort"; - repo = pname; - rev = "v${version}"; - hash = "sha256-TLL9Ta+7Xd55hGTTXjc6CBMj+tW1LpFrprpsnGqZvkQ="; + repo = "rova"; + rev = "refs/tags/v${version}"; + hash = "sha256-y73Vf/E2xDy+2vnvZEllRUgsDfX33Q7AsL/UY2pR1sI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; @@ -34,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to access for ROVA calendars"; homepage = "https://github.com/GidoHakvoort/rova"; + changelog = "https://github.com/GidoHakvoort/rova/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index b957fb1170417..0270832326502 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,14 +24,14 @@ }: buildPythonPackage rec { - version = "3.5.14"; + version = "3.5.15"; format = "setuptools"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - hash = "sha256-X0auMdNuEXvjZq1K4CSTwBWsa6WevjtM1yAAdTMvxIE="; + hash = "sha256-RE+uSoTcfyM7cOqrCqgTmO4BR8ThrjjdRSTXedbyWys="; }; patches = [ diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 184f27c292ea4..2cc6bb9d79505 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.12.2"; + version = "2024.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tewHBiSBu7RcsGGzGYTHGI0QbiksJwMwOeAk5LpXQNw="; + hash = "sha256-+AZPUirQiLVrBDBHyCVzSEfAJp3xnyYTyVbUwg3hW2I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 0400ab4b8cd87..124b44f097cc5 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -1,29 +1,38 @@ { lib +, stdenv , botocore , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder -, stdenv +, setuptools }: buildPythonPackage rec { pname = "s3transfer"; - version = "0.8.2"; - format = "setuptools"; + version = "0.10.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "boto"; - repo = pname; - rev = version; - hash = "sha256-sdoPjkZHN5wVCK9V6V+fkGvQvEQo2ABy2lqefEKfg6o="; + repo = "s3transfer"; + rev = "refs/tags/${version}"; + hash = "sha256-21xycx1+84uY4gFr7N+ra98dpsEwxy9zeSl4QA66nUc="; }; - propagatedBuildInputs = [ botocore ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + botocore + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ # Requires network access @@ -32,12 +41,18 @@ buildPythonPackage rec { # There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS # See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603. # I suspect the underlying issue here is that upstream tests aren't compatible with spawn multiprocessing, and pass on linux where the default is still fork - lib.optionals stdenv.isDarwin [ "tests/unit/test_compat.py" ]; + lib.optionals stdenv.isDarwin [ + "tests/unit/test_compat.py" + ]; - pythonImportsCheck = [ "s3transfer" ]; + pythonImportsCheck = [ + "s3transfer" + ]; passthru.optional-dependencies = { - crt = [ botocore.optional-dependencies.crt ]; + crt = [ + botocore.optional-dependencies.crt + ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/safety-schemas/default.nix b/pkgs/development/python-modules/safety-schemas/default.nix new file mode 100644 index 0000000000000..0f9724e95f65e --- /dev/null +++ b/pkgs/development/python-modules/safety-schemas/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hatchling +, pythonRelaxDepsHook +, dparse +, packaging +, pydantic +, ruamel-yaml +, typing-extensions +}: + +buildPythonPackage rec { + pname = "safety-schemas"; + version = "0.0.2"; + pyproject = true; + + src = fetchPypi { + pname = "safety_schemas"; + inherit version; + hash = "sha256-fRsEDsBkgPBc/2tF6nqT4JyJQt+GT7DQHd62fDI8+ow="; + }; + + nativeBuildInputs = [ + hatchling + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "dparse" + ]; + + propagatedBuildInputs = [ + dparse + packaging + pydantic + ruamel-yaml + typing-extensions + ]; + + pythonImportsCheck = [ "safety_schemas" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Schemas for Safety CLI"; + homepage = "https://pypi.org/project/safety-schemas/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index bb367629b5a34..dee37f85eeb4e 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -5,33 +5,46 @@ , pythonRelaxDepsHook , setuptools , click +, urllib3 , requests , packaging , dparse , ruamel-yaml +, jinja2 +, marshmallow +, authlib +, jwt +, rich +, typer +, pydantic +, safety-schemas +, typing-extensions , pytestCheckHook }: buildPythonPackage rec { pname = "safety"; - version = "2.3.5"; + version = "3.0.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pgwR+JUvQSy7Fl1wyx9nOjtDorqak84R+X5qTeg0qjo="; + hash = "sha256-HyAA8DZS86C/xn+P0emLxXI8y3bhXLG91oVFw9gD3wE="; }; postPatch = '' substituteInPlace safety/safety.py \ - --replace "telemetry=True" "telemetry=False" + --replace-fail "telemetry=True" "telemetry=False" substituteInPlace safety/util.py \ - --replace "telemetry=True" "telemetry=False" + --replace-fail "telemetry = True" "telemetry = False" substituteInPlace safety/cli.py \ - --replace "telemetry', default=True" "telemetry', default=False" + --replace-fail "disable-optional-telemetry', default=False" \ + "disable-optional-telemetry', default=True" + substituteInPlace safety/scan/finder/handlers.py \ + --replace-fail "telemetry=True" "telemetry=False" ''; nativeBuildInputs = [ @@ -41,15 +54,28 @@ buildPythonPackage rec { pythonRelaxDeps = [ "packaging" + "dparse" + "authlib" + "pydantic" ]; propagatedBuildInputs = [ setuptools click + urllib3 requests packaging dparse ruamel-yaml + jinja2 + marshmallow + authlib + jwt + rich + typer + pydantic + safety-schemas + typing-extensions ]; nativeCheckInputs = [ @@ -61,9 +87,8 @@ buildPythonPackage rec { "test_announcements_if_is_not_tty" "test_check_live" "test_check_live_cached" - "test_check_vulnerabilities" - "test_license" - "test_chained_review" + "test_get_packages_licenses_without_api_key" + "test_validate_with_policy_file_using_invalid_keyword" ]; preCheck = '' diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index e1423c9270e76..1d85fb9bed9f6 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.208.0"; + version = "2.212.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-9YcYRwwa5P31jZpDrsewBY+r2kjRmoGM8CkXqAMilvE="; + hash = "sha256-JZX/k8AJSQrCrPAsDfEc78mAouBWFQlmRG0ZA1yBGJY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 8ebdeef2c86f7..e29ad8eb3c4ff 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "23.6.0"; + version = "23.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = "sanic-testing"; rev = "refs/tags/v${version}"; - hash = "sha256-WDiEuve9P9fLHxpK0UjxhbZUmWXtP+DV7e6OT19TASs="; + hash = "sha256-pFsGB0QDeO/iliHOitHqBIQtDlwRgFg8nhgMLsopoec="; }; outputs = [ diff --git a/pkgs/development/python-modules/sanic-testing/tests.nix b/pkgs/development/python-modules/sanic-testing/tests.nix index 7c2b94d9590c8..167a74217463b 100644 --- a/pkgs/development/python-modules/sanic-testing/tests.nix +++ b/pkgs/development/python-modules/sanic-testing/tests.nix @@ -1,7 +1,8 @@ { buildPythonPackage -, sanic-testing , pytest-asyncio , pytestCheckHook +, sanic-testing +, setuptools }: buildPythonPackage { @@ -18,6 +19,7 @@ buildPythonPackage { pytest-asyncio pytestCheckHook sanic-testing + setuptools ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 752802df209cd..fb1d5aba58db2 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, pythonAtLeast # build-system , setuptools @@ -145,6 +146,9 @@ buildPythonPackage rec { "test_websocket_route_with_subprotocols" # Socket closes early "test_no_exceptions_when_cancel_pending_request" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: 'has_calls' is not a valid assertion. Use a spec for the mock if 'has_calls' is meant to be an attribute. + "test_ws_frame_put_message_into_queue" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 86a1ba65598df..7e20d1c39779e 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.5.20240102191336.dev7+g8e95468"; + version = "8.5.20240311110950"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "common-workflow-language"; repo = "schema_salad"; - rev = "8e954684b08d222d54b7eff680eaa4d4e65920a9"; - hash = "sha256-VoFFKe6XHDytj5UlmsN14RevKcgpl+DSDMGDVS2Ols4="; + rev = "refs/tags/${version}"; + hash = "sha256-bjeVgV9ovIVvGvSay24vKkzSXBbzgV05BkO5DojTX3o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index fd4e5100c2872..1d448c0b45dec 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.38"; + version = "0.4.40"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/+1eENbpng/X1g108cEGiTZlIkdcqqnm9wyN9ECH5D4="; + hash = "sha256-6PUAam7eDWQOMS3SVIVJXvqQLBE187yUbkiyFZ+ojcU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix index 9ae9c01b39e02..8051215440802 100644 --- a/pkgs/development/python-modules/sdds/default.nix +++ b/pkgs/development/python-modules/sdds/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sdds"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pylhc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8tnJAptTUsC0atxM9Dpn90drcprdWrs8fYoX8RDkLyQ="; + hash = "sha256-4phANoYohuCaLbzO4TgRkSS+UHE8CnzonpEd46xzD0M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sdkmanager/default.nix b/pkgs/development/python-modules/sdkmanager/default.nix index 0a2092c3d24ca..7063adf94e18b 100644 --- a/pkgs/development/python-modules/sdkmanager/default.nix +++ b/pkgs/development/python-modules/sdkmanager/default.nix @@ -2,14 +2,16 @@ , buildPythonPackage , fetchFromGitLab , pythonOlder +, pythonAtLeast , argcomplete , requests +, looseversion , gnupg }: buildPythonPackage rec { pname = "sdkmanager"; - version = "0.6.5"; + version = "0.6.6"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,12 +20,15 @@ buildPythonPackage rec { owner = "fdroid"; repo = pname; rev = version; - hash = "sha256-EQ24OjQZr42C1PFtIXr4yFzYb/M4Tatqu8Zo+9dgtEE="; + hash = "sha256-Vuht2gH9ivNG7PgG+XKtkdKoszkkoI91reQKg6D50xs="; }; propagatedBuildInputs = [ argcomplete requests + ] ++ requests.optional-dependencies.socks + ++ lib.optionals (pythonAtLeast "3.12") [ + looseversion ]; postInstall = '' diff --git a/pkgs/development/python-modules/sectools/default.nix b/pkgs/development/python-modules/sectools/default.nix index 2fdc27283f08c..f65c80aabdc13 100644 --- a/pkgs/development/python-modules/sectools/default.nix +++ b/pkgs/development/python-modules/sectools/default.nix @@ -3,22 +3,27 @@ , fetchFromGitHub , ldap3 , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "sectools"; - version = "1.3.9"; - format = "setuptools"; + version = "1.4.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "p0dalirius"; - repo = pname; + repo = "sectools"; rev = "refs/tags/${version}"; - hash = "sha256-F9mmPSlfSSS7UDNuX9OPrqDsEpqq0bD3eROG8D9CC78="; + hash = "sha256-k3k1/DFmv0resnsNht/C+2Xh6qbSQmk83eN/3vtDU00="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ldap3 ]; diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix index 4104fa2dc499a..b4c8c90989eca 100644 --- a/pkgs/development/python-modules/securetar/default.nix +++ b/pkgs/development/python-modules/securetar/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "securetar"; - version = "2024.2.0"; + version = "2024.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pvizeli"; repo = "securetar"; rev = "refs/tags/${version}"; - hash = "sha256-rYRbrpXo2oVW8SpddNsKb0FBdscovNUaGXLHy7WBiVU="; + hash = "sha256-D50ceRlK+v5Uo3qBBpVtKwI8zKU/qh1Njn3qeKM4LiY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 4d29391e80996..f15096a8e430f 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.40.4"; + version = "1.41.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-WyjyV1oBaRPDyawPckkgoA6JB974CNJG1h5YmmA10uo="; + hash = "sha256-eoHoUW3cXxdGeWpo/0kBIfVkLECrnKA2wtobe3GeU2Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix index 53fa54a5aff09..9f708245cd443 100644 --- a/pkgs/development/python-modules/service-identity/default.nix +++ b/pkgs/development/python-modules/service-identity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "service-identity"; - version = "23.1.0"; + version = "24.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pyca"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PGDtsDgRwh7GuuM4OuExiy8L4i3Foo+OD0wMrndPkvo="; + hash = "sha256-ibi9hls/VnVePv4fF2CyxI22P1RX6QpCwyeENWVPkx4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 7f87ddf6befab..3db9ce9e2af6b 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,27 +1,28 @@ { lib , stdenv , buildPythonPackage -, pythonOlder , fetchPypi +, pytestCheckHook +, pythonOlder + , cython , geos +, numpy , oldest-supported-numpy , setuptools , wheel -, numpy -, pytestCheckHook }: buildPythonPackage rec { pname = "shapely"; - version = "2.0.2"; - format = "pyproject"; + version = "2.0.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FxPMBMFxuv/Fslm6hTHFiswqMBcHt/Ah2IoV7QkGSec="; + hash = "sha256-TWXQqnkQr3Hvpy/WRH4CqOXdRNqBqYPenXNtbmzL5nQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index 05c9784b367f1..7190c1e2c0ae7 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -72,6 +72,7 @@ buildPythonPackage rec { changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + # https://github.com/shazamio/ShazamIO/issues/80 broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix index 2060210a3bd84..37f2ae860c0ec 100644 --- a/pkgs/development/python-modules/simpful/default.nix +++ b/pkgs/development/python-modules/simpful/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "simpful"; - version = "2.11.1"; + version = "2.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aresio"; repo = "simpful"; rev = "refs/tags/${version}"; - hash = "sha256-54WkKnPB3xA2CaOpmasqxgDoga3uAqoC1nOivytXmGY="; + hash = "sha256-NtTw7sF1WfVebUk1wHrM8FHAe3/FXDcMApPkDbw0WXo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix index 0e1db82e8af0f..879dc6cd125a7 100644 --- a/pkgs/development/python-modules/sip/4.x.nix +++ b/pkgs/development/python-modules/sip/4.x.nix @@ -5,7 +5,8 @@ buildPythonPackage rec { version = "4.19.25"; format = "other"; - disabled = isPyPy; + # relies on distutils + disabled = isPyPy || pythonAtLeast "3.12"; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 32c28211cd065..30dd904f13962 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,10 +1,8 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , pythonOlder , setuptools -, wheel , packaging , ply , toml @@ -18,21 +16,22 @@ buildPythonPackage rec { pname = "sip"; - version = "6.8.1"; - - format = "pyproject"; + version = "6.8.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MALfQV4WisP/45OULbxxMcuCreUAAOFSb0aoit4m9Zg="; + hash = "sha256-iIVHsBi7JMNq3tUZ6T0+UT1MaqC6VbfMGv+9Rc8Qdiw="; }; nativeBuildInputs = [ setuptools - wheel ]; - propagatedBuildInputs = [ packaging ply toml ] ++ lib.optionals (pythonOlder "3.11") [ + propagatedBuildInputs = [ + packaging + setuptools + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index af3dca512c62b..2782b5eea5db7 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.27.0"; + version = "3.27.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-MA3pn6NQxzXYu/BBpOgfZWnS51dl7oXrAi43jenHhxI="; + hash = "sha256-fBHu4e6pSt8yzXbLWr5cwjRFDfvdH2jzpSNzdMBg4N0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 3a66c42111b91..9769f22727a36 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.27.0"; + version = "3.27.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-MA3pn6NQxzXYu/BBpOgfZWnS51dl7oXrAi43jenHhxI="; + hash = "sha256-fBHu4e6pSt8yzXbLWr5cwjRFDfvdH2jzpSNzdMBg4N0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index f613645b390af..bccc5b97f7283 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -11,12 +11,14 @@ , solc , web3 , withSolc ? false +, testers +, slither-analyzer }: buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.10.0"; - format = "setuptools"; + version = "0.10.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,18 +26,18 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-lyjHubnYIwGiA6uAt9erKlTr2sCRGHQy/ZkNByFrFgM="; + hash = "sha256-MjO2ZYFat+byH0DEt2v/wPXaYL2lmlESgQCZXD4Jpt0="; }; nativeBuildInputs = [ makeWrapper + setuptools ]; propagatedBuildInputs = [ crytic-compile packaging prettytable - setuptools web3 ]; @@ -44,9 +46,38 @@ buildPythonPackage rec { --prefix PATH : "${lib.makeBinPath [ solc ]}" ''; + # required for pythonImportsCheck + postInstall = '' + export HOME="$TEMP" + ''; + + pythonImportsCheck = [ + "slither" + "slither.all_exceptions" + "slither.analyses" + "slither.core" + "slither.detectors" + "slither.exceptions" + "slither.formatters" + "slither.printers" + "slither.slither" + "slither.slithir" + "slither.solc_parsing" + "slither.utils" + "slither.visitors" + "slither.vyper_parsing" + ]; + # No Python tests doCheck = false; + passthru.tests = { + version = testers.testVersion { + package = slither-analyzer; + command = "HOME=$TMPDIR slither --version"; + }; + }; + meta = with lib; { description = "Static Analyzer for Solidity"; longDescription = '' @@ -57,6 +88,7 @@ buildPythonPackage rec { homepage = "https://github.com/trailofbits/slither"; changelog = "https://github.com/crytic/slither/releases/tag/${version}"; license = licenses.agpl3Plus; + mainProgram = "slither"; maintainers = with maintainers; [ arturcygan fab hellwolf ]; }; } diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 17620e452b2f1..82fba525c0372 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.8.4"; + version = "1.8.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QG8fS6t+dXPdVZpEECfT3jPRe7o1S88g3caq+6JyKGs="; + hash = "sha256-dePwrUhVX39ckijnBmwdQ1izPWQLT753PsNLA7f66aM="; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for XMPP"; homepage = "https://slixmpp.readthedocs.io/"; - changelog = "https://lab.louiz.org/poezio/slixmpp/-/tags/slix-${version}"; + changelog = "https://codeberg.org/poezio/slixmpp/releases/tag/slix-${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index 0e5ef76927e44..d2ca5f2973222 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch2 , isPyPy +, setuptools , docutils , pygments , pytestCheckHook @@ -9,8 +11,9 @@ buildPythonPackage rec { version = "2.0.1"; - format = "setuptools"; pname = "smartypants"; + pyproject = true; + disabled = isPyPy; src = fetchFromGitHub { @@ -20,6 +23,19 @@ buildPythonPackage rec { sha256 = "00p1gnb9pzb3svdq3c5b9b332gsp50wrqqa39gj00m133zadanjp"; }; + patches = [ + (fetchpatch2 { + # https://github.com/leohemsted/smartypants.py/pull/21 + name = "smartypants-3.12-compat.patch"; + url = "https://github.com/leohemsted/smartypants.py/commit/ea46bf36343044a7a61ba3acce4a7f188d986ec5.patch"; + hash = "sha256-9lsiiZKFFKHLy7j3y9ff4gt01szY+2AHpWPAKQgKwZg="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ docutils pygments diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix index 70b538e43fa04..dd58978ced49a 100644 --- a/pkgs/development/python-modules/smmap/default.nix +++ b/pkgs/development/python-modules/smmap/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , setuptools , nosexcover +, pythonOlder }: buildPythonPackage rec { @@ -19,6 +20,8 @@ buildPythonPackage rec { setuptools ]; + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ nosexcover ]; diff --git a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix index 17b0aeed0baec..0a1f92a9d4f80 100644 --- a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix +++ b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-executor-plugin-cluster-generic"; - version = "1.0.7"; + version = "1.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1W/8jf+R1798cu3sWI0LTSyVawtmFfwlAqRHwfmIAzU="; + hash = "sha256-+aGd+E+VQb7MflsiUgFR98AyeetZxbc4gdvU1JWJNcM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index 740fd99013df8..6ac47e4afedeb 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-interface-common"; - version = "1.17.0"; + version = "1.17.1"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1dvanwYCQE5usgXPhYCZfUpj4MyaLImQ5RskQvS6nJs="; + hash = "sha256-23PGKSBX7KMt0Q7sWiLIPfCkxr2HtBas7flYeNHABWM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix index 31325c2178641..b39139f848ca5 100644 --- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "snakemake-interface-storage-plugins"; - version = "3.1.0"; + version = "3.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-S3+8u3U2o5FzUVSocR96zGbNL4Hof7yBqqSJIPdh3nQ="; + hash = "sha256-5EWpfKpEATlEsw2VZGrGqS+WddVdtEKSgelBGud8kmI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 9917e4d3f759d..0fa0e03b030b8 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -5,12 +5,13 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "snapcast"; - version = "2.3.3"; - format = "setuptools"; + version = "2.3.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "happyleavesaoc"; repo = "python-snapcast"; rev = "refs/tags/${version}"; - hash = "sha256-IFgSO0PjlFb4XJarx50Xnx6dF4tBKk3sLcoLWVdpnk8="; + hash = "sha256-5TbwenEe3vMJovwKYfkvkXMRex0KgaXpsd4iCEk7uWE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ construct packaging diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 9701824a4df2b..b0fe11d9f9bb2 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, setuptools , async-timeout , attrs , buildPythonPackage @@ -14,17 +15,21 @@ buildPythonPackage rec { pname = "snitun"; version = "0.36.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "NabuCasa"; - repo = pname; + repo = "snitun"; rev = "refs/tags/${version}"; hash = "sha256-ViNsmTq1iLxNujA71b9JZB5AZ79ZbiqdTyDeBGd4gUA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ async-timeout attrs @@ -36,19 +41,30 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # broke after aiohttp 3.8.5 upgrade - "test_client_stop_no_wait" - ] ++ lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 # port binding conflicts "test_snitun_single_runner_timeout" "test_snitun_single_runner_throttling" # ConnectionResetError: [Errno 54] Connection reset by peer "test_peer_listener_timeout" - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # TypeError: Passing coroutines is forbidden, use tasks explicitly. - "test_snitun_runner_updown" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # blocking + "test_flow_client_peer" + "test_close_client_peer" + "test_init_connector" + "test_flow_connector" + "test_close_connector_remote" + "test_init_connector_whitelist" + "test_init_multiplexer_server" + "test_init_multiplexer_client" + "test_init_multiplexer_server_throttling" + "test_init_multiplexer_client_throttling" + "test_multiplexer_ping" + "test_multiplexer_ping_error" + "test_multiplexer_init_channel_full" + "test_multiplexer_close_channel_full" + "test_init_dual_peer_with_multiplexer" ]; pythonImportsCheck = [ "snitun" ]; diff --git a/pkgs/development/python-modules/snorkel/default.nix b/pkgs/development/python-modules/snorkel/default.nix index 6e918c2f9145c..8da4fd87d736c 100644 --- a/pkgs/development/python-modules/snorkel/default.nix +++ b/pkgs/development/python-modules/snorkel/default.nix @@ -20,7 +20,7 @@ }: let pname = "snorkel"; - version = "0.9.9"; + version = "0.10.0"; in buildPythonPackage { inherit pname version; @@ -31,8 +31,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "snorkel-team"; repo = pname; - rev = "v${version}"; - hash = "sha256-IDWYvblS0Q8ubuHzgIc7fU/gwpJ43Dd7VMWycMfAJxc="; + rev = "refs/tags/v${version}"; + hash = "sha256-1DgkMHYToiI3266yCND1bXiui80x8AaBttxM83kJImw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index d9b673ca49cd4..085c21bfb59ba 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.7.0"; + version = "3.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sr+uxkBZMHsIyq2tQCFNSI/vtKI/zXVTrHX16nWKkWk="; + hash = "sha256-3GmC9lOGDt7xYUowR6FrywfiJ3Xm4JCAi79PdinEGR0="; }; # snowflake-connector-python requires arrow 10.0.1, which we don't have in diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index 05c1e8988b386..ecdd7782e4573 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "social-auth-core"; - version = "4.5.2"; + version = "4.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "python-social-auth"; repo = "social-core"; rev = "refs/tags/${version}"; - hash = "sha256-4oUSGTDNJc+qZRYiexRUaz8IOaZRXlwqswfPiEzTuR4="; + hash = "sha256-bnPn9roMjOfF2pa1GfCZTnDK0Sfu+umGS0H0PhppKBc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/solax/default.nix b/pkgs/development/python-modules/solax/default.nix index b66bac955ab19..ffba0140becdb 100644 --- a/pkgs/development/python-modules/solax/default.nix +++ b/pkgs/development/python-modules/solax/default.nix @@ -1,9 +1,9 @@ { lib , aiohttp +, async-timeout , buildPythonPackage , fetchPypi , pytest-asyncio -, pytest-cov , pytest-httpserver , pytestCheckHook , pythonOlder @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "solax"; - version = "0.3.2"; - format = "setuptools"; + version = "3.0.5"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7UDTG8rw9XJd5LPqcAe2XyE7DQa96dBj9YOcgW+/aFc="; + hash = "sha256-PQ7qJCNfXGNF2RK6pHwf0U1DXgv2j2uQ64Nv/qh8f8s="; }; nativeBuildInputs = [ @@ -29,12 +29,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + async-timeout voluptuous ]; nativeCheckInputs = [ pytest-asyncio - pytest-cov pytest-httpserver pytestCheckHook ]; @@ -43,9 +43,16 @@ buildPythonPackage rec { "solax" ]; + disabledTests = [ + # Tests require network access + "test_discovery" + "test_smoke" + ]; + meta = with lib; { description = "Python wrapper for the Solax Inverter API"; homepage = "https://github.com/squishykid/solax"; + changelog = "https://github.com/squishykid/solax/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 406d687bba964..3fb467475fb7a 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -6,16 +6,18 @@ , catalogue , cymem , fetchPypi +, hypothesis , jinja2 , jsonschema , langcodes +, mock , murmurhash , numpy , packaging , pathy , preshed , pydantic -, pytest +, pytestCheckHook , python , pythonOlder , pythonRelaxDepsHook @@ -38,14 +40,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.7.3"; + version = "3.7.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mSZQKPvcbhIknFMwXkYfeaEDY3sOaGbCivDkY2X3UeE="; + hash = "sha256-Ul8s7S5AdhViyMrOk+9qHm6MSD8nvVZLwbFfYI776Fs="; }; pythonRelaxDeps = [ @@ -83,35 +85,44 @@ buildPythonPackage rec { typing-extensions ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "thinc>=8.1.8,<8.2.0" "thinc>=8.1.8" - ''; - nativeCheckInputs = [ - pytest + pytestCheckHook + hypothesis + mock ]; - doCheck = false; + doCheck = true; - checkPhase = '' - ${python.interpreter} -m pytest spacy/tests --vectors --models --slow + # Fixes ModuleNotFoundError when running tests on Cythonized code. See #255262 + preCheck = '' + cd $out ''; + pytestFlagsArray = [ + "-m 'slow'" + ]; + + disabledTests = [ + # touches network + "test_download_compatibility" + "test_validate_compatibility_table" + "test_project_assets" + ]; + pythonImportsCheck = [ "spacy" ]; passthru = { updateScript = writeScript "update-spacy" '' - #!${stdenv.shell} - set -eou pipefail - PATH=${lib.makeBinPath [ nix git nix-update ]} + #!${stdenv.shell} + set -eou pipefail + PATH=${lib.makeBinPath [ nix git nix-update ]} - nix-update python3Packages.spacy + nix-update python3Packages.spacy - # update spacy models as well - echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm + # update spacy models as well + echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm ''; tests.annotation = callPackage ./annotation-test { }; }; diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 87d05612e7125..2ccd62fcdf15c 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -1,26 +1,50 @@ -{ lib, buildPythonPackage, fetchPypi, hkdf, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch2 +, setuptools +, hkdf +, pytestCheckHook +}: buildPythonPackage rec { pname = "spake2"; version = "0.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4"; }; - nativeCheckInputs = [ pytest ]; + patches = [ + # https://github.com/warner/python-spake2/pull/16 + (fetchpatch2 { + name = "python312-compat.patch"; + url = "https://github.com/warner/python-spake2/commit/1b04d33106b105207c97c64b2589c45790720b0b.patch"; + hash = "sha256-OoBz0lN17VyVGg6UfT+Zj9M1faFTNpPIhxrwCgUwMc8="; + }) + ]; - propagatedBuildInputs = [ hkdf ]; + nativeBuildInputs = [ + setuptools + ]; - checkPhase = '' - py.test $out - ''; + propagatedBuildInputs = [ + hkdf + ]; + + pythonImportsCheck = [ "spake2" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/warner/python-spake2/blob/v${version}/NEWS"; description = "SPAKE2 password-authenticated key exchange library"; homepage = "https://github.com/warner/python-spake2"; license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix index ddb1ab53c9c33..2a91b2b0b100d 100644 --- a/pkgs/development/python-modules/speechbrain/default.nix +++ b/pkgs/development/python-modules/speechbrain/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "speechbrain"; - version = "0.5.16"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "speechbrain"; repo = "speechbrain"; rev = "refs/tags/v${version}"; - hash = "sha256-Mve6wr3klXMe7sCiJjPuzUPKGHRyI/LzTe6Ea39zNHw="; + hash = "sha256-s23RHxqr+ZCWPYNchFpyYa01mY+Bum3thgNbJP8rAmA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 90dfcb1e6ef64..ddf9237918af4 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -19,7 +18,6 @@ , pygments , requests , snowballstemmer -, sphinxcontrib-apidoc , sphinxcontrib-applehelp , sphinxcontrib-devhelp , sphinxcontrib-htmlhelp @@ -77,9 +75,6 @@ buildPythonPackage rec { sphinxcontrib-serializinghtml # extra[docs] sphinxcontrib-websupport - - # extra plugins which are otherwise not found by sphinx-build - sphinxcontrib-apidoc ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index 327ff267eebc8..9abab99c05985 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-apidoc"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/lnRWIJHKqk8Jzevvepr7bNM41y9NKpJR5CfXfFQCq0="; + hash = "sha256-Ze/NkiEqX4I3FfuV7gmLRYprsJpe5hfZ7T3q2XF3zVU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index f99d32ec7e21a..6e0b7802d03a8 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.28"; + version = "0.29"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zpNirT1LvMTDDf38MIqsrSwHs0RjUxZoGnESabjgC+o="; + hash = "sha256-l6Tyomr5HbiHcMz4o7LgMwW82n7EGn+Wn8jLJ7hKPEQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index d0803c6dc7291..0764e6c6ccd01 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -9,21 +9,19 @@ , click , click-command-tree , click-option-group -, cmsis-pack-manager -, commentjson +, colorama , crcmod , cryptography , deepmerge , fastjsonschema , hexdump -, importlib-metadata -, jinja2 , libusbsio , oscrypto -, pycryptodome -, pyftdi +, platformdirs +, prettytable , pylink-square , pyocd +, pyocd-pemicro , pypemicro , pyserial , requests @@ -33,20 +31,22 @@ , spsdk , testers , typing-extensions +, ipykernel +, pytest-notebook , pytestCheckHook , voluptuous }: buildPythonPackage rec { pname = "spsdk"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "nxp-mcuxpresso"; - repo = pname; - rev = version; - hash = "sha256-C6cz5jhIHI4WkCYT0rURFa4kBAu6cMcKpQHiHACIiu8="; + repo = "spsdk"; + rev = "refs/tags/${version}"; + hash = "sha256-ZXNqger5WBk2AjTszJLmemYDPClUPy+kNtBWSPcTDro="; }; nativeBuildInputs = [ @@ -55,21 +55,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "bincopy" - "bitstring" - "cmsis-pack-manager" - "deepmerge" - "jinja2" - "pycryptodome" - "pylink-square" - "pyocd" - "typing-extensions" "click" - "ruamel.yaml" - ]; - - pythonRemoveDeps = [ - "pyocd-pemicro" ]; propagatedBuildInputs = [ @@ -80,20 +66,19 @@ buildPythonPackage rec { click click-command-tree click-option-group - cmsis-pack-manager - commentjson + colorama crcmod cryptography deepmerge fastjsonschema hexdump - importlib-metadata - jinja2 libusbsio oscrypto - pycryptodome + platformdirs + prettytable pylink-square pyocd + pyocd-pemicro pypemicro pyserial requests @@ -103,16 +88,23 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pyftdi + ipykernel + pytest-notebook pytestCheckHook voluptuous ]; + disabledTests = [ + "test_nxpcrypto_create_signature_algorithm" + "test_nxpimage_sb31_kaypair_not_matching" + ]; + pythonImportsCheck = [ "spsdk" ]; passthru.tests.version = testers.testVersion { package = spsdk; }; meta = with lib; { + broken = versionAtLeast cryptography.version "41.1"; changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.rev}/docs/release_notes.rst"; description = "NXP Secure Provisioning SDK"; homepage = "https://github.com/nxp-mcuxpresso/spsdk"; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index f62c4d7c9ede4..30f76ffd62587 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.5.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M2hCbARFfgIRiE6SdPpH61ViUrpMBz3ydeg8Zd97oqE="; + hash = "sha256-BQQqP5eyXxfN+o11AR/Xmq8CdSM0ip3/8PWiC92wubA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 9fd3c75adcc6a..1ace2eab95900 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -83,7 +83,6 @@ buildPythonPackage rec { docutils flexmock psycopg2 - psycopg2cffi pg8000 pytz python-dateutil @@ -91,6 +90,10 @@ buildPythonPackage rec { pyodbc ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies) + ++ lib.optionals (pythonOlder "3.12") [ + # requires distutils, which were removed in 3.12 + psycopg2cffi + ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index 06ffcab2ae322..a630b110314d8 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "1.4.51"; + version = "1.4.52"; pyproject = true; src = fetchFromGitHub { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-KhLSKlQ4xfSh1nsAt+cRO+adh2aj/h/iqV6YmDbz39k="; + hash = "sha256-3JiPDOI6KDQwtBtISvHi3d+Rdm0pz1d9cnZu3+f4jYE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index edee5d1d44142..565ab218dd91b 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.25"; + version = "2.0.27"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-nfkYzLpWyNXDuRUJl5pzaedw5v7jHpG7kpmr6VTGUaw="; + hash = "sha256-6R+A7rVq1olRXj1wMolHhEq418bpr5rsmH8RjxajmmQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index f02a32d0f64f8..7eb9ee70eca91 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlglot"; - version = "20.9.0"; + version = "21.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "sqlglot"; owner = "tobymao"; rev = "refs/tags/v${version}"; - hash = "sha256-4czhmAJUDRj0x8dCmIXg5BQ1Uvie5vx+UtWdSSY5mnM="; + hash = "sha256-xMKDkhotVBkLzn+f9RMGCPfWTF4Rz9a193nSJv5z+iA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index d2bdaa146789c..8c4e09082622f 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DypzKg8ajqevVFDoeEW6Mj82x90U9OUb7dgIhp+KyZg="; + hash = "sha256-X3xz2ucuxr48q9gS9K19Zd7gYkRCpU+XLWMSrwiQMIo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix index f9fd0d2262e6b..def0517d8655f 100644 --- a/pkgs/development/python-modules/stanza/default.nix +++ b/pkgs/development/python-modules/stanza/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "stanza"; - version = "1.7.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "stanfordnlp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uLstqplCQ55fW5WRS1qSrE6sGgpc8z92gyoksUnGpnQ="; + hash = "sha256-MO9trPkemVDzlVrO6v6N27RY2SNwflj+XlUrB1NqFGc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index a9dd1b3ff2524..7ff02acd0bdcb 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools -, nose +, pynose , mock }: @@ -20,13 +20,10 @@ buildPythonPackage rec { setuptools ]; - nativeCheckInputs = [ nose mock ]; + nativeCheckInputs = [ pynose mock ]; - patchPhase = '' - # Failing test: ERROR: statsd.tests.test_ipv6_resolution_udp - sed -i 's/test_ipv6_resolution_udp/noop/' statsd/tests.py - # well this is a noop, but so it was before - sed -i 's/assert_called_once()/called/' statsd/tests.py + checkPhase = '' + nosetests -sv ''; meta = with lib; { diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix new file mode 100644 index 0000000000000..e11e26acc2867 --- /dev/null +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "std-uritemplate"; + version = "0.0.54"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "std_uritemplate"; + inherit version; + hash = "sha256-FVKnB3v/T7eV6IQkaKQ8CFumIMc3PPlAgNOFNohQf9Q="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # Module doesn't have unittest, only functional tests + doCheck = false; + + pythonImportsCheck = [ + "stduritemplate" + ]; + + meta = with lib; { + description = "Std-uritemplate implementation for Python"; + homepage = "https://github.com/std-uritemplate/std-uritemplate"; + changelog = "https://github.com/std-uritemplate/std-uritemplate/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 3e1027913bd3f..851a613d87402 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.31.1"; + version = "1.32.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-38Q8qFtLTDHQl8J7mDuMzJYCIq2QeGKysvtN3wTFD9w="; + hash = "sha256-7GQASW9niFIUPLwjxMQ4ifeLbJPC4nVv2OBgzM3kuP0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index f53e3c90945dd..a6c826a00a5e0 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -11,13 +11,12 @@ , pythonOlder , simplejson , twisted -, typing-extensions }: buildPythonPackage rec { pname = "structlog"; - version = "23.2.0"; - format = "pyproject"; + version = "24.1.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +24,7 @@ buildPythonPackage rec { owner = "hynek"; repo = "structlog"; rev = "refs/tags/${version}"; - hash = "sha256-KSHKgkv+kObKCdWZDg5o6QYe0AMND9VLdEuseY/GyDY="; + hash = "sha256-0Yc28UEeozK2+IqILFTqHoTiM5L2SA4t6jld4qTBSzQ="; }; nativeBuildInputs = [ @@ -34,10 +33,6 @@ buildPythonPackage rec { hatchling ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - typing-extensions - ]; - nativeCheckInputs = [ freezegun pretend @@ -47,11 +42,6 @@ buildPythonPackage rec { twisted ]; - disabledTests = [ - # _pickle.PicklingError: Only BytesLoggers to sys.stdout and sys.stderr can be pickled. - "test_pickle" - ]; - pythonImportsCheck = [ "structlog" ]; @@ -61,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/hynek/structlog"; changelog = "https://github.com/hynek/structlog/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 9eeb7e99aaa0d..293d39cee3e2d 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.10"; + version = "0.7.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OKZ55J294I3wPo2vL+wuMMCA4N1ejgtquA8Bf7wPiIs="; + hash = "sha256-HKtToMh4dAUpA654tFkUEM9DLPGr9XRQK0ezYzNPzqk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sudachidict/default.nix b/pkgs/development/python-modules/sudachidict/default.nix index 41a359110474f..65f5d4630d064 100644 --- a/pkgs/development/python-modules/sudachidict/default.nix +++ b/pkgs/development/python-modules/sudachidict/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-xJ/iPywOZA2kzHaVU43Bc8TUboj3OpDg1kLFMIc/T90="; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; # setup script tries to get data from the network but we use the nixpkgs' one postPatch = '' diff --git a/pkgs/development/python-modules/sv-ttk/default.nix b/pkgs/development/python-modules/sv-ttk/default.nix index a5518b0944310..834178a5c2362 100644 --- a/pkgs/development/python-modules/sv-ttk/default.nix +++ b/pkgs/development/python-modules/sv-ttk/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sv-ttk"; - version = "2.5.5"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sv_ttk"; - hash = "sha256-m7/iq6bMb5/fcNeTMQRlQ8lmb8zMeLrV/2SKmYfjzts="; + hash = "sha256-P9RAOWyV4w6I9ob88ovkJUgPcyDWvzRvnOpdb1ZwLMI="; }; # No tests available diff --git a/pkgs/development/python-modules/svg-py/default.nix b/pkgs/development/python-modules/svg-py/default.nix index f2971a0b4144d..236e5fd3105da 100644 --- a/pkgs/development/python-modules/svg-py/default.nix +++ b/pkgs/development/python-modules/svg-py/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "svg-py"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "orsinium-labs"; repo = "svg.py"; rev = "refs/tags/${version}"; - hash = "sha256-GbXPDYDq6zlsPJ/PAjR6OvarVrp7x3LGhseyTMwY8Dg="; + hash = "sha256-rnxznJM3ihuEJrD3ba6uMdGMozIrLw/QyGzA3JPygH4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/systembridgeconnector/default.nix b/pkgs/development/python-modules/systembridgeconnector/default.nix new file mode 100644 index 0000000000000..04132ffe081a2 --- /dev/null +++ b/pkgs/development/python-modules/systembridgeconnector/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch2 +, setuptools +, aiohttp +, incremental +, systembridgemodels +, pytest-aiohttp +, pytest-socket +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "systembridgeconnector"; + version = "4.0.4"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "timmo001"; + repo = "system-bridge-connector"; + rev = "refs/tags/${version}"; + hash = "sha256-Guh9qbRLp+b2SuFgBx7jf16vRShuHJBi3WOVn9Akce8="; + }; + + patches = [ + (fetchpatch2 { + url = "https://github.com/timmo001/system-bridge-connector/commit/25aa172775ee983dc4a29b8dda880aefbad70040.patch"; + hash = "sha256-PedW1S1gZmWkS4sJBqSAx3aoA1KppYS5Xlhoaxqkcd4="; + }) + ]; + + postPatch = '' + substituteInPlace systembridgeconnector/_version.py \ + --replace-fail ", dev=0" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + incremental + systembridgemodels + ]; + + pythonImportsCheck = [ "systembridgeconnector" ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytest-socket + pytestCheckHook + ]; + + disabledTests = [ + # ConnectionClosedException: Connection closed to server + "test_get_files" + ]; + + meta = { + changelog = "https://github.com/timmo001/system-bridge-connector/releases/tag/${version}"; + description = "This is the connector package for the System Bridge project"; + homepage = "https://github.com/timmo001/system-bridge-connector"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix new file mode 100644 index 0000000000000..ee7945ee20b93 --- /dev/null +++ b/pkgs/development/python-modules/systembridgemodels/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, incremental +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "systembridgemodels"; + version = "4.0.3"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "timmo001"; + repo = "system-bridge-models"; + rev = "refs/tags/${version}"; + hash = "sha256-5rbj58E8iDu2Rjf0k9Y1UoF3hbN7ntkx6dm20HYpw6I="; + }; + + postPatch = '' + substituteInPlace systembridgemodels/_version.py \ + --replace-fail ", dev=0" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + incremental + ]; + + pythonImportsCheck = [ "systembridgemodels" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/timmo001/system-bridge-models/releases/tag/${version}"; + description = "This is the models package used by the System Bridge project"; + homepage = "https://github.com/timmo001/system-bridge-models"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/telepath/default.nix b/pkgs/development/python-modules/telepath/default.nix index 40aa3ca5982b9..73cab072dbd2f 100644 --- a/pkgs/development/python-modules/telepath/default.nix +++ b/pkgs/development/python-modules/telepath/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "telepath"; - version = "0.3"; + version = "0.3.1"; format = "setuptools"; src = fetchFromGitHub { repo = "telepath"; owner = "wagtail"; rev = "v${version}"; - sha256 = "sha256-kfEAYCXbK0HTf1Gut/APkpw2krMa6C6mU/dJ0dsqzS0="; + hash = "sha256-MS4Q41WVSrjFmFjv4fztyf0U2+5WkNU79aPEKv/CeUQ="; }; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix new file mode 100644 index 0000000000000..c114f157986f8 --- /dev/null +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "tencentcloud-sdk-python"; + version = "3.0.1108"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "TencentCloud"; + repo = "tencentcloud-sdk-python"; + rev = "refs/tags/${version}"; + hash = "sha256-aeQPoVHrRMxXzutaBkEjD2ek4zU/ZV4aBgm17r0ZRPU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tencentcloud" + ]; + + pytestFlagsArray = [ + # Other tests require credentials + "tests/unit/test_deserialize_warning.py" + "tests/unit/test_import.py" + "tests/unit/test_serialization.py" + ]; + + meta = with lib; { + description = "Tencent Cloud API 3.0 SDK for Python"; + homepage = "https://github.com/TencentCloud/tencentcloud-sdk-python"; + changelog = "https://github.com/TencentCloud/tencentcloud-sdk-python/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index 1c5bad17e8a0f..6c64ca00c5ee5 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -10,11 +10,12 @@ , numpy , h5py , pytestCheckHook +, stdenv }: buildPythonPackage rec { pname = "tensordict"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = "tensordict"; rev = "refs/tags/v${version}"; - hash = "sha256-XTFUzPs/fqX3DPtu/qSE1hY+7r/HToPVPaTyVRzDT/E="; + hash = "sha256-eCx1r7goqOdGX/0mSGCiLhdGQTh4Swa5aFiLSsL56p0="; }; nativeBuildInputs = [ @@ -53,6 +54,18 @@ buildPythonPackage rec { pytestCheckHook ]; + # RuntimeError: internal error + disabledTests = lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + "test_add_scale_sequence" + "test_modules" + "test_setattr" + ]; + + # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "test/test_distributed.py" + ]; + meta = with lib; { description = "A pytorch dedicated tensor container"; changelog = "https://github.com/pytorch/tensordict/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index 9a0af4e558e23..474af852d39f0 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -30,9 +30,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Termcolor"; - homepage = "https://pypi.python.org/pypi/termcolor"; + description = "ANSI color formatting for output in terminal"; + homepage = "https://github.com/termcolor/termcolor"; license = licenses.mit; }; - } diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 598c68884d3b2..a9f70fdf92d90 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -1,14 +1,15 @@ { lib +, aiohttp +, aiolimiter , buildPythonPackage , fetchFromGitHub -, setuptools , pythonOlder -, aiohttp +, setuptools }: buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.4.4"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.10"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-80VjSg94gCXzqy6Z/yuDblYgo4TlJdxR+jsOiY/Zhng="; + hash = "sha256-GiDhVN6aBj0yeIg596ox2ES28Dca81pVnsYWvc1SZ+A="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + aiolimiter ]; # Module has no tests diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 6113762d77a2e..0dbcd6bddc49a 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.10"; + version = "3.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DNac9rrHJkFWlYRLvDB49kjmJV2EMvs5Y2ndSGY7uvk="; + hash = "sha256-Eez8ktPhbWauFNsIuwoxMkGpI7hnYsBwStmU80IDFw4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index f0dd9ab9a6507..2ba5ff7019194 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , cairocffi -, cython +, cython_3 , fetchPypi , igraph , leidenalg @@ -9,6 +9,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , scipy , setuptools , spacy @@ -21,22 +22,25 @@ buildPythonPackage rec { pname = "textnets"; - version = "0.9.3"; + version = "0.9.4"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fx2S43IqpSMsfJow26jB/D27dyUFQ1PlXP1rbUIZPPQ="; + hash = "sha256-4154ytzo1QpwhKA1BkVMss9fNIkysnClW/yfSVlX33M="; }; nativeBuildInputs = [ - cython + pythonRelaxDepsHook + cython_3 poetry-core setuptools ]; + pythonRelaxDeps = [ "igraph" "leidenalg" ]; + propagatedBuildInputs = [ cairocffi igraph @@ -59,10 +63,14 @@ buildPythonPackage rec { "textnets" ]; + # Enables the package to find the cythonized .so files during testing. See #255262 + preCheck = '' + rm -r textnets + ''; + disabledTests = [ - # Test fails: A warning is triggered because of a deprecation notice by pandas. - # TODO: Try to re-enable it when pandas is updated to 2.1.1 - "test_corpus_czech" + # Test fails: Throws a UserWarning asking the user to install `textnets[fca]`. + "test_context" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix index ab9be50821e72..5c58f63dcdbf5 100644 --- a/pkgs/development/python-modules/textual-dev/default.nix +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "textual-dev"; - version = "1.4.0"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual-dev"; rev = "refs/tags/v${version}"; - hash = "sha256-l8InIStQD7rAHYr2/eA1+Z0goNZoO4t78eODYmwSOrA="; + hash = "sha256-QnMKVt1WxnwGnZFNb7Gbus7xewGvyG5xJ0hIKKK5hug="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix index b36ce6ed84e9c..0e9e3e6d002c3 100644 --- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix +++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , hatchling , textual , universal-pathlib @@ -16,7 +15,7 @@ buildPythonPackage rec { pname = "textual-universal-directorytree"; - version = "1.0.2"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,18 +24,9 @@ buildPythonPackage rec { owner = "juftin"; repo = "textual-universal-directorytree"; rev = "refs/tags/v${version}"; - hash = "sha256-FL2bwPGqBmDn33Rhj7+VEpuqB4znEAw+GGAODTs25oo="; + hash = "sha256-ncQ3IRaZaCv1rMUWT9dkUKo6OAEC5pziMCM7adIBGWo="; }; - patches = [ - # universal-pathlib upgrade, https://github.com/juftin/textual-universal-directorytree/pull/2 - (fetchpatch { - name = "universal-pathlib-upgrade.patch"; - url = "https://github.com/juftin/textual-universal-directorytree/commit/e445aff21ddf756e3f180c8308a75c41487667c3.patch"; - hash = "sha256-Fftx8rrLPb6lQ+HBdB5Ai55LHMWEO6XftmFfZXbXIyk="; - }) - ]; - nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index 6d8c9c9f83d2d..e6a696dec9bb8 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "thriftpy2"; - version = "0.4.16"; + version = "0.4.20"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o+h38NREnh14M23gyF2X2UdW7/spmHFo0rqvkKnmSRQ="; + hash = "sha256-IEYoSLaJUeQdwHaXR0UUlCZg5zBEh5Y2/IwB4RVEAcg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/thttp/default.nix b/pkgs/development/python-modules/thttp/default.nix new file mode 100644 index 0000000000000..0e42f2a0c23a7 --- /dev/null +++ b/pkgs/development/python-modules/thttp/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +}: + +buildPythonPackage rec { + pname = "thttp"; + version = "1.3.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "sesh"; + repo = "thttp"; + rev = "refs/tags/${version}"; + hash = "sha256-e15QMRMpTcWo8TfH3tk23ybSlXFb8F4B/eqAp9oyK8g="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "thttp" + ]; + + meta = with lib; { + description = "A lightweight wrapper around urllib"; + homepage = "https://github.com/sesh/thttp"; + changelog = "https://github.com/sesh/thttp/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index c39b04cd3fe7a..ea6df2843c9a4 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.4.1"; + version = "6.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jannikmi"; repo = "timezonefinder"; rev = "refs/tags/${version}"; - hash = "sha256-e9Zx236X76GYFuADCw9+5HWs2craeq44gVNclkc4th0="; + hash = "sha256-V5g1zTdXWeJba71/eUGQbF9XOhMQuzivtGkqGD4OHMY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix new file mode 100644 index 0000000000000..25b1f049bf697 --- /dev/null +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -0,0 +1,111 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, gpuctypes +, numpy +, tqdm +, hypothesis +, librosa +, onnx +, pillow +, pytest-xdist +, pytestCheckHook +, safetensors +, sentencepiece +, tiktoken +, torch +, transformers +}: + +buildPythonPackage rec { + pname = "tinygrad"; + version = "0.8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tinygrad"; + repo = "tinygrad"; + rev = "refs/tags/v${version}"; + hash = "sha256-QAccZ79qUbe27yUykIf22WdkxYUlOffnMlShakKfp60="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + gpuctypes + numpy + tqdm + ]; + + pythonImportsCheck = [ "tinygrad" ]; + + nativeCheckInputs = [ + hypothesis + librosa + onnx + pillow + pytest-xdist + pytestCheckHook + safetensors + sentencepiece + tiktoken + torch + transformers + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # Require internet access + "test_benchmark_openpilot_model" + "test_bn_alone" + "test_bn_linear" + "test_bn_mnist" + "test_car" + "test_chicken" + "test_chicken_bigbatch" + "test_conv_mnist" + "testCopySHMtoDefault" + "test_data_parallel_resnet" + "test_e2e_big" + "test_fetch_small" + "test_huggingface_enet_safetensors" + "test_linear_mnist" + "test_load_convnext" + "test_load_enet" + "test_load_enet_alt" + "test_load_llama2bfloat" + "test_load_resnet" + "test_openpilot_model" + "test_resnet" + "test_shufflenet" + "test_transcribe_batch12" + "test_transcribe_batch21" + "test_transcribe_file1" + "test_transcribe_file2" + "test_transcribe_long" + "test_transcribe_long_no_batch" + "test_vgg7" + ]; + + disabledTestPaths = [ + "test/extra/test_lr_scheduler.py" + "test/models/test_mnist.py" + "test/models/test_real_world.py" + ]; + + meta = with lib; { + description = "A simple and powerful neural network framework"; + homepage = "https://github.com/tinygrad/tinygrad"; + changelog = "https://github.com/tinygrad/tinygrad/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/tinysegmenter/default.nix b/pkgs/development/python-modules/tinysegmenter/default.nix new file mode 100644 index 0000000000000..2b56544061b70 --- /dev/null +++ b/pkgs/development/python-modules/tinysegmenter/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, unittestCheckHook + +, setuptools +}: + +buildPythonPackage rec { + pname = "tinysegmenter"; + version = "0.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ZEWL26VLp0gsAseF+WDPPWz2FZSk2rPWTDJUOQlPwbc="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ "-s" "tests" ]; + + pythonImportsCheck = [ "tinysegmenter" ]; + + meta = with lib; { + description = "Very compact Japanese tokenizer"; + homepage = "https://tinysegmenter.tuxfamily.org"; + license = licenses.bsd3; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/torch-audiomentations/default.nix b/pkgs/development/python-modules/torch-audiomentations/default.nix index 3d2ea51aa62d6..5a849752586be 100644 --- a/pkgs/development/python-modules/torch-audiomentations/default.nix +++ b/pkgs/development/python-modules/torch-audiomentations/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "torch-audiomentations"; - version = "0.11.0"; + version = "0.11.1"; pyproject = true; src = fetchFromGitHub { owner = "asteroid-team"; repo = "torch-audiomentations"; - rev = "v${version}"; - hash = "sha256-r3J8yo3+jjuD4qqpC5Ax3TFPL9pGUNc0EksTkCTJKbU="; + rev = "refs/tags/v${version}"; + hash = "sha256-0+5wc+mP4c221q6mdaqPalfumTOtdnkjnIPtLErOp9E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index bea1769439a08..0bb415574e392 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -24,7 +24,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.2.0"; + version = "2.2.1"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index ef4386142900b..0fd4a5b36e4d8 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.2.0" = { + "2.2.1" = { x86_64-linux-38 = { - name = "torch-2.2.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-on2vBAW5JDWXlcOaWnP/MRUYgNY/ZePwBRwi+bs7Ix4="; + name = "torch-2.2.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-OIDrgRsT+PGl/DKC5FVnS5qfpnOrJW8GOOK09JUlFsM="; }; x86_64-linux-39 = { - name = "torch-2.2.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-ccYx+u1TWJYdL6WCo3Dh0p+L7GT8Autv9vTrLFas/YU="; + name = "torch-2.2.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-HLN5h0E455jAK0GWLdnU7AsGOoykWlEJfzJmFUd8m9A="; }; x86_64-linux-310 = { - name = "torch-2.2.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-xEECFnLr4uWvvbNIF6qF5tMhMPlN8tqa1Mt4qdS4E3A="; + name = "torch-2.2.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-Gt9DDwH/ZJyEisAheF4YAHsHFP3eaOTmW9DGQL8/uOE="; }; x86_64-linux-311 = { - name = "torch-2.2.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-C8Wa5xUo8KYBPxsBZw8DnMbQGyztenIZyhbuGUwwURY="; + name = "torch-2.2.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-I7souoAPJanTPVF2i/X976AiDLxc2aF/ItKkJig1lGg="; }; x86_64-darwin-38 = { - name = "torch-2.2.0-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-n6S6LDDsKUolu0t6FaegYSDTqub4+N50A5G9ZSOcgAY="; + name = "torch-2.2.1-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-YXaFhegqmdxcQZM759ucoGf6451F/r1RA8yKBNUkSRg="; }; x86_64-darwin-39 = { - name = "torch-2.2.0-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-jTTFeq04rJJTWsryl8vuYDbwMZKGxgJnpKBz4fwWlxg="; + name = "torch-2.2.1-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-o6OqT5rSqLjnLBqElA2MWd1O7SkbyytgOta1hJgwYvU="; }; x86_64-darwin-310 = { - name = "torch-2.2.0-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-none-macosx_10_9_x86_64.whl"; - hash = "sha256-Ux4YihpeLVzqPX+bbqviXwOT9k5mTJj26LIYdfIFT5M="; + name = "torch-2.2.1-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-none-macosx_10_9_x86_64.whl"; + hash = "sha256-531ee2Cn4cI0XGSC/4dvNqDwQ+a+Mu9Y2sQWxKoOOyg="; }; x86_64-darwin-311 = { - name = "torch-2.2.0-cp311-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-none-macosx_10_9_x86_64.whl"; - hash = "sha256-yCp8ENobrFoxlWhnHce7+PexfFUfwjPlqAgDurnvDQQ="; + name = "torch-2.2.1-cp311-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-none-macosx_10_9_x86_64.whl"; + hash = "sha256-lkeM9Oc3ADBZee0cp2tTVTbUYvMDAqNe3Rzu4MPYB9M="; }; aarch64-darwin-38 = { - name = "torch-2.2.0-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-TCrIfQcXzbYqkUJTTPCFmFHvONk6KC6dyRUYETp6gDM="; + name = "torch-2.2.1-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-fX1aq00JspIgKXkbacgDq6HAWcYP9lYj8ddFgMFHvUw="; }; aarch64-darwin-39 = { - name = "torch-2.2.0-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-xZuzd7T6xt4wZrqPFZuWAEWLCcwyo/Y9ADDbmVpR/qk="; + name = "torch-2.2.1-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-uQZpsWKYTjAvvQXJwnDveW5GeQOUTs76dFe6vpYRYH4="; }; aarch64-darwin-310 = { - name = "torch-2.2.0-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-kApUIX2bUP0RIVXO11+JCB8jyFqlmLX+A8ng2gDlOSc="; + name = "torch-2.2.1-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-Ur3sHiLQg4L9mNttK/F6KU0P1TJgz9ZPuHRDSSy6xrQ="; }; aarch64-darwin-311 = { - name = "torch-2.2.0-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-qbGvT92jsrSCTl8SMz19vSJ5EwJBWGly2WrOuYtErJs="; + name = "torch-2.2.1-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-zNmEmw3TcKmBPd3kenf0OciqzOAi5LoL+TZRc9WAgJY="; }; aarch64-linux-38 = { - name = "torch-2.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-pfl3K7le+v2QbeaDEEryMB7xhgjQx/Ny/xpaYb95K4g="; + name = "torch-2.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-y4ThL9QAXHh/zkDto96sBCmPWQY0iRBixM2yzywUIiE="; }; aarch64-linux-39 = { - name = "torch-2.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-5tJVCovq33nOSCcaoqKBF16RowZf7ThdKouYAsKnRNs="; + name = "torch-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-7g90adoiGNyHlIV1DaF6JF3DaRbi+cX8CDbkz1cq0H0="; }; aarch64-linux-310 = { - name = "torch-2.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-GeiXY73Z3wv145Ri6UEMYSp6Rq/3LqKFuXkprCBFEj8="; + name = "torch-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-8BgwAuGJeNWYw+6JGcLmSCAsf+u5CIFRVshmxSTEo1k="; }; aarch64-linux-311 = { - name = "torch-2.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-TYGa0jWR4M2KPAt0DYTqrm/QmSjPLK3OveiuYFrC24s="; + name = "torch-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-fyaXQWtneZbuHzCyZ2qKlN3b44ijXDYdyG6RW9pHt9o="; }; }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 899b692c47edc..d6c51904bd9df 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -8,7 +8,7 @@ magma-hip, magma-cuda-static, # Use the system NCCL as long as we're targeting CUDA on a supported platform. - useSystemNccl ? (cudaSupport && !cudaPackages.nccl.meta.unsupported), + useSystemNccl ? (cudaSupport && !cudaPackages.nccl.meta.unsupported || rocmSupport), MPISupport ? false, mpi, buildDocs ? false, @@ -127,7 +127,7 @@ let in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.8.0"; @@ -145,7 +145,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-FfFjgx6yrPEQlF8CLglsWq+zWGr6MD4z0F+lYoy6grc="; + hash = "sha256-6z8G5nMbGHbpA+xfmOR726h9E4N9NoEtaFgcYE0DuUE="; }; patches = lib.optionals cudaSupport [ diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index edde12213bc6e..863fdc920a485 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.2.0"; + version = "2.2.1"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 14b7400562c3d..eda82094c5111 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.2.0" = { + "2.2.1" = { x86_64-linux-38 = { - name = "torchaudio-2.2.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-POcebL/QW1zrKI53MKygCOElGQn4PB5XRUV50q4UnCo="; + name = "torchaudio-2.2.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-XU/trqM3W8hQ+9kI6G1b+GAbp9eCPFId6+jY3lwiZYg="; }; x86_64-linux-39 = { - name = "torchaudio-2.2.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-OpwwHNjLB7E3gI6JextkysqRA1kMrQ7GtCNRNmqdwas="; + name = "torchaudio-2.2.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-LQScsJsPn+EE0goKRwIW/Fzo+SW9SYVuZYDi2Vn1syg="; }; x86_64-linux-310 = { - name = "torchaudio-2.2.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-2zy3mq2qPvY/+WjwqyRXaBrU+fRYwq+NZXnx1K/2Yys="; + name = "torchaudio-2.2.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-I/YjZCniv2drgg6OciGh1YqvkIv/K6JmWqhS33GpeWE="; }; x86_64-linux-311 = { - name = "torchaudio-2.2.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-d3FY1g5mBPiYWqffYx+m1L8vvmvkWCc3f4pQsuQqZCU="; + name = "torchaudio-2.2.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-YJACsObf9ED81qY9FcA8PTdOIU56iqYcLvSlKLpkTDk="; }; x86_64-darwin-38 = { - name = "torchaudio-2.2.0-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-xcsLSJaxB/TR5zR84pY8m7d9JI6KnbWIYWTsobO6Ygo="; + name = "torchaudio-2.2.1-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-ge+I12k+O5kAfR7nQv2Buakjmey/iOt+1plJRDAF/7o="; }; x86_64-darwin-39 = { - name = "torchaudio-2.2.0-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-MdDGWy+jfACwxYL8Kstppyt/9wuBoXVNkAfVYv8UOIA="; + name = "torchaudio-2.2.1-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-Azn+eO2cKfcEKWdhsouwVbU1BiX/UDrXgXBDl5NOa1g="; }; x86_64-darwin-310 = { - name = "torchaudio-2.2.0-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-WeVoNs0r6BlAzrrNP07jd5xLeDeKPmGUVEbad8FjhLQ="; + name = "torchaudio-2.2.1-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-WA7v12SgGmTVtqomDAxHl0vmppZIktVAKac7F/RhH80="; }; x86_64-darwin-311 = { - name = "torchaudio-2.2.0-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-lx7enoSIqLhdZySgWGw4KGSHA9gFBU9dEnXTIGDBeUk="; + name = "torchaudio-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-J0y4R0vB5Wt2jvNH0xiGYcWp1eaOLfVvwK/xHMc8kWo="; }; aarch64-darwin-38 = { - name = "torchaudio-2.2.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-DQOCmhh+yJOzJT0Rgq8LW+Cak61flOHo3r9iaeHH3NY="; + name = "torchaudio-2.2.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-9Ien0xd65q8BZ1CFDuk3iOiAIYoaMQvGx2kB4hL5HNM="; }; aarch64-darwin-39 = { - name = "torchaudio-2.2.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-+xBG66mjt/Z2L2o35EMw3GyWJVAdpL676viWzqQG8tc="; + name = "torchaudio-2.2.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-aLHZ+P/psm7wToDYKuLcL3Sxoetkw+itIbUlgCs7x6w="; }; aarch64-darwin-310 = { - name = "torchaudio-2.2.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-3Ej5ZswZc6jVipaGM15ResAN2unNe1kpFqBLd0me8rs="; + name = "torchaudio-2.2.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-itVcIGmye74Y4UeDogLj8/gIL+nlkoFDa6eX7bD8lNU="; }; aarch64-darwin-311 = { - name = "torchaudio-2.2.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-aoRSKkjUYF5C9o5XKcCw6jxaYEyXqjTxC4FH7QEO7gc="; + name = "torchaudio-2.2.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-HmLCexdnLMK92WY2geUzAA+cCYTmoPPUVfcFG8AFuwI="; }; aarch64-linux-38 = { - name = "torchaudio-2.2.0-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-GWWTv0PlA/EP+MHGCvqXS19Qtc6yKddAXM7Ke11WAhY="; + name = "torchaudio-2.2.1-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-pEYrPyFPYLa4944SpM8Skcm8NT3u1wmsPf3tvtUTp6M="; }; aarch64-linux-39 = { - name = "torchaudio-2.2.0-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-hA64ZbBkfvHBd/fv7hSt0k2vUGKntOSZR/uY1KuZBmM="; + name = "torchaudio-2.2.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-yy2girt7aNx7AQV0ixpzbdMzKfhBN0AT7ALFTgS+3yk="; }; aarch64-linux-310 = { - name = "torchaudio-2.2.0-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-1OoJS4cho2GYLbBi7pk/Km9x3+FvYqhPiQCyNk8zouQ="; + name = "torchaudio-2.2.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-uRa3dkaYupMZqjslUZE5iS3oZl2EQ4lpusXh2FeMahE="; }; aarch64-linux-311 = { - name = "torchaudio-2.2.0-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-m+GMogoMLoygtjOIcRQIPJKMleRUhwsdbqjP4FmCzsk="; + name = "torchaudio-2.2.1-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-ILKWXbT4QwIWNvU9P6sQdcP4lZxFDGR2KRJNJMfmy7A="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 7f81a044f0ebf..73aec87cca611 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-Z6Xc8bR6bqBHyzWfoB3F33YZEwzuvXByB6s1kSer1DY="; + hash = "sha256-ejgxWVIkusGi7zwg3nyAHHdjEPrFaS1TN7nN+PpSgOE="; }; patches = [ diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index c0be5710121b2..89422ff7c65e0 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -7,47 +7,47 @@ version=$1 linux_cuda_version="cu121" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" -linux_cpu_bucket="https://download.pytorch.org/whl" +linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_13_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" - "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_13_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" - "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_13_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" - "x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_13_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" - "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" - "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" - "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" - "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" - "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" - "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" - "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" + "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_13_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_13_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_13_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" + "x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_13_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl" + "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" + "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" + "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" + "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" + "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" ) hashfile=binary-hashes-"$version".nix -echo " \"$version\" = {" >> $hashfile +echo " \"$version\" = {" >>$hashfile for url_and_key in "${url_and_key_list[@]}"; do - key=$(echo "$url_and_key" | cut -d' ' -f1) - url=$(echo "$url_and_key" | cut -d' ' -f2) - name=$(echo "$url_and_key" | cut -d' ' -f3) + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) - echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + echo "prefetching ${url}..." + hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url "$url" --name "$name")) - echo " $key = {" >> $hashfile - echo " name = \"$name\";" >> $hashfile - echo " url = \"$url\";" >> $hashfile - echo " hash = \"$hash\";" >> $hashfile - echo " };" >> $hashfile + echo " $key = {" >>$hashfile + echo " name = \"$name\";" >>$hashfile + echo " url = \"$url\";" >>$hashfile + echo " hash = \"$hash\";" >>$hashfile + echo " };" >>$hashfile - echo + echo done -echo " };" >> $hashfile +echo " };" >>$hashfile echo "done." diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 371a178ab5c94..591e59302ea6a 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "torchrl"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = "rl"; rev = "refs/tags/v${version}"; - hash = "sha256-ngl/gbNm+62W6UFNo8GOhSaIuK9FERDxGBCr++7B4gw="; + hash = "sha256-lETW996IKPUGgZpe+cyzrXvVmDSwj5G4XFreFmGxReQ="; }; nativeBuildInputs = [ @@ -134,6 +134,7 @@ buildPythonPackage rec { meta = with lib; { description = "A modular, primitive-first, python-first PyTorch library for Reinforcement Learning"; homepage = "https://github.com/pytorch/rl"; + changelog = "https://github.com/pytorch/rl/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 4448f97a1c23c..e1bc7295cb2d4 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -16,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.17.0"; + version = "0.17.1"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 44052910a03a7..d7cb16d01b61f 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,66 +6,66 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.17.0" = { + "0.17.1" = { x86_64-linux-38 = { - name = "torchvision-0.17.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-3l28SA/MEAeS46rPkO3/5bzuTO06vE/B0hDSNH/DbgU="; + name = "torchvision-0.17.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-oCRjQQZPPBdtqKpuMvATD2ACOAyQruqOMccY3ixUZOE="; }; x86_64-linux-39 = { - name = "torchvision-0.17.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-v1BQa1hwhI5c8KV+ZSa50Az058aZKUkbqR+5/DhKvDg="; + name = "torchvision-0.17.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-WsK2vDCcNDud6KklczHPcVtm+qm1kiep8HDZ4BJS5go="; }; x86_64-linux-310 = { - name = "torchvision-0.17.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-4Sc+mGL8gh/rxMcW8ThJsf+ofA1p9quCQ1bFUyxJDwg="; + name = "torchvision-0.17.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-J69HkV9udiwdROWOgIjSKsl0RWaPn3k1JAMrK69PNL0="; }; x86_64-linux-311 = { - name = "torchvision-0.17.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-/WbJVU/BRIYzwjLu3cvZCpvNE1rpTmgvTLchmEl0yps="; + name = "torchvision-0.17.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-bYKfOZSQQCWyiXHMxhvWbt2VKATyEipuEENQuOkXL08="; }; x86_64-darwin-38 = { - name = "torchvision-0.17.0-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-hw182ldCDkTSDrB7/je/U0SgZDSnphlbTH891Vg4WH0="; + name = "torchvision-0.17.1-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-JiEJcGX6HIJ4heK1IQLoOaNUG5M7epDg+jxCw94bw88="; }; x86_64-darwin-39 = { - name = "torchvision-0.17.0-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-sc7UOLge9mKnHIyB3rrwyARVs1uBHKVaTDxZPXIbVgo="; + name = "torchvision-0.17.1-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-WCmacks3uJPHzk0LMuoUgMMORnzBFBZ5ZLRfYBP2wtM="; }; x86_64-darwin-310 = { - name = "torchvision-0.17.0-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-FTiCzY/449vvXFBU/dFd9k6FQgVGgFqQwLIiHy8RnEo="; + name = "torchvision-0.17.1-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-BkGIgCErZuRehV3Tn1Nuf9SLTmsDShHdn+niOEr7Uew="; }; x86_64-darwin-311 = { - name = "torchvision-0.17.0-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-ENJ2gh8RX7Np5s8fG3eyzKYM2hLLs5pBUTqdPQ8qk64="; + name = "torchvision-0.17.1-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-6izNv1l04L8n/WZEozsZywcAKXzzl7sEaediwRxsQQU="; }; aarch64-darwin-38 = { - name = "torchvision-0.17.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-R39uZKnXmMD1re/DAKzCINpvF+9cHhENIBCPZlVP7k0="; + name = "torchvision-0.17.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-XOdkZq8rWjBXOTnK4ebmLikxbOs+50gJEALzEqsJEvY="; }; aarch64-darwin-39 = { - name = "torchvision-0.17.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-tTVpxSvUvRF2oeSdjqVYg7z1fhYUy5fi6M43J2gpm3A="; + name = "torchvision-0.17.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-ihsX+xWLK4gfLIeW/hg5piTknV/QeqYfba5gukgZQho="; }; aarch64-darwin-310 = { - name = "torchvision-0.17.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-xVwvhuPzoh3dknOalyNmJE6bF5Fug27EcWewoMCDxl8="; + name = "torchvision-0.17.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-M9ZdDH/cs/e8HdjtMOo81+BYe0rRsQS1Z3yBkai62fE="; }; aarch64-darwin-311 = { - name = "torchvision-0.17.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-o+7y2t2ttcIegC4FUN1+PuPZjEMPSu0hKuO6A1hVi+E="; + name = "torchvision-0.17.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-kQbjLJ8ecK+oFyzxsGTPnCmY2N/wdp7GnVN7ICCe5D0="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 013d1886b684b..a8e90f7211c42 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -17,7 +17,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.17.0"; + version = "0.17.1"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-ZAmvVEVLzZ+AWER4vGssAhvFscoFooS1VaZnvgVDeNk="; + hash = "sha256-K2irwwf6qgyfZqJH1NUasDmBSA4mH2Rclx7A7zP4kiQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 84489b22ce4ae..2cd490e844e5a 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-W" "ignore::FutureWarning" + "-W" "ignore::DeprecationWarning" ]; # Remove performance testing. diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index 0123ce0cbd6cd..1292e7d72a711 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "trackpy"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "soft-matter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NG1TOppqRbIZHLxJjlaXD4icYlAUkSxtmmC/fsS/pXo="; + hash = "sha256-HqInZkKvMM0T/HrDeZJcVHMxuRmhMvu0qAl5bAu3eQI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index de3fabc2ba28d..0a0af07b89eea 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.38.1"; + version = "4.38.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -62,7 +62,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-92WmvSFZYCCG4qJprPT7clYa7ePuvyaCvxni/spDhSw="; + hash = "sha256-/rt2XHN46NcFwlM9MOygVvpQkfPVu2eCNybYmSj711M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index bf1de1ae4ab45..79540ea997eec 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.1.4"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JeURuw0YImIKRwi35tYWDa5CQqYfPZm+NJiap8Qo6mE="; + hash = "sha256-uS6oVNS+JBN61SEVDwLQDoCf60SwqXV7831E2J+hb7I="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 1f2cfdd7febc2..adb4df9753a38 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.5.3"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Kk4PvkUC1JB2MNyarq/cHhOOc+2Id7HlR/hSt/5JjlI="; + hash = "sha256-DxLgAEuIfO8K42DbkOaPjE+MS6/WKnybDsszuCXwufM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index f196b3a3d4727..d9cc9ae10312e 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.0.5"; + version = "7.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UTDONJrb28gnGkoV6Rb/2ChsgcLIxCmDhSd4gvFxq14="; + hash = "sha256-ZpK3+DZi2U4TK7dHwIJnw5u/lFrvtBD+MhRLkdO8DLI="; }; propagatedBuildInputs = [ @@ -80,7 +80,7 @@ buildPythonPackage rec { modularity, scalability and security. ''; homepage = "http://www.tryton.org/"; - changelog = "https://hg.tryton.org/trytond/file/${version}/CHANGELOG"; + changelog = "https://foss.heptapod.net/tryton/tryton/-/blob/trytond-${version}/trytond/CHANGELOG?ref_type=tags"; license = licenses.gpl3Plus; maintainers = with maintainers; [ udono johbo ]; }; diff --git a/pkgs/development/python-modules/tsfresh/default.nix b/pkgs/development/python-modules/tsfresh/default.nix index 36a93a5400517..a4541ba7b98c9 100644 --- a/pkgs/development/python-modules/tsfresh/default.nix +++ b/pkgs/development/python-modules/tsfresh/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "tsfresh"; - version = "0.20.1"; + version = "0.20.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,8 +34,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "blue-yonder"; repo = "tsfresh"; - rev = "v${version}"; - hash = "sha256-JmdP/6aTnuYsBRiRq9zZng3xNYhOdr9V8bp1trAv508="; + rev = "refs/tags/v${version}"; + hash = "sha256-UTra+RAQnrv61NQ86xGYrUVYiycUAWhN/45F6/0ZvPI="; }; patches = [ diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix new file mode 100644 index 0000000000000..ada7cc390b690 --- /dev/null +++ b/pkgs/development/python-modules/ttn-client/default.nix @@ -0,0 +1,47 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ttn-client"; + version = "0.0.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "angelnu"; + repo = "thethingsnetwork_python_client"; + rev = "refs/tags/v${version}"; + hash = "sha256-oHGv9huk400nPl4ytV8uxzK7eENpoBHt8uFjD2Ck67w="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ttn_client" + ]; + + meta = with lib; { + description = "Module to fetch/receive and parse uplink messages from The Thinks Network"; + homepage = "https://github.com/angelnu/thethingsnetwork_python_client"; + changelog = "https://github.com/angelnu/thethingsnetwork_python_client/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix new file mode 100644 index 0000000000000..dd95baba855d4 --- /dev/null +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, requests +, paho-mqtt +, cryptography +}: +let + pname = "tuya-device-sharing-sdk"; + version = "0.2.0"; +in +buildPythonPackage { + inherit pname version; + + src = fetchPypi { + inherit pname version; + hash = "sha256-fu8zh59wlnxtstNbNL8mIm10tiXy22oPbi6oUy5x8c8="; + }; + + # workaround needed, upstream issue: https://github.com/tuya/tuya-device-sharing-sdk/issues/10 + postPatch = '' + touch requirements.txt + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + paho-mqtt + cryptography + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Tuya Device Sharing SDK"; + homepage = "https://github.com/tuya/tuya-device-sharing-sdk"; + license = licenses.mit; + maintainers = with maintainers; [ aciceri ]; + }; +} diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 2deb71addc849..a470b090a1783 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.13.0"; + version = "9.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-HlHT7fJbDz8+7pTWHortK2xKDzoIQElJPbUTxmIdGCs="; + hash = "sha256-fOtNzyeE0Ijr2HvxuG5+01I1VBbX4io8OqGEjNcxAgk="; }; nativeBuildInputs = [ @@ -44,6 +44,9 @@ buildPythonPackage rec { requests ]; + # aiounittest is not supported on 3.12 + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ aiounittest cryptography diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index dd77084ad3a83..4bf59621b5ca7 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -52,7 +52,7 @@ , unittestCheckHook }: let - version = "6.3.0"; + version = "7.0.0"; api = [ aiohttp fastapi uvicorn ]; # cloud = [ apache-libcloud ]; console = [ rich ]; @@ -105,7 +105,7 @@ buildPythonPackage { owner = "neuml"; repo = "txtai"; rev = "refs/tags/v${version}"; - hash = "sha256-Efk4HAJsQtSGp4S8S1dFBmObJ9ff9u9bRrTa5lACpTU="; + hash = "sha256-dYAzbdGEu9gAUzptuSfej6T5LPyTneRWigdAMlGgeqM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index 47f06b4741fe8..bb0bf9a5b313f 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -57,701 +57,701 @@ rec { types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.11.2" "sha256-g9a2ad5hZonlKWGnLQchfT5CAgwqsvseeQBQemCSCQw="; - types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.11.2" "sha256-XUzsO3dJmVEyAkwGcZ9BxNb8CceJALCNRIfs6/lFa8M="; + types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.12.1" "sha256-3x/hagYKcLpkQcl2xs5E1BK86pBexCPEI9jXoapaupk="; - types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.11.2" "sha256-hFZPPMjFeQ8YuDV27uuQudFkKaXPaOkEWEbGrEp7nsc="; + types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.12.1" "sha256-nqfw8mMje6HZo6ZiOin1Ki3i/ldnxwcestf+7AYvfRo="; - types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.11.2" "sha256-p11NN4Iohj0Rpx7ZWnLKHP64DAKzg5CfwQ5DV2UtRqk="; + types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.12.1" "sha256-mI4T75e4J0jUy3zyhRQTf2BK1G0+dvAIteGUOeoTphg="; - types-aiobotocore-amplifybackend = buildTypesAiobotocorePackage "amplifybackend" "2.11.2" "sha256-vG15+IbQZSoSeXPgZw2YgKFtu6vVLgwHrnvXbUOu7ow="; + types-aiobotocore-amplifybackend = buildTypesAiobotocorePackage "amplifybackend" "2.12.1" "sha256-flDA+ENgxiTyUQYlv7B4Rj8avu+7/8HcDCm5gy1boRQ="; - types-aiobotocore-amplifyuibuilder = buildTypesAiobotocorePackage "amplifyuibuilder" "2.11.2" "sha256-WazM6zeqExvUzf6edTg79q5ghSbCFS+4emllnp2/nGs="; + types-aiobotocore-amplifyuibuilder = buildTypesAiobotocorePackage "amplifyuibuilder" "2.12.1" "sha256-BqRPND+LfrMfs7VffO1GB9qk5WQgqPV+jCpwMp2351k="; - types-aiobotocore-apigateway = buildTypesAiobotocorePackage "apigateway" "2.11.2" "sha256-pb13E6ybvZrt1NfYFqPzkXYSxqFVUuE9Ka3LK6oLLB8="; + types-aiobotocore-apigateway = buildTypesAiobotocorePackage "apigateway" "2.12.1" "sha256-jYW4DedcNBTVplVdOfj6JV8zvY00b6xp8kB22ug5ejU="; - types-aiobotocore-apigatewaymanagementapi = buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.11.2" "sha256-Zgv4BfnwMjZTWnnkvSIZx7jEcYDg088Po8wS3YNnscE="; + types-aiobotocore-apigatewaymanagementapi = buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.12.1" "sha256-y/vhZTSQVANxxNWkbcupu3JjhA1CYwcoY9FjDZMarEk="; - types-aiobotocore-apigatewayv2 = buildTypesAiobotocorePackage "apigatewayv2" "2.11.2" "sha256-kQIc0DS8mgBdBBncavFLo6gYoQbqNzgbhzfN7ZRmZU0="; + types-aiobotocore-apigatewayv2 = buildTypesAiobotocorePackage "apigatewayv2" "2.12.1" "sha256-ZPqN6GmWiB9WOE5iiO86SFHoIF8kj0vKRbWvUupZEbQ="; - types-aiobotocore-appconfig = buildTypesAiobotocorePackage "appconfig" "2.11.2" "sha256-ufFeadCeUuzQlVZEoHKC2bdgsnCni4bUlOVII3P0ydQ="; + types-aiobotocore-appconfig = buildTypesAiobotocorePackage "appconfig" "2.12.1" "sha256-icbJT3C4cHYWVDYDeQWmnFTLaxb1YgOwIOWHasrSEU4="; - types-aiobotocore-appconfigdata = buildTypesAiobotocorePackage "appconfigdata" "2.11.2" "sha256-D6wk/D18H5DSv9rzu61GtO0b4sLUsAbAgDThxM/LXaw="; + types-aiobotocore-appconfigdata = buildTypesAiobotocorePackage "appconfigdata" "2.12.1" "sha256-Uc+eRBHVAfztcsXcGbwjJi4JRM6kQtXkIqhuLGhjwL0="; - types-aiobotocore-appfabric = buildTypesAiobotocorePackage "appfabric" "2.11.2" "sha256-jvO9GCkF6HC7Y/Gallc0unmk0ZX5C6uZDGmxwiHAMCs="; + types-aiobotocore-appfabric = buildTypesAiobotocorePackage "appfabric" "2.12.1" "sha256-AlrHEE9y9q4D5q5M6YiWLTHdbsRBf5i+ifIGcuS8F38="; - types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.11.2" "sha256-Kvu5+auFG7FDR1w/6xv7JWJkEwM+wuaXJHIDIUOgxsg="; + types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.12.1" "sha256-Jg2v0ygeP6UIvNrnyuilzbeCpKSs8L6yGTlh6aAMXko="; - types-aiobotocore-appintegrations = buildTypesAiobotocorePackage "appintegrations" "2.11.2" "sha256-nyJNZejMFYBgTJGjM+ylfHVilA/KrZJ9mJa1m4Ej/i0="; + types-aiobotocore-appintegrations = buildTypesAiobotocorePackage "appintegrations" "2.12.1" "sha256-x6EuJVZJl/mw7wXfJP5djkVKsZ9rxSlAMynlmIeYf7c="; - types-aiobotocore-application-autoscaling = buildTypesAiobotocorePackage "application-autoscaling" "2.11.2" "sha256-RrjOGf342giEftdtYrWN9nuHuxGIX7tC2lyi7kFVGZA="; + types-aiobotocore-application-autoscaling = buildTypesAiobotocorePackage "application-autoscaling" "2.12.1" "sha256-ZLgLJAGtiMUhWWXz2GxwOaxn9CzRh2lWTvhvOrzUDq4="; - types-aiobotocore-application-insights = buildTypesAiobotocorePackage "application-insights" "2.11.2" "sha256-/CRUfLRLggcHpD+H6tsMrJf8kC23qqCtfRUf510MYs8="; + types-aiobotocore-application-insights = buildTypesAiobotocorePackage "application-insights" "2.12.1" "sha256-p96BagoCjYHXqnCQqVMLlwNT6hlkIOhLFmXcXQKZsIM="; - types-aiobotocore-applicationcostprofiler = buildTypesAiobotocorePackage "applicationcostprofiler" "2.11.2" "sha256-uB+lXza3Zyj5ug/1tr5jxhIYDFmy0u/rbLdHQQW33zs="; + types-aiobotocore-applicationcostprofiler = buildTypesAiobotocorePackage "applicationcostprofiler" "2.12.1" "sha256-bDuo8+w6NbWh7vFV488kuS/by+Bb8m3KvKqFtQRJbVY="; - types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.11.2" "sha256-ddng69ZZp8lEEKZAEK/9AMPHBaRpQRmbPVQVQgEpWQI="; + types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.12.1" "sha256-IXg7ZyW6rnpb2XycRLnMcihim4pYIC0iiQlQf07mesY="; - types-aiobotocore-apprunner = buildTypesAiobotocorePackage "apprunner" "2.11.2" "sha256-zn+wgfdLfNzrhmmWaQnnBJw6Mp6FUPSs1Aq4U+QEZZ4="; + types-aiobotocore-apprunner = buildTypesAiobotocorePackage "apprunner" "2.12.1" "sha256-bSEzv5bkO6L0VGrdAmsSeH62wjQWnJu34lGSsa5U/J0="; - types-aiobotocore-appstream = buildTypesAiobotocorePackage "appstream" "2.11.2" "sha256-97aTTprrNQ5fp1Ap2SgliVhz2FweNcWJxmOVf7NGznQ="; + types-aiobotocore-appstream = buildTypesAiobotocorePackage "appstream" "2.12.1" "sha256-pMnJ6CcqhhBGpPG4sPsJUqcCohFZPHQ4nZbM82WhFQg="; - types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.11.2" "sha256-1d4FgrbxzX5jMZEL7ghT4olTTmy18ZK1zaXDWcBoz3I="; + types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.12.1" "sha256-8IyLcQLUg/t/WodMhJkrUnTYOVR5PmkjDtILnzYEqKM="; - types-aiobotocore-arc-zonal-shift = buildTypesAiobotocorePackage "arc-zonal-shift" "2.11.2" "sha256-s9zX+TsBp4DSORJkxZG9VrVmeHuNfeNfv+vZsJXnfSE="; + types-aiobotocore-arc-zonal-shift = buildTypesAiobotocorePackage "arc-zonal-shift" "2.12.1" "sha256-8HP5cQS7p7QyncnccISZHOPIYwWEyMUIz0OEiwoZ0OQ="; - types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.11.2" "sha256-MxbYsiBSryODm6ZuJpb0Jwmiw/k679yPxBIGYrFQFfQ="; + types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.12.1" "sha256-9wlWv7qFWj/bnLIEH2wXGHG0IYvPdEIolDyh9xJsY6I="; - types-aiobotocore-auditmanager = buildTypesAiobotocorePackage "auditmanager" "2.11.2" "sha256-IErQ9xVFHfQKAT4WUvyummuUndVG6azLCflA4e8AcAI="; + types-aiobotocore-auditmanager = buildTypesAiobotocorePackage "auditmanager" "2.12.1" "sha256-/IYKAlDmq/+5jsMcnwmhVV+OMvWP4IcMdrtZ3ocy0ls="; - types-aiobotocore-autoscaling = buildTypesAiobotocorePackage "autoscaling" "2.11.2" "sha256-UJxccq20Wy9A3xDDqpDGGs3KtP8uVFK/G8AFvlJblUs="; + types-aiobotocore-autoscaling = buildTypesAiobotocorePackage "autoscaling" "2.12.1" "sha256-pJZDPqRXSKlDYd57vfJdgbaszKhyvONsgRhHxT7PO3s="; - types-aiobotocore-autoscaling-plans = buildTypesAiobotocorePackage "autoscaling-plans" "2.11.2" "sha256-0LzoSmxim0Ji1qVTKz5aaYNF2ZxSxkJPQsZgl6HBvXM="; + types-aiobotocore-autoscaling-plans = buildTypesAiobotocorePackage "autoscaling-plans" "2.12.1" "sha256-VqO8b8JQX1OzvgHnZZCC6l3a73Ren2b2GphClJBZc/c="; - types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.11.2" "sha256-deC72vTE1w4K2vIQeQMb/38CEBHXhP/koEsVBUZQkxU="; + types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.12.1" "sha256-UMP61m/gcHfc5JUtAoEAIfxdbjntqL7HubUuTb4AfwI="; - types-aiobotocore-backup-gateway = buildTypesAiobotocorePackage "backup-gateway" "2.11.2" "sha256-ggjy2SYEDZgqkvBi7N/mZbScwQNOxQR3Je+UsntPaKA="; + types-aiobotocore-backup-gateway = buildTypesAiobotocorePackage "backup-gateway" "2.12.1" "sha256-bxXM19C5beGNvKV0bXpnU43e3h8UmFJpXc1kmsbeelw="; - types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.11.2" "sha256-ZtC6TpfMQE48ih14/yMm9UVt/nCjVt6Jza0lakE/t0w="; + types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.12.1" "sha256-+y3Xqw/KJqcSC7VMwjN+FZN/MLt0E/UISk+CNRN0lTI="; - types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.11.2" "sha256-DnZ7/CZ2af+DhHKp6LvsuCLfVu43yiwYFRxugEsMEok="; + types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.12.1" "sha256-cX2aVftGdhLDfY3bSSIiFnOV0EPfmlcwrSG7ad+On1g="; - types-aiobotocore-billingconductor = buildTypesAiobotocorePackage "billingconductor" "2.11.2" "sha256-vURVxenciwH3Qwi6FLjsxVkHSVQJ5C63zzb5Npr+Kxo="; + types-aiobotocore-billingconductor = buildTypesAiobotocorePackage "billingconductor" "2.12.1" "sha256-GROhwMYXYrYTChJVlE/MN/EZ0NzOHeSXAfiIuHJG9u8="; - types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.11.2" "sha256-rdH9EaCMApXDf+3ERvNNsvJBtCEqkjf6XpLHTRn4V4Y="; + types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.12.1" "sha256-d9oj+mAHxXapK+756DrglrqlYTOlZQtkFdbh+Ipanqc="; - types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.11.2" "sha256-zaaeXhic5omexJMc5TVAK+ADqmJxkV9YJkasQCfAf/w="; + types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.12.1" "sha256-kCXjo49wwgdVjbI45A+JV0gQbb7FxqSi2rqa41XgrbI="; - types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.11.2" "sha256-nlsx8TDLKC3bTcuHuqACgtgl4OvTjHHYiYXXlk7gbLE="; + types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.12.1" "sha256-RNGUxIvjKqJvOQ3CUjfJWHGD76wUqfev43aCU5Z+5Dg="; - types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.11.2" "sha256-j+RmGyAMnf8a/OztACdfOr/6a16V+SGDPS+ETl0ZetM="; + types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.12.1" "sha256-/EHroPbg5w45i8vqpzLHf8ZpzIWbOLLwwAbP/MZvDyI="; - types-aiobotocore-chime-sdk-identity = buildTypesAiobotocorePackage "chime-sdk-identity" "2.11.2" "sha256-5MtREitAmJ/5cSQDJeYj6SilLfspKWZFTmiTaCsv/a0="; + types-aiobotocore-chime-sdk-identity = buildTypesAiobotocorePackage "chime-sdk-identity" "2.12.1" "sha256-yZbk3/p11XA6y57z58ShBpYzbgmZaqXKFaSjRNLIHAs="; - types-aiobotocore-chime-sdk-media-pipelines = buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.11.2" "sha256-JFZ/ijE1FRCEWMF8wFZe5mA5UW1Y0Xh7A7kVAoG4QY0="; + types-aiobotocore-chime-sdk-media-pipelines = buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.12.1" "sha256-A45a8+rGxkkF+qMNWQOwp3keTnVqitC+T+1cXfpjh4s="; - types-aiobotocore-chime-sdk-meetings = buildTypesAiobotocorePackage "chime-sdk-meetings" "2.11.2" "sha256-FB0X7wR4xvMT9GiyHkDX9lSVxBQVxWs1NG0/rwPpeyg="; + types-aiobotocore-chime-sdk-meetings = buildTypesAiobotocorePackage "chime-sdk-meetings" "2.12.1" "sha256-CBOz1xzJF7502CCcdbVPTnC5lRgDHsRCRQjDhvUJQks="; - types-aiobotocore-chime-sdk-messaging = buildTypesAiobotocorePackage "chime-sdk-messaging" "2.11.2" "sha256-IMRhuNevxyg48ahyKSCJ6ytpX3BEZKPG37du+Vm+grk="; + types-aiobotocore-chime-sdk-messaging = buildTypesAiobotocorePackage "chime-sdk-messaging" "2.12.1" "sha256-IzhApCA/D73+LPyxILQDrKTRABG3kgyVobNdY0L065M="; - types-aiobotocore-chime-sdk-voice = buildTypesAiobotocorePackage "chime-sdk-voice" "2.11.2" "sha256-R18RGbDg393B37iuwi3NwEshVzDZ7iTaTX525MMgpoQ="; + types-aiobotocore-chime-sdk-voice = buildTypesAiobotocorePackage "chime-sdk-voice" "2.12.1" "sha256-o+QL/ujJrHtggWUOTXgE5/EcE5Dsx4EYAOrRbLAV6qM="; - types-aiobotocore-cleanrooms = buildTypesAiobotocorePackage "cleanrooms" "2.11.2" "sha256-AKjMZa6crhEuSl3aHo0op94hlPKKWqXG8w33ipcnuK4="; + types-aiobotocore-cleanrooms = buildTypesAiobotocorePackage "cleanrooms" "2.12.1" "sha256-haTOrvbpW3sM2cj4hhb1higAs/CcBM07bKbeSP29ox0="; - types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.11.2" "sha256-ru9I0dKqFsjaNUhAFLrXh+SPN1HaHCFL+2LRS16+pSI="; + types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.12.1" "sha256-lB7ETrEcEcUN0Wo0v5jfHS/7deB+RigE7QAsRtCm34s="; - types-aiobotocore-cloudcontrol = buildTypesAiobotocorePackage "cloudcontrol" "2.11.2" "sha256-LwgyZxkvTTFgYWsF2kkK/IxflGpyr2oq2CxCMWnMDpQ="; + types-aiobotocore-cloudcontrol = buildTypesAiobotocorePackage "cloudcontrol" "2.12.1" "sha256-9wQePNZU01EZ0HsEri+NhyqbovxKvrq1Ym2X6ZjmpgQ="; - types-aiobotocore-clouddirectory = buildTypesAiobotocorePackage "clouddirectory" "2.11.2" "sha256-0G1EUlW2oDJI0DgsQjZ4NkHIQbKqnvlyMxxrkhj5q8M="; + types-aiobotocore-clouddirectory = buildTypesAiobotocorePackage "clouddirectory" "2.12.1" "sha256-tcapX1pGlYT5I9psU/lhq+ltsYJzhJA8ECopImTBNG8="; - types-aiobotocore-cloudformation = buildTypesAiobotocorePackage "cloudformation" "2.11.2" "sha256-QFupRQ8DtSwddqrTVEUrUjLyKChguEnSmYqvicaJJA8="; + types-aiobotocore-cloudformation = buildTypesAiobotocorePackage "cloudformation" "2.12.1" "sha256-ZDPwZIVtYGjMVYGhwRqHhDgQuGRMPm9nDSf3yXyHDig="; - types-aiobotocore-cloudfront = buildTypesAiobotocorePackage "cloudfront" "2.11.2" "sha256-n/cNWP73Qta8lkXnpvtEOU7vO6IR5n1khlY8G2gZHZ4="; + types-aiobotocore-cloudfront = buildTypesAiobotocorePackage "cloudfront" "2.12.1" "sha256-1SkPaujxS66tXJ7d37AOF5fWJfm6NMMFs3BdCzvFQ18="; - types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.11.2" "sha256-+CRJNZ5W5ZQB7HzlY6IF6fT5a3LF8ES7Cmmts5c8Xjc="; + types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.12.1" "sha256-h/ukCEJa/sU2c54Yt0JccYHUkk57A48hBZy0dixo37Q="; - types-aiobotocore-cloudhsmv2 = buildTypesAiobotocorePackage "cloudhsmv2" "2.11.2" "sha256-RWoizNbfw+Nujlf2Y4vEgVyyyVqmxkBF3wu4Ox7EsG0="; + types-aiobotocore-cloudhsmv2 = buildTypesAiobotocorePackage "cloudhsmv2" "2.12.1" "sha256-ErBwA+z2JvT5xfvoTzsIAVPU8tU08sphFXGw1g3f4yQ="; - types-aiobotocore-cloudsearch = buildTypesAiobotocorePackage "cloudsearch" "2.11.2" "sha256-VncrELHOiw/z4oQ5JTiXQIR0CZdGtX5xQeei1/JdONY="; + types-aiobotocore-cloudsearch = buildTypesAiobotocorePackage "cloudsearch" "2.12.1" "sha256-1olJgbAOkbh9vXli4pcwwJoi1THWtfU8oz9YCj6Ukes="; - types-aiobotocore-cloudsearchdomain = buildTypesAiobotocorePackage "cloudsearchdomain" "2.11.2" "sha256-Ei3/wp0zUE5CitvVf135GF4cW7KAbukDYtS8ZOJPwBg="; + types-aiobotocore-cloudsearchdomain = buildTypesAiobotocorePackage "cloudsearchdomain" "2.12.1" "sha256-aGTQp3cmL7ZWu4g17Rrk5rmiJ4aQRmPk54AGSWkhFGs="; - types-aiobotocore-cloudtrail = buildTypesAiobotocorePackage "cloudtrail" "2.11.2" "sha256-YEPoPUFRt+kiMbABD3fg7W2qYRKblmIG4YjbFTQpAdw="; + types-aiobotocore-cloudtrail = buildTypesAiobotocorePackage "cloudtrail" "2.12.1" "sha256-bM3LaR0mBX7i7hUB4maK7exCplszTtN+I5EllNdXy64="; - types-aiobotocore-cloudtrail-data = buildTypesAiobotocorePackage "cloudtrail-data" "2.11.2" "sha256-3ZLYMHreAEA1j/mp3HJF5rLZ45Nnt5GdQrcFY3Sh434="; + types-aiobotocore-cloudtrail-data = buildTypesAiobotocorePackage "cloudtrail-data" "2.12.1" "sha256-GOm6+wQGXOmJJa7Thw1QwEh7qsfGrmlphlR9jbWVRwI="; - types-aiobotocore-cloudwatch = buildTypesAiobotocorePackage "cloudwatch" "2.11.2" "sha256-gvJyiNl7u79VejEK5eFhBuC1tYK4tMAhAbsnFEfNhYI="; + types-aiobotocore-cloudwatch = buildTypesAiobotocorePackage "cloudwatch" "2.12.1" "sha256-7HPW7wBHzEz3Wf+ExWt0EuLGyMenZLKitxg1vRRLvXg="; - types-aiobotocore-codeartifact = buildTypesAiobotocorePackage "codeartifact" "2.11.2" "sha256-CUiHlJTgSYpYH/6aEyjtsXBbWxFKu4GqTdDn7hP7wHA="; + types-aiobotocore-codeartifact = buildTypesAiobotocorePackage "codeartifact" "2.12.1" "sha256-vbVK79R9VPVVtpqvzhdRiVkLBhfRZgFYcoH7asbaE0c="; - types-aiobotocore-codebuild = buildTypesAiobotocorePackage "codebuild" "2.11.2" "sha256-0gs1j3dJ94suVhfieHwNs6xDmUwN/2VAMUP8F9BQcaY="; + types-aiobotocore-codebuild = buildTypesAiobotocorePackage "codebuild" "2.12.1" "sha256-eXPqgX5MD/aIBxIQjHqyP4I0FJ2l+AHnoiq6RofKY4Q="; - types-aiobotocore-codecatalyst = buildTypesAiobotocorePackage "codecatalyst" "2.11.2" "sha256-7GYiqcO1H1eVojfpfBUHmf7JvePZOAKLu8QSxqTKjH0="; + types-aiobotocore-codecatalyst = buildTypesAiobotocorePackage "codecatalyst" "2.12.1" "sha256-xu7zEVV3AX9ygsYzTjyp1WcA5fEndCu6yCMsCuDnYOo="; - types-aiobotocore-codecommit = buildTypesAiobotocorePackage "codecommit" "2.11.2" "sha256-YHisggElD8iq1DTcrZnIzdFrnLAUWFULgGe7jdm3oWY="; + types-aiobotocore-codecommit = buildTypesAiobotocorePackage "codecommit" "2.12.1" "sha256-IshGyh7RTJDbmcjJ/t1SoeZKd7GnsRrr/kZAXpLZQXY="; - types-aiobotocore-codedeploy = buildTypesAiobotocorePackage "codedeploy" "2.11.2" "sha256-dkyzpYzga1rjIiUAvAYqmvBotq7cbzgujsEdB1ViTZs="; + types-aiobotocore-codedeploy = buildTypesAiobotocorePackage "codedeploy" "2.12.1" "sha256-1ess+WyiHaejghvuESxCHBu7XmGoR9uA3fL21WzhBPs="; - types-aiobotocore-codeguru-reviewer = buildTypesAiobotocorePackage "codeguru-reviewer" "2.11.2" "sha256-hBobZDb4rpMcVkXTWVVRvHTjz+O4num/tLdHc9K+pn0="; + types-aiobotocore-codeguru-reviewer = buildTypesAiobotocorePackage "codeguru-reviewer" "2.12.1" "sha256-o9WfffjQPMU8pgUtQFrj7+CyP87rvalF1qxTTZp/UgM="; - types-aiobotocore-codeguru-security = buildTypesAiobotocorePackage "codeguru-security" "2.11.2" "sha256-UjhVraSTdP6zQNKK7YF7CiR8Y0IglumyKWo4q4+lYEY="; + types-aiobotocore-codeguru-security = buildTypesAiobotocorePackage "codeguru-security" "2.12.1" "sha256-RfKsb90lP57S6kyvfrFGampEGGHr1czQ/+49Oox0rEI="; - types-aiobotocore-codeguruprofiler = buildTypesAiobotocorePackage "codeguruprofiler" "2.11.2" "sha256-A1MNRLeNmKFZWO9VPlYOPiYI1XfMvxau08eu0kt9XH8="; + types-aiobotocore-codeguruprofiler = buildTypesAiobotocorePackage "codeguruprofiler" "2.12.1" "sha256-1AkpcKCrwHIJHO9cFIyZrizSbNeLcjhRbTlvgDz6RJ4="; - types-aiobotocore-codepipeline = buildTypesAiobotocorePackage "codepipeline" "2.11.2" "sha256-1agFA021Ng2yyGZeR6RfnNiajPwLV1hgGH9mnGi54V4="; + types-aiobotocore-codepipeline = buildTypesAiobotocorePackage "codepipeline" "2.12.1" "sha256-0qNifbqbtK/XNo9un7snezMTBw5ED08UxZnHgVJj4HU="; - types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.11.2" "sha256-yBc09bY/svyht27FIcSYGkkLyUeHM97IYB4aVWo8CFE="; + types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.12.1" "sha256-Du4dvdfqQjtRwnomiqtV+T3z65PjomCAkgl1vMAsZ2A="; - types-aiobotocore-codestar-connections = buildTypesAiobotocorePackage "codestar-connections" "2.11.2" "sha256-RSpNT70XrU8ZLRgTgpqiELV4e0WJTtWCTESdGA4mGQs="; + types-aiobotocore-codestar-connections = buildTypesAiobotocorePackage "codestar-connections" "2.12.1" "sha256-wHiMhzwCMPgrtZ650BAsZvgldAzGR6kjnHIQh0B8scA="; - types-aiobotocore-codestar-notifications = buildTypesAiobotocorePackage "codestar-notifications" "2.11.2" "sha256-5DiJoLCkRD5GL+uglCSYQAdrAPrHrk9Eoo0TUoFV6ms="; + types-aiobotocore-codestar-notifications = buildTypesAiobotocorePackage "codestar-notifications" "2.12.1" "sha256-rOKutC1NJS55XJ5sWks++sylGHLOwo1OElz+uZXMhQo="; - types-aiobotocore-cognito-identity = buildTypesAiobotocorePackage "cognito-identity" "2.11.2" "sha256-yf1lZtCRru/n4lWW+8Js75azhW7o1q8dQ7vgwQQpOv0="; + types-aiobotocore-cognito-identity = buildTypesAiobotocorePackage "cognito-identity" "2.12.1" "sha256-aBwQC4hoUaZWbICP74+vy3xocFGHWfB4B5hb+JwMKeA="; - types-aiobotocore-cognito-idp = buildTypesAiobotocorePackage "cognito-idp" "2.11.2" "sha256-GtrQuQBHzkglEMjkYSGoHrOm/LFAAYhKl2JTUpGCFaE="; + types-aiobotocore-cognito-idp = buildTypesAiobotocorePackage "cognito-idp" "2.12.1" "sha256-uVd9KNIMx1p26vaOzlPNM7a0+2SS5ZkfpMe5obGDXiw="; - types-aiobotocore-cognito-sync = buildTypesAiobotocorePackage "cognito-sync" "2.11.2" "sha256-uh+LAEBYuKAK1BJPu6rJtSJcE4TpXV09d9jH20IevOk="; + types-aiobotocore-cognito-sync = buildTypesAiobotocorePackage "cognito-sync" "2.12.1" "sha256-NJVV8lN0HTmASQfqh9fbQSkg2KijOcbHTc8QYgTrY4I="; - types-aiobotocore-comprehend = buildTypesAiobotocorePackage "comprehend" "2.11.2" "sha256-w1FlANcEK/BIDeT+iSJU1FQDidor6bs1w5HNEa1Jj4k="; + types-aiobotocore-comprehend = buildTypesAiobotocorePackage "comprehend" "2.12.1" "sha256-+WMvk9yY5bGHPqd93TWS3XC6XDvTzh54oM9py52pzws="; - types-aiobotocore-comprehendmedical = buildTypesAiobotocorePackage "comprehendmedical" "2.11.2" "sha256-GqWg0H95Z0wNHaSt1R1GnVTGTyZ3Qki9Du4byRRGmcs="; + types-aiobotocore-comprehendmedical = buildTypesAiobotocorePackage "comprehendmedical" "2.12.1" "sha256-KFeZxBzsAZVdpIlvKohBIP3p1yJ14/AHW7sItn6slY4="; - types-aiobotocore-compute-optimizer = buildTypesAiobotocorePackage "compute-optimizer" "2.11.2" "sha256-7TK1QtWs6gVZQO8dTuVs9JG35xlP/4Sk0HCfEDL5cPU="; + types-aiobotocore-compute-optimizer = buildTypesAiobotocorePackage "compute-optimizer" "2.12.1" "sha256-xCFDjZ+tkRs3UWhPu6BpabaKIFWITApu65gFk0hw/Vs="; - types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.11.2" "sha256-oBXLOS4TLGd/6cEVwySUNKXTigmEPFhM4vR+uWC/jCA="; + types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.12.1" "sha256-cQWccDw2YPdj5pXb/H2WaFlWg4BrAg/HNAq6RLAp4yY="; - types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.11.2" "sha256-nRq8rHdQNHpY0O1ft/IOFgiZT+flDoJeYktoIR7azd0="; + types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.12.1" "sha256-zbAIII9gaTJEZEcdd1go00s6PUAZdNtEYlOu0Hz2K5g="; - types-aiobotocore-connect-contact-lens = buildTypesAiobotocorePackage "connect-contact-lens" "2.11.2" "sha256-kSSYE9sHHvWyXQD3+h4zwbmpVE4spdFsVajLrs8wQoY="; + types-aiobotocore-connect-contact-lens = buildTypesAiobotocorePackage "connect-contact-lens" "2.12.1" "sha256-8QSM/rytw1tx8OfL3NQOaxT8D0hlFK4BmaxxPJGpeL0="; - types-aiobotocore-connectcampaigns = buildTypesAiobotocorePackage "connectcampaigns" "2.11.2" "sha256-8h5Uw5dRI0Iq88DKaEkp/QiqsxMpXqT1e0fSCnmeUeQ="; + types-aiobotocore-connectcampaigns = buildTypesAiobotocorePackage "connectcampaigns" "2.12.1" "sha256-QJylFv6qLf+JS2FL2Fs9oXXkTbwgmcxChsXUjoJJIQ4="; - types-aiobotocore-connectcases = buildTypesAiobotocorePackage "connectcases" "2.11.2" "sha256-iCunD1EYNwnwEVE5h83cO8DtgQrfqd2XsjmA6/LUyKk="; + types-aiobotocore-connectcases = buildTypesAiobotocorePackage "connectcases" "2.12.1" "sha256-5rHxLWeR6ElpegaV1lO6Wh8h0DBoZ8S4TblDPMlZvEg="; - types-aiobotocore-connectparticipant = buildTypesAiobotocorePackage "connectparticipant" "2.11.2" "sha256-3szxg0WTtha1txrfidQUwCnwQ+y6DmaFdyRASxNvyPM="; + types-aiobotocore-connectparticipant = buildTypesAiobotocorePackage "connectparticipant" "2.12.1" "sha256-VSno3aW8mDf/yxg0bTERjsERvdd6+T4yOJQdA32o3bo="; - types-aiobotocore-controltower = buildTypesAiobotocorePackage "controltower" "2.11.2" "sha256-Vnc1jV10ylYc1xyIAB05sc6F/mrenB/evzSxUXvksIo="; + types-aiobotocore-controltower = buildTypesAiobotocorePackage "controltower" "2.12.1" "sha256-3G2EarLZAonr/2noJ8sUlrvol6En37NfWqaKWkKUF40="; - types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.11.2" "sha256-GxnIgMuPdhButM1g0WhIY5aozxRVD9wisFI7vg0htkk="; + types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.12.1" "sha256-Q22cMbQCNx57+z5gVRWzEu+NFre7nr43iCfZckmzUqU="; - types-aiobotocore-customer-profiles = buildTypesAiobotocorePackage "customer-profiles" "2.11.2" "sha256-32oCCsq7HRgfuQHxtC8To8YRPPkBYxP+wj8tTxJg74Y="; + types-aiobotocore-customer-profiles = buildTypesAiobotocorePackage "customer-profiles" "2.12.1" "sha256-qMPLsa4euoHZiaRizphbpw4H66mCxZhNKZM1qjILwy8="; - types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.11.2" "sha256-QezthhLSvyrCjlBDgQFJOLd3jdkvf3gYczusxWARUtM="; + types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.12.1" "sha256-ekG77cZnn6V9InRjhqUzJWGs4/ear90bifUP+RwCXz8="; - types-aiobotocore-dataexchange = buildTypesAiobotocorePackage "dataexchange" "2.11.2" "sha256-GZaODMMW3citfIA0EDl8J+Z8T8euCx6pXmm24iL/g90="; + types-aiobotocore-dataexchange = buildTypesAiobotocorePackage "dataexchange" "2.12.1" "sha256-L6bedg9iqlsB+0mt5GaZzB8RRepZGW1BahDXUwfNc+I="; - types-aiobotocore-datapipeline = buildTypesAiobotocorePackage "datapipeline" "2.11.2" "sha256-bkok6yFZG4DOXnweqa1fWxxX5lq4XVN6A/NSrQiAWNI="; + types-aiobotocore-datapipeline = buildTypesAiobotocorePackage "datapipeline" "2.12.1" "sha256-EAkwiRw1PF3+6pdt15onwTBvXXf9f4BLQd6mqDLgYdk="; - types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.11.2" "sha256-lipzCM0iHpHfggorFc67IIRIA7zQkZOFSrNdkZNc1n0="; + types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.12.1" "sha256-JZuIbuaaci7scqF27/7KZtkfpTa+FkE3Ooq84ZjL4Fg="; - types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.11.2" "sha256-cmtSKNzaKuDMKpT2e3FxxGAA3s6fXmnp27g8ZjiuW34="; + types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.12.1" "sha256-wtFXwUfDxUJSjt2FFvt6+eq1vSsHWwvBJvg1pyplX8Q="; - types-aiobotocore-detective = buildTypesAiobotocorePackage "detective" "2.11.2" "sha256-+qeNgy9ZCpx2i7aSSBv6vHJAa11j+YqYbu1e5ebTOkY="; + types-aiobotocore-detective = buildTypesAiobotocorePackage "detective" "2.12.1" "sha256-ydMwZRT9F95KBrvlwGAqjiTiEUVnr0xKElMKz5dgRSM="; - types-aiobotocore-devicefarm = buildTypesAiobotocorePackage "devicefarm" "2.11.2" "sha256-hJ8ajXMmlmUZmKBDYxkUX1RU/8C3xmjb403YzkVzm6E="; + types-aiobotocore-devicefarm = buildTypesAiobotocorePackage "devicefarm" "2.12.1" "sha256-8GRf+xgsv8lTNuRlib78GMOV5gLMxiybo9gqgfL2s6g="; - types-aiobotocore-devops-guru = buildTypesAiobotocorePackage "devops-guru" "2.11.2" "sha256-1ERoQL1dD2Ia1asRDjF/bl/tnKkaKUhd0JkXfsw9zXY="; + types-aiobotocore-devops-guru = buildTypesAiobotocorePackage "devops-guru" "2.12.1" "sha256-Jg4yLzlZGjlHqgKECEgGndcVGc28KCE0C8K4JhpjAXA="; - types-aiobotocore-directconnect = buildTypesAiobotocorePackage "directconnect" "2.11.2" "sha256-EcaX5FjIweqW0hTbhgMm3XFVtnoY/fVt5pAjgm8L0+U="; + types-aiobotocore-directconnect = buildTypesAiobotocorePackage "directconnect" "2.12.1" "sha256-wk0y4voHIlDmBMGTsOukcM4yG9XP4wnQA1WgAUb9T1c="; - types-aiobotocore-discovery = buildTypesAiobotocorePackage "discovery" "2.11.2" "sha256-ZOPuTLIH9Sqojs2jWiskjEqz7LBstS1KyjPCiSnW0Qo="; + types-aiobotocore-discovery = buildTypesAiobotocorePackage "discovery" "2.12.1" "sha256-IctqTU+e65MHeo3Mm+MVzkyrzki8f0eSEWHvzTgTTlc="; - types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.11.2" "sha256-SfzmZe5x4I0TMdfwAu6DFkK2NDgqZrdiXfYzj6FV6/0="; + types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.12.1" "sha256-dHKET+GhbmbRJzoziqtB2H1T36L9lFFU0HtNrPve4/o="; - types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.11.2" "sha256-1ZEKq3hLceAxXAM7PncqWR/XEri75Moyno/yg0szG+E="; + types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.12.1" "sha256-RIm9mkVCGtpMdib6ObpPxJgiME15tT9wm5UrQjLYicc="; - types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.11.2" "sha256-sFS4uLPnOltigByAzretunrrS/jabDft6tTX68+uXnI="; + types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.12.1" "sha256-F3BHJezYz2fHG/76JnOrc8J5jgAEJx82I+Lzhput4Bs="; - types-aiobotocore-docdb-elastic = buildTypesAiobotocorePackage "docdb-elastic" "2.11.2" "sha256-2Ay4Bx3txzhZMaOwFJRsTt7w3qCr2bS2KsoDg9Apxbk="; + types-aiobotocore-docdb-elastic = buildTypesAiobotocorePackage "docdb-elastic" "2.12.1" "sha256-GA13WEdMqY8SUctSK5o9N6B6F35RySbUQS7XxleRak0="; - types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.11.2" "sha256-j1tX8XGhYVRWw3XJosccmWRPLJRzjfoZpEsEWW8KrcU="; + types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.12.1" "sha256-oMsLU3UfvqACSteoKKALYNV2qnXnxDkmE+TaVJV9cG0="; - types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.11.2" "sha256-wUF8YcVlSop62Bqsr3yx7JnlLFOKZFY9ZOQPp+IArOY="; + types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.12.1" "sha256-2FfD3ck4faAK5s85ELfI1jPH7icQZh3a8ALDIGxpBz4="; - types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.11.2" "sha256-nBxKLHdId11mo/0P4LFgKRUoBXum2OHtJO7wjy0yK/o="; + types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.12.1" "sha256-mi1byiYu/T2h65HtTgygYXS1tNxiDhnsIH+FGGpFq1A="; - types-aiobotocore-dynamodbstreams = buildTypesAiobotocorePackage "dynamodbstreams" "2.11.2" "sha256-7/Yt+rhmXoJaTyXv/cApcI6GUE0bqYaIDaLlQr6/vlA="; + types-aiobotocore-dynamodbstreams = buildTypesAiobotocorePackage "dynamodbstreams" "2.12.1" "sha256-y7lR076HGKvwzK4AFExfys6yvddmHmH/h0Klb7ExIKw="; - types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.11.2" "sha256-g4soKEa22SWyE8Sq7lemBWMEjzvS47Xp3ykQoccWg6A="; + types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.12.1" "sha256-ji1opGGeCLCMvpYkbwKQ+bkEGkeV9ZhuxZ3uIcT4Vmk="; - types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.11.2" "sha256-QbLjyIptZJoKm79byEABhg5TWPjbHTmq2ReibuC22+s="; + types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.12.1" "sha256-Ep4MKh26Iv+2LE/BKQBF5gX539ujCIzb4uaeHdd3vK8="; - types-aiobotocore-ec2-instance-connect = buildTypesAiobotocorePackage "ec2-instance-connect" "2.11.2" "sha256-pk6rOYhNMnCTxlDpRC+b2TlWCTfr9sVrV/OVaTV4Tzo="; + types-aiobotocore-ec2-instance-connect = buildTypesAiobotocorePackage "ec2-instance-connect" "2.12.1" "sha256-UQJvL+kpS1A2ptVpWzDEBvLntIZiyLJu3IwASJQd+ik="; - types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.11.2" "sha256-BJp+XxIXv1LM6nQLyjo7cPHxU02SQHcace2Y4rb14ro="; + types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.12.1" "sha256-dOp+qRCpF+1hLgdlQTaLQcCEpST44ajxeJeepOwcU+U="; - types-aiobotocore-ecr-public = buildTypesAiobotocorePackage "ecr-public" "2.11.2" "sha256-6rVdyPkUOsr6mpfr1jlsbGt9WN+vVsRyzxG/WrpelyQ="; + types-aiobotocore-ecr-public = buildTypesAiobotocorePackage "ecr-public" "2.12.1" "sha256-wwcl/GCHz17YisIylvjtkMXiRlqcHX8pf3K0sy2GtL8="; - types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.11.2" "sha256-IvTlBjwLhphGUD/0uMkqePhEwStxj+YPVVMY12ElfvY="; + types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.12.1" "sha256-yVwVId7K3DLWTjgk3tLywZhgnAxFGEi2oAKfXfdO18w="; - types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.11.2" "sha256-jov1KwnZWbuMUpL3OVqrI+EHIR6WResabp20owGIvGA="; + types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.12.1" "sha256-hk9CLjWumjbT4EUGQnXytjgc6qgeCQAJx51d2TK6u9U="; - types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.11.2" "sha256-qTA88Wux/Ns7dHfRPwG1ZFWNTtSUGTcw6L+Nake+YGg="; + types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.12.1" "sha256-fGSU2Xx8VF/R3tFwqJlJGcgq4Mpv/NevgMsE0IVzRrY="; - types-aiobotocore-elastic-inference = buildTypesAiobotocorePackage "elastic-inference" "2.11.2" "sha256-POTPmu22698IeVAhpxh2kWk+OwTv2fBSm9KAhJ/MiQg="; + types-aiobotocore-elastic-inference = buildTypesAiobotocorePackage "elastic-inference" "2.12.1" "sha256-4SkFFVNIyY0vJjZ2uIwwyrN0LiOTj/6Oo1vWagRJtM4="; - types-aiobotocore-elasticache = buildTypesAiobotocorePackage "elasticache" "2.11.2" "sha256-LC5g7bf5jAc4Llo6rukPb2WYf5KqvUweQ52u2zsXAQE="; + types-aiobotocore-elasticache = buildTypesAiobotocorePackage "elasticache" "2.12.1" "sha256-5X5icBKyZRNawv5lJzfDcyD2tFC9eLlJNHogV3ZM3tQ="; - types-aiobotocore-elasticbeanstalk = buildTypesAiobotocorePackage "elasticbeanstalk" "2.11.2" "sha256-L3Pti+JnFCFGo+0v82sQK73aHKG5Lgbm6shPCvF4Wug="; + types-aiobotocore-elasticbeanstalk = buildTypesAiobotocorePackage "elasticbeanstalk" "2.12.1" "sha256-U9xp81RqyuAFNNYkYSjIpRBfsXKZanunVWAmAfR/ZVw="; - types-aiobotocore-elastictranscoder = buildTypesAiobotocorePackage "elastictranscoder" "2.11.2" "sha256-PdWptyC6jP53Lv8JDPMbD+KE32nXltpOeXOXt+yBqZk="; + types-aiobotocore-elastictranscoder = buildTypesAiobotocorePackage "elastictranscoder" "2.12.1" "sha256-Ggq93JeHa5+2hSwyHcFGRU7rMGHGPMAqaJPZj2KIUUU="; - types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.11.2" "sha256-PzGkhg0Ole3nVSkPzLzGhCXR7O6tQXQI/fyG/xWF5NU="; + types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.12.1" "sha256-LzHkiRKqmdD/iXZhJu1G9eLltFJcIFwBhgiLgywyOcA="; - types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.11.2" "sha256-pxf7oIi/KDjuAJPKA/blGpBTtSsbW6VQR2GIIG4Xg6I="; + types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.12.1" "sha256-g1ozRS44owh8ogisOE7ydF7omi9LPdXLxO2JaEWDmlg="; - types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.11.2" "sha256-nI1XjcxmEBZs63d9EO+rQfqyYQMOBJXOdLI+EaNZsgY="; + types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.12.1" "sha256-14akL+yzo3/uV9Qsdpewt4Y88ghxVbV9aL6e8Qe+FFo="; - types-aiobotocore-emr-containers = buildTypesAiobotocorePackage "emr-containers" "2.11.2" "sha256-i37s9KpOUqbO8xAgFtU0tNlSZUqvxQjI6D2mMmjbTOs="; + types-aiobotocore-emr-containers = buildTypesAiobotocorePackage "emr-containers" "2.12.1" "sha256-zOLyra/2uaqKl1t5Z2FVyLqtMmlYRZFN9HaCd+ocXi0="; - types-aiobotocore-emr-serverless = buildTypesAiobotocorePackage "emr-serverless" "2.11.2" "sha256-gaSCCHUbA5XqpXwls5f6LR9BfA/V4eECsRVfat+tLw0="; + types-aiobotocore-emr-serverless = buildTypesAiobotocorePackage "emr-serverless" "2.12.1" "sha256-clBwlUdU9v90NEm744l6OB3QHuB+aUC3kQjLuHNKFdU="; - types-aiobotocore-entityresolution = buildTypesAiobotocorePackage "entityresolution" "2.11.2" "sha256-sKRdHC1b4LhoHMo1ixwIEMFgKzn4oAMf7Hd4kPpAGNA="; + types-aiobotocore-entityresolution = buildTypesAiobotocorePackage "entityresolution" "2.12.1" "sha256-3onJrgPQlgcNGPIUypd/ke5y3j4qt6vWF0fVgcwYsOg="; - types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.11.2" "sha256-2mSA+/Ad1gok69+r7E/euPzKOj82e38Qn+sXWTfvoPk="; + types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.12.1" "sha256-pgQ7UDfnBaITqhrRoxze9jTLaxyUR2MubCWc+VfQS6c="; - types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.11.2" "sha256-tkrTtagj15JMTRSKD6qCqew4zo+i4IOl8KxBtgoREno="; + types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.12.1" "sha256-zdeJ+xc6KaAc0wcBsRQq49GvkK735LgTBHOKALjXPPk="; - types-aiobotocore-evidently = buildTypesAiobotocorePackage "evidently" "2.11.2" "sha256-Cj7UZddP4zWjKehjFL6S7c89hu6lZKe2muZ+vZQYLEA="; + types-aiobotocore-evidently = buildTypesAiobotocorePackage "evidently" "2.12.1" "sha256-BLolxhY1yHTi5jQajuJpBj7GtKAtxhVjkIN+X1yvGmY="; - types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.11.2" "sha256-nCFS8zPgut2AUT+e6ZKwa4mP2yUuSyWB4ouuqDZaJZY="; + types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.12.1" "sha256-Rc7iPcraCISAebFQzU+Yxll+fYwi5b2hYO/3d1I3RRY="; - types-aiobotocore-finspace-data = buildTypesAiobotocorePackage "finspace-data" "2.11.2" "sha256-5z1ek7Euei7r1XSygNM4qZEaDrGeC4XMFIeGvg9qJV0="; + types-aiobotocore-finspace-data = buildTypesAiobotocorePackage "finspace-data" "2.12.1" "sha256-B3RJZRLKtz+CBOnRo0YcqdHhUc3P1Owjk2EwNChrnK0="; - types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.11.2" "sha256-ATPvNRegT/EjVJCGY7sl6ayiMC8+B0GMyfQEpOnWfyI="; + types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.12.1" "sha256-D0+FLyDYDx4xroVaANmyQq5qLPGUdDfgPMtSKfVAiUg="; - types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.11.2" "sha256-PBRTNQeoBf8Sqd4zYQYJ4h/wZWHT1LY1LodceA4SzLU="; + types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.12.1" "sha256-C99pmPa7zV9DZrc9stWxV9EPbJXwxslMyynj2PhbtDA="; - types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.11.2" "sha256-83W6ys3ZBuC+RINAiqZZ9t9/pJVV6vSqW0w7B6cA9uw="; + types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.12.1" "sha256-/oj+/dwtRXH8WD5QWuxJTLfNfhqwJmdXJROHUzzzF68="; - types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.11.2" "sha256-nWsEp9VH2JsMnQrVRuALqc6EUjtfkge8E86XB6koHcE="; + types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.12.1" "sha256-POwSXbfBT9xTA+b2dNFv7ONfYSv+N/Td9FW7EPDYbmA="; - types-aiobotocore-forecastquery = buildTypesAiobotocorePackage "forecastquery" "2.11.2" "sha256-Sne3DwWkPz0CqmOlbxLcR9ooSW4soLSuNPNfs9L9pAo="; + types-aiobotocore-forecastquery = buildTypesAiobotocorePackage "forecastquery" "2.12.1" "sha256-twtNBD27WYeuJNI5FuA6C98b5wjkRJSRqHmZ1fmArAc="; - types-aiobotocore-frauddetector = buildTypesAiobotocorePackage "frauddetector" "2.11.2" "sha256-zQ50MEleTedxViEOOs2u5GJSs36zRw7crvMA3h7FLZU="; + types-aiobotocore-frauddetector = buildTypesAiobotocorePackage "frauddetector" "2.12.1" "sha256-YDub5fFJg5efes6BtnwVEKnKhbbmDuyFHNTQ6O7SgOI="; - types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.11.2" "sha256-VTjXUrEzhGuT2YjeTdY4IKxa/DxNmfnPEnZ7vQoAzKA="; + types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.12.1" "sha256-lsDu0YT6015Or5STid9M8mbLXWxu7UkKgQHwTkgwnpY="; - types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.11.2" "sha256-AgZvipboBZnhSlC7K0JRFpH8Z4pNPT2UfdXYjshxF8Y="; + types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.12.1" "sha256-SX7bzOCoV3v6+CVb1eBfm6AxLRivUJ1zbZtxZ7D1jvg="; types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; - types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.11.2" "sha256-qDj9RSbqHPpJ5yU+AXPeA+umbbSrf2Ssu1g0aiLvnMw="; + types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.12.1" "sha256-qKEzg0ruG6E8DPsi+xsJF5rbmcEraLrS0gQr3It8io0="; - types-aiobotocore-globalaccelerator = buildTypesAiobotocorePackage "globalaccelerator" "2.11.2" "sha256-Ef+Ujeoc7gSrtjNbPEd4Y1F1eP4c4WKwRBIbbiCe/d8="; + types-aiobotocore-globalaccelerator = buildTypesAiobotocorePackage "globalaccelerator" "2.12.1" "sha256-fjve8IEN0KcejFBwUxO1rstv8/CA0g0pS/0lxfnZx6k="; - types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.11.2" "sha256-CvNGo1MNUf4GONCR8cISV8eC/ZcTeI1hgqb5WB+aZnI="; + types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.12.1" "sha256-JYo3D3i2FtCKUatnLyDWW8YGB9u0SzQwDeC0tIBULms="; - types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.11.2" "sha256-Nv4t50tCoOFp7GhVhNkUldUyQsTj7aY0QnfXzIl0BfY="; + types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.12.1" "sha256-fByRGOJ1TnfnPB6czGYyjvKOop6chA7fiatsVPKCxys="; - types-aiobotocore-greengrass = buildTypesAiobotocorePackage "greengrass" "2.11.2" "sha256-FvrpT2aOOD93rSy3c8VoUQAt9q0pgvoL1PaBccSCw00="; + types-aiobotocore-greengrass = buildTypesAiobotocorePackage "greengrass" "2.12.1" "sha256-QhTA5b8q6LDdHVeN0M0mT/XLKTfDHIY71EXUCtSCqbI="; - types-aiobotocore-greengrassv2 = buildTypesAiobotocorePackage "greengrassv2" "2.11.2" "sha256-x9x7Hmrm6XTDrFKT2ZmMy3kaRFAu22TEe3Miv2F6H0g="; + types-aiobotocore-greengrassv2 = buildTypesAiobotocorePackage "greengrassv2" "2.12.1" "sha256-b6DO2ZGOBzPZ311Fj+il6pkBmSXPKe12Ssua9T/mdjs="; - types-aiobotocore-groundstation = buildTypesAiobotocorePackage "groundstation" "2.11.2" "sha256-eds5ZF/JpTaZyEg91RkID5sjy6gBVnixvNOUkO/gStU="; + types-aiobotocore-groundstation = buildTypesAiobotocorePackage "groundstation" "2.12.1" "sha256-XzlCvtOwGPUQEkU1HiGYeeAWuRAQpRnXDcgyblykJEE="; - types-aiobotocore-guardduty = buildTypesAiobotocorePackage "guardduty" "2.11.2" "sha256-zj0sU8OWIFHKD/A4fbGytLeNQhyfdEg/ANSfM74ySrk="; + types-aiobotocore-guardduty = buildTypesAiobotocorePackage "guardduty" "2.12.1" "sha256-Y3FDX5NPe+s0CBawE0OsXaIBPhe4wfEoLOEhDLRl6Sc="; - types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.11.2" "sha256-r+oyRLvZP0H5UOmW0UK9qRNDLCPhvsUQrsO2DGA01Lk="; + types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.12.1" "sha256-/Dn89WzfH67/4MFpkCHW5FGNdKDR5xAqZogAoo0uTb0="; - types-aiobotocore-healthlake = buildTypesAiobotocorePackage "healthlake" "2.11.2" "sha256-gg4maW0abnPj+1+qJCykrjdS0c7Lb71H3zhQPMltZcQ="; + types-aiobotocore-healthlake = buildTypesAiobotocorePackage "healthlake" "2.12.1" "sha256-K05QqhDzTN9S4xz9nYX/HMjtYQPRsUjo/lua+15kreA="; - types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.11.2" "sha256-h+Mi42MOl8GHLdVJUu024Y5ICtQcHVY6odyxH/eAl1g="; + types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.12.1" "sha256-N/RNj96TYYIEF8tM4T1O9A386rWpey7vNeENARYuVR4="; - types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.11.2" "sha256-fXk5xj6lJPosnlUBTcPM0dwYv+TEf2OeXcZQEKrK2cY="; + types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.12.1" "sha256-m297NaucGsLk8wkezGmktS5L7dtvEHAclGDYo2LhOy0="; - types-aiobotocore-identitystore = buildTypesAiobotocorePackage "identitystore" "2.11.2" "sha256-T/91ZTr/RsNj2WcwvlC8QVbglJgH3yu0hTDh0kb3Euk="; + types-aiobotocore-identitystore = buildTypesAiobotocorePackage "identitystore" "2.12.1" "sha256-IpOR07RxE9OSF5Ia4haHw/N/SMIL6QWqNfmqhZrh5WI="; - types-aiobotocore-imagebuilder = buildTypesAiobotocorePackage "imagebuilder" "2.11.2" "sha256-tZHFF9JmYUJ+0mFXuWBHNfi+kEhi46J3jjTnA17B9V0="; + types-aiobotocore-imagebuilder = buildTypesAiobotocorePackage "imagebuilder" "2.12.1" "sha256-SHfM9cerQSj7NmBHkC++6U5O9jOM3O0wWUXnu58nmRU="; - types-aiobotocore-importexport = buildTypesAiobotocorePackage "importexport" "2.11.2" "sha256-E2Roi3zEeim9R0fXXwgi+bEB9bDBC2Eev2lI/6Lfrmw="; + types-aiobotocore-importexport = buildTypesAiobotocorePackage "importexport" "2.12.1" "sha256-sflWs79vrb2/CW+Xnh/94qe97plOyzXqwn+wzYHRNrk="; - types-aiobotocore-inspector = buildTypesAiobotocorePackage "inspector" "2.11.2" "sha256-Isl+sNzDxiv3sTuBkL8MkcaZW1yB8O6j7kTXGPgcHW4="; + types-aiobotocore-inspector = buildTypesAiobotocorePackage "inspector" "2.12.1" "sha256-EpF8oSl8c2CCf6c+R2Y+hvlfjGqxtLJfMFuABrUbb0c="; - types-aiobotocore-inspector2 = buildTypesAiobotocorePackage "inspector2" "2.11.2" "sha256-Nq2mUWIzziku4bcyjZQA9/luP8q0tyGOkNdHr1Rem80="; + types-aiobotocore-inspector2 = buildTypesAiobotocorePackage "inspector2" "2.12.1" "sha256-/WC/HvLK+BYcWWRvoNaLPwVoFSnTEDedqOA1zqiNYh4="; - types-aiobotocore-internetmonitor = buildTypesAiobotocorePackage "internetmonitor" "2.11.2" "sha256-g8CL+bL2P4STnx6937WNozQ1QL2EWjCMrTjS+jYTPCI="; + types-aiobotocore-internetmonitor = buildTypesAiobotocorePackage "internetmonitor" "2.12.1" "sha256-nnvd49vG1ZofJbWAnr1ZUsSFT4Jgmnde4mTVb8bjX8w="; - types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.11.2" "sha256-QKhDQUOfoFJTzJn5cG8USV2503MzPHE5jFlHqMKhn/A="; + types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.12.1" "sha256-0/b7nYgrFnOComNlfvx0c+phkqsLTlQBQGubp1Md1AU="; - types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.11.2" "sha256-+UFQoQI1ZHQHryki1SZi6SRyEQHImAxmFsL9MHuY+Hk="; + types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.12.1" "sha256-FRCda6jDLcl1tI6PwTaYydY3jzrtJvmYlKvyCR766fM="; - types-aiobotocore-iot-jobs-data = buildTypesAiobotocorePackage "iot-jobs-data" "2.11.2" "sha256-ZZyQXut8dYT2uTYrrugoHd4DPNDHz53uCbIcUc1ibD8="; + types-aiobotocore-iot-jobs-data = buildTypesAiobotocorePackage "iot-jobs-data" "2.12.1" "sha256-OkKiROSuCZ1Dy2/Jeoby0J3obSRRXToTUUUfY2bwlVk="; - types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.11.2" "sha256-65n/QRMNxmXysRtdQajwAN2yX00MpcM6045M65k3fQ8="; + types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.12.1" "sha256-Mstavqb84CltIUmh5aw+Q5+6+w90ErjP9MYlsFrQSZQ="; - types-aiobotocore-iot1click-devices = buildTypesAiobotocorePackage "iot1click-devices" "2.11.2" "sha256-n01JfOuAJa1M1lxV/IjM1w7kws8UpfI5/Wx5jxqrB9w="; + types-aiobotocore-iot1click-devices = buildTypesAiobotocorePackage "iot1click-devices" "2.12.1" "sha256-+JiJr+Vvn1MZEKtRAtNNTlv9JEiX4hCzF0mcrCZBnvY="; - types-aiobotocore-iot1click-projects = buildTypesAiobotocorePackage "iot1click-projects" "2.11.2" "sha256-8pX6X71farX+IXR/LSfEU1LNul2/T7qCnAXwsuGBZI4="; + types-aiobotocore-iot1click-projects = buildTypesAiobotocorePackage "iot1click-projects" "2.12.1" "sha256-044QFOHWRDFqiOA/JQ904BO46+P+/GWyqJrW+FyFs+w="; - types-aiobotocore-iotanalytics = buildTypesAiobotocorePackage "iotanalytics" "2.11.2" "sha256-JAUUApgPoSlv8ZJY+WX3+Aetey7SXIpqxWs3gbrgW3c="; + types-aiobotocore-iotanalytics = buildTypesAiobotocorePackage "iotanalytics" "2.12.1" "sha256-2ZCngNUtPYX1m173bPtZ9Xn4t8bVSZ4IQG2Rlux/aAs="; - types-aiobotocore-iotdeviceadvisor = buildTypesAiobotocorePackage "iotdeviceadvisor" "2.11.2" "sha256-AieTPU2zw4m7cFITd3udE03Yq/wlZFuwOCVb9vy83vk="; + types-aiobotocore-iotdeviceadvisor = buildTypesAiobotocorePackage "iotdeviceadvisor" "2.12.1" "sha256-9Zby+hIaVQuoqHcSRulQ8+F4RIgTHzfNPSUcEm6x430="; - types-aiobotocore-iotevents = buildTypesAiobotocorePackage "iotevents" "2.11.2" "sha256-kLODxMyHr7oo9LruKVl2ncg5Fi8GkSEfKoe2VqmbEeI="; + types-aiobotocore-iotevents = buildTypesAiobotocorePackage "iotevents" "2.12.1" "sha256-eIGobenbMUDi7cuh28zbb2BP6IIsAxmOU6sj5dSJwbU="; - types-aiobotocore-iotevents-data = buildTypesAiobotocorePackage "iotevents-data" "2.11.2" "sha256-uVsWsZy8xAISqNpPN7qctpxhfkaS4XXshG+iCpSqi58="; + types-aiobotocore-iotevents-data = buildTypesAiobotocorePackage "iotevents-data" "2.12.1" "sha256-yWAqc6peQ/fpKo9aokUzSHAq4PCuwKGzYUUsnxVEuCU="; - types-aiobotocore-iotfleethub = buildTypesAiobotocorePackage "iotfleethub" "2.11.2" "sha256-+mmy4nqLxHuQ1xxgztft0g3uyoNXd56C6wwL7aQ2ono="; + types-aiobotocore-iotfleethub = buildTypesAiobotocorePackage "iotfleethub" "2.12.1" "sha256-/G5zzVrwFwalyD/k0liRV0jI+zREXYEu35d8sQutKIc="; - types-aiobotocore-iotfleetwise = buildTypesAiobotocorePackage "iotfleetwise" "2.11.2" "sha256-57fg4yeNePHkyvFN1rrGn0zh576dPAFkqroSm+Tp7Tc="; + types-aiobotocore-iotfleetwise = buildTypesAiobotocorePackage "iotfleetwise" "2.12.1" "sha256-c9z+iY9RNWFO3U+88O+FQPGLMbFTtOUrXu7E5Iq5n8g="; - types-aiobotocore-iotsecuretunneling = buildTypesAiobotocorePackage "iotsecuretunneling" "2.11.2" "sha256-hvJs4KzaTK2ougi16IrVhD9kHnHl7HN4xLhUqVcDNQg="; + types-aiobotocore-iotsecuretunneling = buildTypesAiobotocorePackage "iotsecuretunneling" "2.12.1" "sha256-2PstSZB2bk+Sz9q9DsNX0GoVGFwiYx/YOjlH1wZchXk="; - types-aiobotocore-iotsitewise = buildTypesAiobotocorePackage "iotsitewise" "2.11.2" "sha256-qOfVU9YH1xYLORFeeSBAE8biTHvpiBcgzvvQXZYvtmI="; + types-aiobotocore-iotsitewise = buildTypesAiobotocorePackage "iotsitewise" "2.12.1" "sha256-lgn9uGyoyF5CAgOOpHRGdjMjb78u9EQ0Nf9QTzyyW5U="; - types-aiobotocore-iotthingsgraph = buildTypesAiobotocorePackage "iotthingsgraph" "2.11.2" "sha256-XrLIkbqPoCOch+J8Gt9z4JP+4tyA7qkcqDMv+lF4Qe8="; + types-aiobotocore-iotthingsgraph = buildTypesAiobotocorePackage "iotthingsgraph" "2.12.1" "sha256-Fy+88mBmjUgnRUqM2VLvvI5SWuY04o1aq4WHNk69B7w="; - types-aiobotocore-iottwinmaker = buildTypesAiobotocorePackage "iottwinmaker" "2.11.2" "sha256-+C/oOZEJ/qqu3YhDgrr8evDEBN63QAT6P6nes3T7sSI="; + types-aiobotocore-iottwinmaker = buildTypesAiobotocorePackage "iottwinmaker" "2.12.1" "sha256-yhSsgqu/fPILYTEOuL+1g5bKC3V7nyegYg8WPO8/vQI="; - types-aiobotocore-iotwireless = buildTypesAiobotocorePackage "iotwireless" "2.11.2" "sha256-BTvtuBIj05XJLe2XXkxeZbddmevzXAoxylfpEE0L3PY="; + types-aiobotocore-iotwireless = buildTypesAiobotocorePackage "iotwireless" "2.12.1" "sha256-y4nUuqr++tjN7/JT0cYM5aY01iOGNXU57fjZUTJuP5E="; - types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.11.2" "sha256-dxovawH56iI3UmWpUTPl3utJOp1XGYk6AVGTTq03Aa4="; + types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.12.1" "sha256-vXYET71jHEMKdA6mFFVjjv1uK4tREDu5vXfXh5dOwZA="; - types-aiobotocore-ivs-realtime = buildTypesAiobotocorePackage "ivs-realtime" "2.11.2" "sha256-hYrdXBE0DQy0k0TM0WpuxSIvmnq5dF2nyy+RHt7q5QM="; + types-aiobotocore-ivs-realtime = buildTypesAiobotocorePackage "ivs-realtime" "2.12.1" "sha256-mr+I1UbBSvw6y33vuSwaqCyT33zA1LhJmsvnkYL6970="; - types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.11.2" "sha256-yRPTeOjvFUaU0Pt4IydYSHNZvf4egj0jNj9uF9Z3s3w="; + types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.12.1" "sha256-OXY0CRbaYPyOw68acgRJ0bHiy96dc70f30PbC8X7gSY="; - types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.11.2" "sha256-qcNqcSME1ihk5i0cjoe4XsEiM9oafjYNaESU8zxaNp8="; + types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.12.1" "sha256-knkfB2mafoeDKpNdnAZoOgcym/Qd3JraROwqneN9GPg="; - types-aiobotocore-kafkaconnect = buildTypesAiobotocorePackage "kafkaconnect" "2.11.2" "sha256-gkPedqkyaElW78yq7xC0Afswcs2SAiAPgKuFMOqpr+A="; + types-aiobotocore-kafkaconnect = buildTypesAiobotocorePackage "kafkaconnect" "2.12.1" "sha256-40wG7JtuSibwSMl0XCeOxvJlYKBNc6SmyrxHYRLYtxc="; - types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.11.2" "sha256-2Gqu/wamqCf8r7XQjMotNVesvlQQKFY+v2qhFGEq7Bs="; + types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.12.1" "sha256-MqwoPPEnEv7uLRE+U5vFge2vr3/g5iYnyztbKJ9/ATc="; - types-aiobotocore-kendra-ranking = buildTypesAiobotocorePackage "kendra-ranking" "2.11.2" "sha256-TVhSsL/6ZZImHdwIi66UsS6WxnDb1ZSJO09QdZiazbI="; + types-aiobotocore-kendra-ranking = buildTypesAiobotocorePackage "kendra-ranking" "2.12.1" "sha256-P25wxbzWNmFdcCR6eX+M27jMqQzCdM4L1AerLzltIUg="; - types-aiobotocore-keyspaces = buildTypesAiobotocorePackage "keyspaces" "2.11.2" "sha256-VTi7r0qB1O4zaS/VnZ+dItsOLbvZytEhzYO6yO5WoQg="; + types-aiobotocore-keyspaces = buildTypesAiobotocorePackage "keyspaces" "2.12.1" "sha256-eMucpOTz1CpzfAuJIyAkR1Kr0qF1F5B03qpcNHR6c/Y="; - types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.11.2" "sha256-yybY1DIO68QDlsFwly6tvdf7FfFTIVWYgSKYVfL2jxw="; + types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.12.1" "sha256-J7U0j1XJB2ikTT1IfLcxltTczzqWDkmTP/8I/QIdvlE="; - types-aiobotocore-kinesis-video-archived-media = buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.11.2" "sha256-RV9DyGgCrTfP0f6MxJFyqzWlKDqyewB3M/EM/m9og/Q="; + types-aiobotocore-kinesis-video-archived-media = buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.12.1" "sha256-y7ALdUdp9fTc2b2hVtufJATcm8c8YjbR/fEnX5ynbX4="; - types-aiobotocore-kinesis-video-media = buildTypesAiobotocorePackage "kinesis-video-media" "2.11.2" "sha256-lV6aNCvVNULd5foNDHpIdR+9XshDlDPtM3YN4P0c4Q4="; + types-aiobotocore-kinesis-video-media = buildTypesAiobotocorePackage "kinesis-video-media" "2.12.1" "sha256-jKMh2sbz1kIuKmx6qZYj+ZhMTaAORLux+X6oVrno8Fk="; - types-aiobotocore-kinesis-video-signaling = buildTypesAiobotocorePackage "kinesis-video-signaling" "2.11.2" "sha256-KsKInDsGfipueDGMmPmQKoeG6DYK8e9FpgrrO7pPwNY="; + types-aiobotocore-kinesis-video-signaling = buildTypesAiobotocorePackage "kinesis-video-signaling" "2.12.1" "sha256-DrZHSwqfQZ+mn5wmuWR3MbjolGkOg7mmnKr5uI/NGWo="; - types-aiobotocore-kinesis-video-webrtc-storage = buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.11.2" "sha256-B3V1ho4oPas9UD6YCDpUl3if69dJlTRSxSLzHPa6Ias="; + types-aiobotocore-kinesis-video-webrtc-storage = buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.12.1" "sha256-38R/9LUDMvNhAXmEA2sMR4KE+jB6O0hHJLaowPEnlMQ="; - types-aiobotocore-kinesisanalytics = buildTypesAiobotocorePackage "kinesisanalytics" "2.11.2" "sha256-32uEJswxpS4CptKIV7vBZD6DjzlSuhptNfULE9Fcikk="; + types-aiobotocore-kinesisanalytics = buildTypesAiobotocorePackage "kinesisanalytics" "2.12.1" "sha256-LnyZhLCGcN0Qbam0x+ALYGZlYky/ldLUg03bxRlyhf8="; - types-aiobotocore-kinesisanalyticsv2 = buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.11.2" "sha256-R/s7CD1hAlNsvmMe7PCzZL9xIV8O21lZgMXtzqib0IQ="; + types-aiobotocore-kinesisanalyticsv2 = buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.12.1" "sha256-giSsTelOj3/bF5uPHx6WJhdKtqL6QljcU3l+Tp7aR4k="; - types-aiobotocore-kinesisvideo = buildTypesAiobotocorePackage "kinesisvideo" "2.11.2" "sha256-nRRSzjYxQDFvfD4fuTWl+LfyPg5RoNHg8loGDxzVVrk="; + types-aiobotocore-kinesisvideo = buildTypesAiobotocorePackage "kinesisvideo" "2.12.1" "sha256-lmaTXcxKgevwoWJeUxTHmynCcZaIHXmnJjjvFAARLJw="; - types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.11.2" "sha256-e9y0ZjEzAr41xE2jSc5xCeftDK7EEg/SKqkgWkkMeRE="; + types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.12.1" "sha256-vonZnhR5Rh2ZVlXlBTuSfE6ipVliGKMIdhBAV6pl1NU="; - types-aiobotocore-lakeformation = buildTypesAiobotocorePackage "lakeformation" "2.11.2" "sha256-XX3f+pw03ft13aRml7ublI72AjbVm8XlgcF4WLaT8UA="; + types-aiobotocore-lakeformation = buildTypesAiobotocorePackage "lakeformation" "2.12.1" "sha256-IFFB7sUhrW46nrmQR/bSRTjVye+3C3eGQCrpe3jNVxs="; - types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.11.2" "sha256-b0QPtSWITrvIrQdpcFb7m5EEbgyyX1UaE36Ds2UzieY="; + types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.12.1" "sha256-A1oS/awripZCCFwwP3bpPt8xAn8MKHBd4Y7nDG9Beo0="; - types-aiobotocore-lex-models = buildTypesAiobotocorePackage "lex-models" "2.11.2" "sha256-oLe70GFx6BJosKfgrFzde8G3gd3Tb9mLRKy45gx4s8U="; + types-aiobotocore-lex-models = buildTypesAiobotocorePackage "lex-models" "2.12.1" "sha256-W8xa7bl2wYS3SY6rZk7T65UvwntxCY9OHKKtVaDUMq8="; - types-aiobotocore-lex-runtime = buildTypesAiobotocorePackage "lex-runtime" "2.11.2" "sha256-JfipFKHOk7w2iGmey0MxSGW1QFDdNY1ArptnNc4nR70="; + types-aiobotocore-lex-runtime = buildTypesAiobotocorePackage "lex-runtime" "2.12.1" "sha256-IODLqqjC6UXTkT980S+drXqhnkNWH2ejzVWeo1LE45U="; - types-aiobotocore-lexv2-models = buildTypesAiobotocorePackage "lexv2-models" "2.11.2" "sha256-sQ1liyCEjK8+QJYF5e3FFbPNWKfmGFV3QOv2lNZ4rR4="; + types-aiobotocore-lexv2-models = buildTypesAiobotocorePackage "lexv2-models" "2.12.1" "sha256-Jf2MQbBanDZetFUVH/5CVMYDzzBN7Th8K6RVUWkYaQc="; - types-aiobotocore-lexv2-runtime = buildTypesAiobotocorePackage "lexv2-runtime" "2.11.2" "sha256-LV9yyj5NsgRCSs+jQ2sNaEWuUKluLB00dtuKfzR+Cn0="; + types-aiobotocore-lexv2-runtime = buildTypesAiobotocorePackage "lexv2-runtime" "2.12.1" "sha256-jAsyQqIj3YXfEa6q/cZIPIjal+3YJqts6N13I5O+kHw="; - types-aiobotocore-license-manager = buildTypesAiobotocorePackage "license-manager" "2.11.2" "sha256-9mNtD4FE3PQ6DNAhH8IcVSmlP9iDgswweWJ6m9sSxLo="; + types-aiobotocore-license-manager = buildTypesAiobotocorePackage "license-manager" "2.12.1" "sha256-AWe9VEJxap7+tL0flZqs2/SQemIzGKXJXWxx1ScLtC8="; - types-aiobotocore-license-manager-linux-subscriptions = buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.11.2" "sha256-DmYp2EEdSip+CNQw2mF27NftTcl/RCStoJUIUE98kZ4="; + types-aiobotocore-license-manager-linux-subscriptions = buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.12.1" "sha256-0HhhZH3OBYQBK1q9RyqJqCBmINMzgZfj20iFVmPYMac="; - types-aiobotocore-license-manager-user-subscriptions = buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.11.2" "sha256-WWeTc1oPQc/BGve6ulckgoE6Un2VsEQO+jZ9Vn1YN1M="; + types-aiobotocore-license-manager-user-subscriptions = buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.12.1" "sha256-K7KXzCtdGS6ok79zNDxx9PxXPNbNPsp6fuucT/Us2/M="; - types-aiobotocore-lightsail = buildTypesAiobotocorePackage "lightsail" "2.11.2" "sha256-o2DSZMBf7SUboQRa+j3w9XX97B1V+IrKe4lcYTTbKqU="; + types-aiobotocore-lightsail = buildTypesAiobotocorePackage "lightsail" "2.12.1" "sha256-lRlifiUJCGbVkf0wVdrXQiwoOvQPqrXrvzl/4BqXpsM="; - types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.11.2" "sha256-2qLEPAx24yVox+WzM1F+TgrMHUICh/u52CrIkan4jKw="; + types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.12.1" "sha256-j+UcTL5YYpI5eCmWq1durTCIwuc0U94udfgNUCAgR9A="; - types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.11.2" "sha256-kMT5kfYjkuEOYqEGgJSPrT2zA0SRwR7ozROrK/auyWI="; + types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.12.1" "sha256-CqByIbfkIeROXAFWvjS9pwPImo2dD10q1/7kTR5GA9w="; - types-aiobotocore-lookoutequipment = buildTypesAiobotocorePackage "lookoutequipment" "2.11.2" "sha256-tkgaimET3g+IYEPa07877wIkTRl6qg85ppcWttRunKU="; + types-aiobotocore-lookoutequipment = buildTypesAiobotocorePackage "lookoutequipment" "2.12.1" "sha256-++dMJ+uFbNkbRVKbMP3URxlKRj9pm6Je6+iQTAs3vqU="; - types-aiobotocore-lookoutmetrics = buildTypesAiobotocorePackage "lookoutmetrics" "2.11.2" "sha256-Ck43tu6SnKPtQW3+6WClcf8rLGF8jS7vg4N/VeeWcDM="; + types-aiobotocore-lookoutmetrics = buildTypesAiobotocorePackage "lookoutmetrics" "2.12.1" "sha256-rInxd7NLuze5qs4fV47PmnptYPKyj/IwrHhrND/ufgw="; - types-aiobotocore-lookoutvision = buildTypesAiobotocorePackage "lookoutvision" "2.11.2" "sha256-0MOrWtTHMUf4HPbM/Fi8JtWSD+UqXFg3zQNwFbhmydI="; + types-aiobotocore-lookoutvision = buildTypesAiobotocorePackage "lookoutvision" "2.12.1" "sha256-HOVBuDQoYpTCfie8GyyyrTY09OwXW8JvzO6eJJxQncI="; - types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.11.2" "sha256-q3oYdCaMzvZ/FYkldC0DbzAHscuAGTq8WyAQwZlCNso="; + types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.12.1" "sha256-e8jfy4ilPA0NLZMeP6zkrPhkGqLXKBX2bDSfu+bLpPY="; - types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.11.2" "sha256-CKCC7W5h6qKv3Zya/e+WcVoWdOtCqoWKRlJFHSTdxaI="; + types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.12.1" "sha256-A++bU7yYnFfL7FmAHqh6906dJb3YusAWBr9lHk7l608="; types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; - types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.11.2" "sha256-zg/QhW+4Chugyg6rG5HtrE1GAhbWUaveJpaJFemoN94="; + types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.12.1" "sha256-Cm8DEoGP6TwqvJcU4+JiYwkYKQP3GGKyAVY95lSUHmY="; - types-aiobotocore-managedblockchain = buildTypesAiobotocorePackage "managedblockchain" "2.11.2" "sha256-jGl4I2voUUW0+OuEiqmB/MEHaMMlaaKHkKzod2r4d+E="; + types-aiobotocore-managedblockchain = buildTypesAiobotocorePackage "managedblockchain" "2.12.1" "sha256-PWM8WIxLZTjGch2Mhu9n0v0x63fGK0J6XcL8U0MXEMs="; - types-aiobotocore-managedblockchain-query = buildTypesAiobotocorePackage "managedblockchain-query" "2.11.2" "sha256-E0jvEhS96gCpV8uIUySP4EmxsFBnS8A4DOM0rOEtNHs="; + types-aiobotocore-managedblockchain-query = buildTypesAiobotocorePackage "managedblockchain-query" "2.12.1" "sha256-7sCnI6B/QM7AcB2iEDCSNKRgIcFCUyJct2Jg/KoQk64="; - types-aiobotocore-marketplace-catalog = buildTypesAiobotocorePackage "marketplace-catalog" "2.11.2" "sha256-ASsMuZQJlYkEFGwMByXHNlxyJVjjMWSkzOBG2l77AyA="; + types-aiobotocore-marketplace-catalog = buildTypesAiobotocorePackage "marketplace-catalog" "2.12.1" "sha256-ho34PTQaL4POvic2Nzy+fuCYanrXGOXN9Jf+qd+dMX4="; - types-aiobotocore-marketplace-entitlement = buildTypesAiobotocorePackage "marketplace-entitlement" "2.11.2" "sha256-AxS9uLbEut6+4PLuLBB9ddb/6aPWCzBQBG2XyJW6VRA="; + types-aiobotocore-marketplace-entitlement = buildTypesAiobotocorePackage "marketplace-entitlement" "2.12.1" "sha256-pdRHgmA3ul+2ww+hOO2TTs7brvMAXZXM7QQTqTWfDz4="; - types-aiobotocore-marketplacecommerceanalytics = buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.11.2" "sha256-SgmAl7uy4YUqMwGWbt+vjjAhggfzzVXy14eZuowl8Q0="; + types-aiobotocore-marketplacecommerceanalytics = buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.12.1" "sha256-rXnL667PBKx5IxK3YJzJiWN8wFlDvz09RjaIMrVIyZo="; - types-aiobotocore-mediaconnect = buildTypesAiobotocorePackage "mediaconnect" "2.11.2" "sha256-P+HWJ/nEkeccqTNk8AotPjSXvHW2gahfhfI5hDeXnOs="; + types-aiobotocore-mediaconnect = buildTypesAiobotocorePackage "mediaconnect" "2.12.1" "sha256-bm/2aSToVTIaxBs0i/v4As2mX4vK81RqZIjzgrQYP+g="; - types-aiobotocore-mediaconvert = buildTypesAiobotocorePackage "mediaconvert" "2.11.2" "sha256-Umk+VdPTQSp4VmEqfCdDwU1coJaMU/+tGgi/bjgb0xw="; + types-aiobotocore-mediaconvert = buildTypesAiobotocorePackage "mediaconvert" "2.12.1" "sha256-52088rNi5Vuf0CuDU2LdXV4ZSoWaHqBeTD42DOEmDTs="; - types-aiobotocore-medialive = buildTypesAiobotocorePackage "medialive" "2.11.2" "sha256-/afargcEN7hB5DajP4EL+juei59/rLQp+XKm1N9QEbA="; + types-aiobotocore-medialive = buildTypesAiobotocorePackage "medialive" "2.12.1" "sha256-/B3qy79nPiz8Xo5KxJKDnUKo6PclE/pXrkjSJmlcz9I="; - types-aiobotocore-mediapackage = buildTypesAiobotocorePackage "mediapackage" "2.11.2" "sha256-sAxc6wjEXz5zqq6iDatNbWH+cYQkP7RMMAgnTR35Hdg="; + types-aiobotocore-mediapackage = buildTypesAiobotocorePackage "mediapackage" "2.12.1" "sha256-a3qTy0sS8J8iEBvcPCXAC2lSLuuhEbslLork1HaHrF8="; - types-aiobotocore-mediapackage-vod = buildTypesAiobotocorePackage "mediapackage-vod" "2.11.2" "sha256-qjfONLIXIeXfZForb5PBEZBK1CpWAvkTMy2hqMJIZQA="; + types-aiobotocore-mediapackage-vod = buildTypesAiobotocorePackage "mediapackage-vod" "2.12.1" "sha256-4jyIrHer52rwi0ry9uBhMPm2YbzEWqhiHaSPqHfFr98="; - types-aiobotocore-mediapackagev2 = buildTypesAiobotocorePackage "mediapackagev2" "2.11.2" "sha256-QBDIxGZ4ZP4CN9VpV0UhE0PYWnF2L+FRk61qLfLNDj4="; + types-aiobotocore-mediapackagev2 = buildTypesAiobotocorePackage "mediapackagev2" "2.12.1" "sha256-KOFEpAVUnaN607soHl7SCq79KU/qS/ab/GGH9QEQJ4Y="; - types-aiobotocore-mediastore = buildTypesAiobotocorePackage "mediastore" "2.11.2" "sha256-jPWj2lyMNpEhJwWYosvYPA6g4b8RjHvLyCJ+545suKc="; + types-aiobotocore-mediastore = buildTypesAiobotocorePackage "mediastore" "2.12.1" "sha256-A4V8LMaloeRlOBNIEI43I4Rkyl2NllwB87XJVy9KDGo="; - types-aiobotocore-mediastore-data = buildTypesAiobotocorePackage "mediastore-data" "2.11.2" "sha256-dwEipFOs4xkkegGVtNysoTLsVfal7ysR2zAJ7ehXQYw="; + types-aiobotocore-mediastore-data = buildTypesAiobotocorePackage "mediastore-data" "2.12.1" "sha256-tXvQxnQSShN4gVQunAhmKEQztuJfJpxxvhXTh3kXyKA="; - types-aiobotocore-mediatailor = buildTypesAiobotocorePackage "mediatailor" "2.11.2" "sha256-LF9iBh/e3Ac54ampStAudt5cqbarnhWupRR1+A300xc="; + types-aiobotocore-mediatailor = buildTypesAiobotocorePackage "mediatailor" "2.12.1" "sha256-7FvUjBLyNRBZOApbvurtXt0exH9htacmJq9exlGBDMg="; - types-aiobotocore-medical-imaging = buildTypesAiobotocorePackage "medical-imaging" "2.11.2" "sha256-aYViyNpTZ66Ow2Vymcqc/Fs6ESvl/U61eEpYmozaK+Q="; + types-aiobotocore-medical-imaging = buildTypesAiobotocorePackage "medical-imaging" "2.12.1" "sha256-NVA0xf98DhJXfzNdLu42lV+ilO8gz2ZRt/Kxk68GP9I="; - types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.11.2" "sha256-EcqRC07VonREJAnEQAuM0D6pewJd1wPpIHQh/oEGICg="; + types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.12.1" "sha256-hn/83GWPAn6UL8Ez+L/mdiGPy0ycFvNDcLcEvAd/+a8="; - types-aiobotocore-meteringmarketplace = buildTypesAiobotocorePackage "meteringmarketplace" "2.11.2" "sha256-B7Ls8R45clgh2OnBfLtYV49pzwCKs+tGVUPa298U51A="; + types-aiobotocore-meteringmarketplace = buildTypesAiobotocorePackage "meteringmarketplace" "2.12.1" "sha256-SNGrScKSyEp35Aq+vs+uXk67ab0M1tjwkOuO/mmgrtY="; - types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.11.2" "sha256-/6NysP2UP5gttr4CE0dr38ictulCYUnzbv/3owe/8Ww="; + types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.12.1" "sha256-lbmcxyFquZmbFEmQbmIY6lqdJmukR1dLkH9CgS52MQM="; - types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.11.2" "sha256-sOHVNzltGlxz4FZR0DVoGJVo6Ga8+UMW4owsaubVCPA="; + types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.12.1" "sha256-NNjPCZxxV3Nx0+2OTV93SLN3AM6wF2Uqq8BNaWm2dVk="; - types-aiobotocore-migration-hub-refactor-spaces = buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.11.2" "sha256-A8aLuBH4xtvpOjlLTBy5iPHiub9P1plbZWjCGke/WzA="; + types-aiobotocore-migration-hub-refactor-spaces = buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.12.1" "sha256-eHH4V6svWNwjD9StyvyxTZ4DTwVsBX0VU65mTcKMZ7k="; - types-aiobotocore-migrationhub-config = buildTypesAiobotocorePackage "migrationhub-config" "2.11.2" "sha256-spHl1upjr2r1a8DG5XBRnmaowpOYFtnpMLGtoEakwO8="; + types-aiobotocore-migrationhub-config = buildTypesAiobotocorePackage "migrationhub-config" "2.12.1" "sha256-rMCfG8GrTGzFBPE6oS+2DSZ7rD2XW1weGImOO85nDP4="; - types-aiobotocore-migrationhuborchestrator = buildTypesAiobotocorePackage "migrationhuborchestrator" "2.11.2" "sha256-SgIGw/aiY0VGJtVdmg/b5FZhmhaSqUHJ4/BfqShnRDo="; + types-aiobotocore-migrationhuborchestrator = buildTypesAiobotocorePackage "migrationhuborchestrator" "2.12.1" "sha256-uGWiICcRZzVCCKPmWwqV0JoytgeVFcJexgLcUE64PCM="; - types-aiobotocore-migrationhubstrategy = buildTypesAiobotocorePackage "migrationhubstrategy" "2.11.2" "sha256-DhuUTGNVKB0jHd+MJ3valcCQSL5sKJlMtUP56aVqkkk="; + types-aiobotocore-migrationhubstrategy = buildTypesAiobotocorePackage "migrationhubstrategy" "2.12.1" "sha256-wcN2fJO1BrHJiItDkqIxvvWwnzFIw9YQCQYKfbfi4Xc="; - types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.11.2" "sha256-fJp9LXYqauvrxIa6i0208JRm3CuTpzV4rvYmYTXH7os="; + types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.12.1" "sha256-p5uySMWHaMLvdFP4qlWySsUByqw/8YrYAkJSWdLC4B4="; - types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.11.2" "sha256-UtnqvuB42ZdW9Pl4dKDC8Y+OfXe1pULa2TGWPh2BvDM="; + types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.12.1" "sha256-RI5nNpGCl4jXeAla990a6R5+YH+IyR9dpkxbSrI30dM="; - types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.11.2" "sha256-6+O/r6fNyT1jm/3088WnUmy/lLeoSUp3XzhvhqbD9Yo="; + types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.12.1" "sha256-VHQSTVDau/EDXslby+ZFsBqDd5iPM7jlZ4SNsr1fh2Y="; - types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.11.2" "sha256-nnvnvNlI0d9eY6BK+fM0HK9+cBDStuwl11AlK5lRw8g="; + types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.12.1" "sha256-CX58a5H9pYhMlXqf9hx2HRmqYUInLBmfEhX6/VqYG64="; - types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.11.2" "sha256-1aFyIW+UZv6jxDRn8ry6gIrLMJbgaYKVKlkIOAGWRHE="; + types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.12.1" "sha256-RdCi4jseTuX11ZqNdvnH6Lral68aVKE9xehhhinCE6M="; - types-aiobotocore-network-firewall = buildTypesAiobotocorePackage "network-firewall" "2.11.2" "sha256-MhxCre5EDkm9EOtNdPLqTckeazZJcTmbZ2r8soQA+Jc="; + types-aiobotocore-network-firewall = buildTypesAiobotocorePackage "network-firewall" "2.12.1" "sha256-1xujtFAG0Jh65Ds6MrgY0Tw4KyYMRFbll30t0S+Pc2g="; - types-aiobotocore-networkmanager = buildTypesAiobotocorePackage "networkmanager" "2.11.2" "sha256-6aVK9lzDYgLCqy0cwp0ORJn0BT9cSk4NEJayxOjF7ZI="; + types-aiobotocore-networkmanager = buildTypesAiobotocorePackage "networkmanager" "2.12.1" "sha256-1nBKGtnU7PaZXhsrwBZbJfwGdbi5FPFwszIXxmw/HGg="; - types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.11.2" "sha256-QbM+B7Tfvcs/ve35QzymZKVnWhtB7oFiwI6lloQLxVY="; + types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.12.1" "sha256-zLrnjFSKA53wgxsStGQfLqogX5u2l58kdzOFTTgelQA="; - types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.11.2" "sha256-lVM/HoERd7xawMrVIzHYUDnc+qymMSloqcFRh+u7mjU="; + types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.12.1" "sha256-Ujm2i+dRU3STj+A58KZS/Ypkod36JpWlXvAKO/NLErs="; - types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.11.2" "sha256-r81zJzAsRFSpJRkZwWvN5hYj0S/JEuUFuCrNJO8kwlc="; + types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.12.1" "sha256-uMef3Qrh+H631nsOsy7OEB4zeETR707ld6Jz6NjWwL8="; - types-aiobotocore-opensearch = buildTypesAiobotocorePackage "opensearch" "2.11.2" "sha256-zFrWBgOmagE6CtdQfSOZTgoKAJHmCsa0tcOrGbO6T60="; + types-aiobotocore-opensearch = buildTypesAiobotocorePackage "opensearch" "2.12.1" "sha256-kSnMbexNutPYHJfj4qgbFR3mhOU3rWputXUhBu7rFeo="; - types-aiobotocore-opensearchserverless = buildTypesAiobotocorePackage "opensearchserverless" "2.11.2" "sha256-JrtkoMlkuM9KiJMWRxTyFw/9usEjOO2Z1qYc4SsDOtM="; + types-aiobotocore-opensearchserverless = buildTypesAiobotocorePackage "opensearchserverless" "2.12.1" "sha256-N5vfHByujicDNnRiXIWkudjivmPoNeEpsnZYeX18Uok="; - types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.11.2" "sha256-z7kEjYPPi5CQ/cWIm06bOuwCf/0lU7/9Wv6FK5TxIDk="; + types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.12.1" "sha256-7R8AtGb0Gt6XfWBUYSjudRUGRGF2tp9Ey3Bqh6LJ7wM="; - types-aiobotocore-opsworkscm = buildTypesAiobotocorePackage "opsworkscm" "2.11.2" "sha256-34u790+vU+yqsAFh2P0lV6zASqCAl776l8a+a9iVucw="; + types-aiobotocore-opsworkscm = buildTypesAiobotocorePackage "opsworkscm" "2.12.1" "sha256-5N/yQdfPTdJTkF2Yo0szvLK7tHYBALqahIbTwG2YSFM="; - types-aiobotocore-organizations = buildTypesAiobotocorePackage "organizations" "2.11.2" "sha256-coo7Pv1DaAh+d1594EK+kQV+Fm423zIYaotG+Te8JN8="; + types-aiobotocore-organizations = buildTypesAiobotocorePackage "organizations" "2.12.1" "sha256-CEEKhdfh//GBT9pbOqu3pxCg0iy83LBy172FmVWbnK8="; - types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.11.2" "sha256-1pqghG7TZeT7FwT8nCQfQnKpiKgovfv4zpjAAgYnxeM="; + types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.12.1" "sha256-IRo94LgBBk4sawgE9fpySggeG6EjmyLRf7cHLzIYcBo="; - types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.11.2" "sha256-Rcz9n5/L5B/BPiUiJp2rsqfElU6o6n24d/ja+w+n1aY="; + types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.12.1" "sha256-PXACndLusmvG0cYQESek4mr/k376seaNia4x0KqufBk="; - types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.11.2" "sha256-P3HlDSCLDzmdq9bEvcM0c7YDdZu0S6smXJejCkjSvF8="; + types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.12.1" "sha256-58uOgEi1MyxZU4rRG8WO2IEUq7YWG2nIgQwcPQG770o="; - types-aiobotocore-payment-cryptography = buildTypesAiobotocorePackage "payment-cryptography" "2.11.2" "sha256-tHh5VCmz7dE5dOQPwQtwF1yrG7iPLO3LJCEXcxi1N4M="; + types-aiobotocore-payment-cryptography = buildTypesAiobotocorePackage "payment-cryptography" "2.12.1" "sha256-dOUHOX72DzvICM0jPPZueDkvasPRp01JwubfeaUSqWk="; - types-aiobotocore-payment-cryptography-data = buildTypesAiobotocorePackage "payment-cryptography-data" "2.11.2" "sha256-opL4WsHUD7VSMrFguX7LKD8rzuncTMnn9KU45AgYoKk="; + types-aiobotocore-payment-cryptography-data = buildTypesAiobotocorePackage "payment-cryptography-data" "2.12.1" "sha256-qK5LnCwuiMJB1s5T1ncVOF45q5VILHO5SHhpCD5G0kk="; - types-aiobotocore-personalize = buildTypesAiobotocorePackage "personalize" "2.11.2" "sha256-yv6GvZxxzKoquIqE3lu/xpfYxB9QvKEipmKk4YM2jec="; + types-aiobotocore-personalize = buildTypesAiobotocorePackage "personalize" "2.12.1" "sha256-p94/gqPE0V5HRmC+bSqx5yGg6hyVYJE1w9lGwruONX8="; - types-aiobotocore-personalize-events = buildTypesAiobotocorePackage "personalize-events" "2.11.2" "sha256-Dc6z1uAWiVPyiN0ecX4br07bKdojmeo0MC7c3re1hyM="; + types-aiobotocore-personalize-events = buildTypesAiobotocorePackage "personalize-events" "2.12.1" "sha256-GsyLDjpZvGnf8dAWB+ibT0ZuRts2WU8P3fQ2i2Wwjn4="; - types-aiobotocore-personalize-runtime = buildTypesAiobotocorePackage "personalize-runtime" "2.11.2" "sha256-niY0fPGHHWpAPOffgjEWRttS43Kw4uxkcTy5xEmaPPc="; + types-aiobotocore-personalize-runtime = buildTypesAiobotocorePackage "personalize-runtime" "2.12.1" "sha256-Oq7DFo4Xi7a7naEflLlPDaR2zpFv1/cKjMsQfAMshT8="; - types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.11.2" "sha256-I79oOBYzQ35mrD9ZkwZo9yFKkvOVg5MHg1/qsWBs1hA="; + types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.12.1" "sha256-RyvXuiebtNWG49SBbKmwFYRKxd6Ba/UKNphCxZ3XhVQ="; - types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.11.2" "sha256-Id0RR3EWaGZIMMaA1CSKwtX4hPQNvYIo04lCjzGbLno="; + types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.12.1" "sha256-UWnbgABQfwd2rUz952iFMh1QPdEchzgw/aeggi/+/9A="; - types-aiobotocore-pinpoint-email = buildTypesAiobotocorePackage "pinpoint-email" "2.11.2" "sha256-TDRjuFHP/6MSNUwO0q9mgxXw4GAjYeEAEwcGf0a+q3U="; + types-aiobotocore-pinpoint-email = buildTypesAiobotocorePackage "pinpoint-email" "2.12.1" "sha256-WinsN8jm/Ua0iYhMS5FAHlELJYbpfH8TRzRJEcQGevc="; - types-aiobotocore-pinpoint-sms-voice = buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.11.2" "sha256-GUDNq34JKrR6F1uzGvrINNEvZf75c6hrtcVJ4ishQ1E="; + types-aiobotocore-pinpoint-sms-voice = buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.12.1" "sha256-OcP5l7Xc8AIY9c9/Cx3a6JzNFu3kC0+pH5/TzNjgbqQ="; - types-aiobotocore-pinpoint-sms-voice-v2 = buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.11.2" "sha256-P59HWAaJrCKpwyY6kdyd4XHHRhmd2DxafY5Ytu5d8Ow="; + types-aiobotocore-pinpoint-sms-voice-v2 = buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.12.1" "sha256-9uVmiRlhT66EYFgoImQa7uLhX8HvvO4mo6wW1dwUkmk="; - types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.11.2" "sha256-BBZWoO4sWWSSJOf1MnMF9KrtGKTc+h8yuIjlnx0iIBE="; + types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.12.1" "sha256-T5ggvFxgi2rWsOw+vArGx9zVLmGZxB4fsZ+GIz6X13U="; - types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.11.2" "sha256-CrNLX+1TDawkCrBgmNqUbhJcbh208sKpfbSpS6dksPY="; + types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.12.1" "sha256-6thPshwvWCl4666WKAUyFL8JcNbvZ6mRHpvRSeZrvxE="; - types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.11.2" "sha256-sbiwfFkB6GDwkw38mTbKFis7SOYcM7lrC/sOzjCHi0A="; + types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.12.1" "sha256-2vFSQr2uFCWEOjBtmQjAWyKw85/NfKuDGKnu6Vfq85s="; - types-aiobotocore-privatenetworks = buildTypesAiobotocorePackage "privatenetworks" "2.11.2" "sha256-fHGSVacmVC4/mOaeiMhgJwcMz+x7njlFm8EesZnxdd0="; + types-aiobotocore-privatenetworks = buildTypesAiobotocorePackage "privatenetworks" "2.12.1" "sha256-NCiA+mnWkeS6li7ruHZ8k2UM2rpHWJbE0UohIDhGDko="; - types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.11.2" "sha256-4OlzYFr/xz603R6am4Mk4A2C/cGXOksSdxopm/2rhV4="; + types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.12.1" "sha256-2exlCIbq2xS+kvRR+LBEe0//Oit9wXhPxrITzASk6SI="; - types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.11.2" "sha256-4CvtgQH4KoYEUWzCYD/3aC1Ouo0XiOL8ByKCdFD+DPQ="; + types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.12.1" "sha256-C7JHRm/SnRWMCBMzcpmmByMtcsK9Ozwd/IauoKKoZag="; - types-aiobotocore-qldb-session = buildTypesAiobotocorePackage "qldb-session" "2.11.2" "sha256-ccTKJjTvCtPiK0Z+TLxFYOE+/zpLjkBaEcT7EtPw5IM="; + types-aiobotocore-qldb-session = buildTypesAiobotocorePackage "qldb-session" "2.12.1" "sha256-3xfvNRLpJD+eUH4yLzNSYYf2g9OLmgEAOP7VKu/eaho="; - types-aiobotocore-quicksight = buildTypesAiobotocorePackage "quicksight" "2.11.2" "sha256-Len2Z6UxFRlt4lzyNB7bMw3SO+mRqgBO5YHaz9N/4V4="; + types-aiobotocore-quicksight = buildTypesAiobotocorePackage "quicksight" "2.12.1" "sha256-BgO49MbWTu63gi8NoILgqOH7fnZmsSwCoxMNUBOzrvg="; - types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.11.2" "sha256-CcMrlDc5sbbjK0NLOQB7+Y7qaODQWz1NTIB6yYZB7OE="; + types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.12.1" "sha256-EXG6jgh2RWvjURXu0I4qQprATS3Ip35gEQK6MLhE6SU="; - types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.11.2" "sha256-/dvoqri/C9QzCddypXJXJYrhQCVHSn3S45VJBHeS+5k="; + types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.12.1" "sha256-WgPe6GjNL9F/VdQs4pp3xK0f5dyR23JZyfehm5I6sTo="; - types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.11.2" "sha256-qBj2alCz0Us1vUIlstWa++ePJgO7xYeE16Hlq2JRx1Q="; + types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.12.1" "sha256-lgeDWUKBZCxVJayyytTiYbQboTdRBvIu7/HvhO4Wqkc="; - types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.11.2" "sha256-Om3guoTpVeL7dvRt7D3p8B8ZkWjb3waQAeM89e0rpUQ="; + types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.12.1" "sha256-/m11lpU8mBO1DkvbN9hg090aCjTLrqaULpCBUnCadSk="; - types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.11.2" "sha256-b4hNZ77+lFUmFLqhowH/bOn4kSCuqvIxU18vj7jcFHI="; + types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.12.1" "sha256-/VL1Bzn27YKCL+Awdfg+4g+cg1ZD8Z9xvVS+jN91PU0="; - types-aiobotocore-redshift-data = buildTypesAiobotocorePackage "redshift-data" "2.11.2" "sha256-J96w8/9UdtRzbcWqw4E0S/FrknEKnTTxOm59Tcu2jvM="; + types-aiobotocore-redshift-data = buildTypesAiobotocorePackage "redshift-data" "2.12.1" "sha256-OUTaZTCSUJLzzBNoxxHDCn+LRodqeakEgteHIjfyM7s="; - types-aiobotocore-redshift-serverless = buildTypesAiobotocorePackage "redshift-serverless" "2.11.2" "sha256-XdoXh+IE82wywcCDY1bA5tr8dJbSNvXB5gIY9nLoPWo="; + types-aiobotocore-redshift-serverless = buildTypesAiobotocorePackage "redshift-serverless" "2.12.1" "sha256-nkRZzNd0KdBdb4pEbpr8oHAiAOzuMo8RNXJiKtTXT00="; - types-aiobotocore-rekognition = buildTypesAiobotocorePackage "rekognition" "2.11.2" "sha256-0ODtTavUgRNXUzK7bjVa86lYNoCn+iH64QAJN1cvc84="; + types-aiobotocore-rekognition = buildTypesAiobotocorePackage "rekognition" "2.12.1" "sha256-05PKIuZPVLdYoVeeDVYrhR6Y6YJq41Sm0zql3GMd2GE="; - types-aiobotocore-resiliencehub = buildTypesAiobotocorePackage "resiliencehub" "2.11.2" "sha256-abgoq7erXikE8KNMdRBdItI0/Kzapgg0BcDVjRbjBYU="; + types-aiobotocore-resiliencehub = buildTypesAiobotocorePackage "resiliencehub" "2.12.1" "sha256-BI7AQcnbbmA3jAE+weckSULbCLi7L+E6Bviwcp6nUTY="; - types-aiobotocore-resource-explorer-2 = buildTypesAiobotocorePackage "resource-explorer-2" "2.11.2" "sha256-xXj60XZQMUiHXETJGQjvpzd+I6A3isV6KLOz3d5qpto="; + types-aiobotocore-resource-explorer-2 = buildTypesAiobotocorePackage "resource-explorer-2" "2.12.1" "sha256-5QLkLGSEVy4WunpnwixrY7NC74G0qscsyRRonAiziuM="; - types-aiobotocore-resource-groups = buildTypesAiobotocorePackage "resource-groups" "2.11.2" "sha256-lw4MR2UKLdWQhpaeMnu1/q6bZMF7sPenQfeErKfWGxM="; + types-aiobotocore-resource-groups = buildTypesAiobotocorePackage "resource-groups" "2.12.1" "sha256-ulM+lDPXOSw//ATwgvHUwRN6mt4JCPxsI9kvlFeBW8g="; - types-aiobotocore-resourcegroupstaggingapi = buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.11.2" "sha256-QpVVzSgMUTww9Llo1WG6mn4BruNDStXhy6kNoPZR3s8="; + types-aiobotocore-resourcegroupstaggingapi = buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.12.1" "sha256-eNAIL3H4R2DeCcPD80gmgCPw6OajhHMfyAAYsLZ5qk0="; - types-aiobotocore-robomaker = buildTypesAiobotocorePackage "robomaker" "2.11.2" "sha256-RWKmf8SArQUMNYGF7e7dmYMkQIlpxuzKdZis4w/cKpg="; + types-aiobotocore-robomaker = buildTypesAiobotocorePackage "robomaker" "2.12.1" "sha256-mEDDY5dN90CuxIe48KECB4FnVikxO+5sGzb0HznEWgQ="; - types-aiobotocore-rolesanywhere = buildTypesAiobotocorePackage "rolesanywhere" "2.11.2" "sha256-M2FfcvPJenYY/WD8iH9foiVIRsFG9WKsMLOuPUnjs/U="; + types-aiobotocore-rolesanywhere = buildTypesAiobotocorePackage "rolesanywhere" "2.12.1" "sha256-ZrGHBUThGVUUmy/TJDyG3hjNXGkRqO5oQP8SkIyCCu0="; - types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.11.2" "sha256-wes4LEtLv5ybE51iXxHQg18qCAm5sZ+vZGiXj8bK3yk="; + types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.12.1" "sha256-6qYcsh/D1+JhAAKCCpfsi8hOQndu6iLKQIAX0/j2UUE="; - types-aiobotocore-route53-recovery-cluster = buildTypesAiobotocorePackage "route53-recovery-cluster" "2.11.2" "sha256-xcGxuzmb8ZG56tp352OVDRn81EjSjPySxDhcg/n0B3A="; + types-aiobotocore-route53-recovery-cluster = buildTypesAiobotocorePackage "route53-recovery-cluster" "2.12.1" "sha256-0PlKImcsyHMot9P8yjVLo6gt/pMr+xdMJTGoW5lcdqQ="; - types-aiobotocore-route53-recovery-control-config = buildTypesAiobotocorePackage "route53-recovery-control-config" "2.11.2" "sha256-z7IdwFRh8yaTv/1BMUdCOmUueSIilBB201OCiAFe+Kw="; + types-aiobotocore-route53-recovery-control-config = buildTypesAiobotocorePackage "route53-recovery-control-config" "2.12.1" "sha256-f+9lv8WRb723cgw2339xAXv6H9DSqTV3He2rOSfdLZs="; - types-aiobotocore-route53-recovery-readiness = buildTypesAiobotocorePackage "route53-recovery-readiness" "2.11.2" "sha256-W1q61V0sPYF1XD109kf1uKgOLggvTEtbtDA7xaWDFB0="; + types-aiobotocore-route53-recovery-readiness = buildTypesAiobotocorePackage "route53-recovery-readiness" "2.12.1" "sha256-fYyZULP5ZPGa29XG81sfeLzJyM2a01fSzpasDmKQKaY="; - types-aiobotocore-route53domains = buildTypesAiobotocorePackage "route53domains" "2.11.2" "sha256-xeuBRVcg+Fn8/lYTOZA3Le7LbpB9jrCCB2H8nQIq+4A="; + types-aiobotocore-route53domains = buildTypesAiobotocorePackage "route53domains" "2.12.1" "sha256-jyZnn8+Z/ca81BFLz9STnRT5rVdgRbovqesUWFmzxSY="; - types-aiobotocore-route53resolver = buildTypesAiobotocorePackage "route53resolver" "2.11.2" "sha256-yn0pE63A8Pzgx3NhSVKqlTFIgKFMklw+XWHTxKybwc4="; + types-aiobotocore-route53resolver = buildTypesAiobotocorePackage "route53resolver" "2.12.1" "sha256-chqu+C8HGB0P8KsfttB1oKnyaZY3GUcFgeikJcWeFo8="; - types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.11.2" "sha256-uxY9FB+BVi7aC7reo2FsNEELX2bdgg+/IY6qxUz7U8c="; + types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.12.1" "sha256-x2b5L14Zx3XFSLOC9UPbRpOAiFd7jzd9UrLA9b+5+Ww="; - types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.11.2" "sha256-n2hn56rUVBuS5qNep7junV5LGZWGLdBt4EVkSORg02s="; + types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.12.1" "sha256-sHbgvSbUD55nQ46ufvPpngzCt0O4zIIDd8FlXH8TGF8="; - types-aiobotocore-s3control = buildTypesAiobotocorePackage "s3control" "2.11.2" "sha256-PNo0W4KDRwUyzg+aSxoocYPqllG4cMAB5SEsj5mt3lk="; + types-aiobotocore-s3control = buildTypesAiobotocorePackage "s3control" "2.12.1" "sha256-p4AG4soN/NYbh1EPRc9DGtNtG89QRlarqVCPrKQcRqE="; - types-aiobotocore-s3outposts = buildTypesAiobotocorePackage "s3outposts" "2.11.2" "sha256-hhqdwUHmEAPGQuPnhLJtDdHaIYb/sv/U6UCEg+CKkyA="; + types-aiobotocore-s3outposts = buildTypesAiobotocorePackage "s3outposts" "2.12.1" "sha256-EGR13xcf88tYBn5lbmrAQ2cxO6xDiFvuGA+xGp/o24Y="; - types-aiobotocore-sagemaker = buildTypesAiobotocorePackage "sagemaker" "2.11.2" "sha256-O9TbCPu6aHsK0NAmYVCZjy4G71EhlgzX24behEGU7eI="; + types-aiobotocore-sagemaker = buildTypesAiobotocorePackage "sagemaker" "2.12.1" "sha256-YmBdTNil9ghlUrcr6Ej8GfwFaICQ+QZokuJk5iaHtY4="; - types-aiobotocore-sagemaker-a2i-runtime = buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.11.2" "sha256-N1RAqfBhqqw4q8G8xJPlSQ69ww7Vaz3ySafwi2oBrB8="; + types-aiobotocore-sagemaker-a2i-runtime = buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.12.1" "sha256-+fLY+MOh3P3/N7tVDGYZDlB7IKKMjxCdqje6apUGkQs="; - types-aiobotocore-sagemaker-edge = buildTypesAiobotocorePackage "sagemaker-edge" "2.11.2" "sha256-dHZZF5L+bVPDYFLXWHxSJjNAfKus2E2sUQlOXLp0TPk="; + types-aiobotocore-sagemaker-edge = buildTypesAiobotocorePackage "sagemaker-edge" "2.12.1" "sha256-izwrksagyX2mbDR1w+9ErrqrzHC1nnlIqXgE9++fGJI="; - types-aiobotocore-sagemaker-featurestore-runtime = buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.11.2" "sha256-nTfFkbwnKM2flJfCIU+An2eDDrMkyjrayJ7V1zAFVoE="; + types-aiobotocore-sagemaker-featurestore-runtime = buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.12.1" "sha256-Kt8weJY6HFekwsF+de0VUqwkpGj+j+4GH5/Ct6ggBXc="; - types-aiobotocore-sagemaker-geospatial = buildTypesAiobotocorePackage "sagemaker-geospatial" "2.11.2" "sha256-8LYpcjMnPEOX7qbQ6I8zbs3/UoIhKEnvNC5qasqsqcc="; + types-aiobotocore-sagemaker-geospatial = buildTypesAiobotocorePackage "sagemaker-geospatial" "2.12.1" "sha256-mdXNrA1f96TxH5MRUsr1aadj20R0tqQ0kwmawaskZX8="; - types-aiobotocore-sagemaker-metrics = buildTypesAiobotocorePackage "sagemaker-metrics" "2.11.2" "sha256-WM2MksGubVpLG73vK107MUh7tJcvBr0hiZ/669yPOq0="; + types-aiobotocore-sagemaker-metrics = buildTypesAiobotocorePackage "sagemaker-metrics" "2.12.1" "sha256-VlaupOFkaHjjp1+Hjbmo8QHl/2tItZYg8t4WORUXGzg="; - types-aiobotocore-sagemaker-runtime = buildTypesAiobotocorePackage "sagemaker-runtime" "2.11.2" "sha256-/xKAA15x8xpMCh7kOi4kWuwaXulLRpMcnyzVPMH+Gh8="; + types-aiobotocore-sagemaker-runtime = buildTypesAiobotocorePackage "sagemaker-runtime" "2.12.1" "sha256-kGep+vJ4bqzTURgVEc3QESgmvBZJizk7SDWf2ELHPKM="; - types-aiobotocore-savingsplans = buildTypesAiobotocorePackage "savingsplans" "2.11.2" "sha256-he01wy13rhnE2xzXkJ3twOZsnQ/XfzMG74QP9Nyuj1o="; + types-aiobotocore-savingsplans = buildTypesAiobotocorePackage "savingsplans" "2.12.1" "sha256-sN2ihAQiOi6Rp2Nl1HyETUZxz/B09IH4yLUGEOG2khw="; - types-aiobotocore-scheduler = buildTypesAiobotocorePackage "scheduler" "2.11.2" "sha256-U2zesi+tt47KzbpdI94/S3ypcUUSWFUZNQRUcHRHWWY="; + types-aiobotocore-scheduler = buildTypesAiobotocorePackage "scheduler" "2.12.1" "sha256-7Yn5P3j5URK4oiEgyokKEazP9zRan5laX4pyXoLlCGM="; - types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.11.2" "sha256-o+l4pAMZDwmVFnpArvKHNRB6zUC/AYWqrRsNZBgrV7Y="; + types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.12.1" "sha256-sN7ixP27dN1ojaw/W3I2/VJFx5snuWEpJ1LugHx5tQs="; - types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.11.2" "sha256-IX8mZcFKSvfgCI+iXq6hByFwPBRRL8rqxr42XgPXZ8c="; + types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.12.1" "sha256-YwurPoYxG2ldprgCtLrn8jsHDAuqzxgOk+rBIrYdI8o="; - types-aiobotocore-secretsmanager = buildTypesAiobotocorePackage "secretsmanager" "2.11.2" "sha256-Op15jR7QepqLkWxFG7dMrre904OC3N9viwzChS2bNno="; + types-aiobotocore-secretsmanager = buildTypesAiobotocorePackage "secretsmanager" "2.12.1" "sha256-DhKCgIIcxNIP2gJRZVA6ITP5k/wbI73JEpGFVNbriEo="; - types-aiobotocore-securityhub = buildTypesAiobotocorePackage "securityhub" "2.11.2" "sha256-Rgc7+yij/CyhxOK/2hOQIVzrLW4lmRa+0eGxlWiIf38="; + types-aiobotocore-securityhub = buildTypesAiobotocorePackage "securityhub" "2.12.1" "sha256-WDKxtbB1RZEG5eJbIKBddS8yX2YkbfzW6IabYivCpy4="; - types-aiobotocore-securitylake = buildTypesAiobotocorePackage "securitylake" "2.11.2" "sha256-Hv6L2fWR7dHjhU3Oqm/sI18a/12DYJzPsCcGKlXCm80="; + types-aiobotocore-securitylake = buildTypesAiobotocorePackage "securitylake" "2.12.1" "sha256-TG+xWDnQmXp55RcTP3GYIKdGUh9sLcU+AbpS+YnI0T4="; - types-aiobotocore-serverlessrepo = buildTypesAiobotocorePackage "serverlessrepo" "2.11.2" "sha256-k4Xsag9IM9/kyv7TM9EH360yTC9mChJgxLS5U8MHRA8="; + types-aiobotocore-serverlessrepo = buildTypesAiobotocorePackage "serverlessrepo" "2.12.1" "sha256-NEdGr3+zYFsxgL9xPyZqllQm9q5U3Y8Fq4vnjE9VQDk="; - types-aiobotocore-service-quotas = buildTypesAiobotocorePackage "service-quotas" "2.11.2" "sha256-8XfZoANc59/sIqKsSMjvk8T41/BW8xX17ACjf1pXxyA="; + types-aiobotocore-service-quotas = buildTypesAiobotocorePackage "service-quotas" "2.12.1" "sha256-ZYzfFp+HQZCzBKG2Uaar44IO6rk3rPX8D00vAh5drsQ="; - types-aiobotocore-servicecatalog = buildTypesAiobotocorePackage "servicecatalog" "2.11.2" "sha256-7sLVYb2ZzdiVsqUOytiPt/b8GiW9qA2un4n2LORy4gY="; + types-aiobotocore-servicecatalog = buildTypesAiobotocorePackage "servicecatalog" "2.12.1" "sha256-B1nyXU/z+ZR7MaPqqAIER3g+XQJDx37PTfvTHxSzHkQ="; - types-aiobotocore-servicecatalog-appregistry = buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.11.2" "sha256-k5jGzYtjbnV/ZaJMQE/lbgmhYxF5k9Quk7/QaTJDjrw="; + types-aiobotocore-servicecatalog-appregistry = buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.12.1" "sha256-kQaEpE5fbWumtroUFNuyKrmXI7MmoNmJhWEh4ve1sYA="; - types-aiobotocore-servicediscovery = buildTypesAiobotocorePackage "servicediscovery" "2.11.2" "sha256-mJdB9fehiTA35dA766QlQyTkrvS4J4s8pCBq3cJcsxw="; + types-aiobotocore-servicediscovery = buildTypesAiobotocorePackage "servicediscovery" "2.12.1" "sha256-V6TD1sOtO5AkbBrKVXr5dc2Ym7Mgz/dkm7c4rBNZOzw="; - types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.11.2" "sha256-iMgv2U0XPdil6xt4/3j1ZZGJGylEz8qDYzzvTP4N6n4="; + types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.12.1" "sha256-agdBiB1VRs38GxuHsBkHByWbBqrAt+YZNTfBFDIhgLE="; - types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.11.2" "sha256-2eN+bo1BWU63a6xCexpVCZvblcCRdPlGf35D8v6A3Xg="; + types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.12.1" "sha256-ziNzhAspWnYDGxJfw5JPBf6FY0of0q2KddVZA4n1Trg="; - types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.11.2" "sha256-i5WHQ5wHvYdNpNJZWgAWAAD6mZPl/RPEOSh66l7PSCA="; + types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.12.1" "sha256-Z289uZBMaexBmuG2aEfUWOy145jJC8ZHnaKb7lhjL7o="; - types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.11.2" "sha256-v1FG59Mjxefyp4PpeLGfgHlrzVrUGUquqBSyxEM1OiU="; + types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.12.1" "sha256-MDoK/Qnvo6Y+WsVFSyKt+irzFC/HgWNAHkZgj3LSp4w="; - types-aiobotocore-simspaceweaver = buildTypesAiobotocorePackage "simspaceweaver" "2.11.2" "sha256-7UnTnGGGAfpPmU+m91R2n9AZinLoPFY/nqAjopnwhiU="; + types-aiobotocore-simspaceweaver = buildTypesAiobotocorePackage "simspaceweaver" "2.12.1" "sha256-tpzwKKdv8G0E0H3+wrANs50K0mM/lyqcXeTprBQeVNs="; - types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.11.2" "sha256-s/DbyfwPZ0qNvYaMWxuAwF9HqKihUjELdKPJ71DB1C4="; + types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.12.1" "sha256-mr5ntl7rZ9Nopql41qqs9n01bYZ2aW/v+/ehZKsQ+kI="; - types-aiobotocore-sms-voice = buildTypesAiobotocorePackage "sms-voice" "2.11.2" "sha256-k0ujcxl1uupuVNDXDc53WTb3buAHziPHDG662LrP36s="; + types-aiobotocore-sms-voice = buildTypesAiobotocorePackage "sms-voice" "2.12.1" "sha256-BGilumzkB01iMg0a833gBvT+LhkKVXncH/klno1Wc7g="; - types-aiobotocore-snow-device-management = buildTypesAiobotocorePackage "snow-device-management" "2.11.2" "sha256-jCEaxTTobMmZBNAFauI0Oh0/gvhJZXyrbgvsIofmrKY="; + types-aiobotocore-snow-device-management = buildTypesAiobotocorePackage "snow-device-management" "2.12.1" "sha256-en4h9jzuPw1JoLLFIUVAru46YJeu9ThPYkCzcu9LyRw="; - types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.11.2" "sha256-f5RZLaBzcikIZ77Ei1JZZQuaKy2M+RkRpeNhsswSunU="; + types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.12.1" "sha256-F8WStkw9CRkTxQXST7JKCHvJV+2DleR6zBmZmPQeCZg="; - types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.11.2" "sha256-bja/dcxw3OOeCfFgpHK+6gnivYoqAzmqt2IetHLgzws="; + types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.12.1" "sha256-bEFE0arHc/U8LmXCiRAZkFHNWsGFb069DSseHdBJA1Y="; - types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.11.2" "sha256-9fVYF2qfjM5DYWZG2hbeg/XPz+K8tyGhzSxY8eW0mHI="; + types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.12.1" "sha256-B106hChye7naXa6VvefcfDICI1rU1Td5K7zxP9vAofU="; - types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.11.2" "sha256-yztJVMvlWsZu9L+GzxTPdM2lzTKTW36T1OX0WmHgoBA="; + types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.12.1" "sha256-f1hVxTtSmljYA3p/wNltr4wMlKT94yzP8zFIq8fHIng="; - types-aiobotocore-ssm-contacts = buildTypesAiobotocorePackage "ssm-contacts" "2.11.2" "sha256-0o9kuyEE7rzzgA4Q75udMRUADKbW+rLgmvIGCVJpJhA="; + types-aiobotocore-ssm-contacts = buildTypesAiobotocorePackage "ssm-contacts" "2.12.1" "sha256-zhJooXRPSJoVNLRTcKMgnmGuDFvol2LCHKesveS2onI="; - types-aiobotocore-ssm-incidents = buildTypesAiobotocorePackage "ssm-incidents" "2.11.2" "sha256-89yICjzgxAlJ+ljpfRsCwf4RITWX9y+alCdtTBeLhkw="; + types-aiobotocore-ssm-incidents = buildTypesAiobotocorePackage "ssm-incidents" "2.12.1" "sha256-bvkyOZP9zuExuWV7ZHkV/YPzTAcl59L69TMRTkKtDKo="; - types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.11.2" "sha256-slJsfHBHVv+vPSfqNu/C9zl45SDX5H7K9rn+YVCca5Q="; + types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.12.1" "sha256-YjxpS0Tn+waraHNSDKSm/Ig4axeJmUHRR9wKUh9/w8w="; - types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.11.2" "sha256-ZAbFyBaGfQIRoMQkvnbViwShuvtIgTPmGZjScm1F7Bw="; + types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.12.1" "sha256-pBNQzTTu3DXWoAMOZHoZwvWRZetNOEwEN6XlX5b3cTc="; - types-aiobotocore-sso-admin = buildTypesAiobotocorePackage "sso-admin" "2.11.2" "sha256-DUOiPjmvmUL498QOrn4GBhnEw2GcFrOaj6YW5rh5i3M="; + types-aiobotocore-sso-admin = buildTypesAiobotocorePackage "sso-admin" "2.12.1" "sha256-wBv/pIRqsPxJONtGu782zxSAIDnAM6raAU8XFKoHwTQ="; - types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.11.2" "sha256-RmyyuORVrE0Qwl8yna/JlOXIrHYtyBVJPVpU2g0DDxY="; + types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.12.1" "sha256-HdZz0vbe+M0q5lLxArKy/k447cc2VZDByeLBkg/inl4="; - types-aiobotocore-stepfunctions = buildTypesAiobotocorePackage "stepfunctions" "2.11.2" "sha256-+w4WT5xRSShrvyKI9LpZlnBWwk52XZDM8EIx20DPfxk="; + types-aiobotocore-stepfunctions = buildTypesAiobotocorePackage "stepfunctions" "2.12.1" "sha256-J5UI5f2WWT+nhl6o0d2DkCVZKOwg5O29VbNi26RfUQ0="; - types-aiobotocore-storagegateway = buildTypesAiobotocorePackage "storagegateway" "2.11.2" "sha256-H3tINfz/GO514kayygBZ8ucyeEDfCUxObyqqKJFDIrs="; + types-aiobotocore-storagegateway = buildTypesAiobotocorePackage "storagegateway" "2.12.1" "sha256-p7ubgOcj4xkB7UcU3OUVMgzPzbLQTYcB0hbh/3KZqrs="; - types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.11.2" "sha256-uzhkXmUdnXzHRTyUj+l6pskEJJGG/rSUtnK3GML7nCk="; + types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.12.1" "sha256-D/+jqiERytxUvDGxxxVBZnBQae/csg4GpRA2YAiigno="; - types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.11.2" "sha256-i0rmU4YdFuZyuqyzFd2BCAKokXWMVVqOTN8Jm8cEvEc="; + types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.12.1" "sha256-7QN7ZamHv/C67SrlPWDi7yZ51QGbIr896PZ1FQ4kEuU="; - types-aiobotocore-support-app = buildTypesAiobotocorePackage "support-app" "2.11.2" "sha256-Duti4k7lA0jovcu8q+kv6HQWaMeZtKxN2wGScqNw+hc="; + types-aiobotocore-support-app = buildTypesAiobotocorePackage "support-app" "2.12.1" "sha256-GOdOna5aa3inSl+Q/vGPBJf3ULXmMxfabpHVvYL3XIA="; - types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.11.2" "sha256-g29BPcFbEGwBs7qUKmJOBrhgcI7iGOglr3SJQ/HHe54="; + types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.12.1" "sha256-BnNcpeNmYWlmBUUgDtOczwDp/BGrjLg2+QMNJEyiCmU="; - types-aiobotocore-synthetics = buildTypesAiobotocorePackage "synthetics" "2.11.2" "sha256-h1FCzj5+IplgFJ0SpsY5okNURSpuC4zy4qAlhUyt7sE="; + types-aiobotocore-synthetics = buildTypesAiobotocorePackage "synthetics" "2.12.1" "sha256-kiEkHVz9U9svw+IYstUcle1oCBSs1b2cU9vBHaY/H0c="; - types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.11.2" "sha256-PzmzE1Mgka+bM2E4qwPS3N3lOz3ljYdI78KZ4flr6ac="; + types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.12.1" "sha256-O95r0QCGOW2RbU1zlv4dn/1OuP/x/KFyO3TD2YwdTA8="; - types-aiobotocore-timestream-query = buildTypesAiobotocorePackage "timestream-query" "2.11.2" "sha256-MK4YicO38uuJsHuEL6NZwh/qo6UANVK19sodjcJHNOs="; + types-aiobotocore-timestream-query = buildTypesAiobotocorePackage "timestream-query" "2.12.1" "sha256-mp2zgiLO/bFBY1nhsx0nocKcerRnBzZyaONBlJ9OJk4="; - types-aiobotocore-timestream-write = buildTypesAiobotocorePackage "timestream-write" "2.11.2" "sha256-UBp0FEr4ufUQ2WvMEg1Rv1OgRdtzk6VoKJ56VHlcAyo="; + types-aiobotocore-timestream-write = buildTypesAiobotocorePackage "timestream-write" "2.12.1" "sha256-N7FQ85Y/vr8kam/ESgTxK3v1nMnMl17wYZkcK8kOOyI="; - types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.11.2" "sha256-ZnTjfCvcvshwPK0bBD/Ck6lGiy8+9T5cvFqPv2BnHOc="; + types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.12.1" "sha256-bB9gINmvd69sbfqeJ5cuqhVlA52BFA26rB7c+AWXNZg="; - types-aiobotocore-transcribe = buildTypesAiobotocorePackage "transcribe" "2.11.2" "sha256-GspypGik1nJBWksXZpID2uIP8zgiZnNidLC4uxWd4Uo="; + types-aiobotocore-transcribe = buildTypesAiobotocorePackage "transcribe" "2.12.1" "sha256-ziN4VGQoNThnfC1Pg7thxMFzfvTE2xRGtk3f0OLRiDc="; - types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.11.2" "sha256-wHO9PVHgTSDRiYbKxlkBCIhLB/gt1LtLWjXAG1eViEI="; + types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.12.1" "sha256-Ru3p8rngnhuTytJcVycJo2w0G8hMfCWKk7bzRAU534Q="; - types-aiobotocore-translate = buildTypesAiobotocorePackage "translate" "2.11.2" "sha256-I1b0qD9Trk6Dx2lKr8ERD4cQA+VKvBsmdCRJeIGEqhs="; + types-aiobotocore-translate = buildTypesAiobotocorePackage "translate" "2.12.1" "sha256-y+b/46Qp/+iqFWdgcLhXOQQ60Jb4ZHn+T3VV2B2blr8="; - types-aiobotocore-verifiedpermissions = buildTypesAiobotocorePackage "verifiedpermissions" "2.11.2" "sha256-JChel9RC22kon8uWBlJKMKuYuugbbsrZyjlrmg+fhgg="; + types-aiobotocore-verifiedpermissions = buildTypesAiobotocorePackage "verifiedpermissions" "2.12.1" "sha256-Eiv4Jccs56w0k0hSKvW18vmResqvhxsLB6GmwCadPOA="; - types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.11.2" "sha256-RT09v7dqVet6tAb0IA5NfmzMy4IX2DAofcy729nZZwA="; + types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.12.1" "sha256-vFq5MQHyL3ShqgXGh2eBDZNq6AHVjZek+QonwuaxYwU="; - types-aiobotocore-vpc-lattice = buildTypesAiobotocorePackage "vpc-lattice" "2.11.2" "sha256-Rlr0tzi20v4XosIPW9zkNqKWHN2rNd8DZGiiy1Nb5f0="; + types-aiobotocore-vpc-lattice = buildTypesAiobotocorePackage "vpc-lattice" "2.12.1" "sha256-+coxrlXSx4qwcQXf3RSOpJQL+t1yqO/xB3autVz/NLY="; - types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.11.2" "sha256-JnvB33lVkfViHtEDLo7r11dv5U9Kztv/OW+4gjGDB28="; + types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.12.1" "sha256-U2QbBdI58XBMFEM0AYtK6i51I4lqW28Aeu+XuNhAZJ8="; - types-aiobotocore-waf-regional = buildTypesAiobotocorePackage "waf-regional" "2.11.2" "sha256-Air8rMhqKgkO5TGqRojR+IYOnNXY+N7xNNqQPMn2jrc="; + types-aiobotocore-waf-regional = buildTypesAiobotocorePackage "waf-regional" "2.12.1" "sha256-9JjZCzf9Z8T9tQB/BE+u8+iE/kX/iMLlffBJkuNXzS0="; - types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.11.2" "sha256-b9S614sFcuX4E3W8EXz9Nbdx7sJmHfZz/6dyObuQV/w="; + types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.12.1" "sha256-2gZSrTR5wRP7qOMxkmRQqU+pH83hnEOopuVUbMIXcAU="; - types-aiobotocore-wellarchitected = buildTypesAiobotocorePackage "wellarchitected" "2.11.2" "sha256-7HJ0WBfowqrWLwYvWgbDo+gftumeaepQSWpO5DqIJGE="; + types-aiobotocore-wellarchitected = buildTypesAiobotocorePackage "wellarchitected" "2.12.1" "sha256-guUODw1ecYm396nkEoTKiYurk8YIoSJg9/IZkNaba7I="; - types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.11.2" "sha256-Kaz1XfeiPzKTeUPC2GxY1mr2Xfs2rMmk8qoJXsP+o6Q="; + types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.12.1" "sha256-rOa8B0/7HQ+GfmTVMq5Kn2eclN5i7ywipnJ7bYymUbA="; - types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.11.2" "sha256-eSTETN2kjC/NgehPRXrSe+zZoFOS8Tuk+W51iT5iXt0="; + types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.12.1" "sha256-/hN0c65UtT9/ZgUtmrmlEoDGVUnd9rnC+hJLH38qZXw="; - types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.11.2" "sha256-0N9Va4wHn6SgCPBQ77VuHQgODlCaEgeoze+g//ZoQK8="; + types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.12.1" "sha256-geeKa8vZebnIFuuD6Slz9ShpBYCJXrXojS2KSORDqKk="; - types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.11.2" "sha256-N/eiwpmwBimzDy4VT+m7nbe9PK2QlCa1+z3LKDjzZZI="; + types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.12.1" "sha256-ZnxR1sUOX+krBU0OKsTtnjvhPC8WnsMw4Oyfb5kbSd0="; - types-aiobotocore-workmailmessageflow = buildTypesAiobotocorePackage "workmailmessageflow" "2.11.2" "sha256-+M5VV+1wtSpDz7b7CtfIRIwJFpRA8GLdWRne+RQ2EGM="; + types-aiobotocore-workmailmessageflow = buildTypesAiobotocorePackage "workmailmessageflow" "2.12.1" "sha256-AasaWFat0OGT4/iTmqDHnaXvFU6BQMhTpWKYc9E7FoY="; - types-aiobotocore-workspaces = buildTypesAiobotocorePackage "workspaces" "2.11.2" "sha256-JXslg9nlK/7VwSaVW6No0p0SxRLufoFhmhl+y6Lvsek="; + types-aiobotocore-workspaces = buildTypesAiobotocorePackage "workspaces" "2.12.1" "sha256-/07XwxB2vWaGR8Y07x53/C6PBTaDVKMNoSqbzaRAESo="; - types-aiobotocore-workspaces-web = buildTypesAiobotocorePackage "workspaces-web" "2.11.2" "sha256-Z4tueuOfvtxD6PrWk3Tfq/ztXcE3UZkVn8J6OLA49N4="; + types-aiobotocore-workspaces-web = buildTypesAiobotocorePackage "workspaces-web" "2.12.1" "sha256-QBJmVHZ5UazLecUrpizJDe99t0rIllVqYw+JZQTJWBQ="; - types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.11.2" "sha256-vw6nBEHHtmhHSM/gusdLGT+qB92USaycyIw4f9/bSNA="; + types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.12.1" "sha256-KPhRhUwIv8RG9R/skKq1hZ7SKJB18C2lWIYs4rjvjHw="; } diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index e69d9ab8e5dff..5e60e9d26f311 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,12 +364,12 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.11.2"; + version = "2.12.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bnYg/u2BvG3/iBJ5xKQwiMG/n8vREpnOGHYaSlwlnRs="; + hash = "sha256-pdPYBcAaqGnDwvgttfEUZv3GfUxebpqwTtVwk9p120c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-aiobotocore/update.sh b/pkgs/development/python-modules/types-aiobotocore/update.sh index daded94309a6c..1c0306f27e01c 100644 --- a/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/pkgs/development/python-modules/types-aiobotocore/update.sh @@ -5,7 +5,7 @@ set -eu -o pipefail source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix -version="2.11.2" +version="2.12.1" nix-update python311Packages.types-aiobotocore --commit --build diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index c2adf4dd7b7b8..7b0e42df6d5a5 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.20.3"; + version = "0.20.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-BqhZGJoynKjmbVbO7vI5FIjjm4ePvSFB8RXqtNQW/iI="; + hash = "sha256-YYEbv03pUkiTn5J2pDS+k9K5X2zP6KqU5WmZ6XeM/MI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 923d2e581f97f..687dadc3eb65e 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240106"; + version = "4.12.0.20240229"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-mNYomFtxsUC9O8IqjLCrYDwvLQjyDTeSWWXrSiFzm+g="; + hash = "sha256-435M+hGwOwF3VzLlbSwBDLJO4Qd4Yne65rwPo+MFtoY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 6651855d95699..a3e5cfba04bdd 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.20240205"; - format = "setuptools"; + version = "0.4.15.20240311"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-euT1jUB9OH9PmLJNgeG3ZX7HVOodxGGa5b0n8MNnY34="; + hash = "sha256-oo5/mNF9KxT7lWXTI4jkGfQQj1V6fZOaZjGZabK5nHo="; }; + nativeBuildInputs = [ + setuptools + ]; + # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index a0e4c6e9121d9..ff98f62dcdf6d 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-dateutil"; - version = "2.8.19.20240106"; + version = "2.8.19.20240311"; format = "setuptools"; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-H42yIcO5jmygLqg6WDcbIsN09Crlu98YbbnJp2WBRZ8="; + hash = "sha256-UReCJ7vUy+w13Jrf+/Wdgy8g4JhC19y4xzsWm4eAt8s="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index d118f349ebd05..3cc020d8a9f2a 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.8.20240106"; - format = "setuptools"; + version = "5.1.8.20240310"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Mv+SszYVBg0judN2ASS9s1BsSqjZ61CWPPGjwguey78="; + hash = "sha256-UuMWsDeDiGqKKr3CKPcHFoC6ZYlFRc0ghevjz4hoSg4="; }; + nativeBuildInputs = [ + setuptools + ]; + # Modules doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index 13cd4f61f93cc..4744ffd95da51 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.20.0.20240201"; + version = "0.20.0.20240314"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ukv9T/bdGWQLp6tdk5ADk6ZYl4gPNlCZeWSpQ/Tnmms="; + hash = "sha256-Lq158JJnPILx+3u4yHugGrrVTbZlB2QsBAseaE4j7Ug="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix index 7e5fbfe902510..996f8b4e5c3d8 100644 --- a/pkgs/development/python-modules/types-html5lib/default.nix +++ b/pkgs/development/python-modules/types-html5lib/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-html5lib"; - version = "1.1.11.20240222"; + version = "1.1.11.20240228"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-2VF+xrovofYxE+KTClm2ByKpdsyYO5TX/XcvFIZeEVI="; + hash = "sha256-InNrcpnmBexLpTnUhpHpBf0MYcPqYQrMWZIiMtyEzt4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix new file mode 100644 index 0000000000000..21a8dc8821613 --- /dev/null +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, pyright +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +, typeguard +, types-beautifulsoup4 +, typing-extensions +}: + +buildPythonPackage rec { + pname = "types-lxml"; + version = "2024.02.09"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "abelcheung"; + repo = "types-lxml"; + rev = "refs/tags/${version}"; + hash = "sha256-vmRbzfwlGGxd64KX8j4B3O9c7kg7hXSsCEYq3WAFdmk="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + types-beautifulsoup4 + typing-extensions + ]; + + nativeCheckInputs = [ + lxml + pyright + pytestCheckHook + typeguard + ]; + + pythonImportsCheck = [ + "lxml-stubs" + ]; + + disabledTests = [ + # AttributeError: 'bytes' object has no attribute 'find_class' + # https://github.com/abelcheung/types-lxml/issues/34 + "test_bad_methodfunc" + "test_find_class" + "test_find_rel_links" + "test_iterlinks" + "test_make_links_absolute" + "test_resolve_base_href" + "test_rewrite_links" + ]; + + meta = with lib; { + description = "Complete lxml external type annotation"; + homepage = "https://github.com/abelcheung/types-lxml"; + changelog = "https://github.com/abelcheung/types-lxml/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix index e0b1301062a65..edfa253da75f8 100644 --- a/pkgs/development/python-modules/types-markdown/default.nix +++ b/pkgs/development/python-modules/types-markdown/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-markdown"; - version = "3.5.0.20240129"; + version = "3.5.0.20240311"; pyproject = true; src = fetchPypi { pname = "types-Markdown"; inherit version; - hash = "sha256-ms02/vJk2e1aljRcRffYDw2WcFnpIhOZizBG+7ZPZ/w="; + hash = "sha256-TFjvM+4ngYPFQKWOWZy+lwkPZVMCtu9loQhMSzLXSKQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix index b6a6265364803..cde1a52b9319c 100644 --- a/pkgs/development/python-modules/types-mock/default.nix +++ b/pkgs/development/python-modules/types-mock/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-mock"; - version = "5.1.0.20240106"; + version = "5.1.0.20240311"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-E8o3nVcQzLPxj2mt5bCIgYdMuDOD2PtJsdTaydXF0JA="; + hash = "sha256-dHJ5eYbYMBb5b95/c1d9EpsM2KjQt4NIenvjMNV7pDE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix index f4dad0490d5c3..b6b882218d192 100644 --- a/pkgs/development/python-modules/types-pillow/default.nix +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.1.0.20240106"; + version = "10.2.0.20240311"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-0sLtfs5rC+y02vFQ4jdMj02Xf+bv7GJe+VLiYldhkOc="; + hash = "sha256-9hH2uvfDeE/lUO6SsQgGD1VEpHw3xzrLgaeF8cYxJ3I="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index fcfd7f5d0a658..0d51f30d12aa5 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "5.9.5.17"; + version = "5.9.5.20240205"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-99h2mBLXKktRPX7J61WA/i9gE/wnA5SmA8tlNIEfPk0="; + hash = "sha256-Ud82o2GqWXv0g9zFtY8qt6qHRSo20tqXyQmU1qge90M="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index b2fef1134aa1d..4dce98b9c3795 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20240218"; + version = "2.9.21.20240311"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MITNgHA4piyA+1vni0HYVbSKBgMWEB6ln9hcMC77V9Q="; + hash = "sha256-cilF3/pqcpvrxmDxQTfzft/OrVosFesjQhKn0BfugHI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pyopenssl/default.nix b/pkgs/development/python-modules/types-pyopenssl/default.nix index 7a0a600492967..d7cf53e4ff68c 100644 --- a/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "24.0.0.20240130"; + version = "24.0.0.20240311"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-yBLlwcNSSfde9ZNXCLKpl9Yqv5dFviIuX5S5WVRyqyU="; + hash = "sha256-e8oAz8Tn75xdJmPGocBow1eY5ZZwWVQ59ilue6PVgIM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index c5515cf1f70f9..9a3685c1bb0d3 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.20240218"; + version = "4.6.0.20240311"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UQPX5pDlx0yXShYTF7LVmsIwPPi+8kF1sEwqTDSGyzk="; + hash = "sha256-4Em73/DgofjnAbZGNoESkdIb/3m/HnhQhQpEBVIkqF8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 520927662c2b6..ef7b456981584 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.31.0.20240218"; + version = "2.31.0.20240311"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8XIduoOFlY9QSlOGJAuS3kc04EegikB1HBZU0awzScU="; + hash = "sha256-scG2ar+3+nmq4JCXqBHEqpcTDriDHGDkeu5Mo0RzHKU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index cff06ebc62aa7..7b9da3aed9d77 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "69.1.0.20240215"; + version = "69.1.0.20240308"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Kk/dOjymQ8VzWeWE2y3Stdt0gaguzCHqNovEMXv8BQU="; + hash = "sha256-rU9eUSUe7cvkqo2whEr2ZUBUqvycD20/H6APcHPBd2c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 68c72fe80fed7..a868fde95be05 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , cython , certifi , CFNetwork @@ -29,6 +30,23 @@ buildPythonPackage rec { patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ ./darwin-azure-c-shared-utility-corefoundation.patch ] ++ [ + (fetchpatch { + name = "CVE-2024-25110.patch"; + url = "https://github.com/Azure/azure-uamqp-c/commit/30865c9ccedaa32ddb036e87a8ebb52c3f18f695.patch"; + stripLen = 1; + extraPrefix = "src/vendor/azure-uamqp-c/"; + hash = "sha256-igzZqTLUUyuNcpCUbYHI4RXmWxg+7EC/yyD4DBurR2M="; + }) + (fetchpatch { + name = "CVE-2024-27099.patch"; + url = "https://github.com/Azure/azure-uamqp-c/commit/2ca42b6e4e098af2d17e487814a91d05f6ae4987.patch"; + stripLen = 1; + extraPrefix = "src/vendor/azure-uamqp-c/"; + # other files are just tests which aren't run from the python + # builder anyway + includes = [ "src/vendor/azure-uamqp-c/src/link.c" ]; + hash = "sha256-EqDfG1xAz5CG8MssSSrz8Yrje5qwF8ri1Kdw+UUu5ms="; + }) # Fix incompatible function pointer conversion error with clang 16. ./clang-fix-incompatible-function-pointer-conversion.patch ]; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 8299effe6f5ea..827a21c811b7c 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -1,5 +1,9 @@ -{ lib, fetchPypi, buildPythonPackage -, nose, numpy, future +{ lib +, buildPythonPackage +, fetchPypi +, future +, numpy +, pynose }: buildPythonPackage rec { @@ -13,10 +17,10 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ future ]; - nativeCheckInputs = [ nose numpy ]; + nativeCheckInputs = [ pynose numpy ]; checkPhase = '' - nosetests -sv + nosetests -sve test_1to2 ''; meta = with lib; { diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix index 934f51c67ddfd..6dd4e813312eb 100644 --- a/pkgs/development/python-modules/unicode-rbnf/default.nix +++ b/pkgs/development/python-modules/unicode-rbnf/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "unicode-rbnf"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "unicode-rbnf"; rev = "v${version}"; - hash = "sha256-xwnfqWwQJKCJ4G+8eVaySTJAHxhwKYAqLHaCsxtBIl0="; + hash = "sha256-PquPoiaO1rEDMz7jaN9MUB0UQGH07M0O9mlrUCsfhm4="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/rhasspy/unicode-rbnf/v${version}/master/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/unicode-rbnf/blob/v${version}/CHANGELOG.md"; description = "A pure Python implementation of ICU's rule-based number format engine"; homepage = "https://github.com/rhasspy/unicode-rbnf"; license = licenses.mit; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 5fcf87e9ced97..3e39c28eabd42 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -3,22 +3,27 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "unidecode"; - version = "1.3.6"; - format = "setuptools"; + version = "1.3.8"; + pyproject = true; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "avian2"; - repo = pname; - rev = "${pname}-${version}"; - hash = "sha256-75E2OlrGIxvwR9MeZEB4bDLdFd1SdprCVcBIJCPS3hM="; + repo = "unidecode"; + rev = "refs/tags/${pname}-${version}"; + hash = "sha256-OoJSY+dNNISyVwKuRboMH7Je8nYFKxus2c4v3VsmyRE="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index cd53dae36822f..760b9f96c89ba 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "unifi-discovery"; - version = "1.1.7"; + version = "1.1.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EQFk3kRY/JL1ZTDdHKzl0KbMUuhZSFc4tYqAYvsNSj0="; + hash = "sha256-gE/2awyhDACrc0nuTvTPOcK2lFbPIZAXDPRnVJtWFco="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index 23667d02c2835..195d6cbfe2a86 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.1.4"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-guXYbRaifg6hrcfYisvLqdAtWkVIgWMXT5bZrCidsuQ="; + hash = "sha256-a8IVVIeSrV2zVTcIscGbr9ni+hZn3JJe1ATJXlKuLxM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 938856691b7ab..e9b8e0294d808 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.18"; + version = "0.0.19"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; - rev = "v${version}"; - hash = "sha256-XUMpWzDqouhbsP+s0b13f6N0YGdXJK6qhbWQLqMzNHM="; + rev = "refs/tags/v${version}"; + hash = "sha256-VoO9B27CNY2Cnt/Q2HsU6DVYkukQMgbIHc6xqfN0P7w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index ac1f937a44b4f..9ad99ec8d8852 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.12.4"; + version = "0.12.6"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-lfsCmEhF6CTrEIa4y98NgDw6EgfLk39BVsTmYZD6MkU="; + hash = "sha256-K2ilPDkxXICb66rOgz18AZ92u5VBgRh6bLiDVEgleDU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 288758dfb34aa..9e8436bd662c3 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pythonOlder , awkward +, cramjam , hatch-vcs , hatchling , numpy @@ -10,17 +11,15 @@ , packaging , pandas , pytestCheckHook -, lz4 , pytest-timeout , rangehttpserver , scikit-hep-testdata , xxhash -, zstandard }: buildPythonPackage rec { pname = "uproot"; - version = "5.2.2"; + version = "5.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-7X8oIMvOSC1JXQrZTPXLiqsUnfSc2Rx3KCvxKbhvPzM="; + hash = "sha256-cZVdsemaA3ni6xFfrkyLJA+12B7vyURj9OYVuOhqTXU="; }; nativeBuildInputs = [ @@ -39,6 +38,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward + cramjam numpy fsspec packaging @@ -47,12 +47,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pandas pytestCheckHook - lz4 pytest-timeout rangehttpserver scikit-hep-testdata xxhash - zstandard ]; preCheck = '' @@ -79,6 +77,8 @@ buildPythonPackage rec { "test_open_fsspec_http" "test_open_fsspec_github" "test_pickle_roundtrip_http" + # Cyclic dependency with dask-awkward + "test_decompression_executor_for_dask" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/urlextract/default.nix b/pkgs/development/python-modules/urlextract/default.nix index 90fb0d457c0a3..df2b134f9a656 100644 --- a/pkgs/development/python-modules/urlextract/default.nix +++ b/pkgs/development/python-modules/urlextract/default.nix @@ -7,21 +7,26 @@ , platformdirs , pytestCheckHook , pythonOlder +, setuptools , uritools }: buildPythonPackage rec { pname = "urlextract"; - version = "1.8.0"; - format = "setuptools"; + version = "1.9.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NXP2uBKBTv4GykbpHoLZhO2qPNB9qqqilqRnrZiBoDc="; + hash = "sha256-cFCOArqd83LiXPBkLbNnzs4nPocSzQzngXj8XdfqANs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ filelock idna diff --git a/pkgs/development/python-modules/urwid-readline/default.nix b/pkgs/development/python-modules/urwid-readline/default.nix index 7d24067fd1101..3e47f886cdb70 100644 --- a/pkgs/development/python-modules/urwid-readline/default.nix +++ b/pkgs/development/python-modules/urwid-readline/default.nix @@ -1,26 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , urwid -, glibcLocales , pytestCheckHook }: buildPythonPackage rec { - pname = "urwid_readline"; - version = "0.13"; + pname = "urwid-readline"; + version = "0.14"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-AYAgy8hku17Ye+F9wmsGnq4nVcsp86nFaarDve0e+vQ="; + src = fetchFromGitHub { + owner = "rr-"; + repo = "urwid_readline"; + rev = "refs/tags/${version}"; + hash = "sha256-ZTg+GZnu7R6Jf2+SIwVo57yHnjwuY92DElTJs8oRErE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ urwid ]; + pythonImportsCheck = [ "urwid_readline" ]; + nativeCheckInputs = [ - glibcLocales pytestCheckHook ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 35ed3e78fafff..e6141601cbdd8 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.2"; + version = "2.6.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-d9tgKjZMVdaMrxQT6sJsVb812NuFYkA1hLlo/6XgwAo="; + hash = "sha256-KtIcmAPOcxC9wTq6mKRZWcohH0skYMHlq4mehpn6raY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index 5f4a31d39b190..014de3cfeb1ed 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "userpath"; - version = "1.9.1"; - format = "pyproject"; + version = "1.9.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zoF2co2YyRS2QBeBvzsj/M2WjRZHU5yHiMcBA3XgJ5Y="; + hash = "sha256-bFIojasGklfMgxhG0V1IEzUiRV1Gd+5pqXgfEdvv2BU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index 59e6f93aff8d1..8cd0a28b533db 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, nose, mock }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pynose, mock }: buildPythonPackage rec { pname = "uvcclient"; @@ -12,8 +12,13 @@ buildPythonPackage rec { sha256 = "0k8aswrk1n08w6pi6dg0zdzsmk23cafihkrss9ywg3i85w7q43x2"; }; + postPatch = '' + substituteInPlace tests/test_camera.py \ + --replace-fail "assertEquals" "assertEqual" + ''; + nativeCheckInputs = [ - nose + pynose mock ]; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 11df7fd78c6e1..112d25ef6403c 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.24.0.post1"; + version = "0.27.1"; disabled = pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WMXOmQOTj/yPazPEAuteho4UH9enXcIa1mMDDl2eaIk="; + hash = "sha256-p0iPQE66RJfd811x6cnv7m3yvD/L9v7evBXlaIQSE0M="; }; outputs = [ diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 1caf7ed4c5d9b..3d38c9a17ccb4 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "4.2.0"; - format = "pyproject"; + version = "5.1.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-e05MP130okj8j20yMn8a7P6PYZ4PKwCOlAf0ZlUR5aI="; + hash = "sha256-BhAI/bGzaSckyZJq7GYUldziotr2bMlA5cWgQEwiUcQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index 11e20dfc1d56a..44678dcd884a4 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "vector"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-I7esW9qyc7T5MGFn/YZmajd3pSgE0CgqVW2YkTDLV6Q="; + hash = "sha256-nQ7tzYVOmcF0oklmhxbgH4w5cJ+cwuJi1ihich7D7yc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/verlib2/default.nix b/pkgs/development/python-modules/verlib2/default.nix new file mode 100644 index 0000000000000..41c1d95eff25a --- /dev/null +++ b/pkgs/development/python-modules/verlib2/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, versioningit +}: + +buildPythonPackage rec { + pname = "verlib2"; + version = "0.2.0"; + pyproject = true; + + # This tarball doesn't include tests unfortuneatly, and the GitHub tarball + # could have been an alternative, but versioningit fails to detect the + # version of it correctly, even with setuptools-scm and + # SETUPTOOLS_SCM_PRETEND_VERSION = version added. Since this is a pure Python + # package, we can rely on upstream to run the tests before releasing, and it + # should work for us as well. + src = fetchPypi { + inherit pname version; + hash = "sha256-CrlAh8CU4nFjlI36gXyY1itr3QEibM5RiPjMPNaDRbk="; + }; + + nativeBuildInputs = [ + setuptools + versioningit + ]; + + pythonImportsCheck = [ "verlib2" ]; + + meta = with lib; { + description = "A standalone variant of packaging.version, without anything else"; + homepage = "https://pypi.org/project/verlib2/"; + license = licenses.bsd2; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/virt-firmware/default.nix b/pkgs/development/python-modules/virt-firmware/default.nix index cd9d2441b9d10..8f2f0c0736098 100644 --- a/pkgs/development/python-modules/virt-firmware/default.nix +++ b/pkgs/development/python-modules/virt-firmware/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "virt-firmware"; - version = "24.1.1"; + version = "24.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dUDfDQypP8hCo4eZcnUsOovgMksSX7hxMQI8mliCx2c="; + hash = "sha256-bvk3MIgPY6DJ+y0eKQHLffClNjPAEP7AJ15rFObiMig="; }; pythonImportsCheck = [ "virt.firmware.efi" ]; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index e8127c4caf8bb..ce739e1d6dd27 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -7,6 +7,7 @@ , packaging , setuptools , torch +, outlines , wheel , psutil , ray @@ -36,14 +37,14 @@ buildPythonPackage rec { pname = "vllm"; - version = "0.3.1"; + version = "0.3.3"; format = "pyproject"; src = fetchFromGitHub { owner = "vllm-project"; repo = pname; rev = "v${version}"; - hash = "sha256-hfd4ScU0mkZ7z4+w08BUA1K9bPXSiFThfiO+Ll2MTtg="; + hash = "sha256-LU5pCPVv+Ws9dL8oWL1sJGzwQKI1IFk2A1I6TP9gXL4="; }; # Otherwise it tries to enumerate host supported ROCM gfx archs, and that is not possible due to sandboxing. @@ -62,11 +63,11 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace "cupy-cuda12x == 12.1.0" "cupy == 12.3.0" substituteInPlace requirements-build.txt \ - --replace "torch==2.1.2" "torch == 2.2.0" + --replace "torch==2.1.2" "torch == 2.2.1" substituteInPlace pyproject.toml \ - --replace "torch == 2.1.2" "torch == 2.2.0" + --replace "torch == 2.1.2" "torch == 2.2.1" substituteInPlace requirements.txt \ - --replace "torch == 2.1.2" "torch == 2.2.0" + --replace "torch == 2.1.2" "torch == 2.2.1" '' + lib.optionalString rocmSupport '' substituteInPlace setup.py \ --replace "'hipcc', '--version'" "'${writeShellScript "hipcc-version-stub" "echo HIP version: 0.0"}'" @@ -114,6 +115,7 @@ buildPythonPackage rec { numpy torch transformers + outlines xformers fastapi uvicorn diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index 14b6a094912a7..bfcfb72d45c67 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.8"; - format = "pyproject"; + version = "1.8.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - repo = pname; + repo = "wagtail-localize"; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-K4TOW4q8vD9vaNJzSEtmQBgO/dOxcWKKUp2FE3JLIbE="; + hash = "sha256-DBqGFD6piMn9d7Ls/GBeBfeQty/MDvlQY0GP66BA2QE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wallbox/default.nix b/pkgs/development/python-modules/wallbox/default.nix index a53344a76fd17..38e2d8a89e00f 100644 --- a/pkgs/development/python-modules/wallbox/default.nix +++ b/pkgs/development/python-modules/wallbox/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "wallbox"; - version = "0.5.1"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EDEB7/CkrfYSNcSh55Itrj6rThsNKeuj8lHLAY+Qml4="; + hash = "sha256-COZHMkAbTFZKi/b4e6toC4gPj1MPfGN4aBVi6SglrBI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index 08b6e1800955a..fa5a75c132683 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.5"; + version = "8.5.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-hsF1ctD3XL87yxoY878vnnKzmpwIybSnTpkeGIKo77M="; + hash = "sha256-wAiMf2Qmz2vyflMOK3tzQDGQX35JBHX9g8fFAIq1gbM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index ee12162a0632a..52a411b23269b 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -1,15 +1,21 @@ -{ lib, fetchPypi, buildPythonPackage, pytestCheckHook +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder , setuptools }: buildPythonPackage rec { pname = "wcwidth"; - version = "0.2.12"; + version = "0.2.13"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - hash = "sha256-8BwQTv31eXG8t1bwVN1Y3exSBN0V+jHWUD6leUfZfAI="; + hash = "sha256-cuoMBjmesobZeP3ttpI6nrR+HEhs5j6bTmT8GDA5crU="; }; nativeBuildInputs = [ @@ -23,6 +29,10 @@ buildPythonPackage rec { # To prevent infinite recursion with pytest doCheck = false; + pythonImportsCheck = [ + "wcwidth" + ]; + meta = with lib; { description = "Measures number of Terminal column cells of wide-character codes"; longDescription = '' @@ -32,6 +42,8 @@ buildPythonPackage rec { no 3rd-party dependencies. ''; homepage = "https://github.com/jquast/wcwidth"; + changelog = "https://github.com/jquast/wcwidth/releases/tag/${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 99f3ba24f1b2d..403c577d65541 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -24,15 +24,15 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "60.2"; + version = "61.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-DAzdYXp4aZJiuAAm5n+haS44As+pZjlUNu6vb3h90SY="; + hash = "sha256-fLyCTcQCbYKpc2Jkd1X4N90VeZlJY5zIpCjdM9OFAJo="; }; patches = [ diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 3f85f8064899d..5e00ef399e613 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -6,12 +6,13 @@ , paho-mqtt , python-dateutil , weconnect +, setuptools }: buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.48.3"; - format = "setuptools"; + version = "0.48.4"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,19 +20,23 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-Pja9BP0gbWXTgOokEngNS364tJp1oWJYNKcTxyYJHGw="; + hash = "sha256-Yv6CAGTDi4P9pImLxVk2QkZ014iqQ8UMBUeiyZWnYiQ="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "weconnect[Images]~=" "weconnect>=" substituteInPlace weconnect_mqtt/__version.py \ - --replace "develop" "${version}" + --replace-fail "0.0.0dev" "${version}" + substituteInPlace requirements.txt \ + --replace-fail "weconnect[Images]~=" "weconnect>=" substituteInPlace pytest.ini \ - --replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ - --replace "pytest-cov" "" + --replace-fail "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ + --replace-fail "pytest-cov" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ paho-mqtt python-dateutil diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index e9f4877110efe..096e41b89bcc9 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -2,18 +2,18 @@ , ascii-magic , buildPythonPackage , fetchFromGitHub +, oauthlib , pillow -, pytest-httpserver , pytestCheckHook , pythonOlder , requests -, oauthlib +, setuptools }: buildPythonPackage rec { pname = "weconnect"; - version = "0.59.5"; - format = "setuptools"; + version = "0.60.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -21,9 +21,24 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ujIA98QD8ds2/iLLeJqn88nY9tZuuOSnOwGvRznA8PQ="; + hash = "sha256-VM4qCe+VMnfKXioUHTjOeBSniwpq44fvbN1k1jG6puk="; }; + postPatch = '' + substituteInPlace weconnect/__version.py \ + --replace-fail "0.0.0dev" "${version}" + substituteInPlace setup.py \ + --replace-fail "setup_requires=SETUP_REQUIRED" "setup_requires=[]" \ + --replace-fail "tests_require=TEST_REQUIRED" "tests_require=[]" + substituteInPlace pytest.ini \ + --replace-fail "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ + --replace-fail "required_plugins = pytest-cov" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ oauthlib requests @@ -37,24 +52,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytest-httpserver pytestCheckHook ]; - postPatch = '' - substituteInPlace weconnect/__version.py \ - --replace "develop" "${version}" - substituteInPlace setup.py \ - --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ - --replace "tests_require=TEST_REQUIRED," "tests_require=[]," - substituteInPlace image_extra_requirements.txt \ - --replace "pillow~=" "pillow>=" \ - --replace "ascii_magic~=" "ascii_magic>=" - substituteInPlace pytest.ini \ - --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ - --replace "required_plugins = pytest-httpserver pytest-cov" "" - ''; - pythonImportsCheck = [ "weconnect" ]; diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 20d05c8bbaf31..4642da2b3acec 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.3.4"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ariebovenberg"; repo = "whenever"; - rev = version; - hash = "sha256-pVbR9KYothEPJUhvFA3hDnLcKp7hvU8ntxvkYrKxQfQ="; + rev = "refs/tags/${version}"; + hash = "sha256-vZRdt3Vxndp0iwA5uwMHSbzQZZZc5+tBWh3tMJYfIaU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 13168c3757ebe..04f9528c8d744 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -11,10 +11,10 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "6.5.0"; - format = "pyproject"; + version = "6.6.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; __darwinAllowLocalNetworking = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "evansd"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-g1D0tjGsAP3y1fWvODWwNvxnTSZJuTpyZ0Otk83Oq9E="; + hash = "sha256-Z59GjrOL+BPHqBCirg9T4qBOrjiuBng6Q5lTuLQx9ac="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wikipedia2vec/default.nix b/pkgs/development/python-modules/wikipedia2vec/default.nix new file mode 100644 index 0000000000000..f28addf30f4f0 --- /dev/null +++ b/pkgs/development/python-modules/wikipedia2vec/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, click +, cython_3 +, fetchFromGitHub +, jieba +, joblib +, lmdb +, marisa-trie +, mwparserfromhell +, numpy +, pythonOlder +, scipy +, setuptools +, tqdm +}: + +buildPythonPackage rec { + pname = "wikipedia2vec"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "wikipedia2vec"; + repo = "wikipedia2vec"; + rev = "refs/tags/v${version}"; + hash = "sha256-vrBLlNm0bVIStSBWDHRCtuRpazu8JMCtBl4qJPtHGvU="; + }; + + nativeBuildInputs = [ + cython_3 + setuptools + ]; + + propagatedBuildInputs = [ + click + cython_3 + jieba + joblib + lmdb + marisa-trie + mwparserfromhell + numpy + scipy + tqdm + ]; + + preBuild = '' + bash cythonize.sh + ''; + + pythonImportsCheck = [ + "wikipedia2vec" + ]; + + meta = with lib; { + description = "Tool for learning vector representations of words and entities from Wikipedia"; + homepage = "https://wikipedia2vec.github.io/wikipedia2vec/"; + changelog = "https://github.com/wikipedia2vec/wikipedia2vec/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 6a1cde0a1a909..59dab76820c93 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -1,27 +1,53 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, mock, git -, cherrypy, gevent, tornado }: +{ lib +, buildPythonPackage +, cherrypy +, fetchPypi +, gevent +, git +, mock +, pytestCheckHook +, pythonOlder +, setuptools +, tornado +}: buildPythonPackage rec { pname = "ws4py"; version = "0.5.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483"; + hash = "sha256-KdBz1/LgBjc+aoSLHQCVGhEH64HzdClSvpBUKdxaVIM="; }; - nativeCheckInputs = [ pytest mock git ]; - propagatedBuildInputs = [ cherrypy gevent tornado ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cherrypy + gevent + tornado + ]; + + nativeCheckInputs = [ + git + mock + pytestCheckHook + ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ + "ws4py" + ]; meta = with lib; { - homepage = "https://ws4py.readthedocs.org"; description = "A WebSocket package for Python"; - maintainers = []; + homepage = "https://ws4py.readthedocs.org"; + changelog = "https://github.com/Lawouach/WebSocket-for-Python/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/wsgi-intercept/default.nix b/pkgs/development/python-modules/wsgi-intercept/default.nix index 6e943a0b34f7a..fcc8551f72942 100644 --- a/pkgs/development/python-modules/wsgi-intercept/default.nix +++ b/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -7,22 +7,27 @@ , pytestCheckHook , pythonOlder , requests +, setuptools , urllib3 }: buildPythonPackage rec { pname = "wsgi-intercept"; - version = "1.12.1"; - format = "setuptools"; + version = "1.13.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "wsgi_intercept"; inherit version; - hash = "sha256-StUxEN91fU7qoptH9iKJFpZWIBIOtIe6S4gvdBgN48E="; + hash = "sha256-daA+HQHdtCAC+1a4Ss0qeo7OJe/dIGREoTqfH7z6k0w="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ six ]; @@ -36,6 +41,9 @@ buildPythonPackage rec { ]; disabledTests = [ + # Tests require network access + "test_urllib3" + "test_requests" "test_http_not_intercepted" "test_https_not_intercepted" "test_https_no_ssl_verification_not_intercepted" @@ -49,6 +57,6 @@ buildPythonPackage rec { description = "Module that acts as a WSGI application in place of a real URI for testing"; homepage = "https://github.com/cdent/wsgi-intercept"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mikecm ]; }; } diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 9cc0ec2254c7c..3ef8332cae216 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -3,28 +3,34 @@ , fetchPypi , python , cffi +, setuptools , pythonOlder }: buildPythonPackage rec { pname = "xattr"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-osfLLvRBv2eeJAtl4gXwij7jFeGQ/qVnPmD9aBLmNKU="; + hash = "sha256-/svzsFBD7TSHooGQ3sPkxNh5svzsDjC6/Y7F1LYENjA="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ cffi + setuptools ]; # https://github.com/xattr/xattr/issues/43 doCheck = false; + propagatedBuildInputs = [ + cffi + ]; + postBuild = '' ${python.pythonOnBuildForHost.interpreter} -m compileall -f xattr ''; diff --git a/pkgs/development/python-modules/xdxf2html/default.nix b/pkgs/development/python-modules/xdxf2html/default.nix new file mode 100644 index 0000000000000..496627c3724f0 --- /dev/null +++ b/pkgs/development/python-modules/xdxf2html/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, setuptools +}: + +buildPythonPackage rec { + pname = "xdxf2html"; + version = "0.1.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-u2UaEALzD583+hbgwTItQOdGQ6GIhdVy79C2gfJwzlI="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "xdxf2html" ]; + + meta = with lib; { + description = "Python module for converting XDXF dictionary texts into HTML"; + homepage = "https://github.com/Crissium/python-xdxf2html"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 18de691f53983..8264a5b9fb173 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.26.1"; + version = "0.27.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-ENs+n8YgOSQpN+UpYU6CI1McWPyh8hKKMUjPDUYRWjI="; + hash = "sha256-D1LqIdnusCs7vzVCPnbhXqRER/+uPKWoVsfeGe2M6b8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 91721fdd169aa..dc3e1adb1707f 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -4,16 +4,15 @@ , fetchFromGitHub , cryptography , ifaddr -, pytest-asyncio +, pytest-asyncio_0_21 , pytestCheckHook , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "xknx"; - version = "2.12.0"; + version = "2.12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,22 +21,26 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknx"; rev = "refs/tags/${version}"; - hash = "sha256-Fwo76tvkLLx8QJeokuGohhnt83eGBMyWIUSHJGuQWJ4="; + hash = "sha256-gajxXIR3lmHsW7258v4z20RilzGfm5KGVrXZwRm74Mk="; }; + patches = [ + ./pytest-asyncio-0.22-compat.patch + ]; + nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ - async-timeout cryptography ifaddr + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0_21 pytestCheckHook ]; @@ -50,6 +53,15 @@ buildPythonPackage rec { "test_scan_timeout" "test_start_secure_routing_knx_keys" "test_start_secure_routing_manual" + # RuntimeError: Event loop is closed + "test_has_group_address_localtime" + "test_invalid_authentication" + "test_invalid_frames" + "test_no_authentication" + "test_process_read_localtime" + "test_sync_date" + "test_sync_datetime" + "test_sync_time_local" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/xknx/pytest-asyncio-0.22-compat.patch b/pkgs/development/python-modules/xknx/pytest-asyncio-0.22-compat.patch new file mode 100644 index 0000000000000..2688ceb1fdd62 --- /dev/null +++ b/pkgs/development/python-modules/xknx/pytest-asyncio-0.22-compat.patch @@ -0,0 +1,28 @@ +diff --git a/test/devices_tests/datetime_test.py b/test/devices_tests/datetime_test.py +index af06abc6..2145fcc1 100644 +--- a/test/devices_tests/datetime_test.py ++++ b/test/devices_tests/datetime_test.py +@@ -12,11 +12,6 @@ from xknx.telegram.apci import GroupValueRead, GroupValueResponse, GroupValueWri + class TestDateTime: + """Test class for DateTime object.""" + +- # pylint: disable=attribute-defined-outside-init +- def teardown_method(self): +- """Cancel broadcast_task.""" +- self.datetime.__del__() +- + # + # SET Time + # +diff --git a/test/io_tests/secure_session_test.py b/test/io_tests/secure_session_test.py +index cd2dc1d0..ca90e2d9 100644 +--- a/test/io_tests/secure_session_test.py ++++ b/test/io_tests/secure_session_test.py +@@ -65,7 +65,6 @@ class TestSecureSession: + + def teardown_method(self): + """Cancel keepalive task.""" +- self.session.stop() + self.patch_serial_number.stop() + self.patch_message_tag.stop() + diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index f5e47f196dcac..1b0098629a92e 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-7WK4TgrTuUwR33d1N8+VmgZ6iylyfIJbFCyxh49luL0="; + hash = "sha256-tw/hHiiW4ZGlrbQmuIihJmhyIL++Rjpg6q8AdKNsn14="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 0bcbbdda09e04..a4d23e9580dda 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.19.1"; + version = "3.20.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-kKbetvJDzvsUUWEYgFb7G86v9/Iiy49Wyl25p/zzBHo="; + hash = "sha256-w4wmjY+yA5Nc1roAXBRTqQxqaSI1vzdMhK9hGkbv7Rk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index f8752d5d2321a..5869ad70fcea1 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -6,12 +6,13 @@ , lxml , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "xmlschema"; - version = "3.0.1"; - format = "setuptools"; + version = "3.0.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-7gko4BFbTnQ+MpSQiGVaAldZcb1X16hinXaHg+nvPgs="; + hash = "sha256-jYFhoNx4Oxm7c0LsSQ0xw9fY/yxfQU5JoP5RteHzeYM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ elementpath ]; diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 78bec78444c56..097c2e1cc07c4 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "xsdata"; - version = "24.1"; + version = "24.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tefra"; repo = "xsdata"; - rev = "v${version}"; - hash = "sha256-vdcCTJqvaRehGWfTd9GR/DypF9ftY4ite7SDMPc2Ups="; + rev = "refs/tags/v${version}"; + hash = "sha256-o3G0isXShwNHaOiA4TNml0IhStB3X4jB9CgrVKViBlY="; }; patches = [ @@ -94,7 +94,7 @@ buildPythonPackage rec { meta = { description = "Naive XML & JSON bindings for Python"; homepage = "https://github.com/tefra/xsdata"; - changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix index d970f0888aa89..7651ce57c10d2 100644 --- a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix +++ b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "XStatic-asciinema-player"; + pname = "xstatic-asciinema-player"; version = "2.6.1.1"; src = fetchPypi { - inherit version pname; + pname = "XStatic-asciinema-player"; + inherit version; sha256 = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw="; }; diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix index 6e5200d2a8878..49c0f7d783fb1 100644 --- a/pkgs/development/python-modules/xstatic-bootbox/default.nix +++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "XStatic-Bootbox"; + pname = "xstatic-bootbox"; version = "5.5.1.1"; src = fetchPypi { - inherit version pname; + pname = "XStatic-Bootbox"; + inherit version; sha256 = "4b2120bb33a1d8ada8f9e0532ad99987aa03879b17b08bfdc6b8326d6eb7c205"; }; diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index 0d9962e5faf50..808957f70d149 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "XStatic-Bootstrap"; + pname = "xstatic-bootstrap"; version = "4.5.3.1"; src = fetchPypi { - inherit version pname; + pname = "XStatic-Bootstrap"; + inherit version; sha256 = "cf67d205437b32508a88b69a7e7c5bbe2ca5a8ae71097391a6a6f510ebfd2820"; }; diff --git a/pkgs/development/python-modules/xstatic-font-awesome/default.nix b/pkgs/development/python-modules/xstatic-font-awesome/default.nix index 71028393dc8c2..07bce6f3c4c0b 100644 --- a/pkgs/development/python-modules/xstatic-font-awesome/default.nix +++ b/pkgs/development/python-modules/xstatic-font-awesome/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "XStatic-Font-Awesome"; + pname = "xstatic-font-awesome"; version = "6.2.1.1"; src = fetchPypi { - inherit version pname; + pname = "XStatic-Font-Awesome"; + inherit version; sha256 = "sha256-8HWHEJYShjjy4VOQINgid1TD2IXdaOfubemgEjUHaCg="; }; diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix index ce3f8c76dfa6c..29ab4f1cb062d 100644 --- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "XStatic-jQuery-File-Upload"; + pname = "xstatic-jquery-file-upload"; version = "10.31.0.1"; src = fetchPypi { - inherit version pname; + pname = "XStatic-jQuery-File-Upload"; + inherit version; sha256 = "7d716f26aca14732c35c54f0ba6d38187600ab472fc98a91d972d12c5a70db27"; }; diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix index f5509676d1144..0f74a49f929c1 100644 --- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "XStatic-jquery-ui"; + pname = "xstatic-jquery-ui"; version = "1.13.0.1"; src = fetchPypi { - inherit version pname; + pname = "XStatic-jquery-ui"; + inherit version; sha256 = "3697e5f0ef355b8f4a1c724221592683c2db031935cbb57b46224eef474bd294"; }; diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix index e2a8f8266111c..bd48c889f3f05 100644 --- a/pkgs/development/python-modules/xstatic-jquery/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "XStatic-jQuery"; + pname = "xstatic-jquery"; version = "3.5.1.1"; src = fetchPypi { - inherit version pname; + pname = "XStatic-jQuery"; + inherit version; sha256 = "e0ae8f8ec5bbd28045ba4bca06767a38bd5fc27cf9b71f434589f59370dcd323"; }; diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix index 68fc2339f559b..6d8391dcb8aae 100644 --- a/pkgs/development/python-modules/xstatic-pygments/default.nix +++ b/pkgs/development/python-modules/xstatic-pygments/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "XStatic-Pygments"; + pname = "xstatic-pygments"; version = "2.9.0.1"; src = fetchPypi { - inherit version pname; + pname = "XStatic-Pygments"; + inherit version; sha256 = "082c1e9fe606fbbef474f78b6fdb19e9a2efcc7a9b7d94163cf66f7bfae75762"; }; diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix index d9d6e03983552..593dd7e9dd9ec 100644 --- a/pkgs/development/python-modules/xstatic/default.nix +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "XStatic"; + pname = "xstatic"; version = "1.0.3"; src = fetchPypi { - inherit version pname; + pname = "XStatic"; + inherit version; sha256 = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg="; }; diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index b32403a6a97d7..93a16ea29f9b0 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.4.1"; + version = "2.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-u6Mhqt6DcPiini8EvtqKoVAYUwb31hvWfCNb/sbqvWQ="; + hash = "sha256-A/4N3vmFuzg9vaPISs0P3KxRQZSquPpR1zYcYEePkTA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 02e72f9244fc4..4f515f9b7bbbc 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -13,22 +13,33 @@ , pythonOlder , requests , requests-mock +, setuptools }: buildPythonPackage rec { pname = "yalexs"; - version = "1.11.2"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-FHaHXbRtgbBrveHPbrPsP+vGIvscot3ilpPFucISces="; + hash = "sha256-ozohIzw80YfyB0sxXQ9MY6VpF+EDDvXZYfkpuloE4AU="; }; + postPatch = '' + # Not used requirement + substituteInPlace setup.py \ + --replace-fail '"vol",' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp @@ -39,6 +50,9 @@ buildPythonPackage rec { requests ]; + # aiounittest is not supported on 3.12 + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ aioresponses aiounittest @@ -46,12 +60,6 @@ buildPythonPackage rec { requests-mock ]; - postPatch = '' - # Not used requirement - substituteInPlace setup.py \ - --replace '"vol",' "" - ''; - pythonImportsCheck = [ "yalexs" ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index c5664846dcfc5..9200d7d508acc 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , setuptools @@ -6,21 +7,20 @@ , pytestCheckHook , pythonOlder , pyyaml -, stdenv }: buildPythonPackage rec { pname = "yamllint"; - version = "1.33.0"; - format = "pyproject"; + version = "1.35.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "adrienverge"; - repo = pname; + repo = "yamllint"; rev = "refs/tags/v${version}"; - hash = "sha256-hWN5PhEAhckp250Dj7h5PpyH/E1jCi38O4VmMYgPtzE="; + hash = "sha256-+7Q2cPl4XElI2IfLAkteifFVTrGkj2IjZk7nPuc6eYM="; }; nativeBuildInputs = [ @@ -46,7 +46,9 @@ buildPythonPackage rec { "test_run_with_locale" ]; - pythonImportsCheck = [ "yamllint" ]; + pythonImportsCheck = [ + "yamllint" + ]; meta = with lib; { description = "A linter for YAML files"; diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index cff5b329e6ca6..c386e5a565117 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yara-python"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - hash = "sha256-Fl/0ordXDKC1CBBmPx0fEwZZjqSiMxnwNvQqD98MjRo="; + hash = "sha256-RcrzzJQdzn+BXEp5M3ziGL6qSgfUN3wJ3JxwgjzVeuk="; }; # undefined symbol: yr_finalize diff --git a/pkgs/development/python-modules/yaspin/default.nix b/pkgs/development/python-modules/yaspin/default.nix index c90da30a746bc..0235c06ab1496 100644 --- a/pkgs/development/python-modules/yaspin/default.nix +++ b/pkgs/development/python-modules/yaspin/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, pytest-xdist , pytestCheckHook , pythonOlder , termcolor @@ -30,13 +31,13 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-xdist pytestCheckHook ]; - postPatch = '' - # https://github.com/pavdmyt/yaspin/pull/212 - substituteInPlace pyproject.toml \ - --replace 'termcolor-whl = "1.1.2"' 'termcolor = "*"' + # tests assert for \033 which gets turned off in termcolor when TERM dumb is used which is used by nix + preCheck = '' + export FORCE_COLOR=1 ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index fb771047db112..06db089ca8356 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.36"; + version = "0.2.37"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oBpkWKQZ5FA+nyNWVOlRzoEyShCfh6SqCCrkFZBu1rQ="; + hash = "sha256-rptCZ4Yiz6VbV/woHN6JpRNsZL4SrqepoIw4tYpU4x0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 5c155094cf644..e1e43b34a7ae6 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.3.7"; - format = "pyproject"; + version = "0.3.9"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "YoSmart-Inc"; - repo = pname; + repo = "yolink-api"; rev = "refs/tags/v${version}"; - hash = "sha256-P9Hu3JhoFDwKylTAZmXYX2AI2CPf/GbYhJCU4wX/aWY="; + hash = "sha256-RXO++8Dh0hLkjXev/WDhPixLHKXlqRabbrPW6Hs/xoM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index 3fc465d9bad10..ff10359238b40 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -5,7 +5,7 @@ , certifi , chardet , idna -, nose +, pynose , requests , urllib3 }: @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pynose ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 700a250130aa5..41e8f3c4248a5 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.5.2"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-3dJ9Mu1cblBJh3BVEyxdfO+RD8kSxpdvnvox7ljMWT4="; + hash = "sha256-DqTcdWVivE2R51qm3XQ7cDnD1a90AocmX9TG+M5reto="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index d43b0c4c779db..770764dde09db 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.3.5"; + version = "0.3.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-lT345G0apo4ncM4FMs69+ql+QxvTlsEtG2KRX4oYvlo="; + hash = "sha256-j864+3c0GDDftdLqLDD0hizT54c0IgTjT77jOneXlq0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index f3fcfc74d4f55..f7e7c7f4f26ab 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.111"; + version = "0.0.112"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-e2Ho/LBdnEKn7hgykhstjv8ZUYAn41e1+rsgA1MEmf4="; + hash = "sha256-wI7mpX6oFV/RrxH/UP1X9Odago0CxJ5dhjKAsDS+Sq4="; }; postPatch = '' @@ -43,6 +43,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # RuntimeError: no running event loop + "test_mfg_cluster_events" + "test_co2_sensor" + "test_smart_air_sensor" + ]; + pythonImportsCheck = [ "zhaquirks" ]; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 9038d29222d55..2b7060ddc223f 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aiosqlite +, aioresponses , buildPythonPackage , crccheck , cryptography @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.62.3"; + version = "0.63.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-LMcyYDUH/jGrDW8sjrT9kHdIWQ20fOOcOJRhUpKMGi8="; + hash = "sha256-0wenUUkhgodsBID+ZT9JRoJeGDTqAChAIpj+9/Q3FMM="; }; postPatch = '' @@ -51,6 +52,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses freezegun pytest-asyncio pytest-timeout |