diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules')
949 files changed, 12491 insertions, 5104 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/acme/default.nix b/nixpkgs/pkgs/development/python-modules/acme/default.nix index 538b8dff964a..65e930e07414 100644 --- a/nixpkgs/pkgs/development/python-modules/acme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/acme/default.nix @@ -3,7 +3,7 @@ , cryptography , pyasn1 , pyopenssl -, pyRFC3339 +, pyrfc3339 , josepy , pytz , requests @@ -20,7 +20,7 @@ buildPythonPackage rec { format = "setuptools"; propagatedBuildInputs = [ - cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six + cryptography pyasn1 pyopenssl pyrfc3339 pytz requests requests-toolbelt six werkzeug ndg-httpsclient josepy ]; diff --git a/nixpkgs/pkgs/development/python-modules/acquire/default.nix b/nixpkgs/pkgs/development/python-modules/acquire/default.nix index aabd6216c904..c2c4e125e328 100644 --- a/nixpkgs/pkgs/development/python-modules/acquire/default.nix +++ b/nixpkgs/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.11"; + version = "3.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-0aLPDh9lrKpHo97VFFwCmPXyXXNFGgkdjoppzm3BCTo="; + hash = "sha256-anRNCnLDKHAEfOWi6m1n4R9lvFTlZgw5xxh39exvzH0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 138f339a17ac..baecca21fd5e 100644 --- a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.58.0"; + version = "3.60.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-9pucdj4rXCLitoNqu1ddETY9XUmIlIfC0hIoKJ54Ks8="; + hash = "sha256-ZE3rETwAuhv7pHA/zYDKtStWONShFG8tWDeN9K8JdG8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix b/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix index d8d82edb8a31..a97353baa987 100644 --- a/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix @@ -4,27 +4,34 @@ , matplotlib , numpy , packaging +, pythonOlder +, scipy +, setuptools }: buildPythonPackage rec { pname = "adjusttext"; - version = "0.8.1"; - format = "setuptools"; + version = "1.0.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Phlya"; - repo = pname; - rev = "refs/tags/${version}"; + repo = "adjusttext"; + rev = "refs/tags/v${version}"; hash = "sha256-Lhl6ykx5ynf+pBub5tBUaALm1w/88jbuSXPigE216NY="; }; nativeBuildInputs = [ packaging + setuptools ]; propagatedBuildInputs = [ matplotlib numpy + scipy ]; # Project has no tests @@ -37,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Iteratively adjust text position in matplotlib plots to minimize overlaps"; homepage = "https://github.com/Phlya/adjustText"; + changelog = "https://github.com/Phlya/adjustText/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aesedb/default.nix b/nixpkgs/pkgs/development/python-modules/aesedb/default.nix index 5dd95fe9eae5..62f9b0dd5b94 100644 --- a/nixpkgs/pkgs/development/python-modules/aesedb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aesedb/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "aesedb"; - version = "0.1.4"; - format = "pyproject"; + version = "0.1.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "skelsec"; - repo = pname; + repo = "aesedb"; rev = "refs/tags/${version}"; - hash = "sha256-QqPy68rWabRY0Y98W+odwP/10gMtLAQ0Ah2+ZLkqHPI="; + hash = "sha256-nYuMWE03Rsw1XuD/bxccpu8rddeXgS/EKJcO1VBLTLU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/nixpkgs/pkgs/development/python-modules/afdko/default.nix index 1bd2b71d25fb..ed934eab350b 100644 --- a/nixpkgs/pkgs/development/python-modules/afdko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/afdko/default.nix @@ -17,7 +17,6 @@ , booleanoperations , ufoprocessor , ufonormalizer -, psautohint , tqdm , setuptools-scm , scikit-build @@ -33,7 +32,7 @@ buildPythonPackage rec { pname = "afdko"; - version = "4.0.0+unstable-2023-11-07"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,8 +40,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adobe-type-tools"; repo = pname; - rev = "6c832edbd81ecf689dbe66e840bf18ae61cf4bca"; - hash = "sha256-XXkksHggUIs2O0/OSGsft8ofogcbtAa3w5JdldIAJAI="; + rev = "refs/tags/${version}"; + hash = "sha256-I5GKPkbyQX8QNSZgNB3wPKdWwpx8Xkklesu1M7nhgp8="; }; nativeBuildInputs = [ @@ -93,7 +92,6 @@ buildPythonPackage rec { mutatormath ufoprocessor ufonormalizer - psautohint tqdm ]; diff --git a/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index 0e339d0d2135..70cb2fbda688 100644 --- a/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.7.0"; + version = "0.7.2"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-uyHkkc3KzuYulOtod9KkHQmszVh2mrrCOLwvQt6JTMk="; + hash = "sha256-mxswKEpXP9QWdZQ3Jz3MXIECK98vrLJLSqAppir9U7A="; }; propagatedBuildInputs = [ agate sqlalchemy ]; diff --git a/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index f8daf10c3c1f..65973321f95b 100644 --- a/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -1,29 +1,34 @@ { lib , aio-geojson-client , aiohttp -, aresponses +, aioresponses , buildPythonPackage , fetchFromGitHub , pytest-asyncio , pytestCheckHook , pytz , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.15"; - format = "setuptools"; + version = "0.16"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; rev = "refs/tags/v${version}"; - hash = "sha256-/EPPEGLtiZBorZMnVg0NqwnHCbCXyZzz4449MzAYQx8="; + hash = "sha256-8OpmA3yHjUY+N5Obri4RWeuJiW916xGSWUYUgdpmjkw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aio-geojson-client aiohttp @@ -33,7 +38,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - aresponses + aioresponses pytest-asyncio pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index d97070df5907..35e558fdc262 100644 --- a/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -1,20 +1,22 @@ { lib , aio-geojson-client , aiohttp -, aresponses +, aioresponses , mock , buildPythonPackage , fetchFromGitHub , pytest-asyncio +, pytest-xdist , pytestCheckHook , pytz , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.8"; - format = "setuptools"; + version = "0.9"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,9 +24,13 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; rev = "refs/tags/v${version}"; - hash = "sha256-wJVFjy6QgYb6GX9pZTylYFvCRWmD2lAFZKnodsa8Yqo="; + hash = "sha256-ZmGDO9EROFMlxdj5txNh719M+3l/0jRFbB2h2AyZAdI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aio-geojson-client aiohttp @@ -34,9 +40,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - aresponses + aioresponses mock pytest-asyncio + pytest-xdist pytestCheckHook ]; @@ -46,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; - homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano"; + homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano"; changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; diff --git a/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index bf18c2bf184b..94724e800f58 100644 --- a/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -1,29 +1,34 @@ { lib , aio-geojson-client , aiohttp -, aresponses +, aioresponses , buildPythonPackage , fetchFromGitHub , pytest-asyncio , pytestCheckHook -, pytz , pythonOlder +, pytz +, setuptools }: buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.6"; - format = "setuptools"; + version = "0.7"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; rev = "refs/tags/v${version}"; - hash = "sha256-pn0r5iLpNnK3xmAhq/oX90hdiHgFDuwDQqfAzkp5jmw="; + hash = "sha256-HksiKfXhLASAgU81x7YiOXFmBLIkqJ9ldWLLY1ZbZlk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aio-geojson-client aiohttp @@ -33,7 +38,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - aresponses + aioresponses pytest-asyncio pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index 89a1fd75b8f2..339481624a35 100644 --- a/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -1,29 +1,34 @@ { lib , aio-geojson-client , aiohttp -, aresponses +, aioresponses , buildPythonPackage , fetchFromGitHub , pytest-asyncio , pytestCheckHook , pytz , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aio-geojson-usgs-earthquakes"; - version = "0.2"; - format = "setuptools"; + version = "0.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-usgs-earthquakes"; rev = "refs/tags/v${version}"; - hash = "sha256-ET8wcOep4tSZJXyL+XvfW2j9eKp6LrBk/g18ZlgLIzc="; + hash = "sha256-Q9vBy5R5N5ihJdSMALo88qVYcFVs2/33lYRPdLej4S8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aio-geojson-client aiohttp @@ -37,7 +42,7 @@ buildPythonPackage rec { ]; checkInputs = [ - aresponses + aioresponses pytest-asyncio ]; diff --git a/nixpkgs/pkgs/development/python-modules/aio-georss-client/default.nix b/nixpkgs/pkgs/development/python-modules/aio-georss-client/default.nix index 9c3cda759039..6130564b421c 100644 --- a/nixpkgs/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aio-georss-client/default.nix @@ -1,6 +1,6 @@ { lib , aiohttp -, aresponses +, aioresponses , buildPythonPackage , dateparser , fetchFromGitHub @@ -10,23 +10,30 @@ , pytestCheckHook , pythonOlder , requests +, setuptools , xmltodict }: buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.11"; - format = "setuptools"; + version = "0.12"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-client"; rev = "refs/tags/v${version}"; - hash = "sha256-Voc1ME0iGQCMaDfBXDSVnRp8olvId+fLhH8sqHwB2Ak="; + hash = "sha256-qs0/TkGZlwsucnkgCBco2Pqr9mf5fZHY7ikMBKff+gA="; }; + __darwinAllowLocalNetworking = true; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp haversine @@ -35,10 +42,8 @@ buildPythonPackage rec { dateparser ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ - aresponses + aioresponses mock pytest-asyncio pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/nixpkgs/pkgs/development/python-modules/aio-georss-gdacs/default.nix index f55a42b5dd22..52c5c79a198e 100644 --- a/nixpkgs/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -1,37 +1,42 @@ { lib , aio-georss-client -, aresponses +, aioresponses , buildPythonPackage , dateparser , fetchFromGitHub , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aio-georss-gdacs"; - version = "0.8"; - format = "setuptools"; + version = "0.9"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-gdacs"; rev = "refs/tags/v${version}"; - hash = "sha256-1mpOWd4Z2gTQtRewWfZsfEtmS6i5uMPAMTlC8UpawxM="; + hash = "sha256-B0qVCh2u0WleF0iv0o1/d5UIS2kbYCAqCgmNHyCpJ8Q="; }; + __darwinAllowLocalNetworking = true; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aio-georss-client dateparser ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ - aresponses + aioresponses pytest-asyncio pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix b/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix index 574d386b95de..65f15fa639d5 100644 --- a/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix @@ -7,36 +7,31 @@ , poetry-core , pytestCheckHook , pythonOlder -, setuptools , shortuuid -, typing-extensions , yarl }: buildPythonPackage rec { pname = "aio-pika"; - version = "9.3.1"; + version = "9.4.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mosquito"; repo = "aio-pika"; rev = "refs/tags/${version}"; - hash = "sha256-RbDiJvbFNuXIqFvevLpk5sy5WDinwaWwSqa+XI6Dljo="; + hash = "sha256-EntV/CBvT4II4nxsVe3KjNA4EPV7Oc6h2G0fX0fHKTU="; }; nativeBuildInputs = [ - setuptools poetry-core ]; propagatedBuildInputs = [ aiormq yarl - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioapcaccess/default.nix b/nixpkgs/pkgs/development/python-modules/aioapcaccess/default.nix new file mode 100644 index 000000000000..373324848222 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aioapcaccess/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "aioapcaccess"; + version = "0.4.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "yuxincs"; + repo = "aioapcaccess"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ig9aQduM9wby3DzPjvbubihopwhdMXHovMo3Id47mRk="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aioapcaccess" + ]; + + meta = with lib; { + description = "Module for working with apcaccess"; + homepage = "https://github.com/yuxincs/aioapcaccess"; + changelog = "https://github.com/yuxincs/aioapcaccess/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix b/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix index 5f8ca91e7d41..64fd61e2219a 100644 --- a/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.7.3"; + version = "0.8.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-rtMR3j/DwHVgf4RYXx1Y+W/N8U5pSaLnRwnRmuLbFEY="; + hash = "sha256-og54xVby9kyLtsIBCmH3KjKSSWaxHtXCH+wvHdrGQAU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix b/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix index 6d7600a1c7b6..14146ef64d1f 100644 --- a/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix @@ -6,12 +6,13 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aioecowitt"; - version = "2023.5.0"; - format = "setuptools"; + version = "2024.2.1"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uEA3OA/QOQ/h6ZMnb5hGQXHyqNO+KLmDSZMQBvmRwtE="; + hash = "sha256-PBV5jk0oItelCDFZsk8et0raIGEWxOaNdHuAViQ6LZc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp meteocalc diff --git a/nixpkgs/pkgs/development/python-modules/aioelectricitymaps/default.nix b/nixpkgs/pkgs/development/python-modules/aioelectricitymaps/default.nix index 1c13880ec497..fe16afab2258 100644 --- a/nixpkgs/pkgs/development/python-modules/aioelectricitymaps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -2,8 +2,9 @@ , aiohttp , aresponses , buildPythonPackage -, dataclasses-json , fetchFromGitHub +, mashumaro +, orjson , poetry-core , pytest-asyncio , pytestCheckHook @@ -13,25 +14,31 @@ buildPythonPackage rec { pname = "aioelectricitymaps"; - version = "0.1.6"; + version = "0.4.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "jpbede"; repo = "aioelectricitymaps"; rev = "refs/tags/v${version}"; - hash = "sha256-SyI+2hxKOiSdx5e+vkHLsIk5xj4gNvmfZTYZ10oJhfc="; + hash = "sha256-q06B40c0uvSuzH/3YCoxg4p9aNIOPrphsoESktF+B14="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-warn "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - dataclasses-json + mashumaro + orjson ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index a640c978764a..7c81afa0f8b3 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "21.0.1"; + version = "21.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HPnyFHHx1BahqzvRChT85BaG4eJM3qvTq2Tpbqb3SDI="; + hash = "sha256-uNVf0wnqVntjTxkNTilvb0v6h3VBCjd91wbLQJ6q71g="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index 290935e8c2ce..6aa37699ca4a 100644 --- a/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -6,32 +6,48 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , siosocks , trustme }: buildPythonPackage rec { pname = "aioftp"; - version = "0.21.4"; - format = "setuptools"; + version = "0.22.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-KLsm1GFsfDgaFUMoH5hwUbjS0dW/rwI9nn4sIQXFG7k="; + hash = "sha256-uqKxMYaqAWIuS4LyfC9I9Nr7SORXprGPzamakl4NwnA="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ siosocks ]; + passthru.optional-dependencies = { + socks = [ + siosocks + ]; + }; + nativeCheckInputs = [ async-timeout pytest-asyncio pytestCheckHook trustme - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = lib.optionals stdenv.isDarwin [ # uses 127.0.0.2, which macos doesn't like @@ -44,7 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python FTP client/server for asyncio"; - homepage = "https://github.com/aio-libs/aioftp"; + homepage = "https://aioftp.readthedocs.io/"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix b/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix index 3eb23c4a6641..59367acb041a 100644 --- a/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix @@ -15,23 +15,26 @@ buildPythonPackage rec { pname = "aiogithubapi"; version = "23.11.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "aiogithubapi"; rev = "refs/tags/${version}"; hash = "sha256-SbpfHKD4QJuCe3QG0GTvsffkuFiGPLEUXOVW9f1gyTI="; }; + __darwinAllowLocalNetworking = true; + postPatch = '' # Upstream is releasing with the help of a CI to PyPI, GitHub releases # are not in their focus substituteInPlace pyproject.toml \ --replace 'version = "0"' 'version = "${version}"' \ - --replace 'backoff = "^1.10.0"' 'backoff = "*"' + --replace 'backoff = "^1.10.0"' 'backoff = "*"' \ + --replace 'sigstore = "<2"' 'sigstore = "*"' ''; nativeBuildInputs = [ @@ -55,10 +58,19 @@ buildPythonPackage rec { "--asyncio-mode=auto" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "aiogithubapi" ]; + disabledTests = [ + # sigstore.errors.TUFError: Failed to refresh TUF metadata + "test_sigstore" + ]; + meta = with lib; { description = "Python client for the GitHub API"; homepage = "https://github.com/ludeeus/aiogithubapi"; diff --git a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index 106ba441f88c..8ea84581873a 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.1.3"; + version = "3.1.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-LQplvI6P42dI2vIaWyL50cj9k543qeUoHUogDkBaPvI="; + hash = "sha256-hZhbmEEqmhvoxGD4hvy4SDQWG5Xk1cmzFDSNa742iMs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix index d97a21bf6589..bb5337203f6f 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohttp-zlib-ng"; - version = "0.1.3"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,12 +19,12 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiohttp-zlib-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-t7T3KIGId5CoBciSkwu/sejW45i2EYtq1fHvNKNXlhA="; + hash = "sha256-XA2XSX9KA/oBzOLJrhj78uoy6ufLbVTENYZL3y/+fwU="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=aiohttp_zlib_ng --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=aiohttp_zlib_ng --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index 691345d65a16..11eb19010fdd 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -18,18 +18,18 @@ , aiodns , brotli # tests_require +, freezegun , gunicorn , pytest-mock , pytestCheckHook , python-on-whales , re-assert -, time-machine , trustme }: buildPythonPackage rec { pname = "aiohttp"; - version = "3.9.1"; + version = "3.9.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp"; rev = "refs/tags/v${version}"; - hash = "sha256-uiqBUDbmROrhkanfBz4avvTSrnKxgVqw54k4jKhfRGY="; + hash = "sha256-dEeMHruFJ1o0J6VUJcpUk7LhEC8sV8hUKXoKcd618lE="; }; patches = [ @@ -79,12 +79,12 @@ buildPythonPackage rec { # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info. nativeCheckInputs = [ + freezegun gunicorn pytest-mock pytestCheckHook python-on-whales re-assert - time-machine ] ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ # Optional test dependency. Depends indirectly on pyopenssl, which is # broken on aarch64-darwin. diff --git a/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix b/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix index c7d7b5dd7a99..634c031cbd74 100644 --- a/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiomqtt"; - version = "1.2.1"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sbtinstruments"; repo = "aiomqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-P8p21wjmFDvI0iobpQsWkKYleY4M0R3yod3/mJ7V+Og="; + hash = "sha256-Ww4NdCtT04b4tRmarJjB4xmfRBNIQekP8iARAdpmBH0="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "The idiomatic asyncio MQTT client, wrapped around paho-mqtt"; homepage = "https://github.com/sbtinstruments/aiomqtt"; - changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.rev}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix b/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix index 1cfee59a0003..6f18127ed167 100644 --- a/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -1,7 +1,7 @@ { lib , aiohttp , aioresponses -, pydantic +, pydantic_1 , buildPythonPackage , fetchFromGitHub , poetry-core @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.5"; + version = "0.4.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-4mvd5G4qpebocg74Kz/+XtJovDnGJJYPigyhke9YDjA="; + hash = "sha256-qwqhbHp4JPsbA6g7SI2frtqhayCmA1s3pTW2S4r6gmw="; }; postPatch = '' @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - pydantic + pydantic_1 ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix b/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix index 0c0e512dae98..2d30e0422ef3 100644 --- a/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiooss2"; - version = "0.2.8"; + version = "0.2.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "karajan1001"; repo = "aiooss2"; rev = "refs/tags/${version}"; - hash = "sha256-PwgbUZAuk2woEmLYDdWF5hTs19DASxxUv3Ga844ai7g="; + hash = "sha256-LdH04pRioxpHY1amRO90l9l5540IsDxmQcrEUVSq8dk="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix b/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix index a596791e74c0..b46746f50b85 100644 --- a/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix @@ -6,12 +6,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiopegelonline"; - version = "0.0.7"; - format = "setuptools"; + version = "0.0.8"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "mib1185"; repo = "aiopegelonline"; rev = "refs/tags/v${version}"; - hash = "sha256-r+5b52N/vliKHx6qOLJ4lWcQt1TPEcn5Dz7cZNhRbNg="; + hash = "sha256-Z/3IF5AwiNB+h8wug+57OVdLpFxGoiUe2xG4euHT1Bw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix b/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix index 710421cd366e..1a5689f3df43 100644 --- a/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix @@ -1,16 +1,16 @@ { lib , aiohttp -, async-timeout , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiopvapi"; version = "3.0.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,9 +21,18 @@ buildPythonPackage rec { hash = "sha256-+jhfp8gLEmL8TGPPN7QY8lw1SkV4sMSDb4VSq2OJ6PU="; }; + postPatch = '' + # https://github.com/sander76/aio-powerview-api/pull/31 + substituteInPlace setup.py \ + --replace '"asyncio", ' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp - async-timeout ]; nativeCheckInputs = [ @@ -34,9 +43,20 @@ buildPythonPackage rec { "aiopvapi" ]; + disabledTestPaths = [ + # https://github.com/sander76/aio-powerview-api/issues/32 + "tests/test_shade.py" + "tests/test_scene.py" + "tests/test_room.py" + "tests/test_apiresource.py" + "tests/test_hub.py" + "tests/test_scene_members.py" + ]; + meta = with lib; { description = "Python API for the PowerView API"; homepage = "https://github.com/sander76/aio-powerview-api"; + changelog = "https://github.com/sander76/aio-powerview-api/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aioquic/default.nix b/nixpkgs/pkgs/development/python-modules/aioquic/default.nix index fc0fe63de4e5..0d9801df1f82 100644 --- a/nixpkgs/pkgs/development/python-modules/aioquic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioquic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , certifi +, cryptography , fetchPypi , openssl , pylsqpack @@ -13,14 +14,14 @@ buildPythonPackage rec { pname = "aioquic"; - version = "0.9.23"; + version = "0.9.25"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-UsnaYO0IN/6LimoNfc8N++vsjpoCfhDr9yBPBWnFj6g="; + hash = "sha256-cHlceJBTJthVwq5SQHIjSq5YbHibgSkuJy0CHpsEMKM="; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi + cryptography pylsqpack pyopenssl service-identity diff --git a/nixpkgs/pkgs/development/python-modules/aiormq/default.nix b/nixpkgs/pkgs/development/python-modules/aiormq/default.nix index 14c0d0f7b513..214ffc714ee6 100644 --- a/nixpkgs/pkgs/development/python-modules/aiormq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiormq/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pythonRelaxDepsHook , pytestCheckHook , pamqp , yarl @@ -11,21 +12,25 @@ buildPythonPackage rec { pname = "aiormq"; - version = "6.7.6"; - format = "pyproject"; + version = "6.8.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mosquito"; repo = "aiormq"; - # https://github.com/mosquito/aiormq/issues/189 - rev = "72c44f55313fc14e2a760a45a09831237b64c48d"; - hash = "sha256-IIlna8aQY6bIA7OZHthfvMFFWnf3DDRBP1uiFCD7+Do="; + rev = "refs/tags/${version}"; + hash = "sha256-XD1g4JXQJlJyXuZbo4hYW7cwQhy8+p4/inwNw2WOD9Y="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pamqp" ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiortm/default.nix b/nixpkgs/pkgs/development/python-modules/aiortm/default.nix index dbbaea2d3903..e1e4f7fabaf7 100644 --- a/nixpkgs/pkgs/development/python-modules/aiortm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiortm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.8.7"; + version = "0.8.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,12 +24,12 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-rWULiyQGBA01hWfRDulDuHX0c1LPo6CTZ9HFOn3MD+E="; + hash = "sha256-WkVuuvWWdj2McdXl+XwYukUcloehelFIi6QL5LSkfLk="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=aiortm --cov-report=term-missing:skip-covered" "" + --replace-warn " --cov=aiortm --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix b/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix index b72d69e8fd31..87fab70a03f3 100644 --- a/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "aiorwlock"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-g/Eth99LlyiguP2hdWWFqw1lKxB7q1nGCE4bGtaSq0U="; + hash = "sha256-TOpb7E6dA1M6JpGSmTlIIqFCKqUZvKndCReOxJD40cw="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index 832bd768a8bd..4e77bc9c6509 100644 --- a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -3,28 +3,37 @@ , bluetooth-data-tools , buildPythonPackage , fetchFromGitHub +, habluetooth , orjson , pythonOlder +, setuptools +, yarl }: buildPythonPackage rec { pname = "aioshelly"; - version = "7.1.0"; - format = "setuptools"; + version = "8.0.1"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-W8oAJ7q4cAWq+RF4Hwd8cuPkEZQorsBnjmos5tVSBzc="; + hash = "sha256-3W5XfSOaKCCBjDHJh8IP/5I48py3j6i2O3FfhbcQzbY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp bluetooth-data-tools + habluetooth orjson + yarl ]; # Project has no test diff --git a/nixpkgs/pkgs/development/python-modules/aiosql/default.nix b/nixpkgs/pkgs/development/python-modules/aiosql/default.nix index 8236533154c8..165342fec1d9 100644 --- a/nixpkgs/pkgs/development/python-modules/aiosql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiosql/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "9.2"; + version = "9.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; rev = "refs/tags/${version}"; - hash = "sha256-x8ndLVIYAmixH4Fc1DIC1CK8ChYIPZc3b5VFdpT7JO8="; + hash = "sha256-7bCJykE+7/eA1h4L5MyH/zVPZVMt7cNLXZSWq+8mPtY="; }; sphinxRoot = "docs/source"; diff --git a/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix b/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix index 7cb513897cb1..245f9f44a3ae 100644 --- a/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix @@ -14,8 +14,8 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "3.4.1"; - format = "pyproject"; + version = "3.4.2"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -23,9 +23,11 @@ buildPythonPackage rec { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jam0pyVajk8z7s/Uk5yQZfbFQLDiJ2yRKDk7VMJpCKo="; + hash = "sha256-UpwIzwOl1yKqK8KxFDXAWoZFkQ+1r1sUcDfx6AxRdNw="; }; + __darwinAllowLocalNetworking = true; + nativeBuildInputs = [ poetry-core ]; @@ -50,7 +52,6 @@ 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" - "test_hexadecimale_timestamp_to_localtime_with_the_current_timestamp_should_return_a_time_string" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index cf1615734d20..886c0e4d4c1e 100644 --- a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "69"; + version = "70"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "aiounifi"; rev = "refs/tags/v${version}"; - hash = "sha256-XYwdnG3OprHRZm3zQgoPw4VOzvvVflsQzi7+XQiASAU="; + hash = "sha256-yLqGqRWzuMqymGqGR1mA4oQb+tWt58lA7C/kXC5bYz8="; }; postPatch = '' @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/Kane610/aiounifi"; changelog = "https://github.com/Kane610/aiounifi/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix b/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix index bd9dc3ede2dc..cd19fc80327b 100644 --- a/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.5.1"; + version = "0.5.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-4Pcdf5yAzjXbmWehon9DdZfaIdEjPLcdzf/EjYKEamk="; + hash = "sha256-J2VdRxCzIjRUOqQW4YzOC8RRth9tibBS9YuizveqhhI="; }; postPatch = '' @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to control Vodafon Station"; homepage = "https://github.com/chemelli74/aiovodafone"; - changelog = "https://github.com/chemelli74/aiovodafone/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/chemelli74/aiovodafone/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix b/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix index eec4830837f0..aa418733a6cc 100644 --- a/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix @@ -1,16 +1,18 @@ { lib +, async-interrupt , bleak , bleak-retry-connector , buildPythonPackage , fetchFromGitHub , poetry-core +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "airthings-ble"; - version = "0.5.6-4"; - format = "pyproject"; + version = "0.6.1"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -18,12 +20,12 @@ buildPythonPackage rec { owner = "vincegio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ft5A2ZGVH9VHoRDAqDcc0rBfnQRxoXMylCAwUSwmViE="; + hash = "sha256-A7Nrg0O+WVoHP+m8pz6idnNcxulwPYmMt9DfhKTHG24="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'bleak-retry-connector = "^0.15.1"' 'bleak = "*"' + --replace "-v -Wdefault --cov=airthings_ble --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ @@ -31,12 +33,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + async-interrupt bleak bleak-retry-connector ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "airthings_ble" diff --git a/nixpkgs/pkgs/development/python-modules/ale-py/default.nix b/nixpkgs/pkgs/development/python-modules/ale-py/default.nix index 77978654e68f..9cc5f6105cf5 100644 --- a/nixpkgs/pkgs/development/python-modules/ale-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ale-py/default.nix @@ -2,7 +2,7 @@ , SDL2 , cmake , fetchFromGitHub -, git +, fetchpatch , gym , importlib-metadata , importlib-resources @@ -11,7 +11,6 @@ , numpy , pybind11 , pytestCheckHook -, python , pythonOlder , setuptools , stdenv @@ -23,10 +22,10 @@ buildPythonPackage rec { pname = "ale-py"; version = "0.8.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { - owner = "mgbellemare"; + owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; rev = "refs/tags/v${version}"; hash = "sha256-B2AxhlzvBy1lJ3JttJjImgTjMtEUyZBv+xHU2IC7BVE="; @@ -35,6 +34,20 @@ buildPythonPackage rec { patches = [ # don't download pybind11, use local pybind11 ./cmake-pybind11.patch + ./patch-sha-check-in-setup.patch + + # The following two patches add the required `include <cstdint>` for compilation to work with GCC 13. + # See https://github.com/Farama-Foundation/Arcade-Learning-Environment/pull/503 + (fetchpatch { + name = "fix-gcc13-compilation-1"; + url = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/commit/ebd64c03cdaa3d8df7da7c62ec3ae5795105e27a.patch"; + hash = "sha256-NMz0hw8USOj88WryHRkMQNWznnP6+5aWovEYNuocQ2c="; + }) + (fetchpatch { + name = "fix-gcc13-compilation-2"; + url = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/commit/4c99c7034f17810f3ff6c27436bfc3b40d08da21.patch"; + hash = "sha256-66/bDCyMr1RsKk63T9GnFZGloLlkdr/bf5WHtWbX6VY="; + }) ]; nativeBuildInputs = [ @@ -67,7 +80,7 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace 'dynamic = ["version"]' 'version = "${version}"' substituteInPlace setup.py \ - --replace 'subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=here)' 'b"${src.rev}"' + --replace '@sha@' '"${version}"' ''; dontUseCmakeConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/ale-py/patch-sha-check-in-setup.patch b/nixpkgs/pkgs/development/python-modules/ale-py/patch-sha-check-in-setup.patch new file mode 100644 index 000000000000..f387346ded37 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ale-py/patch-sha-check-in-setup.patch @@ -0,0 +1,17 @@ +diff --git a/setup.py b/setup.py +index ff1b1c5..ce40df0 100644 +--- a/setup.py ++++ b/setup.py +@@ -141,11 +141,7 @@ def parse_version(version_file): + + version = ci_version + else: +- sha = ( +- subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=here) +- .decode("ascii") +- .strip() +- ) ++ sha = @sha@ + version += f"+{sha}" + + return version diff --git a/nixpkgs/pkgs/development/python-modules/alive-progress/default.nix b/nixpkgs/pkgs/development/python-modules/alive-progress/default.nix index b10b056f292a..58ccedd26d6c 100644 --- a/nixpkgs/pkgs/development/python-modules/alive-progress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alive-progress/default.nix @@ -5,20 +5,28 @@ , fetchFromGitHub , grapheme , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "alive-progress"; - version = "3.1.4"; - format = "setuptools"; + version = "3.1.5"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rsalmei"; - repo = pname; - rev = "v${version}"; - hash = "sha256-27PgxQ9nw8p5hfaSf/jPYG7419o3i8B8R09o93szSOk="; + repo = "alive-progress"; + rev = "refs/tags/v${version}"; + hash = "sha256-yJhl0QrMHET9ISDc/D5AEQ7dTJkmcV2SWqy/xmG18uY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ about-time grapheme @@ -36,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "A new kind of Progress Bar, with real-time throughput, ETA, and very cool animations"; homepage = "https://github.com/rsalmei/alive-progress"; + changelog = "https://github.com/rsalmei/alive-progress/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ thiagokokada ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 2a753b425103..2f08429d54d7 100644 --- a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.57.0"; + version = "8.59.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ea0IUn2mlu0c7QYJZkUrBUrtjUuTHoTeuvZHw/il+4A="; + hash = "sha256-v0jTMKtYrbEBVjHQokpWSlcJBALZFsuoYHq8wCP8w1E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix b/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix index b6f885daf619..a94ef0e3d624 100644 --- a/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "anova-wifi"; - version = "0.10.3"; + version = "0.11.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Lash-L"; repo = "anova_wifi"; rev = "refs/tags/v${version}"; - hash = "sha256-tCmvp29KSCkc+g0w0odcB7vGjtDx6evac7XsHEF0syM="; + hash = "sha256-zRMs0GAsLgKt1R0SfRFPchjmk87K2d8vBeHJs66k9xc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/ansi/default.nix b/nixpkgs/pkgs/development/python-modules/ansi/default.nix index 287bf13a5dee..3fb30ebf7255 100644 --- a/nixpkgs/pkgs/development/python-modules/ansi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ansi"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchFromGitHub { owner = "tehmaze"; repo = pname; - rev = "${pname}-${version}"; - hash = "sha256-2gu2Dba3LOjMhbCCZrBqzlOor5KqDYThhe8OP8J3O2M="; + rev = "refs/tags/ansi-${version}"; + hash = "sha256-PmgB1glksu4roQeZ1o7uilMJNm9xaYqw680N2z+tUUM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/nixpkgs/pkgs/development/python-modules/ansible/core.nix index dec3ad21bdeb..7a2f7e5e6606 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -4,6 +4,7 @@ , pythonOlder , pythonRelaxDepsHook , installShellFiles +, docutils , ansible , cryptography , importlib-resources @@ -28,11 +29,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.16.2"; + version = "2.16.3"; src = fetchPypi { inherit pname version; - hash = "sha256-5KtVnn5SWxxvmQhPyoc7sBR3XV7L6EW3wHuOnWycBIs="; + hash = "sha256-dqh2WoWGBk7wc6KZVi4wj6LBgKdbX3Vpu9D2HUFxzbM="; }; # ansible_connection is already wrapped, so don't pass it through @@ -41,10 +42,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace lib/ansible/executor/task_executor.py \ --replace "[python," "[" + + patchShebangs --build packaging/cli-doc/build.py ''; nativeBuildInputs = [ installShellFiles + docutils ] ++ lib.optionals (pythonOlder "3.10") [ pythonRelaxDepsHook ]; @@ -82,7 +86,9 @@ buildPythonPackage rec { ]; postInstall = '' - installManPage docs/man/man1/*.1 + export HOME="$(mktemp -d)" + packaging/cli-doc/build.py man --output-dir=man + installManPage man/* ''; # internal import errors, missing dependencies diff --git a/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/nixpkgs/pkgs/development/python-modules/ansible/default.nix index 42f4d0032cfd..c2ebd3e9d8bb 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "9.0.1"; + version = "9.2.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-zAbCUfFCg3z1QLeXdyRZapTz0P6dqWGRdeneZTnNBwU="; + hash = "sha256-ogekoApF5c0Xin+UykKv4m8jydJ75JkB6oxF0YoHt8Y="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix index f7a0a8ba6372..0b15d85e2e36 100644 --- a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix @@ -6,6 +6,7 @@ , distro , dirty-equals , httpx +, google-auth , sniffio , pydantic , pytest-asyncio @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.7.8"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-1mpNwZJbYdKVmUeUM+PBL6vPhwe8tr2SnAP/t/MMKpI="; + hash = "sha256-cI+CbQir2QpHAb+72clLGG7ZBsrYT3fY14HzxjtKOsk="; }; nativeBuildInputs = [ @@ -44,6 +45,10 @@ buildPythonPackage rec { typing-extensions ]; + passthru.optional-dependencies = { + vertex = [ google-auth ]; + }; + nativeCheckInputs = [ dirty-equals pytest-asyncio @@ -51,8 +56,9 @@ buildPythonPackage rec { respx ]; - disabledTests = [ - "api_resources" + disabledTestPaths = [ + # require network access + "tests/api_resources" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/anysqlite/default.nix b/nixpkgs/pkgs/development/python-modules/anysqlite/default.nix new file mode 100644 index 000000000000..bf6cb41a7916 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/anysqlite/default.nix @@ -0,0 +1,51 @@ +{ lib +, anyio +, buildPythonPackage +, fetchFromGitHub +, hatch-fancy-pypi-readme +, hatchling +, pytestCheckHook +, pythonOlder +, trio +}: + +buildPythonPackage rec { + pname = "anysqlite"; + version = "0.0.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "karpetrosyan"; + repo = "anysqlite"; + rev = "refs/tags/v${version}"; + hash = "sha256-6kNN6kjkMHVNneMq/8zQxqMIXUxH/+eWLX8XhoHqFRU="; + }; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatchling + ]; + + propagatedBuildInputs = [ + anyio + ]; + + nativeCheckInputs = [ + pytestCheckHook + trio + ]; + + pythonImportsCheck = [ + "anysqlite" + ]; + + meta = with lib; { + description = "Sqlite3 for asyncio and trio"; + homepage = "https://github.com/karpetrosyan/anysqlite"; + changelog = "https://github.com/karpetrosyan/anysqlite/blob/${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/anywidget/default.nix b/nixpkgs/pkgs/development/python-modules/anywidget/default.nix index 16bf2daaa4a4..4d449bbe0303 100644 --- a/nixpkgs/pkgs/development/python-modules/anywidget/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hHoP7OWOp6MtINzNVKAm3T3Sj3baprTwp0wlPlx8/uw="; + hash = "sha256-fV8yMQ6WGZyyf5c41B0MSwHusVx090SzukqX/WqbqG0="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/nixpkgs/pkgs/development/python-modules/aocd-example-parser/default.nix b/nixpkgs/pkgs/development/python-modules/aocd-example-parser/default.nix new file mode 100644 index 000000000000..c2379aa914e1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aocd-example-parser/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aocd-example-parser"; + version = "unstable-2023-12-17"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "wimglenn"; + repo = "aocd-example-parser"; + rev = "07330183f3e43401444fe17b08d72eb6168504e1"; + hash = "sha256-iOxqzZj29aY/xyigir1KOU6GcBBvnlxEOBLHChEQjf4="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + # Circular dependency with aocd + # pythonImportsCheck = [ + # "aocd_example_parser" + # ]; + + meta = with lib; { + description = "Default implementation of an example parser plugin for advent-of-code-data"; + homepage = "https://github.com/wimglenn/aocd-example-parser"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aocd/default.nix b/nixpkgs/pkgs/development/python-modules/aocd/default.nix index f1a31ee243b8..1b56736028b8 100644 --- a/nixpkgs/pkgs/development/python-modules/aocd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aocd/default.nix @@ -1,32 +1,33 @@ { lib , stdenv +, aocd-example-parser +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub -, requests -, pytestCheckHook -, tzlocal -, pytest-mock +, numpy +, pebble +, pook , pytest-freezegun +, pytest-mock , pytest-raisin , pytest-socket +, pytestCheckHook +, python-dateutil +, pythonOlder +, requests , requests-mock -, pook -, numpy , rich -, pebble -, python-dateutil -, termcolor -, beautifulsoup4 , setuptools -, pythonOlder +, termcolor +, tzlocal }: buildPythonPackage rec { pname = "aocd"; version = "2.0.1"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "wimglenn"; @@ -35,15 +36,30 @@ buildPythonPackage rec { hash = "sha256-YZvcR97uHceloqwoP+azaBmj3GLusYNbItLIaeJ3QD0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + aocd-example-parser + beautifulsoup4 + pebble python-dateutil requests + rich # for example parser aoce. must either be here or checkInputs termcolor - beautifulsoup4 - pebble tzlocal - setuptools - rich # for example parser aoce. must either be here or checkInputs + ]; + + nativeCheckInputs = [ + numpy + pook + pytest-freezegun + pytest-mock + pytest-raisin + pytest-socket + pytestCheckHook + requests-mock ]; # Too many failing tests @@ -85,20 +101,6 @@ buildPythonPackage rec { "test_submit_float_warns" ]; - nativeCheckInputs = [ - pytestCheckHook - pytest-mock - pytest-freezegun - pytest-raisin - pytest-socket - ]; - - checkInputs = [ - pook - numpy - requests-mock - ]; - pythonImportsCheck = [ "aocd" ]; diff --git a/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix b/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix index bd53a6f0b48a..2e267e2ef191 100644 --- a/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix @@ -150,7 +150,7 @@ buildPythonPackage rec { # Make sure we're running the tests for the actually installed # package, so that cython's .so files are available. - preCheck = "cd $out/lib/${python.libPrefix}/site-packages"; + preCheck = "cd $out/${python.sitePackages}"; disabledTestPaths = [ # Fails with diff --git a/nixpkgs/pkgs/development/python-modules/apispec-webframeworks/default.nix b/nixpkgs/pkgs/development/python-modules/apispec-webframeworks/default.nix index 3211eed5aa3f..171deeebda8c 100644 --- a/nixpkgs/pkgs/development/python-modules/apispec-webframeworks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apispec-webframeworks/default.nix @@ -3,6 +3,7 @@ , bottle , buildPythonPackage , fetchFromGitHub +, flit-core , flask , mock , pytestCheckHook @@ -12,18 +13,22 @@ buildPythonPackage rec { pname = "apispec-webframeworks"; - version = "0.5.2"; - format = "setuptools"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marshmallow-code"; repo = "apispec-webframeworks"; - rev = version; - hash = "sha256-ByNmmBLO99njw9JrT+cCW/K4NJBH92smAiIgg47Cvkk="; + rev = "refs/tags/${version}"; + hash = "sha256-zrsqIZ5ZogZsK1ZOL2uy8igS4T8a+19IwL5dMhKw7OA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ apispec ] ++ apispec.optional-dependencies.yaml; diff --git a/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/nixpkgs/pkgs/development/python-modules/apprise/default.nix index d70a70d43eae..9d3f55bec283 100644 --- a/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.7.1"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jUOdCFUEcFJEJd7e5LyKcnZsIWwhjzdyw3QE6y/Yblo="; + hash = "sha256-CeFZspAI5sjpPX/8PBXUGcC7rkFiBAX48tNDK3Ki6b8="; }; nativeBuildInputs = [ @@ -75,5 +75,6 @@ buildPythonPackage rec { changelog = "https://github.com/caronc/apprise/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; + mainProgram = "apprise"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index 49e61e87731c..6c49acf449cf 100644 --- a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "10.2.0"; + version = "10.4.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-2NaqqgrHXJovoVExvbr0s86eRbcxy+DUrsdRH/vak3E="; + hash = "sha256-/UsrUzCd4aYEQ4epZggk2O2esJCUG0DxRseK+s6yJd4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 336a08e0532f..174dbc71a28a 100644 --- a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,21 +17,21 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.5.8"; + version = "5.6.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-C3A7mNsiTe50jKD98zjU37GL20zw5SNSVte+GtrvbFA="; + hash = "sha256-/Un5Jh/3UjhJApL0eQzj545F9q+55xwFsIa5M+U93w0="; }; postPatch = '' - substituteInPlace pytest.ini \ - --replace " --cov-append --cov-report term --cov vdb" "" + substituteInPlace pyproject.toml \ + --replace-warn " --cov-report=term-missing --no-cov-on-fail --cov vdb" "" ''; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/apycula/default.nix b/nixpkgs/pkgs/development/python-modules/apycula/default.nix index afa3cf9230d5..43289ba0751d 100644 --- a/nixpkgs/pkgs/development/python-modules/apycula/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.10.0"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-nSj+c6IX57kwcDz/h2Sg4U8JlxZ5fq8k7hDL1zCE08g="; + hash = "sha256-yuDyW1JXavI6U3B3hx3kdHBuVCQd2rJJqgZ0z15ahaw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aranet4/default.nix b/nixpkgs/pkgs/development/python-modules/aranet4/default.nix index dda10a9d6f22..49000324ac27 100644 --- a/nixpkgs/pkgs/development/python-modules/aranet4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aranet4/default.nix @@ -5,12 +5,13 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "aranet4"; - version = "2.2.2"; - format = "setuptools"; + version = "2.2.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "Anrijs"; repo = "Aranet4-Python"; rev = "refs/tags/v${version}"; - hash = "sha256-HiveHkGQUCvG4aqK2HSCbONObidT7yof4LzKSJPEOKU="; + hash = "sha256-Jd7yuddxwRrO7XFQsVGy5vRQxwIUZdwFSjiZZHdkE3g="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ bleak requests diff --git a/nixpkgs/pkgs/development/python-modules/argilla/default.nix b/nixpkgs/pkgs/development/python-modules/argilla/default.nix index 9450b6af44ae..336b6f6db856 100644 --- a/nixpkgs/pkgs/development/python-modules/argilla/default.nix +++ b/nixpkgs/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.22.0"; + version = "1.24.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aPq/ZPewQId5OZq5v+TgvWWBS03QDftYLEwhzNLzrFQ="; + hash = "sha256-2baSX6b2BFYHXKg37WMHcGel3OTGsCJrulvyxmbdBek="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/asf-search/default.nix b/nixpkgs/pkgs/development/python-modules/asf-search/default.nix index 74ab08277397..56e2e7fe8991 100644 --- a/nixpkgs/pkgs/development/python-modules/asf-search/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asf-search/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "6.7.3"; + version = "7.0.4"; 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-wtsPnppsW44OdvdkkuyPoqADzpecUytXEc6G4q7HEw0="; + hash = "sha256-eq8VKML50TfOnHZFXr+Ht7FUMm+NHJOksKvv3uMcq3g="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix b/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix index 58bfe11458db..a9e078b38756 100644 --- a/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix @@ -2,25 +2,24 @@ , buildPythonPackage , fetchFromGitHub -# build-system +# build system , setuptools # tests , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "asn1crypto"; - version = "1.5.1-unstable-2023-11-03"; + version = "1.5.1"; pyproject = true; # Pulling from Github to run tests src = fetchFromGitHub { owner = "wbond"; repo = "asn1crypto"; - # https://github.com/wbond/asn1crypto/issues/269 - rev = "b763a757bb2bef2ab63620611ddd8006d5e9e4a2"; - hash = "sha256-11WajEDtisiJsKQjZMSd5sDog3DuuBzf1PcgSY+uuXY="; + rev = version; + hash = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; }; nativeBuildInputs = [ @@ -35,5 +34,6 @@ buildPythonPackage { description = "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP"; license = lib.licenses.mit; homepage = "https://github.com/wbond/asn1crypto"; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/asterisk-mbox/default.nix b/nixpkgs/pkgs/development/python-modules/asterisk-mbox/default.nix index 4347c42d47dd..0a08dc737449 100644 --- a/nixpkgs/pkgs/development/python-modules/asterisk-mbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asterisk-mbox/default.nix @@ -1,19 +1,39 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch2 +, setuptools +, packaging }: buildPythonPackage rec { pname = "asterisk-mbox"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "asterisk_mbox"; inherit version; - sha256 = "0624f9ab85ce9c4d43655f8653e8539fa10c81b60fd7b94b1a15dce306c20888"; + hash = "sha256-BiT5q4XOnE1DZV+GU+hTn6EMgbYP17lLGhXc4wbCCIg="; }; + patches = [ + # https://github.com/PhracturedBlue/asterisk_mbox/pull/1 + (fetchpatch2 { + name = "distutils-deprecated.patch"; + url = "https://github.com/PhracturedBlue/asterisk_mbox/commit/bab84525306a0c41aadd3aab4ebba7c062253d07.patch"; + hash = "sha256-2j7jIl3Ydn2dHJhEzu/77Zkxhw58NIebgULifpTVidY="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + packaging + ]; + # no tests implemented doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix b/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix index b25fb6e9eb43..23db660f951b 100644 --- a/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "astropy-healpix"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchPypi { inherit version; pname = lib.replaceStrings ["-"] ["_"] pname; - hash = "sha256-74k4vfcpdXw4CowXNHlNc3StAOB2f8Si+mOma+8SYkI="; + hash = "sha256-BW+m7ZOWvtx3HTdNh3zeg9lGCj9ip4/gXb+boDlAMjo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix b/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix index 9d469ca43bc0..2d4c0e538a68 100644 --- a/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix @@ -4,6 +4,7 @@ , python3Packages , poetry-core , tkinter +, typing-extensions , pythonRelaxDepsHook , pytestCheckHook }: @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tkinter + typing-extensions ]; pythonRemoveDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 426c0b5bd548..4d283d1d5ed8 100644 --- a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.38.0"; + version = "0.38.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-hCgZsoccrHCXTZPnFX5OFhCGnd2WufxWo84jW3k9KiY="; + hash = "sha256-tYGJwmzyVTry3KIMv1JjoBsE6kNw7FJb1nq1+39bEdU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix b/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix index 2d0066a86e13..5847a55f8375 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "asyncclick"; - version = "8.1.3.2"; - format = "setuptools"; + version = "8.1.7.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "python-trio"; - repo = pname; - rev = version; - hash = "sha256-by1clF+WAfN/gjOg/F60O1tCZ3qAhWqiiJJY04iMzQ8="; + repo = "asyncclick"; + rev = "refs/tags/${version}"; + hash = "sha256-gx7s/HikvjsXalc0Z73JWMKc1SlhR+kohwk2sW4o19I="; }; nativeBuildInputs = [ @@ -40,15 +40,18 @@ buildPythonPackage rec { ]; disabledTests = [ - # RuntimeWarning: coroutine 'Context.invoke' was never awaited - "test_context_invoke_type" + # AttributeError: 'Context' object has no attribute '_ctx_mgr' + "test_context_pushing" ]; - pythonImportsCheck = [ "asyncclick" ]; + pythonImportsCheck = [ + "asyncclick" + ]; meta = with lib; { description = "Python composable command line utility"; homepage = "https://github.com/python-trio/asyncclick"; + changelog = "https://github.com/python-trio/asyncclick/blob/${version}/CHANGES.rst"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix b/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix index feb778c729aa..6fe187bfc3cf 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix @@ -1,35 +1,45 @@ { lib , buildPythonPackage -, fetchFromGitLab +, fetchFromGitHub , flit-core -, python +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "asyncinotify"; - version = "4.0.2"; - format = "pyproject"; + version = "4.0.6"; + pyproject = true; - src = fetchFromGitLab { - owner = "Taywee"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "absperf"; repo = "asyncinotify"; - rev = "v${version}"; - hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw="; + rev = "refs/tags/v${version}"; + hash = "sha256-RXx6i5dIB2oySVaLoHPRGD9VKgiO5OAXmrzVBq8Ad18="; }; nativeBuildInputs = [ flit-core ]; - checkPhase = '' - ${python.pythonOnBuildForHost.interpreter} ${src}/test.py - ''; - pythonImportsCheck = ["asyncinotify"]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "asyncinotify" + ]; + + pytestFlagsArray = [ + "test.py" + ]; meta = with lib; { - description = "A simple optionally-async python inotify library, focused on simplicity of use and operation, and leveraging modern Python features"; - homepage = "https://pypi.org/project/asyncinotify/"; - changelog = "https://gitlab.com/Taywee/asyncinotify/-/blob/master/CHANGELOG.md"; + description = "Module for inotify"; + homepage = "https://github.com/absperf/asyncinotify/"; + changelog = "https://github.com/absperf/asyncinotify/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ cynerd ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix b/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix index 254423141ab4..25969661bf15 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.4.2"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zvIEuPsko2CaImcdY55qwl+rAzrRT8gjLAovlpOR8Gk="; + hash = "sha256-TDHFKLifNmmAVvD5DjSopEXFbR+KPMIdSA+rLAKrfpI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix index e462a0d0b49c..084c9ee8d306 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix @@ -6,24 +6,29 @@ , pytestCheckHook , python-socks , pythonOlder +, setuptools , tldextract , whodap }: buildPythonPackage rec { pname = "asyncwhois"; - version = "1.0.9"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pogzyb"; repo = "asyncwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-5T/h4YzODH7zFyQpG8qVZetTK7V+Ii9jc+MQFgMUA8w="; + hash = "sha256-rJwJhSOFrZZ3WXEZmPMfdosBBW/R5/PMqs0QLnsPMoI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ python-socks tldextract @@ -38,7 +43,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "python-socks[asyncio]" "python-socks" + --replace-fail "python-socks[asyncio]" "python-socks" ''; disabledTests = [ diff --git a/nixpkgs/pkgs/development/python-modules/atom/default.nix b/nixpkgs/pkgs/development/python-modules/atom/default.nix index b6be40bc6c93..519fc3791d79 100644 --- a/nixpkgs/pkgs/development/python-modules/atom/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atom/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "atom"; - version = "0.10.3"; - format = "pyproject"; + version = "0.10.4"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nucleic"; - repo = pname; + repo = "atom"; rev = "refs/tags/${version}"; - hash = "sha256-NXjvRVYcWU9p7b8y2ICOzYe6TeMh1S70Edy/JvTG7a4="; + hash = "sha256-HoUKU6z+6PPBUsvI4earZG9UXN0PrugAxu/F7WUfUe8="; }; nativeBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Memory efficient Python objects"; homepage = "https://github.com/nucleic/atom"; + changelog = "https://github.com/nucleic/atom/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ bhipple ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/auditwheel/default.nix b/nixpkgs/pkgs/development/python-modules/auditwheel/default.nix index 836bbaf1cd0f..9890a39e460c 100644 --- a/nixpkgs/pkgs/development/python-modules/auditwheel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/auditwheel/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "auditwheel"; - version = "5.4.0"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qvgVOreinMmaZjziSYgE2vGIfqG3oyMboNP+5oo8zxk="; + hash = "sha256-ZCLEq2Qh0j41XJHplGkmzVMrn99G8rX/2vGr/p7inmc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/authheaders/default.nix b/nixpkgs/pkgs/development/python-modules/authheaders/default.nix index 7d4a4075439e..6762e4b3ad7a 100644 --- a/nixpkgs/pkgs/development/python-modules/authheaders/default.nix +++ b/nixpkgs/pkgs/development/python-modules/authheaders/default.nix @@ -5,15 +5,15 @@ , dnspython , fetchFromGitHub , publicsuffix2 -, pythonOlder , pytestCheckHook +, pythonOlder , setuptools }: buildPythonPackage rec { pname = "authheaders"; - version = "0.15.3"; - format = "setuptools"; + version = "0.16.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,9 +21,13 @@ buildPythonPackage rec { owner = "ValiMail"; repo = "authentication-headers"; rev = "refs/tags/${version}"; - hash = "sha256-96fCx5uN7yegTrCN+LSjtu4u3RL+dcxV/Puyo0eziI8="; + hash = "sha256-/vxUUSWwysYQzcy2AmkF4f8R59FHRnBfFlPRpfM9e5o="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ authres dnspython @@ -40,6 +44,11 @@ buildPythonPackage rec { "authheaders" ]; + disabledTests = [ + # Test fails with timeout even if the resolv.conf hack is present + "test_authenticate_dmarc_psdsub" + ]; + meta = with lib; { description = "Python library for the generation of email authentication headers"; homepage = "https://github.com/ValiMail/authentication-headers"; diff --git a/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix b/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix index 9f1bf2a6d818..0f6ab7dda159 100644 --- a/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "autofaiss"; - version = "2.16.0"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "criteo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NpehDx67VyIkcqno2DB2NmUKKZhK1Owwd9BNh3nqOLY="; + hash = "sha256-pey3wrW7CDLMiPPKnmYrcSJqGuy6ecA2SE9m3Jtt6DU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix index 9a177d7b4936..4bfffd8a780b 100644 --- a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; homepage = "https://github.com/hhatto/autopep8"; license = licenses.mit; + mainProgram = "autopep8"; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index 164b89ae4cc6..4cd972d95b8c 100644 --- a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "23.11.0"; + version = "24.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-glnM32ha5eXVpoaDkEsbwdH1oiG9qMxFwbtqLx+Kl98="; + hash = "sha256-bpLtHhpWc1VweVl5G8mM473Js3bXT11N3Zc0jiVqq5c="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix index 3ccfc393a988..18c0be822dea 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "28"; + version = "29"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ME67+QDFdzaP08SRpN3+aleQvex2orBr3MRygXYmRZI="; + hash = "sha256-r0t4kbeLkDFxvONB6I0q3YQFn6Fn8I6KmTAFmZ0bnRs="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "CPU kernels and compiled extensions for Awkward Array"; homepage = "https://github.com/scikit-hep/awkward"; + changelog = "https://github.com/scikit-hep/awkward/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix index fa31f3b5a4f7..5c174cb54d2b 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -1,4 +1,5 @@ { lib +, fsspec , stdenv , buildPythonPackage , pythonOlder @@ -10,7 +11,6 @@ , numpy , packaging , typing-extensions -, fsspec , jax , jaxlib , numba @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.5.2"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-n50REyU/aWx6rj+9TZ52S3sZS25/hIaNfOe+AQGaXVA="; + hash = "sha256-G9jXAo37mhvXzn7cQ/DEUGauGs+P7JxBntfu7ZPfaHc="; }; nativeBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward-cpp + fsspec importlib-metadata numpy packaging diff --git a/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix b/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix index d583a97a41a0..2397b2462579 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.10.0"; + version = "2.11.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "venth"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CUWjD5b62pSvvMS5CFZix9GL4z0EhkGttxgfeOLKHqY="; + hash = "sha256-ZzQ92VBa8CApd0WkfPrUZsEZICK2fhwmt45P2sx2mK0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index dc499f2bcb6c..31639cb455ff 100644 --- a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.19.19"; + version = "0.20.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HBURU13uFGpsJqOC7T6tViWaEFs7fX2CNVOuVn0Djf4="; + hash = "sha256-xB5HHDSUKHYGosbCa4/pesx0uJQarp2aEhpHDBmDh1g="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/python-modules/awsipranges/default.nix b/nixpkgs/pkgs/development/python-modules/awsipranges/default.nix new file mode 100644 index 000000000000..036639c3cdb7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/awsipranges/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pyopenssl +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "awsipranges"; + version = "0.3.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aws-samples"; + repo = "awsipranges"; + rev = "refs/tags/${version}"; + hash = "sha256-ve1+0zkDDUGswtQoXhfESMcBzoNgUutxEhz43HXL4H8="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pyopenssl + pytestCheckHook + ]; + + pythonImportsCheck = [ + "awsipranges" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/data/test_syntax_and_semantics.py" + "tests/integration/test_package_apis.py" + "tests/unit/test_data_loading.py" + ]; + + meta = with lib; { + description = "Module to work with the AWS IP address ranges"; + homepage = "https://github.com/aws-samples/awsipranges"; + changelog = "https://github.com/aws-samples/awsipranges/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix b/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix index 3e20875ac15d..788148d5e441 100644 --- a/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix @@ -5,7 +5,7 @@ , fetchpatch , isPy27 , pytestCheckHook -, autoconf +, autoconf271 , automake , cmake , gcc @@ -44,7 +44,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ simplejson ]; - nativeBuildInputs = [ autoconf automake cmake libtool perl setuptools ]; + nativeBuildInputs = [ autoconf271 automake cmake libtool perl setuptools ]; buildInputs = [ gcc ]; diff --git a/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix b/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix index d3eee65f576a..274b88a9811b 100644 --- a/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.5.1"; + version = "3.5.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-USHRs/NRCPACvVxsQyRF1yQsQefAXSTwdHJqQqKe6bQ="; + hash = "sha256-lIEitS/pyOq4RjyUqPzfKOcNtAIWp14sQcLfQ1FwEoE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix b/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix index 2ca6a6d743ca..041d79b5ebd0 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix @@ -1,29 +1,31 @@ { lib , buildPythonPackage , fetchPypi -, msrest -, azure-common , msrestazure +, azure-common , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "azure-batch"; - version = "14.0.0"; - format = "setuptools"; + version = "14.1.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-FlsembhvghAkxProX7NIadQHqg67DKS5b7JthZwmyTQ="; + hash = "sha256-lhayyqYpx0ABItaF1VfrzQF5famImQgxj5pUdIQ5es0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - msrest - msrestazure azure-common + msrestazure ]; # Module has no tests @@ -35,7 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure Batch Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/batch/azure-batch"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-batch_${version}/sdk/batch/azure-batch/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix index ed4cd5243abf..2b4caa102f79 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup postInstall = lib.optionalString (!isPy3k) '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py ''; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix b/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix index 783a792513be..42b8b1edb55d 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-data-tables"; - version = "12.4.4"; + version = "12.5.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HWjIQBWYmU43pSxKLcwx45EExn10jeEkyY9Hpbyn0vw="; + hash = "sha256-7qOTpjgMQusD6AeCXAN4MgA9CcgjKUgx2hXoEVWgtOY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix index 7ce7ce2c3f00..5f0390708c7d 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -28,8 +28,8 @@ buildPythonPackage rec { ]; postInstall = pkgs.lib.optionalString (!isPy3k) '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/mgmt/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py ''; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index eb95a00de2a0..7c6c6b7ff7da 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "30.4.0"; + version = "30.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C3Qo/YvRXHy9fGa5uwEOClyzeoBs7x9JSNkHGRV2kzQ="; + hash = "sha256-7T6jS3mdsNUu5V4vGrSw8J+koI814GHsuarZ+1ohiEQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index c72c54ffbdce..ddb4b6987fac 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "28.0.0"; + version = "29.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tVYFpEUV9v0OOk3CK/oPRA8+fhYl668Gqz6wa/NabNs="; + hash = "sha256-0BiuK5JCj6rqfSYD8+GWca2k5SQ19MXEHR3TQcYzgoA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 3de8b1c16fab..ee4b29c28a8e 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "4.0.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-XfTLbVdoPVLKgVlBDr59N0EKe+G9fAS+SjI9cWhhs4g="; + hash = "sha256-WX/lFsU8qGg3Mg5bk+U0SBdR6cQpjtfmbX02Hr8uz7o="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index a9c9da857478..7f8ab5b19a48 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "7.0.0"; + version = "9.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-GuW6x8JGdBedywum4fDAQ8rwbVU9UgQWgHrFqJ6Uz9A="; + hash = "sha256-H/SsO/DnHXSsSyejYX7BFem1GqPh20DRGecrYVkIu1E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix index b760acc8c8a6..60271f7c0381 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -1,34 +1,33 @@ { lib -, buildPythonPackage -, fetchPypi , azure-common , azure-mgmt-core -, msrest -, msrestazure +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder -, typing-extensions +, setuptools }: buildPythonPackage rec { pname = "azure-mgmt-security"; - version = "5.0.0"; - format = "setuptools"; + version = "6.0.0"; + fpyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OLA+/oLCNEzqID/alebQC3rCJ4L6HAtYXNDqLI/z5wI="; - extension = "zip"; + hash = "sha256-zq/BhpiZBnEQvYMMXMmLybjzLY6oQMofaTsaX1Kl+LA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions + isodate ]; # no tests included @@ -42,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Security Center Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-security_${version}/sdk/security/azure-mgmt-security/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index 2e13666af140..0ff6214bf5b5 100644 --- a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.29.0"; + version = "1.29.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-h/pXLGpQ2+ENxWqIb9yteroaudsS8Hz+sraON+65TMw="; + hash = "sha256-Talw1P0JnPdU+dDgC8J2TJSOV/LshgQyBbPYEqzKpfA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix b/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix index ed0915eee522..ff5196855d34 100644 --- a/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { (substituteAll { name = "zoneinfo-path"; src = ./zoneinfo.patch; - zoneinfo = "${tzdata}/lib/${python.libPrefix}/site-packages/tzdata/zoneinfo"; + zoneinfo = "${tzdata}/${python.sitePackages}/tzdata/zoneinfo"; }) ]; diff --git a/nixpkgs/pkgs/development/python-modules/bandit/default.nix b/nixpkgs/pkgs/development/python-modules/bandit/default.nix index 7d7464ec74da..f2f30079954d 100644 --- a/nixpkgs/pkgs/development/python-modules/bandit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bandit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.6"; + version = "1.7.7"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-cs57yXQTdNlvsvHJqJYIKYhfEkP/3nQ95woZzuNT6PM="; + hash = "sha256-UnkGvsYIjLSZquMbyWKGS053Vp6dUp7lHfOpO0uKsoo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/base2048/default.nix b/nixpkgs/pkgs/development/python-modules/base2048/default.nix index 889ef9f81f17..8d75bd93e336 100644 --- a/nixpkgs/pkgs/development/python-modules/base2048/default.nix +++ b/nixpkgs/pkgs/development/python-modules/base2048/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , buildPythonPackage , cargo , fetchFromGitHub , frelatage +, libiconv , maturin , pytestCheckHook , pythonOlder @@ -39,6 +41,10 @@ buildPythonPackage rec { rustc ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + passthru.optional-dependencies = { fuzz = [ frelatage diff --git a/nixpkgs/pkgs/development/python-modules/bbox/default.nix b/nixpkgs/pkgs/development/python-modules/bbox/default.nix index 93eb8d272887..5e601e43b564 100644 --- a/nixpkgs/pkgs/development/python-modules/bbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bbox/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-FrJ8FhlqwmnEB/QvPlkDfqZncNGPhwY9aagM9yv1LGs="; }; - nativebuildInputs = [ + nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 24052663f1c2..f7431e6ea4eb 100644 --- a/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.37.6"; + version = "0.38.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-S3Yf0C+KInYoDaixlJf+9WSPIcEhfQCdcwEuNQYxugU="; + hash = "sha256-7aqzhujTn1TMYBA6+79Ok76yv8hXszuuZ7TjhJ6zbQw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/betterproto/default.nix b/nixpkgs/pkgs/development/python-modules/betterproto/default.nix index f17fabec994f..f5cc7d9253ea 100644 --- a/nixpkgs/pkgs/development/python-modules/betterproto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/betterproto/default.nix @@ -13,6 +13,7 @@ , pytestCheckHook , pytest-asyncio , pytest-mock +, typing-extensions , tomlkit , grpcio-tools }: @@ -20,21 +21,25 @@ buildPythonPackage rec { pname = "betterproto"; version = "2.0.0b6"; - format = "pyproject"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "danielgtaylor"; repo = "python-betterproto"; - rev = "v.${version}"; + rev = "refs/tags/v.${version}"; hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ grpclib python-dateutil + typing-extensions ]; passthru.optional-dependencies.compiler = [ @@ -43,16 +48,18 @@ buildPythonPackage rec { isort ]; - pythonImportsCheck = [ "betterproto" ]; - nativeCheckInputs = [ + grpcio-tools pydantic - pytestCheckHook pytest-asyncio pytest-mock + pytestCheckHook tomlkit - grpcio-tools - ] ++ passthru.optional-dependencies.compiler; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "betterproto" + ]; # The tests require the generation of code before execution. This requires # the protoc-gen-python_betterproto script from the package to be on PATH. @@ -62,14 +69,24 @@ buildPythonPackage rec { ${python.interpreter} -m tests.generate ''; + disabledTestPaths = [ + # https://github.com/danielgtaylor/python-betterproto/issues/530 + "tests/inputs/oneof/test_oneof.py" + ]; + + disabledTests = [ + "test_pydantic_no_value" + ]; + meta = with lib; { - description = "Clean, modern, Python 3.6+ code generator & library for Protobuf 3 and async gRPC"; + description = "Code generator & library for Protobuf 3 and async gRPC"; longDescription = '' This project aims to provide an improved experience when using Protobuf / gRPC in a modern Python environment by making use of modern language features and generating readable, understandable, idiomatic Python code. ''; homepage = "https://github.com/danielgtaylor/python-betterproto"; + changelog = "https://github.com/danielgtaylor/python-betterproto/blob/v.${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ nikstur ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/biopython/default.nix b/nixpkgs/pkgs/development/python-modules/biopython/default.nix index cb27d3231d4f..2ec814f56aef 100644 --- a/nixpkgs/pkgs/development/python-modules/biopython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/biopython/default.nix @@ -1,25 +1,43 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools , numpy -, isPy3k }: buildPythonPackage rec { pname = "biopython"; - version = "1.82"; - format = "setuptools"; + version = "1.83"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-qbENlZroipdEqRxs42AfTIbn7EFnm8k8KfZ5IY9hZ7s="; + hash = "sha256-eOa/t43mMDQDev01/nfLbgqeW2Jwa+z3in2SKxbtg/c="; }; - disabled = !isPy3k; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ numpy ]; - # Checks try to write to $HOME, which does not work with nix - doCheck = false; + + pythonImportsCheck = [ + "Bio" + ]; + + checkPhase = '' + runHook preCheck + + export HOME=$(mktemp -d) + cd Tests + python run_tests.py --offline + + runHook postCheck + ''; + meta = { description = "Python library for bioinformatics"; longDescription = '' diff --git a/nixpkgs/pkgs/development/python-modules/bip-utils/default.nix b/nixpkgs/pkgs/development/python-modules/bip-utils/default.nix index 505c19cf1943..5666f7c1353a 100644 --- a/nixpkgs/pkgs/development/python-modules/bip-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bip-utils/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bip-utils"; - version = "2.9.0"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = "bip_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-PUWKpAn6Z1E7uMk8+XFm6FDtupzj6eMSkyXR9vN1w3I="; + hash = "sha256-D+LalbrwsjxwYW8l38D1l4tGAsjrZ+bS+/Ppgaxkzy4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/birch/default.nix b/nixpkgs/pkgs/development/python-modules/birch/default.nix index 3afd6d3df06a..1dd4848427e5 100644 --- a/nixpkgs/pkgs/development/python-modules/birch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/birch/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , setuptools , strct , pytestCheckHook @@ -19,11 +20,24 @@ buildPythonPackage rec { hash = "sha256-KdQZzQJvJ+logpcLQfaqqEEZJ/9VmNTQX/a4v0oBC98="; }; + patches = [ + # https://github.com/shaypal5/birch/pull/4 + (fetchpatch { + name = "fix-versioneer-on-python312.patch"; + url = "https://github.com/shaypal5/birch/commit/84d597b2251ebb76fb15fb70fc86c83baa19dc0b.patch"; + hash = "sha256-xXADCSIhq1ARny2twzrhR1J8LkMFWFl6tmGxrM8RvkU="; + }) + ]; + postPatch = '' substituteInPlace pytest.ini \ --replace \ "--cov" \ "#--cov" + + # configure correct version, which fails due to missing .git + substituteInPlace versioneer.py birch/_version.py \ + --replace '"0+unknown"' '"${version}"' ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix b/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix index f93ef838751f..e91abe0b8f06 100644 --- a/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , aiohttp , semver , deepmerge @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.2.0"; - format = "setuptools"; + version = "2.2.2"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -20,14 +21,18 @@ buildPythonPackage rec { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - hash = "sha256-cLSI6wa3gHE0QkSVVWMNpb5fyQy0TLDNSqOuGlDJGJc="; + hash = "sha256-q1plIIcPY94zRD17srz5vMJzkk6K/xbbNIRB6zLlUo0="; }; postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner" "" + --replace-fail "pytest-runner" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp semver diff --git a/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix b/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix index 37b01b386055..f245b50d1343 100644 --- a/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.22.5"; + version = "0.22.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-u6FurFaAbkBOT2F+nTL/rGNdUhOpLq+nVKPF3ohuXEs="; + hash = "sha256-46REi+3dUY9dJrhXgKkQ1OfN6XCy1fV9cW6wk82ClOA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix b/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix index ac53b567e5a9..18437efceb4b 100644 --- a/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix @@ -1,53 +1,50 @@ { lib , buildPythonPackage -, fetchPypi , distro +, fetchFromGitHub +, pyasyncore , pysnmp +, pytestCheckHook , python-gnupg +, pythonAtLeast +, pythonOlder , qrcode , requests -, sseclient-py -, zfec -, pytestCheckHook -, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "blocksat-cli"; - version = "0.4.6"; - format = "setuptools"; + version = "2.4.6"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-uANAMNoAC4HUoUuR5ldxoiy+LLzZVpKosU5JttXLnqg="; + src = fetchFromGitHub { + owner = "Blockstream"; + repo = "satellite"; + rev = "refs/tags/v${version}"; + hash = "sha256-1gz2lAS/AHeY54AaVXGeofLC68KjAP7POsIaBL3v2EY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ distro pysnmp python-gnupg qrcode requests - sseclient-py - zfec + ] ++ lib.optionals (pythonAtLeast "3.12") [ + pyasyncore ]; nativeCheckInputs = [ pytestCheckHook ]; - disabledTestPaths = [ - # disable tests which require being connected to the satellite - "blocksatcli/test_satip.py" - "blocksatcli/api/test_listen.py" - "blocksatcli/api/test_msg.py" - "blocksatcli/api/test_net.py" - # disable tests which require being online - "blocksatcli/api/test_order.py" - ]; - disabledTests = [ "test_monitor_get_stats" "test_monitor_update_with_reporting_enabled" @@ -61,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Blockstream Satellite CLI"; homepage = "https://github.com/Blockstream/satellite"; + changelog = "https://github.com/Blockstream/satellite/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ prusnak ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/blosc2/default.nix b/nixpkgs/pkgs/development/python-modules/blosc2/default.nix index 1bc55fbdcf0a..d960139a7d6e 100644 --- a/nixpkgs/pkgs/development/python-modules/blosc2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blosc2/default.nix @@ -7,10 +7,14 @@ , cython_3 , ninja , oldest-supported-numpy +, pkg-config , scikit-build , setuptools , wheel +# c library +, c-blosc2 + # propagates , msgpack , ndindex @@ -26,15 +30,14 @@ buildPythonPackage rec { pname = "blosc2"; - version = "2.3.2"; - format = "pyproject"; + version = "2.5.1"; + pyproject = true; src = fetchFromGitHub { owner = "Blosc"; repo = "python-blosc2"; rev = "refs/tags/v${version}"; - fetchSubmodules = true; - hash = "sha256-tRcyntJlmLPbqnX7nzdBQ/50uXy0fVLb2YGVOIwJjxU="; + hash = "sha256-yBgnNJU1q+FktIkpQn74LuRP19Ta/fNC60Z8TxzlWPk="; }; postPatch = '' @@ -47,12 +50,16 @@ buildPythonPackage rec { cython_3 ninja oldest-supported-numpy + pkg-config scikit-build setuptools wheel ]; + buildInputs = [ c-blosc2 ]; + dontUseCmakeConfigure = true; + env.CMAKE_ARGS = "-DUSE_SYSTEM_BLOSC2:BOOL=YES"; propagatedBuildInputs = [ msgpack @@ -68,11 +75,13 @@ buildPythonPackage rec { torch ]; + passthru.c-blosc2 = c-blosc2; + meta = with lib; { description = "Python wrapper for the extremely fast Blosc2 compression library"; homepage = "https://github.com/Blosc/python-blosc2"; changelog = "https://github.com/Blosc/python-blosc2/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ris ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/bluecurrent-api/default.nix b/nixpkgs/pkgs/development/python-modules/bluecurrent-api/default.nix new file mode 100644 index 000000000000..ca19887a0fb0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bluecurrent-api/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pythonRelaxDepsHook +, setuptools +, pytz +, websockets +, pytest-asyncio +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "bluecurrent-api"; + version = "1.0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-XHVdtkiG0ff/OY8g+W5iur7OAyhhk1UGA+XUfB2L8/o="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + + pythonRemoveDeps = [ + "asyncio" + ]; + + propagatedBuildInputs = [ + pytz + websockets + ]; + + pythonImportsCheck = [ "bluecurrent_api" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + meta = { + description = "Wrapper for the Blue Current websocket api"; + homepage = "https://github.com/bluecurrent/HomeAssistantAPI"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/blurhash-python/default.nix b/nixpkgs/pkgs/development/python-modules/blurhash-python/default.nix new file mode 100644 index 000000000000..2b0232a7e9b9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/blurhash-python/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cffi +, pillow +, pytestCheckHook +, setuptools-scm +, six +}: + +buildPythonPackage rec { + pname = "blurhash-python"; + version = "1.2.2"; + + disabled = pythonOlder "3.8"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "woltapp"; + repo = "blurhash-python"; + rev = "v${version}"; + hash = "sha256-Cz+PkPp1knvT3U5ofyb1PstM9kzBOkgPbx03LgOLXgw="; + }; + + nativeBuildInputs = [ + cffi + setuptools-scm + ]; + + propagatedBuildInputs = [ + cffi + pillow + six + ]; + + pythonImportsCheck = [ "blurhash" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Compact representation of a placeholder for an image"; + homepage = "https://github.com/woltapp/blurhash-python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix b/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix index b8b493258354..6f5155643432 100644 --- a/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "boltztrap2"; - version = "22.12.1"; + version = "24.1.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BoltzTraP2"; inherit version; - hash = "sha256-gzjWAMUJcF5AyDS1Qx7opVbYewaqGgmFMDGWCh/2Wz4="; + hash = "sha256-kgv4lPBxcBmRKihaTwPRz8bHTWAWUOGZADtJUb3y+C4="; }; dontUseCmakeConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix index b569e7fa6dc8..a3944ba39500 100644 --- a/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "${python.libPrefix}-bootstrap-${installer.pname}"; - inherit (installer) version src meta; + inherit (installer) version src patches meta; buildPhase = '' runHook preBuild diff --git a/nixpkgs/pkgs/development/python-modules/borb/default.nix b/nixpkgs/pkgs/development/python-modules/borb/default.nix index 2c8c84bbf20c..2c20e8ff7fb7 100644 --- a/nixpkgs/pkgs/development/python-modules/borb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/borb/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "borb"; - version = "2.1.20"; + version = "2.1.21"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-HvPwFtqAPtJrG+O+t8OyQmYHVo6DC7StAjSfAxtuFe4="; + hash = "sha256-gnsPsvchvcUlWwmhDIazuc8/83ZRKc29VKhIDFSoFlE="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for reading, creating and manipulating PDF files in Python"; homepage = "https://borbpdf.com/"; + changelog = "https://github.com/jorisschellekens/borb/releases/tag/v${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ marsam ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix index 85a58ae3711c..16ac2560c60a 100644 --- a/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.20"; + version = "1.34.39"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QxhR6oK4WW+PpJ3nAUVUrg8vosxqCVRFl4ejuTh5bGg="; + hash = "sha256-ywCmGzid3oVaJllil8xm99ahgHUpi7iyA4GLOWOx0VM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix index a8164c800530..133114b9cd21 100644 --- a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.21"; + version = "1.34.39"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-xc3pikb8lNUNTs1GXdXGRQEiHJT+KJWmBt5cReyDdkM="; + hash = "sha256-LK8KDVR97UkwZAjqlZ2Uq6Od2WC33hGdkGwoKdFJ7OY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/botorch/default.nix b/nixpkgs/pkgs/development/python-modules/botorch/default.nix index c62fef2478ae..d4503c85c988 100644 --- a/nixpkgs/pkgs/development/python-modules/botorch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botorch/default.nix @@ -11,6 +11,7 @@ , torch , scipy , pytestCheckHook +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -26,6 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + pythonRelaxDepsHook setuptools setuptools-scm wheel @@ -40,6 +42,10 @@ buildPythonPackage rec { torch ]; + pythonRelaxDeps = [ + "linear-operator" + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/boxx/default.nix b/nixpkgs/pkgs/development/python-modules/boxx/default.nix index 7dd580c345a7..a42cc2c0ee55 100644 --- a/nixpkgs/pkgs/development/python-modules/boxx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.12"; + version = "0.10.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pumkDVyotm8bJEl/rrpNSsP8KZIVIgThGFB/Sy4OdUs="; + hash = "sha256-Z1mmNTGjK77GNdlYAXQzp+9Z7TeiKZGvio4SXGwgOPk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/branca/default.nix b/nixpkgs/pkgs/development/python-modules/branca/default.nix index 3bd46a26b83b..894ee421d208 100644 --- a/nixpkgs/pkgs/development/python-modules/branca/default.nix +++ b/nixpkgs/pkgs/development/python-modules/branca/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "branca"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DH+XBj+VcS56+nAOGjjrKG0dnSKrqiU6N5vkILm+vSE="; + hash = "sha256-OePOZvqXtsp73HsfFslI6F3kegbdk45lWY1CMQRTcoc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/breezy/Cargo.lock b/nixpkgs/pkgs/development/python-modules/breezy/Cargo.lock index 6b1457497700..0c70fa49f4ee 100644 --- a/nixpkgs/pkgs/development/python-modules/breezy/Cargo.lock +++ b/nixpkgs/pkgs/development/python-modules/breezy/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -25,7 +25,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "breezy" -version = "3.3.4" +version = "3.3.5" dependencies = [ "pyo3", ] @@ -37,10 +37,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] name = "indoc" -version = "1.0.9" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "lazy_static" @@ -50,15 +56,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[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", @@ -66,9 +72,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -81,9 +87,9 @@ dependencies = [ [[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" @@ -97,9 +103,9 @@ 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", @@ -110,18 +116,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" +checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" dependencies = [ "cfg-if", "indoc", @@ -136,9 +142,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" +checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" dependencies = [ "once_cell", "target-lexicon", @@ -146,9 +152,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" +checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" dependencies = [ "libc", "pyo3-build-config", @@ -156,9 +162,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" +checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -168,10 +174,11 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" +checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" dependencies = [ + "heck", "proc-macro2", "quote", "syn", @@ -179,27 +186,27 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[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", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -209,9 +216,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -220,13 +227,13 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rio-py" -version = "3.3.4" +version = "3.3.5" dependencies = [ "lazy_static", "pyo3", @@ -241,15 +248,15 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" -version = "1.0.109" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -258,21 +265,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[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 = "windows-targets" diff --git a/nixpkgs/pkgs/development/python-modules/breezy/default.nix b/nixpkgs/pkgs/development/python-modules/breezy/default.nix index 505137993b08..9861218d13c7 100644 --- a/nixpkgs/pkgs/development/python-modules/breezy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/breezy/default.nix @@ -1,8 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchpatch -, fetchPypi +, fetchFromGitHub , cargo , configobj , cython @@ -29,24 +28,18 @@ buildPythonPackage rec { pname = "breezy"; - version = "3.3.4"; - format = "pyproject"; + version = "3.3.5"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-fEEvOfo8YWhx+xuiqD/KNstlso5/K1XJnGY64tkLIwE="; + src = fetchFromGitHub { + owner = "breezy-team"; + repo = "breezy"; + rev = "brz-${version}"; + hash = "sha256-z8NKb8gFgA6dufM12jnZIZ6b1ZMZRzFA3w7t7gECEts="; }; - patches = [ - # Explicitly track which URLs are used for GitLab - (fetchpatch { - url = "https://github.com/breezy-team/breezy/commit/cc9fdf3774253183f726127c2ee191c24640d898.patch"; - hash = "sha256-HTDAW3CPEZ1YBe0wnv6ncWEd0QRHwHawfTplbVDiOGc="; - }) - ]; - cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; @@ -129,7 +122,7 @@ buildPythonPackage rec { meta = with lib; { description = "Friendly distributed version control system"; homepage = "https://www.breezy-vcs.org/"; - changelog = "https://github.com/breezy-team/breezy/blob/brz-${version}/doc/en/release-notes/brz-${versions.majorMinor version}.txt"; + changelog = "https://github.com/breezy-team/breezy/blob/${src.rev}/doc/en/release-notes/brz-${versions.majorMinor version}.txt"; license = licenses.gpl2Only; maintainers = [ maintainers.marsam ]; mainProgram = "brz"; diff --git a/nixpkgs/pkgs/development/python-modules/brotli-asgi/default.nix b/nixpkgs/pkgs/development/python-modules/brotli-asgi/default.nix index 8bdd814cfe5e..3bb6041422ae 100644 --- a/nixpkgs/pkgs/development/python-modules/brotli-asgi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/brotli-asgi/default.nix @@ -6,6 +6,7 @@ , starlette , brotli # check inputs +, httpx , requests , mypy , brotlipy @@ -35,6 +36,7 @@ buildPythonPackage { pythonImportsCheck = [ "brotli_asgi" ]; nativeCheckInputs = [ + httpx requests mypy brotlipy diff --git a/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix b/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix index 746c918120ec..faa8582b6b22 100644 --- a/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.4.1"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-1Srimb+MfWiX5NdmDQHJsmn6LatWd8nmXaB4uXdHKWY="; + hash = "sha256-7/09RasnW4cTUbwf3N+9DxsGG9pCaqAODX2UNWvlxZg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix b/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix index 55d1c971cf21..582bc6b8ca0c 100644 --- a/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bx-py-utils"; - version = "88"; + version = "91"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "boxine"; repo = "bx_py_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-Ds7Ljgp6OdbFkEWl1E0X03o0oJ/Nk8U3pO/ztK42DbY="; + hash = "sha256-W8NP5h9fHyTJj6TIpBunoPcNOu8eWV1rA8ZaoGUnmBQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/cantools/default.nix b/nixpkgs/pkgs/development/python-modules/cantools/default.nix index d656c85dca01..05a52e2bca08 100644 --- a/nixpkgs/pkgs/development/python-modules/cantools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cantools/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "cantools"; - version = "39.4.2"; + version = "39.4.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gGmo9HO7FnmZC+oJA/OiLVjfVJWuu/CfWNSfYnURthk="; + hash = "sha256-eqo9JGvFMouynGgfyBYtKAC+Be4JWz7blHD6FHj55QY="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix index e874aee16a24..64fe9705ea61 100644 --- a/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.35.0"; + version = "1.36.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "casbin"; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-XVFuRmeQwm+3kyO71F8nxB+VdaPS+5oTAk5XqcjvkCM="; + hash = "sha256-ebmCcu4OvDI7k4K6Jk5BgmXi5HtLMAV3PMkLd2LC0pY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index 7c22634f2a3c..fa7ebb248adb 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -18,6 +18,7 @@ , pytest-click , pytest-subtests , pytest-timeout +, pytest-xdist , pytestCheckHook , python-dateutil , pythonOlder @@ -63,6 +64,7 @@ buildPythonPackage rec { pytest-click pytest-subtests pytest-timeout + pytest-xdist pytestCheckHook ]; @@ -77,6 +79,10 @@ buildPythonPackage rec { disabledTests = [ "msgpack" "test_check_privileges_no_fchown" + # fails with pytest-xdist + "test_itercapture_limit" + "test_stamping_headers_in_options" + "test_stamping_with_replace" ] ++ lib.optionals stdenv.isDarwin [ # too many open files on hydra "test_cleanup" diff --git a/nixpkgs/pkgs/development/python-modules/censys/default.nix b/nixpkgs/pkgs/development/python-modules/censys/default.nix index f4b1f97f8cfa..901f70dddd2e 100644 --- a/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.10"; + version = "2.2.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-rjLTEaHSBB6igffNGt4qJZeSyIn1Cc1ZGEGfEoMj7OQ="; + hash = "sha256-/aB8rsyymNTXJLsf/IkA6o7M/mzyao10cl7kbxHEzGc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/nixpkgs/pkgs/development/python-modules/certbot/default.nix index 621a0f991856..0689319840e6 100644 --- a/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -10,7 +10,7 @@ , distro , josepy , parsedatetime -, pyRFC3339 +, pyrfc3339 , pyopenssl , pytz , requests @@ -47,7 +47,7 @@ buildPythonPackage rec { distro josepy parsedatetime - pyRFC3339 + pyrfc3339 pyopenssl pytz requests diff --git a/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix b/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix index ce55ab982925..bccf5c066799 100644 --- a/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix @@ -12,7 +12,7 @@ , pyopenssl , pythonOlder , requests -, requests_ntlm +, requests-ntlm , unicrypto }: @@ -47,7 +47,7 @@ buildPythonPackage rec { pycryptodome pyopenssl requests - requests_ntlm + requests-ntlm unicrypto ]; diff --git a/nixpkgs/pkgs/development/python-modules/cf-xarray/default.nix b/nixpkgs/pkgs/development/python-modules/cf-xarray/default.nix index 9e025568858c..fcbc6f6f20d5 100644 --- a/nixpkgs/pkgs/development/python-modules/cf-xarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cf-xarray/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.8.7"; + version = "0.8.8"; 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-ldnrEks6NkUkaRaev0X6aRHdOZHfsy9/Maihvq8xdSs="; + hash = "sha256-memz0VDhxnSHOFaEhFYy/sqRifcu905EGovGduS0YBQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 4c2cabda2cd3..dbab53868f66 100644 --- a/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -17,7 +17,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.12.0"; + version = "0.12.1"; in buildPythonPackage { @@ -30,7 +30,7 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-g1sLmYy5SClkdBSjFFYtikh2nuxfTIoaCyktqoFl+Ho="; + hash = "sha256-jgbtDpl2hXmfzmsiIIG6+B3QoekuAjBJGMxQJPX4ynA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cirq-ft/default.nix b/nixpkgs/pkgs/development/python-modules/cirq-ft/default.nix index d307191dd9af..a0fbbc40da1f 100644 --- a/nixpkgs/pkgs/development/python-modules/cirq-ft/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cirq-ft/default.nix @@ -7,15 +7,20 @@ , nbconvert , nbformat , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "cirq-ft"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs cachetools @@ -31,6 +36,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Upstream doesn't always adjust the version + "test_version" + ]; + # cirq's importlib hook doesn't work here #pythonImportsCheck = [ "cirq_ft" ]; diff --git a/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix b/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix index 4f185c825c34..c2d36a4f796d 100644 --- a/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix @@ -1,27 +1,23 @@ { buildPythonPackage , cirq-core +, freezegun , google-api-core , protobuf , pytestCheckHook -, freezegun , pythonRelaxDepsHook +, setuptools }: buildPythonPackage rec { pname = "cirq-google"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" \ - --replace "protobuf >= 3.15.0, < 4" "protobuf >= 3.15.0" - ''; - nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ @@ -40,6 +36,8 @@ buildPythonPackage rec { "cirq_google/_version_test.py" # Trace/BPT trap: 5 "cirq_google/engine/calibration_test.py" + # Very time-consuming + "cirq_google/engine/*_test.py" ]; disabledTests = [ diff --git a/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix b/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix index dc0ad33f60ee..ea3bf5c530d3 100644 --- a/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.0.3"; + version = "10.0.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-mIiUwqagFlZXkm/diQlCXMBDAbnWNG4BNMHVedo5u/M="; + hash = "sha256-IcMnzfkq4eSXh2KsxSog64RQbJhXkEWjma6LNkzDX0Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix b/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix index 9f6e4519c262..b44188ffcc71 100644 --- a/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.6.23"; + version = "0.7.0"; format = "setuptools"; @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-Gaiq5t/u5LJeJR5nNNfBvdNaFEycqgxVCHFETIvsUUU="; + hash = "sha256-RpuBKdjjSjJJ9UU7VW20gD9Rouj0oxv72sZZaUa/BfY="; }; nativeBuildInputs = [ cython_3 ]; diff --git a/nixpkgs/pkgs/development/python-modules/clldutils/default.nix b/nixpkgs/pkgs/development/python-modules/clldutils/default.nix index 76b2eceaeb09..f5b975f8467a 100644 --- a/nixpkgs/pkgs/development/python-modules/clldutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clldutils/default.nix @@ -2,10 +2,8 @@ , attrs , buildPythonPackage , colorlog -, csvw , fetchFromGitHub , git -, isPy27 , lxml , markdown , markupsafe @@ -15,30 +13,36 @@ , pytest-mock , pytestCheckHook , python-dateutil +, pythonOlder +, setuptools , tabulate }: buildPythonPackage rec { pname = "clldutils"; - version = "3.19.0"; - format = "setuptools"; - disabled = isPy27; + version = "3.21.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "clld"; repo = pname; rev = "v${version}"; - hash = "sha256-dva0lbbTxvETDPkACxpI3PPzWh5gz87Fv6W3lTjNv3Q="; + hash = "sha256-OD+WJ9JuYZb/oXDgVqL4i5YlcVEt0+swq0SB3cutyRo="; }; patchPhase = '' - substituteInPlace setup.cfg --replace "--cov" "" + substituteInPlace setup.cfg \ + --replace-fail "--cov" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs colorlog - csvw lxml markdown markupsafe @@ -55,13 +59,8 @@ buildPythonPackage rec { git ]; - disabledTests = [ - # uses pytest.approx which is not supported in a boolean context in pytest7 - "test_to_dec" - "test_roundtrip" - ]; - meta = with lib; { + changelog = "https://github.com/clld/clldutils/blob/${src.rev}/CHANGES.md"; description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al"; homepage = "https://github.com/clld/clldutils"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix b/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix index d6f9eedbec0f..dc8eafe6326f 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix @@ -1,48 +1,55 @@ { lib , buildPythonPackage , fetchPypi -, attrs -, beautifulsoup4 +, setuptools , requests -, future , pyyaml , jsonlines , pythonOlder +, pytestCheckHook +, pytz }: buildPythonPackage rec { pname = "cloudflare"; - version = "2.14.2"; - format = "setuptools"; + version = "2.18.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HeSaiJKI2C3FwPKip0ZVKWe5nZYGP13zpXpwNkLiQLQ="; + hash = "sha256-dTD9HO26elFdfNMJxlyK1jKf4xWcz98/XrKI3EpUSsc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - attrs - beautifulsoup4 requests - future pyyaml jsonlines ]; - # no tests associated with package + # tests require networking doCheck = false; pythonImportsCheck = [ "CloudFlare" ]; + nativeCheckInputs = [ + pytestCheckHook + pytz + ]; + meta = with lib; { description = "Python wrapper for the Cloudflare v4 API"; homepage = "https://github.com/cloudflare/python-cloudflare"; changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md"; license = licenses.mit; + mainProgram = "cli4"; maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cmdstanpy/default.nix b/nixpkgs/pkgs/development/python-modules/cmdstanpy/default.nix index 41f06c59cc2b..9ca60fe3c88e 100644 --- a/nixpkgs/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cmdstanpy/default.nix @@ -11,18 +11,19 @@ , stanio , xarray , pytestCheckHook +, stdenv }: buildPythonPackage rec { pname = "cmdstanpy"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "stan-dev"; repo = "cmdstanpy"; rev = "refs/tags/v${version}"; - hash = "sha256-1/X5JDvCx21qLNamNQXpg+w3d3DdSRlB+liIv2fThs4="; + hash = "sha256-q+AFhWEzjYElJpiHT4h6YfZrwZJ56pv+8R+001vREyQ="; }; patches = [ @@ -70,11 +71,12 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_lp_good" # Fails for some reason "test_serialization" # Pickle class mismatch errors # These tests use the flag -DSTAN_THREADS which doesn't work in cmdstan (missing file) "test_multi_proc_threads" "test_compile_force" + ] ++ lib.optionals stdenv.isDarwin [ + "test_init_types" # CmdStan error: error during processing Operation not permitted ]; pythonImportsCheck = [ "cmdstanpy" ]; @@ -84,7 +86,6 @@ buildPythonPackage rec { description = "A lightweight interface to Stan for Python users"; changelog = "https://github.com/stan-dev/cmdstanpy/releases/tag/v${version}"; license = lib.licenses.bsd3; - platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ tomasajt ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 443d24d3f695..8c0a04f59cd2 100644 --- a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.11.27.17"; + version = "2024.1.17.17"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-UDcegRnDtz6LYAN9S8wiW/TCsIsQHr5sSX+chEkeFnw="; + hash = "sha256-mYA67oiWWvEdNU2MrjtOPyDW3LbxH/mgh+MOuZg2ljo="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/colorlog/default.nix b/nixpkgs/pkgs/development/python-modules/colorlog/default.nix index 8a7ff6494e4d..1e8cfb0d0d03 100644 --- a/nixpkgs/pkgs/development/python-modules/colorlog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colorlog/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "colorlog"; - version = "6.8.0"; + version = "6.8.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+7b9+dVoXyUX84j7Kbsn1U6GVN0x9YvCo7IX6WepXKY="; + hash = "sha256-Pj4HmkH+taG2T5eLXqT0YECpTxHw6Lu4Jh49u+ymTUQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/comicon/default.nix b/nixpkgs/pkgs/development/python-modules/comicon/default.nix index 8d69ae0fc744..04382d3ee340 100644 --- a/nixpkgs/pkgs/development/python-modules/comicon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/comicon/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, pythonRelaxDepsHook , ebooklib , lxml , pillow @@ -10,18 +11,24 @@ buildPythonPackage rec { pname = "comicon"; - version = "1.0.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "potatoeggy"; repo = "comicon"; rev = "v${version}"; - hash = "sha256-D6nK+GlcG/XqMTH7h7mJcbZCRG2xDHRsnooSTtphDNs="; + hash = "sha256-e9YEr8IwttMlj6FOxk+/kw79qiF1N8/e2qusfw3WH00="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "lxml" + "pillow" ]; propagatedBuildInputs = [ @@ -34,6 +41,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "comicon" ]; meta = with lib; { + changelog = "https://github.com/potatoeggy/comicon/releases/tag/v${version}"; description = "Lightweight comic converter library between CBZ, PDF, and EPUB"; homepage = "https://github.com/potatoeggy/comicon"; license = licenses.agpl3Only; diff --git a/nixpkgs/pkgs/development/python-modules/comm/default.nix b/nixpkgs/pkgs/development/python-modules/comm/default.nix index e03eae5ffdbb..3c2fa837a8cd 100644 --- a/nixpkgs/pkgs/development/python-modules/comm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/comm/default.nix @@ -8,7 +8,7 @@ let pname = "comm"; - version = "0.2.0"; + version = "0.2.1"; in buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "ipython"; repo = "comm"; rev = "refs/tags/v${version}"; - hash = "sha256-bErZNTm0spO0A/Lc8kq5u7sB0FMXm/WMWtFbCNGJVXE="; + hash = "sha256-iyO3q9E2lYU1rMYTnsa+ZJYh+Hq72LEvE9ynebFIBUk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix b/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix index 15f48da9264f..e378b71b43b8 100644 --- a/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix @@ -7,6 +7,7 @@ , setuptools , setuptools-scm , wheel +, packaging , pybind11 , pydantic , rich @@ -18,21 +19,19 @@ buildPythonPackage rec { pname = "correctionlib"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bQKcS8vktvD62zvSeaBtoJw36TSpo0gEpKm0HI3AuXg="; + hash = "sha256-H8QCdU6piBdqJEJOGVbsz+6eyMhFVuwTpIHKUoKaf4A="; }; nativeBuildInputs = [ cmake - numpy scikit-build setuptools setuptools-scm - wheel pybind11 ]; @@ -41,6 +40,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + numpy + packaging pydantic rich ]; @@ -62,6 +63,5 @@ buildPythonPackage rec { homepage = "https://cms-nanoaod.github.io/correctionlib/"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ veprbl ]; - broken = versionAtLeast pydantic.version "2"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/courlan/default.nix b/nixpkgs/pkgs/development/python-modules/courlan/default.nix new file mode 100644 index 000000000000..d906f44c0f16 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/courlan/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, langcodes +, pytestCheckHook +, tld +, urllib3 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "courlan"; + version = "0.9.5"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ONw1suO/H11RbQDVGsEuveVD40F8a+b2oic8D8W1s1M="; + }; + + propagatedBuildInputs = [ + langcodes + tld + urllib3 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # disable tests that require an internet connection + disabledTests = [ + "test_urlcheck" + ]; + + # nixify path to the courlan binary in the test suite + postPatch = '' + substituteInPlace tests/unit_tests.py \ + --replace "\"courlan --help\"" "\"$out/bin/courlan --help\"" \ + --replace "courlan_bin = \"courlan\"" "courlan_bin = \"$out/bin/courlan\"" + ''; + + pythonImportsCheck = [ "courlan" ]; + + meta = with lib; { + description = "Clean, filter and sample URLs to optimize data collection"; + homepage = "https://github.com/adbar/courlan"; + changelog = "https://github.com/adbar/courlan/blob/v${version}/HISTORY.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jokatzke ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cron-descriptor/default.nix b/nixpkgs/pkgs/development/python-modules/cron-descriptor/default.nix index bb946780009e..d4283b3af6ec 100644 --- a/nixpkgs/pkgs/development/python-modules/cron-descriptor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cron-descriptor/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "cron_descriptor"; - version = "1.2.35"; + version = "1.4"; src = fetchFromGitHub { owner = "Salamek"; repo = "cron-descriptor"; rev = "refs/tags/${version}"; - hash = "sha256-m+h91cddmEPHCeUWWNpTvb89mFwm8ty8tTnw3YDjCFo="; + hash = "sha256-r5TMatjNYaPhPxhJbBGGshQf6VxKyBV6Za1lQoblxYA="; }; # remove tests_require, as we don't do linting anyways diff --git a/nixpkgs/pkgs/development/python-modules/crontab/default.nix b/nixpkgs/pkgs/development/python-modules/crontab/default.nix new file mode 100644 index 000000000000..fea3e9909b70 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/crontab/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, python-dateutil +, pytz +, setuptools +}: + +buildPythonPackage rec { + pname = "crontab"; + version = "0.23.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "josiahcarlson"; + repo = "parse-crontab"; + rev = "refs/tags/${version}"; + hash = "sha256-8vMkgBU1jIluo9+hAvk2KNM+Wn0+PvJqFNwX+JLXD+w="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + python-dateutil + pytz + ]; + + pythonImportsCheck = [ + "crontab" + ]; + + meta = with lib; { + description = "Parse and use crontab schedules in Python"; + homepage = "https://github.com/josiahcarlson/parse-crontab"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix b/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix index 734569297796..e19a4137e4f3 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix @@ -1,36 +1,38 @@ { lib -, buildPythonPackage -, fetchFromGitLab - -# build-system -, setuptools - -# dependencies , asn1crypto , attrs +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitLab , pathlib2 +, pyfakefs , python-dateutil +, pythonOlder +, setuptools , six -, urllib3 - -# tests -, beautifulsoup4 -, pyfakefs , unittestCheckHook +, urllib3 }: buildPythonPackage rec { pname = "cryptodatahub"; - version = "0.10.1"; - format = "pyproject"; + version = "0.12.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitLab { owner = "coroner"; repo = "cryptodatahub"; - rev = "v${version}"; - hash = "sha256-eLdK5gFrLnbIBB1NTeQzpdCLPdATVjzPn5LhhUsDuwo="; + rev = "refs/tags/v${version}"; + hash = "sha256-zVHHBQYcl26zTtXPAs/AgKOojKQORu08rpkfY0l1zjM="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace-warn "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" + ''; + nativeBuildInputs = [ setuptools ]; @@ -44,23 +46,28 @@ buildPythonPackage rec { urllib3 ]; - pythonImportsCheck = [ "cryptodatahub" ]; - nativeCheckInputs = [ beautifulsoup4 pyfakefs unittestCheckHook ]; + pythonImportsCheck = [ + "cryptodatahub" + ]; + + preCheck = '' # failing tests rm test/updaters/test_common.py + # Tests require network access + rm test/common/test_utils.py ''; meta = with lib; { description = "Repository of cryptography-related data"; homepage = "https://gitlab.com/coroner/cryptodatahub"; - changelog = "https://gitlab.com/coroner/cryptodatahub/-/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://gitlab.com/coroner/cryptodatahub/-/blob/${version}/CHANGELOG.rst"; license = licenses.mpl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 4acb8c6dcd19..4ae2e77de6ac 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -3,52 +3,56 @@ , buildPythonPackage , callPackage , cargo +, certifi , cffi +, cryptography-vectors ? (callPackage ./vectors.nix { }) , fetchPypi -, hypothesis -, iso8601 +, fetchpatch2 , isPyPy , libiconv , libxcrypt , openssl , pkg-config , pretend -, py -, pytest-subtests +, pytest-xdist , pytestCheckHook , pythonOlder -, pytz , rustc , rustPlatform , Security , setuptoolsRustBuildHook }: -let - cryptography-vectors = callPackage ./vectors.nix { }; -in buildPythonPackage rec { pname = "cryptography"; - version = "41.0.7"; # Also update the hash in vectors.nix + version = "42.0.2"; # Also update the hash in vectors.nix pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E/k86b6oAWwlOzSvxr1qdZk+XEBnLtVAWpyDLw1KALw="; + hash = "sha256-4OxSujx/G32BPNUmSaWz7x/A1DMhncjJOCfFfqts+Ig="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-VeZhKisCPDRvmSjGNwCgJJeVj65BZ0Ge+yvXbZw86Rw="; + hash = "sha256-jw/FC5rQO77h6omtBp0Nc2oitkVbNElbkBUduyprTIc="; }; + patches = [ + (fetchpatch2 { + # skip overflowing tests on 32 bit; https://github.com/pyca/cryptography/pull/10366 + url = "https://github.com/pyca/cryptography/commit/d741901dddd731895346636c0d3556c6fa51fbe6.patch"; + hash = "sha256-eC+MZg5O8Ia5CbjRE4y+JhaFs3Q5c62QtPHr3x9T+zw="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ - --replace "--benchmark-disable" "" + --replace-fail "--benchmark-disable" "" ''; cargoRoot = "src/rust"; @@ -77,14 +81,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + certifi cryptography-vectors - hypothesis - iso8601 pretend - py pytestCheckHook - pytest-subtests - pytz + pytest-xdist ]; pytestFlagsArray = [ diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix index c02e4d3bcf7e..a5654de86cbb 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , cryptography -, setuptools +, flit-core }: buildPythonPackage rec { @@ -14,11 +14,11 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-ezb5drbljMGAExDhyTxYTGU503Haf4U47dj8Rj3IDVs="; + hash = "sha256-rc3M9dnuZhqWAq0h0lJfZ4ugem52jOeYNZlOIIurDhY="; }; nativeBuildInputs = [ - setuptools + flit-core ]; # No tests included diff --git a/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix b/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix index 27c5150f3715..61d5a4a3f664 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix @@ -1,35 +1,56 @@ { lib , attrs +, beautifulsoup4 , buildPythonPackage , certvalidator +, colorama , cryptoparser +, dnspython , fetchPypi +, pathlib2 +, pyfakefs +, python-dateutil , pythonOlder , requests -, six +, setuptools , urllib3 }: buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.12.1"; - format = "setuptools"; + version = "0.12.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "CryptoLyzer"; inherit version; - hash = "sha256-1Ec57A5lCjy9FsA3vDmCyfOeHZaQz01FNiKyNV3eJfc="; + hash = "sha256-UffFdQ+MiB8kPzqnmWdnGRwAAM9wJwpUDK2bPvPvH0c="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace-warn "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" \ + --replace-warn "bs4" "beautifulsoup4" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - certvalidator attrs - six - urllib3 + beautifulsoup4 + certvalidator + colorama cryptoparser + dnspython + pathlib2 + pyfakefs + python-dateutil requests + urllib3 ]; # Tests require networking diff --git a/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix b/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix index a04c424e61e3..e377b35ee5be 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix @@ -12,15 +12,20 @@ buildPythonPackage rec { pname = "cryptoparser"; - version = "0.12.1"; - format = "pyproject"; + version = "0.12.2"; + pyproject = true; src = fetchPypi { pname = "CryptoParser"; inherit version; - hash = "sha256-Q05koDfVaVgiQYhULkwzl9uzUIumO8ZIGJPfxRBUsj0="; + hash = "sha256-SG7I/uOWZapjZ5zGW1HndGqaYc2k2aRWf3IWlartIJE="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace-warn "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix index 26e7080c2139..56dab1fbbb54 100644 --- a/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.3.5"; + version = "0.3.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; rev = "refs/tags/${version}"; - hash = "sha256-aO2K0lc3qjKK8CZAbu/lotI5QJ/R+8npSIRX4a6HdrI="; + hash = "sha256-dQynnILHt6YO5qtvVVwcxRwtBJgokyfsQ5ubH15dkuA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cvelib/default.nix b/nixpkgs/pkgs/development/python-modules/cvelib/default.nix index 0f9d292a5151..c269c351c1da 100644 --- a/nixpkgs/pkgs/development/python-modules/cvelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cvelib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cvelib"; - version = "1.2.1"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvelib"; rev = "tags/${version}"; - hash = "sha256-hJPcxnc4iQzsYNNVJ9fw6yQl+5K7pdtjHT6oMmBx/Zs="; + hash = "sha256-PCZUAKgE80PD//4qK8ap55IN9vtx9WdpRZUAC3UdaWM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cvss/default.nix b/nixpkgs/pkgs/development/python-modules/cvss/default.nix index 140852cb98be..120325a7b8e5 100644 --- a/nixpkgs/pkgs/development/python-modules/cvss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cvss/default.nix @@ -2,47 +2,44 @@ , buildPythonPackage , fetchFromGitHub , jsonschema -, pytestCheckHook +, unittestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "cvss"; - version = "2.6"; - format = "setuptools"; + version = "3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RedHatProductSecurity"; - repo = pname; + repo = "cvss"; rev = "refs/tags/v${version}"; - hash = "sha256-gD9MreJQPaxziy02Wt3BGFiIoQ/+pW3KqiNfNlTijJY="; + hash = "sha256-xrkWpE13Y4KgQEZjitWE3Ka+IyfShqE2cj0/yzsAnX4="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ jsonschema - pytestCheckHook + unittestCheckHook ]; pythonImportsCheck = [ "cvss" ]; - disabledTests = [ - # Tests require additional data - "test_calculator" - "test_cvsslib" - "test_json_ordering" - "test_json_schema_repr" - "test_random" - "test_rh_vector" - "test_simple" - "test_simple_31" - ]; + preCheck = '' + cd tests + ''; meta = with lib; { - description = "Library for CVSS2/3"; + description = "Library for CVSS2/3/4"; homepage = "https://github.com/RedHatProductSecurity/cvss"; changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}"; license = with licenses; [ lgpl3Plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index b98e52695836..16a5adbf1594 100644 --- a/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , clarabel , cvxopt , ecos @@ -19,16 +20,26 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.4.1"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ep7zTjxX/4yETYbwo4NPtVda8ZIzlHY53guld8YSLj4="; + hash = "sha256-CjhqV4jb14t7IN0HFSTsY2yPpys2KOafGrxxTI+YEeU="; }; + patches = [ + # fix QP tests. remove on next update + # https://github.com/cvxpy/cvxpy/pull/2343 + (fetchpatch { + name = "fix-QP-tests.patch"; + url = "https://github.com/cvxpy/cvxpy/commit/4c8549b9820e64c1b06f5d71c5d3f36528dd4a76.patch"; + hash = "sha256-43zjS1STEBaGgj1jEOlX3XzMsE4wjoKAk8ApJo98AzY="; + }) + ]; + # we need to patch out numpy version caps from upstream postPatch = '' sed -i 's/\(numpy>=[0-9.]*\),<[0-9.]*;/\1;/g' pyproject.toml diff --git a/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix b/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix index cfd1cebd6620..874af6d65941 100644 --- a/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix @@ -7,29 +7,33 @@ , pythonOlder , ruamel-yaml , schema-salad +, setuptools }: buildPythonPackage rec { pname = "cwl-upgrader"; - version = "1.2.10"; - format = "setuptools"; + version = "1.2.11"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "common-workflow-language"; - repo = pname; + repo = "cwl-upgrader"; rev = "refs/tags/v${version}"; - hash = "sha256-D/MIvn/jyxK++CMgKM8EYDVo94WFgdlTtMZjsXoQ4W4="; + hash = "sha256-P8607Io/KIJqAnrValM+rRK59tQITcC/jyGwkge8qN0="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "ruamel.yaml >= 0.15, < 0.17.22" "ruamel.yaml" \ - --replace "setup_requires=PYTEST_RUNNER," "" - sed -i "/ruamel.yaml/d" setup.py + # Version detection doesn't work for schema_salad + substituteInPlace pyproject.toml \ + --replace '"schema_salad",' "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ mypy-extensions ruamel-yaml @@ -46,9 +50,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Library to interface with Yolink"; - homepage = "https://github.com/common-workflow-language/cwl-utils"; - changelog = "https://github.com/common-workflow-language/cwl-utils/releases/tag/v${version}"; + description = "Library to upgrade CWL syntax to a newer version"; + homepage = "https://github.com/common-workflow-language/cwl-upgrader"; + changelog = "https://github.com/common-workflow-language/cwl-upgrader/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix b/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix index 91cae6b49d7f..a3c71a2776bc 100644 --- a/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.15.12"; + version = "6.15.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cx_Freeze"; inherit version; - hash = "sha256-Ak4OC94xD21daVdsbYSvFxO1YKJcccJ8xoCBk50cWww="; + hash = "sha256-VeOgoVrga9dPJ0W9S3Ye/9Ff5yEOlP2DlDf0sDUh1yo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index e4bd3686b161..6d5aa4032c2d 100644 --- a/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,8 +23,8 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "6.3.0"; - format = "pyproject"; + version = "6.4.1"; + 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-Q4mz6qNqR7lkZqb70COBkrXsv0+z5TEC149dnSpzhtI="; + hash = "sha256-IhiH1Vk/Wf6cTxijxE1erkQozY+vOVd5pu6tAVUoDJM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index 5b5ca31e4d02..cf808fe263a4 100644 --- a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -5,24 +5,24 @@ , fetchPypi , pari , gmp -, cython +, cython_3 , cysignals }: buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.1.3"; + version = "2.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "17beb467d3cb39fffec3227c468f0dd8db8a09129faeb95a6bb4c84b2b6c6683"; + sha256 = "sha256-76SkTZb2k8sRVtof1vzMEw2vz5wZr0GFz3cL9E0A2/w="; }; patches = [ # patch to avoid some segfaults in sage's totallyreal.pyx test. - # (https://trac.sagemath.org/ticket/27267). depends on Cython patch. + # (https://trac.sagemath.org/ticket/27267). (fetchpatch { name = "use-trashcan-for-gen.patch"; url = "https://raw.githubusercontent.com/sagemath/sage/b6ea17ef8e4d652de0a85047bac8d41e90b25555/build/pkgs/cypari/patches/trashcan.patch"; @@ -30,20 +30,13 @@ buildPythonPackage rec { }) ]; - # This differs slightly from the default python installPhase in that it pip-installs - # "." instead of "*.whl". - # That is because while the default install phase succeeds to build the package, - # it fails to generate the file "auto_paridecl.pxd". - installPhase = '' - export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - - # install "." instead of "*.whl" - pip install . --no-index --no-warn-script-location --prefix="$out" --no-cache + preBuild = '' + # generate cythonized extensions (auto_paridecl.pxd is crucial) + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace ''; nativeBuildInputs = [ pari - python.pythonOnBuildForHost.pkgs.pip ]; buildInputs = [ @@ -52,10 +45,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ cysignals - cython + cython_3 ]; checkPhase = '' + test -f "$out/${python.sitePackages}/cypari2/auto_paridecl.pxd" make check ''; diff --git a/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix b/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix index c7d6602de5fe..c3e5436de969 100644 --- a/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix +++ b/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "daiquiri"; - version = "3.2.3"; + version = "3.2.5.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-P8rvN2/WgIi5I5E3R6t+4S2Lf7Kvf4xfIOWYCZfp6DU="; + hash = "sha256-Xy6G1vyovDjR6a36YFGE32/eo3AuB8oC0Wqj0AQ7Luw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix b/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix index a7b80faf973e..0875430cc383 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.1.1"; + version = "2024.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-8nha0h1f/pLl7YmUc5HzlqwNRE/gRpRV2PudkddMHqg="; + hash = "sha256-oBGja1dt9UbHym0c5K/pAMXNErryr3u6IhDRuhwTvG0="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix b/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix index c465baf23309..0931cf6060c0 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2023.10.0"; - format = "pyproject"; + version = "2024.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; rev = "refs/tags/${version}"; - hash = "sha256-ugAqNdvCROCCXURwsGLpnl/lBEAremvTI7MVa/TWt6c="; + hash = "sha256-YU5i7mGOZxj/pvpkZLwohoSuHJgS3zkHYVuj1Vtyrj4="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Histograms with task scheduling"; homepage = "https://dask-histogram.readthedocs.io/"; + changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/dask/default.nix b/nixpkgs/pkgs/development/python-modules/dask/default.nix index 70b15822cb65..77f702506136 100644 --- a/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2023.12.0"; + version = "2024.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-LMd55s8LT4m6Ym+LmXb4TKPnZ0jMkNBfcPJxmgruMDM="; + hash = "sha256-L8bRh2bx36CYrAFXYJF67rCeCRfm5ufhTkMFRJo0yYo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix b/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix index 01b565df96e9..b0bd083085f3 100644 --- a/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.0.1"; + version = "3.0.2"; 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-ymR/PL+LC7Bt+thtCJs5kfbJgKDgioUo+T79E7ZUQWY="; + hash = "sha256-Uvy5/a9YFdPKpZ3B+Yvrvp7uZCY/My45w1lDqX7zJvI="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/nixpkgs/pkgs/development/python-modules/datadog/default.nix index 9c314e6ea09a..1375dd7e780a 100644 --- a/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.47.0"; - format = "pyproject"; + version = "0.48.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R747LD1wmn9bcJ6xJu1P5sx5d9YY/lwVjdicKp99mRY="; + hash = "sha256-1NZhNYw+f4Afv+FRGPXM8Iub2bH0W4uRBgWWUoPtrWQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dataprep-ml/default.nix b/nixpkgs/pkgs/development/python-modules/dataprep-ml/default.nix index 6af89e238ccd..00a25158bc87 100644 --- a/nixpkgs/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataprep-ml/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage +, colorlog +, dataclasses-json , fetchPypi -, pythonOlder -, poetry-core +, nltk-data , numpy , pandas +, poetry-core +, pydantic , pydateinfer , python-dateutil +, pythonOlder +, pythonRelaxDepsHook , scipy -, type-infer -, dataclasses-json -, colorlog -, pydantic -, nltk-data , symlinkJoin +, type-infer }: let testNltkData = symlinkJoin { name = "nltk-test-data"; - paths = [ nltk-data.punkt nltk-data.stopwords ]; + paths = [ + nltk-data.punkt + nltk-data.stopwords + ]; }; in buildPythonPackage rec { @@ -35,20 +39,25 @@ buildPythonPackage rec { hash = "sha256-BtnRmj5JtgNdCFowgNdpIZn5vUdw8QYCWneHfDgC4/c="; }; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ + colorlog + dataclasses-json numpy pandas + pydantic pydateinfer python-dateutil scipy type-infer - dataclasses-json - colorlog - pydantic ]; # PyPI tarball has no tests diff --git a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index c7b9d6e2b295..014e7ad01f72 100644 --- a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.21.0"; + version = "2.21.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-P2Czo7XRJLDnR62eLb2lYn97nS5x6LsnYHs47+mvktQ="; + hash = "sha256-L3PZjxbcVfqWktWuN5l8JxfR1GyxuA+1ZtO/W2YqFZA="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix b/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix new file mode 100644 index 000000000000..f3fdbef18782 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix @@ -0,0 +1,84 @@ +{ lib +, aiohttp +, aiomqtt +, buildPythonPackage +, cachetools +, defusedxml +, docker +, fetchFromGitHub +, numpy +, pillow +, pycountry +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +, svg-py +, testfixtures +}: + +buildPythonPackage rec { + pname = "deebot-client"; + version = "5.1.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "DeebotUniverse"; + repo = "client.py"; + rev = "refs/tags/${version}"; + hash = "sha256-axz31GboqaWAcBU8DtG700Se6rX7VV7eBrQBDazG+Ig="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + aiohttp + aiomqtt + cachetools + defusedxml + numpy + pillow + svg-py + ]; + + nativeCheckInputs = [ + docker + pycountry + pytest-asyncio + pytestCheckHook + testfixtures + ]; + + pythonImportsCheck = [ + "deebot_client" + ]; + + disabledTests = [ + # Tests require running container + "test_last_message_received_at" + "test_client_bot_subscription" + "test_client_reconnect_manual" + "test_p2p_success" + "test_p2p_not_supported" + "test_p2p_data_type_not_supported" + "test_p2p_to_late" + "test_p2p_parse_error" + "test_mqtt_task_exceptions" + "test_mqtt_task_exceptions" + "test_client_reconnect_on_broker_error" + ]; + + meta = with lib; { + description = "Deebot client library"; + homepage = "https://github.com/DeebotUniverse/client.py"; + changelog = "https://github.com/DeebotUniverse/client.py/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/demetriek/default.nix b/nixpkgs/pkgs/development/python-modules/demetriek/default.nix index 42205ac652f9..68f2660f6bb7 100644 --- a/nixpkgs/pkgs/development/python-modules/demetriek/default.nix +++ b/nixpkgs/pkgs/development/python-modules/demetriek/default.nix @@ -1,23 +1,24 @@ { lib , aiohttp +, aresponses , awesomeversion , backoff , buildPythonPackage -, pydantic , fetchFromGitHub , fetchpatch , poetry-core -, yarl -, aresponses +, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, yarl }: buildPythonPackage rec { pname = "demetriek"; version = "0.4.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -45,8 +46,13 @@ buildPythonPackage rec { --replace "--cov" "" ''; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -72,6 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for LaMetric TIME devices"; homepage = "https://github.com/frenck/python-demetriek"; + changelog = "https://github.com/frenck/python-demetriek/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/denonavr/default.nix b/nixpkgs/pkgs/development/python-modules/denonavr/default.nix index acfa4dc0eb5c..61930b92818c 100644 --- a/nixpkgs/pkgs/development/python-modules/denonavr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/denonavr/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , defusedxml , fetchFromGitHub +, ftfy , httpx , netifaces , pytest-asyncio @@ -17,16 +18,16 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.11.4"; - format = "pyproject"; + version = "0.11.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ol-iver"; - repo = pname; + repo = "denonavr"; rev = "refs/tags/${version}"; - hash = "sha256-0+BjakGGnCbmiSHSipRifPkasfP1vvAWGvzyRufpsOk="; + hash = "sha256-VxoRK1qeGrIunsiCzeZJUHxW/sxk+PFpntInL+G/yI8="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { asyncstdlib attrs defusedxml + ftfy httpx netifaces ] ++ lib.optionals (pythonOlder "3.11") [ diff --git a/nixpkgs/pkgs/development/python-modules/dict2xml/default.nix b/nixpkgs/pkgs/development/python-modules/dict2xml/default.nix index c032eef5f4e3..62fb5caa8efb 100644 --- a/nixpkgs/pkgs/development/python-modules/dict2xml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dict2xml/default.nix @@ -7,8 +7,8 @@ buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.3"; - format = "pyproject"; + version = "1.7.4"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "delfick"; repo = "python-dict2xml"; rev = "refs/tags/release-${version}"; - hash = "sha256-0Ahc+8pb1gHvcpnYhKAJYLIaQ5Wbp7Q8clzMVcnVdYs="; + hash = "sha256-58sWvdkbt+czo96RUxB2vdOl/wqSU3BNIozSEdixWO8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix b/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix index ee5e15e3da73..b198097ebdb0 100644 --- a/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix +++ b/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "8.0.1"; + version = "8.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-zDnRmety/kG83P7hZOtbWRUztMYlWA4/mprMaGkGTXw="; + hash = "sha256-OTVlyoZorh4OOOThMrUc8CgIb7Bqen2Ued61Aj4vaNQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/diffusers/default.nix b/nixpkgs/pkgs/development/python-modules/diffusers/default.nix index 2d2c901a5016..2150fdabe66e 100644 --- a/nixpkgs/pkgs/development/python-modules/diffusers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/diffusers/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "diffusers"; - version = "0.25.0"; + version = "0.25.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "diffusers"; rev = "refs/tags/v${version}"; - hash = "sha256-3IwBZWSbAMaOo76rUejt4YG7PA0RMLq4LYkNB6SvK6k="; + hash = "sha256-AvD/kiwKGojsLlJ0n/U6tTu7ON8Ujl0lZd1e/fDY+CM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dissect-btrfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-btrfs/default.nix new file mode 100644 index 000000000000..3d1bc5c20bac --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dissect-btrfs/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, google-crc32c +, python-lzo +, pythonOlder +, setuptools +, setuptools-scm +, zstandard +}: + +buildPythonPackage rec { + pname = "dissect-btrfs"; + version = "1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.btrfs"; + rev = "refs/tags/${version}"; + hash = "sha256-3k0UUkce7bZ3mZ8Umjms4DX63QeBdRPUXpsdaK0VDyc="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + passthru.optional-dependencies = { + full = [ + python-lzo + zstandard + ]; + gcrc32 = [ + google-crc32c + ]; + }; + + # Issue with the test file handling + doCheck = false; + + pythonImportsCheck = [ + "dissect.btrfs" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for the BTRFS file system"; + homepage = "https://github.com/fox-it/dissect.btrfs"; + changelog = "https://github.com/fox-it/dissect.btrfs/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix index 0f44c587c746..03284d72cc93 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix @@ -11,9 +11,9 @@ buildPythonPackage rec { pname = "dissect-clfs"; version = "1.6"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix index cecc7dffef3f..bcc86b1f7588 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.10"; - format = "pyproject"; + version = "3.12"; + pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-cdBojvFI0cN6mEZ98xLa3XldvIoR+Jv1c0/hvVkKVoQ="; + hash = "sha256-67s0Qr/YeQp/K9MZS+btKdp+9J6mIMCwiittIUB9p2w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix index 1253b9ebb9c8..b5ddf86dd548 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.10"; + version = "3.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-RlXnUD+KiBmntM/f7jEzdZ0Tdb8vPGvW0e3XoANaPnk="; + hash = "sha256-ynrZqP3QXe+SXFB0Uz+tdH2jGj+hpHfarbEN2P1+r/8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix index 86206ee27ac1..0659372ca5cf 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.extfs"; rev = "refs/tags/${version}"; - hash = "sha256-RsAWqtoarn/2sZU5dkQYt794dXGOr5fe68VgMNDBst4="; + hash = "sha256-yM9PTMI4/8oU2bvOCKdh5tT0gw9+6esV1auKSbupL0U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix index 975526db7158..d8ccf0e0d8fb 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.10"; + version = "3.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-Ml5U7yc4iqqilL6Y9qF3VU+pa0AXnYVQjVas90TpG30="; + hash = "sha256-x7C2h9NZRlkJWAe0+PCmOhOpfHM2/4vc7oEGQqGEPq8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dissect-jffs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-jffs/default.nix new file mode 100644 index 000000000000..1fdc2af6cc21 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dissect-jffs/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, pythonOlder +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dissect-jffs"; + version = "1.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.jffs"; + rev = "refs/tags/${version}"; + hash = "sha256-Rj8/WRHNl2IQ6zwvLhqEIEMzk8BH1fv7KQkw1NzoDjI="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + # Test file handling fails + doCheck = true; + + pythonImportsCheck = [ + "dissect.jffs" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for the JFFS2 file system"; + homepage = "https://github.com/fox-it/dissect.jffs"; + changelog = "https://github.com/fox-it/dissect.jffs/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix index 4d69844c9884..97ebe80f18b8 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-bnFimn5ektIKiX73NZ+1Iz3Uoew138a0nFJgypffC4o="; + hash = "sha256-BmXYnN8B7r/gz+zEWWS7ClOv29QOiHrm7g2ZNZXlnGU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix index 62f4a745156c..786b29562874 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.14"; + version = "3.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -48,9 +48,14 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-vp1upVwohMXFKxlHy5lWmigdq9MUk1UknSsPpCXt50s="; + hash = "sha256-1uWKlp0t1mVtt3lbjl4U1TMxE2YHN/GzGs8OuoVTRqc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-warn "flow.record~=" "flow.record>=" + ''; + nativeBuildInputs = [ setuptools setuptools-scm @@ -105,12 +110,13 @@ buildPythonPackage rec { # Test requires rdump "test_exec_target_command" # Issue with tar file - "test_tar_sensitive_drive_letter" "test_dpapi_decrypt_blob" - "test_notifications_appdb" "test_md" - "test_notifications_wpndatabase" "test_nested_md_lvm" + "test_notifications_appdb" + "test_notifications_wpndatabase" + "test_tar_anonymous_filesystems" + "test_tar_sensitive_drive_letter" # Tests compare dates and times "yum" # Filesystem access, windows defender tests diff --git a/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix index 495294db9c3f..894b5e35f4e0 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.13"; + version = "3.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-GUDYr3lP0BV7zJaaUen78CplRA7jfn1zYes7kczNGEU="; + hash = "sha256-NzqQW6OFv+CtAxa5J2X/XGS9UCFfhMp4elvgcTrA1Wg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix index 1a2ce1e27355..77f69a83730f 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.7"; + version = "3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-5ZO++l6BWA085U5IkghjCT46YhKc85SB7sNU2h4Fpec="; + hash = "sha256-hEfURO4ITpjSpfHMlYfzO1cG+tjvqBP5QLYzo2uz8yo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix index 1f46b745edc3..af83a91ec22f 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.xfs"; rev = "refs/tags/${version}"; - hash = "sha256-unrkmhLvjWWKHiqJWCEVEVcUjxWXMznjOytRbDwAxKw="; + hash = "sha256-bqpN4Ho5A9j8oLwErPErMVgkanIkdNTqcT3lkdQiw6M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dissect/default.nix b/nixpkgs/pkgs/development/python-modules/dissect/default.nix index 2d15c4f5a720..544deeace888 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, dissect-btrfs , dissect-cim , dissect-clfs , dissect-cobaltstrike @@ -8,11 +9,12 @@ , dissect-etl , dissect-eventlog , dissect-evidence +, dissect-executable , dissect-extfs , dissect-fat , dissect-ffs -, dissect-executable , dissect-hypervisor +, dissect-jffs , dissect-ntfs , dissect-ole , dissect-regf @@ -26,14 +28,15 @@ , dissect-xfs , fetchFromGitHub , pythonOlder +, pythonRelaxDepsHook , setuptools , setuptools-scm }: buildPythonPackage rec { pname = "dissect"; - version = "3.11"; - format = "pyproject"; + version = "3.12"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -41,15 +44,19 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-6y+p+Ulc1Viu5s1AL/ecVtO4YRnmem/ZleY8xC4CJrU="; + hash = "sha256-hy5Yr/yR7CC7cp6pA1JP+GKazu+N4AwPqFKwb7zM+N8="; }; + pythonRelaxDeps = true; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools setuptools-scm ]; propagatedBuildInputs = [ + dissect-btrfs dissect-cim dissect-clfs dissect-cobaltstrike @@ -63,6 +70,7 @@ buildPythonPackage rec { dissect-fat dissect-ffs dissect-hypervisor + dissect-jffs dissect-ntfs dissect-ole dissect-regf diff --git a/nixpkgs/pkgs/development/python-modules/distutils-cfg/default.nix b/nixpkgs/pkgs/development/python-modules/distutils-cfg/default.nix index cbf12c17582a..fb616c65d036 100644 --- a/nixpkgs/pkgs/development/python-modules/distutils-cfg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distutils-cfg/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { dontUnpack = true; installPhase = '' - dest="$out/lib/${python.libPrefix}/site-packages/distutils" + dest="$out/${python.sitePackages}/distutils" mkdir -p $dest ln -s ${python}/lib/${python.libPrefix}/distutils/* $dest ln -s ${distutilsCfg} $dest/distutils.cfg diff --git a/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix b/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix index acc94865c02b..a465ffefc6a6 100644 --- a/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-cleanup"; - version = "8.0.0"; + version = "8.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xzmgVUTh5I3ISIcchw2/FZX4Uz0kUjvGc2DkNWLtrw0="; + hash = "sha256-cN+QUHakTnoRGzEZgZmvYz3uCIduGZ5tzjbKjda4sQ8="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix b/nixpkgs/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix new file mode 100644 index 000000000000..16609c82d34a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, setuptools +, pytestCheckHook +, pytest-django +, django-crispy-forms +}: + +buildPythonPackage rec { + pname = "django-crispy-bootstrap5"; + version = "2023.10"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "django-crispy-forms"; + repo = "crispy-bootstrap5"; + rev = "refs/tags/${version}"; + hash = "sha256-AUMlLj3GmI+0vYw56Dw2+iF5s1l6GF+zV7PRD889ldg="; + }; + + propagatedBuildInputs = [ + django + setuptools + ]; + + nativeCheckInputs = [ + pytest-django + pytestCheckHook + django-crispy-forms + ]; + + pythonImportsCheck = [ "crispy_bootstrap5" ]; + + meta = with lib; { + description = "Bootstrap 5 template pack for django-crispy-forms"; + homepage = "https://github.com/django-crispy-forms/crispy-bootstrap5"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix index a5c85a485695..427a8e231139 100644 --- a/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.4.3"; + version = "3.4.5"; format = "setuptools"; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-D9IyuM+ZsvFZL0nhMt1VQ1DYcKg4CS8FPAgSWLtsXeE="; + hash = "sha256-FXh5OFMTjsKgjEeIS+CiOwyGOs4AisJA+g49rCILDsQ="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-X3bJ6STFq6zGIzXHSd2C67d4kSOVJJR5aBSM3o5T850="; + hash = "sha256-cZEr/7FW4vCR8gpraT+/rPwYK9Xn22b5WH7lnuK5L4U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix b/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix index d4c9940c6b04..4c901273ab02 100644 --- a/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "3.3.5"; + version = "3.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bYb000KRnvuMSMTTicqrJ+0zU/XguQFcLATqxUvc5V0="; + hash = "sha256-xcvBavXrA1XhBKYBkbaOuzG6yYkSnX2USvjg5djoXQ8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix b/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix index deaf003701b0..34f17a8d7304 100644 --- a/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "6.0.3"; + version = "6.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-D2gt1POv73kJuz3TlpScNVmCU5vUOS1OnfCwsxYESE0="; + hash = "sha256-YU0PCpEfinZeVbbTWLFxW7he62PR67d0R9CdZF8TQ+g="; }; propagatedBuildInputs = [ django ]; diff --git a/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index 6803c26b01c5..026788caf646 100644 --- a/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix @@ -12,6 +12,7 @@ , django , pytest-django , pytestCheckHook +, nixosTests }: buildPythonPackage rec { @@ -46,6 +47,8 @@ buildPythonPackage rec { "django_mailman3" ]; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = with lib; { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; diff --git a/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix b/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix index e6940c53b430..6b0dbb8d3b9d 100644 --- a/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -1,33 +1,29 @@ { lib -, fetchFromGitHub -, fetchpatch , buildPythonPackage , django -, python-fsutil +, fetchFromGitHub , python +, python-fsutil , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "django-maintenance-mode"; - version = "0.19.0"; - format = "setuptools"; + version = "0.21.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fabiocaccamo"; - repo = pname; + repo = "django-maintenance-mode"; rev = "refs/tags/${version}"; - hash = "sha256-NAm3xMcHePTYxysihYj48bk7r9ykEtPcxPjSEju/zMM="; + hash = "sha256-rZo0yru+y5TkdULBQDMGAVb494PSLtbnNX/7cuphKNk="; }; - patches = [ - (fetchpatch { - name = "fix-broken-test.patch"; - url = "https://github.com/fabiocaccamo/django-maintenance-mode/commit/68cde8d9ceef00eeaa2068f420698c1c562fa9fc.patch"; - hash = "sha256-K/zYYkcnmWGc7Knz4l9PgvUtT0IccPRXc3UFriC1ldc="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -43,11 +39,15 @@ buildPythonPackage rec { runHook postCheck ''; + pythonImportsCheck = [ + "maintenance_mode" + ]; + meta = with lib; { description = "Shows a 503 error page when maintenance-mode is on"; homepage = "https://github.com/fabiocaccamo/django-maintenance-mode"; changelog = "https://github.com/fabiocaccamo/django-maintenance-mode/releases/tag/${version}"; - maintainers = with maintainers; [ mrmebelman ]; license = licenses.bsd3; + maintainers = with maintainers; [ mrmebelman ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix b/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix index 7eaa9c3a7189..35d54194f07d 100644 --- a/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "5.0.10"; + version = "5.0.12"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wYdJpnwdtBZ8yszDY5XF/mB48xKGloPC89IUBR5aayk="; + hash = "sha256-wEfMmanxukqubbicOsJDR41t6Y7Ipgxwc/zIddicXNs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix b/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix index b0671d789510..a8953369304a 100644 --- a/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "django-sesame"; - version = "3.2.1"; - format = "pyproject"; + version = "3.2.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aaugustin"; - repo = pname; + repo = "django-sesame"; rev = "refs/tags/${version}"; - hash = "sha256-R7ySuop7E1lkxtRSVNFfzyb3Ba1mW0o6PDiTxTztK/Y="; + hash = "sha256-8jbYhD/PfPnutJZonmdrqLIQdXiUHF12w0M9tuyyDz0="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "URLs with authentication tokens for automatic login"; homepage = "https://github.com/aaugustin/django-sesame"; + changelog = "https://github.com/aaugustin/django-sesame/blob/${version}/docs/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/django-silk/default.nix b/nixpkgs/pkgs/development/python-modules/django-silk/default.nix index 9f91aee935ac..5cb38385284c 100644 --- a/nixpkgs/pkgs/development/python-modules/django-silk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-silk/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "django-silk"; - version = "5.0.3"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-silk"; rev = "refs/tags/${version}"; - hash = "sha256-91FcOqAYZK7/RCKgXjbQEPUQ2cZRFi7NzVLQF+MMDRI="; + hash = "sha256-QqY1bRa0v4DZ2/gDbssyhJA9Kb+5jig4hZEBVKZiowY="; }; # "test_time_taken" tests aren't suitable for reproducible execution, but Django's diff --git a/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix b/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix index d43892cb04d3..11c3e862804a 100644 --- a/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "django-simple-captcha"; - version = "0.5.20"; + version = "0.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ICcwCae+tEKX6fbHpr0hraPS+pPDFNL2v145TO62opc="; + hash = "sha256-0YhRbTJvrdLVrQduuJZJ1VwCyrr+P9zCFUrBjp9tS5c="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-two-factor-auth/default.nix b/nixpkgs/pkgs/development/python-modules/django-two-factor-auth/default.nix index 7ca684149800..dfb726a55b01 100644 --- a/nixpkgs/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { pname = "django-two-factor-auth"; - version = "1.15.1"; - format = "setuptools"; + version = "1.15.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-two-factor-auth"; rev = "refs/tags/${version}"; - hash = "sha256-+E6kSD00ChPiRLT2i43dNlVkbvuR1vKkbSZfD1Bf3qc="; + hash = "sha256-Sr7L3ioeofyADHb1NSgs0GmVbzX7rro7yhhG9Gq6GJE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix index bd0e45dee75f..89fd6e85c954 100644 --- a/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "django-versatileimagefield"; - version = "3.0"; + version = "3.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-FlHbLtNthDz7F4jyYBRyopPZuoZyk2m29uVZERI1esc="; + hash = "sha256-M5DiAEgJjol78pmwNgdj0QzQiWZbeu+OupAO7Lrq0Ng="; }; propagatedBuildInputs = [ pillow python-magic ]; diff --git a/nixpkgs/pkgs/development/python-modules/django-vite/default.nix b/nixpkgs/pkgs/development/python-modules/django-vite/default.nix index 5f4ee952e2f1..607d0b6e818f 100644 --- a/nixpkgs/pkgs/development/python-modules/django-vite/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-vite/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "django-vite"; - version = "3.0.2"; + version = "3.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MrBin99"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Lnecxkn+E1Bce/EhP1AHH9/VrdzBiMGLv+eYld5+QKM="; + hash = "sha256-FH42auBm/YRfGgjL9TGQLed/p0P8POb7DOLmpUK1d9c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix b/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix index 3f1aa0138b90..3850c7cbd891 100644 --- a/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dND6btp4i4Sxq4KMLn786EFLBe7wpOsr8n0xGlDgpO0="; + hash = "sha256-UTMbM9p2aI60078+o7tWQ0sMHfstzYjL+wo5YY9o3Xo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django/3.nix b/nixpkgs/pkgs/development/python-modules/django/3.nix index 295094c65928..e2c7a93cf007 100644 --- a/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.23"; + version = "3.2.24"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-gpaPNkDinvSnc68sKESPX3oI0AHGrAWzLQKu7mUJUIs="; + hash = "sha256-qu6fsPtOvUMRUgiHrS4zMT02iEZgf4KpoO1GHNTDWxg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/django/4.nix b/nixpkgs/pkgs/development/python-modules/django/4.nix index 47c079328a17..365a775c11a6 100644 --- a/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.9"; + version = "4.2.10"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-EkmMw8uLyAOFOf756Q6V9QdQJDbB8MOmc0ETJPpnXRQ="; + hash = "sha256-sSYO04GxChF1PHNERAjhmGnzJB/EXJhc1VowF3x4nRM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/django/5.nix b/nixpkgs/pkgs/development/python-modules/django/5.nix index 565309cef538..686280dcdd24 100644 --- a/nixpkgs/pkgs/development/python-modules/django/5.nix +++ b/nixpkgs/pkgs/development/python-modules/django/5.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "5.0.1"; + version = "5.0.2"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-jIZZZlvG46RP7+GrCikeWj+zl5+agjC+Kd6XXlfo+FQ="; + hash = "sha256-tbsdEbJRil+RNyooLyRmL1j2Z0lmawooarBXAp9ygIA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix b/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix index d106d1295595..a285a538fa08 100644 --- a/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix @@ -8,29 +8,36 @@ , pytestCheckHook , python-dateutil , pythonOlder +, setuptools +, structlog , typing-extensions }: buildPythonPackage rec { pname = "dlms-cosem"; - version = "21.3.2"; - format = "setuptools"; + version = "24.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pwitab"; - repo = pname; + repo = "dlms-cosem"; rev = "refs/tags/${version}"; - hash = "sha256-BrLanP+SIRRof15yzqwcDOxw92phbW7m9CfORz0xo7I="; + hash = "sha256-NeTaU8i18Zb39Y2JnYzr87Ozt7Rj074xusL4xaNe0q0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ asn1crypto attrs cryptography pyserial python-dateutil + structlog typing-extensions ]; @@ -45,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to parse DLMS/COSEM"; homepage = "https://github.com/pwitab/dlms-cosem"; + changelog = "https://github.com/pwitab/dlms-cosem/blob/${version}/HISTORY.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/dparse/default.nix b/nixpkgs/pkgs/development/python-modules/dparse/default.nix index 3c8b56a2c406..44649dd0e991 100644 --- a/nixpkgs/pkgs/development/python-modules/dparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dparse/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, toml -, pyyaml +, fetchPypi +, fetchpatch2 +, setuptools , packaging +, tomli +, pyyaml , pytestCheckHook }: buildPythonPackage rec { pname = "dparse"; version = "0.6.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -20,15 +22,32 @@ buildPythonPackage rec { hash = "sha256-J7uLS8rv7DmXaXuj9uBrJEcgC6JzwLCFw9ASoEVxtSg="; }; + patches = [ + (fetchpatch2 { + name = "fix-configparser-deprecation-warning.patch"; + url = "https://github.com/pyupio/dparse/pull/69.patch"; + hash = "sha256-RolD6xDJpI8/UHgAdcsXoyxOGLok7AogLMOTl1ZPKvw="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - toml - pyyaml packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; + passthru.optional-dependencies = { + # FIXME pipenv = [ pipenv ]; + conda = [ pyyaml ]; + }; + nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "dparse" diff --git a/nixpkgs/pkgs/development/python-modules/dploot/default.nix b/nixpkgs/pkgs/development/python-modules/dploot/default.nix new file mode 100644 index 000000000000..6b6dc6454cb6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dploot/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, poetry-core +, pythonRelaxDepsHook +, fetchPypi +, impacket +, cryptography +, pyasn1 +, lxml +}: + +buildPythonPackage rec { + pname = "dploot"; + version = "2.2.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-40/5KOlEFvPL9ohCfR3kqoikpKFfJO22MToq3GhamKM="; + }; + + pythonRelaxDeps = true; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + impacket + cryptography + pyasn1 + lxml + ]; + + pythonImportsCheck = [ "dploot" ]; + + # No tests + doCheck = false; + + meta = { + homepage = "https://github.com/zblurx/dploot"; + description = "DPAPI looting remotely in Python"; + changelog = "https://github.com/zblurx/dploot/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vncsb ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix b/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix index 84da4beadd79..35c2b79c438d 100644 --- a/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dramatiq"; - version = "1.15.0"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Bogdanp"; repo = "dramatiq"; rev = "refs/tags/v${version}"; - hash = "sha256-uhradhLIyfHf1meAr7ChuGnvm62mX/lkQQ2Pe7hBWtY="; + hash = "sha256-gC1vWnG3zDuFT61i2VgDrP/qIwmGN5GkGv6EVxqUf4U="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index fc9245f33777..97b27d14bd35 100644 --- a/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -74,6 +74,8 @@ buildPythonPackage rec { disabledTestPaths = [ # missing test inputs "dulwich/contrib/test_swift_smoke.py" + # flaky on high core count >4 + "dulwich/tests/compat/test_client.py" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index c7b41c27823a..86f8cf2483e5 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "3.7.0"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-ycC6NWvU00yUEHu62H5VLKDEZEHyIo4+TBwj5XaswII="; + hash = "sha256-rgqSgNsqAGATzu3ZX8LWRiFJt0xTTLaF8bUNOgA3s2w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dvc-gdrive/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-gdrive/default.nix new file mode 100644 index 000000000000..e7b2b0d7c499 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dvc-gdrive/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, dvc +, fetchFromGitHub +, pydrive2 +, pythonOlder +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dvc-gdrive"; + version = "3.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = "dvc-gdrive"; + rev = "refs/tags/${version}"; + hash = "sha256-oqHSMmwfR24ydJlpXGI3cCxIlF0BwNdgje5zKa0c7FA="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dvc + pydrive2 + ]; + + # Circular dependency with dvc + doCheck = false; + + pythonImportsCheck = [ + "dvc_gdrive" + ]; + + meta = with lib; { + description = "Google Drive plugin for DVC"; + homepage = "https://github.com/iterative/dvc-gdrive"; + changelog = "https://github.com/iterative/dvc-gdrive/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dvc-hdfs/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-hdfs/default.nix new file mode 100644 index 000000000000..b532941e42ba --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dvc-hdfs/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, dvc +, fetchFromGitHub +, fsspec +, pythonOlder +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dvc-hdfs"; + version = "3.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = "dvc-hdfs"; + rev = "refs/tags/${version}"; + hash = "sha256-Bo8+El5GC7iyT8SxaJquWFG29BOeilmEMDtTG+RkDGI="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dvc + fsspec + ] ++ fsspec.optional-dependencies.arrow; + + # Circular dependency with dvc + doCheck = false; + + pythonImportsCheck = [ + "dvc_hdfs" + ]; + + meta = with lib; { + description = "HDFS/WebHDFS plugin for dvc"; + homepage = "https://github.com/iterative/dvc-hdfs"; + changelog = "https://github.com/iterative/dvc-hdfs/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix index 34848b020c63..778bcf39fa27 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "3.0.3"; + version = "3.0.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-objects"; rev = "refs/tags/${version}"; - hash = "sha256-JQ3UDUOpuxPavXkoJqbS0T7y3kpwuJ8NvqAl3DahoLU="; + hash = "sha256-os4MzxB4IuqJ9EsKZXGzOU23Qf6LLLiV6SLaNpMlEp8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix index a4527cd1b6c5..fc0a13004970 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "1.0.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "dvc-render"; rev = "refs/tags/${version}"; - hash = "sha256-OrfepQuLBNa5m3Sy4NzFOArtFFvaNtNNVJ8DNN3yT6s="; + hash = "sha256-7rmmhf6Y6teoHR8u1+Ce1Xq0rdtC1/MWLXb282OOEnc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dvc-ssh/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-ssh/default.nix index eaee2a6a579e..3dd39273307f 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-ssh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-ssh/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "dvc-ssh"; - version = "3.0.0"; + version = "4.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Xlbav0mk+8/VTgS1MCide76QW8WhlflzNXQ7YM4N4iw="; + hash = "sha256-WaWcoWKXauNHZRFDt+MnqpFWjxzya+yAo0TRNQURViA="; }; pythonRemoveDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/dvc/default.nix b/nixpkgs/pkgs/development/python-modules/dvc/default.nix index 302c6a11e356..c469ffcb9754 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc/default.nix @@ -1,24 +1,22 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, pythonOlder -, pythonRelaxDepsHook -, setuptools-scm , appdirs +, buildPythonPackage , colorama , configobj , distro , dpath , dvc-azure , dvc-data +, dvc-gdrive , dvc-gs +, dvc-hdfs , dvc-http , dvc-render , dvc-s3 , dvc-ssh , dvc-studio-client , dvc-task +, fetchFromGitHub , flatten-dict , flufl_lock , funcy @@ -36,10 +34,13 @@ , pydot , pygtrie , pyparsing +, pythonOlder +, pythonRelaxDepsHook , requests , rich , ruamel-yaml , scmrepo +, setuptools-scm , shortuuid , shtab , tabulate @@ -56,14 +57,16 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.40.0"; + version = "3.43.1"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-MSbj8k7ZdjbB3jNq+AZ3gkwjyuT1DpfQuaWlgltsfrk="; + hash = "sha256-9JS8N4BWikmXoo5TtpUD5El2vHST80NEOBdxkHfK4ME="; }; pythonRelaxDeps = [ @@ -72,7 +75,8 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace dvc/analytics.py --replace 'enabled = not os.getenv(DVC_NO_ANALYTICS)' 'enabled = False' + substituteInPlace dvc/analytics.py \ + --replace 'enabled = not os.getenv(DVC_NO_ANALYTICS)' 'enabled = False' substituteInPlace dvc/daemon.py \ --subst-var-by dvc "$out/bin/dcv" ''; @@ -135,9 +139,15 @@ buildPythonPackage rec { azure = [ dvc-azure ]; + gdrive = [ + dvc-gdrive + ]; gs = [ dvc-gs ]; + hdfs = [ + dvc-hdfs + ]; s3 = [ dvc-s3 ]; diff --git a/nixpkgs/pkgs/development/python-modules/dvclive/default.nix b/nixpkgs/pkgs/development/python-modules/dvclive/default.nix index 67f70fffb3e0..f657ab37083c 100644 --- a/nixpkgs/pkgs/development/python-modules/dvclive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvclive/default.nix @@ -1,21 +1,39 @@ { lib , buildPythonPackage +, datasets , dvc +, dvc-render , dvc-studio-client +, fastai , fetchFromGitHub , funcy +, gto +, jsonargparse +, lightgbm +, lightning +, matplotlib +, mmcv +, numpy +, optuna +, pandas +, pillow , pytestCheckHook , pythonOlder , ruamel-yaml +, scikit-learn , scmrepo , setuptools-scm , tabulate +, tensorflow +, torch +, transformers +, xgboost }: buildPythonPackage rec { pname = "dvclive"; - version = "3.5.1"; - format = "pyproject"; + version = "3.41.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +41,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QsA8HZ6wIWKvtQ+f3nyRKKZRNJS56eZ1sKw+KNHxfXc="; + hash = "sha256-PbgazRK3+CoJISh1ZXGjxDfbKHY/XqSvVrkpycvPi7c="; }; nativeBuildInputs = [ @@ -32,12 +50,78 @@ buildPythonPackage rec { propagatedBuildInputs = [ dvc + dvc-render dvc-studio-client funcy + gto ruamel-yaml scmrepo ]; + passthru.optional-dependencies = { + all = [ + jsonargparse + lightgbm + lightning + matplotlib + mmcv + numpy + optuna + pandas + pillow + scikit-learn + tensorflow + torch + transformers + xgboost + ] ++ jsonargparse.optional-dependencies.signatures; + image = [ + numpy + pillow + ]; + sklearn = [ + scikit-learn + ]; + plots = [ + pandas + scikit-learn + numpy + ]; + markdown = [ + matplotlib + ]; + mmcv = [ + mmcv + ]; + tf = [ + tensorflow + ]; + xgb = [ + xgboost + ]; + lgbm = [ + lightgbm + ]; + huggingface = [ + datasets + transformers + ]; + # catalyst = [ + # catalyst + # ]; + fastai = [ + fastai + ]; + lightning = [ + lightning + torch + jsonargparse + ] ++ jsonargparse.optional-dependencies.signatures; + optuna = [ + optuna + ]; + }; + # Circular dependency with dvc doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix b/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix index b057158b731a..e07190f98104 100644 --- a/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; # it would use the erroneous tag v0.47 - passthru.skipBulkUpdate = false; + passthru.skipBulkUpdate = true; meta = with lib; { description = "An unofficial Dynalite DyNET interface creating devices"; diff --git a/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix b/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix index 91031fd567aa..5e3cc6b94f5c 100644 --- a/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "easyenergy"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-easyenergy"; rev = "refs/tags/v${version}"; - hash = "sha256-WnDyGkF1JI0Yu4p+znBdtCRvzrmGl9DH7QygKDuhEZo="; + hash = "sha256-UHCwxdtziWIZMf3ORIZoQFE3MI8qbBQo5PEbvppvwD4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/ed25519-blake2b/default.nix b/nixpkgs/pkgs/development/python-modules/ed25519-blake2b/default.nix index 2fca4287a348..2783662ad2cf 100644 --- a/nixpkgs/pkgs/development/python-modules/ed25519-blake2b/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ed25519-blake2b/default.nix @@ -1,20 +1,26 @@ { lib +, buildPythonPackage , fetchPypi , pythonOlder -, buildPythonPackage }: +, setuptools +}: buildPythonPackage rec { pname = "ed25519-blake2b"; - version = "1.4"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0aHLkDLsMHzpW0HGGUQP1NP87MGPIkA1zH1tx6fY70A="; + hash = "sha256-cx6fk80awaZGSVdfNRmpn/4LseTPe/X18L5ROjnfc2M="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "ed25519_blake2b" ]; @@ -22,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ed25519 public-key signatures (BLAKE2b fork)"; homepage = "https://github.com/Matoking/python-ed25519-blake2b"; + changelog = "https://github.com/Matoking/python-ed25519-blake2b/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ onny stargate01 ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix b/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix index a42b0cced7cf..cdfb91d72042 100644 --- a/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -4,18 +4,19 @@ , fetchFromGitHub , setuptools , setuptools-scm -, pythonRelaxDepsHook , pyasn1 , pyasn1-modules , cryptography , joblib , gitpython +, sqlalchemy +, pygount , pytestCheckHook }: buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.19.9"; + version = "0.21.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,18 +25,12 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-eQcto4pd+y9fCjuiaSezA3okfW+xrR01Kc/N2tQdf5A="; + hash = "sha256-xJ5OuQXvccgEjzuMqa75+mv3MipgdsiHc9yjrZYoCow="; }; nativeBuildInputs = [ setuptools setuptools-scm - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "tinydb" - "joblib" ]; propagatedBuildInputs = [ @@ -44,6 +39,8 @@ buildPythonPackage rec { cryptography joblib gitpython + sqlalchemy + pygount ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix b/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix index 93ec1fc59b50..d3edf6748300 100644 --- a/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-ApWz0La+weqczVj3EyBqTAFlTt8cylA3Dl0ZDP4/i5o="; + hash = "sha256-INOg1oL5APMI2YZDe4yOJadhMsG7b+NfEcSr9FsdqeU="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix index dfee78a41408..263786e3e404 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "8.11.0"; + version = "8.12.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RK9P1/YgCbsZGTtV4cIUO2kyUX5MDsMBB+f/TZaKEn4="; + sha256 = "sha256-zjK4UpiIqXvpEVMedZCBbPOx9ggmPv9vt1qnEG4jPIg="; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ]; diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix index 23187eb603e9..84376cdbdb19 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.11.1"; + version = "8.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nY+qZ94uVBLMPb0i0k7gEUfcR5lsE6lcbtFtGQkTKeo="; + hash = "sha256-YFsrdsAAelOest7Pw3+Zl3lV+Q/e7YMELmL3TodBKSM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix b/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix index 739cad1e1714..9a1a8a0b1dfc 100644 --- a/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "embedding-reader"; - version = "1.6.1"; + version = "1.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rom1504"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-51UQOqXZcI1VBQ1k6omMStI7GZXNDQ6/e3ThafpP61U="; + hash = "sha256-paN6rAyH3L7qCfWPr5kXo9Xl57gRMhdcDnoyLJ7II2w="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/nixpkgs/pkgs/development/python-modules/emoji/default.nix index 3820b7a8eaf7..f2c036f7be02 100644 --- a/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.8.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "carpedm20"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fnVY4KwiqvSVYijlDckLq6qDrBJj/rJGMwaQ1mMygek="; + hash = "sha256-cCYZ+0IFHIR9++RfUbFTRMKYB9nC5dBaPMH6dSiAXK0="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/environs/default.nix b/nixpkgs/pkgs/development/python-modules/environs/default.nix index 529c940dd45c..8c179349e18e 100644 --- a/nixpkgs/pkgs/development/python-modules/environs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/environs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "environs"; - version = "10.1.0"; + version = "10.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; rev = "refs/tags/${version}"; - hash = "sha256-G9dgOugmFRHSLlmVHs2H5XyF3UKghAGtuzTWn4IB4dI="; + hash = "sha256-D6Kp8aHiUls7+cACJ3DwrS4OftA5uMbAu4l5IyR4F5U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/es-client/default.nix b/nixpkgs/pkgs/development/python-modules/es-client/default.nix index 7c72732f7499..f5b16097c26f 100644 --- a/nixpkgs/pkgs/development/python-modules/es-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/es-client/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , certifi , click +, ecs-logging , elastic-transport , elasticsearch8 , fetchFromGitHub @@ -19,8 +20,8 @@ buildPythonPackage rec { pname = "es-client"; - version = "8.11.0"; - format = "pyproject"; + version = "8.12.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "untergeek"; repo = "es_client"; rev = "refs/tags/v${version}"; - hash = "sha256-VsHpWe37/CZvGm3PqVq4mJCBA9juvOD9FLmDeW8OjiM="; + hash = "sha256-gaeNIxHnNulUOGhYHf9dIgBSh2rJIdsYdpPT8OTyEdg="; }; pythonRelaxDeps = true; @@ -41,6 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi click + ecs-logging elastic-transport elasticsearch8 pyyaml @@ -62,7 +64,11 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_bad_version_raises" + "test_basic_operation" + "test_basic_operation" "test_client_info" + "test_logging_options_ecs" + "test_logging_options_json" "test_multiple_hosts_raises" "test_non_dict_passed" "test_skip_version_check" diff --git a/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix b/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix index 0ce780d0f7aa..b2f512ea973c 100644 --- a/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix +++ b/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "0.4.17"; + version = "0.4.19"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "evohome-async"; rev = "refs/tags/${version}"; - hash = "sha256-8Dl23U0LynNPxDpo79CmA4H8o2knU2rrtNYwDPZBVRQ="; + hash = "sha256-B7LvGXAZO1pd9iCuZjW/bRWdB5PEzfcQjZWokGzMN70="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index b7d4cda7df7c..9b4078ba47f6 100644 --- a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -17,7 +17,7 @@ , pytz , pyyaml , requests -, requests_ntlm +, requests-ntlm , requests-oauthlib , requests-kerberos , requests-mock @@ -57,7 +57,7 @@ buildPythonPackage rec { oauthlib pygments requests - requests_ntlm + requests-ntlm requests-oauthlib requests-kerberos tzdata diff --git a/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix b/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix index 41521f096290..014fa1057d56 100644 --- a/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix +++ b/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix @@ -7,23 +7,25 @@ , pygments , pytestCheckHook , pythonRelaxDepsHook +, setuptools }: buildPythonPackage rec { pname = "explorerscript"; - version = "0.1.4"; - format = "setuptools"; + version = "0.1.5"; + pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-oa9q5k3OREGn6pQiyLy22MNJTiY6Pm+xrwA4DBUhxp0="; + hash = "sha256-dGbzZYEFEWE5bUz+647pPzP4Z/XmrJU82jNT4ZBRNHk="; }; nativeBuildInputs = [ antlr4 pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/extruct/default.nix b/nixpkgs/pkgs/development/python-modules/extruct/default.nix index c2156965d08b..64873c94d324 100644 --- a/nixpkgs/pkgs/development/python-modules/extruct/default.nix +++ b/nixpkgs/pkgs/development/python-modules/extruct/default.nix @@ -1,38 +1,37 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonRelaxDepsHook , html-text , jstyleson , lxml , mf2py +, mock , pyrdfa3 +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , rdflib +, setuptools , six , w3lib -, pytestCheckHook -, mock }: buildPythonPackage rec { pname = "extruct"; - version = "0.13.0"; - format = "setuptools"; + version = "0.16.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "scrapinghub"; repo = "extruct"; - rev = "v${version}"; - hash = "sha256-hf6b/tZLggHzgFmZ6aldZIBd17Ni7vCTIIzhNlyjvxw="; + rev = "refs/tags/v${version}"; + hash = "sha256-6lAb17EoR0FKyIOb9hk1jcpmPtZ7vClfuCrDZ83XBeg="; }; nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - - # rdflib-jsonld functionality is part of rdblib from version 6 onwards - pythonRemoveDeps = [ - "rdflib-jsonld" + setuptools ]; propagatedBuildInputs = [ @@ -51,11 +50,20 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "extruct" ]; + pythonImportsCheck = [ + "extruct" + ]; + + disabledTests = [ + # AssertionError: Lists differ + "test_microformat" + "test_umicroformat" + ]; meta = with lib; { description = "Extract embedded metadata from HTML markup"; homepage = "https://github.com/scrapinghub/extruct"; + changelog = "https://github.com/scrapinghub/extruct/blob/v${version}/HISTORY.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ambroisie ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix b/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix index faa7efa650f8..024509dad06b 100644 --- a/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2401"; + version = "1.3.0.post2402"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - hash = "sha256-mNpW9RSli7af0fHLh+cmBrOQaO0wlGOrcLigefMR2ww="; + hash = "sha256-MiFNTz3vrN4rMHK7e4ntE35wzgnPt6yczCv7XDcUlO8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix b/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix index 8b06c83cf5aa..ef1d57e3eb67 100644 --- a/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix +++ b/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix @@ -2,15 +2,17 @@ , fetchPypi , lib -# propagates + # propagates , click , dlib , face-recognition-models , numpy , pillow -# tests + # tests , pytestCheckHook +, config +, cudaSupport ? config.cudaSupport }: buildPythonPackage rec { @@ -18,7 +20,7 @@ buildPythonPackage rec { version = "1.3.0"; format = "setuptools"; - src = fetchPypi { + src = fetchPypi { pname = "face_recognition"; inherit version; hash = "sha256-Xl790WhqpWavDTzBMTsTHksZdleo/9A2aebT+tknBew="; @@ -36,6 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # Disables tests when running with cuda due to https://github.com/NixOS/nixpkgs/issues/225912 + doCheck = !config.cudaSupport; + meta = with lib; { license = licenses.mit; homepage = "https://github.com/ageitgey/face_recognition"; diff --git a/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 7e7624020d5f..ca7a90aa647a 100644 --- a/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -5,21 +5,31 @@ , packaging , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.3.1"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-yWDZPa9+DZh2Bj9IIeIVFpAt9nhQOk2tTZh02difsCs="; + hash = "sha256-pene97VKOX8mZEQgHkOBDu72Dpww2D9nDjA94s5F9rM="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-warn '"pytest-runner",' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ marshmallow packaging @@ -29,11 +39,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner",' "" - ''; - pythonImportsCheck = [ "faraday_agent_parameters_types" "faraday_agent_parameters_types.utils" diff --git a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index e3c96089cefe..c1c5dbac14fe 100644 --- a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -12,14 +12,15 @@ , pythonOlder , pytz , requests +, setuptools , simplejson , tabulate }: buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.15.1"; - format = "setuptools"; + version = "1.16.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,14 +28,18 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-cJ7gFE8zTN+7fp4EY8ZRwjS8i0r+8WaIH/EdY89nZew="; + hash = "sha256-1haWRuWK9WCgdR4geT2w3E95+CapBYDohGowUmnJ2H4="; }; postPatch = '' substituteInPlace setup.py \ - --replace "version=version," "version='${version}'," + --replace-warn "version=version," "version='${version}'," ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 click diff --git a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index 89c1c2ffbe40..74f816d9b8a6 100644 --- a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -38,8 +38,8 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.104.1"; - format = "pyproject"; + version = "0.109.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xTTFBc+fswLYUhKRkWP/eiYSbG3j1E7CASkEtHVNTlk="; + hash = "sha256-iZBc0tYGmhQuOL/pdthhBYYnZhe+wEttoinePNAIgEs="; }; nativeBuildInputs = [ @@ -98,14 +98,9 @@ buildPythonPackage rec { # ignoring deprecation warnings to avoid test failure from # tests/test_tutorial/test_testing/test_tutorial001.py "-W ignore::DeprecationWarning" - - # http code mismatches - "--deselect=tests/test_annotated.py::test_get" ]; disabledTestPaths = [ - # Disabled tests require orjson which requires rust nightly - "tests/test_default_response_class.py" # Don't test docs and examples "docs_src" # databases is incompatible with SQLAlchemy 2.0 @@ -113,30 +108,12 @@ buildPythonPackage rec { "tests/test_tutorial/test_sql_databases" ]; - disabledTests = [ - "test_get_custom_response" - # Failed: DID NOT RAISE <class 'starlette.websockets.WebSocketDisconnect'> - "test_websocket_invalid_data" - "test_websocket_no_credentials" - # TypeError: __init__() missing 1...starlette-releated - "test_head" - "test_options" - "test_trace" - # Unexpected number of warnings caught - "test_warn_duplicate_operation_id" - # assert state["except"] is True - "test_dependency_gets_exception" - # Fixtures drift - "test_openapi_schema_sub" - # 200 != 404 - "test_flask" - ]; - pythonImportsCheck = [ "fastapi" ]; meta = with lib; { + changelog = "https://github.com/tiangolo/fastapi/releases/tag/${version}"; description = "Web framework for building APIs"; homepage = "https://github.com/tiangolo/fastapi"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/find-libpython/default.nix b/nixpkgs/pkgs/development/python-modules/find-libpython/default.nix index 21ce69e071d7..7a26be2b38ed 100644 --- a/nixpkgs/pkgs/development/python-modules/find-libpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/find-libpython/default.nix @@ -1,30 +1,42 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "find-libpython"; - version = "0.3.0"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; - src = fetchPypi { - inherit version; - pname = "find_libpython"; - sha256 = "sha256-bn/l2a9/rW3AZstVFaDpyQpx8f6yuy+OTNu0+DJ26eU="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ktbarrett"; + repo = "find_libpython"; + rev = "refs/tags/v${version}"; + hash = "sha256-DBBAgfYQ4UBFn5Osb1kpVBWbrZVBAvcVGQ/J4rJO/rQ="; }; - disabled = pythonOlder "3.7"; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - pythonImportsCheck = [ "find_libpython" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "find_libpython" + ]; meta = with lib; { description = "Finds the libpython associated with your environment, wherever it may be hiding"; - changelog = "https://github.com/ktbarrett/find_libpython/releases/tag/${version}"; + changelog = "https://github.com/ktbarrett/find_libpython/releases/tag/v${version}"; homepage = "https://github.com/ktbarrett/find_libpython"; license = licenses.mit; maintainers = with maintainers; [ jleightcap ]; diff --git a/nixpkgs/pkgs/development/python-modules/findimports/default.nix b/nixpkgs/pkgs/development/python-modules/findimports/default.nix index ff6c6579d738..b809d7835d96 100644 --- a/nixpkgs/pkgs/development/python-modules/findimports/default.nix +++ b/nixpkgs/pkgs/development/python-modules/findimports/default.nix @@ -3,22 +3,27 @@ , fetchFromGitHub , python , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "findimports"; - version = "2.3.0"; - format = "setuptools"; + version = "2.4.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mgedmin"; - repo = pname; + repo = "findimports"; rev = "refs/tags/${version}"; - hash = "sha256-yA1foeGhgOXZArc/nZfS1tbGyONXJZ9lW+Zcx7hCedM="; + hash = "sha256-ar05DYSc/raYC1RJyLCxDYnd7Zjx20aczywlb6wc67Y="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "findimports" ]; diff --git a/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix b/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix index 00c2efe7e3f3..a4e3be44b06f 100644 --- a/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix @@ -1,21 +1,30 @@ { lib -, fetchFromGitHub , buildPythonPackage +, fetchFromGitHub , normality , pytestCheckHook +, pythonOlder +, setuptools }: + buildPythonPackage rec { pname = "fingerprints"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "alephdata"; repo = "fingerprints"; rev = version; - hash = "sha256-rptBM08dvivfglPvl3PZd9V/7u2SHbJ/BxfVHNGMt3A="; + hash = "sha256-U2UslCy1OagVTtllCKsEBX4zI/qIczbxs2Cxzy+/Xys="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ normality ]; @@ -32,6 +41,6 @@ buildPythonPackage rec { description = "A library to generate entity fingerprints"; homepage = "https://github.com/alephdata/fingerprints"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix index 3a24547016c2..74319971e9a2 100644 --- a/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "23.12.2"; + version = "24.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5l57t7TMtidp6j4tluz8/af5kgPdD8GKY7B7u/toc8I="; + hash = "sha256-9GuHgRCwHD7YP0XdoFip9rWyPtZtVme+c+nHjvBrB8k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flask-api/default.nix b/nixpkgs/pkgs/development/python-modules/flask-api/default.nix index 9b4a398f7f79..e837dc71df37 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-api/default.nix @@ -2,14 +2,23 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch + +# build-system +, setuptools + +# dependencies , flask + +# tests , markdown +, pytestCheckHook }: buildPythonPackage rec { - pname = "Flask-API"; + pname = "flask-api"; version = "3.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -20,9 +29,25 @@ buildPythonPackage rec { hash = "sha256-nHgeI5FLKkDp4uWO+0eaT4YSOMkeQ0wE3ffyJF+WzTM="; }; + patches = [ + (fetchpatch { + # werkzeug 3.0 support + url = "https://github.com/flask-api/flask-api/commit/9c998897f67d8aa959dc3005d7d22f36568b6938.patch"; + hash = "sha256-vaCZ4gVlfQXyeksA44ydkjz2FxODHt3gTTP+ukJwEGY="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ flask + ]; + + nativeCheckInputs = [ markdown + pytestCheckHook ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix b/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix deleted file mode 100644 index c8e14eaf35e3..000000000000 --- a/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, flask -, flask-silk -, future -, pythonOlder -, unittestCheckHook -}: - -buildPythonPackage rec { - pname = "flask-autoindex"; - version = "0.6.6"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "Flask-AutoIndex"; - inherit version; - sha256 = "ea319f7ccadf68ddf98d940002066278c779323644f9944b300066d50e2effc7"; - }; - - propagatedBuildInputs = [ - flask - flask-silk - future - ]; - - nativeCheckInputs = [ - unittestCheckHook - ]; - - pythonImportsCheck = [ - "flask_autoindex" - ]; - - meta = with lib; { - description = "The mod_autoindex for Flask"; - longDescription = '' - Flask-AutoIndex generates an index page for your Flask application automatically. - The result is just like mod_autoindex, but the look is more awesome! - ''; - homepage = "https://flask-autoindex.readthedocs.io/"; - changelog = "https://github.com/general03/flask-autoindex/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = teams.sage.members; - # https://github.com/general03/flask-autoindex/issues/67 - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/flask-basicauth/default.nix b/nixpkgs/pkgs/development/python-modules/flask-basicauth/default.nix deleted file mode 100644 index 97a214744457..000000000000 --- a/nixpkgs/pkgs/development/python-modules/flask-basicauth/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, flask -, python -}: - -buildPythonPackage rec { - pname = "flask-basicauth"; - version = "0.2.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "jpvanhal"; - repo = pname; - rev = "v${version}"; - hash = "sha256-han0OjMI1XmuWKHGVpk+xZB+/+cpV1I+659zOG3hcPY="; - }; - - patches = [ - (fetchpatch { - # The unit tests fail due to an invalid import: - # from flask.ext.basicauth import BasicAuth - # - # This patch replaces it with the correct import: - # from flask_basicauth import BasicAuth - # - # The patch uses the changes from this pull request, - # and therefore can be removed once this pull request - # has been merged: - # https://github.com/jpvanhal/flask-basicauth/pull/29 - name = "fix-test-flask-ext-imports.patch"; - url = "https://github.com/jpvanhal/flask-basicauth/commit/23f57dc1c3d85ea6fc7f468e8d8c6f19348a0a81.patch"; - hash = "sha256-njUYjO0TRe3vr5D0XjIfCNcsFlShbGxtFV/DJerAKDE="; - }) - ]; - - propagatedBuildInputs = [ flask ]; - - checkPhase = '' - runHook preCheck - ${python.interpreter} -m unittest discover - runHook postCheck - ''; - - pythonImportsCheck = [ "flask_basicauth" ]; - - meta = with lib; { - homepage = "https://github.com/jpvanhal/flask-basicauth"; - description = "HTTP basic access authentication for Flask"; - license = licenses.mit; - maintainers = with maintainers; [ wesnel ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix b/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix index 08ff5d808f06..e9b1e3643bdb 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Flask-Caching"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JLYMVS1ZqWBcwbakLFbNs5qCoo2rRTK77bkiKuVOy04="; + hash = "sha256-t1AMFFE1g2qVLj3jqAiB2WVOMnopyFLJJlYH9cRJI1w="; }; postPatch = '' @@ -47,6 +47,7 @@ buildPythonPackage rec { "Memcache" ] ++ lib.optionals stdenv.isDarwin [ # ignore flaky test + "test_cache_timeout_dynamic" "test_cached_view_class" ]; diff --git a/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix b/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix index a52feb8aecbf..1a305f017cee 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix @@ -1,7 +1,15 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch + +# build-system +, setuptools + +# dependencies , flask + +# tests , pytestCheckHook , pygments }: @@ -17,6 +25,14 @@ buildPythonPackage rec { sha256 = "YGZfMcLGEokdto/4Aek+06CIHGyOw0arxk0qmSP1YuE="; }; + patches = [ + (fetchpatch { + # flask 3.0 compat + url = "https://github.com/zzzsochi/Flask-Gravatar/commit/d74d70d9695c464b602c96c2383d391b38ed51ac.patch"; + hash = "sha256-tCKkA2io/jhvrh6RhTeEw4AKnIZc9hsqTf2qItUsdjo="; + }) + ]; + postPatch = '' sed -i setup.py \ -e "s|tests_require=tests_require,||g" \ @@ -28,6 +44,10 @@ buildPythonPackage rec { --replace "--cov=flask_gravatar --cov-report=term-missing" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ flask ]; @@ -37,7 +57,9 @@ buildPythonPackage rec { pygments ]; - pythonImportsCheck = [ "flask_gravatar" ]; + pythonImportsCheck = [ + "flask_gravatar" + ]; meta = with lib; { homepage = "https://github.com/zzzsochi/Flask-Gravatar"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix b/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix index 8f23f51fe979..be74af2d5f9a 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -2,9 +2,9 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, flit-core , flask , marshmallow -, packaging , pytestCheckHook , flask-sqlalchemy , marshmallow-sqlalchemy @@ -12,22 +12,25 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.15.0"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marshmallow-code"; repo = "flask-marshmallow"; rev = "refs/tags/${version}"; - hash = "sha256-N21M/MzcvOaDh5BgbbZtNcpRAULtWGLTMberCfOUoEM="; + hash = "sha256-QoktZcyVJXkHr8fCVYt3ZkYq52nxCsZu+AgaDyrZHWs="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ flask marshmallow - packaging ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix b/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix index 68072b7ddde9..3107d4c7f5bc 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { # conditional so that overrides are easier for web applications patches = lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [ ./werkzeug-2.1.0-compat.patch + ] ++ lib.optionals (lib.versionAtLeast flask.version "3.0.0") [ + ./flask-3.0-compat.patch ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flask-restful/flask-3.0-compat.patch b/nixpkgs/pkgs/development/python-modules/flask-restful/flask-3.0-compat.patch new file mode 100644 index 000000000000..c78105e72282 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/flask-restful/flask-3.0-compat.patch @@ -0,0 +1,24 @@ +diff --git a/tests/test_api.py b/tests/test_api.py +index 582ee5a..20db1f5 100644 +--- a/tests/test_api.py ++++ b/tests/test_api.py +@@ -1,7 +1,7 @@ + import unittest + import json + from flask import Flask, Blueprint, redirect, views, abort as flask_abort +-from flask.signals import got_request_exception, signals_available ++from flask.signals import got_request_exception + try: + from mock import Mock + except: +@@ -491,10 +491,6 @@ class APITestCase(unittest.TestCase): + self.assertEqual(api.default_mediatype, resp.headers['Content-Type']) + + def test_handle_error_signal(self): +- if not signals_available: +- # This test requires the blinker lib to run. +- print("Can't test signals without signal support") +- return + app = Flask(__name__) + api = flask_restful.Api(app) + diff --git a/nixpkgs/pkgs/development/python-modules/flask-session-captcha/default.nix b/nixpkgs/pkgs/development/python-modules/flask-session-captcha/default.nix index a720d2a4b555..8a71b99c1539 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-session-captcha/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-session-captcha/default.nix @@ -1,17 +1,25 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage + +# build-system +, setuptools + +# dependencies +, captcha , flask -, flask-sessionstore +, markupsafe + +# tests , flask-sqlalchemy -, captcha , pytestCheckHook }: buildPythonPackage rec { pname = "flask-session-captcha"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Tethik"; @@ -20,15 +28,36 @@ buildPythonPackage rec { hash = "sha256-V0f3mXCfqwH2l3OtJKOHGdrlKAFxs2ynqXvNve7Amkc="; }; - propagatedBuildInputs = [ flask flask-sessionstore captcha ]; + patches = [ + (fetchpatch { + # https://github.com/Tethik/flask-session-captcha/pull/44 + url = "https://github.com/Tethik/flask-session-captcha/commit/3f79c22a71c60dd60e9df61b550cce641603dcb6.patch"; + hash = "sha256-MXsoSytBNbcg3HU6IWlvf2MgNUL78T5ToxKGv4YMtZw="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; - pythonImportsCheck = [ "flask_session_captcha" ]; + propagatedBuildInputs = [ + captcha + flask + markupsafe + ]; - nativeCheckInputs = [ flask-sqlalchemy pytestCheckHook ]; + pythonImportsCheck = [ + "flask_session_captcha" + ]; # RuntimeError: Working outside of application context. doCheck = false; + nativeCheckInputs = [ + flask-sqlalchemy + pytestCheckHook + ]; + meta = with lib; { description = "A captcha implemention for flask"; homepage = "https://github.com/Tethik/flask-session-captcha"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-sessionstore/default.nix b/nixpkgs/pkgs/development/python-modules/flask-sessionstore/default.nix deleted file mode 100644 index 12f3ff51b425..000000000000 --- a/nixpkgs/pkgs/development/python-modules/flask-sessionstore/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, fetchPypi -, buildPythonPackage -, flask -, nose -}: - -buildPythonPackage rec { - pname = "flask-sessionstore"; - version = "0.4.5"; - format = "setuptools"; - - src = fetchPypi { - pname = "Flask-Sessionstore"; - inherit version; - hash = "sha256-AQ3jWrnw2UI8L3nFEx4AhDwGP4R8Tr7iBMsDS5jLQPQ="; - }; - - propagatedBuildInputs = [ flask ]; - - pythonImportsCheck = [ "flask_sessionstore" ]; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests -s - ''; - - meta = with lib; { - description = "Session Storage Backends for Flask"; - homepage = "https://github.com/mcrowson/flask-sessionstore"; - license = licenses.bsd3; - maintainers = with maintainers; [ Flakebi ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/flask/default.nix b/nixpkgs/pkgs/development/python-modules/flask/default.nix index 154625f6c52a..083cf33c88fd 100644 --- a/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -1,18 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, asgiref +, pythonOlder + +# build-system +, flit-core + +# dependencies , blinker , click -, flit-core , importlib-metadata , itsdangerous , jinja2 -, python-dotenv , werkzeug + +# optional-dependencies +, asgiref +, python-dotenv + +# tests +, greenlet , pytestCheckHook -, pythonOlder - # used in passthru.tests + +# reverse dependencies , flask-limiter , flask-restful , flask-restx @@ -21,12 +31,12 @@ buildPythonPackage rec { pname = "flask"; - version = "2.3.3"; + version = "3.0.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; + hash = "sha256-ZIn1G7Nmbe9vMU4V8Z1QoYaaGa4OjJo2Qf/mbHfUJAM="; }; nativeBuildInputs = [ @@ -39,21 +49,31 @@ buildPythonPackage rec { itsdangerous jinja2 werkzeug - ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; + + passthru.optional-dependencies = { + async = [ + asgiref + ]; + dotenv = [ + python-dotenv + ]; + }; nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ + greenlet + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); passthru.tests = { inherit flask-limiter flask-restful flask-restx moto; }; - passthru.optional-dependencies = { - dotenv = [ python-dotenv ]; - async = [ asgiref ]; - }; meta = with lib; { + changelog = "https://flask.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${replaceStrings [ "." ] [ "-" ] version}"; homepage = "https://flask.palletsprojects.com/"; description = "The Python micro framework for building web applications"; longDescription = '' diff --git a/nixpkgs/pkgs/development/python-modules/flet-core/default.nix b/nixpkgs/pkgs/development/python-modules/flet-core/default.nix index 8c5bde07e016..2b84348f36f5 100644 --- a/nixpkgs/pkgs/development/python-modules/flet-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flet-core/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "flet-core"; - version = "0.18.0"; - format = "pyproject"; + version = "0.19.0"; + pyproject = true; src = fetchPypi { pname = "flet_core"; inherit version; - hash = "sha256-PbAzbDK9DkQBdrym9H3uBvPeeK8Qocq+t8veF+7izOQ="; + hash = "sha256-JRV56SwIhrsJHX/fzQKI0R2o/I+H5xXCXVu7uBiyIP8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flet-runtime/default.nix b/nixpkgs/pkgs/development/python-modules/flet-runtime/default.nix index 21c5934f8c4b..9f2a9a68de3d 100644 --- a/nixpkgs/pkgs/development/python-modules/flet-runtime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flet-runtime/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , poetry-core +, pythonRelaxDepsHook , flet-core , httpx , oauthlib @@ -9,17 +10,22 @@ buildPythonPackage rec { pname = "flet-runtime"; - version = "0.18.0"; - format = "pyproject"; + version = "0.19.0"; + pyproject = true; src = fetchPypi { pname = "flet_runtime"; inherit version; - hash = "sha256-VfPTfCJXpRZsKM4ToFyl7zxbk58HT6eOYthfzAM4f88="; + hash = "sha256-no2oDGZG1svrOZLNAao279qeHwyk5SGibDG4UqpriiU="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "httpx" ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flet/default.nix b/nixpkgs/pkgs/development/python-modules/flet/default.nix index 815d43c18e03..1730e0515ce2 100644 --- a/nixpkgs/pkgs/development/python-modules/flet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flet/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook # build-system , poetry-core @@ -21,16 +22,21 @@ buildPythonPackage rec { pname = "flet"; - version = "0.18.0"; - format = "pyproject"; + version = "0.19.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ix9O4wBq7/gwkV+23B+dnxTYv/VL6w8RmnvbYWcWqmc="; + hash = "sha256-YpML/NIUiL1WYg6zR6l60nJ6KRBfjMOjRbPDdjhR3/Q="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "websockets" ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fontparts/default.nix b/nixpkgs/pkgs/development/python-modules/fontparts/default.nix index e3113b8d1fb4..d543220c4b25 100644 --- a/nixpkgs/pkgs/development/python-modules/fontparts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -1,40 +1,67 @@ -{ lib, buildPythonPackage, fetchPypi, python, pythonOlder -, fonttools, lxml, fs, unicodedata2 -, defcon, fontpens, fontmath, booleanoperations -, pytest, setuptools-scm +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch2 +, pythonOlder + +# build-system +, setuptools +, setuptools-scm + +# dependencies +, fonttools +, defcon +, fontmath +, booleanoperations + +# tests +, python }: buildPythonPackage rec { - pname = "fontParts"; - version = "0.11.0"; + pname = "fontparts"; + version = "0.12.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-He3BAIWxwDIM80ixmYjyAHlwDK9bBe/qS8P4+TVEkEg="; + pname = "fontParts"; + inherit version; + hash = "sha256-eeU13S1IcC+bsiK3YDlT4rVDeXDGcxx1wY/is8t5pCA="; extension = "zip"; }; - nativeBuildInputs = [ setuptools-scm ]; + patches = [ + (fetchpatch2 { + # replace remaining usage of assertEquals for Python 3.12 support + # https://github.com/robotools/fontParts/pull/720 + url = "https://github.com/robotools/fontParts/commit/d7484cd98051aa1588683136da0bb99eac31523b.patch"; + hash = "sha256-maoUgbmXY/RC4TUZI4triA9OIfB4T98qjUaQ94uhsbg="; + }) + ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; propagatedBuildInputs = [ booleanoperations - fonttools - unicodedata2 # fonttools[unicode] extra - lxml # fonttools[lxml] extra - fs # fonttools[ufo] extra defcon - fontpens # defcon[pens] extra fontmath - ]; + fonttools + ] + ++ defcon.optional-dependencies.pens + ++ fonttools.optional-dependencies.ufo + ++ fonttools.optional-dependencies.lxml + ++ fonttools.optional-dependencies.unicode; checkPhase = '' runHook preCheck ${python.interpreter} Lib/fontParts/fontshell/test.py runHook postCheck ''; - nativeCheckInputs = [ pytest ]; meta = with lib; { description = "An API for interacting with the parts of fonts during the font development process."; diff --git a/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index db66e46f3d9d..e07ab3c0d953 100644 --- a/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.concatLists (lib.attrVals ([ "woff" - "interpolatable" + # "interpolatable" is not included because it only contains 2 tests at the time of writing but adds 270 extra dependencies "ufo" ] ++ lib.optionals (!skia-pathops.meta.broken) [ "pathops" # broken diff --git a/nixpkgs/pkgs/development/python-modules/fpdf2/default.nix b/nixpkgs/pkgs/development/python-modules/fpdf2/default.nix index dd24dc35972e..292478ea2557 100644 --- a/nixpkgs/pkgs/development/python-modules/fpdf2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fpdf2/default.nix @@ -12,23 +12,24 @@ , qrcode , camelot , uharfbuzz +, lxml }: buildPythonPackage rec { pname = "fpdf2"; - version = "2.7.6"; + version = "2.7.7"; pyproject = true; src = fetchFromGitHub { owner = "py-pdf"; repo = "fpdf2"; rev = version; - hash = "sha256-wiCKmS+GlrYV2/6TEdXUbmWIMWU4hyzswFJZR9EOWxc="; + hash = "sha256-6B68kwxAW3cHpwMTDhj3C4zEOR6o6USqpSXB7uxcEXs="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=fpdf --cov-report=xml" "" + --replace-fail "--cov=fpdf --cov-report=xml" "" ''; nativeBuildInputs = [ setuptools ]; @@ -44,6 +45,7 @@ buildPythonPackage rec { qrcode camelot uharfbuzz + lxml ]; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/development/python-modules/fpylll/default.nix b/nixpkgs/pkgs/development/python-modules/fpylll/default.nix index 2de77cfbd69d..97abc4562fe6 100644 --- a/nixpkgs/pkgs/development/python-modules/fpylll/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fpylll/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fpylll"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; rev = "refs/tags/${version}"; - hash = "sha256-EyReCkVRb3CgzIRal5H13OX/UdwWi+evDe7PoS1qP4A="; + hash = "sha256-M3ZnDL0Ui3UAa5Jn/Wr5pAHhghP7EAaQD/sx5QZ58ZQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix b/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix index 1519347b8ba2..d8ddff87463b 100644 --- a/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix +++ b/nixpkgs/pkgs/development/python-modules/frigidaire/default.nix @@ -6,28 +6,33 @@ , idna , pythonOlder , requests +, setuptools , urllib3 }: buildPythonPackage rec { pname = "frigidaire"; - version = "0.18.13"; - format = "setuptools"; + version = "0.18.15"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bm1549"; - repo = pname; + repo = "frigidaire"; rev = "refs/tags/${version}"; - hash = "sha256-FikBV4KjutQfupGPXcVT1h+BfQ099WRrmbrEJOaVCQI="; + hash = "sha256-5+epdQyeTGJp8iTrX6vyp4JgM45Fl5cb67Z8trNBe+8="; }; postPatch = '' substituteInPlace setup.py \ - --replace 'version = "SNAPSHOT"' 'version = "${version}"' + --replace-warn 'version = "SNAPSHOT"' 'version = "${version}"' ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ certifi chardet diff --git a/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix b/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix index 87f075460caf..8bcb486a6311 100644 --- a/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "fuse-python"; - version = "1.0.5"; + version = "1.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-dOX/szaCu6mlrypaBI9Ht+e0ZOv4QpG/WiWL+60Do6o="; + hash = "sha256-MhiAY2UkCM1HKuu2+S0135LIu0IAk3H4yJJ7s35r3Rs="; }; buildInputs = [ fuse ]; diff --git a/nixpkgs/pkgs/development/python-modules/galois/default.nix b/nixpkgs/pkgs/development/python-modules/galois/default.nix index cfb4ac57d563..8c927b96019f 100644 --- a/nixpkgs/pkgs/development/python-modules/galois/default.nix +++ b/nixpkgs/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.7"; + version = "0.3.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-dWYnD+Byh0orRg20/nhu8ILooFBeHysxQ403boDVqYk="; + hash = "sha256-Nfr9gD2FLZ+KvHh1mcpReUWnzFr/NxpvperzZPoFeT4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix b/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix index 43604aa29333..42363ecdcdd4 100644 --- a/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.12"; + version = "0.2.13"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-uq3biWZvcORvrAMd/Ix0Cj1ol5fiqdDsO54zD82G2vA="; + hash = "sha256-9At9v+7jOt43qPOhZpFYBEXA2zUfp8MAGO4/676kcBU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix b/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix index 9b66fc47bd64..3cbc255ec7a0 100644 --- a/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix @@ -7,22 +7,27 @@ , lxml , pythonOlder , requests +, setuptools , slixmpp , websockets }: buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.26"; - format = "setuptools"; + version = "0.5.27"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eIpBVfkUIQBriZ4wxp8ii5YmuuKF8r0lNauBEEqoNV8="; + hash = "sha256-H76y784lYzETgq5XSsQOSGka/kvM+hyMHzUHEJuXTuk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp bidict diff --git a/nixpkgs/pkgs/development/python-modules/gentools/default.nix b/nixpkgs/pkgs/development/python-modules/gentools/default.nix index e4760c3fe958..7dd95925f4ba 100644 --- a/nixpkgs/pkgs/development/python-modules/gentools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gentools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "gentools"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "gentools"; rev = "refs/tags/v${version}"; - hash = "sha256-RBUIji3FOIRjfp4t7zBAVSeiWaYufz4ID8nTWmhDkf8="; + hash = "sha256-+6KTFxOpwvGOCqy6JU87gOZmDa6MvjR10qES5wIfrjI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index 39904aec9363..bb4eb7ca664e 100644 --- a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.14.3"; + version = "0.14.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; rev = "refs/tags/${version}"; - hash = "sha256-L3/gLbiEF2VEqyhfVPnREMUPFbf9cD3tqGJ+AbThPkQ="; + hash = "sha256-zMd/hHobFBPre0bZA1e2S9gPWnIkeImZhSySlIDxYsg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/geometric/default.nix b/nixpkgs/pkgs/development/python-modules/geometric/default.nix index 0693e209b457..3178b959475a 100644 --- a/nixpkgs/pkgs/development/python-modules/geometric/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geometric/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "geometric"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; src = fetchFromGitHub { owner = "leeping"; repo = "geomeTRIC"; - rev = version; - hash = "sha256-3d4z1n8+e0HgdeKLNSsHLb3XHOk09uy+gP9AwNvNITE="; + rev = "refs/tags/${version}"; + hash = "sha256-DmrKLVQrPQDzTMxqEImnvRr3Wb2R3+hxtDVCN9XUcFM="; }; patches = [ (fetchpatch { diff --git a/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index 92aa4631c4bb..522e0f6e59e3 100644 --- a/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.14.2"; + version = "0.14.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-E4J6VBKPwyQ4IVVClLzNoI//oxlymY+KE6ALaENWwOg="; + hash = "sha256-qAINoqnCVfpg2mQhnu0qT/5EjUB+9a3//H8vJJnyj6A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/georss-client/default.nix b/nixpkgs/pkgs/development/python-modules/georss-client/default.nix index d6529cbf9fec..51d895456da3 100644 --- a/nixpkgs/pkgs/development/python-modules/georss-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/georss-client/default.nix @@ -6,23 +6,28 @@ , pytestCheckHook , pythonOlder , requests +, setuptools , xmltodict }: buildPythonPackage rec { pname = "georss-client"; - version = "0.15"; - format = "setuptools"; + version = "0.17"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; - rev = "v${version}"; - hash = "sha256-D1ggfEDU+vlFmi1USwdHj1due0PrCQCpKF4zaarHCFs="; + rev = "refs/tags/v${version}"; + hash = "sha256-DvQifO/jirpacWZccK4WPxnm/iYs1qT5nAYQUDoleO4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ haversine xmltodict @@ -41,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing GeoRSS feeds"; homepage = "https://github.com/exxamalte/python-georss-client"; + changelog = "https://github.com/exxamalte/python-georss-client/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix b/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix index 73cafe77bb90..b3679a93a2fd 100644 --- a/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "georss-generic-client"; - version = "0.7"; + version = "0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-georss-generic-client"; rev = "v${version}"; - hash = "sha256-58NpACrJK29NUnx3RrsLFPPo+6A/JlIlkrv8N9juMu0="; + hash = "sha256-Y19zMHL6DjAqiDi47Lmst8m9d9kEtTgyRiECKo6CqZY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix index 273b67acfb7c..e74f3670f223 100644 --- a/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix @@ -4,22 +4,27 @@ , georss-client , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "georss-ingv-centro-nazionale-terremoti-client"; - version = "0.6"; - format = "setuptools"; + version = "0.7"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ingv-centro-nazionale-terremoti-client"; - rev = "v${version}"; - hash = "sha256-zqjo70NzpUt5zNEar0P1sl/gMb+ZcS+7GX7QGuFjMYY="; + rev = "refs/tags/v${version}"; + hash = "sha256-J72yd1D4mKCOsBRLMUXKnxmjr6g0IQApTTrWjklczN8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ georss-client ]; @@ -35,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing the INGV Centro Nazionale Terremoti GeoRSS feed"; homepage = "https://github.com/exxamalte/python-georss-ingv-centro-nazionale-terremoti-client"; + changelog = "https://github.com/exxamalte/python-georss-ingv-centro-nazionale-terremoti-client/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix b/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix index 1279be5e9d3f..8af128e895a0 100644 --- a/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,20 +1,31 @@ -{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll -, python, util-linux, pygit2, gitMinimal, git-annex, cacert +{ lib +, buildPythonPackage +, cacert +, fetchFromGitHub +, fetchpatch +, git-annex +, gitMinimal +, pygit2 +, pytestCheckHook +, python +, pythonOlder +, setuptools +, substituteAll +, util-linux }: buildPythonPackage rec { pname = "git-annex-adapter"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; - # No tests in PyPI tarball src = fetchFromGitHub { owner = "alpernebbi"; - repo = pname; - rev = "v${version}"; - sha256 = "0666vqspgnvmfs6j3kifwyxr6zmxjs0wlwis7br4zcq0gk32zgdx"; + repo = "git-annex-adapter"; + rev = "refs/tags/v${version}"; + hash = "sha256-vb0vxnwAs0/yOjpyyoGWvX6Tu+cuziGNdnXbdzXexhg="; }; patches = [ @@ -37,17 +48,31 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pygit2 + cacert + ]; + nativeCheckInputs = [ gitMinimal util-linux # `rev` is needed in tests/test_process.py + pytestCheckHook ]; - propagatedBuildInputs = [ pygit2 cacert ]; + pythonImportsCheck = [ + "git_annex_adapter" + ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; - pythonImportsCheck = [ "git_annex_adapter" ]; + disabledTests = [ + # KeyError and AssertionError + "test_jsonprocess_annex_metadata_batch" + "test_process_annex_metadata_batch" + "test_batchjson_metadata" + ]; meta = with lib; { homepage = "https://github.com/alpernebbi/git-annex-adapter"; diff --git a/nixpkgs/pkgs/development/python-modules/githubkit/default.nix b/nixpkgs/pkgs/development/python-modules/githubkit/default.nix index 85509528bf35..50ec8128885c 100644 --- a/nixpkgs/pkgs/development/python-modules/githubkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/githubkit/default.nix @@ -1,37 +1,95 @@ { lib +, anyio , buildPythonPackage -, fetchPypi -, poetry-core +, fetchFromGitHub +, hishel , httpx +, poetry-core , pydantic +, pyjwt +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , typing-extensions }: buildPythonPackage rec { pname = "githubkit"; - version = "0.10.7"; + version = "0.11.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-sKikL+761mBP7j+qugHKDQ0hVXT51FV8FYbB3ZJtweA="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "yanyongyu"; + repo = "githubkit"; + rev = "refs/tags/v${version}"; + hash = "sha256-nPXs6thXAshDojgHSNyEeBN/jNJkfFECSuY5f51Zozo="; }; + pythonRelaxDeps = [ + "hishel" + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=githubkit --cov-append --cov-report=term-missing" "" + ''; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ + hishel httpx pydantic typing-extensions ]; - pythonImportsCheck = [ "githubkit" ]; + passthru.optional-dependencies = { + all = [ + anyio + pyjwt + ]; + jwt = [ + pyjwt + ]; + auth-app = [ + pyjwt + ]; + auth-oauth-device = [ + anyio + ]; + auth = [ + anyio + pyjwt + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "githubkit" + ]; + + disabledTests = [ + # Tests require network access + "test_graphql" + "test_async_graphql" + "test_call" + "test_async_call" + "test_versioned_call" + "test_versioned_async_call" + ]; meta = { description = "GitHub SDK for Python"; homepage = "https://github.com/yanyongyu/githubkit"; + changelog = "https://github.com/yanyongyu/githubkit/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kranzes ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix b/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix index 7f3b41b5899e..50239a9b2653 100644 --- a/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , unittestCheckHook }: buildPythonPackage rec { pname = "gitignore-parser"; - version = "0.1.10"; - format = "setuptools"; + version = "0.1.11"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "mherrmann"; repo = "gitignore_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-uILXtozXRTOJeVpF1lpM19xaibebiwIMyHzdrlnfoec="; + hash = "sha256-y8A8OLgJccYWvKTJs7um8RwFFM0CswbwRojknBmk3TY="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/gitlike-commands/default.nix b/nixpkgs/pkgs/development/python-modules/gitlike-commands/default.nix index f51adf2a184a..c5e8ab506696 100644 --- a/nixpkgs/pkgs/development/python-modules/gitlike-commands/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gitlike-commands/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "gitlike-commands"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "unixorn"; repo = "gitlike-commands"; rev = "refs/tags/v${version}"; - hash = "sha256-VjweN4gigzCNvg6TccZx2Xw1p7SusKplxUTZjItTQc0="; + hash = "sha256-Z0l8nCKov1iMJvI3YTHvg0ey+oPju3rgaKtmk6OX44g="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix b/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix index d85a0771a809..380ada5d33a6 100644 --- a/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "10.0.3"; + version = "11.0.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-1XNZYp0pX57lcAaKKEaWaJLj/ttyIlnsvNjMN20pm1E="; + hash = "sha256-eeUjtRsP3c6fbGMJ+oxkMou3BrLWyEelP4ipPQFpXkM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/glfw/default.nix b/nixpkgs/pkgs/development/python-modules/glfw/default.nix index 31d6c0a275d8..667206fa58ea 100644 --- a/nixpkgs/pkgs/development/python-modules/glfw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glfw/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.6.4"; + version = "2.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - hash = "sha256-ANydW+4uLIJelUdDCHZ6WJgIJHNXzdc9jK/nZbZHi+I="; + hash = "sha256-mh2l63Nt9YMCPM3AplKWPx5HQZi2/cm+dUS56JB8fGA="; }; # Patch path to GLFW shared object diff --git a/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix b/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix index 7d2ec762f813..a1c5cff80dda 100644 --- a/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gocardless-pro"; - version = "1.50.0"; + version = "1.51.0"; format = "setuptools"; src = fetchFromGitHub { owner = "gocardless"; repo = "gocardless-pro-python"; rev = "refs/tags/v${version}"; - hash = "sha256-eYuXHqJyThXKKGubCn8aoBZZ7lyXtpzlomaLNus+oJQ="; + hash = "sha256-4pyVcyEa8iex7ngTibxWYu4HeW+6V5OASkxqjHIOe2Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/nixpkgs/pkgs/development/python-modules/goodwe/default.nix index 19ce3a18cf83..0acb958de47a 100644 --- a/nixpkgs/pkgs/development/python-modules/goodwe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.33"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-D2NR31aIl6A3ij8sKOIHPOj3HFQKGwpk6RjA+MB3mMk="; + hash = "sha256-5wUGbXAmpdHHgM3HLCKPauIkbp4GDqky3I5T2hN3Pvk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index ac6dfc171933..a94b33e9b444 100644 --- a/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.4.0"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yBmQZsCPdMTpEpB3gym7nzV7oepdb4LeK8DRBVK/T4w="; + hash = "sha256-njzyaFPXTRvZmWfB0uYufMNqhTBBN7fkKtS7bUyA8ME="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index a7a92d057a73..2754c32c3c97 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.4.0"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/nT0GNCwHr6+g64hKr8FGtQmkqY2Z345fePUWeANe2Q="; + hash = "sha256-mQXHwww8K77dCxMuKycfyCRzM+vJMdLSOvG7vRG0Nf4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 38210fe9990b..71075ad7f60d 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.10.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JrW6lkaRiVsisuOCHLNTxh6LF44PO/RhRfTkORDSIt4="; + hash = "sha256-EjwBVYq7V39ab/VQEmysfiuwEbMkjCXq5o+jM31NrwI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index ddc78dc7cc57..ab2ae150eb3d 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.22.0"; + version = "3.24.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-S+rJ80pkphkPlNFUn8e0bxpnkBILRS9Uvoa0vlfrK8M="; + hash = "sha256-aNTCDqj/0/qm4gwZrIKrn2yhgKshv1XwGlHd4zhzMgI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index bf293c41541d..c975700ce1ef 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.13.0"; + version = "3.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-J6hFyyJgWlEsBc4owokNLvl61O38mBevVVpz2AJOw7o="; + hash = "sha256-DZDp/aRhIe2bBcn8BVA8jwmDaUrbHAMMRG0LixuvGl0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index ea4750d69755..85e60259a6c5 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4pl7cT8bLy0y3ntYt1qO027KF7yokHun5lGZHWnBkUw="; + hash = "sha256-HryKL26J6H2xW/EEPVceWd0ZATP7QAuolU77sw3QrWM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index cbda1f2f254e..d6952abe84f0 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.23.0"; + version = "2.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hJbG0wV177IkwYlAVm+awAbTsSCudZACkYaXw0B5l+Y="; + hash = "sha256-tK9bmqzYOWuEB9G4d2AaN22O6m0ZKCOop4gb0v3Ads4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 5eeb88cd9d0f..b59372f294a0 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.13.0"; + version = "3.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eUzPyTzLDgrWiUQviW+cgt5W2g/hihlVMbs3CWwmV9Y="; + hash = "sha256-CuB7kNUFK6OilqIhCiFEwoRpMA1x9vRViB+Uwt9UMFc="; }; propagatedBuildInputs = [ @@ -127,8 +127,6 @@ buildPythonPackage rec { ]; meta = with lib; { - # Not compatible with pyarrow13 yet. - broken = true; description = "Google BigQuery API client library"; homepage = "https://github.com/googleapis/python-bigquery"; changelog = "https://github.com/googleapis/python-bigquery/blob/v${version}/CHANGELOG.md"; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 4d55bc739a23..014d68c19168 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.37.0"; + version = "2.40.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kHWB2/iCAXFlHnifL+aPaU0i3xmgf1rOSsk8JhCx1Dk="; + hash = "sha256-4yTrV0OtvCmd9+5rNaTOJBAS/s52hyjwA7O1/lLyFtE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 24eb50c01e60..018eb4a26cb4 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.17.2"; + version = "3.18.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kKRuakMZfmt2HrU7g4Ap1ZxFmYYSiRNKvRB/xHkyp1U="; + hash = "sha256-xjf6yWXgfJFEHw1lYSryfe86UMsM1Y4fGRffDTne20U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 3b0fff422ce1..b481bff3f750 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.8.0"; + version = "5.9.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sDQS3WPLhNwLsIRM2emp7vQOHQ1xlkllkFLMzw0+ldc="; + hash = "sha256-qDc6E6d6hIHgRBNDGUHaJ7ROP24xDUXK1rkXTX187g0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 63060d008efd..9fecd41cec58 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.18.0"; + version = "2.19.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Bswdf7dcXlC1S8wASUHqSyCnqfCe1+bnU1FP2MQ2CWo="; + hash = "sha256-P4vdD1zCDzDn0ydEXCw2C/aEFnJYR13knOM91eDFcZw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index 3ea7d25e9d54..7d67e77c4c97 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -7,20 +7,25 @@ , pytestCheckHook , pytest-asyncio , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.16.0"; - format = "setuptools"; + version = "1.17.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1wXyDI1/NMqMwgqYZb3/pLExyi1Wo7st8R/mNwMte44="; + hash = "sha256-0DXo2h2gqO1z5quUyWI1Qb/CNaqyy1SNinyaPyRWuR0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus @@ -45,8 +50,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud OS Config API client library"; - homepage = "https://github.com/googleapis/python-os-config"; - changelog = "https://github.com/googleapis/python-os-config/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-os-config"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-os-config-v${version}/packages/google-cloud-os-config/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index f2288f8638c1..47e0373d65df 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.19.0"; + version = "2.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-apjDP361994q5S76BZsrX3WyzNnw8R8u3O/dqNFOQlw="; + hash = "sha256-wQ2V66+QP5I7FKqOxbfICRYTjt8pnGWhwalDH9VmXSU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index 228545f62da4..351acb618101 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -7,20 +7,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.14.0"; - format = "setuptools"; + version = "2.15.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TzuRWGGdQrsmOLidvLiC80e9t9VVu8LUNhq2Ikk0Pco="; + hash = "sha256-RTDYMmkRjkP5VhN74Adlvm/vpqXd9lnu3ckjmItIi+Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 50f605f5fc99..56f4b5018ebe 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.10.4"; - format = "setuptools"; + version = "1.12.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RWsl3do9TNJ0iKcnNrvDrwTXE64v42VcAbZqM50o1nk="; + hash = "sha256-JbMRLJhO9qJWnKcEcWCyNBxSjHDh0uct65loaqLhZ90="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core google-cloud-core @@ -48,8 +53,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Resource Manager API client library"; - homepage = "https://github.com/googleapis/python-resource-manager"; - changelog = "https://github.com/googleapis/python-resource-manager/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-resource-manager"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v${version}/packages/google-cloud-resource-manager/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 781218fa7a20..915f00961bca 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.33.3"; + version = "0.34.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4sv5wua03gLd9YqwdD8P/VaKv4LcacB42fK5hUAt2vQ="; + hash = "sha256-hyxvTChxCGC6YjjvYGqaJDvgBbve7EjzfPELl+LB2D8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 5bb5940f55a4..6901c9dc3107 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.16.4"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Nx3HL5FFrzI+ioE8jlA4DmrEvWpdvNQtzzFi2PN+UIA="; + hash = "sha256-Tkmb0z/3rv8nG9Z0h+IdVAQpeobcSHPuhh1jewGzC04="; }; propagatedBuildInputs = [ @@ -42,8 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Secret Manager API API client library"; - homepage = "https://github.com/googleapis/python-secret-manager"; - changelog = "https://github.com/googleapis/python-secret-manager/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-secret-manager"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-secret-manager-v${version}/packages/google-cloud-secret-manager/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ siriobalmelli ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 291760011587..1e0c86b61a73 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -8,20 +8,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.25.0"; - format = "setuptools"; + version = "1.26.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SofrNcO5Rir8iQfwjADlUJnGmf1y1xkBG8r6gBVxva4="; + hash = "sha256-oZWY7n/8638/WkIG9s/9LN4NKWSfhnrQp+9Pydq103E="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index ab352fa62569..69cc1914c5ab 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -6,6 +6,7 @@ , google-cloud-core , google-cloud-testutils , grpc-google-iam-v1 +, grpc-interceptor , libcst , mock , proto-plus @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.41.0"; + version = "3.42.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jK2hHdYdxwsEmk/aDp7ArXZwZbhEloqIuLJ2ZwMs9YI="; + hash = "sha256-E7arqGBZ/QPzbAMsQUMnTWiD054tMr91PgrT0tzQjhI="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { google-api-core google-cloud-core grpc-google-iam-v1 + grpc-interceptor proto-plus protobuf sqlparse diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 8fa7bc16d6ce..a4f2ab9ae4b3 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.23.0"; + version = "2.24.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-H4aDIHCF3cpsXgZIly+KBik30w5zqlVSDwgPSVMse/8="; + hash = "sha256-Z7x4xfCbeRPoCbinCrTwIAp9JIvfavFvA1c4/a5UbHQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index c5762819af6a..bc6cf42b27c7 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.15.0"; - format = "setuptools"; + version = "2.16.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SpmTjbARHVU3hkG1I1uY5r12S8jip+JN9wb4uGO98nw="; + hash = "sha256-oybkbzeqE4sW6RN5P7AFJV3rahTCykwJndQ8uAmhiCE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 7d89107c0d35..f65f1de88806 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.15.1"; + version = "2.16.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-R4ReOtnO/auvNYlHyxlt3eovqkzfyvhkoBHbghpN6vs="; + hash = "sha256-8Mgf83pd3FFokpnb1g8DDthVBBY+hvBMmjdf2fpQswQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index 98a62651013c..bca3d89819f0 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.12.0"; - format = "setuptools"; + version = "1.13.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IvbMxHbOMQHUH7q86sP+/N/gV9KWez6OIMAmcTY6Uko="; + hash = "sha256-KJpHnWbmrFVcixfvKQ/nvDWLy4Sn1lVDVsjkS/2+p5w="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index ef0a5971ebbb..e8ac6fa628f5 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.12.0"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SwGUkyzSYEGZuIBbwQhpLmoqJZ9Hd1FrnLyXi4hx4pU="; + hash = "sha256-ODRF08xxjUrj6PMzfTlcYLqGrgV71OA0VHT44ktQZ4k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index 7d998aea6f55..071543ae3caf 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dwO/R8iyEIYw0qJ15X9DJuPAceZmISrZorPVqAkMZ2c="; + hash = "sha256-uaaL/CbR4RM4YFU0xd/naGn3xSiLuRqI0/qyZNLKJ3Q="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index d4c285c3f34e..1f9b27f06f28 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -8,20 +8,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.13.0"; - format = "setuptools"; + version = "1.14.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vktbTjzNYMa8otEGGq36fYOKcNuNasWql4SBWbk84Iw="; + hash = "sha256-+RupyR6W5fYR1n28anASGIXI6J53CU4WG1QC+HIZi/Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix b/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix index 6b5b23c6a8a8..5499af7a1f95 100644 --- a/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix @@ -12,18 +12,23 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.27.3"; - format = "pyproject"; + version = "0.31.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "govee-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-yMKZe2hEkBm9c/5QuFNQMVPsdHTx9lnEVysRlbntiVY="; + hash = "sha256-g4tOu4nrJx1DVk2KLfF6HIEM7vTkfBg2fd7R1j+Xwrk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=govee_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -39,11 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=govee_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "govee_ble" ]; diff --git a/nixpkgs/pkgs/development/python-modules/gpaw/default.nix b/nixpkgs/pkgs/development/python-modules/gpaw/default.nix index e415c192511c..be43eb55857d 100644 --- a/nixpkgs/pkgs/development/python-modules/gpaw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gpaw/default.nix @@ -74,14 +74,14 @@ let in buildPythonPackage rec { pname = "gpaw"; - version = "23.9.1"; + version = "24.1.0"; format = "setuptools"; src = fetchFromGitLab { owner = "gpaw"; repo = pname; rev = version; - hash = "sha256-9nnK4ksTFATO6HexnxfMiih/yoY/noyJZXZOaDG/2kc="; + hash = "sha256-8eX50F124R46dGN2rJS/dDvPeDmEm7XpVyTiOAjMKyI="; }; # `inetutils` is required because importing `gpaw`, as part of diff --git a/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix b/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix index d2bbfecefdc3..f1758be6a76f 100644 --- a/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "gradio-pdf"; - version = "0.0.3"; + version = "0.0.4"; format = "pyproject"; src = fetchPypi { pname = "gradio_pdf"; inherit version; - hash = "sha256-l9bcH/6paEdKk9Q7HM3ap9MI1Qi7rPZ/ucAibBUEPKI="; + hash = "sha256-lyZd8tH3SaTmE/7ooNaQJUYZRvjSOLx3+doWTCTXk9U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 74efbd0eb6d7..d3e9ca2ae7f4 100644 --- a/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.39.0"; + version = "0.40.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mVIGT7kb8+eQcTAF7/S+0KraQiDzS9VdyrBsxzqpBHI="; + hash = "sha256-DaLxGEwR2Z9IEkKbLkOy7Q3dvvmwTNBNMzYxNoeZMJE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix b/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix index a940aa17de74..0cac6c05106f 100644 --- a/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , poetry-core , grpcio @@ -12,8 +11,8 @@ buildPythonPackage rec { pname = "grpc-interceptor"; - version = "0.15.3"; - format = "pyproject"; + version = "0.15.4"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,18 +20,9 @@ buildPythonPackage rec { owner = "d5h-foss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tTi1X1r7584ZXa12eLp2G/Am8G6Dnd18eE5wF/Lp/EY="; + hash = "sha256-GJkVCslPXShJNDrqhFtCsAK5+VaG8qFJo0RQTsiMIFY="; }; - patches = [ - # https://github.com/d5h-foss/grpc-interceptor/pull/44 - (fetchpatch { - name = "replace-poetry-with-poetry-core.patch"; - url = "https://github.com/d5h-foss/grpc-interceptor/commit/916cb394acd8dd7abb4f5edcb4e88aee961a32d0.patch"; - hash = "sha256-W2SF2zyjusTxgvCxBDLpisD03bofzDug1eyd4FLJmKs="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix index 4c66dcc99031..522bf49fafd9 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.60.0"; + version = "1.60.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-TRTHMDUm50cmFJ0BX1zwd34xCVsuyejqp7hHc33LYKA="; + hash = "sha256-eAYWHTlyThrJ9vTumXPDeEcyk5OC8tfI12K073heF6A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix index 573670a98c30..7873404d6514 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.60.0"; + version = "1.60.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-R4tTAHeBIP7Z9tE01ysVeln5wGaJeJIYy/9H+vyi8Rk="; + hash = "sha256-fC5Izp1b2xmtV7er40ONR+verVB4ZpORQHILPijGJbM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix index dc4fb436fbb4..713fec8af4cd 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.60.0"; + version = "1.60.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-P2wMc7qPINFCDF5y/E3QOJ+sNG7Y+zKijm4ZZ7RP/zU="; + hash = "sha256-v+1JYUE4IcEbTfECyesFWsjENUYm2dyxEKJz79TPfZg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix index a6aaa9e28d5f..fa3f65ebc924 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.60.0"; + version = "1.60.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8Q4LbbOtwP3CRLcZYoFO6YKZbvBhhkRrVpW5+mNaoas="; + hash = "sha256-YbWquJiUmOiqFCwguIgp6l2Q0YwYyFO5+ebUB9N7+LQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix index 1d0f47a5c9e1..2fc0e47dd29c 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.60.0"; + version = "1.60.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XF+za8O9x4m/8ewEBQG5reoPiK64vh7VyA1oic0Jq0A="; + hash = "sha256-vvrZX0fes/OTTr1VEpl0jqo/Y+44btlq1pemZFNWixc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index 2ab692a2c715..0437e16a8923 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.60.0"; + version = "1.60.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7TBJk0AijXM/9p/PSmZZDteSH5TrWiv2kiWLEoC52sc="; + hash = "sha256-2ggiSrhnXG1GS5iL2MoCzM0r8Cdbzu/o9iGb/UpPXoU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio/default.nix index 77be060cfd2d..497a4d725e50 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "grpcio"; format = "setuptools"; - version = "1.60.0"; + version = "1.60.1"; src = fetchPypi { inherit pname version; - hash = "sha256-IZkWWhr/tmaqJK3wyXQ2aG0KYbxfwRPAN3Aft8f865Y="; + hash = "sha256-3R06jR0uUK2bWeEKp/B8fRvis2fz8tM8X63pbtVGCWI="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix b/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix index 26a7223b97e7..bca9611b7e21 100644 --- a/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { postPatch = '' patchShebangs bin/* substituteInPlace bin/speak-ipa \ - --replace '${"\${src_dir}:"}' "$out/lib/${python.libPrefix}/site-packages:" \ + --replace '${"\${src_dir}:"}' "$out/${python.sitePackages}:" \ --replace "do espeak" "do ${espeak}/bin/espeak" ''; diff --git a/nixpkgs/pkgs/development/python-modules/gsd/default.nix b/nixpkgs/pkgs/development/python-modules/gsd/default.nix index 3040102f8773..54062ec39f14 100644 --- a/nixpkgs/pkgs/development/python-modules/gsd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gsd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "3.2.0"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ceoHHEX44DrVgatV2EIS6gT9oVZkAx6OTFMZG/x4q64="; + hash = "sha256-huMM98An/DG8PIVblS3b6AxF6vJ5IoKOs1f9kBnR3ik="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix deleted file mode 100644 index 6d6accc642a8..000000000000 --- a/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, fetchFromGitHub, makeWrapper -, glibcLocales, gobject-introspection, gtk3, libsoup, libsecret -, buildPythonPackage, python -, pygobject3, freezegun, mock -}: - -buildPythonPackage rec { - pname = "gtimelog"; - version = "unstable-2020-05-16"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "80682ddbf9e0d68b8c67257289784f3b49b543d8"; - sha256 = "0qv2kv7vc3qqlzxsisgg31cmrkkqgnmxspbj10c5fhdmwzzwi0i9"; - }; - - nativeBuildInputs = [ makeWrapper gobject-introspection ]; - buildInputs = [ - glibcLocales gtk3 libsoup libsecret - ]; - - propagatedBuildInputs = [ - pygobject3 freezegun mock - ]; - - checkPhase = '' - substituteInPlace runtests --replace "/usr/bin/env python3" "${python.interpreter}" - ./runtests - ''; - - pythonImportsCheck = [ "gtimelog" ]; - - preFixup = '' - wrapProgram $out/bin/gtimelog \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${gtk3.out}/lib" \ - ''; - - meta = with lib; { - description = "A time tracking app"; - longDescription = '' - GTimeLog is a small time tracking application for GNOME. - It's main goal is to be as unintrusive as possible. - - To run gtimelog successfully on a system that does not have full GNOME 3 - installed, the following NixOS options should be set: - - programs.dconf.enable = true; - - services.gnome.gnome-keyring.enable = true; - - In addition, the following packages should be added to the environment: - - gnome.adwaita-icon-theme - - gnome.dconf - ''; - homepage = "https://gtimelog.org/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ oxzi ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/gtts/default.nix b/nixpkgs/pkgs/development/python-modules/gtts/default.nix index 8ae5eb470280..0b08a400888f 100644 --- a/nixpkgs/pkgs/development/python-modules/gtts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gtts/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.5.0"; + version = "2.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "refs/tags/v${version}"; - hash = "sha256-eNBgUP1lXZCr4dx3wNfWS6nFf93C1oZXpkPDtKDCr9Y="; + hash = "sha256-CCxD73fpHGsO4zSifWLQtgDkbPvPEnA2357umhOCNoI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gudhi/default.nix b/nixpkgs/pkgs/development/python-modules/gudhi/default.nix index 8989320fdf4b..1c8810ffe427 100644 --- a/nixpkgs/pkgs/development/python-modules/gudhi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gudhi/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonPackage , cmake +, setuptools , boost , eigen , gmp @@ -19,37 +20,44 @@ buildPythonPackage rec { pname = "gudhi"; - version = "3.8.0"; - format = "setuptools"; + version = "3.9.0"; + pyproject = true; src = fetchFromGitHub { owner = "GUDHI"; repo = "gudhi-devel"; rev = "tags/gudhi-release-${version}"; fetchSubmodules = true; - sha256 = "sha256-f2ajy4muG9vuf4JarGWZmdk/LF9OYd2KLSaGyY6BQrY="; + hash = "sha256-VL6RIPe8a2/cUHnHOql9e9EUMBB9QU311kMCaMZTbGI="; }; - patches = [ ./remove_explicit_PYTHONPATH.patch ]; - - nativeBuildInputs = [ cmake numpy cython pybind11 matplotlib ]; + nativeBuildInputs = [ cmake numpy cython pybind11 matplotlib setuptools ]; buildInputs = [ boost eigen gmp cgal mpfr ] ++ lib.optionals enableTBB [ tbb ]; propagatedBuildInputs = [ numpy scipy ]; nativeCheckInputs = [ pytest ]; cmakeFlags = [ - "-DWITH_GUDHI_PYTHON=ON" - "-DPython_ADDITIONAL_VERSIONS=3" + (lib.cmakeBool "WITH_GUDHI_PYTHON" true) + (lib.cmakeFeature "Python_ADDITIONAL_VERSIONS" "3") ]; + prePatch = '' + substituteInPlace src/python/CMakeLists.txt \ + --replace '"''${GUDHI_PYTHON_PATH_ENV}"' "" + ''; + preBuild = '' cd src/python ''; checkPhase = '' + runHook preCheck + rm -r gudhi - ${cmake}/bin/ctest --output-on-failure + ctest --output-on-failure + + runHook postCheck ''; pythonImportsCheck = [ "gudhi" "gudhi.hera" "gudhi.point_cloud" "gudhi.clustering" ]; diff --git a/nixpkgs/pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch b/nixpkgs/pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch deleted file mode 100644 index 2b8284ba216d..000000000000 --- a/nixpkgs/pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch +++ /dev/null @@ -1,195 +0,0 @@ -diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 86a409b6..09544fb5 100644 ---- a/src/python/CMakeLists.txt -+++ b/src/python/CMakeLists.txt -@@ -329,15 +329,6 @@ if(PYTHONINTERP_FOUND) - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/setup.py" "build_ext" "--inplace") - -- add_custom_target(python ALL DEPENDS gudhi.so -- COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests") -- -- # Path separator management for windows -- if (WIN32) -- set(GUDHI_PYTHON_PATH_ENV "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR};$ENV{PYTHONPATH}") -- else(WIN32) -- set(GUDHI_PYTHON_PATH_ENV "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:$ENV{PYTHONPATH}") -- endif(WIN32) - # Documentation generation is available through sphinx - requires all modules - # Make it first as sphinx test is by far the longest test which is nice when testing in parallel - if(SPHINX_PATH) -@@ -358,13 +349,13 @@ if(PYTHONINTERP_FOUND) - # sphinx target requires gudhi.so, because conf.py reads gudhi version from it - add_custom_target(sphinx - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${SPHINX_PATH} -b html ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/sphinx - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/gudhi.so" - COMMENT "${GUDHI_SPHINX_MESSAGE}" VERBATIM) - add_test(NAME sphinx_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${SPHINX_PATH} -b doctest ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/doctest) - # Set missing or not modules - set(GUDHI_MODULES ${GUDHI_MODULES} "python-documentation" CACHE INTERNAL "GUDHI_MODULES") -@@ -408,13 +399,13 @@ if(PYTHONINTERP_FOUND) - # Cubical - add_test(NAME periodic_cubical_complex_barcode_persistence_from_perseus_file_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py" - --no-barcode -f ${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt) - - add_test(NAME random_cubical_complex_persistence_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/random_cubical_complex_persistence_example.py" - 10 10 10) - -@@ -426,7 +417,7 @@ if(PYTHONINTERP_FOUND) - - add_test(NAME cubical_complex_sklearn_itf_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/cubical_complex_sklearn_itf.py") - endif() - -@@ -435,7 +426,7 @@ if(PYTHONINTERP_FOUND) - # Bottleneck and Alpha - add_test(NAME alpha_rips_persistence_bottleneck_distance_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_rips_persistence_bottleneck_distance.py" - -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -t 0.15 -d 3) - endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 5.1.0) -@@ -443,7 +434,7 @@ if(PYTHONINTERP_FOUND) - # Tangential - add_test(NAME tangential_complex_plain_homology_from_off_file_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/tangential_complex_plain_homology_from_off_file_example.py" - --no-diagram -i 2 -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off) - -@@ -452,13 +443,13 @@ if(PYTHONINTERP_FOUND) - # Witness complex - add_test(NAME euclidean_strong_witness_complex_diagram_persistence_from_off_file_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py" - --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2) - - add_test(NAME euclidean_witness_complex_diagram_persistence_from_off_file_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py" - --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2) - -@@ -467,7 +458,7 @@ if(PYTHONINTERP_FOUND) - # Bottleneck - add_test(NAME bottleneck_basic_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/bottleneck_basic_example.py") - - add_gudhi_py_test(test_bottleneck_distance) -@@ -479,26 +470,26 @@ if(PYTHONINTERP_FOUND) - file(COPY ${CMAKE_SOURCE_DIR}/data/points/COIL_database/lucky_cat_PCA1 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) - add_test(NAME cover_complex_nerve_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/nerve_of_a_covering.py" - -f human.off -c 2 -r 10 -g 0.3) - - add_test(NAME cover_complex_coordinate_gic_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/coordinate_graph_induced_complex.py" - -f human.off -c 0 -v) - - add_test(NAME cover_complex_functional_gic_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/functional_graph_induced_complex.py" - -o lucky_cat.off - -f lucky_cat_PCA1 -v) - - add_test(NAME cover_complex_voronoi_gic_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/voronoi_graph_induced_complex.py" - -f human.off -n 700 -v) - -@@ -506,15 +497,15 @@ if(PYTHONINTERP_FOUND) - # Alpha - add_test(NAME alpha_complex_from_points_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_points_example.py") - add_test(NAME alpha_complex_from_generated_points_on_sphere_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_generated_points_on_sphere_example.py") - add_test(NAME alpha_complex_diagram_persistence_from_off_file_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_diagram_persistence_from_off_file_example.py" - --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off) - add_gudhi_py_test(test_alpha_complex) -@@ -532,19 +523,19 @@ if(PYTHONINTERP_FOUND) - # Rips - add_test(NAME rips_complex_diagram_persistence_from_distance_matrix_file_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_diagram_persistence_from_distance_matrix_file_example.py" - --no-diagram -f ${CMAKE_SOURCE_DIR}/data/distance_matrix/lower_triangular_distance_matrix.csv -s , -e 12.0 -d 3) - - add_test(NAME rips_complex_diagram_persistence_from_off_file_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_diagram_persistence_from_off_file_example.py - --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -e 0.25 -d 3) - - add_test(NAME rips_complex_from_points_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_from_points_example.py) - - add_gudhi_py_test(test_rips_complex) -@@ -552,7 +543,7 @@ if(PYTHONINTERP_FOUND) - # Simplex tree - add_test(NAME simplex_tree_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/simplex_tree_example.py) - - add_gudhi_py_test(test_simplex_tree) -@@ -565,7 +556,7 @@ if(PYTHONINTERP_FOUND) - # Witness - add_test(NAME witness_complex_from_nearest_landmark_table_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/witness_complex_from_nearest_landmark_table.py) - - add_gudhi_py_test(test_witness_complex) diff --git a/nixpkgs/pkgs/development/python-modules/gurobipy/linux.nix b/nixpkgs/pkgs/development/python-modules/gurobipy/linux.nix index e9a72cbb5cba..a7c519406e74 100644 --- a/nixpkgs/pkgs/development/python-modules/gurobipy/linux.nix +++ b/nixpkgs/pkgs/development/python-modules/gurobipy/linux.nix @@ -16,7 +16,7 @@ buildPythonPackage { postFixup = '' patchelf --set-rpath $out/lib \ - $out/lib/${python.libPrefix}/site-packages/gurobipy/gurobipy.so + $out/${python.sitePackages}/gurobipy/gurobipy.so ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix index 7cb78248c172..cd6a4bfcd25b 100644 --- a/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,18 +10,20 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "23.11.0"; - format = "pyproject"; + version = "24.1.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "greenbone"; - repo = pname; + repo = "gvm-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-ZwImkTYYSscmGJYCpMWmZjToi41XjT4Znpo8j66BKIs="; + hash = "sha256-4uYOhsnprYybt5EB/b4LW8/9cn0Nahc1lYQ+DwPNlOU="; }; + __darwinAllowLocalNetworking = true; + nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/h5io/default.nix b/nixpkgs/pkgs/development/python-modules/h5io/default.nix new file mode 100644 index 000000000000..e9f8af129f1c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/h5io/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, numpy +, h5py +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "h5io"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "h5io"; + repo = "h5io"; + rev = "refs/tags/h5io-${version}"; + hash = "sha256-3mrHIkfaXq06mMzUwudRO81DWTk0TO/e15IQA5fxxNc="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov-report=" "" \ + --replace "--cov-branch" "" \ + --replace "--cov=h5io" "" + ''; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + numpy + h5py + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "h5io" ]; + + meta = with lib; { + description = "Read and write simple Python objects using HDF5"; + homepage = "https://github.com/h5io/h5io"; + changelog = "https://github.com/h5io/h5io/releases/tag/${src.rev}"; + license = licenses.bsd3; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix b/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix index 9e347d9a1553..e37c6a680742 100644 --- a/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.1.0"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-oPdKmaj2wKgOQw7QYwOQc8efcNtQiGryZgNJ+bbB6L8="; + hash = "sha256-bZtcvidjUhlb9ML1UIP00yqJ+KnJig5i0j/tAZSK7+Y="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 9609365f7fef..cf4a23ec2ce0 100644 --- a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.1.7"; + version = "2024.2.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-98biJ/BXFZV55FMRvT8QexzWVB2rfF/YVa66+HU06mI="; + hash = "sha256-d4LULYnnP/8RnbZcJJXadOri/Pl3dTTDi2cVJAYKhnI="; }; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index 61b1fdf58a1a..3730f653ead1 100644 --- a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.75.1"; + version = "0.78.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VQ5nxkrHt6xp+bk/wqAPJ+srTuf9WyamoLXawW1mKWo="; + hash = "sha256-ZqBYmh+MA4ZuhnUQPn/C8d7CVPrwp6mirsWnoB/ZMFw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hassil/default.nix b/nixpkgs/pkgs/development/python-modules/hassil/default.nix index 65b97fd7c485..229abe5f4a52 100644 --- a/nixpkgs/pkgs/development/python-modules/hassil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hassil/default.nix @@ -13,7 +13,7 @@ let pname = "hassil"; - version = "1.5.1"; + version = "1.6.1"; in buildPythonPackage { inherit pname version; @@ -23,7 +23,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-GLvDT8BUBvEzgiqKaXokF912g3fOH+KsXnmeOXIwe9U="; + hash = "sha256-jkPo02Jy6UqyC5YvwMw+DDkT8rG5Xe4EiNVED/JHzKc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix index a6246b3a4746..999596680505 100644 --- a/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hatch-requirements-txt"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "repo-helper"; repo = "hatch-requirements-txt"; rev = "refs/tags/v${version}"; - hash = "sha256-qk+70o/41BLxCuz3SOXkGYSEmUZOG1oLYcFUmlarqmY="; + hash = "sha256-Kd3rDfTBn/t/NiSJMPkHRWD5solUF7MAN8EiZokxHrk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hatchling/default.nix b/nixpkgs/pkgs/development/python-modules/hatchling/default.nix index 221c266287f9..6dca631c967e 100644 --- a/nixpkgs/pkgs/development/python-modules/hatchling/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hatchling/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "hatchling"; - version = "1.21.0"; + version = "1.21.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-XAhncjV6UHI7gl/V2lJ4rH42l833eX0HVBpskLb/dUw="; + hash = "sha256-u6RARToiTn1EeEV/oujYw2M3Zbr6Apdaa1O5v5F5gLw="; }; # listed in backend/pyproject.toml diff --git a/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix b/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix index c5a1ad4141dd..c2cfe5843c42 100644 --- a/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hdf5plugin"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-xOSGykG6D2Am/gnAPoqLOvIQz6FfxRQe9lPyRHxUoew="; + hash = "sha256-MnqY1PyGzo31H696J9CekiA2rJrUYzUMDC3UJMZaFLA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix index 3cdf1463cd57..e8ce48aab0ad 100644 --- a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "heudiconv"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-cW6G2NtPZiyqqJ3w9a3Y/6blEaXtR9eGG5epPknimsw="; + hash = "sha256-KMEvuxRFFbnyAez+cpcHKDDXdrHfeZcqlGNwy8RWTxg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/hg-commitsigs/default.nix b/nixpkgs/pkgs/development/python-modules/hg-commitsigs/default.nix index a97c2be2b98c..7a97bff33316 100644 --- a/nixpkgs/pkgs/development/python-modules/hg-commitsigs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hg-commitsigs/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir -p $out/lib/${python.libPrefix}/site-packages/hgext3rd/ + mkdir -p $out/${python.sitePackages}/hgext3rd/ install -D $src/commitsigs.py \ - $out/lib/${python.libPrefix}/site-packages/hgext3rd/ + $out/${python.sitePackages}/hgext3rd/ ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index a9d5fb12596e..c742b0a57e66 100644 --- a/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "11.1.0"; + version = "11.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-sMvHvHwLuMT0LaH2XFDePuePbwCXjvl66QGdERR0k6g="; + hash = "sha256-HFZN/JJQPlVB57xcUUxyXrrD4EqPg9vYCRAa4PAQHow="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hg-git/default.nix b/nixpkgs/pkgs/development/python-modules/hg-git/default.nix index e2b842091153..1e1803c9061f 100644 --- a/nixpkgs/pkgs/development/python-modules/hg-git/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hg-git/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hg-git"; - version = "1.0.3"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HuFwRW/SuGrzMX9bttdqztFRB19dZZNF5Y8+e9gAQWw="; + hash = "sha256-btEamGLqCC5PRigxHbe49/bnJNVGm6Czf852JaAdB38="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/highdicom/default.nix b/nixpkgs/pkgs/development/python-modules/highdicom/default.nix new file mode 100644 index 000000000000..b4420e6de9d4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/highdicom/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, numpy +, pillow +, pillow-jpls +, pydicom +, pylibjpeg +, pylibjpeg-libjpeg +}: + +let + test_data = fetchFromGitHub { + owner = "pydicom"; + repo = "pydicom-data"; + rev = "cbb9b2148bccf0f550e3758c07aca3d0e328e768"; + hash = "sha256-nF/j7pfcEpWHjjsqqTtIkW8hCEbuQ3J4IxpRk0qc1CQ="; + }; +in +buildPythonPackage rec { + pname = "highdicom"; + version = "0.22.0"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "MGHComputationalPathology"; + repo = "highdicom"; + rev = "refs/tags/v${version}"; + hash = "sha256-KHSJWEnm8u0xHkeeLF/U7MY4FfiWb6Q0GQQy2w1mnKw="; + }; + + propagatedBuildInputs = [ + numpy + pillow + pillow-jpls + pydicom + ]; + + passthru.optional-dependencies = { + libjpeg = [ + pylibjpeg + pylibjpeg-libjpeg + #pylibjpeg-openjpeg # not in nixpkgs yet + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ passthru.optional-dependencies.libjpeg; + preCheck = '' + export HOME=$TMP/test-home + mkdir -p $HOME/.pydicom/ + ln -s ${test_data}/data_store/data $HOME/.pydicom/data + ''; + + pythonImportsCheck = [ + "highdicom" + "highdicom.legacy" + "highdicom.ann" + "highdicom.ko" + "highdicom.pm" + "highdicom.pr" + "highdicom.seg" + "highdicom.sr" + "highdicom.sc" + ]; + + meta = with lib; { + description = "High-level DICOM abstractions for Python"; + homepage = "https://highdicom.readthedocs.io"; + changelog = "https://github.com/ImagingDataCommons/highdicom/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hishel/default.nix b/nixpkgs/pkgs/development/python-modules/hishel/default.nix new file mode 100644 index 000000000000..de75f1e46b17 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hishel/default.nix @@ -0,0 +1,74 @@ +{ lib +, anysqlite +, buildPythonPackage +, fetchFromGitHub +, hatch-fancy-pypi-readme +, hatchling +, httpx +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pyyaml +, redis +, trio +}: + +buildPythonPackage rec { + pname = "hishel"; + version = "0.0.22"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "karpetrosyan"; + repo = "hishel"; + rev = "refs/tags/${version}"; + hash = "sha256-2GboU1J0jvZUz20+KpDYnfDqc+qi0tmlypbWeOoYjX0="; + }; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatchling + ]; + + propagatedBuildInputs = [ + httpx + ]; + + passthru.optional-dependencies = { + redis = [ + redis + ]; + sqlite = [ + anysqlite + ]; + yaml = [ + pyyaml + ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + trio + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "hishel" + ]; + + disabledTests = [ + # Tests require a running Redis instance + "test_redis" + ]; + + meta = with lib; { + description = "HTTP Cache implementation for HTTPX and HTTP Core"; + homepage = "https://github.com/karpetrosyan/hishel"; + changelog = "https://github.com/karpetrosyan/hishel/blob/${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/nixpkgs/pkgs/development/python-modules/holidays/default.nix index 8e3918fe02a4..539caf7083d8 100644 --- a/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -21,16 +21,16 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.40"; + version = "0.42"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "dr-prodigy"; + owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-rFitLHUgXSWNd59VzG01ggaTHfVzI50OAi7Gxr6pMug="; + hash = "sha256-oVuzX/H5jj/c4dbPGmXUnZeDbgSd9v9qP2dXe6+PaUQ="; }; nativeBuildInputs = [ @@ -75,8 +75,8 @@ buildPythonPackage rec { meta = with lib; { description = "Generate and work with holidays in Python"; - homepage = "https://github.com/dr-prodigy/python-holidays"; - changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v${version}"; + homepage = "https://github.com/vacanza/python-holidays"; + changelog = "https://github.com/vacanza/python-holidays/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab jluttine ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 8d58ea765509..de204e5fb425 100644 --- a/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "home-assistant-bluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-1Bp43TaJkrT9lZsBu4yiuOD4tE7vv6bYRlcgTfNwOuA="; + hash = "sha256-KTaZ3xbZpBIN5zP73YdJW6QeCQThGdqejnfWwvL+0R8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 8787a8da31e8..44fb32e25c2d 100644 --- a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.12.0"; + version = "2024.1.0"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-4yAfbQBqHMEXWMwJ0kSDs0We/AsHweJ+Tc8aZiWi90w="; + hash = "sha256-4btkqAHbwAsyGV1LjngEoeTT5qyI8dtqFVTp0lIFwmg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 5f437a150d82..66a232d86577 100644 --- a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.12.0"; + version = "2024.1.0"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -37,11 +37,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-mWJ3/IKm/kcNztr7+Q9Rhjka9niGOshLvGShS3ugR6g="; + hash = "sha256-UiikZ2DVhTqX6WYfiE8sp2e52BMlyoQnDjLap/efmNc="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-wRJWgT+uycCwNKMgHaiACv1y+AvOLrPOpcm2I8hVAxk="; + hash = "sha256-/+gegUMd2n7MpJvdilS5VWefXc0tuRcLrXBBXSH35b0="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { diff --git a/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix b/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix index edf600921f1a..296fb482c16d 100644 --- a/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "homeconnect"; - version = "0.7.2"; + version = "0.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wCx8Jh3NBTnYI+essH9toacjUaT4fS61SaAAZDCYZ4g="; + hash = "sha256-lkal6Dy4cRRZ893I3/jyQ3+sDZMrHN0UMGff0ab4pvk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index 105e410968d0..badfd107962d 100644 --- a/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.1.5"; + version = "2024.2.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-sf0Dsl6zH64O3Y8jns10jAE5faaJSRAu4M5JQ4JBKh0="; + hash = "sha256-e0PQpnzYWl8IMtLFdnYPMCBioriumc3vc1ExRjCYoc8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix b/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix index c640ee8a106d..c859952214ef 100644 --- a/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "html-sanitizer"; - version = "2.2"; + version = "2.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "matthiask"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WU5wdTvCzYEw1eiuTLcFImvydzxWANfmDQCmEgyU9h4="; + hash = "sha256-lQ8E3hdHX0YR3HJUTz1pVBegLo4lhvyiylLVFMDY1+s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/htmldate/default.nix b/nixpkgs/pkgs/development/python-modules/htmldate/default.nix new file mode 100644 index 000000000000..5226a7eb7634 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/htmldate/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, charset-normalizer +, dateparser +, lxml +, pytestCheckHook +, python-dateutil +, urllib3 +, backports-datetime-fromisoformat +}: + +buildPythonPackage rec { + pname = "htmldate"; + version = "1.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AqgA3SJMv3S/SDsEL2ThT1e6DkDGtEBLKE6YvGwwto0="; + }; + + propagatedBuildInputs = [ + charset-normalizer + dateparser + lxml + python-dateutil + urllib3 + ] ++ lib.optionals (pythonOlder "3.7") [ + backports-datetime-fromisoformat + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # disable tests that require an internet connection + disabledTests = [ + "test_input" + "test_cli" + "test_download" + ]; + + pythonImportsCheck = [ "htmldate" ]; + + meta = with lib; { + description = "Fast and robust extraction of original and updated publication dates from URLs and web pages"; + homepage = "https://htmldate.readthedocs.io"; + changelog = "https://github.com/adbar/htmldate/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jokatzke ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/http-ece/default.nix b/nixpkgs/pkgs/development/python-modules/http-ece/default.nix index 16f8fa23c328..83719397fda9 100644 --- a/nixpkgs/pkgs/development/python-modules/http-ece/default.nix +++ b/nixpkgs/pkgs/development/python-modules/http-ece/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "http_ece"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1y5ln09ji4dwpzhxr77cggk02kghq7lql60a6969a5n2lwpvqblk"; + sha256 = "sha256-tZIPjvuOG1+wJXE+Ozb9pUM2JiAQY0sm3B+Y+F0es94="; }; propagatedBuildInputs = [ cryptography ] diff --git a/nixpkgs/pkgs/development/python-modules/http-sf/default.nix b/nixpkgs/pkgs/development/python-modules/http-sf/default.nix new file mode 100644 index 000000000000..f9ebde2b2b03 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/http-sf/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, typing-extensions +}: + +buildPythonPackage rec { + pname = "http-sf"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "mnot"; + repo = "http-sf"; + rev = "refs/tags/v${version}"; + hash = "sha256-8xK8/IVrhqMDgkxZY10QqSGswCrttc29FZLCntmSUQ4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + # Tests require external data (https://github.com/httpwg/structured-field-tests) + doCheck = false; + + pythonImportsCheck = [ + "http_sf" + ]; + + meta = with lib; { + description = "Module to parse and serialise HTTP structured field values"; + homepage = "https://github.com/mnot/http-sf"; + changelog = "https://github.com/mnot/http-sf/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/http-sfv/default.nix b/nixpkgs/pkgs/development/python-modules/http-sfv/default.nix index 55b318ff40de..205b9c7423dd 100644 --- a/nixpkgs/pkgs/development/python-modules/http-sfv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/http-sfv/default.nix @@ -8,8 +8,8 @@ buildPythonPackage rec { pname = "http-sfv"; - version = "0.9.8"; - format = "pyproject"; + version = "0.9.9"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mnot"; repo = "http_sfv"; rev = "http_sfv-${version}"; - hash = "sha256-zl0Rk4QbzCVmYZ6TnVq+C+oe27Imz5fEQY9Fco5lo5s="; + hash = "sha256-xf9bGDfsEcQnFQ2b1bLRGYug+H4e5jeV/LJstQtp6Bw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/nixpkgs/pkgs/development/python-modules/httpbin/default.nix index 48de08ee3b4c..0fbc8bc73ee9 100644 --- a/nixpkgs/pkgs/development/python-modules/httpbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpbin/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonRelaxDepsHook # build-system @@ -33,6 +34,14 @@ buildPythonPackage rec { hash = "sha256-e4WWvrDnWntlPDnR888mPW1cR20p4d9ve7K3C/nwaj0="; }; + patches = [ + (fetchpatch { + # backport flask 3.0 support; drop after 0.10.1 + url = "https://github.com/psf/httpbin/commit/c1d9e33049263fed3cb27806a97f094acc350905.patch"; + hash = "sha256-SYJgQN3ERDgLIaBc4eqDfey+EX4z6CSxLoAA7j+16xI="; + }) + ]; + nativeBuildInputs = [ setuptools pythonRelaxDepsHook diff --git a/nixpkgs/pkgs/development/python-modules/httpie-ntlm/default.nix b/nixpkgs/pkgs/development/python-modules/httpie-ntlm/default.nix index 22a995ebd24b..cbf3b29bcf03 100644 --- a/nixpkgs/pkgs/development/python-modules/httpie-ntlm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpie-ntlm/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , httpie -, requests_ntlm +, requests-ntlm }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "b1f757180c0bd60741ea16cf91fc53d47df402a5c287c4a61a14b335ea0552b3"; }; - propagatedBuildInputs = [ httpie requests_ntlm ]; + propagatedBuildInputs = [ httpie requests-ntlm ]; # Package have no tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/httpx-auth/default.nix b/nixpkgs/pkgs/development/python-modules/httpx-auth/default.nix index 5c099d91d436..dc159c7b0ee4 100644 --- a/nixpkgs/pkgs/development/python-modules/httpx-auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpx-auth/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "httpx-auth"; - version = "0.18.0"; + version = "0.19.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "httpx_auth"; rev = "refs/tags/v${version}"; - hash = "sha256-kK31jpS9Ax5kNkvUSbWWIC6CKdZKVJ28kLS0iuntWqg="; + hash = "sha256-ptxM0gabr+NmfkXqYlWd+G0c0yClJawRNKjbtPKSGFY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix b/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix index 75be71df04f7..1daf600f4d84 100644 --- a/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Dj+rrH5Pil5xQE6sAAD5RTycwlKq+TVsAeB2NVqGjY="; + hash = "sha256-L2nyVADDjPrHwhZRm+RAvfBdpP9sIvc9cakDiLVA7xw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 0bbb64652737..9641597a516d 100644 --- a/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.25.2"; + version = "0.26.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rGtIrs4dffs7Ndtjb400q7JrZh+HG9k0uwHw9pRlC5s="; + hash = "sha256-qMMx1CYu2/yH4NRvZFzJOflAPIbcvMYJqU4r+chuzl0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix index b76328f10303..17ad769329c7 100644 --- a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.20.2"; + version = "0.20.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-LYfkZVoQ+Jph7cyJYOIaAjtH8+fC/w8V+IWAqc1lHp4="; + hash = "sha256-21Ay8RVS2vtQIh4bBUxE8jFk6F+yeFBJ3XgvRRNtNgI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/huum/default.nix b/nixpkgs/pkgs/development/python-modules/huum/default.nix index 72f65940a5e3..42a44a04a9eb 100644 --- a/nixpkgs/pkgs/development/python-modules/huum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/huum/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , mashumaro , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "huum"; - version = "0.7.9"; + version = "0.7.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "frwickst"; repo = "pyhuum"; rev = "refs/tags/${version}"; - hash = "sha256-wIroT1eMO9VXsPWQkpSBEVN/nR4pg2/Eo4ms81qMaew="; + hash = "sha256-INW6d/Zc5UZZOgN6wW+Xbm/wH1K/V6bviu3mID1R+BY="; }; nativeBuildInputs = [ @@ -48,6 +47,5 @@ buildPythonPackage rec { changelog = "https://github.com/frwickst/pyhuum/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = versionAtLeast pydantic.version "2"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/nixpkgs/pkgs/development/python-modules/hvac/default.nix index 5f15e359f35e..42f09f7266cc 100644 --- a/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-alHLmg0i/hPoJMsLChzi7qy5zmr2i30bZoniXsG+yvU="; + hash = "sha256-tIvNoRpKsKe2xHIyx7p8h/2jGK4tSnZigAxGWnh0KJQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hvplot/default.nix b/nixpkgs/pkgs/development/python-modules/hvplot/default.nix index 29a14301ffd6..ded23a070c12 100644 --- a/nixpkgs/pkgs/development/python-modules/hvplot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hvplot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KB0YmiEtJkGT9446k079oWqTwBZMSFTakzW0LuBlazo="; + hash = "sha256-moyekkkTmqo97l8c6g+TzzY3TReemGcF/N3CuSxHB5M="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hwi/default.nix b/nixpkgs/pkgs/development/python-modules/hwi/default.nix index 046dbc7bb4ff..0f4c21e86e7c 100644 --- a/nixpkgs/pkgs/development/python-modules/hwi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hwi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hwi"; - version = "2.3.1"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bitcoin-core"; repo = "HWI"; rev = "refs/tags/${version}"; - hash = "sha256-V4BWB4mCONQ8kjAy6ySonAbCUTaKpBTvhSnHmoH8TQM="; + hash = "sha256-a1ppYDuY7CtNrKSvuAofS79nvDaYUMIm4FCHiiQYrtQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hyperscan/default.nix b/nixpkgs/pkgs/development/python-modules/hyperscan/default.nix index 342dda967cfe..51ea23baf4a2 100644 --- a/nixpkgs/pkgs/development/python-modules/hyperscan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hyperscan/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hyperscan"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "darvid"; repo = "python-hyperscan"; - rev = "v${version}"; - hash = "sha256-6PoV9rY9CkXkAMWN2QCnfU4S0OJD/6bzkqFgvEVqNjo="; + rev = "refs/tags/v${version}"; + hash = "sha256-XIsYBu2YPbSIZGIhJjPap1ymg7cr0+ozwZtpOj8GFm8="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index efa362c6fdd0..5d27b9d490e1 100644 --- a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.18.2"; + version = "3.19.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0gjISrKELopSMEuZHL8fy8q7rMuMqzATkP+c4Y8I+9A="; + hash = "sha256-oPDcQSWNWG9wauSVW7srXN85+UeF6Q0CRlaSyqh2W/Q="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix index f2ce179d65bd..252a40b7cbe2 100644 --- a/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -4,23 +4,28 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools , ukkonen }: buildPythonPackage rec { pname = "identify"; - version = "2.5.33"; - format = "setuptools"; + version = "2.5.34"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pre-commit"; - repo = pname; + repo = "identify"; rev = "refs/tags/v${version}"; - hash = "sha256-v0k+N/E1xzhL2iWM0HQzYCxHfzuP8Za4eupkofN7bAA="; + hash = "sha256-q1RVFdDFUkKGaKpcbasXHks+OZhVRZUy3ufuruBZiPA="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ editdistance-s pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/ilua/default.nix b/nixpkgs/pkgs/development/python-modules/ilua/default.nix index 9c6a7f6cb337..9eba6781a413 100644 --- a/nixpkgs/pkgs/development/python-modules/ilua/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ilua/default.nix @@ -4,6 +4,7 @@ , jupyter-console , jupyter-core , pygments +, setuptools , termcolor , txzmq }: @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-YxV6xC7GS5NXyMPRZN9YIJxamgP2etwrZUAZjk5PjtU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jupyter-console jupyter-core diff --git a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index 1ef8fea6a100..585e043e4eb3 100644 --- a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -1,43 +1,72 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, setuptools +, joblib +, keras +, numpy , pandas -, pytestCheckHook , scikit-learn +, scipy +, tensorflow +, threadpoolctl +, pytest-xdist +, pytestCheckHook }: buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.11.0"; - format = "setuptools"; - disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 + version = "0.12.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-dYKuiFjm2wuS/vl90IZgoYKX7hKNeMKr3ABri9hrj9w="; + hash = "sha256-uczZqqMChpkHnUOm1Nn8nQOfVTdnM7Mfh8fZsSXcwWU="; }; - propagatedBuildInputs = [ scikit-learn ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + joblib + numpy + scikit-learn + scipy + threadpoolctl + ]; + + passthru.optional-dependencies = { + optional = [ + keras + pandas + tensorflow + ]; + }; + + pythonImportsCheck = [ + "imblearn" + ]; + nativeCheckInputs = [ pytestCheckHook pandas ]; + preCheck = '' export HOME=$TMPDIR ''; - disabledTests = [ - "estimator" - "classification" - "_generator" - "show_versions" - "test_make_imbalanced_iris" - "test_rusboost[SAMME.R]" - - # https://github.com/scikit-learn-contrib/imbalanced-learn/issues/824 - "ValueDifferenceMetric" + + disabledTestPaths = [ + # require tensorflow and keras, but we don't want to + # add them to nativeCheckInputs just for this tests + "imblearn/keras/_generator.py" ]; meta = with lib; { description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; + changelog = "https://github.com/scikit-learn-contrib/imbalanced-learn/releases/tag/${version}"; license = licenses.mit; maintainers = [ maintainers.rmcgibbo ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index 1a69525d8438..2dc389f70ecc 100644 --- a/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -12,7 +12,7 @@ , exiftool , ghostscript , imagemagick -, mupdf +, mupdf-headless , netpbm , numpy , poppler_utils @@ -74,7 +74,7 @@ buildPythonPackage rec { exiftool ghostscript imagemagick - mupdf + mupdf-headless netpbm numpy poppler_utils diff --git a/nixpkgs/pkgs/development/python-modules/iminuit/default.nix b/nixpkgs/pkgs/development/python-modules/iminuit/default.nix index 3969b1c9ca51..1028512694b7 100644 --- a/nixpkgs/pkgs/development/python-modules/iminuit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/iminuit/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.24.0"; + version = "2.25.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JatjHDyOAksbzHyW9mM4yqxUpKIyTVXx47pWF4FuRP0="; + hash = "sha256-uCn/wdte1nHc0aSeBFk3duZXXPOmbMfOdHf8ZkI/hj4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix b/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix index 5d762be3fb86..6a066fad36d8 100644 --- a/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "4.0.0"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "corenting"; repo = "immutabledict"; rev = "refs/tags/v${version}"; - hash = "sha256-z03s2mOJiMVnvLmeFJFgCRvkP+9VUcALiIoIPBAHUPw="; + hash = "sha256-c76apNW6nlxL9paevqKpPw5RpDLMpYnbVabCCIrW3pw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/impacket/default.nix b/nixpkgs/pkgs/development/python-modules/impacket/default.nix index 7c7542252601..ba387cd8d06c 100644 --- a/nixpkgs/pkgs/development/python-modules/impacket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/impacket/default.nix @@ -4,19 +4,21 @@ , dsinternals , fetchPypi , flask +, ldap3 , ldapdomaindump , pyasn1 , pycryptodomex , pyopenssl , pythonOlder , setuptools +, pytestCheckHook , six }: buildPythonPackage rec { pname = "impacket"; version = "0.11.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,25 +27,36 @@ buildPythonPackage rec { hash = "sha256-7kA5tNKu3o9fZEeLxZ+qyGA2eWviTeqNwY8An7CQXko="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ charset-normalizer dsinternals flask + ldap3 ldapdomaindump pyasn1 pycryptodomex pyopenssl - setuptools six ]; - # RecursionError: maximum recursion depth exceeded - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "impacket" ]; + disabledTestPaths = [ + # Skip all RPC related tests + "tests/dcerpc/" + "tests/SMB_RPC/" + ]; + meta = with lib; { description = "Network protocols Constructors and Dissectors"; homepage = "https://github.com/SecureAuthCorp/impacket"; diff --git a/nixpkgs/pkgs/development/python-modules/indexed-gzip/default.nix b/nixpkgs/pkgs/development/python-modules/indexed-gzip/default.nix index 73ad916f35f8..7b0bf177bf19 100644 --- a/nixpkgs/pkgs/development/python-modules/indexed-gzip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/indexed-gzip/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "indexed_gzip"; - version = "1.8.5"; + version = "1.8.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-h9JgYq9KxmknaRuMgq+5YWA8tUaFk+lclkqdNAnr/cI="; + hash = "sha256-dryq1LLC+lVHj/i+m60ubGGItlX5/clCnwNGrexI92I="; }; nativeBuildInputs = [ cython ]; diff --git a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index 8e0bd695c0f6..6fb8974642ee 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.39.0"; + version = "1.40.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-cj3qeT5wE/RqrwOW1MV9sVG+khxyRAO5438omqbKbmY="; + hash = "sha256-+I5DxcxNxIRDwtfYXLvXPl8Z3FKcSWyaYtv1KHT9QO4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/installer/default.nix b/nixpkgs/pkgs/development/python-modules/installer/default.nix index d4f1e33ca606..c26dae01c237 100644 --- a/nixpkgs/pkgs/development/python-modules/installer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/installer/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, pythonOlder +, pythonAtLeast , fetchFromGitHub , pytestCheckHook , flit-core @@ -20,6 +20,12 @@ buildPythonPackage rec { hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A="; }; + patches = lib.optionals (pythonAtLeast "3.13") [ + # Fix compatibility with Python 3.13 + # https://github.com/pypa/installer/pull/201 + ./python313-compat.patch + ]; + nativeBuildInputs = [ flit-core ]; # We need to disable tests because this package is part of the bootstrap chain diff --git a/nixpkgs/pkgs/development/python-modules/installer/python313-compat.patch b/nixpkgs/pkgs/development/python-modules/installer/python313-compat.patch new file mode 100644 index 000000000000..423a550510eb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/installer/python313-compat.patch @@ -0,0 +1,55 @@ +From b23f89b10cf5d179bd6b0bad195ee36f43a5fb9e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Edgar=20Ram=C3=ADrez=20Mondrag=C3=B3n?= + <16805946+edgarrmondragon@users.noreply.github.com> +Date: Tue, 19 Dec 2023 06:09:41 -0600 +Subject: [PATCH] Fix removed `importlib.resources.read_binary` in Python 3.13 + (#201) + +diff --git a/noxfile.py b/noxfile.py +index a690c59..6a69cce 100644 +--- a/noxfile.py ++++ b/noxfile.py +@@ -22,7 +22,7 @@ def lint(session): + session.run("pre-commit", "run", "--all-files", *args) + + +-@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3"]) ++@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3"]) + def test(session): + session.install(".") + session.install("-r", "tests/requirements.txt") +@@ -42,7 +42,7 @@ def test(session): + ) + + +-@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3"]) ++@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3"]) + def doctest(session): + session.install(".") + session.install("-r", "docs/requirements.txt") +diff --git a/src/installer/scripts.py b/src/installer/scripts.py +index d18060b..c9f96b4 100644 +--- a/src/installer/scripts.py ++++ b/src/installer/scripts.py +@@ -3,9 +3,19 @@ + import io + import os + import shlex ++import sys + import zipfile +-from importlib.resources import read_binary +-from typing import TYPE_CHECKING, Mapping, Optional, Tuple ++from types import ModuleType ++from typing import TYPE_CHECKING, Mapping, Optional, Tuple, Union ++ ++if sys.version_info >= (3, 9): # pragma: no cover ++ from importlib.resources import files ++ ++ def read_binary(package: Union[str, ModuleType], file_path: str) -> bytes: ++ return (files(package) / file_path).read_bytes() ++ ++else: # pragma: no cover ++ from importlib.resources import read_binary + + from installer import _scripts + diff --git a/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 2a6e9f0556a9..7c8536e1466a 100644 --- a/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -4,33 +4,22 @@ , fetchPypi , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.3.5-1"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-R+P4pgKbLvf0mwpSDoujCvlJe/yS+nvSJ7ewLVOOg/0="; + hash = "sha256-NZwnx8tlXnsVCk4nvNjOg3cjSr2CnjqWcZG7xFTC2wA="; }; - patches = [ - # https://github.com/pyinsteon/insteon-panel/pull/33 - (fetchpatch { - name = "unpin-setuptools.patch"; - url = "https://github.com/pyinsteon/insteon-panel/commit/2297eb05668907edd03633f244e5876990e340c7.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; - nativeBuildInputs = [ setuptools - wheel ]; # upstream has no tests diff --git a/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix b/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix index 676ec23081a6..c6e50535bad4 100644 --- a/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipwhois/default.nix @@ -3,33 +3,47 @@ , buildPythonPackage , dnspython , fetchFromGitHub +, fetchpatch , iana-etc , libredirect , pytestCheckHook , pythonOlder , pythonRelaxDepsHook +, setuptools }: buildPythonPackage rec { pname = "ipwhois"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "secynic"; - repo = pname; + repo = "ipwhois"; rev = "refs/tags/v${version}"; hash = "sha256-2CfRRHlIIaycUtzKeMBKi6pVPeBCb1nW3/1hoxQU1YM="; }; + patches = [ + # Use assertEqual instead of assertEquals, https://github.com/secynic/ipwhois/pull/316 + (fetchpatch { + name = "assert-equal.patch"; + url = "https://github.com/secynic/ipwhois/commit/fce2761354af99bc169e6cd08057e838fcc40f75.patch"; + hash = "sha256-7Ic4xWTAmklk6MvnZ/WsH9SW/4D9EG/jFKt5Wi89Xtc="; + }) + ]; + + __darwinAllowLocalNetworking = true; + pythonRelaxDeps = [ "dnspython" ]; nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ @@ -53,6 +67,8 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests require network access "ipwhois/tests/online/" + # Stress test + "ipwhois/tests/stress/test_experimental.py" ]; disabledTests = [ diff --git a/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix index d96ab023c87f..317f8a7fc2eb 100644 --- a/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.28.0"; + version = "6.29.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-acEUA9Jt5p3wIiWRb5FrN+pLmvQX2gqMgn+EMo2I5fM="; + hash = "sha256-td0wE8q3szDfcSiRyWzRq4aMJ6cVnmBvdiAV6b+M6z8="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix b/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix index 0aa7fa388c4f..a87c359c967a 100644 --- a/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix @@ -1,32 +1,29 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder +, setuptools , ipython , ipython-genutils -, pandas , prettytable -, pytest , sqlalchemy , sqlparse }: buildPythonPackage rec { pname = "ipython-sql"; - version = "0.4.0"; - format = "setuptools"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "catherinedevlin"; - repo = "ipython-sql"; - rev = "117764caf099d80100ed4b09fc004b55eed6f121"; - hash = "sha256-ScQihsvRSnC7VIgy8Tzi1z4x6KIZo0SAeLPvHAVdrfA="; + src = fetchPypi { + inherit pname version; + hash = "sha256-PbPOf5qV369Dh2+oCxa9u5oE3guhIELKsT6fWW/P/b4="; }; - postPatch = '' - substituteInPlace setup.py --replace 'prettytable<1' prettytable - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ ipython @@ -36,17 +33,8 @@ buildPythonPackage rec { sqlparse ]; - nativeCheckInputs = [ ipython pandas pytest ]; - - checkPhase = '' - runHook preCheck - - # running with ipython is required because the tests use objects available - # only inside of ipython, for example the global `get_ipython()` function - ipython -c 'import pytest; pytest.main()' - - runHook postCheck - ''; + # pypi tarball has no tests + doCheck = false; pythonImportsCheck = [ "sql" ]; diff --git a/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/nixpkgs/pkgs/development/python-modules/ipython/default.nix index 09121fb1f24a..e92d5fbbf656 100644 --- a/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -29,13 +29,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.18.1"; - format = "pyproject"; - disabled = pythonOlder "3.8"; + version = "8.20.0"; + pyproject = true; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ym8Hm7M0V8ZuIz5FgOv8QSiFW0z2Nw3d1zhCqVY+iic="; + hash = "sha256-LyG9P8HVFVDInuOUSuBLvHvHnhKeoJN9pubGi/2/EXo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix index f6f8f5e2b1b6..5e27c0f605b8 100644 --- a/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -33,7 +33,7 @@ }: let - inherit (cudaPackagesGoogle) cudatoolkit cudnn; + inherit (cudaPackagesGoogle) cudatoolkit cudnn cudaVersion; version = "0.4.23"; @@ -118,26 +118,44 @@ let }; }; - # Find new releases at https://storage.googleapis.com/jax-releases/jax_releases.html. + # Note that the prebuilt jaxlib binary requires specific version of CUDA to + # work. The cuda12 jaxlib binaries only works with CUDA 12.2, and cuda11 + # jaxlib binaries only works with CUDA 11.8. This is why we need to find a + # binary that matches the provided cudaVersion. + gpuSrcVersionString = "cuda${cudaVersion}-${pythonVersion}"; + + # Find new releases at https://storage.googleapis.com/jax-releases # When upgrading, you can get these hashes from prefetch.sh. See # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index. gpuSrcs = { - "3.9" = fetchurl { + "cuda12.2-3.9" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp39-cp39-manylinux2014_x86_64.whl"; hash = "sha256-our2mSwHPdjVoDAZP+9aNUkJ+vxv1Tq7G5UqA9HvhNI="; }; - "3.10" = fetchurl { + "cuda12.2-3.10" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; hash = "sha256-jkIABnJZnn7A6n9VGs/MldzdDiKwWh0fEvl7Vqn85Kg="; }; - "3.11" = fetchurl { + "cuda12.2-3.11" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp311-cp311-manylinux2014_x86_64.whl"; hash = "sha256-dMUcRnHjl8NyUeO3P1x7CNgF0iAHFKIzUtHh+/CNkow="; }; - "3.12" = fetchurl { + "cuda12.2-3.12" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl"; hash = "sha256-kXJ6bUwX+QybqYPV9Kpwv+lhdoGEFRr4+1T0vfXoWRo="; }; + "cuda11.8-3.9" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp39-cp39-manylinux2014_x86_64.whl"; + hash = "sha256-m2Y5p12gF3OaADu+aGw5RjcKFrj9RB8xzNWnKNpSz60="; + }; + "cuda11.8-3.10" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl"; + hash = "sha256-aQ7iX3o0kQ4liPexv7dkBVWVTUpaty83L083MybGkf0="; + }; + "cuda11.8-3.11" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp311-cp311-manylinux2014_x86_64.whl"; + hash = "sha256-uIEyjEmv0HBaiYVl5PuICTI9XnH4zAfQ1l9tjALRcP4="; + }; }; in @@ -154,7 +172,7 @@ buildPythonPackage { ( cpuSrcs."${pythonVersion}-${stdenv.hostPlatform.system}" or (throw "jaxlib-bin is not supported on ${stdenv.hostPlatform.system}") - ) else gpuSrcs."${pythonVersion}"; + ) else gpuSrcs."${gpuSrcVersionString}"; # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. @@ -212,6 +230,7 @@ buildPythonPackage { broken = !(cudaSupport -> (cudaPackagesGoogle ? cudatoolkit) && lib.versionAtLeast cudatoolkit.version "11.1") || !(cudaSupport -> (cudaPackagesGoogle ? cudnn) && lib.versionAtLeast cudnn.version "8.2") - || !(cudaSupport -> stdenv.isLinux); + || !(cudaSupport -> stdenv.isLinux) + || !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}")); }; } diff --git a/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix b/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix index 0f0e396b906d..af924cea5ab2 100644 --- a/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix @@ -1,7 +1,9 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , pytest-xdist , pytestCheckHook , absl-py @@ -29,6 +31,16 @@ buildPythonPackage rec { hash = "sha256-T/BHSnuk3IRuLkBj3Hvb/tFIb7Au25jjQtvwL28OU1U="; }; + patches = [ + # fix failing tests from scipy 1.12 update + # https://github.com/google/jaxopt/pull/574 + (fetchpatch { + name = "scipy-1.12-fix-tests.patch"; + url = "https://github.com/google/jaxopt/commit/48b09dc4cc93b6bc7e6764ed5d333f9b57f3493b.patch"; + hash = "sha256-v+617W7AhxA1Dzz+DBtljA4HHl89bRTuGi1QfatobNY="; + }) + ]; + propagatedBuildInputs = [ absl-py jax @@ -54,6 +66,13 @@ buildPythonPackage rec { "jaxopt.tree_util" ]; + disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # https://github.com/google/jaxopt/issues/577 + "test_binary_logit_log_likelihood" + "test_solve_sparse" + "test_logreg_with_intercept_manual_loop3" + ]; + meta = with lib; { homepage = "https://jaxopt.github.io"; description = "Hardware accelerated, batchable and differentiable optimizers in JAX"; diff --git a/nixpkgs/pkgs/development/python-modules/jc/default.nix b/nixpkgs/pkgs/development/python-modules/jc/default.nix index 056afc4fcb43..cbc548151a15 100644 --- a/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "jc"; - version = "1.24.0"; + version = "1.25.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aEDEp32PR51uRMEmDdWkF/Y0bMT0Lp25lVUpyn/VxlA="; + hash = "sha256-viB/avMED5xllmkrF+WpsQbF/b7pyr3p3p+8vJk72+k="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix index 863a7af192e7..19d6b9e33339 100644 --- a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,23 +9,16 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "5.0.4"; + version = "6.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-+zrsfyi4I8venFGMKXDMUq+9+f7y6IY59y1/OJDExGs="; + hash = "sha256-queP6RBpw32PXbpz6StIE6Pb7RNsm2O4tNarrDwb2cU="; }; postPatch = '' - # relax version constraint, https://storyboard.openstack.org/#!/story/2009723 - substituteInPlace requirements.txt --replace 'PyYAML>=3.10.0,<6' 'PyYAML>=3.10.0' - - # Allow building with setuptools from nixpkgs. - # Related: https://github.com/NixOS/nixpkgs/issues/238226. - substituteInPlace requirements.txt --replace 'setuptools<=65.7.0' 'setuptools' - - export HOME=$TMPDIR + export HOME=$(mktemp -d) ''; propagatedBuildInputs = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ]; @@ -35,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; - homepage = "https://docs.openstack.org/infra/jenkins-job-builder/"; + homepage = "https://jenkins-job-builder.readthedocs.io/en/latest/"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/jinja2/default.nix index 1b154f90d386..1c260e37c7b0 100644 --- a/nixpkgs/pkgs/development/python-modules/jinja2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jinja2/default.nix @@ -9,79 +9,83 @@ , pytestCheckHook , sphinxHook , pallets-sphinx-themes +, setuptools , sphinxcontrib-log-cabinet , sphinx-issues }: buildPythonPackage rec { - pname = "Jinja2"; - version = "3.1.2"; + pname = "jinja2"; + version = "3.1.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-MTUacCpAip51laj8YVD8P0O7a/fjGXcMvA2535Q36FI="; + pname = "Jinja2"; + inherit version; + hash = "sha256-rIvWVE1Lssl5K/OhWegLuo/afwfoG8Ou1WVDLVklupA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - babel markupsafe ]; + passthru.optional-dependencies = { + i18n = [ + babel + ]; + }; + # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 doCheck = !stdenv.is32bit; nativeCheckInputs = [ pytestCheckHook - ]; - - pytestFlagsArray = [ - # Avoid failure due to deprecation warning - # Fixed in https://github.com/python/cpython/pull/28153 - # Remove after cpython 3.9.8 - "-p no:warnings" - ]; + ] ++ passthru.optional-dependencies.i18n; - passthru = { - doc = stdenv.mkDerivation { - # Forge look and feel of multi-output derivation as best as we can. - # - # Using 'outputs = [ "doc" ];' breaks a lot of assumptions. - name = "${pname}-${version}-doc"; - inherit src pname version; + passthru.doc = stdenv.mkDerivation { + # Forge look and feel of multi-output derivation as best as we can. + # + # Using 'outputs = [ "doc" ];' breaks a lot of assumptions. + name = "${pname}-${version}-doc"; + inherit src pname version; - patches = [ - # Fix import of "sphinxcontrib-log-cabinet" - ./patches/import-order.patch - ]; + patches = [ + # Fix import of "sphinxcontrib-log-cabinet" + ./patches/import-order.patch + ]; - postInstallSphinx = '' - mv $out/share/doc/* $out/share/doc/python$pythonVersion-$pname-$version - ''; + postInstallSphinx = '' + mv $out/share/doc/* $out/share/doc/python$pythonVersion-$pname-$version + ''; - nativeBuildInputs = [ - sphinxHook - sphinxcontrib-log-cabinet - pallets-sphinx-themes - sphinx-issues - ]; + nativeBuildInputs = [ + sphinxHook + sphinxcontrib-log-cabinet + pallets-sphinx-themes + sphinx-issues + ]; - inherit (python) pythonVersion; - inherit meta; - }; + inherit (python) pythonVersion; + inherit meta; }; meta = with lib; { - homepage = "https://jinja.palletsprojects.com/"; - description = "Stand-alone template engine"; + changelog = "https://github.com/pallets/jinja/blob/${version}/CHANGES.rst"; + description = "Very fast and expressive template engine"; + downloadPage = "https://github.com/pallets/jinja"; + homepage = "https://jinja.palletsprojects.com"; license = licenses.bsd3; longDescription = '' Jinja is a fast, expressive, extensible templating engine. Special placeholders in the template allow writing code similar to Python syntax. Then the template is passed data to render the final document. - an optional sandboxed environment. ''; maintainers = with maintainers; [ pierron ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch b/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch deleted file mode 100644 index 0894b776fef6..000000000000 --- a/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/setup.py b/setup.py -index 01cc813..15e9048 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,97 +1,18 @@ - #!/usr/bin/env python - - import os --import subprocess --import tarfile --import shutil --import sysconfig - - from setuptools import setup --from setuptools.command.build_ext import build_ext - from setuptools.extension import Extension - -- --def _path_in_dir(relative_path): -- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path)) -- --def _dep_source_path(relative_path): -- return os.path.join(_path_in_dir("deps"), relative_path) -- --def _dep_build_path(relative_path): -- return os.path.join(_path_in_dir("_deps/build"), relative_path) -- - def _read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() - - --jq_lib_tarball_path = _dep_source_path("jq-1.6.tar.gz") --jq_lib_dir = _dep_build_path("jq-1.6") -- --oniguruma_version = "6.9.4" --oniguruma_lib_tarball_path = _dep_source_path("onig-{}.tar.gz".format(oniguruma_version)) --oniguruma_lib_build_dir = _dep_build_path("onig-{}".format(oniguruma_version)) --oniguruma_lib_install_dir = _dep_build_path("onig-install-{}".format(oniguruma_version)) -- --class jq_build_ext(build_ext): -- def run(self): -- if not os.path.exists(_dep_build_path(".")): -- os.makedirs(_dep_build_path(".")) -- self._build_oniguruma() -- self._build_libjq() -- build_ext.run(self) -- -- def _build_oniguruma(self): -- self._build_lib( -- tarball_path=oniguruma_lib_tarball_path, -- lib_dir=oniguruma_lib_build_dir, -- commands=[ -- ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir], -- ["make"], -- ["make", "install"], -- ]) -- -- -- def _build_libjq(self): -- self._build_lib( -- tarball_path=jq_lib_tarball_path, -- lib_dir=jq_lib_dir, -- commands=[ -- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], -- ["make"], -- ]) -- -- def _build_lib(self, tarball_path, lib_dir, commands): -- self._extract_tarball( -- tarball_path=tarball_path, -- lib_dir=lib_dir, -- ) -- -- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET") -- if macosx_deployment_target: -- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target) -- -- def run_command(args): -- print("Executing: %s" % ' '.join(args)) -- subprocess.check_call(args, cwd=lib_dir) -- -- for command in commands: -- run_command(command) -- -- def _extract_tarball(self, tarball_path, lib_dir): -- if os.path.exists(lib_dir): -- shutil.rmtree(lib_dir) -- tarfile.open(tarball_path, "r:gz").extractall(_dep_build_path(".")) -- -- - jq_extension = Extension( - "jq", - sources=["jq.c"], -- include_dirs=[os.path.join(jq_lib_dir, "src")], -- extra_link_args=["-lm"], -- extra_objects=[ -- os.path.join(jq_lib_dir, ".libs/libjq.a"), -- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"), -- ], -+ libraries=["jq"] - ) - - setup( -@@ -104,7 +25,6 @@ def _extract_tarball(self, tarball_path, lib_dir): - python_requires='>=3.5', - license='BSD 2-Clause', - ext_modules = [jq_extension], -- cmdclass={"build_ext": jq_build_ext}, - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', diff --git a/nixpkgs/pkgs/development/python-modules/json-logging/default.nix b/nixpkgs/pkgs/development/python-modules/json-logging/default.nix index a3ac3ff7f005..3d22f4e878ba 100644 --- a/nixpkgs/pkgs/development/python-modules/json-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-logging/default.nix @@ -6,6 +6,7 @@ , httpx , pytestCheckHook , pythonOlder +, quart , requests , sanic , uvicorn @@ -31,7 +32,7 @@ buildPythonPackage rec { flask httpx pytestCheckHook - # quart + quart requests sanic uvicorn diff --git a/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix b/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix index dfbe2d7d638e..9bd62060457c 100644 --- a/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -11,6 +11,7 @@ , pygments , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pytz , pyyaml , requests @@ -18,20 +19,25 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.46"; - format = "pyproject"; + version = "0.47"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "coveooss"; - repo = pname; + repo = "json-schema-for-humans"; rev = "refs/tags/v${version}"; - hash = "sha256-wTO+d0O3SKT2jJ2zNubT2q76PdJ7+kT9RBEw5MMH1yg="; + hash = "sha256-yioYsCp+q5YWdIWDlNZkpaLqo++n+dV5jyEeIhUDHr4="; }; + pythonRelaxDeps = [ + "dataclasses-json" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index 6800635c0b2f..9609d68c6961 100644 --- a/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , json-stream , json-stream-rs-tokenizer +, pythonOlder , rustc , rustPlatform , setuptools @@ -15,14 +16,16 @@ buildPythonPackage rec { pname = "json-stream-rs-tokenizer"; - version = "0.4.22"; - format = "setuptools"; + version = "0.4.25"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "smheidrich"; repo = "py-json-stream-rs-tokenizer"; rev = "refs/tags/v${version}"; - hash = "sha256-EW726gUXTBX3gTxlFQ45RgkUa2Z4tIjUZxO4GBLXgEs="; + hash = "sha256-zo/jRAWSwcOnO8eU4KhDNz44P6xDGcrZf9CflwsSvF0="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix b/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix new file mode 100644 index 000000000000..f52b6412a617 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix @@ -0,0 +1,109 @@ +{ lib +, argcomplete +, attrs +, buildPythonPackage +, docstring-parser +, fetchFromGitHub +, fsspec +, jsonnet +, jsonschema +, omegaconf +, pydantic +, pytest-subtests +, pytestCheckHook +, pythonOlder +, pyyaml +, reconplogger +, requests +, responses +, ruyaml +, setuptools +, types-pyyaml +, types-requests +, typeshed-client +}: + +buildPythonPackage rec { + pname = "jsonargparse"; + version = "4.27.4"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "omni-us"; + repo = "jsonargparse"; + rev = "refs/tags/v${version}"; + hash = "sha256-MzcFsH1PyDAnPBEELHLRKfD3TR01INDFIvHc1y3dbng="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pyyaml + ]; + + passthru.optional-dependencies = { + all = [ + argcomplete + fsspec + jsonnet + jsonschema + omegaconf + ruyaml + docstring-parser + typeshed-client + requests + ]; + argcomplete = [ + argcomplete + ]; + fsspec = [ + fsspec + ]; + jsonnet = [ + jsonnet + # jsonnet-binary + ]; + jsonschema = [ + jsonschema + ]; + omegaconf = [ + omegaconf + ]; + reconplogger = [ + reconplogger + ]; + ruyaml = [ + ruyaml + ]; + signatures = [ + docstring-parser + typeshed-client + ]; + urls = [ + requests + ]; + }; + + nativeCheckInputs = [ + pytest-subtests + pytestCheckHook + types-pyyaml + types-requests + ]; + + pythonImportsCheck = [ + "jsonargparse" + ]; + + meta = with lib; { + description = "Module to mplement minimal boilerplate CLIs derived from various sources"; + homepage = "https://github.com/omni-us/jsonargparse"; + changelog = "https://github.com/omni-us/jsonargparse/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix index 42aa42638013..f10f9bbb8b82 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -4,22 +4,27 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "jsonrpc-base"; - version = "2.1.1"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "emlove"; - repo = pname; - rev = version; - hash = "sha256-C03m/zeLIFqsmEMSzt84LMOWAHUcpdEHhaa5hx2NsoQ="; + repo = "jsonrpc-base"; + rev = "refs/tags/${version}"; + hash = "sha256-AbpuAW+wuGc+Vj4FDFlyB2YbiwDxPLuyAGiNcmGU+Ss="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix index 6c1569055b5d..eb50c3f3a32e 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -1,35 +1,42 @@ { lib +, aiohttp +, async-timeout , buildPythonPackage , fetchFromGitHub -, aiohttp , jsonrpc-base , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "3.1.4"; - format = "setuptools"; + version = "3.1.5"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "emlove"; repo = "jsonrpc-websocket"; - rev = version; - hash = "sha256-xSOITOVtsNMEDrq610l8LNipLdyMWzKOQDedQEGaNOQ="; + rev = "refs/tags/${version}"; + hash = "sha256-CdYa4gcbG3EM1glxLU1hyqbNse87KJKjwSRQSFfDMM0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp + async-timeout jsonrpc-base ]; nativeCheckInputs = [ - pytestCheckHook pytest-asyncio + pytestCheckHook ]; pytestFlagsArray = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix index 69d0734bfa00..bdb7b5772941 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix @@ -3,13 +3,12 @@ , fetchPypi , pythonOlder , flit-core -, pythonRelaxDepsHook , click -, docutils , jinja2 , jsonschema , linkify-it-py , myst-nb +, myst-parser , pyyaml , sphinx , sphinx-comments @@ -26,29 +25,28 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.15.1"; + version = "1.0.0"; + pyproject = true; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-ihY07Bb37t7g0Rbx5ft8SCAyia2S2kLglRnccdlWwBA="; + inherit version; + pname = "jupyter_book"; + hash = "sha256-U5xdBJNUYgDZ3ie9S1936uoDEV+JN/gl1P+Cs4AamH4="; }; nativeBuildInputs = [ flit-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ click - docutils jinja2 jsonschema linkify-it-py myst-nb + myst-parser pyyaml sphinx sphinx-comments @@ -63,16 +61,9 @@ buildPythonPackage rec { sphinx-multitoc-numbering ]; - pythonRelaxDeps = [ - "docutils" - "myst-nb" - "sphinx" - "sphinx-thebe" - "sphinxcontrib-bibtex" - ]; - pythonImportsCheck = [ "jupyter_book" + "jupyter_book.cli.main" ]; meta = with lib; { @@ -81,5 +72,6 @@ buildPythonPackage rec { changelog = "https://github.com/executablebooks/jupyter-book/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; + mainProgram = "jupyter-book"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix index 1cc43ebc6001..51161435e917 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jupyter-lsp"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-sX+rbXD+g8iJawz/WSN2QAOCR8GWBWtDaEoJArap4Ps="; + hash = "sha256-JW0kYgVCrku6BKUPwfb/4ggJOgfY5pf+oKjRuMobfls="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix index 3c9f3b0e043e..5dbb04fda092 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix @@ -16,14 +16,14 @@ let self = buildPythonPackage rec { pname = "jupyter-server-terminals"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "jupyter_server_terminals"; rev = "refs/tags/v${version}"; - hash = "sha256-d++WnroL9nq/G8K5nMl98pXYNpXgdWRfCNoIbVoiD7U="; + hash = "sha256-e4PtrK2DCJAK+LYmGguwU5hmxdqP5Dws1dPoPOv/WrM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix index 240d2064168c..77993d24fd2c 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.12.4"; + version = "2.12.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-QfSh5rkSzCSnxsaUhRs309hBKxgPQ9cjFf5CLLK4XMI="; + hash = "sha256-DttibJS6oigJvhMj+XcM8cAKlSsXCXWS5A0D5qOVFok="; }; nativeBuildInputs = [ @@ -93,11 +93,11 @@ buildPythonPackage rec { "test_cull_idle" "test_server_extension_list" "test_subscribe_websocket" + # test is presumable broken in sandbox + "test_authorized_requests" ] ++ lib.optionals stdenv.isDarwin [ # attempts to use trashcan, build env doesn't allow this "test_delete" - # test is presumable broken in sandbox - "test_authorized_requests" # Insufficient access privileges for operation "test_regression_is_hidden" ] ++ lib.optionals stdenv.isLinux [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix index 004bddfbe8ac..71012f747e47 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab-lsp"; - version = "5.0.1"; + version = "5.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jQ8mhTfZ+6F9EgDfBWVI6I/I3n2lIlJs+mM0OJ0MKTQ="; + hash = "sha256-JmiGhOkHUPjvikFimgpAUOc26IFVWqFBP7Xah54GNfE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index c00e171772e1..ed909d15f6a6 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.0.10"; + version = "4.0.12"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Rhd+uO3nDcc76SKsmfjvlDvcLfvGoxs1PEvehIo13uE="; + hash = "sha256-ll2S76gqU47XDMs5aNmqu6eIhA2oguE9ewYXgM3tw7c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/justext/default.nix b/nixpkgs/pkgs/development/python-modules/justext/default.nix new file mode 100644 index 000000000000..82f0aa804565 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/justext/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, lxml +}: + +buildPythonPackage rec { + pname = "justext"; + version = "3.0.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "miso-belica"; + repo = "jusText"; + rev = "refs/tags/v${version}"; + hash = "sha256-WNxDoM5666tEHS9pMl5dOoig4S7dSYaCLZq71tehWqw="; + }; + + propagatedBuildInputs = [ + lxml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # patch out coverage report + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=justext --cov-report=term-missing --no-cov-on-fail" "" + ''; + + pythonImportsCheck = [ "justext" ]; + + meta = with lib; { + description = "Heuristic based boilerplate removal tool"; + homepage = "https://github.com/miso-belica/jusText"; + changelog = "https://github.com/miso-belica/jusText/blob/v${version}/CHANGELOG.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ jokatzke ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix b/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix index 96c83a4ac81d..8d83bdb5b110 100644 --- a/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix @@ -24,20 +24,20 @@ buildPythonPackage rec { installPhase = '' runHook preInstall - mkdir -p "$out/lib/${python.libPrefix}/site-packages" + mkdir -p "$out/${python.sitePackages}" - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --install-lib=$out/${python.sitePackages} \ --prefix="$out" - eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + eapth="$out/${python.sitePackages}/easy-install.pth" if [ -e "$eapth" ]; then mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth fi - rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + rm -f "$out/${python.sitePackages}"/site.py* runHook postInstall ''; diff --git a/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix index de71d207b876..20ae66f17a9d 100644 --- a/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix @@ -29,20 +29,20 @@ buildPythonPackage rec { installPhase = '' runHook preInstall - mkdir -p "$out/lib/${python.libPrefix}/site-packages" + mkdir -p "$out/${python.sitePackages}" - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --install-lib=$out/${python.sitePackages} \ --prefix="$out" - eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + eapth="$out/${python.sitePackages}/easy-install.pth" if [ -e "$eapth" ]; then mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth fi - rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + rm -f "$out/${python.sitePackages}"/site.py* runHook postInstall ''; diff --git a/nixpkgs/pkgs/development/python-modules/kaggle/default.nix b/nixpkgs/pkgs/development/python-modules/kaggle/default.nix index e0b4ab4ef586..58098b37bf79 100644 --- a/nixpkgs/pkgs/development/python-modules/kaggle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kaggle/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "kaggle"; - version = "1.6.1"; + version = "1.6.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AsdRYWbeG++zACCSVfnCPuy1hIdixLqNbxP0npmmabQ="; + sha256 = "sha256-J2FOzXJhO59Ya4cjE68WOK2MChfQx4rZ1KcYeb7NcuQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/keyring-pass/default.nix b/nixpkgs/pkgs/development/python-modules/keyring-pass/default.nix new file mode 100644 index 000000000000..c9ac11c9313a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/keyring-pass/default.nix @@ -0,0 +1,78 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, gnupg +, keyring +, pass +, poetry-core +, pythonOlder +}: +buildPythonPackage rec { + pname = "keyring-pass"; + version = "0.9.2"; + disabled = pythonOlder "3.6"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "nazarewk"; + repo = "keyring_pass"; + rev = "refs/tags/v${version}"; + hash = "sha256-Sf7eDOB3prH2s6BzdBtxewSweC0ibLXVxNHBJRRaJe4="; + }; + + postPatch = '' + substituteInPlace keyring_pass/__init__.py \ + --replace 'pass_binary = "pass"' 'pass_binary = "${lib.getExe pass}"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + keyring + gnupg + ]; + + checkPhase = '' + export HOME="$TMPDIR" + + # generate temporary GPG identity + cat <<EOF | gpg --gen-key --batch /dev/stdin + %no-protection + %transient-key + Key-Type: 1 + Key-Length: 1024 + Subkey-Type: 1 + Subkey-Length: 1024 + Name-Real: test + Name-Email: test@example.com + Expire-Date: 1 + EOF + + # configure password store + ${lib.getExe pass} init test@example.com + + # Configure `keyring` CLI + # first make sure `keyring-pass` is in "$PYTHONPATH" + [[ "$PYTHONPATH" == *"$out"/lib/python*/site-packages* ]] + export PYTHON_KEYRING_BACKEND="keyring_pass.PasswordStoreBackend" + + # confirm set/get/del works + keyring set test-service test-username <<<"test-password" + test "$(keyring get test-service test-username)" == "test-password" + keyring del test-service test-username + ''; + + pythonImportsCheck = [ + "keyring_pass" + ]; + + meta = { + description = "Password Store (pass) backend for python's keyring"; + homepage = "https://github.com/nazarewk/keyring_pass"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nazarewk ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix b/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix index 84eb2697eaac..895773678ca8 100644 --- a/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, hatchling, requests, pytestCheckHook }: buildPythonPackage rec { pname = "kiss-headers"; version = "2.4.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Ousret"; @@ -12,13 +12,15 @@ buildPythonPackage rec { hash = "sha256-WeAzlC1yT+0nPSuB278z8T0XvPjbre051f/Rva5ujAk="; }; + nativeBuildInputs = [ hatchling ]; + propagatedBuildInputs = [ requests ]; nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=kiss_headers --doctest-modules --cov-report=term-missing -rxXs" "--doctest-modules -rxXs" + substituteInPlace pyproject.toml \ + --replace-fail "--cov=kiss_headers --doctest-modules --cov-report=term-missing -rxXs" "--doctest-modules -rxXs" ''; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix b/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix index 47b9fa4d8357..6b6a1cff6700 100644 --- a/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix +++ b/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix @@ -1,35 +1,23 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , setuptools -, wheel }: buildPythonPackage rec { pname = "knx-frontend"; - version = "2023.6.23.191712"; + version = "2024.1.20.105944"; format = "pyproject"; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-MeurZ6731qjeBK6HTwXYLVs6+nXF9Hf1p8/NNwxmae4="; + hash = "sha256-5u+BaZjbGpIpQd3k+u5NC099TQuiwGKdE/EoIWny01I="; }; - patches = [ - # https://github.com/XKNX/knx-frontend/pull/96 - (fetchpatch { - name = "relax-setuptools-dependency.patch"; - url = "https://github.com/XKNX/knx-frontend/commit/72ac6dc42eeeb488992b0709ee58ea4a79287817.patch"; - hash = "sha256-EpfgEq4pIx7ahqJZalzo30ruj8NlZYHcKHxFXCGL98w="; - }) - ]; - nativeBuildInputs = [ setuptools - wheel ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/labgrid/default.nix b/nixpkgs/pkgs/development/python-modules/labgrid/default.nix index 15474fa5b659..31fc50197d20 100644 --- a/nixpkgs/pkgs/development/python-modules/labgrid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/labgrid/default.nix @@ -6,6 +6,7 @@ , jinja2 , lib , mock +, openssh , packaging , pexpect , psutil @@ -13,6 +14,7 @@ , pytestCheckHook , pytest-dependency , pytest-mock +, pythonRelaxDepsHook , pyudev , pyusb , pyyaml @@ -25,16 +27,17 @@ buildPythonPackage rec { pname = "labgrid"; - version = "23.0.4"; + version = "23.0.5"; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; rev = "refs/tags/v${version}"; - sha256 = "sha256-EEPQSIHKAmLPudv7LLm9ol3Kukgz8edYKfDi+wvERpk="; + hash = "sha256-jrapbSrybuLT3V11rvV342tOr7/sRwBMgAdNWDG5obA="; }; nativeBuildInputs = [ + pythonRelaxDepsHook setuptools setuptools-scm wheel @@ -57,8 +60,25 @@ buildPythonPackage rec { xmodem ]; + pythonRelaxDeps = [ + "attrs" + "autobahn" + "jinja2" + "packaging" + "pexpect" + "pytest" + "pyudev" + "requests" + "xmodem" + ]; + + pythonRemoveDeps = [ + "pyserial-labgrid" + ]; + nativeCheckInputs = [ mock + openssh psutil pytestCheckHook pytest-mock diff --git a/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix b/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix index c129f8c8a557..0d0046b216ee 100644 --- a/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.0.12"; + version = "0.0.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_community"; inherit version; - hash = "sha256-fP42xSsfuGwQldTewM9Gahx1KnRGEE6LOc8PcFEqSFE="; + hash = "sha256-wGUSqTAToG+6dnnNWhJU/4uSfN3S0fvgzERL97vfC4w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix b/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix index 8ac7bf9173a1..8e8309874f1e 100644 --- a/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.10"; + version = "0.1.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-PJ4TgyZMEC/Mb4ZXANu5QWxJMaJdCsIZX2MRxrhnqhc="; + hash = "sha256-jLVG7tMYAJ7hqKOB0QgHTt3wOVrmHrJD2wDXbh4mXok="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/langchain/default.nix b/nixpkgs/pkgs/development/python-modules/langchain/default.nix index d39942c769ac..18936f7a9ca5 100644 --- a/nixpkgs/pkgs/development/python-modules/langchain/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langchain/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.1.0"; + version = "0.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -61,7 +61,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-izaSah1S0INsskdzE9b7Iw4yWBsNmN5fBI6BQgaHgE4="; + hash = "sha256-cQz4u6FeVZLNbix4pyc6ulfj+nb/tARMJniusy7Q46A="; }; sourceRoot = "${src.name}/libs/langchain"; diff --git a/nixpkgs/pkgs/development/python-modules/langsmith/default.nix b/nixpkgs/pkgs/development/python-modules/langsmith/default.nix index 1fffd07adff8..21ee2b4ac871 100644 --- a/nixpkgs/pkgs/development/python-modules/langsmith/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.80"; + version = "0.0.83"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-YFXwM/YiQJzJ1Nf76kuq3WtFhU6dUIHzK4K33+VO/lQ="; + hash = "sha256-WRrwekh4pcn3I0U/A2Q91ePrRx2RUC3XX+z4bez0BzU="; }; sourceRoot = "${src.name}/python"; diff --git a/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix b/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix index f71543c828bb..f4657dce8458 100644 --- a/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ldfparser"; - version = "0.21.0"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "c4deszes"; repo = "ldfparser"; rev = "refs/tags/v${version}"; - hash = "sha256-4uwze9TJYmNvhDiKYyUX6Ya+eQb0mbpQQaawUWmO3Gs="; + hash = "sha256-gSjTuMndkzFUDcixJCohuCChhztFXnLpbK/zTOjEBpg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/leidenalg/default.nix b/nixpkgs/pkgs/development/python-modules/leidenalg/default.nix index 336fb029c476..661ac2c71597 100644 --- a/nixpkgs/pkgs/development/python-modules/leidenalg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/leidenalg/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , ddt -, fetchPypi +, fetchFromGitHub , igraph , igraph-c +, libleidenalg , pythonOlder , setuptools-scm , unittestCheckHook @@ -11,31 +12,29 @@ buildPythonPackage rec { pname = "leidenalg"; - version = "0.10.1"; - format = "setuptools"; + version = "0.10.2"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-RXrZaYKoC9XGVxifQt/rd+6807dEoRDlosFhjS64C0c="; + src = fetchFromGitHub { + owner = "vtraag"; + repo = "leidenalg"; + rev = "refs/tags/${version}"; + hash = "sha256-oaTV+BIB/YQBWKrVXuiIEMH/1MxPxeHhjUzbmxt6hlw="; }; - postPatch = '' - substituteInPlace ./setup.py \ - --replace "[\"/usr/include/igraph\", \"/usr/local/include/igraph\"]" \ - "[\"${igraph-c.dev}/include/igraph\"]" - - rm -r vendor - ''; - nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ + igraph-c + libleidenalg + ]; + propagatedBuildInputs = [ igraph - igraph-c ]; checkInputs = [ @@ -46,8 +45,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "leidenalg" ]; meta = with lib; { + changelog = "https://github.com/vtraag/leidenalg/blob/${version}/CHANGELOG"; description = "Implementation of the Leiden algorithm for various quality functions to be used with igraph in Python"; - homepage = "https://leidenalg.readthedocs.io"; + homepage = "https://github.com/vtraag/leidenalg"; license = licenses.gpl3Only; maintainers = with maintainers; [ jboy ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix b/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix index 037ae3cda69f..38bd559a8568 100644 --- a/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix +++ b/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix @@ -1,11 +1,11 @@ { lib , stdenv , buildPythonPackage -, fetchFromGitHub -, pythonOlder , cmake , cython_3 +, fetchFromGitHub , pytestCheckHook +, pythonOlder , rapidfuzz , rapidfuzz-cpp , scikit-build @@ -13,16 +13,17 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.23.0"; - format = "pyproject"; + version = "0.24.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-O39Xe26WKAGcv6DEvwuOL8NZJBem5SYZDX1TPAY7/uA="; + hash = "sha256-Vf12MBfy4IoTsXSYdKBMjxyMCaba21fiG0g1bPmrUmI="; + fetchSubmodules = true; ## for vendored `rapidfuzz-cpp` }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix index 2361768258df..b6bb639b3afc 100644 --- a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.7.0"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FIqeUAaWVEMqfTSZeVTpFDTdOOv2iDLrnHXUQrPmL60="; + hash = "sha256-db9MCxI7wiXiTKlfyhw1vjCxnmu4X+6ngUBNQ8QnbJE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/libknot/default.nix b/nixpkgs/pkgs/development/python-modules/libknot/default.nix index fd5b0451381b..f79e4d638eba 100644 --- a/nixpkgs/pkgs/development/python-modules/libknot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libknot/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.3"; + version = "3.3.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-w8VAA+llRg1xeAMRe7ISHo8H+qGi247jwOjTZHecFVM="; + hash = "sha256-KRxc34lqOGuYJM2mUsYrjfiVCQNBxcQyO30wPLf17+Q="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/nixpkgs/pkgs/development/python-modules/librosa/default.nix index a93b6b0d99cb..48eae549523f 100644 --- a/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -106,6 +106,8 @@ buildPythonPackage rec { "test_example" "test_example_info" "test_load_resample" + # does not converge + "test_nnls_vector" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index de5a75ee9eea..e10f7c056c6b 100644 --- a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libvirt"; - version = "9.10.0"; + version = "10.0.0"; format = "setuptools"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-7qJieTLPzyHvhOLUsti4Mbt94iba2eTZd6OvPn3uLEA="; + hash = "sha256-zl1Hfm7flRflNjIpLoLAlPDysYlieC05HEd/mzFW8pU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix index 6c64228249e1..a87276c15f17 100644 --- a/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix @@ -38,14 +38,14 @@ assert cudaSupport -> gpuSupport != true; buildPythonPackage rec { pname = "lightgbm"; - version = "4.2.0"; + version = "4.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ik0FHfKrIhiZihb3cS6EPunpbYsJ/7/MGFM9oSfg2gI="; + hash = "sha256-AG9XhKm87kPlp+lD3E8C3hui7np68e5fGQ04Pztsnr4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/linear-operator/default.nix b/nixpkgs/pkgs/development/python-modules/linear-operator/default.nix index 907cb9c44d73..8ebe174d199b 100644 --- a/nixpkgs/pkgs/development/python-modules/linear-operator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/linear-operator/default.nix @@ -3,10 +3,12 @@ , fetchFromGitHub , jaxtyping , pytestCheckHook +, pythonRelaxDepsHook , scipy , setuptools , setuptools-scm , torch +, typeguard , wheel }: @@ -23,6 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + pythonRelaxDepsHook setuptools setuptools-scm wheel @@ -32,6 +35,11 @@ buildPythonPackage rec { jaxtyping scipy torch + typeguard + ]; + + pythonRelaxDeps = [ + "typeguard" ]; pythonImportsCheck = [ "linear_operator" ]; @@ -42,6 +50,7 @@ buildPythonPackage rec { disabledTests = [ # flaky numerical tests + "test_matmul_matrix_broadcast" "test_svd" ]; diff --git a/nixpkgs/pkgs/development/python-modules/linien-common/default.nix b/nixpkgs/pkgs/development/python-modules/linien-common/default.nix index de05fab7f74d..605fdd6f740e 100644 --- a/nixpkgs/pkgs/development/python-modules/linien-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/linien-common/default.nix @@ -4,7 +4,7 @@ , setuptools , importlib-metadata , numpy -, rpyc +, rpyc4 , scipy , appdirs , callPackage @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ importlib-metadata numpy - rpyc + rpyc4 scipy appdirs ]; diff --git a/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix b/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix index 70d4fc1862f0..94a232ef5659 100644 --- a/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix @@ -15,6 +15,7 @@ , colorlog , crcmod , pillow +, fetchpatch }: buildPythonPackage rec { @@ -31,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-LU8rQmXrEIoOBTTFotGvMeHqksYGrtNo2YSl2l2e/UI="; }; + patches = [ + (fetchpatch { + name = "tests-pillow-10.2.0-compat.patch"; + url = "https://github.com/liquidctl/liquidctl/commit/c50afa4e610bd2e268e85c347e2644794c817a78.diff"; + hash = "sha256-1cKk3drl3RybHmnPXdlJoeYK6UDz25jHSS2YS/XLHIY="; + }) + ]; + nativeBuildInputs = [ installShellFiles setuptools diff --git a/nixpkgs/pkgs/development/python-modules/litellm/default.nix b/nixpkgs/pkgs/development/python-modules/litellm/default.nix index b6d29b5501f9..d34dece547a9 100644 --- a/nixpkgs/pkgs/development/python-modules/litellm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/litellm/default.nix @@ -12,21 +12,20 @@ , certifi , appdirs , aiohttp -, httpx }: let - version = "1.17.0"; + version = "1.23.0"; in -buildPythonPackage rec { +buildPythonPackage { pname = "litellm"; - format = "pyproject"; inherit version; + pyproject = true; src = fetchFromGitHub { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-lH0J5QFjSHOkHZWZQaH5ig6d9vWm7Mj02ssVc6lE4Uo="; + hash = "sha256-Pl3Fet0TvGrNHNw4ssUMqa+UhzBYgqTydNfD96TeY7I="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/lmcloud/default.nix b/nixpkgs/pkgs/development/python-modules/lmcloud/default.nix new file mode 100644 index 000000000000..5b048bf3e346 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/lmcloud/default.nix @@ -0,0 +1,51 @@ +{ lib +, authlib +, bleak +, buildPythonPackage +, fetchFromGitHub +, httpx +, pythonOlder +, setuptools +, websockets +}: + +buildPythonPackage rec { + pname = "lmcloud"; + version = "0.4.35"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "zweckj"; + repo = "lmcloud"; + rev = "refs/tags/v${version}"; + hash = "sha256-TUve21yamtEmEceK/V1w7IZjnMgKConMfSY/GlqFpp8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + authlib + bleak + httpx + websockets + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "lmcloud" + ]; + + meta = with lib; { + description = "Library to interface with La Marzocco's cloud"; + homepage = "https://github.com/zweckj/lmcloud"; + changelog = "https://github.com/zweckj/lmcloud/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix index 80d6bcc2f546..3d6b2cc7897b 100644 --- a/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix +++ b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "logilab-constraint"; - version = "0.7.1"; + version = "1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-5ayQBNjueFHSQIjCilgbfL8VdWNuRSMtkYDh3DouNZQ="; + hash = "sha256-UiE1FsHYJxvJd+lqCQKJQkAHXa5iRQYEzU9nDgrR6YY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/logmatic-python/default.nix b/nixpkgs/pkgs/development/python-modules/logmatic-python/default.nix new file mode 100644 index 000000000000..24416041f7b2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/logmatic-python/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-json-logger +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "logmatic-python"; + version = "0.1.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "logmatic"; + repo = "logmatic-python"; + rev = "refs/tags/${version}"; + hash = "sha256-UYKm00KhXnPQDkKJVm7s0gOwZ3GNY07O0oKbzPhAdVE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + python-json-logger + ]; + + # Only functional tests, no unit tests + doCheck = false; + + pythonImportsCheck = [ + "logmatic" + ]; + + meta = with lib; { + description = "Python helpers to send logs to Logmatic.io"; + homepage = "https://github.com/logmatic/logmatic-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix index fbc65794da26..6587f99d8118 100644 --- a/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.3"; + version = "1.19.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-Ppy7vOA7ix76nvzVEP+BkL8dsoN0oXNX/5IZyhXDoSw="; + hash = "sha256-aVOviCeYi/oj1Xv7I0d4U+JBU0w3wbjORXOim/g5S7U="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix b/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix index 06776c0eec3e..c8c058f47c68 100644 --- a/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "lsprotocol"; - version = "2023.0.0"; - format = "pyproject"; + version = "2023.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "microsoft"; - repo = pname; + repo = "lsprotocol"; rev = "refs/tags/${version}"; - hash = "sha256-K5jocKVxMNoUYYUi9YO2+N7hHWj0MFLprqGOzsg1QRs="; + hash = "sha256-PHjLKazMaT6W4Lve1xNxm6hEwqE3Lr2m5L7Q03fqb68="; }; nativeBuildInputs = [ @@ -70,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Language Server Protocol"; homepage = "https://github.com/microsoft/lsprotocol"; + changelog = "https://github.com/microsoft/lsprotocol/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ doronbehar fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/lupupy/default.nix b/nixpkgs/pkgs/development/python-modules/lupupy/default.nix index d2481a5bada9..7be84dae9bc3 100644 --- a/nixpkgs/pkgs/development/python-modules/lupupy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lupupy/default.nix @@ -5,20 +5,25 @@ , fetchPypi , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "lupupy"; - version = "0.3.1"; - format = "setuptools"; + version = "0.3.2"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mij5WGIl60D7ya1SdIvZ8TEgIZhJ9Xd2kcUnnbO1dD4="; + hash = "sha256-A92Jk6WlRKep3dkbqLiYYHklEh0pyncipRW6swq0mvo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ colorlog pyyaml diff --git a/nixpkgs/pkgs/development/python-modules/lxmf/default.nix b/nixpkgs/pkgs/development/python-modules/lxmf/default.nix index 6081f17c2727..a9bdff4e46df 100644 --- a/nixpkgs/pkgs/development/python-modules/lxmf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lxmf/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, rns , pythonOlder +, rns +, setuptools }: buildPythonPackage rec { pname = "lxmf"; - version = "0.3.8"; - format = "setuptools"; + version = "0.3.9"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-tse2Hgu50KfxWLBkzyV4VpDj2YHgxIc5izgvwJAJ/7k="; + hash = "sha256-nZDcSVHR8IKlGBa5ljd3MmgzUPvG7Hv76WRfXxMsndY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ rns ]; diff --git a/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/nixpkgs/pkgs/development/python-modules/maestral/default.nix index 3e871a90562b..4645174e122f 100644 --- a/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { makeWrapperArgs = [ # Add the installed directories to the python path so the daemon can find them "--prefix PYTHONPATH : ${makePythonPath propagatedBuildInputs}" - "--prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages" + "--prefix PYTHONPATH : $out/${python.sitePackages}" ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/maison/default.nix b/nixpkgs/pkgs/development/python-modules/maison/default.nix index 79be6d7b5bc7..d28c5cc6c69d 100644 --- a/nixpkgs/pkgs/development/python-modules/maison/default.nix +++ b/nixpkgs/pkgs/development/python-modules/maison/default.nix @@ -6,25 +6,31 @@ , pydantic , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , toml }: buildPythonPackage rec { pname = "maison"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dbatten5"; repo = "maison"; rev = "refs/tags/v${version}"; - hash = "sha256-XNo7QS8BCYzkDozLW0T+KMQPI667lDTCFtOqKq9q3hw="; + hash = "sha256-2hUmk91wr5o2cV3un2nMoXDG+3GT7SaIOKY+QaZY3nw="; }; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -47,6 +53,5 @@ buildPythonPackage rec { changelog = "https://github.com/dbatten5/maison/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; - broken = versionAtLeast pydantic.version "2"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/malduck/default.nix b/nixpkgs/pkgs/development/python-modules/malduck/default.nix index 0ae7abb72143..ed521cf6d247 100644 --- a/nixpkgs/pkgs/development/python-modules/malduck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/malduck/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "malduck"; - version = "4.3.2"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3joIfhQBJzKdoU3FNW/yAHsQa/lMMbw3wGEQTyOBrOQ="; + hash = "sha256-CXHbU1AudvOJrG9MKYDQXeEtwrJODRPQtK43dQzZASE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mandown/default.nix b/nixpkgs/pkgs/development/python-modules/mandown/default.nix index 51d7db72259b..eae43bc8d951 100644 --- a/nixpkgs/pkgs/development/python-modules/mandown/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mandown/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, pythonRelaxDepsHook , beautifulsoup4 , comicon , feedparser @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "mandown"; version = "1.7.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "potatoeggy"; @@ -29,6 +30,12 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pillow" + "typer" ]; propagatedBuildInputs = [ @@ -50,13 +57,10 @@ buildPythonPackage rec { ]; }; - postPatch = '' - substituteInPlace pyproject.toml --replace 'typer = "^0.7.0"' 'typer = "^0"' - ''; - pythonImportsCheck = [ "mandown" ]; meta = with lib; { + changelog = "https://github.com/potatoeggy/mandown/releases/tag/v${version}"; description = "Comic/manga/webtoon downloader and CBZ/EPUB/MOBI/PDF converter"; homepage = "https://github.com/potatoeggy/mandown"; license = licenses.agpl3Only; diff --git a/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix b/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix index 8b069fd235a3..544e2196326f 100644 --- a/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix @@ -4,7 +4,7 @@ , cython , pytestCheckHook , hypothesis -, readme_renderer +, readme-renderer , pythonOlder }: @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - readme_renderer + readme-renderer hypothesis ]; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 24d117eb322e..dfdb85ebf9c7 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -4,22 +4,32 @@ , marshmallow , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "marshmallow-polyfield"; - version = "5.10"; - format = "setuptools"; + version = "5.11"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Bachmann1234"; - repo = pname; - rev = "v${version}"; - hash = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; + repo = "marshmallow-polyfield"; + rev = "refs/tags/v${version}"; + hash = "sha256-jbpeyih2Ccw1Rk+QcXRO9AfN5B/DhZmxa/M6FzXHqqs="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=marshmallow_polyfield" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ marshmallow ]; @@ -28,11 +38,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=marshmallow_polyfield" "" - ''; - pythonImportsCheck = [ "marshmallow" ]; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix index bbe9c9bf157d..880e3c869aab 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix @@ -6,22 +6,27 @@ , pytz , simplejson , packaging +, setuptools }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.20.1"; - format = "setuptools"; + version = "3.20.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marshmallow-code"; - repo = pname; + repo = "marshmallow"; rev = "refs/tags/${version}"; - hash = "sha256-sPYiup7ontnubtBxv+rIT0up4IHPJNCUlH9J4FlHsss="; + hash = "sha256-z6Quf6uTelGwB/uYayVXtVmculwaoI5LL8I0kKiM/e8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ packaging ]; diff --git a/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix b/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix index d61ddf90362d..6cfa517cc386 100644 --- a/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.11"; + version = "3.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = "mashumaro"; rev = "refs/tags/v${version}"; - hash = "sha256-7gRbTNNK8elWsL0ub7c/EeswIk4xxJOxKVk8HmvWMZA="; + hash = "sha256-sSwj/8j+vPX7M8l2h4bPs8WnjzIN2WIpyd7/NcGaExg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index 1100d1bdbc99..8fb5c7c292cf 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -6,10 +6,8 @@ , isPyPy , pythonOlder -# https://github.com/matplotlib/matplotlib/blob/main/doc/devel/dependencies.rst # build-system , certifi -, oldest-supported-numpy , pkg-config , pybind11 , setuptools @@ -109,19 +107,11 @@ buildPythonPackage rec { substituteInPlace src/_c_internal_utils.c \ --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \ --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 - '' + - # bring our own system libraries - # https://github.com/matplotlib/matplotlib/blob/main/doc/devel/dependencies.rst#c-libraries - '' - echo "[libs] - system_freetype=true - system_qhull=true" > mplsetup.cfg ''; nativeBuildInputs = [ certifi numpy - oldest-supported-numpy # TODO remove after updating to 3.8.0 pkg-config pybind11 setuptools @@ -184,16 +174,17 @@ buildPythonPackage rec { libs = { system_freetype = true; system_qhull = true; - } // lib.optionalAttrs stdenv.isDarwin { # LTO not working in darwin stdenv, see #19312 - enable_lto = false; + enable_lto = !stdenv.isDarwin; }; }; env.MPLSETUPCFG = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config); - # Matplotlib needs to be built against a specific version of freetype in - # order for all of the tests to pass. + # Encountering a ModuleNotFoundError, as describved and investigated at: + # https://github.com/NixOS/nixpkgs/issues/255262 . It could be that some of + # which may fail due to a freetype version that doesn't match the freetype + # version used by upstream. doCheck = false; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index db6b13b0fcc3..38daf62a635b 100644 --- a/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -1,54 +1,57 @@ { lib , buildPythonPackage , fetchFromGitHub -, logbook + +# build-system +, poetry-core + +# dependencies , aiofiles , aiohttp , aiohttp-socks -, aioresponses -, atomicwrites -, attrs -, cachetools -, faker -, future -, git , h11 , h2 -, hypothesis , jsonschema -, peewee -, poetry-core -, py , pycryptodome +, unpaddedbase64 + +# optional-dependencies +, atomicwrites +, cachetools +, peewee +, python-olm + +# tests +, aioresponses +, faker +, hpack +, hyperframe +, hypothesis , pytest-aiohttp , pytest-benchmark , pytestCheckHook -, python-olm -, unpaddedbase64 + +# passthru tests +, nixosTests +, opsdroid +, pantalaimon +, weechatScripts +, zulip }: buildPythonPackage rec { pname = "matrix-nio"; - version = "0.22.1"; + version = "0.24.0"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-hFSS2Nys95YJgBNED8SBan24iRo2q/UOr6pqUPAF5Ms="; + hash = "sha256-XlswVHLvKOi1qr+I7Mbm4IBjn1DG7glgDsNY48NA5Ew="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \ - --replace 'h11 = "^0.12.0"' 'h11 = "*"' \ - --replace 'cachetools = { version = "^4.2.1", optional = true }' 'cachetools = { version = "*", optional = true }' \ - --replace 'aiohttp-socks = "^0.7.0"' 'aiohttp-socks = "*"' - ''; - nativeBuildInputs = [ - git poetry-core ]; @@ -56,12 +59,9 @@ buildPythonPackage rec { aiofiles aiohttp aiohttp-socks - attrs - future h11 h2 jsonschema - logbook pycryptodome unpaddedbase64 ]; @@ -78,8 +78,9 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses faker + hpack + hyperframe hypothesis - py pytest-aiohttp pytest-benchmark pytestCheckHook @@ -96,6 +97,23 @@ buildPythonPackage rec { "test_transfer_monitor_callbacks" ]; + passthru.tests = { + inherit (nixosTests) + dendrite + matrix-appservice-irc + matrix-conduit + mjolnir + ; + inherit (weechatScripts) + weechat-matrix + ; + inherit + opsdroid + pantalaimon + zulip + ; + }; + meta = with lib; { homepage = "https://github.com/poljar/matrix-nio"; changelog = "https://github.com/poljar/matrix-nio/blob/${version}/CHANGELOG.md"; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-admon/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-admon/default.nix index a7fd0f940373..3db893042d88 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-admon/default.nix @@ -1,54 +1,42 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat -, python3 +, mdit-py-plugins +, pytestCheckHook , pythonOlder }: -let - python = python3.override { - packageOverrides = self: super: { - mdit-py-plugins = super.mdit-py-plugins.overridePythonAttrs (_prev: rec { - version = "0.4.0"; - doCheck = false; - src = fetchFromGitHub { - owner = "executablebooks"; - repo = "mdit-py-plugins"; - rev = "refs/tags/v${version}"; - hash = "sha256-YBJu0vIOD747DrJLcqiZMHq34+gHdXeGLCw1OxxzIJ0="; - }; - }); - }; - }; -in python.pkgs.buildPythonPackage rec { +buildPythonPackage rec { pname = "mdformat-admon"; version = "1.0.2"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "KyleKing"; - repo = pname; + repo = "mdformat-admon"; rev = "v${version}"; hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU="; }; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = [ flit-core ]; - buildInputs = with python.pkgs; [ + propagatedBuildInputs = [ mdformat + mdit-py-plugins ]; - propagatedBuildInputs = with python.pkgs; [ - mdit-py-plugins + nativeCheckInputs = [ + pytestCheckHook ]; meta = with lib; { - description = "mdformat plugin for admonitions"; + description = "Mdformat plugin for admonitions"; homepage = "https://github.com/KyleKing/mdformat-admon"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-beautysh/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-beautysh/default.nix index a117fea936eb..940e4754c270 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-beautysh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-beautysh/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mdformat-beautysh"; version = "0.1.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,16 +28,13 @@ buildPythonPackage rec { poetry-core ]; - buildInputs = [ + propagatedBuildInputs = [ + beautysh mdformat mdformat-gfm mdit-py-plugins ]; - propagatedBuildInputs = [ - beautysh - ]; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix index 4d7b56f0c2fa..4d452ce5e452 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat-footnote"; version = "0.1.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { flit-core ]; - buildInputs = [ + propagatedBuildInputs = [ mdformat mdit-py-plugins ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix index 333cb5651130..ee2fe29693b2 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix @@ -28,12 +28,9 @@ buildPythonPackage rec { flit-core ]; - buildInputs = [ + propagatedBuildInputs = [ mdformat mdit-py-plugins - ]; - - propagatedBuildInputs = [ ruamel-yaml ]; @@ -42,7 +39,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "mdformat plugin to ensure frontmatter is respected"; + description = "Mdformat plugin to ensure frontmatter is respected"; homepage = "https://github.com/butler54/mdformat-frontmatter"; changelog = "https://github.com/butler54/mdformat-frontmatter/blob/v{version}/CHANGELOG.md"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix index de5a1d2ac68b..15a79eb0f4ca 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix @@ -13,30 +13,27 @@ buildPythonPackage rec { pname = "mdformat-gfm"; - version = "0.3.5"; - format = "pyproject"; + version = "0.3.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hukkin"; - repo = pname; + repo = "mdformat-gfm"; rev = "refs/tags/${version}"; - hash = "sha256-7sIa50jCN+M36Y0C05QaAL+TVwLzKxJ0gzpZI1YQFxg="; + hash = "sha256-c1jJwyTL8IgQnIAJFoPSuJ8VEYgnQ4slZyV0bHlUHLQ="; }; nativeBuildInputs = [ poetry-core ]; - buildInputs = [ - mdformat - markdown-it-py - mdit-py-plugins - ]; - propagatedBuildInputs = [ + markdown-it-py + mdformat mdformat-tables + mdit-py-plugins linkify-it-py ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix index b35a1eb348b5..52ad5f97b20e 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { flit-core ]; - buildInputs = [ + propagatedBuildInputs = [ mdformat mdformat-gfm mdit-py-plugins @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "mdformat plugin for MkDocs"; + description = "Mdformat plugin for MkDocs"; homepage = "https://github.com/KyleKing/mdformat-mkdocs"; changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v${version}"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix index 6323312072ff..d59e09f999e0 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix @@ -1,30 +1,37 @@ { lib +, alejandra , buildPythonPackage , fetchFromGitHub , mdformat , poetry-core +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "mdformat-nix-alejandra"; version = "0.1.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aldoborrero"; - repo = pname; - rev = "${version}"; + repo = "mdformat-nix-alejandra"; + rev = "refs/tags/${version}"; hash = "sha256-jUXApGsxCA+pRm4m4ZiHWlxmVkqCPx3A46oQdtyKz5g="; }; + postPatch = '' + substituteInPlace mdformat_nix_alejandra/__init__.py \ + --replace-fail '"alejandra"' '"${lib.getExe alejandra}"' + ''; + nativeBuildInputs = [ poetry-core ]; - buildInputs = [ + propagatedBuildInputs = [ mdformat ]; @@ -32,6 +39,10 @@ buildPythonPackage rec { "mdformat_nix_alejandra" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Mdformat plugin format Nix code blocks with alejandra"; homepage = "https://github.com/aldoborrero/mdformat-nix-alejandra"; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix index c5bbeeb46de9..9bff43e4d402 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-simple-breaks"; version = "0.0.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { flit-core ]; - buildInputs = [ + propagatedBuildInputs = [ mdformat ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "mdformat plugin to render thematic breaks using three dashes"; + description = "Mdformat plugin to render thematic breaks using three dashes"; homepage = "https://github.com/csala/mdformat-simple-breaks"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix index 018371ada82f..cfd468d9cc6e 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-tables"; version = "0.4.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { flit-core ]; - buildInputs = [ + propagatedBuildInputs = [ mdformat ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix index 56d7ce69a0d4..1597dcec197a 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-toc"; version = "0.3.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { poetry-core ]; - buildInputs = [ + propagatedBuildInputs = [ mdformat ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat/default.nix index a25a632f5150..eec56ee47944 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat/default.nix @@ -5,99 +5,57 @@ , importlib-metadata , makeWrapper , markdown-it-py -, poetry-core , pytestCheckHook -, python3 , pythonOlder , setuptools , tomli , typing-extensions }: -let - withPlugins = plugins: buildPythonApplication { - pname = "${package.pname}"; - inherit (package) version; - format = "other"; +buildPythonPackage rec { + pname = "mdformat"; + version = "0.7.17"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - dontUnpack = true; - dontBuild = true; - doCheck = false; - - nativeBuildInputs = [ - makeWrapper - ]; - - installPhase = '' - makeWrapper ${package}/bin/mdformat $out/bin/mdformat \ - --prefix PYTHONPATH : "${package}/${python3.sitePackages}:$PYTHONPATH" - ln -sfv ${package}/lib $out/lib - ''; - - propagatedBuildInputs = package.propagatedBuildInputs ++ plugins; - - passthru = package.passthru // { - withPlugins = morePlugins: withPlugins (morePlugins ++ plugins); - }; - - meta.mainProgram = "mdformat"; + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "mdformat"; + rev = "refs/tags/${version}"; + hash = "sha256-umtfbhN6sDR/rFr1LwmJ21Ph9bK1Qq43bmMVzGCPD5s="; }; - package = buildPythonPackage rec { - pname = "mdformat"; - version = "0.7.17"; - format = "pyproject"; + nativeBuildInputs = [ + setuptools + ]; - disabled = pythonOlder "3.7"; + propagatedBuildInputs = [ + markdown-it-py + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; - src = fetchFromGitHub { - owner = "executablebooks"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-umtfbhN6sDR/rFr1LwmJ21Ph9bK1Qq43bmMVzGCPD5s="; - }; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeBuildInputs = [ - poetry-core - setuptools - ]; + pythonImportsCheck = [ + "mdformat" + ]; - propagatedBuildInputs = [ - markdown-it-py - tomli - ] ++ lib.optionals (pythonOlder "3.10") [ - importlib-metadata - ] ++ lib.optionals (pythonOlder "3.7") [ - typing-extensions - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - # AssertionError - "test_no_codeblock_trailing_newline" - # Issue with upper/lower case - "default_style.md-options0" - ]; - - pythonImportsCheck = [ - "mdformat" - ]; - - passthru = { inherit withPlugins; }; + passthru = { + withPlugins = throw "Use pkgs.mdformat.withPlugins, i.e. the top-level attribute."; + }; - meta = with lib; { - description = "CommonMark compliant Markdown formatter"; - homepage = "https://mdformat.rtfd.io/"; - changelog = "https://github.com/executablebooks/mdformat/blob/${version}/docs/users/changelog.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab aldoborrero ]; - mainProgram = "mdformat"; - }; + meta = with lib; { + description = "CommonMark compliant Markdown formatter"; + homepage = "https://mdformat.rtfd.io/"; + changelog = "https://github.com/executablebooks/mdformat/blob/${version}/docs/users/changelog.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab aldoborrero ]; + mainProgram = "mdformat"; }; -in -package +} diff --git a/nixpkgs/pkgs/development/python-modules/medpy/default.nix b/nixpkgs/pkgs/development/python-modules/medpy/default.nix new file mode 100644 index 000000000000..6fc6242c155c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/medpy/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, unittestCheckHook +, boost +, numpy +, scipy +, simpleitk +}: + +buildPythonPackage rec { + pname = "medpy"; + version = "0.5.0rc1"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "loli"; + repo = "medpy"; + rev = "refs/tags/${version}"; + hash = "sha256-W62LjstH42OzNG+vMkuApUWczTNugJGKuuoeeS5ok4U="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + boost + numpy + scipy + simpleitk + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + preCheck = '' + rm -r medpy/ # prevent importing from build directory at test time + rm -r tests/graphcut_ # SIGILL at test time + ''; + + pythonImportsCheck = [ + "medpy" + "medpy.core" + "medpy.features" + "medpy.filter" + "medpy.graphcut" + "medpy.io" + "medpy.metric" + "medpy.utilities" + ]; + + meta = with lib; { + description = "Medical image processing library"; + homepage = "https://loli.github.io/medpy"; + changelog = "https://github.com/loli/medpy/releases/tag/${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/meep/default.nix b/nixpkgs/pkgs/development/python-modules/meep/default.nix index d99b5c3e2e0c..70a588f1c8aa 100644 --- a/nixpkgs/pkgs/development/python-modules/meep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meep/default.nix @@ -113,7 +113,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" # Generate a python test script cat > test.py << EOF diff --git a/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix b/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix index 92747d8e9ecf..61c57c8e47d5 100644 --- a/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.29.0"; + version = "0.30.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-jquaxJ+4/yaPsPqer+v2UY1N60U71ig4nowqm/KRIeA="; + hash = "sha256-gcDJUTg84JugytbUzQzvm3I9YAIboiyvcHe4AcBmpFM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix b/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix index bb9b7dd47509..90c75d0bb7fe 100644 --- a/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, cython +, cython_3 }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-E4BcKuHAG3SJ+rXo6sk2FmK08sAkEuNlLuzkj/aVMWI="; }; - propagatedBuildInputs = [ cython ]; + propagatedBuildInputs = [ cython_3 ]; pythonImportsCheck = [ "memory_allocator" ]; diff --git a/nixpkgs/pkgs/development/python-modules/meraki/default.nix b/nixpkgs/pkgs/development/python-modules/meraki/default.nix index c29543a21dac..53d44ee85d74 100644 --- a/nixpkgs/pkgs/development/python-modules/meraki/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.41.0"; + version = "1.42.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-aXcGMRqkiVPnLEYrzIMLDiFXWurBRNlMg4OnRd5jlrY="; + hash = "sha256-PZ875cjJUUE92aBoKfgQ3tY8tVN3ksB7nITc8MK0g+w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix b/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix index 7947ca1f6021..d77237c172f4 100644 --- a/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix @@ -7,12 +7,13 @@ , pythonOlder , requests , retrying +, setuptools }: buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.6.0"; - format = "setuptools"; + version = "0.4.6.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,9 +21,13 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - hash = "sha256-8DnzTwW4fQQIGAHZJbu2aKkqOUU6a6IGgif5tIZCing="; + hash = "sha256-fekiN4AHb/RNEMibQqV7By0FAyTcERZmmi0+qCG4NzQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp paho-mqtt diff --git a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 27e243ff61b8..534623abccdd 100644 --- a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -1,4 +1,5 @@ { lib +, bleak , buildPythonPackage , dotmap , fetchFromGitHub @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.18"; + version = "2.2.20"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-r3Hs3oD6CyYa/Ew0wMiLeUj/R4aa8Wc/W65EXMrPGmw="; + hash = "sha256-0q8omX306iM3p52u39Dc7m6oxAPo9Fs6CEVicYdIMT4="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + bleak dotmap pexpect protobuf diff --git a/nixpkgs/pkgs/development/python-modules/meson-python/default.nix b/nixpkgs/pkgs/development/python-modules/meson-python/default.nix index 9d34cb27c8cd..deaab05a6574 100644 --- a/nixpkgs/pkgs/development/python-modules/meson-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meson-python/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Meson Python build backend (PEP 517)"; homepage = "https://github.com/mesonbuild/meson-python"; license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.fridh ]; + maintainers = with lib.maintainers; [ fridh doronbehar ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix b/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix index 15d14934c5aa..9510ae01ffa5 100644 --- a/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "meteoalertapi"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rolfberkenbosch"; repo = "meteoalert-api"; - rev = "v${version}"; - hash = "sha256-uB2nza9fj7vOWixL4WEQX1N3i2Y80zQPM3x1+gRtg+w="; + rev = "refs/tags/v${version}"; + hash = "sha256-Imb4DVcNB3QiVSCLCI+eKpfl73aMn4NIItQVf7p0H+E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mf2py/default.nix b/nixpkgs/pkgs/development/python-modules/mf2py/default.nix index cd72dc7d40b9..ce50d3662f46 100644 --- a/nixpkgs/pkgs/development/python-modules/mf2py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mf2py/default.nix @@ -1,26 +1,34 @@ { lib +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub -, beautifulsoup4 , html5lib -, requests , lxml , mock -, nose +, poetry-core +, pytestCheckHook +, pythonOlder +, requests }: buildPythonPackage rec { pname = "mf2py"; - version = "1.1.3"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "microformats"; repo = "mf2py"; rev = "refs/tags/v${version}"; - hash = "sha256-Ya8DND1Dqbygbf1hjIGMlPwyc/MYIWIj+KnWB6Bqu1k="; + hash = "sha256-mhJ+s1rtXEJ6DqVmiyWNEK+3cdDLpR63Q4QGmD9wVio="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ beautifulsoup4 html5lib @@ -30,14 +38,17 @@ buildPythonPackage rec { nativeCheckInputs = [ lxml mock - nose + pytestCheckHook ]; - pythonImportsCheck = [ "mf2py" ]; + pythonImportsCheck = [ + "mf2py" + ]; meta = with lib; { description = "Microformats2 parser written in Python"; homepage = "https://microformats.org/wiki/mf2py"; + changelog = "https://github.com/microformats/mf2py/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ambroisie ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix b/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix index 78fd4b42f232..fe7fb4c178e0 100644 --- a/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -45,6 +45,5 @@ buildPythonPackage rec { changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mitmproxy-wireguard/default.nix b/nixpkgs/pkgs/development/python-modules/mitmproxy-wireguard/default.nix deleted file mode 100644 index b67459a5de02..000000000000 --- a/nixpkgs/pkgs/development/python-modules/mitmproxy-wireguard/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, stdenv -, darwin -, pytestCheckHook -, pythonOlder -, rustPlatform -, setuptools-rust -}: - -buildPythonPackage rec { - pname = "mitmproxy-wireguard"; - version = "0.1.23"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "decathorpe"; - repo = "mitmproxy_wireguard"; - rev = "refs/tags/${version}"; - hash = "sha256-z9ucTBLLRXc1lcHA0r1wUleoP8X7yIlHrtdZdLD9qJk="; - }; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.libiconv - darwin.apple_sdk.frameworks.Security - ]; - - nativeBuildInputs = [ - setuptools-rust - ] ++ (with rustPlatform; [ - cargoSetupHook - maturinBuildHook - ]); - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-qgyAaUpyuWVYMxUA4Gg8inlUMlSLo++16+nVvmDMhTQ="; - }; - - # Module has no tests, only a test client - doCheck = false; - - pythonImportsCheck = [ - "mitmproxy_wireguard" - ]; - - meta = with lib; { - description = "WireGuard frontend for mitmproxy"; - homepage = "https://github.com/decathorpe/mitmproxy_wireguard"; - changelog = "https://github.com/decathorpe/mitmproxy_wireguard/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index 283208e3500e..4dd3baeb614c 100644 --- a/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.2.1"; + version = "10.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-BO7oQ4TVuZ4dCtROq2M24V6HVo0jzyBdQfb67dYA07U="; + hash = "sha256-oxhpaFW++on3eRXm0anXZDRo6g/X5IflTcZkFF8Kcps="; }; nativeBuildInputs = [ @@ -63,6 +63,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "aioquic" + "cryptography" ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix index d386b1cb05da..9797c226b141 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, babel , gitpython , mkdocs , pytz @@ -24,6 +25,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + babel gitpython mkdocs pytz diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix index e8df6bbc8253..317271a10d55 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.4.14"; + version = "9.5.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-oP0DeSRgoLx6boEOa3if5BitGXmJ11DoUVZK16Sjlwg="; + hash = "sha256-t+kS/MZ6kfga+LPSBj0h+vkY/u/bd3iqRUyOHXfrwDU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix new file mode 100644 index 000000000000..a5a379171200 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix @@ -0,0 +1,47 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, mkdocs +, mkdocs-material +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "mkdocs-redoc-tag"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Blueswen"; + repo = "mkdocs-redoc-tag"; + rev = "refs/tags/v${version}"; + hash = "sha256-TOGFch+Uto3qeVMaHqK8SEy0v0cKtHofoGE8T1mnBOk="; + }; + + propagatedBuildInputs = [ + mkdocs + beautifulsoup4 + ]; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + mkdocs-material + pytestCheckHook + ]; + + meta = with lib; { + description = "A MkDocs plugin supports for add Redoc UI in page"; + homepage = "https://github.com/blueswen/mkdocs-redoc-tag"; + changelog = "https://github.com/blueswen/mkdocs-redoc-tag/blob/v${version}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ benhiemer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 85687b1882ba..60fe20c468af 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Blueswen"; repo = "mkdocs-swagger-ui-tag"; rev = "refs/tags/v${version}"; - hash = "sha256-lvE/mN56X2fx835GFNDYQc7ptxBYqwjrJ9Z6Flcvufg="; + hash = "sha256-TV7V1PttzyLeVQ/Ag/tMV2aqtCys1mlYpj6i0x+ko/w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mlx/default.nix b/nixpkgs/pkgs/development/python-modules/mlx/default.nix new file mode 100644 index 000000000000..036bbfac0418 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mlx/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildPythonPackage +, python3Packages +, pybind11 +, cmake +, xcbuild +, zsh +, darwin +, blas +, lapack +}: + +let + # static dependencies included directly during compilation + gguf-tools = fetchFromGitHub { + owner = "antirez"; + repo = "gguf-tools"; + rev = "af7d88d808a7608a33723fba067036202910acb3"; + hash = "sha256-LqNvnUbmq0iziD9VP5OTJCSIy+y/hp5lKCUV7RtKTvM="; + }; + nlohmann_json = fetchFromGitHub { + owner = "nlohmann"; + repo = "json"; + rev = "v3.11.3"; + hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg="; + }; +in +buildPythonPackage rec { + pname = "mlx"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ml-explore"; + repo = "mlx"; + rev = "refs/tags/v${version}"; + hash = "sha256-xNJPG8XGbC0fy6RGcn1cxCsejyHsgnV35PuP8F1I4R4="; + }; + + pyproject = true; + + patches = [ + # With Darwin SDK 11 we cannot include vecLib/cblas_new.h, this needs to wait for PR #229210 + # In the meantime, pretend Accelerate is not available and use blas/lapack instead. + ./disable-accelerate.patch + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" \ + ''; + + dontUseCmakeConfigure = true; + + env = { + PYPI_RELEASE = version; + # we can't use Metal compilation with Darwin SDK 11 + CMAKE_ARGS = toString [ + (lib.cmakeBool "MLX_BUILD_METAL" false) + (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}") + (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_JSON" "${nlohmann_json}") + ]; + }; + + nativeBuildInputs = [ cmake pybind11 xcbuild zsh gguf-tools nlohmann_json ] ++ (with python3Packages; [ setuptools ]); + + buildInputs = [ blas lapack ]; + + meta = with lib; { + homepage = "https://github.com/ml-explore/mlx"; + description = "An array framework for Apple silicon"; + changelog = "https://github.com/ml-explore/mlx/releases/tag/v${version}"; + license = licenses.mit; + platforms = [ "aarch64-darwin" ]; + maintainers = with maintainers; [ viraptor ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mlx/disable-accelerate.patch b/nixpkgs/pkgs/development/python-modules/mlx/disable-accelerate.patch new file mode 100644 index 000000000000..693e7f41104d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mlx/disable-accelerate.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d6bef9..d099673 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -104,7 +104,7 @@ elseif (MLX_BUILD_METAL) + ${QUARTZ_LIB}) + endif() + +-find_library(ACCELERATE_LIBRARY Accelerate) ++#find_library(ACCELERATE_LIBRARY Accelerate) + if (MLX_BUILD_ARM AND ACCELERATE_LIBRARY) + message(STATUS "Accelerate found ${ACCELERATE_LIBRARY}") + set(MLX_BUILD_ACCELERATE ON) diff --git a/nixpkgs/pkgs/development/python-modules/mmengine/default.nix b/nixpkgs/pkgs/development/python-modules/mmengine/default.nix index a73d1fff7d35..dd4e9095325f 100644 --- a/nixpkgs/pkgs/development/python-modules/mmengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mmengine/default.nix @@ -20,16 +20,16 @@ buildPythonPackage rec { pname = "mmengine"; - version = "0.10.1"; - format = "setuptools"; + version = "0.10.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "open-mmlab"; - repo = pname; + repo = "mmengine"; rev = "refs/tags/v${version}"; - hash = "sha256-PG6KSoM5VUyU84z66eZknQfMhS4YWAmyWCIIpRwUOpU="; + hash = "sha256-fKtPDdeKB3vX2mD+Tsicq8KOkPDSACzKK1XLyugdPQ4="; }; propagatedBuildInputs = [ @@ -54,6 +54,12 @@ buildPythonPackage rec { preCheck = '' export HOME=$TMPDIR + '' + # Otherwise, the backprop hangs forever. More precisely, this exact line: + # https://github.com/open-mmlab/mmengine/blob/02f80e8bdd38f6713e04a872304861b02157905a/tests/test_runner/test_activation_checkpointing.py#L46 + # Solution suggested in https://github.com/pytorch/pytorch/issues/91547#issuecomment-1370011188 + + '' + export MKL_NUM_THREADS=1 ''; pythonImportsCheck = [ @@ -77,6 +83,14 @@ buildPythonPackage rec { "test_lazy_import" # AssertionError "test_lazy_module" + + # Require unpackaged aim + "test_experiment" + "test_add_config" + "test_add_image" + "test_add_scalar" + "test_add_scalars" + "test_close" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/mmh3/default.nix b/nixpkgs/pkgs/development/python-modules/mmh3/default.nix index 73f38bbca258..9aff484888ab 100644 --- a/nixpkgs/pkgs/development/python-modules/mmh3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mmh3/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mmh3"; - version = "4.0.1"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rYvmldxORKeWMXSLpVYtgD8KxC02prl6U6yoSnCAk4U="; + hash = "sha256-oc8lNIuazSKd2kZKCU1hcPR9KFCh/Ldio7YXLSzmyko="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/mne-python/default.nix b/nixpkgs/pkgs/development/python-modules/mne-python/default.nix index 8a85f487d2d2..4e93aaf3311c 100644 --- a/nixpkgs/pkgs/development/python-modules/mne-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mne-python/default.nix @@ -1,66 +1,84 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, setuptools-scm , numpy , scipy , pytestCheckHook , pytest-timeout -, h5py +, pytest-harvest , matplotlib -, nibabel -, pandas -, scikit-learn , decorator , jinja2 , pooch , tqdm -, setuptools +, packaging +, importlib-resources +, lazy-loader +, h5io +, pymatreader , pythonOlder }: buildPythonPackage rec { pname = "mne-python"; - version = "1.6.0"; - format = "setuptools"; + version = "1.6.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mne-tools"; - repo = pname; + repo = "mne-python"; rev = "refs/tags/v${version}"; - hash = "sha256-OoaXNHGL2svOpNL5GHcVRfQc9GxIRpZRhpZ5Hi1JTzM="; + hash = "sha256-U1aMqcUZ3BcwqwOYh/qfG5PhacwBVioAgNc52uaoJL0"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov-report=" "" \ + --replace "--cov-branch" "" + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ - decorator - jinja2 - matplotlib numpy - pooch scipy - setuptools + matplotlib tqdm + pooch + decorator + packaging + jinja2 + lazy-loader + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; + passthru.optional-dependencies = { + hdf5 = [ + h5io + pymatreader + ]; + }; + nativeCheckInputs = [ - h5py - nibabel - pandas pytestCheckHook - scikit-learn pytest-timeout - ]; + pytest-harvest + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' - export HOME=$TMP + export HOME=$(mktemp -d) export MNE_SKIP_TESTING_DATASET_TESTS=true export MNE_SKIP_NETWORK_TESTS=1 ''; - # All tests pass, but Pytest hangs afterwards - probably some thread hasn't terminated - doCheck = false; - pythonImportsCheck = [ "mne" ]; @@ -68,7 +86,8 @@ buildPythonPackage rec { meta = with lib; { description = "Magnetoencephelography and electroencephalography in Python"; homepage = "https://mne.tools"; + changelog = "https://mne.tools/stable/changes/v${version}.html"; license = licenses.bsd3; - maintainers = with maintainers; [ bcdarwin ]; + maintainers = with maintainers; [ bcdarwin mbalatsko ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/moderngl/default.nix b/nixpkgs/pkgs/development/python-modules/moderngl/default.nix index 917e688d23cd..f2ff8760f02e 100644 --- a/nixpkgs/pkgs/development/python-modules/moderngl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/moderngl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.9.0"; + version = "5.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R7yZYSwhSJuhL1Qcna4k526KSSgzBk6P7p6zuumlZJo="; + hash = "sha256-EZyNNk3ePNjRwJ8jftSRZhe6dZlUoZUt9GlOUe5PZRE="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix b/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix index af36fe3bb60c..dec568c4a936 100644 --- a/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix +++ b/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "molecule-plugins"; - version = "23.5.0"; + version = "23.5.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-8T6gR7hlDIkmBLgbdjgryAu0riXqULI/MOgf2dWAKv8="; + hash = "sha256-orFDfVMtc24/vG23pp7FM+IzSyEV/5JFoLJ3LtlzjSM="; }; # reverse the dependency diff --git a/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix b/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix index e3a4f2418d16..74b88ca8dc73 100644 --- a/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage +, colorama , fetchFromGitHub -, pythonOlder -, pytestCheckHook -, pytest-lazy-fixture -, numpy , networkx +, numpy , pydicom -, colorama +, pytest-lazy-fixture +, pytestCheckHook +, pythonOlder +, setuptools , typeguard , versioneer }: @@ -29,10 +30,14 @@ buildPythonPackage rec { postPatch = '' # Asked in https://github.com/Project-MONAI/monai-deploy-app-sdk/issues/450 # if this patch can be incorporated upstream. - substituteInPlace pyproject.toml --replace 'versioneer-518' 'versioneer' + substituteInPlace pyproject.toml \ + --replace 'versioneer-518' 'versioneer' ''; - nativeBuildInputs = [ versioneer ]; + nativeBuildInputs = [ + versioneer + setuptools + ]; propagatedBuildInputs = [ numpy @@ -41,11 +46,16 @@ buildPythonPackage rec { typeguard ]; - nativeCheckInputs = [ pytestCheckHook pytest-lazy-fixture ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-lazy-fixture + ]; + disabledTests = [ # requires Docker daemon: "test_packager" ]; + pythonImportsCheck = [ "monai.deploy" "monai.deploy.core" @@ -57,7 +67,8 @@ buildPythonPackage rec { meta = with lib; { description = "Framework and tools to design, develop and verify AI applications in healthcare imaging"; homepage = "https://monai.io/deploy.html"; + changelog = "https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/v${version}.md"; license = licenses.asl20; - maintainers = [ maintainers.bcdarwin ]; + maintainers = with maintainers; [ bcdarwin ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/monty/default.nix b/nixpkgs/pkgs/development/python-modules/monty/default.nix index 8e9ac1b408d2..80256a11bfdb 100644 --- a/nixpkgs/pkgs/development/python-modules/monty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/monty/default.nix @@ -9,22 +9,24 @@ , pytestCheckHook , pythonOlder , ruamel-yaml +, setuptools +, setuptools-scm , torch , tqdm }: buildPythonPackage rec { pname = "monty"; - version = "2023.11.3"; - format = "setuptools"; + version = "2024.2.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "materialsvirtuallab"; - repo = pname; + repo = "monty"; rev = "refs/tags/v${version}"; - hash = "sha256-SENrAHCCWYEMWqPQSy61E8bMYkCBJepK5otb7B7UGXA="; + hash = "sha256-tKt0IMUmx1WvnQ27PyeyEEGekOKGY33YX4af1/ipbk4="; }; postPatch = '' @@ -32,6 +34,11 @@ buildPythonPackage rec { --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' ''; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ msgpack ruamel-yaml diff --git a/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix index a5bb698aa1af..3a9ca598c43e 100644 --- a/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mopeka-iot-ble"; - version = "0.5.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-m27As3tB77JbgY0kDDJ6kmYFTv2O/Sh6y9tFiKDIjbI="; + hash = "sha256-wF3ZSR9kjn6qWaB7SRKsQuHfbNMwdKS/5qR9nStsw1c="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix b/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix index ef6bd75d5f97..6e0d245f0f07 100644 --- a/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix +++ b/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix @@ -3,12 +3,13 @@ , fetchFromGitHub , pycryptodomex , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.19"; - format = "setuptools"; + version = "0.6.20"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - hash = "sha256-t2Y3ASGoMZKlZzbafpAjZHeWgaWS+UsvFd5wyfmJGvE="; + hash = "sha256-Ri14GwRpORk+8RdpPnrOOfDD+sqdQp9ESlYDnaS9ln8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pycryptodomex ]; diff --git a/nixpkgs/pkgs/development/python-modules/motmetrics/default.nix b/nixpkgs/pkgs/development/python-modules/motmetrics/default.nix new file mode 100644 index 000000000000..36fa2d9a7557 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/motmetrics/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, numpy +, pandas +, scipy +, xmltodict + +# tests +, pytestCheckHook +, pytest-benchmark +}: + +buildPythonPackage rec { + pname = "motmetrics"; + version = "1.4.0-unstable-20240130"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cheind"; + repo = "py-motmetrics"; + # latest release is not compatible with pandas 2.0 + rev = "7210fcce0be1b76c96a62f6fe4ddbc90d944eacb"; + hash = "sha256-7LKLHXWgW4QpivAgzvWl6qEG0auVvpiZ6bfDViCKsFY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + numpy + pandas + scipy + xmltodict + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-benchmark + ]; + + pythonImportsCheck = [ + "motmetrics" + ]; + + meta = with lib; { + description = "Bar_chart: Benchmark multiple object trackers (MOT) in Python"; + homepage = "https://github.com/cheind/py-motmetrics"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix index f41519c00112..deb54ab149be 100644 --- a/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { configurePhase = ""; installPhase = '' - mkdir -p "$out/lib/${python.libPrefix}/site-packages" - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + mkdir -p "$out/${python.sitePackages}" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --install-lib=$out/${python.sitePackages} \ --prefix="$out" # --install-lib: diff --git a/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix b/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix index 91d89c8b9a28..600c4ec0d05a 100644 --- a/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix @@ -22,6 +22,5 @@ buildPythonPackage rec { description = "Matplotlib utilities for the visualization, and visual analysis, of financial data"; homepage = "https://github.com/matplotlib/mplfinance"; license = [ licenses.bsd3 ]; - maintainers = [ maintainers.ehmry ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mplhep/default.nix b/nixpkgs/pkgs/development/python-modules/mplhep/default.nix index c39b24a17f31..e550285ccaac 100644 --- a/nixpkgs/pkgs/development/python-modules/mplhep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mplhep/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.31"; + version = "0.3.32"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-aZwazbDljRncB2p7qD95Cms0uQBU8tciUrXcKpsyVTM="; + hash = "sha256-xwlrMZLJKRW6iqMsDKS5BDqejADSk/qGOAnQDZ2fTPc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix index 65894b665cf2..0c7fad002e89 100644 --- a/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix @@ -1,46 +1,47 @@ -{ buildPythonPackage -, fetchPypi -, lib -, isPy27 - -# pythonPackages +{ lib +, buildPythonPackage +, fetchFromGitHub , msal -, pathlib2 , portalocker +, setuptools +, pythonOlder }: buildPythonPackage rec { pname = "msal-extensions"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-xnarpWsMzjeD3htcXs/oKNuZgWeHUSbKS0fcZDZFE1Q="; + src = fetchFromGitHub { + owner = "AzureAD"; + repo = "microsoft-authentication-extensions-for-python"; + rev = "refs/tags/${version}"; + hash = "sha256-ScInTvOgFxP5mgep5FRu6YZHPTtXhrcZGFE7Wdvcm4c="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ msal portalocker - ] ++ lib.optionals isPy27 [ - pathlib2 ]; - # upstream doesn't update this requirement probably because they use pip - postPatch = '' - substituteInPlace setup.py \ - --replace "portalocker~=1.0" "portalocker" - ''; - # No tests found doCheck = false; + pythonImportsCheck = [ + "msal_extensions" + ]; + meta = with lib; { description = "The Microsoft Authentication Library Extensions (MSAL-Extensions) for Python"; homepage = "https://github.com/AzureAD/microsoft-authentication-extensions-for-python"; + changelog = "https://github.com/AzureAD/microsoft-authentication-extensions-for-python/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/msal/default.nix b/nixpkgs/pkgs/development/python-modules/msal/default.nix index c489f5b75b2d..fb6eff799fbf 100644 --- a/nixpkgs/pkgs/development/python-modules/msal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msal/default.nix @@ -1,24 +1,31 @@ { lib +, cryptography , buildPythonPackage , fetchPypi , pyjwt , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "msal"; - version = "1.25.0"; - format = "setuptools"; + version = "1.26.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9EMp/bWfTwRMd5Fko0R0uKRK2eSUCvvEw6Oiu+kDJNk="; + hash = "sha256-IkdWB5/jOL6DhzdoK0n468IKh8HF7q9ZDarkUyuD3hU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + cryptography pyjwt requests ] diff --git a/nixpkgs/pkgs/development/python-modules/msgspec/default.nix b/nixpkgs/pkgs/development/python-modules/msgspec/default.nix index 5af0adeb0300..6dac69d22db8 100644 --- a/nixpkgs/pkgs/development/python-modules/msgspec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msgspec/default.nix @@ -4,22 +4,27 @@ , msgpack , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "msgspec"; - version = "0.18.5"; - format = "setuptools"; + version = "0.18.6"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jcrist"; - repo = pname; + repo = "msgspec"; rev = "refs/tags/${version}"; - hash = "sha256-BcENL1vPCspzYdAHicC5AHs/7xZPWf+Yys37vKgbris="; + hash = "sha256-xqtV60saQNINPMpOnZRSDnicedPSPBUQwPSE5zJGrTo="; }; + nativeBuildInputs = [ + setuptools + ]; + # Requires libasan to be accessible doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix index 4e28e2002452..4bc2e80642e6 100644 --- a/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "msoffcrypto-tool"; - version = "5.2.0"; + version = "5.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nolze"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9qhTGf4IE8PtTfshnqu2fcctznA+2bWH4jz0dmKtoOo="; + hash = "sha256-aQtEJyG0JGe4eSIRI4OUjJZNDBni6FFyJXXkbeiotSY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/msprime/default.nix b/nixpkgs/pkgs/development/python-modules/msprime/default.nix index 2ec32c255dfa..cf0f8abb22be 100644 --- a/nixpkgs/pkgs/development/python-modules/msprime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msprime/default.nix @@ -1,42 +1,32 @@ { lib , buildPythonPackage +, demes , fetchPypi -, fetchpatch -, oldest-supported-numpy -, setuptools-scm -, wheel -, pythonOlder , gsl -, numpy , newick -, tskit -, demes -, pytestCheckHook +, numpy +, oldest-supported-numpy , pytest-xdist +, pytestCheckHook +, pythonOlder , scipy +, setuptools-scm +, tskit +, wheel }: buildPythonPackage rec { pname = "msprime"; - version = "1.2.0"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YAJa2f0w2CenKubnYLbP8HodDhabLB2hAkyw/CPkp6o="; + hash = "sha256-eYjGHvlJXDZ+gu/J+52AI8PbKiB6ZEXUORlTrzxCbCk="; }; - patches = [ - # upstream patch fixes 2 failing unittests. remove on update - (fetchpatch { - name = "python311.patch"; - url = "https://github.com/tskit-dev/msprime/commit/639125ec942cb898cf4a80638f229e11ce393fbc.patch"; - hash = "sha256-peli4tdu8Bv21xIa5H8SRdfjQnTMO72IPFqybmSBSO8="; - includes = [ "tests/test_ancestry.py" ]; - }) - ]; - nativeBuildInputs = [ gsl oldest-supported-numpy @@ -60,10 +50,12 @@ buildPythonPackage rec { pytest-xdist scipy ]; + disabledTests = [ "tests/test_ancestry.py::TestSimulator::test_debug_logging" "tests/test_ancestry.py::TestSimulator::test_debug_logging_dtw" ]; + disabledTestPaths = [ "tests/test_demography.py" "tests/test_algorithms.py" @@ -86,6 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simulate genealogical trees and genomic sequence data using population genetic models"; homepage = "https://github.com/tskit-dev/msprime"; + changelog = "https://github.com/tskit-dev/msprime/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ alxsimon ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mujoco/default.nix b/nixpkgs/pkgs/development/python-modules/mujoco/default.nix index 881253845ed6..ed60720643a7 100644 --- a/nixpkgs/pkgs/development/python-modules/mujoco/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mujoco/default.nix @@ -1,20 +1,23 @@ -{ buildPythonPackage +{ absl-py +, buildPythonPackage , cmake +, etils , fetchPypi , glfw , lib , mujoco , numpy , perl -, pkgs , pybind11 +, pyopengl , python , setuptools +, stdenv }: buildPythonPackage rec { pname = "mujoco"; - version = "3.1.0"; + version = "3.1.2"; pyproject = true; @@ -24,13 +27,19 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-rZNVihIuvNJnQWqA5tV9DG5r3/LttWNW6fN2js+fDb8="; + hash = "sha256-U1MLwakZA/P9Sx6ZgYzDj72ZEXANspssn8g58jv6y7g="; }; nativeBuildInputs = [ cmake setuptools ]; dontUseCmakeConfigure = true; buildInputs = [ mujoco pybind11 ]; - propagatedBuildInputs = [ glfw numpy ]; + propagatedBuildInputs = [ + absl-py + etils + glfw + numpy + pyopengl + ]; pythonImportsCheck = [ "${pname}" ]; @@ -48,11 +57,15 @@ buildPythonPackage rec { # E.g. 3.11.2 -> "311" pythonVersionMajorMinor = with lib.versions; "${major python.pythonVersion}${minor python.pythonVersion}"; + + # E.g. "linux-aarch64" + platform = with stdenv.hostPlatform.parsed; + "${kernel.name}-${cpu.name}"; in '' ${perl}/bin/perl -0777 -i -pe "s/GIT_REPO\n.*\n.*GIT_TAG\n.*\n//gm" mujoco/CMakeLists.txt ${perl}/bin/perl -0777 -i -pe "s/(FetchContent_Declare\(\n.*lodepng\n.*)(GIT_REPO.*\n.*GIT_TAG.*\n)(.*\))/\1\3/gm" mujoco/simulate/CMakeLists.txt - build="/build/${pname}-${version}/build/temp.linux-x86_64-cpython-${pythonVersionMajorMinor}/" + build="/build/${pname}-${version}/build/temp.${platform}-cpython-${pythonVersionMajorMinor}/" mkdir -p $build/_deps ln -s ${mujoco.pin.lodepng} $build/_deps/lodepng-src ln -s ${mujoco.pin.eigen3} $build/_deps/eigen-src @@ -63,6 +76,7 @@ buildPythonPackage rec { description = "Python bindings for MuJoCo: a general purpose physics simulator."; homepage = "https://mujoco.org/"; + changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ tmplt ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/myjwt/default.nix b/nixpkgs/pkgs/development/python-modules/myjwt/default.nix index a54ab560a235..c310c7efe1a1 100644 --- a/nixpkgs/pkgs/development/python-modules/myjwt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/myjwt/default.nix @@ -12,6 +12,7 @@ , pytest-mock , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , questionary , requests , requests-mock @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "myjwt"; version = "1.6.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -33,12 +34,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "1.6.0" "${version}" \ - --replace 'cryptography = "^39.0.2"' 'cryptography = "^39.0.0"' + --replace-warn "1.6.0" "${version}" ''; + pythonRelaxDeps = [ + "cryptography" + "questionary" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index d63e6f9791e5..a51b5df67c23 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -9,17 +9,19 @@ , md-toc , mdformat , newversion +, pip , poetry-core , pyparsing , pytestCheckHook , pythonOlder , setuptools +, typing-extensions }: buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.21.0"; - format = "pyproject"; + version = "7.23.1"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +29,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-lj9Jkp1AGWIAdGzakpt0BMnmdwe1Uf04PI9sMfEBTbw="; + hash = "sha256-dbf2rHDQSeHEIN31yIm1142Z7AxTZzMf9FGvrWsJblA="; }; nativeBuildInputs = [ @@ -43,8 +45,10 @@ buildPythonPackage rec { md-toc mdformat newversion + pip pyparsing setuptools + typing-extensions ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nameko/default.nix b/nixpkgs/pkgs/development/python-modules/nameko/default.nix new file mode 100644 index 000000000000..aec20b0f43e7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nameko/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# install_requires +, dnspython +, eventlet +, kombu +, mock +, packaging +, path +, pyyaml +, requests +, setuptools +, six +, werkzeug +, wrapt +}: + +buildPythonPackage rec { + pname = "nameko"; + version = "2.14.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-J1NXi7Tca5KAGuozTSkwuX37dEhucF7daRmDBqlGjIg="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "path.py" "path" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + dnspython + eventlet + kombu + mock + packaging + path + pyyaml + requests + setuptools + six + werkzeug + wrapt + ]; + + # tests depend on RabbitMQ being installed - https://nameko.readthedocs.io/en/stable/contributing.html#running-the-tests + # and most of the tests are network based + doCheck = false; + + pythonImportsCheck = [ + "nameko" + ]; + + meta = with lib; { + description = "A microservices framework that lets service developers concentrate on application logic and encourages testability"; + homepage = "https://www.nameko.io/"; + changelog = "https://github.com/nameko/nameko/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ siddharthdhakane ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix b/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix index 64659858258b..95ae7bfb39bb 100644 --- a/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix @@ -13,6 +13,7 @@ , pyyaml , rich , typer +, tomli-w }: buildPythonPackage rec { @@ -46,6 +47,7 @@ buildPythonPackage rec { pyyaml rich typer + tomli-w ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/napari-svg/default.nix b/nixpkgs/pkgs/development/python-modules/napari-svg/default.nix index 9150abfb252b..3094327dd422 100644 --- a/nixpkgs/pkgs/development/python-modules/napari-svg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/napari-svg/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , imageio , napari-plugin-engine +, numpy , pythonOlder , setuptools-scm , vispy @@ -10,16 +11,16 @@ buildPythonPackage rec { pname = "napari-svg"; - version = "0.1.6"; - format = "setuptools"; + version = "0.1.10"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "napari"; - repo = pname; + repo = "napari-svg"; rev = "refs/tags/v${version}"; - hash = "sha256-lvI6RWT9oUE95vL6WO75CASc/Z+1G5UMm2p8vhqIjA0="; + hash = "sha256-ywN9lUwBFW8zP7ivP7MNTYFbTCcmaZxAuKr056uY68Q="; }; nativeBuildInputs = [ @@ -27,9 +28,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - vispy - napari-plugin-engine imageio + napari-plugin-engine + numpy + vispy ]; # Circular dependency: napari @@ -38,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A plugin for writing svg files from napari"; homepage = "https://github.com/napari/napari-svg"; + changelog = "https://github.com/napari/napari-svg/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/nats-py/default.nix b/nixpkgs/pkgs/development/python-modules/nats-py/default.nix index 5028ab345f03..3c384b8c5784 100644 --- a/nixpkgs/pkgs/development/python-modules/nats-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nats-py/default.nix @@ -5,6 +5,7 @@ , ed25519 , fetchFromGitHub , nats-server +, nkeys , pytestCheckHook , pythonOlder , setuptools @@ -13,8 +14,8 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.6.0"; - format = "pyproject"; + version = "2.7.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,23 +23,29 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-gpQXCihKvuXzCt1WNOd5W7RxxfVAvpaVP6OuHUiAQkw="; + hash = "sha256-spKz0rKTI8hWdO6r8VLtP3G8tS9ANsjYRbinXOARCOQ="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"--cov=nats", "--cov-report=html"' "" - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - aiohttp ed25519 ]; + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; + nkeys = [ + nkeys + ]; + # fast_parse = [ + # fast-mail-parser + # ]; + }; + nativeCheckInputs = [ nats-server pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix index 1242d018adad..f816abc1d740 100644 --- a/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix @@ -32,14 +32,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.14.1"; + version = "7.14.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IMuhDgRI3Hazvr/hrfkjZj47mDONr3e5e0JRHvWohhg="; + hash = "sha256-p/iAj9TggkMWc6xThAAhjdRe/QdvvrB8xuWqWjpOlJ4="; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/nixpkgs/pkgs/development/python-modules/ndeflib/default.nix b/nixpkgs/pkgs/development/python-modules/ndeflib/default.nix index 3699955627ec..165aed8942df 100644 --- a/nixpkgs/pkgs/development/python-modules/ndeflib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ndeflib/default.nix @@ -2,13 +2,15 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "ndeflib"; version = "0.3.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-cpfztE+/AW7P0J7QeTDfVGYc2gEkr7gzA352hC9bdTM="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -30,11 +36,14 @@ buildPythonPackage rec { disabledTests = [ # AssertionError caused due to wrong size "test_decode_error" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + "test_encode_error" ]; meta = with lib; { description = "Python package for parsing and generating NFC Data Exchange Format messages"; homepage = "https://github.com/nfcpy/ndeflib"; + changelog = "https://github.com/nfcpy/ndeflib/releases/tag/v${version}"; license = licenses.isc; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/neo/default.nix b/nixpkgs/pkgs/development/python-modules/neo/default.nix index 3db12e647838..d23d2fdc57ed 100644 --- a/nixpkgs/pkgs/development/python-modules/neo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/neo/default.nix @@ -6,20 +6,23 @@ , packaging , quantities , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "neo"; - version = "0.12.0"; - format = "setuptools"; + version = "0.13.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O2yk/AXf206VPiU+cJlL+7yP4ukJWPvaf6WGDK8/pjo="; + hash = "sha256-VnXR+jgaU8LH7ri16SnsA5neILsLUkU+G5nsbWbckfM="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ numpy packaging diff --git a/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index 5215da38339c..4db2398c25b5 100644 --- a/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.16.0"; + version = "5.17.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-ly/R2ufd5gEkUyfajpeMQblTiKipC9HFtxkWkh16zLo="; + hash = "sha256-BZo4TzFrH1ATl09zRXy+1AFJSBopmByDHe7oITZy7pA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/niaaml/default.nix b/nixpkgs/pkgs/development/python-modules/niaaml/default.nix index 4a4f175a8943..bc5d712913b8 100644 --- a/nixpkgs/pkgs/development/python-modules/niaaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/niaaml/default.nix @@ -5,28 +5,34 @@ , numpy , pandas , poetry-core -, scikit-learn -, toml-adapt , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, scikit-learn +, toml-adapt }: buildPythonPackage rec { pname = "niaaml"; version = "1.1.12"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "lukapecnik"; repo = "NiaAML"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-GAUXEkUOD04DQtRG/RAeeeLmenBd25h18Lmrxbm4X3A="; }; + pythonRelaxDeps = [ + "pandas" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook toml-adapt ]; @@ -54,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python automated machine learning framework"; homepage = "https://github.com/lukapecnik/NiaAML"; + changelog = "https://github.com/lukapecnik/NiaAML/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/niaarm/default.nix b/nixpkgs/pkgs/development/python-modules/niaarm/default.nix index 3b0399365613..e69bdd6169f7 100644 --- a/nixpkgs/pkgs/development/python-modules/niaarm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/niaarm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "niaarm"; - version = "0.3.5"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaARM"; rev = "refs/tags/${version}"; - hash = "sha256-E5G1uVDSErqwxTBNQ7qselemW9A3W8sr3ExPEh+1les="; + hash = "sha256-DOTeo5ZPZQR56E78pAKQ3DXarIUHhxXoZu0fISDr6fw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/niaclass/default.nix b/nixpkgs/pkgs/development/python-modules/niaclass/default.nix index 89d8ae746aed..eca766c67a0f 100644 --- a/nixpkgs/pkgs/development/python-modules/niaclass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/niaclass/default.nix @@ -5,28 +5,34 @@ , numpy , pandas , poetry-core -, scikit-learn -, toml-adapt , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, scikit-learn +, toml-adapt }: buildPythonPackage rec { pname = "niaclass"; version = "0.1.4"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "lukapecnik"; repo = "NiaClass"; rev = "refs/tags/${version}"; - sha256 = "sha256-md1e/cOIOQKoB760E5hjzjCsC5tS1CzgqAPTeVtrmuo="; + hash = "sha256-md1e/cOIOQKoB760E5hjzjCsC5tS1CzgqAPTeVtrmuo="; }; + pythonRelaxDeps = [ + "pandas" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook toml-adapt ]; @@ -42,7 +48,7 @@ buildPythonPackage rec { toml-adapt -path pyproject.toml -a change -dep scikit-learn -ver X ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -53,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework for solving classification tasks using Nature-inspired algorithms"; homepage = "https://github.com/lukapecnik/NiaClass"; + changelog = "https://github.com/lukapecnik/NiaClass/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/nianet/default.nix b/nixpkgs/pkgs/development/python-modules/nianet/default.nix index 4adca2e5b701..d91f278a5906 100644 --- a/nixpkgs/pkgs/development/python-modules/nianet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nianet/default.nix @@ -9,26 +9,27 @@ , pythonOlder , scikit-learn , toml-adapt +, tomli , torch }: buildPythonPackage rec { pname = "nianet"; version = "1.1.4"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "SasoPavlic"; - repo = pname; - rev = "version_${version}"; + repo = "nianet"; + rev = "refs/tags/version_${version}"; sha256 = "sha256-FZipl6Z9AfiL6WH0kvUn8bVxt8JLdDVlmTSqnyxe0nY="; }; nativeBuildInputs = [ - toml-adapt poetry-core + toml-adapt ]; propagatedBuildInputs = [ @@ -44,8 +45,9 @@ buildPythonPackage rec { toml-adapt -path pyproject.toml -a change -dep torch -ver X ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook + tomli ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/nibabel/default.nix b/nixpkgs/pkgs/development/python-modules/nibabel/default.nix index 34066a583646..3bccab344741 100644 --- a/nixpkgs/pkgs/development/python-modules/nibabel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nibabel/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "nibabel"; - version = "5.1.0"; - format = "pyproject"; + version = "5.2.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-znPKXpVyCechmiI8tx93I1yd8qz00/J/hhujjpSBrFM="; + hash = "sha256-Pfjxq5gdG9kvQzHVZVKNEmq5cX/b1M/mj0P80cK/P1I="; }; nativeBuildInputs = [ @@ -77,13 +77,9 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; - disabledTests = [ - # https://github.com/nipy/nibabel/issues/951 - "test_filenames" - ]; - meta = with lib; { homepage = "https://nipy.org/nibabel"; + changelog = "https://github.com/nipy/nibabel/blob/${version}/Changelog"; description = "Access a multitude of neuroimaging data formats"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; diff --git a/nixpkgs/pkgs/development/python-modules/nibe/default.nix b/nixpkgs/pkgs/development/python-modules/nibe/default.nix index 74b025014759..4dbaa2c94d3d 100644 --- a/nixpkgs/pkgs/development/python-modules/nibe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nibe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.7.0"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-hNxOB/H/KK9qHd+3FQHn9zjmCZRtY6H0nYKNqUc0FIg="; + hash = "sha256-baw2uJn2M0tcP897+h88aMkVul6l170Vyz6qwFHZ8+s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nipreps-versions/default.nix b/nixpkgs/pkgs/development/python-modules/nipreps-versions/default.nix new file mode 100644 index 000000000000..1c54ab9d905e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nipreps-versions/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, flit-scm +, packaging +, setuptools-scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "nipreps-versions"; + version = "1.0.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nipreps"; + repo = "version-schemes"; + rev = "refs/tags/${version}"; + hash = "sha256-B2wtLurzgk59kTooH51a2dewK7aEyA0dAm64Wp+tqhM="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + flit-scm + setuptools-scm + ]; + + propagatedBuildInputs = [ + packaging + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "nipreps_versions" ]; + + meta = with lib; { + description = "Setuptools_scm plugin for nipreps version schemes"; + homepage = "https://github.com/nipreps/version-schemes"; + changelog = "https://github.com/nipreps/version-schemes/blob/${src.rev}/CHANGES.md"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/niworkflows/default.nix b/nixpkgs/pkgs/development/python-modules/niworkflows/default.nix new file mode 100644 index 000000000000..494a834c937a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/niworkflows/default.nix @@ -0,0 +1,101 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatch-vcs +, hatchling +, pytestCheckHook +, attrs +, importlib-resources +, jinja2 +, looseversion +, matplotlib +, nibabel +, nilearn +, nipype +, nitransforms +, numpy +, packaging +, pandas +, pybids +, pyyaml +, scikit-image +, scipy +, seaborn +, svgutils +, templateflow +, traits +, transforms3d +}: + +buildPythonPackage rec { + pname = "niworkflows"; + version = "1.10.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nipreps"; + repo = "niworkflows"; + rev = "refs/tags/${version}"; + hash = "sha256-wQPk9imDvomg+NTWk+VeW1TE2QlvMyi1YYVVaznhktU="; + }; + + postPatch = '' + substituteInPlace pyproject.toml --replace '"traits < 6.4"' '"traits"' + ''; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + attrs + importlib-resources + jinja2 + looseversion + matplotlib + nibabel + nilearn + nipype + nitransforms + numpy + packaging + pandas + pybids + pyyaml + scikit-image + scipy + seaborn + svgutils + templateflow + traits + transforms3d + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeCheckInputs = [ pytestCheckHook ]; + preCheck = ''export HOME=$(mktemp -d)''; + pytestFlagsArray = [ "niworkflows" ]; + # try to download data: + disabledTests = [ + "test_GenerateCifti" + "ROIsPlot" + "ROIsPlot2" + "test_SimpleShowMaskRPT" + "test_cifti_surfaces_plot" + "niworkflows.utils.misc.get_template_specs" + "niworkflows.interfaces.cifti._prepare_cifti" + ]; + disabledTestPaths = [ "niworkflows/tests/test_registration.py" ]; + + pythonImportsCheck = [ "niworkflows" ]; + + meta = with lib; { + description = "Common workflows for MRI (anatomical, functional, diffusion, etc.)"; + homepage = "https://github.com/nipreps/niworkflows"; + changelog = "https://github.com/nipreps/niworkflows/blob/${src.rev}/CHANGES.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix b/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix index 68160474f078..19488765269b 100644 --- a/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix @@ -1,17 +1,18 @@ { lib , buildPythonPackage -, rns , fetchFromGitHub , lxmf -, urwid , pythonOlder , qrcode +, rns +, setuptools +, urwid }: buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.4"; - format = "setuptools"; + version = "0.4.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-k2KJSqOIBU1UwcmNgLek+XVI/C1YwOlAg+l/XJvTx5E="; + hash = "sha256-+w/Earu76mMJFp8ALvaDEkZOGJqlKbO7jfpW/xxvd1o="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ rns lxmf diff --git a/nixpkgs/pkgs/development/python-modules/norfair/default.nix b/nixpkgs/pkgs/development/python-modules/norfair/default.nix new file mode 100644 index 000000000000..17c4e3553531 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/norfair/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, filterpy +, importlib-metadata +, numpy +, rich +, scipy +, motmetrics +, opencv4 +, pytestCheckHook +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "norfair"; + version = "2.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tryolabs"; + repo = "norfair"; + rev = "v${version}"; + hash = "sha256-aKB5TYSLW7FOXIy9u2hK7px6eEmIQdKPrhChKaU1uYs="; + }; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "rich" + ]; + + propagatedBuildInputs = [ + filterpy + importlib-metadata + numpy + rich + scipy + ]; + + passthru.optional-dependencies = { + metrics = [ + motmetrics + ]; + video = [ + opencv4 + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "norfair" + ]; + + meta = with lib; { + description = "Lightweight Python library for adding real-time multi-object tracking to any detector"; + changelog = "https://github.com/tryolabs/norfair/releases/tag/v${version}"; + homepage = "https://github.com/tryolabs/norfair"; + license = licenses.bsd3; + maintainers = with maintainers; [ fleaz ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nose2/default.nix b/nixpkgs/pkgs/development/python-modules/nose2/default.nix index 28dd8df3e263..de96b74709ed 100644 --- a/nixpkgs/pkgs/development/python-modules/nose2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nose2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.14.0"; + version = "0.14.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-XCjXcKC5pwKGK9bDdVuizS95lN1RjJguXOKY1/N0ZqQ="; + hash = "sha256-f48Dohyd4sMwFZM6/O9yv45KLV3+w7QAkih95uQbCTo="; }; nativeBuildInputs = [ @@ -45,13 +45,8 @@ buildPythonPackage rec { unittestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - preCheck = '' - # https://github.com/nose-devs/nose2/issues/588 - substituteInPlace nose2/tests/functional/test_junitxml_plugin.py \ - --replace "test_skip_reason_in_message" "dont_test_skip_reason_in_message" - ''; - meta = with lib; { + changelog = "https://github.com/nose-devs/nose2/blob/${version}/docs/changelog.rst"; description = "Test runner for Python"; homepage = "https://github.com/nose-devs/nose2"; license = licenses.bsd0; diff --git a/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/nixpkgs/pkgs/development/python-modules/notebook/default.nix index e26ec900682a..10b02d1bb620 100644 --- a/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.0.6"; + version = "7.0.7"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-7GETsGUpAZ9/KHgZrwbJeiuvepWsIaj24yGSiY6fmlg="; + hash = "sha256-O8/wDBezrBQu9fQ21QY32TaydM+gtB9qwBdTY96bTgk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/nototools/default.nix b/nixpkgs/pkgs/development/python-modules/nototools/default.nix index 1b515b486f5f..4b20eba21b0a 100644 --- a/nixpkgs/pkgs/development/python-modules/nototools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nototools/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.17"; + version = "0.2.19"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "googlefonts"; repo = "nototools"; - rev = "v${version}"; - sha256 = "0jxydivqzggirc31jv7b4mrsjkg646zmra5m4h0pk4amgy65rvyp"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-anAz+5PIhGhpFunjV2EVk2CrbXq2U0e+LINYUnS0IKU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix index ff50cf872f9c..039e571695f8 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -114,7 +114,7 @@ in buildPythonPackage rec { # we default openblas to build with 64 threads # if a machine has more than 64 threads, it will segfault - # see https://github.com/xianyi/OpenBLAS/issues/2993 + # see https://github.com/OpenMathLib/OpenBLAS/issues/2993 preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) diff --git a/nixpkgs/pkgs/development/python-modules/oci/default.nix b/nixpkgs/pkgs/development/python-modules/oci/default.nix index 8ead56fdae90..0e5d643c7d96 100644 --- a/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.118.0"; + version = "2.120.0"; 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-bmV2IFMh/lp7+7MMqlg9zm8VkdZE48zqf8N3+/sSkTc="; + hash = "sha256-KUiv0cNkkvaouhR2UgdMVBwrZoqCxVif71/eiyjpskI="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix b/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix index 1104bcc02f82..9b4e1d0287eb 100644 --- a/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix @@ -25,15 +25,14 @@ , tqdm , typing-extensions , unpaper -, wheel , installShellFiles }: buildPythonPackage rec { pname = "ocrmypdf"; - version = "15.4.4"; + version = "16.0.4"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; pyproject = true; @@ -47,7 +46,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-Ff0OrSJFglVPpSNB0KvDMnatj+P57zWdcVAFaM+Sg0s="; + hash = "sha256-1Bg1R8c5VtJsd8NHd+WWdJRA39Jjgv9JUMcijZm942o="; }; patches = [ @@ -64,7 +63,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm - wheel installShellFiles ]; diff --git a/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix b/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix index 3b9afa0d6c93..eb3e76a5e518 100644 --- a/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix @@ -2,23 +2,27 @@ , nix-update-script , fetchPypi , buildPythonPackage +, deprecated , regex , pip }: buildPythonPackage rec { pname = "oelint-parser"; - version = "2.13.11"; + version = "3.1.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-Hr+2S4AGx0W+rrMFdAlN7/OcDTFYivZVYknD/sHWMDs="; + hash = "sha256-uR90Af/3E8YVZ2ALSVFOkTr59iVw5NkLOnQBm4Us1vk="; }; buildInputs = [ pip ]; - propagatedBuildInputs = [ regex ]; + propagatedBuildInputs = [ + deprecated + regex + ]; pythonImportsCheck = [ "oelint_parser" ]; # Fail to run inside the code the build. diff --git a/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/nixpkgs/pkgs/development/python-modules/onnx/default.nix index 810ddbf62cf2..7d5e27138ecc 100644 --- a/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -7,13 +7,16 @@ , nbval , numpy , parameterized -, protobuf +, protobuf_21 , pybind11 , pytestCheckHook , pythonOlder , tabulate , typing-extensions , abseil-cpp +, google-re2 +, pillow +, protobuf }: let @@ -39,9 +42,13 @@ in buildPythonPackage rec { buildInputs = [ abseil-cpp + protobuf + google-re2 + pillow ]; propagatedBuildInputs = [ + protobuf_21 protobuf numpy typing-extensions @@ -66,10 +73,6 @@ in buildPythonPackage rec { --replace 'include(googletest)' "" substituteInPlace cmake/unittest.cmake \ --replace 'googletest)' ')' - '' + '' - # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags - substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' ''; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/onvif-zeep/default.nix b/nixpkgs/pkgs/development/python-modules/onvif-zeep/default.nix new file mode 100644 index 000000000000..c1d60fd6bf26 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/onvif-zeep/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, zeep +}: + +buildPythonPackage rec { + pname = "onvif-zeep"; + version = "0.2.12"; + pyproject = true; + + src = fetchPypi { + pname = "onvif_zeep"; + inherit version; + hash = "sha256-qou8Aqc+qlCJSwwY45+o0xilg6ZkxlvzWzyAKdHEC0k="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + zeep + ]; + + pythonImportsCheck = [ + "onvif" + ]; + + # Tests require hardware + doCheck = false; + + meta = with lib; { + description = "Python Client for ONVIF Camera"; + homepage = "https://github.com/quatanium/python-onvif"; + license = licenses.mit; + maintainers = with maintainers; [ fleaz ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/openai/default.nix b/nixpkgs/pkgs/development/python-modules/openai/default.nix index f2b0ea86006f..fcd9620cdf4a 100644 --- a/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pythonRelaxDepsHook , hatchling # propagated , httpx @@ -11,6 +10,7 @@ , anyio , distro , sniffio +, cached-property , tqdm # optional , numpy @@ -26,38 +26,32 @@ buildPythonPackage rec { pname = "openai"; - version = "1.7.1"; + version = "1.11.1"; pyproject = true; - disabled = pythonOlder "3.7.1"; src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-NXZ+7gDA3gMGSrmgceHxcR45LrXdazXbYuhcoUsNXew="; + hash = "sha256-PtxKQQfcM4aOlqU0qIJDpB/24Wkt/omx+uDk4mRZU4s="; }; nativeBuildInputs = [ hatchling - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - # https://github.com/openai/openai-python/issues/921 - "anyio" ]; propagatedBuildInputs = [ httpx pydantic + typing-extensions anyio distro sniffio tqdm ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions + cached-property ]; passthru.optional-dependencies = { @@ -80,15 +74,13 @@ buildPythonPackage rec { dirty-equals ]; - pytestFlagsArray = [ - "-W" "ignore::DeprecationWarning" + disabledTests = [ + # makes network requests + "test_streaming_response" ]; - OPENAI_API_KEY = "sk-foo"; - disabledTestPaths = [ # makes network requests - "tests/test_client.py" "tests/api_resources" ]; diff --git a/nixpkgs/pkgs/development/python-modules/openant/default.nix b/nixpkgs/pkgs/development/python-modules/openant/default.nix index ed142826160b..639ea62a17f3 100644 --- a/nixpkgs/pkgs/development/python-modules/openant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "openant-unstable"; - version = "1.2.1"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Tigge"; repo = "openant"; rev = "refs/tags/v${version}"; - hash = "sha256-Ook9dwcyWvpaGylVDjBxQ2bnXRUBPYQHo6Wub+ISpwE="; + hash = "sha256-wDtHlkVyD7mMDXZ4LGMgatr9sSlQKVbgkYsKvHGr9Pc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix b/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix index 7fe8de134b48..698816a62620 100644 --- a/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix @@ -4,23 +4,28 @@ , pytestCheckHook , pythonOlder , requests +, setuptools , testfixtures }: buildPythonPackage rec { pname = "openerz-api"; - version = "0.2.0"; - format = "setuptools"; + version = "0.3.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "misialq"; - repo = pname; + repo = "openerz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-6q0mKWyTTlNJ/DCeAsck1meM5dQovYBcV2EqmjlABvc="; + hash = "sha256-CwK61StspZJt0TALv76zfibUzlriwp9HRoYOtX9bU+c="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; @@ -34,11 +39,6 @@ buildPythonPackage rec { "openerz_api" ]; - disabledTests = [ - # Assertion issue - "test_sensor_make_api_request" - ]; - meta = with lib; { description = "Python module to interact with the OpenERZ API"; homepage = "https://github.com/misialq/openerz-api"; diff --git a/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix b/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix index 82af53c55119..94252131d9a0 100644 --- a/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix @@ -1,22 +1,20 @@ { lib , buildPythonPackage -, fetchFromGitLab -, pythonOlder - -# dependencies , et-xmlfile - -# tests +, fetchFromGitLab , lxml , pandas , pillow , pytestCheckHook +, pythonAtLeast +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "openpyxl"; version = "3.1.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,10 +22,14 @@ buildPythonPackage rec { domain = "foss.heptapod.net"; owner = "openpyxl"; repo = "openpyxl"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-SWRbjA83AOLrfe6on2CSb64pH5EWXkfyYcTqWJNBEP0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ et-xmlfile ]; @@ -40,20 +42,29 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - # broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116 - "--deselect=openpyxl/chart/tests/test_reader.py::test_read" - "--deselect=openpyxl/comments/tests/test_comment_reader.py::test_read_comments" - "--deselect=openpyxl/drawing/tests/test_spreadsheet_drawing.py::TestSpreadsheetDrawing::test_ignore_external_blip" - "--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_from_xml" - "--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_filenames" - "--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_exts" - "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_from_complex" - "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_merge_named_styles" - "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_unprotected_cell" - "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_none_values" - "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_rgb_colors" - "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_named_styles" - "--deselect=openpyxl/workbook/external_link/tests/test_external.py::test_read_ole_link" + "-W" + "ignore::DeprecationWarning" + ]; + disabledTests = [ + # Tests broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116 + "test_read" + "test_read_comments" + "test_ignore_external_blip" + "test_from_xml" + "test_filenames" + "test_exts" + "test_from_complex" + "test_merge_named_styles" + "test_unprotected_cell" + "test_none_values" + "test_rgb_colors" + "test_named_styles" + "test_read_ole_link" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + "test_broken_sheet_ref" + "test_name_invalid_index" + "test_defined_names_print_area" + "test_no_styles" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix index 6ad0aeca07d9..1dca33bba9e1 100644 --- a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-aXy2JRXFSNO3/Fyz+GXiebkw05433OsR2HH4H5+lkeg="; + hash = "sha256-dsm3QKLNYl/MbpJBYU7vKgk0y3I1SlxYcWj4+t7y5nQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix index 72957901af41..5b59d43e7816 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.21.0"; + version = "1.22.0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta @@ -22,7 +22,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-igG0oHRa6M4d7pMp7fgBo13x5XADZeYgFAL8WzDXsyw="; + hash = "sha256-6BmBmooVaH1FOpgXpFlYth0r9XaNtmb9UezeP8hWEok="; }; sourceRoot = "${src.name}/opentelemetry-api"; diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix new file mode 100644 index 000000000000..71860dd8fd74 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, flask +, hatchling +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-instrumentation-wsgi +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, opentelemetry-util-http +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-flask"; + disabled = pythonOlder "3.7"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-flask"; + + format = "pyproject"; + + nativeBuildInputs = [ hatchling ]; + + propagatedBuildInputs = [ + flask + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-wsgi + opentelemetry-semantic-conventions + opentelemetry-util-http + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.flask" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-flask"; + description = "Flask Middleware for OpenTelemetry based on the WSGI middleware"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 4ee758ea564d..f5e76507d3ab 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "1.16.0"; + version = "0.43b0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-6tGQjPBej2zv5yJN0S46le3kyD7q3TELYyDmyxlp5Wo="; + hash = "sha256-fUyA3cPXAxO506usEWxOUX9xiapc8Ocnbx73LP6ghRE="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix index 85e28f2a6d49..e14338ffcbce 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -33,6 +33,12 @@ buildPythonPackage { pytestCheckHook ]; + # https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1940 + disabledTests = [ + "test_nonstandard_method" + "test_nonstandard_method_allowed" + ]; + pythonImportsCheck = [ "opentelemetry.util.http" ]; meta = opentelemetry-instrumentation.meta // { diff --git a/nixpkgs/pkgs/development/python-modules/openusd/default.nix b/nixpkgs/pkgs/development/python-modules/openusd/default.nix index 70ae6eb5e08b..f97a9f425ecd 100644 --- a/nixpkgs/pkgs/development/python-modules/openusd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openusd/default.nix @@ -23,7 +23,7 @@ , ptex , embree , alembic -, openexr +, imath , flex , bison , qt6 @@ -94,7 +94,7 @@ buildPythonPackage rec { ptex embree alembic.dev - openexr + imath flex bison boost diff --git a/nixpkgs/pkgs/development/python-modules/openwebifpy/default.nix b/nixpkgs/pkgs/development/python-modules/openwebifpy/default.nix index 48d5ba86ff75..3d2da5207656 100644 --- a/nixpkgs/pkgs/development/python-modules/openwebifpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openwebifpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "openwebifpy"; - version = "4.0.4"; + version = "4.2.1"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-mGCi3nFnyzA+yKD5qtpErXYjOA6liZRiy7qJTbTGGnQ="; + hash = "sha256-dCgbMyyVmYGPV8GyZUrMR+IO8nGoQ//dnmHmhFH2iJo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/opower/default.nix b/nixpkgs/pkgs/development/python-modules/opower/default.nix index 9c35a3c5491f..6e5225d17337 100644 --- a/nixpkgs/pkgs/development/python-modules/opower/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opower/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-OT+QCbHQbL3vCfPuyzxBKqUJ2EtFn+PslrKGlrC6Ip8="; + hash = "sha256-YqNHjGJ0BkF8/1LVDqbw9QoJgPgwbA1sIPJUuP4TTJY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/optimum/default.nix b/nixpkgs/pkgs/development/python-modules/optimum/default.nix index 42fb645ed097..ad542017d1f0 100644 --- a/nixpkgs/pkgs/development/python-modules/optimum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.16.1"; + version = "1.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-UlxArfNK4Ialodpne5GY7GuWGUBcLbSjAidL67Li0S0="; + hash = "sha256-bEwCUPZJT1UTD8mQJKg+Nwag6kpn4076uyKocKI/+/M="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oras/default.nix b/nixpkgs/pkgs/development/python-modules/oras/default.nix index 6dd42eeca3db..c43a92524e01 100644 --- a/nixpkgs/pkgs/development/python-modules/oras/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oras/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "oras"; - version = "0.1.26"; + version = "0.1.27"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "oras-project"; repo = "oras-py"; rev = "refs/tags/${version}"; - hash = "sha256-t3098ZeAkwLhinyrFwmi7KKrFgZZKPN6qvp3REQNwG8="; + hash = "sha256-T2zuflew91UsEjhPKPjNxPBN+C//S1vWvXKVT602EVI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix index 708bbd62c36f..0e7a5abedda5 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix @@ -2,14 +2,17 @@ , buildPythonPackage , fetchPypi , alembic +, debtcollector , oslo-config , oslo-context +, oslo-i18n , oslo-utils , oslotest , pbr +, psycopg2 , setuptools , sqlalchemy -, sqlalchemy-migrate +, stevedore , stestr , testresources , testscenarios @@ -33,18 +36,21 @@ buildPythonPackage rec { propagatedBuildInputs = [ alembic + debtcollector oslo-config - oslo-context + oslo-i18n oslo-utils sqlalchemy - sqlalchemy-migrate - testresources - testscenarios + stevedore ]; nativeCheckInputs = [ + oslo-context oslotest stestr + psycopg2 + testresources + testscenarios ]; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/osqp/default.nix b/nixpkgs/pkgs/development/python-modules/osqp/default.nix index 13797c4d17f8..f58a3fec14c8 100644 --- a/nixpkgs/pkgs/development/python-modules/osqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osqp/default.nix @@ -5,6 +5,7 @@ , fetchPypi , future , numpy +, oldest-supported-numpy , pytestCheckHook , pythonOlder , qdldl @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "osqp"; version = "0.6.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,6 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake + oldest-supported-numpy setuptools-scm ]; @@ -50,6 +52,14 @@ buildPythonPackage rec { disabledTests = [ # Need an unfree license package - mkl "test_issue14" + ] + # disable tests failing after scipy 1.12 update + # https://github.com/osqp/osqp-python/issues/121 + # re-enable once unit tests fixed + ++ [ + "feasibility_tests" + "polish_tests" + "update_matrices_tests" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pamqp/default.nix b/nixpkgs/pkgs/development/python-modules/pamqp/default.nix index 62c568e64818..b3ad60e7d1c8 100644 --- a/nixpkgs/pkgs/development/python-modules/pamqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pamqp/default.nix @@ -2,24 +2,29 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytestCheckHook }: buildPythonPackage rec { - version = "3.2.1"; + version = "3.3.0"; pname = "pamqp"; disabled = pythonOlder "3.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "gmr"; repo = "pamqp"; rev = version; - hash = "sha256-zvvRoGMNP4NMy3Etjif5MYUPdRqmQXATbFgxaPp1TaM="; + hash = "sha256-0vjiPBLd8afnATjmV2sINsBd4j7L544u5DA3jLiLSsY="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -38,6 +43,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/gmr/pamqp/blob/${src.rev}/docs/changelog.rst"; description = "RabbitMQ Focused AMQP low-level library"; homepage = "https://github.com/gmr/pamqp"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix index ef387df4f4c6..6fa2978ceb4b 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix @@ -1,8 +1,11 @@ { lib , stdenv +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub +, html5lib , jinja2 +, lxml , matplotlib , odfpy , openpyxl @@ -24,16 +27,16 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.0.3.230814"; - format = "pyproject"; + version = "2.1.4.231227"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pandas-dev"; - repo = pname; + repo = "pandas-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-V/igL+vPJADOL7LwBJljqs2a1BB3vDVYTWXIkK/ImYY="; + hash = "sha256-AkgMesDesKkVkwxNnGYG71IuIgF3G+BecpfWNWVucC8="; }; nativeBuildInputs = [ @@ -46,7 +49,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + beautifulsoup4 + html5lib jinja2 + lxml matplotlib odfpy openpyxl diff --git a/nixpkgs/pkgs/development/python-modules/panel/default.nix b/nixpkgs/pkgs/development/python-modules/panel/default.nix index c47cea4567a8..dc7892df3228 100644 --- a/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.3.4"; + version = "1.3.8"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-FK/ekqXCtTHyzLeFs0tHEeH0VXk0yFcns1lOLa5z0KU="; + hash = "sha256-Sb85MZhqDd8/e0vaPGXGoxHVJ3UkrNtOC/9py6a/V3U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/param/default.nix b/nixpkgs/pkgs/development/python-modules/param/default.nix index c05f906d5b10..f6bbbf3b78ff 100644 --- a/nixpkgs/pkgs/development/python-modules/param/default.nix +++ b/nixpkgs/pkgs/development/python-modules/param/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "param"; - version = "2.0.0"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "holoviz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8R1+utY3e3py4iJTgOVfzt5Y7bp2Rn6OfoITGuOsb5c="; + hash = "sha256-kVuab6+l4KOtSvj6aI9zsQJ91tfCDJkHrSTcRL9SViY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix b/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix index 576b54860557..ac859c0c825f 100644 --- a/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , dateparser , dnspython +, elastic-transport , elasticsearch , elasticsearch-dsl , expiringdict @@ -51,7 +52,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "elasticsearch<7.14.0" "elasticsearch" + --replace "elasticsearch<7.14.0" "elasticsearch" \ + --replace "elasticsearch-dsl==7.4.0" "elasticsearch-dsl" ''; nativeBuildInputs = [ @@ -64,6 +66,7 @@ buildPythonPackage rec { boto3 dateparser dnspython + elastic-transport elasticsearch elasticsearch-dsl expiringdict @@ -89,7 +92,9 @@ buildPythonPackage rec { # https://github.com/domainaware/parsedmarc/issues/426 doCheck = false; - pythonImportsCheck = [ "parsedmarc" ]; + pythonImportsCheck = [ + "parsedmarc" + ]; passthru = { inherit dashboard; @@ -97,11 +102,11 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#${lib.replaceStrings [ "." ] [ "" ] version}"; description = "Python module and CLI utility for parsing DMARC reports"; homepage = "https://domainaware.github.io/parsedmarc/"; - mainProgram = "parsedmarc"; - maintainers = with maintainers; [ talyz ]; + changelog = "https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#${lib.replaceStrings [ "." ] [ "" ] version}"; license = licenses.asl20; + maintainers = with maintainers; [ talyz ]; + mainProgram = "parsedmarc"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pastescript/default.nix b/nixpkgs/pkgs/development/python-modules/pastescript/default.nix index 27933066c7b7..70094b5aaafb 100644 --- a/nixpkgs/pkgs/development/python-modules/pastescript/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pastescript/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pastescript"; - version = "3.3.0"; + version = "3.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PasteScript"; inherit version; - hash = "sha256-3eyAGhOsZn4JTt3ij5AhLN6nvcmhjUNxsI9abvfS66I="; + hash = "sha256-k0jvBlr/Is8ViMEt+wIMx1HGSC4hb4o8dRL6QKQ/kNw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pathos/default.nix b/nixpkgs/pkgs/development/python-modules/pathos/default.nix index cf9d9eaa48ca..690734a4e0f8 100644 --- a/nixpkgs/pkgs/development/python-modules/pathos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathos/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; - rev = "refs/tags/pathos-${version}"; - hash = "sha256-uQv1t3TRbvoQv86wNOdc5k0cgKt9kvnw5/DGbbbE46w="; + rev = "refs/tags/${version}"; + hash = "sha256-b4HCiAvBGkFMxWh2PHC2kZ9G4PsQqVhKeIxLBKj09jU="; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parallel graph management and execution in heterogeneous computing"; homepage = "https://pathos.readthedocs.io/"; - changelog = "https://github.com/uqfoundation/pathos/releases/tag/pathos-${version}"; + changelog = "https://github.com/uqfoundation/pathos/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/patool/default.nix b/nixpkgs/pkgs/development/python-modules/patool/default.nix index d36400970391..ab4ef91d07a0 100644 --- a/nixpkgs/pkgs/development/python-modules/patool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/patool/default.nix @@ -37,7 +37,7 @@ let in buildPythonPackage rec { pname = "patool"; - version = "2.0.0"; + version = "2.1.1"; format = "setuptools"; #pypi doesn't have test data @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "wummel"; repo = pname; rev = "upstream/${version}"; - hash = "sha256-Hjpifsi5Q1eoe/MFWuQBDyjoXi/aUG4VN84yNMkAZaE="; + hash = "sha256-B2P6JldMOAxr4WS+wST+kRVvEm41zH3Nh5LLKoFOws4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pcbnew-transition/default.nix b/nixpkgs/pkgs/development/python-modules/pcbnew-transition/default.nix index 2ac478308cda..2f42e00a0847 100644 --- a/nixpkgs/pkgs/development/python-modules/pcbnew-transition/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pcbnew-transition/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "pcbnewTransition"; - version = "0.3.4"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3CJUG1kd63Lg0r9HpJRIvttHS5s2EuZRoxeXrqsJ/kQ="; + hash = "sha256-M4r6IeARVZq+KO7Q0tbHFD/BMeLN6vmuxfnstmMPgdg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pdfrw2/default.nix b/nixpkgs/pkgs/development/python-modules/pdfrw2/default.nix new file mode 100644 index 000000000000..6ed93640af7e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pdfrw2/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pillow +, pycryptodome +, reportlab +, setuptools +}: + +buildPythonPackage rec { + pname = "pdfrw2"; + version = "0.5.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-5qnMq4Pnaaeov+Lb3fD0ndfr5SAy6SlXTwG7v6IZce0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pillow + reportlab + pycryptodome + ]; + + pythonImportCheck = [ "pdfrw" ]; + + meta = with lib; { + description = "Pure Python library that reads and writes PDFs"; + homepage = "https://github.com/sarnold/pdfrw"; + maintainers = with maintainers; [ loicreynier ]; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix b/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix index 3d32a02768b4..0e1cc04f920b 100644 --- a/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.1.7"; + version = "2.1.8"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-1YM/vba+8+2wKcWzPKzkpaWVmHqbFsYdhQSY/VBBAfo="; + hash = "sha256-d8i+FvxNFPM18W7NmOwh9bqZnMUenF7eCPdcCw4BT7s="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pdoc/default.nix b/nixpkgs/pkgs/development/python-modules/pdoc/default.nix index 0c570aa6165c..b87b76afdc04 100644 --- a/nixpkgs/pkgs/development/python-modules/pdoc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdoc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "14.2.0"; + version = "14.4.0"; disabled = pythonOlder "3.8"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-Mmmq4jqRQow+1jn5ZDVMtP1uxrYgHJK/IQrwFWNw8ag="; + hash = "sha256-2k9uIK6TvoGtVqnh97g9f5QvjhyZlznRvYdw5sPaeVE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index 2d587401e06a..a5c5ff601bcd 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -1,24 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, setuptools +, hatchling , pythonOlder }: buildPythonPackage rec { pname = "pex"; - version = "2.1.159"; + version = "2.1.162"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hBlwfyQ1PbD6AyCsra2yZwt0x8+iGtDisU9coTSJRZI="; + hash = "sha256-XeAOEhmNEACr+KrIYaclDH7EW2XQeobIAQvm99hn24M="; }; nativeBuildInputs = [ - setuptools + hatchling ]; # A few more dependencies I don't want to handle right now... diff --git a/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/nixpkgs/pkgs/development/python-modules/pglast/default.nix index 883def3b068b..4a3e4794bd77 100644 --- a/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.8"; + version = "6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+3ysQuGrAH5xCBKaP0T/PLfbmLuxiKHPB+76D32GG9E="; + hash = "sha256-mGP7o52Wun6AdE2jMAJBmLR10EmN50qzbMzB06BFXMg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 4ba20f5aef31..386f64718eb0 100644 --- a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -7,7 +7,7 @@ , jbig2dec , deprecated , lxml -, mupdf +, mupdf-headless , numpy , packaging , pillow @@ -20,12 +20,11 @@ , qpdf , setuptools , substituteAll -, wheel }: buildPythonPackage rec { pname = "pikepdf"; - version = "8.9.0"; + version = "8.11.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,14 +39,14 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-ia+D0OeB/MQWRniYkBEWZsDCwEApYGgu0++I/HupK6w="; + hash = "sha256-mxUXXD7/ERC6mfmLLo+zdsVblIplrlcnzTNQ7YUk3Q4="; }; patches = [ (substituteAll { src = ./paths.patch; - jbig2dec = "${lib.getBin jbig2dec}/bin/jbig2dec"; - mudraw = "${lib.getBin mupdf}/bin/mudraw"; + jbig2dec = lib.getExe' jbig2dec "jbig2dec"; + mutool = lib.getExe' mupdf-headless "mutool"; }) ]; @@ -63,7 +62,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 setuptools - wheel ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch b/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch index c9c61176aa6f..1bd030c186c2 100644 --- a/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch +++ b/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch @@ -1,18 +1,18 @@ diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py -index d27c660..6796984 100644 +index da40043f..4f566f01 100644 --- a/src/pikepdf/_methods.py +++ b/src/pikepdf/_methods.py -@@ -72,7 +72,7 @@ def _mudraw(buffer, fmt) -> bytes: +@@ -74,7 +74,7 @@ def _mudraw(buffer, fmt) -> bytes: tmp_in.flush() proc = run( -- ['mudraw', '-F', fmt, '-o', '-', tmp_in.name], -+ ['@mudraw@', '-F', fmt, '-o', '-', tmp_in.name], +- ['mutool', 'draw', '-F', fmt, '-o', '-', tmp_in.name], ++ ['@mutool@', 'draw', '-F', fmt, '-o', '-', tmp_in.name], capture_output=True, check=True, ) diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py -index f89b4f9..f187ebd 100644 +index f89b4f90..f187ebdf 100644 --- a/src/pikepdf/jbig2.py +++ b/src/pikepdf/jbig2.py @@ -63,7 +63,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): diff --git a/nixpkgs/pkgs/development/python-modules/pillow-jpls/default.nix b/nixpkgs/pkgs/development/python-modules/pillow-jpls/default.nix new file mode 100644 index 000000000000..cc4d7cde5c51 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pillow-jpls/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchPypi +, fetchpatch +, pythonOlder +, pytestCheckHook +, cmake +, ninja +, scikit-build-core +, charls +, eigen +, fmt +, numpy +, pillow +, pybind11 +, setuptools +, pathspec +, pyproject-metadata +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pillow-jpls"; + version = "1.3.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "planetmarshall"; + repo = "pillow-jpls"; + rev = "refs/tags/v${version}"; + hash = "sha256-Rc4/S8BrYoLdn7eHDBaoUt1Qy+h0TMAN5ixCAuRmfPU="; + }; + + postPatch = '' + substituteInPlace pyproject.toml --replace '"conan~=2.0.16",' "" + ''; + + nativeBuildInputs = [ + cmake + ninja + pybind11 + scikit-build-core + setuptools + setuptools-scm + ]; + buildInputs = [ + charls + eigen + fmt + ]; + propagatedBuildInputs = [ + numpy + pillow + pathspec + pyproject-metadata + ]; + + pypaBuildFlags = [ "-C" "cmake.args='--preset=sysdeps'" ]; + dontUseCmakeConfigure = true; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + checkInputs = [ + pytestCheckHook + ]; + # prevent importing from build during test collection: + preCheck = ''rm -rf pillow_jpls''; + + pythonImportsCheck = [ + "pillow_jpls" + ]; + + meta = with lib; { + description = "A JPEG-LS plugin for the Python Pillow library"; + homepage = "https://github.com/planetmarshall/pillow-jpls"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index 7cf0bb9420fe..f101d6b361ec 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -12,15 +12,15 @@ import ./generic.nix (rec { pname = "pillow"; - version = "10.1.0"; + version = "10.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "Pillow"; + pname = "pillow"; inherit version; - hash = "sha256-5r+N5sNu2WyG6jtuHVJzxT9G71GKBiRkzX713Sz5Ljg="; + hash = "sha256-6H8LLHgVfhLXaGsn1jwHD9ZdmU6N2ubzKODc9KDNAH4="; }; passthru.tests = { diff --git a/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix b/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix index 2b7597499632..2715e1748051 100644 --- a/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , setuptools +, poetry-core +, pythonRelaxDepsHook , numpy , pyyaml , python-dateutil @@ -14,16 +16,19 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "2.2.5"; + version = "3.0.2"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-F2mWUpFMn2ipopa3UjvzrmNZsHtdRrUwfkuHbDYBElo="; + pname = "pinecone_client"; + inherit version; + hash = "sha256-+aCDAzPuzhB7TvERneI9rWphv/q38jjmGEFtUcRtKcg="; }; nativeBuildInputs = [ setuptools + poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -38,12 +43,20 @@ buildPythonPackage rec { loguru ]; + pythonRelaxDeps = [ + "urllib3" + ]; + doCheck = false; + pythonImportsCheck = [ + "pinecone" + ]; + meta = with lib; { homepage = "https://www.pinecone.io/"; description = "The Pinecone python client"; license = licenses.mit; - maintainers = with maintainers; [happysalada]; + maintainers = with maintainers; [ happysalada ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pins/default.nix b/nixpkgs/pkgs/development/python-modules/pins/default.nix new file mode 100644 index 000000000000..3d02d7b03728 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pins/default.nix @@ -0,0 +1,104 @@ +{ lib +, adlfs +, appdirs +, buildPythonPackage +, fastparquet +, fetchFromGitHub +, fsspec +, gcsfs +, humanize +, importlib-metadata +, importlib-resources +, jinja2 +, joblib +, pandas +, pyarrow +, pytest-cases +, pytest-parallel +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, s3fs +, setuptools +, setuptools-scm +, xxhash +}: + +buildPythonPackage rec { + pname = "pins"; + version = "0.8.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "rstudio"; + repo = "pins-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-rNIjHwFELHoxDxC/T5vPzHA6Ifjz01rJpTK6kjUxOIM="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + appdirs + fsspec + humanize + importlib-metadata + importlib-resources + jinja2 + joblib + pandas + pyyaml + requests + xxhash + ]; + + passthru.optional-dependencies = { + aws = [ + s3fs + ]; + azure = [ + adlfs + ]; + gcs = [ + gcsfs + ]; + }; + + nativeCheckInputs = [ + fastparquet + pyarrow + pytest-cases + pytest-parallel + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "pins" + ]; + + pytestFlagsArray = [ + "pins/tests/" + ]; + + disabledTestPaths = [ + # Tests require network access + "pins/tests/test_boards.py" + "pins/tests/test_compat.py" + "pins/tests/test_constructors.py" + "pins/tests/test_rsconnect_api.py" + ]; + + meta = with lib; { + description = "Module to publishes data, models and other Python objects"; + homepage = "https://github.com/rstudio/pins-python"; + changelog = "https://github.com/rstudio/pins-python/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pip-api/default.nix b/nixpkgs/pkgs/development/python-modules/pip-api/default.nix index 48edbf2480dc..c7819229ef16 100644 --- a/nixpkgs/pkgs/development/python-modules/pip-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pip-api/default.nix @@ -1,25 +1,32 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pip , pretend , pytestCheckHook , pythonOlder +, setuptools , virtualenv }: buildPythonPackage rec { pname = "pip-api"; - version = "0.0.30"; - format = "setuptools"; + version = "0.0.31"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-oF3yx6qbcVc3S89Cc1RCAaDHuuYKnGW8+E85We84lvM="; + src = fetchFromGitHub { + owner = "di"; + repo = "pip-api"; + rev = "refs/tags/${version}"; + hash = "sha256-WFyrEEfrGwsITYzQaukwmz5ml+I6zlMddINTkGeNUTM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pip ]; @@ -46,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Importable pip API"; homepage = "https://github.com/di/pip-api"; + changelog = "https://github.com/di/pip-api/blob/${version}/CHANGELOG"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index 1871ce74dd73..154a9c712c5a 100644 --- a/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -66,6 +66,8 @@ buildPythonPackage rec { "test_bad_setup_file" # Assertion error "test_compile_recursive_extras" + "test_combine_different_extras_of_the_same_package" + "test_diff_should_not_uninstall" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index c40bcae0348e..f40be0758ba5 100644 --- a/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.2"; + version = "0.5.3"; 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-bTlDDg3iIab75QynAkXU5u4fgTylPeE6OdiQb8hqP8s="; + hash = "sha256-Figg5yaPo6QqB4lldmyJZtd/Ar584IyETVJfWZ+gjDE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix b/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix index 8cd0a5ef1f04..fafe0b2e9807 100644 --- a/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix @@ -7,26 +7,26 @@ , setuptools , packaging , tomli +, pytestCheckHook }: buildPythonPackage rec { pname = "pkg-about"; - version = "1.0.8"; + version = "1.1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "pkg_about"; - inherit version; + inherit pname version; extension = "zip"; - hash = "sha256-mb43XbKypgilagXLW33kP8wXxioNsfLtl6AEnOI1WlA="; + hash = "sha256-B5u+iJuqHtv4BlGhdWqYxBfS89/S01OXmLyDOQraHfo="; }; # tox is listed in build requirements but not actually used to build # keeping it as a requirement breaks the build unnecessarily postPatch = '' - sed -i "/requires/s/, 'tox>=3.25.1'//" pyproject.toml + sed -i "/requires/s/, 'tox>=[^']*'//" pyproject.toml ''; nativeBuildInputs = [ @@ -42,8 +42,9 @@ buildPythonPackage rec { tomli ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "pkg_about" diff --git a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 109b72039b1d..388688c19f97 100644 --- a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "18.3.0"; + version = "18.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-0u1gj8ZpUL/eehsPNjq7JoDdVDDhlS9SGDw5xizxRlE="; + hash = "sha256-bspTjaTATICk58YHxnq2ZM1N5PNS2o0nVQDWUeUvVAc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix b/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix index 7ba83b6b9fbc..600131e2f5ec 100644 --- a/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "plantuml-markdown"; - version = "3.9.2"; + version = "3.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-k4Xs1w/26QAfNdJY6P1gpJkBzg/tWi7vDFKZi7naVHo="; + hash = "sha256-2nZV/bYRN1SKI6OmpOhK7KUuBwmwhTt/ErTYqVQ9Dps="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index d5579de5d25b..8628c0bf645c 100644 --- a/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.7"; + version = "4.15.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-jI/yQuyPfZNZf6yG35rdIYmnJmRuNYUNpEJBNzDMnrY="; + hash = "sha256-mKn2SLECtJwUdBS7u8NAyIq6wlk+0WNWnDv27AVcysY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pluggy/default.nix b/nixpkgs/pkgs/development/python-modules/pluggy/default.nix index 6b1c8e67f1eb..a768e8ce942f 100644 --- a/nixpkgs/pkgs/development/python-modules/pluggy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pluggy/default.nix @@ -9,17 +9,17 @@ buildPythonPackage rec { pname = "pluggy"; - version = "1.3.0"; + version = "1.4.0"; disabled = pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pluggy"; rev = "refs/tags/${version}"; - hash = "sha256-jLasnqmATIOoheGu90Wo1+iTCwslYzNOKckqHIZDJec="; + hash = "sha256-1XHJwODmpYQkYZvnZck6RrtT4lOeCf8cr1QFx9DCbzw="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index 5707f88cf69d..97b42974993a 100644 --- a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.36.2"; + version = "0.37.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-3TTrfvhTQIhig0QUP56+IkciiboXZD4025FvotAZgzo="; + hash = "sha256-a/8GVHhVZsK2DD3+mM8UvwkgjMC403Mc9UJSO19AlXs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/plyvel/default.nix b/nixpkgs/pkgs/development/python-modules/plyvel/default.nix index d8293f85a9bc..794585c54b80 100644 --- a/nixpkgs/pkgs/development/python-modules/plyvel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plyvel/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-zZGOCzFpCrzT0gKodCyvlRqy/hVz3nr3HDhFaEf5ICs="; + hash = "sha256-PK9gCeT8JPv4cS0/XvPaflZJXCakiN8hYSGPw05GAZw="; }; buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest; diff --git a/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix b/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix index f1d152decc1f..2ddb03b8afe1 100644 --- a/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { # Make sure we're running the tests for the actually installed # package, so that cython's compiled files are available. preCheck = '' - cd $out/lib/${python.libPrefix}/site-packages + cd $out/${python.sitePackages} ''; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/podman/default.nix b/nixpkgs/pkgs/development/python-modules/podman/default.nix index 3279c4212cee..e3174a0a93ac 100644 --- a/nixpkgs/pkgs/development/python-modules/podman/default.nix +++ b/nixpkgs/pkgs/development/python-modules/podman/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "podman"; - version = "4.8.2"; + version = "4.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "containers"; repo = "podman-py"; rev = "refs/tags/v${version}"; - hash = "sha256-XJ+KD3HM+Sygq8Oxht80G9DnZadvR3fFyXrJsWny65g="; + hash = "sha256-fLuWOfv4kW5a9h658s8pBgXsBfcYdkXNp9+bWtgKHv8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock b/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock index b9ba1326cf62..505a370fb586 100644 --- a/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock +++ b/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock @@ -25,11 +25,12 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "ahash" -version = "0.8.5" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", + "const-random", "getrandom", "once_cell", "version_check", @@ -38,9 +39,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -82,6 +83,49 @@ dependencies = [ ] [[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstyle" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" + +[[package]] +name = "anyhow" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "apache-avro" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceb7c683b2f8f40970b70e39ff8be514c95b96fcb9c4af87e1ed2cb2e10801a0" +dependencies = [ + "crc32fast", + "digest", + "lazy_static", + "libflate 2.0.0", + "log", + "num-bigint", + "quad-rand", + "rand", + "regex-lite", + "serde", + "serde_json", + "snap", + "strum", + "strum_macros", + "thiserror", + "typed-builder", + "uuid", +] + +[[package]] name = "argminmax" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -97,13 +141,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" [[package]] -name = "arrow-format" -version = "0.8.1" +name = "arrow-array" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07884ea216994cdc32a2d5f8274a8bee979cfe90274b83f86f440866ee3132c7" +checksum = "d390feeb7f21b78ec997a4081a025baef1e2e0d6069e181939b61864c9779609" dependencies = [ - "planus", - "serde", + "ahash", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "hashbrown 0.14.3", + "num", +] + +[[package]] +name = "arrow-buffer" +version = "50.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69615b061701bcdffbc62756bc7e85c827d5290b472b580c972ebbbf690f5aa4" +dependencies = [ + "bytes", + "half", + "num", +] + +[[package]] +name = "arrow-data" +version = "50.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67d644b91a162f3ad3135ce1184d0a31c28b816a581e08f29e8e9277a574c64e" +dependencies = [ + "arrow-buffer", + "arrow-schema", + "half", + "num", +] + +[[package]] +name = "arrow-schema" +version = "50.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ff3e9c01f7cd169379d269f926892d0e622a704960350d09d331be3ec9e0029" + +[[package]] +name = "arrow2" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59c468daea140b747d781a1da9f7db5f0a8e6636d4af20cc539e43d05b0604fa" +dependencies = [ + "ahash", + "bytemuck", + "chrono", + "dyn-clone", + "either", + "ethnum", + "foreign_vec", + "getrandom", + "hash_hasher", + "num-traits", + "rustc_version", + "simdutf8", ] [[package]] @@ -125,18 +224,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", ] [[package]] @@ -149,6 +248,12 @@ dependencies = [ ] [[package]] +name = "atoi_simd" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9" + +[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -160,15 +265,379 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5281855b39aba9684d2f47bf96983fbfd8f1725f12fabb0513a8ab879647bbd" dependencies = [ + "async-stream", "crc", "fallible-streaming-iterator", - "libflate", + "futures", + "libflate 1.4.0", "serde", "serde_json", "snap", ] [[package]] +name = "aws-config" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b30c39ebe61f75d1b3785362b1586b41991873c9ab3e317a9181c246fb71d82" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-sdk-sso", + "aws-sdk-ssooidc", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "hex", + "http 0.2.11", + "hyper", + "ring", + "time", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cc49dcdd31c8b6e79850a179af4c367669150c7ac0135f176c61bec81a70f7" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", +] + +[[package]] +name = "aws-runtime" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb031bff99877c26c28895766f7bb8484a05e24547e370768d6cc9db514662aa" +dependencies = [ + "aws-credential-types", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "http 0.2.11", + "http-body", + "percent-encoding", + "pin-project-lite", + "tracing", + "uuid", +] + +[[package]] +name = "aws-sdk-s3" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951f7730f51a2155c711c85c79f337fbc02a577fa99d2a0a8059acfce5392113" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-checksums", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes", + "http 0.2.11", + "http-body", + "once_cell", + "percent-encoding", + "regex-lite", + "tracing", + "url", +] + +[[package]] +name = "aws-sdk-sso" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f486420a66caad72635bc2ce0ff6581646e0d32df02aa39dc983bfe794955a5b" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.11", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ddccf01d82fce9b4a15c8ae8608211ee7db8ed13a70b514bbfe41df3d24841" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.11", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-sts" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a591f8c7e6a621a501b2b5d2e88e1697fcb6274264523a6ad4d5959889a41ce" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "http 0.2.11", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c371c6b0ac54d4605eb6f016624fb5c7c2925d315fdf600ac1bf21b19d5f1742" +dependencies = [ + "aws-credential-types", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "crypto-bigint 0.5.5", + "form_urlencoded", + "hex", + "hmac", + "http 0.2.11", + "http 1.0.0", + "once_cell", + "p256", + "percent-encoding", + "ring", + "sha2", + "subtle", + "time", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-async" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ee2d09cce0ef3ae526679b522835d63e75fb427aca5413cd371e490d52dcc6" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-checksums" +version = "0.60.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be2acd1b9c6ae5859999250ed5a62423aedc5cf69045b844432de15fa2f31f2b" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "crc32c", + "crc32fast", + "hex", + "http 0.2.11", + "http-body", + "md-5", + "pin-project-lite", + "sha1", + "sha2", + "tracing", +] + +[[package]] +name = "aws-smithy-eventstream" +version = "0.60.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" +dependencies = [ + "aws-smithy-types", + "bytes", + "crc32fast", +] + +[[package]] +name = "aws-smithy-http" +version = "0.60.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dab56aea3cd9e1101a0a999447fb346afb680ab1406cebc44b32346e25b4117d" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.11", + "http-body", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.60.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3898ca6518f9215f62678870064398f00031912390efd03f1f6ef56d83aa8e" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-query" +version = "0.60.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda4b1dfc9810e35fba8a620e900522cd1bd4f9578c446e82f49d1ce41d2e9f9" +dependencies = [ + "aws-smithy-types", + "urlencoding", +] + +[[package]] +name = "aws-smithy-runtime" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fafdab38f40ad7816e7da5dec279400dd505160780083759f01441af1bbb10ea" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand", + "h2", + "http 0.2.11", + "http-body", + "hyper", + "hyper-rustls", + "once_cell", + "pin-project-lite", + "pin-utils", + "rustls", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c18276dd28852f34b3bf501f4f3719781f4999a51c7bff1a5c6dc8c4529adc29" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http 0.2.11", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb3e134004170d3303718baa2a4eb4ca64ee0a1c0a7041dca31b38be0fb414f3" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.11", + "http-body", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.60.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8604a11b25e9ecaf32f9aa56b9fe253c5e2f606a3477f0071e96d3155a5ed218" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "789bbe008e65636fe1b6dbbb374c40c8960d1232b96af5ff4aec349f9c4accf4" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "http 0.2.11", + "rustc_version", + "tracing", +] + +[[package]] name = "backtrace" version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -184,10 +653,41 @@ dependencies = [ ] [[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + +[[package]] name = "base64" -version = "0.21.4" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] + +[[package]] +name = "base64ct" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] [[package]] name = "bitflags" @@ -197,18 +697,27 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" dependencies = [ "serde", ] [[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -217,9 +726,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -227,9 +736,9 @@ dependencies = [ [[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", @@ -244,9 +753,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" dependencies = [ "bytemuck_derive", ] @@ -259,7 +768,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", ] [[package]] @@ -269,6 +778,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] +name = "bytes-utils" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" +dependencies = [ + "bytes", + "either", +] + +[[package]] name = "cargo-lock" version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -281,6 +800,21 @@ dependencies = [ ] [[package]] +name = "casey" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614586263949597dcc18675da12ef9b429135e13628d92eb8b8c6fa50ca5656b" +dependencies = [ + "syn 1.0.109", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] name = "cc" version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -298,22 +832,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets", + "windows-targets 0.52.0", ] [[package]] name = "chrono-tz" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +checksum = "91d7b79e99bfaa0d47da0687c43aa3b7381938a62ad3a6498599039321f660b7" dependencies = [ "chrono", "chrono-tz-build", @@ -322,9 +856,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" dependencies = [ "parse-zoneinfo", "phf", @@ -333,9 +867,9 @@ dependencies = [ [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -344,21 +878,46 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", ] [[package]] +name = "clap" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +dependencies = [ + "anstyle", + "clap_lex", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] name = "cmake" version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -369,21 +928,75 @@ dependencies = [ [[package]] name = "comfy-table" -version = "7.0.1" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab77dbd8adecaf3f0db40581631b995f312a8a5ae3aa9993188bb8f23d83a5b" +checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" dependencies = [ "crossterm", "strum", - "strum_macros 0.24.3", + "strum_macros", "unicode-width", ] [[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const-random" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[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.4" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] [[package]] name = "crc" @@ -401,6 +1014,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" [[package]] +name = "crc32c" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" +dependencies = [ + "rustc_version", +] + +[[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -410,71 +1032,94 @@ dependencies = [ ] [[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[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-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[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 = "crossterm" -version = "0.26.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "crossterm_winapi", "libc", - "mio", "parking_lot", - "signal-hook", - "signal-hook-mio", "winapi", ] @@ -488,6 +1133,80 @@ dependencies = [ ] [[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "dary_heap" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" + +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -495,9 +1214,21 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dyn-clone" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" + +[[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature", +] [[package]] name = "either" @@ -506,6 +1237,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] +name = "elliptic-curve" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +dependencies = [ + "base16ct", + "crypto-bigint 0.4.9", + "der", + "digest", + "ff", + "generic-array", + "group", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] name = "encoding_rs" version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -523,7 +1274,17 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", ] [[package]] @@ -533,10 +1294,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[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 = "ethnum" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8ff382b2fa527fb7fb06eeebfc5bbb3f17e3cc6b9d70b006c41daa8824adac" +checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c" [[package]] name = "fallible-streaming-iterator" @@ -551,10 +1322,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "libz-ng-sys", @@ -584,18 +1371,18 @@ checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673" [[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", ] [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -608,9 +1395,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -618,15 +1405,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -635,38 +1422,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -681,10 +1468,20 @@ dependencies = [ ] [[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -695,17 +1492,17 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git2" -version = "0.17.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "libc", "libgit2-sys", "log", @@ -719,18 +1516,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] name = "h2" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 1.9.3", + "http 0.2.11", + "indexmap", "slab", "tokio", "tokio-util", @@ -739,9 +1547,14 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", + "num-traits", +] [[package]] name = "halfbrown" @@ -754,10 +1567,10 @@ dependencies = [ ] [[package]] -name = "hashbrown" -version = "0.12.3" +name = "hash_hasher" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c" [[package]] name = "hashbrown" @@ -770,9 +1583,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -787,9 +1600,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -798,19 +1611,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[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", + "itoa", +] + +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" dependencies = [ "bytes", "fnv", @@ -819,12 +1652,12 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] @@ -848,22 +1681,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -872,30 +1705,32 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.11", "hyper", + "log", "rustls", + "rustls-native-certs", "tokio", "tokio-rustls", ] [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -909,9 +1744,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", @@ -919,22 +1754,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "serde", ] @@ -946,15 +1771,26 @@ checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inventory" -version = "0.3.12" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1be380c410bf0595e94992a648ea89db4dd3f3354ba54af206fd2a68cf5ac8e" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.52.0", +] [[package]] name = "itertools" @@ -966,10 +1802,19 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "itoap" @@ -999,18 +1844,18 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -1026,13 +1871,10 @@ dependencies = [ ] [[package]] -name = "lexical" -version = "6.1.1" +name = "lazy_static" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" -dependencies = [ - "lexical-core", -] +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lexical-core" @@ -1100,9 +1942,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libflate" @@ -1112,7 +1954,20 @@ checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", - "libflate_lz77", + "libflate_lz77 1.2.0", +] + +[[package]] +name = "libflate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" +dependencies = [ + "adler32", + "core2", + "crc32fast", + "dary_heap", + "libflate_lz77 2.0.0", ] [[package]] @@ -1125,10 +1980,21 @@ dependencies = [ ] [[package]] +name = "libflate_lz77" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" +dependencies = [ + "core2", + "hashbrown 0.13.2", + "rle-decode-fast", +] + +[[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.16.1+1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" dependencies = [ "cc", "libc", @@ -1138,19 +2004,19 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" @@ -1164,9 +2030,9 @@ dependencies = [ [[package]] name = "libz-ng-sys" -version = "1.1.12" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63" +checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5" dependencies = [ "cmake", "libc", @@ -1174,9 +2040,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" dependencies = [ "cc", "libc", @@ -1185,10 +2051,16 @@ dependencies = [ ] [[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[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", @@ -1222,19 +2094,29 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ "autocfg", "rawpointer", ] [[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] name = "memchr" -version = "2.6.3" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -1280,14 +2162,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "log", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1344,6 +2225,31 @@ dependencies = [ ] [[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] name = "num-complex" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1353,6 +2259,12 @@ dependencies = [ ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1363,10 +2275,33 @@ dependencies = [ ] [[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -1399,18 +2334,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "object_store" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d359e231e5451f4f9fa889d56e3ce34f8724f1a61db2107739359717cf2bbf08" +checksum = "d139f545f64630e2e3688fd9f81c470888ab01edeb72d13b4e86c566f1130000" dependencies = [ "async-trait", "base64", @@ -1419,14 +2354,14 @@ dependencies = [ "futures", "humantime", "hyper", - "itertools", + "itertools 0.12.1", "parking_lot", "percent-encoding", "quick-xml", "rand", "reqwest", "ring", - "rustls-pemfile", + "rustls-pemfile 2.0.0", "serde", "serde_json", "snafu", @@ -1438,9 +2373,38 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2", +] [[package]] name = "parking_lot" @@ -1454,15 +2418,15 @@ 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]] @@ -1486,9 +2450,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" @@ -1541,10 +2505,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + +[[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "planus" @@ -1556,77 +2530,153 @@ dependencies = [ ] [[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] + +[[package]] name = "polars" -version = "0.34.2" +version = "0.37.0" dependencies = [ + "ahash", "getrandom", "polars-core", "polars-io", "polars-lazy", "polars-ops", + "polars-plan", "polars-sql", "polars-time", + "rand", "version_check", ] [[package]] -name = "polars-algo" -version = "0.34.2" -dependencies = [ - "polars-core", - "polars-lazy", - "polars-ops", -] - -[[package]] name = "polars-arrow" -version = "0.34.2" +version = "0.37.0" dependencies = [ "ahash", - "arrow-format", + "apache-avro", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "async-stream", "atoi", + "atoi_simd", "avro-schema", "bytemuck", "chrono", "chrono-tz", + "criterion", + "crossbeam-channel", + "doc-comment", "dyn-clone", "either", "ethnum", + "fast-float", + "flate2", "foreign_vec", "futures", "getrandom", - "hashbrown 0.14.0", - "lexical-core", + "hashbrown 0.14.3", + "hex", + "indexmap", + "itoa", + "itoap", "lz4", "multiversion", "num-traits", + "polars-arrow-format", "polars-error", - "rustc_version", + "polars-utils", + "proptest", + "rand", + "regex", + "regex-syntax 0.8.2", + "ryu", + "sample-arrow2", + "sample-std", + "sample-test", "serde", "simdutf8", "streaming-iterator", "strength_reduce", + "tokio", + "tokio-util", + "version_check", "zstd", ] [[package]] +name = "polars-arrow-format" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b0ef2474af9396b19025b189d96e992311e6a47f90c53cd998b36c4c64b84c" +dependencies = [ + "planus", + "prost", + "prost-derive", + "serde", +] + +[[package]] +name = "polars-compute" +version = "0.37.0" +dependencies = [ + "bytemuck", + "either", + "num-traits", + "polars-arrow", + "polars-error", + "polars-utils", + "strength_reduce", + "version_check", +] + +[[package]] name = "polars-core" -version = "0.34.2" +version = "0.37.0" dependencies = [ "ahash", - "bitflags 2.4.0", + "arrow-array", + "bincode", + "bitflags 2.4.2", "bytemuck", "chrono", "chrono-tz", "comfy-table", "either", - "hashbrown 0.14.0", - "indexmap 2.0.0", - "itoap", + "hashbrown 0.14.3", + "indexmap", "ndarray", "num-traits", "once_cell", "polars-arrow", + "polars-compute", "polars-error", "polars-row", "polars-utils", @@ -1643,12 +2693,25 @@ dependencies = [ ] [[package]] +name = "polars-doc-examples" +version = "0.37.0" +dependencies = [ + "aws-config", + "aws-sdk-s3", + "chrono", + "polars", + "rand", + "reqwest", + "tokio", +] + +[[package]] name = "polars-error" -version = "0.34.2" +version = "0.37.0" dependencies = [ - "arrow-format", "avro-schema", "object_store", + "polars-arrow-format", "regex", "simdutf8", "thiserror", @@ -1656,7 +2719,7 @@ dependencies = [ [[package]] name = "polars-ffi" -version = "0.34.2" +version = "0.37.0" dependencies = [ "polars-arrow", "polars-core", @@ -1664,10 +2727,11 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.34.2" +version = "0.37.0" dependencies = [ "ahash", "async-trait", + "atoi_simd", "bytes", "chrono", "chrono-tz", @@ -1676,8 +2740,6 @@ dependencies = [ "futures", "home", "itoa", - "lexical", - "lexical-core", "memchr", "memmap2", "num-traits", @@ -1700,20 +2762,22 @@ dependencies = [ "simd-json", "simdutf8", "smartstring", + "tempfile", "tokio", "tokio-util", "url", + "zstd", ] [[package]] name = "polars-json" -version = "0.34.2" +version = "0.37.0" dependencies = [ "ahash", "chrono", "fallible-streaming-iterator", - "hashbrown 0.14.0", - "indexmap 2.0.0", + "hashbrown 0.14.3", + "indexmap", "itoa", "num-traits", "polars-arrow", @@ -1726,10 +2790,10 @@ dependencies = [ [[package]] name = "polars-lazy" -version = "0.34.2" +version = "0.37.0" dependencies = [ "ahash", - "bitflags 2.4.0", + "bitflags 2.4.2", "futures", "glob", "once_cell", @@ -1744,6 +2808,7 @@ dependencies = [ "polars-utils", "pyo3", "rayon", + "serde_json", "smartstring", "tokio", "version_check", @@ -1751,22 +2816,24 @@ dependencies = [ [[package]] name = "polars-ops" -version = "0.34.2" +version = "0.37.0" dependencies = [ "ahash", + "aho-corasick", "argminmax", "base64", "bytemuck", "chrono", "chrono-tz", "either", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "hex", - "indexmap 2.0.0", + "indexmap", "jsonpath_lib", "memchr", "num-traits", "polars-arrow", + "polars-compute", "polars-core", "polars-error", "polars-json", @@ -1778,18 +2845,20 @@ dependencies = [ "serde", "serde_json", "smartstring", + "unicode-reverse", "version_check", ] [[package]] name = "polars-parquet" -version = "0.34.2" +version = "0.37.0" dependencies = [ "ahash", "async-stream", "base64", "brotli", "ethnum", + "fallible-streaming-iterator", "flate2", "futures", "lz4", @@ -1799,22 +2868,26 @@ dependencies = [ "polars-error", "polars-utils", "seq-macro", + "serde", "simdutf8", "snap", "streaming-decompression", + "xxhash-rust", "zstd", ] [[package]] name = "polars-pipe" -version = "0.34.2" +version = "0.37.0" dependencies = [ "crossbeam-channel", "crossbeam-queue", "enum_dispatch", - "hashbrown 0.14.0", + "futures", + "hashbrown 0.14.3", "num-traits", "polars-arrow", + "polars-compute", "polars-core", "polars-io", "polars-ops", @@ -1829,13 +2902,14 @@ dependencies = [ [[package]] name = "polars-plan" -version = "0.34.2" +version = "0.37.0" dependencies = [ "ahash", "bytemuck", "chrono", "chrono-tz", "ciborium", + "futures", "libloading", "once_cell", "percent-encoding", @@ -1843,6 +2917,7 @@ dependencies = [ "polars-core", "polars-ffi", "polars-io", + "polars-json", "polars-ops", "polars-parquet", "polars-time", @@ -1852,13 +2927,13 @@ dependencies = [ "regex", "serde", "smartstring", - "strum_macros 0.25.2", + "strum_macros", "version_check", ] [[package]] name = "polars-row" -version = "0.34.2" +version = "0.37.0" dependencies = [ "polars-arrow", "polars-error", @@ -1867,8 +2942,9 @@ dependencies = [ [[package]] name = "polars-sql" -version = "0.34.2" +version = "0.37.0" dependencies = [ + "hex", "polars-arrow", "polars-core", "polars-error", @@ -1882,7 +2958,7 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.34.2" +version = "0.37.0" dependencies = [ "atoi", "chrono", @@ -1901,12 +2977,12 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.34.2" +version = "0.37.0" dependencies = [ "ahash", "bytemuck", - "hashbrown 0.14.0", - "indexmap 2.0.0", + "hashbrown 0.14.3", + "indexmap", "num-traits", "once_cell", "polars-error", @@ -1917,6 +2993,12 @@ dependencies = [ ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1924,36 +3006,76 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] +name = "proptest" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +dependencies = [ + "bitflags 2.4.2", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax 0.8.2", + "unarray", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "py-polars" -version = "0.19.12" +version = "0.20.7" dependencies = [ "ahash", "built", "ciborium", "either", + "itoa", "jemallocator", - "lexical-core", "libc", "mimalloc", "ndarray", + "num-traits", "numpy", "once_cell", "polars", - "polars-algo", "polars-core", "polars-error", "polars-lazy", "polars-ops", "polars-parquet", "polars-plan", + "polars-utils", "pyo3", "pyo3-built", "serde_json", @@ -1963,9 +3085,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" +checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" dependencies = [ "cfg-if", "indoc", @@ -1981,9 +3103,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" +checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" dependencies = [ "once_cell", "target-lexicon", @@ -1997,9 +3119,9 @@ checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de" [[package]] name = "pyo3-ffi" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" +checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" dependencies = [ "libc", "pyo3-build-config", @@ -2007,43 +3129,60 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" +checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.36", + "syn 2.0.48", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" +checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", ] [[package]] +name = "quad-rand" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88" + +[[package]] name = "quick-xml" -version = "0.28.2" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", "serde", ] [[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "env_logger", + "log", + "rand", +] + +[[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2089,6 +3228,25 @@ dependencies = [ ] [[package]] +name = "rand_regex" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a9fe2d7d9eeaf3279d1780452a5bbd26b31b27938787ef1c3e930d1e9cfbd" +dependencies = [ + "rand", + "regex-syntax 0.6.29", +] + +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core", +] + +[[package]] name = "rawpointer" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2096,9 +3254,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -2106,9 +3264,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -2116,47 +3274,79 @@ dependencies = [ [[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 1.3.2", ] [[package]] +name = "ref-cast" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] name = "regex" -version = "1.9.5" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + +[[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ "base64", "bytes", @@ -2164,7 +3354,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -2176,10 +3366,13 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "rustls-pemfile", + "rustls-native-certs", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", "tokio-rustls", "tokio-util", @@ -2189,23 +3382,32 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", "winreg", ] [[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint 0.4.9", + "hmac", + "zeroize", +] + +[[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 0.48.0", ] [[package]] @@ -2236,10 +3438,23 @@ dependencies = [ ] [[package]] +name = "rustix" +version = "0.38.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] name = "rustls" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -2248,19 +3463,47 @@ dependencies = [ ] [[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 1.0.4", + "schannel", + "security-framework", +] + +[[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-pemfile" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" dependencies = [ "base64", + "rustls-pki-types", ] [[package]] +name = "rustls-pki-types" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" + +[[package]] name = "rustls-webpki" -version = "0.101.5" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -2274,9 +3517,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "same-file" @@ -2288,6 +3531,61 @@ dependencies = [ ] [[package]] +name = "sample-arrow2" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "722050f91586506195398fd22d834eb8768716084f6ebf9f32b917ed422b6afb" +dependencies = [ + "arrow2", + "sample-std", +] + +[[package]] +name = "sample-std" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567a153dc3302ce838920fb095c025a6d0529fff0290d25deeec2136e41a57c8" +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-test-macros", +] + +[[package]] +name = "sample-test-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1a2c832a259aae95b6ed1da3aa377111ffde38d4282fa734faa3fff356534e" +dependencies = [ + "proc-macro2", + "quote", + "sample-std", + "syn 1.0.109", +] + +[[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" @@ -2295,19 +3593,56 @@ 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", ] [[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[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 = "semver" -version = "1.0.18" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] @@ -2320,31 +3655,31 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ - "indexmap 2.0.0", + "indexmap", "itoa", "ryu", "serde", @@ -2352,9 +3687,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -2372,24 +3707,25 @@ dependencies = [ ] [[package]] -name = "signal-hook" -version = "0.3.17" +name = "sha1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "libc", - "signal-hook-registry", + "cfg-if", + "cpufeatures", + "digest", ] [[package]] -name = "signal-hook-mio" -version = "0.2.3" +name = "sha2" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "libc", - "mio", - "signal-hook", + "cfg-if", + "cpufeatures", + "digest", ] [[package]] @@ -2402,16 +3738,27 @@ dependencies = [ ] [[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] name = "simd-json" -version = "0.12.0" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f07a84c7456b901b8dd2c1d44caca8b0fd2c2616206ee5acc9d9da61e8d9ec" +checksum = "2faf8f101b9bc484337a6a6b0409cf76c139f2fb70a9e3aee6b6774be7bfbf76" dependencies = [ "ahash", "getrandom", "halfbrown", "lexical-core", "once_cell", + "ref-cast", "serde", "serde_json", "simdutf8", @@ -2441,9 +3788,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smartstring" @@ -2481,41 +3828,41 @@ dependencies = [ [[package]] name = "snap" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] -name = "socket2" -version = "0.5.4" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" -dependencies = [ - "libc", - "windows-sys", -] +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "spin" -version = "0.5.2" +name = "spki" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] [[package]] name = "sqlparser" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0272b7bb0a225320170c99901b4b5fb3a4384e255a7f2cc228f61e2ba3893e75" +checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" dependencies = [ "log", ] @@ -2549,35 +3896,28 @@ checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" [[package]] name = "strum" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] -name = "strum_macros" -version = "0.25.2" +name = "subtle" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.36", -] +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -2592,9 +3932,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.36" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -2602,49 +3942,138 @@ dependencies = [ ] [[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] name = "sysinfo" -version = "0.29.10" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" dependencies = [ "cfg-if", "core-foundation-sys", "libc", "ntapi", "once_cell", - "winapi", + "windows", +] + +[[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-features" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f6b473c37f9add4cf1df5b4d66a8ef58ab6c895f1a3b3f949cf3e21230140e" +checksum = "cfb5fa503293557c5158bd215fdc225695e567a77e453f5d4452a50a193969bd" [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" + +[[package]] +name = "tempfile" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.52.0", +] [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", +] + +[[package]] +name = "time" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe80ced77cbfb4cb91a94bf72b378b4b6791a0d9b7f09d0be747d1bdff4e68bd" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", ] [[package]] @@ -2664,9 +4093,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -2674,20 +4103,21 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.4", + "signal-hook-registry", + "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", ] [[package]] @@ -2702,12 +4132,13 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", + "futures-io", "futures-sink", "pin-project-lite", "tokio", @@ -2728,9 +4159,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -2741,7 +4172,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -2756,11 +4187,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2768,35 +4198,67 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typed-builder" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34085c17941e36627a879208083e25d357243812c30e7d7387c3b954f30ade16" +dependencies = [ + "typed-builder-macro", +] + +[[package]] +name = "typed-builder-macro" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unarray" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[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" @@ -2814,10 +4276,25 @@ dependencies = [ ] [[package]] +name = "unicode-reverse" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bea5dacebb0d2d0a69a6700a05b59b3908bf801bf563a49bd27a1b60122962c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unindent" @@ -2827,15 +4304,15 @@ 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.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -2843,10 +4320,25 @@ dependencies = [ ] [[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +dependencies = [ + "serde", +] + +[[package]] name = "value-trait" -version = "0.6.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a5b6c8ceb01263b969cac48d4a6705134d490ded13d889e52c0cfc80c6945e" +checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" dependencies = [ "float-cmp", "halfbrown", @@ -2867,6 +4359,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] name = "walkdir" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2893,9 +4391,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2903,24 +4401,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" dependencies = [ "cfg-if", "js-sys", @@ -2930,9 +4428,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2940,28 +4438,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -2972,21 +4470,15 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3004,9 +4496,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -3019,11 +4511,21 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-targets", + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -3032,7 +4534,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "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]] @@ -3041,13 +4552,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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", + "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]] @@ -3057,46 +4583,88 @@ 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 = "winnow" -version = "0.5.15" +version = "0.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "818ce546a11a9986bc24f93d0cdf38a8a1a400f1473ea8c82e59f6e0ffab9249" dependencies = [ "memchr", ] @@ -3108,36 +4676,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] name = "xxhash-rust" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" +checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61" [[package]] name = "zerocopy" -version = "0.7.11" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.11" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn 2.0.48", ] [[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] name = "zstd" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3157,11 +4737,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/nixpkgs/pkgs/development/python-modules/polars/default.nix b/nixpkgs/pkgs/development/python-modules/polars/default.nix index 6f66b024f28b..2dca53b7bb6c 100644 --- a/nixpkgs/pkgs/development/python-modules/polars/default.nix +++ b/nixpkgs/pkgs/development/python-modules/polars/default.nix @@ -13,12 +13,12 @@ }: let pname = "polars"; - version = "0.19.12"; + version = "0.20.7"; rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-6tn3Q6oZfMjgQ5l5xCFnGimLSDLOjTWCW5uEbi6yFZY="; + hash = "sha256-R3by/e28HE+1xq+HQd9wYy/iK+fDM6/IfKuc563atX4="; }; rust-jemalloc-sys' = rust-jemalloc-sys.override { jemalloc = jemalloc.override { @@ -48,7 +48,7 @@ buildPythonPackage { }; }; - sourceRoot = "source/py-polars"; + buildAndTestSubdir = "py-polars"; # Revisit this whenever package or Rust is upgraded RUSTC_BOOTSTRAP = 1; @@ -57,6 +57,10 @@ buildPythonPackage { typing-extensions ]; + # trick taken from the polars repo since there seems to be a problem + # with simd enabled with our stable rust (instead of nightly). + maturinBuildFlags = [ "--no-default-features" "--features=all" ]; + dontUseCmakeConfigure = true; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix index 93c42374876c..0c07483b0711 100644 --- a/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchFromGitHub @@ -7,29 +6,25 @@ , setuptools # dependencies -, apricot-select -, networkx , numpy -, scikit-learn +, joblib +, networkx , scipy -, torch - -# tests -, pytestCheckHook +, pyyaml +, cython }: - buildPythonPackage rec { pname = "pomegranate"; - version = "1.0.0"; - format = "pyproject"; + version = "0.14.8"; + pyproject = true; src = fetchFromGitHub { repo = pname; owner = "jmschrei"; # no tags for recent versions: https://github.com/jmschrei/pomegranate/issues/974 rev = "refs/tags/v${version}"; - sha256 = "sha256-EnxKlRRfsOIDLAhYOq7bUSbI/NvPoSyYCZ9D5VCXFGQ="; + hash = "sha256-PoDAtNm/snq4isotkoCTVYUuwr9AKKwiXIojUFMH/YE="; }; nativeBuildInputs = [ @@ -37,20 +32,18 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - apricot-select - networkx numpy - scikit-learn + joblib + networkx scipy - torch + pyyaml + cython ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + # https://github.com/etal/cnvkit/issues/815 + passthru.skipBulkUpdate = true; meta = with lib; { - broken = stdenv.isDarwin; description = "Probabilistic and graphical models for Python, implemented in cython for speed"; homepage = "https://github.com/jmschrei/pomegranate"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/nixpkgs/pkgs/development/python-modules/pontos/default.nix index 7166577d8c74..ddff63f6fa7e 100644 --- a/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -11,13 +11,14 @@ , python-dateutil , pythonOlder , semver +, shtab , rich , tomlkit }: buildPythonPackage rec { pname = "pontos"; - version = "23.12.1"; + version = "24.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; rev = "refs/tags/v${version}"; - hash = "sha256-N10Jn5jq/PktpmeRNlqZyN/rUyAeW+ghY3/RK9Aas7I="; + hash = "sha256-lvmi/aYDGDHbiioFWovDpTCcqgh9hu97Wk2Lcqfd6qk="; }; nativeBuildInputs = [ @@ -40,6 +41,7 @@ buildPythonPackage rec { packaging python-dateutil semver + shtab rich tomlkit ] ++ httpx.optional-dependencies.http2; diff --git a/nixpkgs/pkgs/development/python-modules/posthog/default.nix b/nixpkgs/pkgs/development/python-modules/posthog/default.nix index 704a1f7ebf03..c8ec15057915 100644 --- a/nixpkgs/pkgs/development/python-modules/posthog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.3.1"; + version = "3.4.0"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-aF2Q3ztoFV7j47edtHiLddw+PZyMz6EHj3Zu55rOcF8="; + hash = "sha256-ziqUXQdmzKdrwbk7iYwCbNg+jiXiB9l3QaosY5VA3YA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pot/default.nix b/nixpkgs/pkgs/development/python-modules/pot/default.nix index 663c0427a5ab..321ad2e2dba7 100644 --- a/nixpkgs/pkgs/development/python-modules/pot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pot"; - version = "0.9.2"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "PythonOT"; repo = "POT"; rev = "refs/tags/${version}"; - hash = "sha256-sq8jIWC2DD0T6675W4THbNethm7a//U8HuccKuK0Hjo="; + hash = "sha256-fdqDM0V6zTFe1lcqi53ZZNHAfmuR2I7fdX4SN9qeNn8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pox/default.nix b/nixpkgs/pkgs/development/python-modules/pox/default.nix index f1f7647defba..fd2303197b83 100644 --- a/nixpkgs/pkgs/development/python-modules/pox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pox/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pox"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4c7WbyoMkqWM82Rrx8y4tHc9QIhLdvhe7aBnBHSHFmc="; + hash = "sha256-FubsqE8b7DgoIQsGsFKt8EzyqyDCL9b77194Mgyab+0="; }; # Test sare failing the sandbox diff --git a/nixpkgs/pkgs/development/python-modules/pplpy/default.nix b/nixpkgs/pkgs/development/python-modules/pplpy/default.nix index ec9bddb5ec99..c3a1f8192acf 100644 --- a/nixpkgs/pkgs/development/python-modules/pplpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pplpy/default.nix @@ -5,7 +5,7 @@ , mpfr , libmpc , ppl -, cython +, cython_3 , cysignals , gmpy2 , sphinx @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - cython + cython_3 cysignals gmpy2 ]; diff --git a/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/nixpkgs/pkgs/development/python-modules/preshed/default.nix index 557045649425..e0d37c51a2b1 100644 --- a/nixpkgs/pkgs/development/python-modules/preshed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/preshed/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "preshed"; - version = "4.0.0"; + version = "3.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XisLKgfdGo3uqtZhIBmEXGAu4kkH9pNuqvF6q9VuVEw="; + hash = "sha256-chhjxSRP/NJlGtCSiVGix8d7EC9OEaJRrYXTfudiFmA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix b/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix index 463a0cf50be6..6653a65671b3 100644 --- a/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix @@ -2,7 +2,7 @@ , fetchPypi , buildPythonPackage , primecount -, cython +, cython_3 , cysignals }: @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ primecount ]; - propagatedBuildInputs = [ cython cysignals ]; + propagatedBuildInputs = [ cython_3 cysignals ]; # depends on pytest-cython for "pytest --doctest-cython" doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/primer3/default.nix b/nixpkgs/pkgs/development/python-modules/primer3/default.nix index f4495d9b2c14..b2999f582455 100644 --- a/nixpkgs/pkgs/development/python-modules/primer3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/primer3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "primer3"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "libnano"; repo = "primer3-py"; rev = "refs/tags/v${version}"; - hash = "sha256-WYn88Xv7WSc67TfYCq+i05tG8aKtWLUgc6axntvLF+8="; + hash = "sha256-v3y9nJpWc9lBKcPX/qjuezjfK0nzKIMiE0QdoLgyNj8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/prophet/default.nix b/nixpkgs/pkgs/development/python-modules/prophet/default.nix index 5a8e2dfc1fc6..07ee3e76021b 100644 --- a/nixpkgs/pkgs/development/python-modules/prophet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prophet/default.nix @@ -66,6 +66,5 @@ buildPythonPackage rec { homepage = "https://facebook.github.io/prophet/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; - platforms = lib.platforms.linux; # cmdstanpy doesn't currently build on darwin }; } diff --git a/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix b/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix index efc6aa6d742c..efa364a09de0 100644 --- a/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix @@ -2,9 +2,12 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, attrs , docopt , pillow , scikit-image +, scipy +, numpy , aggdraw , pytestCheckHook , ipython @@ -31,10 +34,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ aggdraw + attrs docopt ipython + numpy pillow scikit-image + scipy ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/nixpkgs/pkgs/development/python-modules/psutil/default.nix index a08ff4c7a697..a27bb429c7c1 100644 --- a/nixpkgs/pkgs/development/python-modules/psutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/psutil/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.9.6"; + version = "5.9.8"; format = "setuptools"; inherit stdenv; @@ -20,9 +20,17 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; + hash = "sha256-a+Em4yJUht/yhqj7mgYkalJT9MfFO0depfWsk05kGUw="; }; + postPatch = '' + # stick to the old SDK name for now + # https://developer.apple.com/documentation/iokit/kiomasterportdefault/ + # https://developer.apple.com/documentation/iokit/kiomainportdefault/ + substituteInPlace psutil/arch/osx/cpu.c \ + --replace-fail kIOMainPortDefault kIOMasterPortDefault + ''; + buildInputs = # workaround for https://github.com/NixOS/nixpkgs/issues/146760 lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ diff --git a/nixpkgs/pkgs/development/python-modules/psycopg/default.nix b/nixpkgs/pkgs/development/python-modules/psycopg/default.nix index b651412571e6..ca237ed8bbd5 100644 --- a/nixpkgs/pkgs/development/python-modules/psycopg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/psycopg/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , fetchurl , pythonOlder , substituteAll @@ -35,13 +34,13 @@ let pname = "psycopg"; - version = "3.1.15"; + version = "3.1.17"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8M2Rm9AtOvZwZhKGuR96XiOOmllqcWAZJuEmUXxzsRw="; + hash = "sha256-Paq4Wkvv6d6+fNcvRO/yfj7OWCMygqccKIdfsohHUMM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index 3b94405d0445..7c438655963e 100644 --- a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240108"; + version = "0.10.0.20240210"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LRUwHL70tezJv6R7OJWa9zNQkVdI1Esvkdsqj8O5jSQ="; + hash = "sha256-U19eJmRDA1Ozz6f81IbXepsXScf7yJZQiaNecqdsYK4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index 4a6ae8af2322..4ffe4f45b3e8 100644 --- a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -10,12 +10,13 @@ , pytest-asyncio , requests , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pubnub"; - version = "7.3.2"; - format = "setuptools"; + version = "7.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,9 +24,13 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-J6vwdOI/GM/K0TxRwIgkXibNAc+n9wVCpmMkzMhBepw="; + hash = "sha256-XYovKAk2GEMi7GE/DVtLjMbww7guGkZzDOHC7Z6ZpJo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp cbor2 diff --git a/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/nixpkgs/pkgs/development/python-modules/pudb/default.nix index 347d11341e14..160e74d5c7b6 100644 --- a/nixpkgs/pkgs/development/python-modules/pudb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pudb/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2023.1"; + version = "2024.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Fd88YDq6h6kYpmbvjhv2P3ZCOMw1ids8W3pfGwHqLwM="; + hash = "sha256-/J1ql2pZtZB2TIN57CAP7NR/qoQlm2Tv2M2GBmoK8zg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pulp/default.nix b/nixpkgs/pkgs/development/python-modules/pulp/default.nix index 6ecd6d4ba8c0..ab55157ed207 100644 --- a/nixpkgs/pkgs/development/python-modules/pulp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pulp/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pulp"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "coin-or"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j0f6OiscJyTqPNyLp0qWRjCGLWuT3HdU1S/sxpnsiMo="; + hash = "sha256-lpbk1GeC8F/iLGV8G5RPHghnaM9eL82YekUYEt9+mvc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/puremagic/default.nix b/nixpkgs/pkgs/development/python-modules/puremagic/default.nix index ad4037a6c580..453cbd96cde6 100644 --- a/nixpkgs/pkgs/development/python-modules/puremagic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/puremagic/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.15"; + version = "1.20"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WnqDrVPTlNxz3SDt1wLdZmxtj0Vh6gLHDJlYGEHHxsg="; + hash = "sha256-Iyf/Vf1uqdtHlaP9Petpp88aIGCGmHu//cH6bindL6c="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pwlf/default.nix b/nixpkgs/pkgs/development/python-modules/pwlf/default.nix new file mode 100644 index 000000000000..8259a41e2e40 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pwlf/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, scipy +, numpy +, pydoe +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "pwlf"; + version = "2.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cjekel"; + repo = "piecewise_linear_fit_py"; + rev = "v${version}"; + hash = "sha256-gjdahulpHjBmOlKOCPF9WmrWe4jn/+0oVI4o09EX7qE="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + scipy + numpy + pydoe + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "pwlf" ]; + + meta = with lib; { + description = "Fit piecewise linear data for a specified number of line segments"; + homepage = "https://jekel.me/piecewise_linear_fit_py/"; + changelog = "https://github.com/cjekel/piecewise_linear_fit_py/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/py-aosmith/default.nix b/nixpkgs/pkgs/development/python-modules/py-aosmith/default.nix new file mode 100644 index 000000000000..bce96a1d320b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/py-aosmith/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +, tenacity +}: + +buildPythonPackage rec { + pname = "py-aosmith"; + version = "1.0.8"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "bdr99"; + repo = "py-aosmith"; + rev = "refs/tags/${version}"; + hash = "sha256-TjBjyWxBPrZEY/o1DZ+GiFTHTW37WwFN0oyJSyGru28="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + tenacity + ]; + + pythonImportsCheck = [ "py_aosmith" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Python client library for A. O. Smith water heaters"; + homepage = "https://github.com/bdr99/py-aosmith"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix b/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix index d48fe7411d79..bcd850def625 100644 --- a/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "py-dmidecode"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "py_dmidecode"; inherit version; - hash = "sha256-nMy/jOlg7yUPfGF27MN0NyVM0vuTIBuJTV2GKNP13UA="; + hash = "sha256-pS1fRWuWLnXuNEGYXU/j1njC8THWQOHbnVOF9+c13Cw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/py-serializable/default.nix b/nixpkgs/pkgs/development/python-modules/py-serializable/default.nix index 3f342a1469ca..12bdef693e20 100644 --- a/nixpkgs/pkgs/development/python-modules/py-serializable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-serializable/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "0.17.1"; + version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-G7bIsvWdL4qVg4akJ2KtXVS10DiJSFUYEzyQSp9ry9o="; + hash = "sha256-7WYe3X4wVUC7HyYoCVQYWm61C+J3r91Ci8IHNeWBTVE="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic library to aid with serialisation and deserialisation to/from JSON and XML"; homepage = "https://github.com/madpah/serializable"; - changelog = "https://github.com/madpah/serializable/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/madpah/serializable/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix b/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix index ec0da2c3ab3b..826c23120ed9 100644 --- a/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "py-sonic"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-9ho0F5kf74pCsLujwLt+pU+Ikxu70/kk+WP7lnD7CiE="; + hash = "sha256-DU1T86T0jQ6ptkWdjuV70VC8MFx/rK5aQFYjbK6F2Hk="; }; # package has no tests diff --git a/nixpkgs/pkgs/development/python-modules/py3langid/default.nix b/nixpkgs/pkgs/development/python-modules/py3langid/default.nix new file mode 100644 index 000000000000..02631320c4af --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/py3langid/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "py3langid"; + version = "0.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tN4B2tfnAfKdIWoJNeheCWzIZ1kD0j6oRFsrtfCQuW8="; + }; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # nixify path to the courlan binary in the test suite + postPatch = '' + substituteInPlace tests/test_langid.py --replace "'langid'" "'$out/bin/langid'" + ''; + + pythonImportsCheck = [ "py3langid" ]; + + meta = with lib; { + description = "Fork of the language identification tool langid.py, featuring a modernized codebase and faster execution times"; + homepage = "https://github.com/adbar/py3langid"; + changelog = "https://github.com/adbar/py3langid/blob/v${version}/HISTORY.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ jokatzke ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 45ac825c6a56..00552787cc50 100644 --- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.54"; + version = "3.55"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-xRiXFCILZeiNYJMIJ8Qxga71/7WXeTUsdnRvfvDzpCY="; + hash = "sha256-HGOHJQWEvTTL+GXVb8ZS8DlL9dHWuS0PioP1bZ32PhI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 39baa283996a..7e9e2c47d3b5 100644 --- a/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.14.1"; + version = "4.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-p31JRojOwoWQZE1w6UXEja0UvloMDbtKw75HHMUzgFU="; + hash = "sha256-Xw+edPs2CKJdpgDp+JB3L2W4oAIAk/IpQAD7c2kF3gk="; }; passthru.optional-dependencies = { diff --git a/nixpkgs/pkgs/development/python-modules/pyarrow-hotfix/default.nix b/nixpkgs/pkgs/development/python-modules/pyarrow-hotfix/default.nix new file mode 100644 index 000000000000..38a8dc4b6ea8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyarrow-hotfix/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyarrow-hotfix"; + version = "0.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pitrou"; + repo = "pyarrow-hotfix"; + rev = "refs/tags/v${version}"; + hash = "sha256-LlSbxIxvouzvlP6PB8J8fJaxWoRbxz4wTs7Gb5LbM4A="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + pythonImportsCheck = [ + "pyarrow_hotfix" + ]; + + meta = with lib; { + description = "Hotfix for the PyArrow security vulnerability CVE-2023-47248"; + homepage = "https://github.com/pitrou/pyarrow-hotfix"; + changelog = "https://github.com/pitrou/pyarrow-hotfix/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index fc424376477e..053b280c500e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -16,7 +16,6 @@ , pytestCheckHook , pytest-lazy-fixture , pkg-config -, scipy , setuptools , setuptools-scm , oldest-supported-numpy @@ -53,10 +52,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi + numpy + ]; + + checkInputs = [ cloudpickle fsspec - numpy - scipy ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyasyncore/default.nix b/nixpkgs/pkgs/development/python-modules/pyasyncore/default.nix index 2acdd9ba5396..d5ebd86a7d95 100644 --- a/nixpkgs/pkgs/development/python-modules/pyasyncore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyasyncore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pyasyncore"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "simonrob"; repo = "pyasyncore"; - rev = "v${version}"; - hash = "sha256-8U46q1QIjBkFh04NkAHZ0XRutlzpJHZWAqDZJj3tdEk="; + rev = "refs/tags/v${version}"; + hash = "sha256-e1iHC9mbQYlfpIdLk033wvoA5z5WcHjOZm6oFTfpRTA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyatem/default.nix b/nixpkgs/pkgs/development/python-modules/pyatem/default.nix index 5b7749ea57c9..1792d2699d80 100644 --- a/nixpkgs/pkgs/development/python-modules/pyatem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyatem/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pyatem"; - version = "0.9.0"; # check latest version in setup.py + version = "0.10.0"; # check latest version in setup.py pyproject = true; src = fetchFromSourcehut { owner = "~martijnbraam"; repo = "pyatem"; rev = version; - hash = "sha256-ntwUhgC8Cgrim+kU3B3ckgPDmPe+aEHDP4wsB45KbJg="; + hash = "sha256-O+f1vVwfGJjLem25hsYE1Q1V4vzjrc0HxTBUCANCEwE="; }; nativeBuildInputs = [ @@ -49,15 +49,6 @@ buildPythonPackage rec { pushd $TESTDIR ''; - disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ - # colorspace mapping has weird, but constant offsets on aarch64-linux - "test_blueramp" - "test_greenramp" - "test_hues" - "test_primaries" - "test_redramp" - ]; - postCheck = '' popd ''; diff --git a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix index fb7fedeaefc5..0fbd5b97f680 100644 --- a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.46.0"; + version = "2.46.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1FSJzz1HqhULGjXolJs7MQNfjCB15YjSa278Yllwxi4="; + sha256 = "+R9qV0NOnAfRPVxL+BndeOjuYFqsKuRdjGTCgRT7BBs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/python-modules/pybase64/default.nix b/nixpkgs/pkgs/development/python-modules/pybase64/default.nix index d94cdf524d20..944247e1fac9 100644 --- a/nixpkgs/pkgs/development/python-modules/pybase64/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybase64/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pybase64"; - version = "1.3.1"; + version = "1.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-I0CC/dcDnLdQxkTi03/Ck+c0XqOl8nmrrC9PyWLZuZY="; + hash = "sha256-Mu+ZPFWCHayavXZ+5GVqUBOy7YvxElyruufoTSuZEDg="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/nixpkgs/pkgs/development/python-modules/pybids/default.nix index 9519ca65e246..f6f5a8fc18ed 100644 --- a/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -26,14 +26,17 @@ buildPythonPackage rec { hash = "sha256-pahl8wi6Sf8AuVqkvi7H90ViHr+9utb14ZVmKK3rFm4="; }; + pythonRelaxDeps = [ + "formulaic" + "sqlalchemy" + ]; + nativeBuildInputs = [ pythonRelaxDepsHook setuptools versioneer ] ++ versioneer.optional-dependencies.toml; - pythonRelaxDeps = [ "sqlalchemy" ]; - propagatedBuildInputs = [ bids-validator click @@ -65,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; homepage = "https://github.com/bids-standard/pybids"; + changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pycaption/default.nix b/nixpkgs/pkgs/development/python-modules/pycaption/default.nix index 7df7ed1f70ad..c6d65db362ae 100644 --- a/nixpkgs/pkgs/development/python-modules/pycaption/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycaption/default.nix @@ -13,17 +13,17 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.1"; + version = "2.2.4"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; pyproject = true; src = fetchFromGitHub { owner = "pbs"; repo = "pycaption"; - rev = version; - hash = "sha256-IPCU9MsBY+Vsk6SrR9+3j4Izfhw5LeUrK0KUa3seSs4="; + rev = "refs/tags/${version}"; + hash = "sha256-aUhNvqeSNtbnRVp4yxsk4q3szNfR0m1zo0MpkBOCokY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix b/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix index f169f91b1a47..cd847241f60c 100644 --- a/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , httpx -, pydantic +, pydantic_1 , pytestCheckHook , pythonOlder , setuptools @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.21.2"; + version = "0.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = "pycfmodel"; rev = "refs/tags/v${version}"; - hash = "sha256-nQIZ9fwk8CdqJawYsU5qiu9xxhi9X0IxhlPohHUDTL8="; + hash = "sha256-NLi94W99LhrBXNFItMfJczV9EZlgvmvkavrfDQJs0YU="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - pydantic + pydantic_1 ]; nativeCheckInputs = [ @@ -54,6 +54,5 @@ buildPythonPackage rec { changelog = "https://github.com/Skyscanner/pycfmodel/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; - broken = versionAtLeast pydantic.version "2"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix b/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix index 4b37a0765f0e..444d673100bb 100644 --- a/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix @@ -10,14 +10,14 @@ let in buildPythonPackage rec { pname = "pycryptodome"; - version = "3.19.0"; + version = "3.19.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Legrandin"; repo = "pycryptodome"; rev = "refs/tags/v${version}"; - hash = "sha256-WD+OEjePVtqlmn7h1CIfraLuEQlodkvjmYQ8q7nNoGU="; + hash = "sha256-+m0gF47l3c9gZ9dLdOUNW0I2W1O+OGrmsdysu7QdjvI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyctr/default.nix b/nixpkgs/pkgs/development/python-modules/pyctr/default.nix index 7f1a8d6d01b1..ddb9937df356 100644 --- a/nixpkgs/pkgs/development/python-modules/pyctr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyctr/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyctr"; - version = "0.7.1"; + version = "0.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SnCps5nzrl+dkbloRbjhaOGDzKOsi8OHX2JXgoJ/XG0="; + hash = "sha256-lpW2pcT5oG7tBUXRj7cTD9hCx51hVhVODq9RxP9GKIg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pycuda/default.nix b/nixpkgs/pkgs/development/python-modules/pycuda/default.nix index 4f4c9291ae39..129bd6269cd4 100644 --- a/nixpkgs/pkgs/development/python-modules/pycuda/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycuda/default.nix @@ -24,12 +24,12 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2023.1"; + version = "2024.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-F1/2dfDPEOOOmtwD7V3z7Y2Kv32lE0yNzOx1LooKPpE="; + hash = "sha256-1Q0j/2NxSCz/fUuVPvQKuByd8DjsthRIT5/VNHMnMn4="; }; preConfigure = with lib.versions; '' diff --git a/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/nixpkgs/pkgs/development/python-modules/pycurl/default.nix index 29c4a2034b2f..80a9458e32c6 100644 --- a/nixpkgs/pkgs/development/python-modules/pycurl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycurl/default.nix @@ -70,6 +70,7 @@ buildPythonPackage rec { # https://github.com/pycurl/pycurl/issues/819 "test_multi_socket_select" # https://github.com/pycurl/pycurl/issues/729 + "test_easy_pause_unpause" "test_multi_socket_action" # https://github.com/pycurl/pycurl/issues/822 "test_request_with_verifypeer" diff --git a/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix b/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix index fa95336d3b3f..9067a3f06ad5 100644 --- a/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , can , cobs @@ -8,31 +8,80 @@ , nunavut , numpy , pyserial +, pytestCheckHook +, pytest-asyncio +, setuptools }: buildPythonPackage rec { pname = "pycyphal"; - version = "1.15.4"; - format = "pyproject"; + version = "1.18.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-0Mp8d/rNOOPLg0gUPWdOgp/d5n148dxcLceW1VtjrkQ="; + src = fetchFromGitHub { + owner = "OpenCyphal"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-XkH0wss8ueh/Wwz0lhvQShOp3a4X9lNdosT/sMe7p4Q="; + fetchSubmodules = true; }; propagatedBuildInputs = [ - can - cobs - libpcap numpy nunavut - pyserial ]; - # Can't seem to run the tests on nix - doCheck = false; + passthru.optional-dependencies = { + transport-can-pythoncan = [ + can + ] ++ can.optional-dependencies.serial; + transport-serial = [ + cobs + pyserial + ]; + transport-udp = [ + libpcap + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ] ++ builtins.foldl' (x: y: x ++ y) [ ] + (builtins.attrValues passthru.optional-dependencies) + ; + + preCheck = '' + export HOME=$TMPDIR + export PYTHONASYNCIODEBUG=1 + python -c ${lib.escapeShellArg '' + import pycyphal + pycyphal.dsdl.compile_all( + [ + "demo/public_regulated_data_types/uavcan", + "demo/custom_data_types/sirius_cyber_corp", + ], + output_directory=".dsdl_compiled", + ) + ''} + export PYTHONPATH="$(pwd)/.dsdl_compiled:$PYTHONPATH" + ''; + + # These require extra permissions and/or actual hardware connected + disabledTestPaths = [ + "pycyphal/application/__init__.py" + "pycyphal/application/_transport_factory.py" + "pycyphal/transport/udp/_ip/_link_layer.py" + "pycyphal/transport/udp/_ip/_v4.py" + "tests/application" + "tests/demo" + "tests/dsdl" + "tests/presentation" + "tests/transport" + ]; + pythonImportsCheck = [ "pycyphal" ]; @@ -43,6 +92,7 @@ buildPythonPackage rec { Cyphal is an open technology for real-time intravehicular distributed computing and communication based on modern networking standards (Ethernet, CAN FD, etc.). ''; homepage = "https://opencyphal.org/"; + changelog = "https://github.com/OpenCyphal/pycyphal/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = teams.ororatech.members; }; diff --git a/nixpkgs/pkgs/development/python-modules/pydantic-settings/default.nix b/nixpkgs/pkgs/development/python-modules/pydantic-settings/default.nix index 3034b2f92711..000f0dd52a17 100644 --- a/nixpkgs/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydantic-settings/default.nix @@ -10,7 +10,7 @@ , pytest-mock }: -buildPythonPackage rec { +let self = buildPythonPackage rec { pname = "pydantic-settings"; version = "2.1.0"; pyproject = true; @@ -50,6 +50,15 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; + # ruff is a dependency of pytest-examples which is required to run the tests. + # We do not want all of the downstream packages that depend on pydantic-settings to also depend on ruff. + doCheck = false; + passthru.tests = { + pytest = self.overridePythonAttrs { + doCheck = true; + }; + }; + meta = with lib; { description = "Settings management using pydantic"; homepage = "https://github.com/pydantic/pydantic-settings"; @@ -57,4 +66,4 @@ buildPythonPackage rec { broken = lib.versionOlder pydantic.version "2.0.0"; maintainers = with maintainers; [ ]; }; -} +}; in self diff --git a/nixpkgs/pkgs/development/python-modules/pydash/default.nix b/nixpkgs/pkgs/development/python-modules/pydash/default.nix index 14e7ffdfcd6e..05ae5e165c27 100644 --- a/nixpkgs/pkgs/development/python-modules/pydash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydash/default.nix @@ -1,47 +1,63 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchFromGitHub , invoke , mock , pytestCheckHook , pythonOlder +, setuptools , sphinx-rtd-theme +, typing-extensions }: buildPythonPackage rec { pname = "pydash"; - version = "5.1.1"; - format = "pyproject"; + version = "7.0.6"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dgilland"; - repo = pname; - rev = "v${version}"; - hash = "sha256-VbuRzKwPMh5S4GZQYnh0sZOBi4LNFjMuol95tMC43b0="; + repo = "pydash"; + rev = "refs/tags/v${version}"; + hash = "sha256-zwtUdP2fFFE5X0SDkBDetAQbKnZ1v24DGdzN3fQLa0A="; }; + postPatch = '' + sed -i "/--cov/d" setup.cfg + sed -i "/--no-cov/d" setup.cfg + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + nativeCheckInputs = [ invoke mock - sphinx-rtd-theme pytestCheckHook + sphinx-rtd-theme ]; - postPatch = '' - sed -i "/--cov/d" setup.cfg - sed -i "/--no-cov/d" setup.cfg - ''; - pythonImportsCheck = [ "pydash" ]; + disabledTestPaths = [ + # Disable mypy testing + "tests/pytest_mypy_testing/" + ]; + meta = with lib; { description = "Python utility libraries for doing stuff in a functional way"; homepage = "https://pydash.readthedocs.io"; + changelog = "https://github.com/dgilland/pydash/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index f3f74623a4c5..337a7a4fca67 100644 --- a/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.15.1"; + version = "0.15.2"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-Bk776WE3vQrKuAQTdZ8ds4pCtR4kKbFZr3XEOnWQMgs="; + hash = "sha256-DF+h+pipsm2uWQZm/1dvJ+Jse6cI/udU7Lngc1ntRYg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydeps/default.nix b/nixpkgs/pkgs/development/python-modules/pydeps/default.nix index f84123163ccf..560a62348541 100644 --- a/nixpkgs/pkgs/development/python-modules/pydeps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydeps/default.nix @@ -6,23 +6,28 @@ , pytestCheckHook , pythonOlder , pyyaml +, setuptools , toml }: buildPythonPackage rec { pname = "pydeps"; - version = "1.12.17"; - format = "setuptools"; + version = "1.12.18"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thebjorn"; - repo = pname; + repo = "pydeps"; rev = "refs/tags/v${version}"; - hash = "sha256-DVSZeNuDz/y0jh/HimV+jFgNFevMhUKOu6EhZytMMqQ="; + hash = "sha256-89RrAf09n42mRiWOUdHFNP4JoCP9bXMofkISyVqd+4I="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ graphviz ]; diff --git a/nixpkgs/pkgs/development/python-modules/pydoe/default.nix b/nixpkgs/pkgs/development/python-modules/pydoe/default.nix new file mode 100644 index 000000000000..e361d09ced3b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pydoe/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, scipy +, numpy +}: + +buildPythonPackage rec { + pname = "pyDOE"; + version = "0.3.8"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-y9bxSuJtPJ9zYBMgX1PqEZGt1FZwM8Pud7fdNWVmxLY="; + extension = "zip"; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ + scipy + numpy + ]; + + pythonImportsCheck = [ "pyDOE" ]; + + meta = with lib; { + description = "Design of experiments for Python"; + homepage = "https://github.com/tisimst/pyDOE"; + license = licenses.bsd3; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix b/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix index ad2d80c0a5e8..32bb5d78984f 100644 --- a/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix @@ -1,19 +1,25 @@ { lib +, appdirs , buildPythonPackage , fetchPypi +, fsspec +, funcy , google-api-python-client , oauth2client , pyopenssl -, pyyaml , pythonOlder +, pyyaml +, setuptools +, setuptools-scm +, tqdm }: buildPythonPackage rec { pname = "pydrive2"; version = "1.19.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "PyDrive2"; @@ -21,6 +27,11 @@ buildPythonPackage rec { hash = "sha256-Ia6n2idjXCw/cFDgICBhkfOwMFxlUDFebo491Sb4tTE="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ google-api-python-client oauth2client @@ -28,6 +39,16 @@ buildPythonPackage rec { pyyaml ]; + passthru.optional-dependencies = { + fsspec = [ + appdirs + fsspec + funcy + tqdm + ]; + }; + + # Tests require a account and network access doCheck = false; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix b/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix index 48f7aa8601e5..d3fbc87e25d8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2024.1.1"; + version = "2024.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-+mPbx678QIV567umbmVKqBTq696pFlFXhlb4cMv54ak="; + hash = "sha256-lwtCTzZJn3bamZWbJoeiyxnzrIRZAi9JPjVgiVR0LG8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyemvue/default.nix b/nixpkgs/pkgs/development/python-modules/pyemvue/default.nix new file mode 100644 index 000000000000..d8502aaf4333 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyemvue/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, hatchling + +# propagated modules +, requests +, python-dateutil +, pycognito +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pyemvue"; + version = "0.18.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-s1Uuoiog3OkqOb6PSTqh79vgyLDGFIuZMCyQKH+qG3g="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + requests + python-dateutil + pycognito + typing-extensions + ]; + + pythonImportsCheck = [ "pyemvue" ]; + + # has no tests + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/magico13/PyEmVue/releases/tag/v${version}"; + description = "A Python library for reading data from the Emporia Vue energy monitoring system"; + homepage = "https://github.com/magico13/PyEmVue"; + license = licenses.mit; + maintainers = with maintainers; [ presto8 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix index 05fccad3a89d..4826806c19f1 100644 --- a/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.17.0"; + version = "1.19.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-GNyhUk2/CSSdigrAJ0T2F1+49PkyPxMaec3nO9/cmNo="; + hash = "sha256-Wj2CkOvH5mS+DaIcbrqHjK+0mG3gfyF5M9tFImeJ/ko="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix b/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix index d16b02d1c3a4..ed7997a842ae 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.7.2.2"; + version = "0.8.1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-O3aTwFLIJpEAD+SpJHXbgv/DtachoSsQ37yHEZxLTTA="; + hash = "sha256-bwSCNSYZ8sxWADyiIyG9sNB2S2VnlbweQGKx+psIaGs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix b/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix index 7622f858959b..fcdfdd0442d4 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -1,6 +1,9 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi +, fetchpatch2 +, pdm-backend , pytz , oauthlib , requests @@ -9,14 +12,27 @@ buildPythonPackage rec { pname = "pyfireservicerota"; - version = "0.0.43"; - format = "setuptools"; + version = "0.0.44"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-3+QK1BVuWYii0oYT4xXMOYJZmVKrB4EmqE0EkdFlZvE="; + hash = "sha256-OknGX4xP+AHXRuhizbeTVAfiOX0uRGzAly7FJ1vopDI="; }; + postPatch = '' + # https://github.com/cyberjunky/python-fireservicerota/pull/1 + substituteInPlace pyproject.toml \ + --replace-fail '"aiohttp",' '"requests",' \ + --replace-fail '"aiohttp_retry",' "" + ''; + + nativeBuildInputs = [ + pdm-backend + ]; + propagatedBuildInputs = [ pytz oauthlib diff --git a/nixpkgs/pkgs/development/python-modules/pyformlang/default.nix b/nixpkgs/pkgs/development/python-modules/pyformlang/default.nix index d4a055d459cd..63bf98a0ea5f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyformlang/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyformlang/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pyformlang"; - version = "1.0.4"; + version = "1.0.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ysX6c8q26bcQyq6GgKBKxTdp00j+4ypb3mgM2cqCmBs="; + hash = "sha256-LHQM+Vy8YVfTtpWaveYgBlp74AnS/IF3Y1EbgwVku7I="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix b/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix index 74791d25c0cd..7176e6f48d45 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix @@ -4,22 +4,27 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "pyfronius"; - version = "0.7.2"; - format = "setuptools"; + version = "0.7.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nielstron"; - repo = pname; + repo = "pyfronius"; rev = "release-${version}"; - hash = "sha256-eWe4nXKW9oP9lqehy6BK7ABaIqP3dgRX6ymW1Okfd9g="; + hash = "sha256-7GtY/6uuLe7K9T7xMVt2ytpA6MKVWnyEoLtA5dSMiH4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; diff --git a/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/nixpkgs/pkgs/development/python-modules/pygit2/default.nix index 50211bda6400..1e17f95e54a7 100644 --- a/nixpkgs/pkgs/development/python-modules/pygit2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygit2/default.nix @@ -10,24 +10,29 @@ , pycparser , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pygit2"; - version = "1.13.3"; - format = "setuptools"; + version = "1.14.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-AlfGJgEeSvuZvbIIdUQ/cG+EIB1MkmN/AiFbmOrBPe0="; + hash = "sha256-7FlYVxuCpjUXhcpkXlOUwxrkXuxThLL6nE4F3eNZetY="; }; preConfigure = lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ libgit2 ]; @@ -65,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of Python bindings to the libgit2 shared library"; homepage = "https://github.com/libgit2/pygit2"; + changelog = "https://github.com/libgit2/pygit2/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Only; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix b/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix index 3d3590a37104..2f3cde9a51d8 100644 --- a/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix @@ -5,6 +5,7 @@ , marshmallow-dataclass , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests , responses , setuptools @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,10 +24,15 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-ybl6QOLb1xE6v0D1C2wKMsSU+r2gWzj24Q4pPIMBsCY="; + hash = "sha256-LRzyZAusCo4uZlXFWoRPIfPgAGO4sP0KCGYOICNZ6f4="; }; + pythonRelaxDeps = [ + "marshmallow-dataclass" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; @@ -63,6 +69,7 @@ buildPythonPackage rec { "test_quota_overview" "test_rate_limit" "test_sca_client_scan_diff" + "test_sca_scan_all_with_params" "test_sca_scan_directory_invalid_tar" "test_sca_scan_directory" "test_versions_from_headers" @@ -71,7 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to access the GitGuardian API"; homepage = "https://github.com/GitGuardian/py-gitguardian"; - changelog = "https://github.com/GitGuardian/py-gitguardian/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/GitGuardian/py-gitguardian/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pygls/default.nix b/nixpkgs/pkgs/development/python-modules/pygls/default.nix index 74e5b243e60b..9c4d50843e22 100644 --- a/nixpkgs/pkgs/development/python-modules/pygls/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygls/default.nix @@ -1,19 +1,21 @@ { lib , stdenv , buildPythonPackage -, pythonOlder , fetchFromGitHub -, poetry-core , lsprotocol -, typeguard +, poetry-core , pytest-asyncio , pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, typeguard +, websockets }: buildPythonPackage rec { pname = "pygls"; - version = "1.2.1"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,11 +23,17 @@ buildPythonPackage rec { owner = "openlawlibrary"; repo = "pygls"; rev = "refs/tags/v${version}"; - hash = "sha256-ARez9fs50kScfMp/W/aFIOcJonpFrcfyrzJuVwou7fk="; + hash = "sha256-6+SMlBTi+jw+bAUYqbaxXT5QygZFj4FeeEp6bch8M1s="; }; + pythonRelaxDeps = [ + # https://github.com/openlawlibrary/pygls/pull/432 + "lsprotocol" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -33,6 +41,12 @@ buildPythonPackage rec { typeguard ]; + passthru.optional-dependencies = { + ws = [ + websockets + ]; + }; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook @@ -46,12 +60,14 @@ buildPythonPackage rec { ulimit -n 1024 ''; - pythonImportsCheck = [ "pygls" ]; + pythonImportsCheck = [ + "pygls" + ]; meta = with lib; { description = "Pythonic generic implementation of the Language Server Protocol"; homepage = "https://github.com/openlawlibrary/pygls"; - changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ kira-bruneau ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pygltflib/default.nix b/nixpkgs/pkgs/development/python-modules/pygltflib/default.nix new file mode 100644 index 000000000000..e88437eb15a9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pygltflib/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, fetchFromGitHub +, pythonOlder +, setuptools +, dataclasses-json +, deprecated +, pytestCheckHook +}: + +let + gltf-sample-models = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glTF-Sample-Models"; + rev = "d7a3cc8e51d7c573771ae77a57f16b0662a905c6"; + hash = "sha256-TxSg1O6eIiaKagcZUoWZ5Iw/tBKvQIoepRFp3MdVlyI="; + }; +in + +buildPythonPackage rec { + pname = "pygltflib"; + version = "1.16.1"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitLab { + owner = "dodgyville"; + repo = "pygltflib"; + rev = "da1c687f5ea88d6063616857d54d195fa0739b37"; # no tags in repo, only on PyPI + hash = "sha256-aoYVglpQ0Qaq6gEqZ455GlkL2/C1Q5YjQASVLplsWbs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + dataclasses-json + deprecated + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + preCheck = '' + ln -s ${gltf-sample-models} glTF-Sample-Models + ''; + + pythonImportsCheck = [ "pygltflib" ]; + + 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"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pygmo/default.nix b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix index 0ce6a2fd3f99..d311df0a4530 100644 --- a/nixpkgs/pkgs/development/python-modules/pygmo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix @@ -28,7 +28,7 @@ toPythonModule (stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DPYGMO_INSTALL_PATH=${placeholder "out"}/lib/${python.libPrefix}/site-packages" + "-DPYGMO_INSTALL_PATH=${placeholder "out"}/${python.sitePackages}" ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pygmt/default.nix b/nixpkgs/pkgs/development/python-modules/pygmt/default.nix index 31b9fdd7c3a1..c455bbcfab16 100644 --- a/nixpkgs/pkgs/development/python-modules/pygmt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygmt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "refs/tags/v${version}"; - hash = "sha256-+bkjqHjJIwk44u226q6xqeGmwMWleyc4lRfMZdDjVBA="; + hash = "sha256-DbewB/lP44bpNSQ4ht7n0coS2Ml7qmEU4CP91p5YtZg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pygount/default.nix b/nixpkgs/pkgs/development/python-modules/pygount/default.nix new file mode 100644 index 000000000000..6239ac9dd841 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pygount/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, chardet +, gitpython +, pygments +, rich +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pygount"; + version = "1.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "roskakori"; + repo = "pygount"; + rev = "refs/tags/v${version}"; + hash = "sha256-j+mXIyF/54MCm0yv7Z+ymy/EeZz7iS/a+/5I9lo1+Zo="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + chardet + gitpython + pygments + rich + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # requires network access + "test_can_find_files_from_mixed_cloned_git_remote_url_and_local" + "test_can_extract_and_close_and_find_files_from_cloned_git_remote_url_with_revision" + ]; + + pythonImportsCheck = [ + "pygount" + ]; + + meta = with lib; { + description = "Count lines of code for hundreds of languages using pygments"; + homepage = "https://github.com/roskakori/pygount"; + changelog = "https://github.com/roskakori/pygount/blob/${src.rev}/CHANGES.md"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index 8d3037baa454..e55936a8e41c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyhanko-certvalidator"; - version = "0.26.2"; + version = "0.26.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "MatthiasValvekens"; repo = "certvalidator"; rev = "refs/tags/v${version}"; - hash = "sha256-yGFaRpAOTbuVfY5UefC1sdJS4FFkgkIZnHHG35p3n3E="; + hash = "sha256-uUmsWiN182g+kxrCny7UNLDHdAdqKk64w6vnjmGBNjM="; }; postPatch = '' @@ -68,8 +68,8 @@ buildPythonPackage rec { "test_revocation_mode_hard_aiohttp_autofetch" # The path could not be validated because no revocation information could be found for intermediate certificate 1 "test_revocation_mode_hard" - # certificate expired 2022-09-17 - "test_revocation_mode_soft" + # ValueError: Hash algorithm not known for ed448 + "test_ed" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix b/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix index c3e26156f5a2..03e7babfb4fe 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.77"; + version = "0.1.78"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "00d95c21b95a17bc07586f69c976fb343a103adc0954d7b2d56c7160665625cb"; + sha256 = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc="; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix b/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix index 99f90e17b028..a8930149b1bb 100644 --- a/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykoplenti/default.nix @@ -7,33 +7,33 @@ , pycryptodome , pydantic , pythonOlder +, pythonRelaxDepsHook , setuptools }: buildPythonPackage rec { pname = "pykoplenti"; version = "1.2.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "stegm"; - repo = pname; + repo = "pykoplenti"; rev = "refs/tags/v${version}"; hash = "sha256-2sGkHCIGo1lzLurvQBmq+16sodAaK8v+mAbIH/Gd3+E="; }; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; - postPatch = '' - # remove with 1.1.0 - substituteInPlace setup.cfg \ - --replace 'version = unreleased' 'version = ${version}' - ''; - propagatedBuildInputs = [ aiohttp pycryptodome @@ -50,11 +50,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pykoplenti" ]; + pythonImportsCheck = [ + "pykoplenti" + ]; meta = with lib; { description = "Python REST client API for Kostal Plenticore Inverters"; homepage = "https://github.com/stegm/pykoplenti/"; + changelog = "https://github.com/stegm/pykoplenti/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix b/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix index 790b41626bf0..a49967ee6c3e 100644 --- a/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage +, fetchpatch , python-dateutil , docopt , fetchPypi , pytestCheckHook -, pyyaml , ruamel-yaml , testfixtures }: @@ -19,10 +19,18 @@ buildPythonPackage rec { hash = "sha256-eWsq0+1MuZuIMItTP7L1WcMPpu+0+p/aETR/SD0kWIQ="; }; + patches = [ + # fix test failures with ruamel.yaml 0.18+ + (fetchpatch { + name = "pykwalify-fix-tests-ruamel-yaml-0.18.patch"; + url = "https://github.com/Grokzen/pykwalify/commit/57bb2ba5c28b6928edb3f07ef581a5a807524baf.diff"; + hash = "sha256-XUiebDzFSvNrPpRMoc2lv9m+30cfFh0N0rznMiSdQ/0="; + }) + ]; + propagatedBuildInputs = [ python-dateutil docopt - pyyaml ruamel-yaml ]; @@ -31,10 +39,6 @@ buildPythonPackage rec { testfixtures ]; - disabledTests = [ - "test_multi_file_support" - ]; - pythonImportsCheck = [ "pykwalify" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pylgnetcast/default.nix b/nixpkgs/pkgs/development/python-modules/pylgnetcast/default.nix index 1e18c9f93aea..f4811bf02dfc 100644 --- a/nixpkgs/pkgs/development/python-modules/pylgnetcast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylgnetcast/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pylgnetcast"; - version = "0.3.8"; + version = "0.3.9"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Drafteed"; repo = "python-lgnetcast"; rev = "refs/tags/v${version}"; - hash = "sha256-UxZ4XM7n0Ryd4D967fXPTA4sqTrZwS8Tj/Q8kNGdk8Q="; + hash = "sha256-5lzLknuGLQryLCc4YQJn8AGuWTiSM90+8UTQ/WYfASM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix b/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix index d12e7268a24f..d3f22e8532ef 100644 --- a/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage , django +, django-tables2 +, django-tastypie , factory-boy , fetchFromGitHub +, poetry-core , pylint-plugin-utils , pytestCheckHook , pythonOlder @@ -11,33 +14,43 @@ buildPythonPackage rec { pname = "pylint-django"; version = "2.5.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; - repo = pname; + repo = "pylint-django"; rev = "refs/tags/v${version}"; hash = "sha256-MNgu3LvFoohXA+JzUiHIaYFw0ssEe+H5T8Ea56LcGuI="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ - django pylint-plugin-utils ]; + passthru.optional-dependencies = { + with_django = [ + django + ]; + }; + nativeCheckInputs = [ + django-tables2 + django-tastypie factory-boy pytestCheckHook ]; disabledTests = [ - # AttributeError, AssertionError - "external_django_tables2_noerror_meta_class" - "external_tastypie_noerror_foreign_key" + # AttributeError: module 'pylint.interfaces' has no attribute 'IAstroidChecker' + "test_migrations_plugin" "func_noerror_model_unicode_lambda" - "0001_noerror_initial" + "test_linter_should_be_pickleable_with_pylint_django_plugin_installed" ]; pythonImportsCheck = [ @@ -47,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pylint plugin to analyze Django applications"; homepage = "https://github.com/PyCQA/pylint-django"; + changelog = "https://github.com/pylint-dev/pylint-django/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kamadorueda ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/nixpkgs/pkgs/development/python-modules/pylint-plugin-utils/default.nix index a8cff3800960..cdc29eb19621 100644 --- a/nixpkgs/pkgs/development/python-modules/pylint-plugin-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylint-plugin-utils/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core , pylint , pytestCheckHook , pythonOlder @@ -9,18 +10,22 @@ buildPythonPackage rec { pname = "pylint-plugin-utils"; - version = "0.7"; - format = "setuptools"; + version = "0.8.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; - repo = pname; - rev = version; - hash = "sha256-uDsSSUWdlzuQz6umoYLbIotOYNEnLQu041ZZVMRd2ww="; + repo = "pylint-plugin-utils"; + rev = "refs/tags/${version}"; + hash = "sha256-xuPU1txfB+6+zJjtlfvNA950S5n7/PWPPFn1F3RtvCc="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ pylint toml diff --git a/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix b/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix index e069e902687f..c95a36aa8eca 100644 --- a/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -1,37 +1,50 @@ { lib , async-timeout , buildPythonPackage +, click , cryptography , fetchFromGitHub +, hatchling , pytest-asyncio , pytest-timeout , pytestCheckHook , pythonOlder -, setuptools +, xdg +, zeroconf }: buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.18.3"; - format = "pyproject"; + version = "0.19.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "gurumitts"; - repo = pname; + repo = "pylutron-caseta"; rev = "refs/tags/v${version}"; - hash = "sha256-tjmMu7LUne+hLLTXGqHhci9/PZiuQ10mQaARvL2sdIM="; + hash = "sha256-/xTHtzXEFGL2/oP1oVxJj7GO3fSZ5CwjXDdp6OLhlzM="; }; nativeBuildInputs = [ - setuptools + hatchling ]; propagatedBuildInputs = [ cryptography + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; + passthru.optional-dependencies = { + cli = [ + click + xdg + zeroconf + ]; + }; + nativeCheckInputs = [ pytest-asyncio pytest-timeout diff --git a/nixpkgs/pkgs/development/python-modules/pylutron/default.nix b/nixpkgs/pkgs/development/python-modules/pylutron/default.nix index b55696d840f9..f217b46179f9 100644 --- a/nixpkgs/pkgs/development/python-modules/pylutron/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylutron/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pylutron"; - version = "0.2.10"; + version = "0.2.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-DKwjBQXC7O/8bFxq5shJJxRV3HYgBeS7tJXg4m3vQMY="; + hash = "sha256-9M7bCZD3zGZM62ID0yB/neKkF+6UW8x5m2y5vj/mYes="; }; # Project has no tests diff --git a/nixpkgs/pkgs/development/python-modules/pylxd/default.nix b/nixpkgs/pkgs/development/python-modules/pylxd/default.nix index f3965de56b85..ee860eb6f105 100644 --- a/nixpkgs/pkgs/development/python-modules/pylxd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylxd/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pylxd"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; src = fetchFromGitHub { owner = "lxc"; repo = "pylxd"; - rev = version; - hash = "sha256-eDRCJYjmBndMnSNuS6HD/2p/KhzqJq2qPAzMk7kC5UM="; + rev = "refs/tags/${version}"; + hash = "sha256-Q4GMz7HFpJNPYlYgLhE0a7mVCwNpdbw4XVcUGQ2gUJ0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pymatreader/default.nix b/nixpkgs/pkgs/development/python-modules/pymatreader/default.nix new file mode 100644 index 000000000000..484797381fa9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pymatreader/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, setuptools +, h5py +, numpy +, scipy +, xmltodict +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pymatreader"; + version = "0.0.31"; + pyproject = true; + + src = fetchFromGitLab { + owner = "obob"; + repo = "pymatreader"; + rev = "refs/tags/v${version}"; + hash = "sha256-pYObmvqA49sHjpZcwXkN828R/N5CSpmr0OyyxzDiodQ="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + h5py + numpy + scipy + xmltodict + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pymatreader" ]; + + meta = with lib; { + description = "A python package to read all kinds and all versions of Matlab mat files"; + homepage = "https://gitlab.com/obob/pymatreader/"; + changelog = "https://gitlab.com/obob/pymatreader/-/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd2; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pymatting/01-kdtree-signature.patch b/nixpkgs/pkgs/development/python-modules/pymatting/01-kdtree-signature.patch deleted file mode 100644 index 2193b260aea1..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pymatting/01-kdtree-signature.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/test_kdtree.py b/tests/test_kdtree.py -index 0110083..049fa07 100644 ---- a/tests/test_kdtree.py -+++ b/tests/test_kdtree.py -@@ -23,7 +23,7 @@ def run_kdtree(): - - tree = cKDTree(data_points) - -- distances2, indices2 = tree.query(query_points, k=k, n_jobs=-1) -+ distances2, indices2 = tree.query(query_points, k=k) - - t2 = time.perf_counter() - diff --git a/nixpkgs/pkgs/development/python-modules/pymatting/default.nix b/nixpkgs/pkgs/development/python-modules/pymatting/default.nix index 5e3b39dd523a..371a4a03c2f3 100644 --- a/nixpkgs/pkgs/development/python-modules/pymatting/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymatting/default.nix @@ -4,14 +4,15 @@ , numba , numpy , pillow -, scipy , pytestCheckHook -, +, scipy +, setuptools }: + buildPythonPackage rec { pname = "pymatting"; version = "1.1.10"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "pymatting"; @@ -20,7 +21,9 @@ buildPythonPackage rec { hash = "sha256-wHCTqcBvVN/pTXH3iW57DPpMEsnehutRQB5NaugS6Zs="; }; - patches = [ ./01-kdtree-signature.patch ]; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ numba @@ -29,12 +32,14 @@ buildPythonPackage rec { scipy ]; - pythonImportsCheck = [ "pymatting" ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "pymatting" + ]; + disabledTests = [ # no access to input data set # see: https://github.com/pymatting/pymatting/blob/master/tests/download_images.py diff --git a/nixpkgs/pkgs/development/python-modules/pymc/default.nix b/nixpkgs/pkgs/development/python-modules/pymc/default.nix index d6dfaaa2cca2..5427eafb1035 100644 --- a/nixpkgs/pkgs/development/python-modules/pymc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymc/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; - homepage = "https://github.com/pymc-devs/pymc3"; + homepage = "https://github.com/pymc-devs/pymc"; changelog = "https://github.com/pymc-devs/pymc/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ nidabdella ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix index 3a06e511a344..d9387a62bec9 100644 --- a/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -44,14 +44,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.5"; + version = "10.7"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - hash = "sha256-S9xnGzX9VHRWDfrlIVcywiyuyyxIFYitwTMdGZ2NEqo="; + hash = "sha256-jeU3mXaARToN1NZ+pcogCu70foGc5xAmijLUSfd9k9U="; }; nativeBuildInputs = [ hatchling ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix b/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix index 68925fe7f4a9..74784a35ff95 100644 --- a/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix @@ -5,6 +5,7 @@ , mock , six , pytestCheckHook +, python-memcached , pythonOlder , zstd , stdenv @@ -32,6 +33,7 @@ buildPythonPackage rec { faker mock pytestCheckHook + python-memcached zstd ]; @@ -39,10 +41,7 @@ buildPythonPackage rec { sed -i "/--cov/d" setup.cfg ''; - disabledTests = [ - # python-memcached is not available (last release in 2017) - "TestClientSocketConnect" - ] ++ lib.optionals stdenv.is32bit [ + disabledTests = lib.optionals stdenv.is32bit [ # test_compressed_complex is broken on 32-bit platforms # this can be removed on the next version bump # see also https://github.com/pinterest/pymemcache/pull/480 diff --git a/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix b/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix index 7d2a583891fb..723eb220b587 100644 --- a/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix @@ -4,21 +4,26 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pymicrobot"; - version = "0.0.9"; - format = "setuptools"; + version = "0.0.12"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { pname = "PyMicroBot"; inherit version; - hash = "sha256-dhhRHXdck7hJGkXQpkiMulLsnMluZ5ADZ9L8cNm6dFs="; + hash = "sha256-Ysg97ApwbraRn19Mn5pJsg91dzf/njnNZiBJQKZqIbQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ bleak bleak-retry-connector diff --git a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix index f62b039bbb45..e0a68e2a4385 100644 --- a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix @@ -5,12 +5,14 @@ , gitpython , grpcio , grpcio-testing +, minio , mmh3 , pandas +, pyarrow , pytestCheckHook -, python , pythonOlder , pythonRelaxDepsHook +, requests , scikit-learn , setuptools-scm , ujson @@ -19,19 +21,20 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.3.3"; - format = "pyproject"; + version = "2.3.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "milvus-io"; - repo = pname; + repo = "pymilvus"; rev = "refs/tags/v${version}"; - hash = "sha256-qnm6JaeF2Li2NgVGZ6yJ2yz1n3pVZqkF4Ee+q4v/kdA="; + hash = "sha256-K7k3MTOEm9+HDwMps9C8Al0Jmp1ptJw3pN1LEBOUz0U="; }; pythonRelaxDeps = [ + "environs" "grpcio" ]; @@ -45,8 +48,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ environs grpcio + minio mmh3 pandas + pyarrow + requests ujson ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix index 4c6676ae97a0..a9c425dfabef 100644 --- a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.5.4"; + version = "3.6.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IgGDYNIRS39t8vHkJSGnDGCTKxpeIYZyedLzyS5pOI0="; + hash = "sha256-SYdjM3wFZD+bAOd0vRFe6N5UwF+1Wv97ooihJjKV8K0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyngo/default.nix b/nixpkgs/pkgs/development/python-modules/pyngo/default.nix index 3616d5eaec6b..a52a09166c5e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyngo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyngo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pyngo"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "yezz123"; repo = "pyngo"; rev = "refs/tags/${version}"; - hash = "sha256-jHPZjS/J1VLpsLN2wg5UJCgavoSEs4Uogo4GI6bZMuY="; + hash = "sha256-wvy1L21AnQ4JP5seAh6DWksQU2OcbYTXKcixpFryH4w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix b/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix index 04f474a8aed5..6b70a33f0f89 100644 --- a/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.0.5"; + version = "7.1.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YTe9n5cZLYQ9ghTOF8MHg/1d8iRElPHNnAQj0pnEjR4="; + hash = "sha256-UanhPx92E8mR6ertGKIGm1HAbiFXf4ATJonvPjNdFS0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pynitrokey/default.nix b/nixpkgs/pkgs/development/python-modules/pynitrokey/default.nix index c00032cb2c4e..58f54f148866 100644 --- a/nixpkgs/pkgs/development/python-modules/pynitrokey/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynitrokey/default.nix @@ -30,7 +30,7 @@ let pname = "pynitrokey"; - version = "0.4.44"; + version = "0.4.45"; mainProgram = "nitropy"; in @@ -40,7 +40,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-SWLxiUAE8AVa+EYjOk0kzOcW65TJbvUe627VmJY7nFY="; + hash = "sha256-iY4ThrmXP7pEjTYYU4lePVAbuJGTdHX3iKswXzuf7W8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix b/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix index 9817ba9935d9..2488222b5f4d 100644 --- a/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , importlib-metadata , joblib , llvmlite , numba , scikit-learn , scipy +, setuptools , pytestCheckHook , pythonOlder }: @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pynndescent"; version = "0.5.11"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -24,12 +24,8 @@ buildPythonPackage rec { hash = "sha256-b0TO2dWp2iyH2bL/8wu1MIVAwGV2BeTVzeftMnW7rVA="; }; - patches = [ - # https://github.com/lmcinnes/pynndescent/pull/224 - (fetchpatch { - url = "https://github.com/lmcinnes/pynndescent/commit/86e0d716a3a4d5f4e6a0a3c2952f6fe339524e96.patch"; - hash = "sha256-dfnT5P9Qsn/nSAr4Ysqo/olbLLfoZXvBRz33yzhN3J4="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -46,16 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # numpy.core._exceptions._UFuncNoLoopError - "test_sparse_nn_descent_query_accuracy_angular" - "test_nn_descent_query_accuracy_angular" - "test_alternative_distances" - # scipy: ValueError: Unknown Distance Metric: wminkowski - # https://github.com/scikit-learn/scikit-learn/pull/21741 - "test_weighted_minkowski" - ]; - pythonImportsCheck = [ "pynndescent" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix b/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix index fe9574105289..bb302c78247b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.16.0"; + version = "1.16.1"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gacou54"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qwH3kJzJRHuuGW7tgcaQjT+JwDsAZksQDZciaJLC55Q="; + hash = "sha256-6l3L0YUAqedyRjlQ6K3SaAMdGK2C0AeKpJj6MyXi4RA="; }; nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyosohotwaterapi/default.nix b/nixpkgs/pkgs/development/python-modules/pyosohotwaterapi/default.nix new file mode 100644 index 000000000000..bd2b10976a07 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyosohotwaterapi/default.nix @@ -0,0 +1,63 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, loguru +, numpy +, pythonOlder +, setuptools +, unasync +, urllib3 +}: + +buildPythonPackage rec { + pname = "pyosohotwaterapi"; + version = "1.1.4"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "osohotwateriot"; + repo = "apyosohotwaterapi"; + rev = "refs/tags/${version}"; + hash = "sha256-7FLGmmndrFqSl4oC8QFIYNlFJPr+xbiZG5ZRt4vx8+s="; + }; + + postPatch = '' + # https://github.com/osohotwateriot/apyosohotwaterapi/pull/3 + substituteInPlace requirements.txt \ + --replace "pre-commit" "" + ''; + + nativeBuildInputs = [ + setuptools + unasync + ]; + + propagatedBuildInputs = [ + aiohttp + loguru + numpy + urllib3 + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "apyosoenergyapi" + ]; + + meta = with lib; { + description = "Module for using the OSO Hotwater API"; + homepage = "https://github.com/osohotwateriot/apyosohotwaterapi"; + changelog = "https://github.com/osohotwateriot/apyosohotwaterapi/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyprusalink/default.nix b/nixpkgs/pkgs/development/python-modules/pyprusalink/default.nix index 0a1d8afc3bd1..0356f899594b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyprusalink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyprusalink/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyprusalink"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wboyISggzC50cZ+J/NC0ytWXwCLBmBpP9/MtPkRb+Zs="; + hash = "sha256-wwH4LE8wi8eb7QwT7N1mNtVleoWscDEOu2vrXKDktwU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix b/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix index 9dc076a5e8d1..4ad16f6ea0a6 100644 --- a/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -10,14 +10,14 @@ let inherit (darwin) autoSignDarwinBinariesHook; in buildPythonPackage (rec { pname = "PyQtWebEngine"; - version = "5.15.4"; + version = "5.15.6"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f"; + sha256 = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyradios/default.nix b/nixpkgs/pkgs/development/python-modules/pyradios/default.nix index 8f9b96e5d12a..42b46720fca2 100644 --- a/nixpkgs/pkgs/development/python-modules/pyradios/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyradios/default.nix @@ -2,26 +2,26 @@ , buildPythonPackage , fetchPypi , appdirs -, requests +, httpx , setuptools , pythonOlder }: buildPythonPackage rec { pname = "pyradios"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Uqg/owmf2popAhyanAUIdSWpXAGCWkQja4P944BpNhc="; + hash = "sha256-XTpw8bgFZo35PJngr9oweU6fY3KAphJsrEhkKzWHLIA="; }; propagatedBuildInputs = [ appdirs - requests + httpx setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyrdfa3/default.nix b/nixpkgs/pkgs/development/python-modules/pyrdfa3/default.nix index ef6d33cb8e80..51f6411cb4fb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrdfa3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrdfa3/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage -, fetchPypi , fetchpatch -, isPy27 -, rdflib +, fetchPypi , html5lib +, pythonOlder +, rdflib +, setuptools }: buildPythonPackage rec { pname = "pyrdfa3"; version = "3.5.3"; - format = "setuptools"; - disabled = isPy27; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; @@ -21,6 +23,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { + # https://github.com/RDFLib/pyrdfa3/pull/40 name = "CVE-2022-4396.patch"; url = "https://github.com/RDFLib/pyrdfa3/commit/ffd1d62dd50d5f4190013b39cedcdfbd81f3ce3e.patch"; hash = "sha256-prRrOwylYcEqKLr/8LIpyJ5Yyt+6+HTUqH5sQXU8tqc="; @@ -31,21 +34,28 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "'html = pyRdfa.rdflibparsers:StructuredDataParser'" "'html = pyRdfa.rdflibparsers:StructuredDataParser'," \ --replace "'hturtle = pyRdfa.rdflibparsers:HTurtleParser'" "'hturtle = pyRdfa.rdflibparsers:HTurtleParser'," + # https://github.com/RDFLib/pyrdfa3/issues/31 + substituteInPlace pyRdfa/utils.py \ + --replace "imp," "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ rdflib html5lib ]; - # Does not work with python3 - doCheck = false; - - pythonImportsCheck = [ "pyRdfa" ]; + pythonImportsCheck = [ + "pyRdfa" + ]; meta = with lib; { description = "RDFa 1.1 distiller/parser library"; - homepage = "https://www.w3.org/2012/pyRdfa/"; + homepage = "https://github.com/prrvchr/pyrdfa3/"; + changelog = "https://github.com/prrvchr/pyrdfa3/releases/tag/v${version}"; license = licenses.w3c; maintainers = with maintainers; [ ambroisie ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix b/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix index 9345b819f75c..368f3cda24de 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix @@ -14,12 +14,13 @@ }: buildPythonPackage rec { - pname = "pyRFC3339"; + pname = "pyrfc3339"; version = "1.1"; pyproject = true; src = fetchPypi { - inherit pname version; + pname = "pyRFC3339"; + inherit version; sha256 = "06jv7ar7lpvvk0dixzwdr3wgm0g1lipxs429s2z7knwwa7hwpf41"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix b/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix index 64b9b97d4a35..4903dbbbc241 100644 --- a/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.15"; + version = "0.9.16"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-kIp946iMKyKiwhppkXxTIVKJW9GkkFJ6Jw7hTK1A5kc="; + hash = "sha256-ECdAa62+zdMP5W6AClp2rX1ycaOuwLes94DuJqAPLUA="; }; # Deliberately not in propagated build inputs; users can decide diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index a66a8cafce2b..2a9ae5011d89 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.0.10"; + version = "1.0.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,12 +19,12 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-oH+47J/7zpJDOAVQ27qIOFtlYfNlzIP6OSp7ogrmdpY="; + hash = "sha256-ibCwTZymgd+VuE4UXbYxUyIbzlpfIdc2zE8Nz/vhBGQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=sigma --cov-report term --cov-report xml:cov.xml" "" + --replace-fail " --cov=sigma --cov-report term --cov-report xml:cov.xml" "" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index 3fdfd2bfdd6d..666816669929 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -6,13 +6,14 @@ , pysigma-backend-elasticsearch , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests }: buildPythonPackage rec { pname = "pysigma-backend-opensearch"; version = "1.0.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -25,11 +26,16 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=sigma --cov-report term --cov-report xml:cov.xml" "" + --replace-fail " --cov=sigma --cov-report term --cov-report xml:cov.xml" "" ''; + pythonRelaxDeps = [ + "pysigma" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix index 7f4a467b3b02..817cdf8866c9 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix @@ -6,6 +6,7 @@ , pysigma-pipeline-sysmon , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests }: @@ -23,8 +24,13 @@ buildPythonPackage rec { hash = "sha256-VymaxX+iqrRlf+WEt4xqEvNt5kg8xI5O/MoYahayu0o="; }; + pythonRelaxDeps = [ + "pysigma" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -36,11 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pysigma = "^0.7.2"' 'pysigma = "*"' - ''; - pythonImportsCheck = [ "sigma.backends.qradar" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index bf939afd646c..ec467e52e9ac 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,8 +10,8 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "1.0.3"; - format = "pyproject"; + version = "1.1.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "refs/tags/v${version}"; - hash = "sha256-ZDRHCzNLwBx8cugNVSkk7lZhE7MzariX0OS4pHv0f1s="; + hash = "sha256-PRJmFXVjcvXVHITwp6ESSoizmJOSiLTl1mj67rNhSNw="; }; nativeBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to support Splunk for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-backend-splunk"; + changelog = "https://github.com/SigmaHQ/pySigma-backend-splunk/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix new file mode 100644 index 000000000000..b9279b024102 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pysigma-backend-sqlite"; + version = "0.1.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-backend-sqlite"; + rev = "refs/tags/v${version}"; + hash = "sha256-wbFSgtsiP5k1aGJx8PWDl0N28r0dgn6Fduk0PuM8x3w="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ + "sigma.backends.sqlite" + ]; + + meta = with lib; { + description = "Library to support sqlite for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-backend-sqlite"; + changelog = "https://github.com/SigmaHQ/pySigma-backend-sqlite/releases/tag/v${version}"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index 2f7f43660d0c..0b08cd5e1b12 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -9,8 +9,8 @@ buildPythonPackage rec { pname = "pysigma-pipeline-crowdstrike"; - version = "1.0.2"; - format = "pyproject"; + version = "1.0.3"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "refs/tags/v${version}"; - hash = "sha256-kopZ4bbWX0HNrqos9XO/DfbdExlgZcDLEsUpOBumvBA="; + hash = "sha256-0uSoZC2cUgdOGE5saLlx5n0gbVPX61kkASCBFD4F5QM="; }; nativeBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to support CrowdStrike pipeline for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike"; + changelog = "https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index 9b02a38cb18b..a60b50f2bc2b 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -9,8 +9,8 @@ buildPythonPackage rec { pname = "pysigma-pipeline-sysmon"; - version = "1.0.3"; - format = "pyproject"; + version = "1.0.4"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-sysmon"; rev = "refs/tags/v${version}"; - hash = "sha256-5CDwevzD6R1nIcID6C5PV+i6pwY2CLakRC6NUXtmPs8="; + hash = "sha256-/WBHu1pFEiVPJQ97xEwjJJ92h9kHzTBPgmfQrR+RZjA="; }; nativeBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to support Sysmon pipeline for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-pipeline-sysmon"; + changelog = "https://github.com/SigmaHQ/pySigma-pipeline-sysmon/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index b6f47d9f4a44..5b6518bbf8d8 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-windows"; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-windows"; rev = "refs/tags/v${version}"; - hash = "sha256-279+nP5IeZiIjKNhJ2adbcJSDzcu7yqIB5JNFK5CPF0="; + hash = "sha256-Ss0OMd8urCYQUlvsm/m8Kz0jY4pVSEoZuLxs1JLWxQA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix index 5ede9fb34ba9..b883c5ea147f 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.10.10"; - format = "pyproject"; + version = "0.11.3"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,10 +24,11 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-QudaAZOxUXLUMMx10gEpWcaI+2ewpkNZOGUDEbxChg0="; + hash = "sha256-G3/ksQXAN981i8iZC8/Ho0r/iHQqqtBPg/VdDTWxC9Y="; }; pythonRelaxDeps = [ + "jinja2" "packaging" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysnmplib/default.nix b/nixpkgs/pkgs/development/python-modules/pysnmplib/default.nix index 587bb4762716..abcbe70562de 100644 --- a/nixpkgs/pkgs/development/python-modules/pysnmplib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysnmplib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysnmplib"; - version = "5.0.23"; + version = "5.0.24"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pysnmp"; repo = "pysnmp"; rev = "refs/tags/v${version}"; - hash = "sha256-1h87fqaWMJN25SOD0xOkP3PFm1GPK99sT0o6ILCFVUI="; + hash = "sha256-AtQqXiy943cYhHDsyz9Yk5uA4xK7Q4p21CT3X3zYzrQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix b/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix index 5e740e78e6a8..1eab58761440 100644 --- a/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix @@ -9,6 +9,7 @@ , requests , responses , poetry-core +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -25,8 +26,13 @@ buildPythonPackage rec { hash = "sha256-jLhM47o6LvkPux0kusOrRk4TDS6VLWE0QMEiQxlBCwo="; }; + pythonRelaxDeps = [ + "responses" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyspellchecker/default.nix b/nixpkgs/pkgs/development/python-modules/pyspellchecker/default.nix index 0a8b0162ad74..ee8d980c1bb0 100644 --- a/nixpkgs/pkgs/development/python-modules/pyspellchecker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyspellchecker/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyspellchecker"; - version = "0.7.3"; + version = "0.8.1"; format = "pyproject"; src = fetchFromGitHub { owner = "barrust"; repo = "pyspellchecker"; rev = "refs/tags/v${version}"; - hash = "sha256-DUFJGO0Ncobr36k0hQRgeHf77Mds53JJHOMlf4/zfAI="; + hash = "sha256-8IwTMj/RqMc9UqhzyvmrirPGuMEwj3iMr+FmF+8312U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index 7f831e1d8e47..ad55dbc99fdf 100644 --- a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.44.0"; + version = "0.45.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-8F0mcZuGU3CiB3pGbAVReKAjvqFLMNa3EHLOOVujgAo="; + hash = "sha256-lQVUHZvAZ4J0DLlUl30dSz2wwXKb9MK5prkXvub0yNI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytedee-async/default.nix b/nixpkgs/pkgs/development/python-modules/pytedee-async/default.nix index 96bb9bca21d8..f4ce2c7bcd89 100644 --- a/nixpkgs/pkgs/development/python-modules/pytedee-async/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytedee-async/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pytedee-async"; - version = "0.2.11"; + version = "0.2.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pytedee_async"; rev = "refs/tags/v${version}"; - hash = "sha256-mBTY2JU79Hk6P+oWQ+2FD0BYHL1c865EvnTUl6H+gnk="; + hash = "sha256-3W+eqkniDMoDKeute5w1QyklOc/aren/Q8txBEI/4ys="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytenable/default.nix b/nixpkgs/pkgs/development/python-modules/pytenable/default.nix index 41e424e60112..6639be7e61c2 100644 --- a/nixpkgs/pkgs/development/python-modules/pytenable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytenable/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.18"; + version = "1.4.19"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-JAS+C1MeO/B8ZQ2BYsRwpVW08E9hGoJcvv9zOJZD3Gg="; + hash = "sha256-UvnDpt0PrK2stO9eRXtqApJjlzXCIXmwMq7ewx+fQ/0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index 705c578f3bd5..b73ae05a8cce 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "24.1.1"; + version = "24.1.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; rev = "refs/tags/v${version}"; - hash = "sha256-UPQx+CGJgaK4XVNngtzzncSueQN9LWh1gMmH5nGtPNk="; + hash = "sha256-NtGk+azpSZZm9PUf6Q1Qipo/zaUH+bed7k3oFnQyKjw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix index bbc67a278855..1942a362a176 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.8.1"; + version = "3.8.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Sdf2+K1TTlpuc/uPX9OJhmBvF7Ru5V9+vuB6VcZ3ygE="; + hash = "sha256-JM7AEoyCL1G19AL6zgnnBJlU2WddsspnX84e9/j3Seg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix index ed62f69d4818..efa2cc4049bc 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix @@ -8,20 +8,20 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "2.2.4"; - format = "pyproject"; + version = "2.3.1"; + pyproject = true; src = fetchPypi { pname = "pytest_check"; inherit version; - hash = "sha256-0uaWYDFB9bLekFuTWD5FmE7DxhzscCZJ3rEL2XSFYLs="; + hash = "sha256-UbjxiozKpCbF2RPE4ORvAUqqdXlIHqA9Itfh9Jj2ibI="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ + buildInputs = [ pytest ]; @@ -29,10 +29,15 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "pytest_check" + ]; + meta = with lib; { description = "pytest plugin allowing multiple failures per test"; homepage = "https://github.com/okken/pytest-check"; + changelog = "https://github.com/okken/pytest-check/releases/tag/${version}"; license = licenses.mit; - maintainers = [ maintainers.flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-describe/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-describe/default.nix index a7c389202ee9..c1118327734c 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-describe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-describe/default.nix @@ -11,7 +11,7 @@ let pname = "pytest-describe"; - version = "2.1.0"; + version = "2.2.0"; in buildPythonPackage { inherit pname version; @@ -19,7 +19,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-BjDJWsSUKrjc2OdmI2+GQ2tJhIltsMBZ/CNP72b+lzI="; + hash = "sha256-ObsF65DySX2co0Lvmgt/pbraflhQWuwz9m1mHWMZVbc="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix index a9c8743badf8..531ad08dec46 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix @@ -7,7 +7,6 @@ , django-configurations , pytest , pytestCheckHook -, pytest-xdist }: buildPythonPackage rec { pname = "pytest-django"; @@ -35,7 +34,6 @@ buildPythonPackage rec { nativeCheckInputs = [ django-configurations pytestCheckHook - pytest-xdist ]; preCheck = '' @@ -51,6 +49,8 @@ buildPythonPackage rec { "test_settings_restored" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "py.test plugin for testing of Django applications"; homepage = "https://pytest-django.readthedocs.org/en/latest/"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-harvest/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-harvest/default.nix new file mode 100644 index 000000000000..32c195171934 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-harvest/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, pytest-runner +, pytest +, decopatch +, makefun +, six +, pytestCheckHook +, numpy +, pandas +, tabulate +, pytest-cases +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytest-harvest"; + version = "1.10.4"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "smarie"; + repo = "python-pytest-harvest"; + rev = "refs/tags/${version}"; + hash = "sha256-ebzE63d7zt9G9HgbLHaE/USZZpUd3y3vd0kNdT/wWw0="; + }; + + # create file, that is created by setuptools_scm + # we disable this file creation as it touches internet + postPatch = '' + echo "version = '${version}'" > pytest_harvest/_version.py + ''; + + nativeBuildInputs = [ + setuptools-scm + pytest-runner + ]; + + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ + decopatch + makefun + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + numpy + pandas + tabulate + pytest-cases + ]; + + pythonImportsCheck = [ "pytest_harvest" ]; + + meta = with lib; { + description = "Store data created during your `pytest` tests execution, and retrieve it at the end of the session, e.g. for applicative benchmarking purposes"; + homepage = "https://github.com/smarie/python-pytest-harvest"; + changelog = "https://github.com/smarie/python-pytest-harvest/releases/tag/${src.rev}"; + license = licenses.bsd3; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix index 0b0f892c7f6c..738579f3ec20 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8qLcbMhD+mTLH5veweAg56G067H4AnDQIjywINwJaCE="; + hash = "sha256-WzPspBVcrtcDqZI+PuAttfI7YBKC5DW5IM+Y7iUdQFI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix index 4e368fb1f169..bfe9fb613e24 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix @@ -1,27 +1,38 @@ { lib +, attrs , buildPythonPackage , fetchPypi , filelock , pytest , mypy +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "pytest-mypy"; version = "0.10.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-+EWPZCMj8Toso+LmFQn3dnlmtSe02K3M1QMsPntP09s="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - buildInputs = [ pytest ]; + buildInputs = [ + pytest + ]; - propagatedBuildInputs = [ mypy filelock ]; + propagatedBuildInputs = [ + attrs + mypy + filelock + ]; # does not contain tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix index ff4cde9c73e5..df1045a19955 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytest-playwright"; - version = "0.4.3"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-pytest"; rev = "refs/tags/v${version}"; - hash = "sha256-5qjfZGDM1OqXXNyj81O49ClKKGiAPdgyZZu6TgpskGs="; + hash = "sha256-jCK2i27wRGsv65zfzW+Ef72HNQd4Qu/Mw3HX66ZMQ9Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix index 5218f0a778e5..2b2b6624c099 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix @@ -1,28 +1,49 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder +, py , pytest +, pytest-xdist +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { - version = "1.1.0"; - format = "setuptools"; pname = "pytest-random-order"; + version = "1.1.1"; + pyproject = true; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-2+beu5NTp6+YTMnt2+s1d91Nu8wVKaeePSH2jtm0VgU="; + hash = "sha256-RHLX008fHF86NZxP/FwT7QZSMvMeyhnIhEwatAbnkIA="; }; - disabled = pythonOlder "3.5"; + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + pytest + ]; + + nativeCheckInputs = [ + py + pytest-xdist + pytestCheckHook + ]; - buildInputs = [ pytest ]; + pythonImportsCheck = [ + "random_order" + ]; meta = with lib; { homepage = "https://github.com/jbasko/pytest-random-order"; description = "Randomise the order of tests with some control over the randomness"; + changelog = "https://github.com/jbasko/pytest-random-order/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.prusnak ]; + maintainers = with maintainers; [ prusnak ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/nixpkgs/pkgs/development/python-modules/pytest/default.nix index 67fb6989df01..88398d5ab438 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.4.3"; + version = "7.4.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-2YnRNpgt5OOynavMg4rVgcZOjtUsEfvobd69naCBjNU="; + hash = "sha256-LPAAWSLGrOSj4uyLQIDrDZdT/ckxB0FTMvUM6eeZQoA="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-arango/default.nix b/nixpkgs/pkgs/development/python-modules/python-arango/default.nix index d21408c2c678..09218269828a 100644 --- a/nixpkgs/pkgs/development/python-modules/python-arango/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-arango/default.nix @@ -32,7 +32,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "7.8.1"; + version = "7.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "ArangoDB-Community"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-R/59SMEVPZow9aG32gqQApuvB2zQLmPCxf/Mz70ubUU="; + hash = "sha256-N10ysJKk0jxFyjgR/MXKHVS2MxCQtfFFGEh1IZ2eJk0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix index 65a27c9b53cf..9b6ffe4e0fe8 100644 --- a/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix @@ -7,6 +7,7 @@ , openpyxl , orjson , phonenumbers +, beautifulsoup4 , pytestCheckHook , python-dateutil , python-decouple @@ -16,7 +17,7 @@ , pythonRelaxDepsHook , pyyaml , requests -, six +, setuptools , toml , xlrd , xmltodict @@ -24,52 +25,94 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.33.0"; - format = "setuptools"; + version = "0.33.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fabiocaccamo"; - repo = pname; + repo = "python-benedict"; rev = "refs/tags/${version}"; - hash = "sha256-SJBU7jMnyLBdWQPQ/UGbVklKUOrCM3fMnOkXKHQnyPI="; + hash = "sha256-QRWyMqHW4C3+718mgp9z/dQ1loesm0Vaf2TzW3yqF3A="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "boto3" ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + propagatedBuildInputs = [ - boto3 - ftfy - mailchecker - openpyxl - phonenumbers - python-dateutil python-fsutil python-slugify - pyyaml requests - toml - xlrd - xmltodict ]; + passthru.optional-dependencies = { + all = [ + beautifulsoup4 + boto3 + ftfy + mailchecker + openpyxl + phonenumbers + python-dateutil + pyyaml + toml + xlrd + xmltodict + ]; + html = [ + beautifulsoup4 + xmltodict + ]; + io = [ + beautifulsoup4 + openpyxl + pyyaml + toml + xlrd + xmltodict + ]; + parse = [ + ftfy + mailchecker + phonenumbers + python-dateutil + ]; + s3 = [ + boto3 + ]; + toml = [ + toml + ]; + xls = [ + openpyxl + xlrd + ]; + xml = [ + xmltodict + ]; + yaml = [ + pyyaml + ]; + }; + nativeCheckInputs = [ orjson pytestCheckHook python-decouple - six - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = [ # Tests require network access "test_from_base64_with_valid_url_valid_content" + "test_from_html_with_valid_file_valid_content" + "test_from_html_with_valid_url_valid_content" "test_from_json_with_valid_url_valid_content" "test_from_pickle_with_valid_url_valid_content" "test_from_plist_with_valid_url_valid_content" diff --git a/nixpkgs/pkgs/development/python-modules/python-bring-api/default.nix b/nixpkgs/pkgs/development/python-modules/python-bring-api/default.nix new file mode 100644 index 000000000000..a5003690c404 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-bring-api/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "python-bring-api"; + version = "3.0.0-unstable-2024-02-03"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "eliasball"; + repo = "python-bring-api"; + # https://github.com/eliasball/python-bring-api/issues/16 + rev = "8043562b22be1f6421a8771774868b105b6ca375"; + hash = "sha256-VCGCm9N6pMhEYT9WuWh7qKacZEf6bcIpEsILfCC6his="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "python_bring_api" + ]; + + meta = with lib; { + description = "Module to access the Bring! shopping lists API"; + homepage = "https://github.com/eliasball/python-bring-api"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-creole/default.nix b/nixpkgs/pkgs/development/python-modules/python-creole/default.nix index 52d13d452aff..7f27466fa2be 100644 --- a/nixpkgs/pkgs/development/python-modules/python-creole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-creole/default.nix @@ -12,7 +12,7 @@ # tests , pytestCheckHook -, readme_renderer +, readme-renderer , textile }: @@ -58,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - readme_renderer + readme-renderer textile ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-docs-theme/default.nix b/nixpkgs/pkgs/development/python-modules/python-docs-theme/default.nix index 464697c35bfa..316f55e4a89d 100644 --- a/nixpkgs/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-docs-theme/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-docs-theme"; - version = "2023.9"; + version = "2024.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "python"; repo = "python-docs-theme"; rev = "refs/tags/${version}"; - hash = "sha256-XVwMEfprTNdNnaW38HMCAu4CswdVjBXYtNWBgqXfbno="; + hash = "sha256-5qn/bROc3wekTyYq+e7rLpJjeI8IBByKvrOE4Kw0fjQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-docx/default.nix b/nixpkgs/pkgs/development/python-modules/python-docx/default.nix index 37a10bdd542c..6a5c01d216da 100644 --- a/nixpkgs/pkgs/development/python-modules/python-docx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-docx/default.nix @@ -47,6 +47,16 @@ buildPythonPackage rec { "docx" ]; + disabledTests = [ + # https://github.com/python-openxml/python-docx/issues/1302 + "it_accepts_unicode_providing_there_is_no_encoding_declaration" + ]; + + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + meta = with lib; { description = "Create and update Microsoft Word .docx files"; homepage = "https://python-docx.readthedocs.io/"; diff --git a/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix b/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix index c359d4ee87f7..eab892f49283 100644 --- a/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "python-frontmatter"; - version = "1.0.1"; + version = "1.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "eyeseast"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-lkBCKZ1fZF580+4TnHYkfaGJjsWk7/Ksnk7VagZuef8="; + sha256 = "sha256-Sr0RbNVk87Zu01U7nkuPUSnl1bm6G72EZDP/eDn099s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix b/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix index 0e362ea35f18..5a347071f620 100644 --- a/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix @@ -4,22 +4,27 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "python-fsutil"; - version = "0.13.0"; - format = "setuptools"; + version = "0.13.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fabiocaccamo"; - repo = pname; + repo = "python-fsutil"; rev = "refs/tags/${version}"; - hash = "sha256-RbpbFd+GqFPl88FqKvYEE6HcwFRzPDUTs3vMYM6x7es="; + hash = "sha256-yY8hhw6uNKqrcj0geoQeGN/JCDJVja7pCPUHwoViL64="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index 9c708b735ce2..6931a0d4ee45 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "4.2.0"; + version = "4.4.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+HDXb5jJXQXEM5nXOx6qtZxnGzJ5ODDNL53fMsyTVB4="; + hash = "sha256-HRF797QzroJV5ddOcsZgl49Q7oXrYiSMn7Uu9Dw+OBQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix b/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix index ca6c2770db46..66d97a4b33b9 100644 --- a/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "4.1.1"; - format = "pyproject"; + version = "4.3.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -22,12 +22,12 @@ buildPythonPackage rec { owner = "DCSBL"; repo = "python-homewizard-energy"; rev = "refs/tags/v${version}"; - hash = "sha256-p7uwodjC+wTGrlKf4i4ZRTPg9Qh9krsmwPpWNdF6J4U="; + hash = "sha256-5e2PzH+kDOopH4LYOq49SlHsfBbZZk60U1BSN8OnrKI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix b/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix index dd2b64173794..2c5262a47ec1 100644 --- a/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix @@ -1,8 +1,10 @@ { lib +, aiohttp , anyio , async-timeout , asyncclick , buildPythonPackage +, cryptography , fetchFromGitHub , kasa-crypt , orjson @@ -17,16 +19,16 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.5.4"; - format = "pyproject"; + version = "0.6.2.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "python-kasa"; + repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-wGPMrYaTtKkkNW88eyiiciFcBSTRqqChYi6e15WUCHo="; + hash = "sha256-iCqJY3qkA3ZVXTCfxvQoaZsaqGui8PwKGAmLXKZgLJs="; }; nativeBuildInputs = [ @@ -34,9 +36,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohttp anyio async-timeout asyncclick + cryptography pydantic ]; @@ -48,7 +52,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - speedup = [ + speedups = [ kasa-crypt orjson ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix index d104a79996d3..a8e4af984de3 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-lsp-ruff"; - version = "2.0.2"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "python-lsp-ruff"; - hash = "sha256-tKYhkRnXPZF1/9iK6ssNtoWa5y9gYVj9zFUOEFlXyOA="; + hash = "sha256-uvTSmoY9rVGEruxY20wOPVgR2JTBDzbn5S7ccDz3zBU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 96ba4c367033..9d5630a22360 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.9.0"; + version = "1.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9za0et/W+AwrjqUVoHwk8oqLXk4eqgRON8Z4F5GSKXM="; + hash = "sha256-dh33m7wgOwUETjdNqqDKZnpTgbrYCg9/XXC296tHm4w="; }; postPatch = '' @@ -144,6 +144,7 @@ buildPythonPackage rec { # https://github.com/python-lsp/python-lsp-server/issues/243 "test_numpy_completions" "test_workspace_loads_pycodestyle_config" + "test_autoimport_code_actions_and_completions_for_notebook_document" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # pyqt5 is broken on aarch64-darwin "test_pyqt_completion" diff --git a/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix b/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix index e3f1b0922a6a..f0652410828c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix @@ -1,32 +1,50 @@ -{ lib, fetchPypi, buildPythonPackage, lzo, pytestCheckHook, setuptools, wheel }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, lzo +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +}: buildPythonPackage rec { pname = "python-lzo"; - version = "1.15"; - format = "pyproject"; + version = "1.16"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-pXqqAMXDoFFd2fdCa6LPYBdn3BncAj2LmdShOwoye0k="; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "jd-boyd"; + repo = "python-lzo"; + rev = "refs/tags/v${version}"; + hash = "sha256-iXAvOCzHPvNERMkE5y4QTHi4ZieW1wrYWYScs7zyb2c="; }; + nativeBuildInputs = [ setuptools wheel ]; - buildInputs = [ lzo ]; + buildInputs = [ + lzo + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "lzo" ]; meta = with lib; { - homepage = "https://github.com/jd-boyd/python-lzo"; description = "Python bindings for the LZO data compression library"; + homepage = "https://github.com/jd-boyd/python-lzo"; + changelog = "https://github.com/jd-boyd/python-lzo/releases/tag/v${version}"; license = licenses.gpl2Only; - maintainers = [ maintainers.jbedo ]; + maintainers = with maintainers; [ jbedo ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix index 8c6ccf5754e6..570ee23fcbf4 100644 --- a/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix @@ -18,6 +18,7 @@ # optionals , cryptography , home-assistant-chip-core +, zeroconf # tests , python @@ -28,7 +29,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "5.1.1"; + version = "5.5.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -37,7 +38,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-y4gapml7rIwOu1TVDEHPch7JS5Rl/cIfMLeVMIFzXOY="; + hash = "sha256-8daAABR5l8ZEX+PR4XrxRHlLllgnOVE4Q9yY/7UQXHw="; }; postPatch = '' @@ -63,6 +64,7 @@ buildPythonPackage rec { server = [ cryptography home-assistant-chip-core + zeroconf ]; }; @@ -70,7 +72,7 @@ buildPythonPackage rec { pytest-aiohttp pytestCheckHook ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (lib.attrValues passthru.optional-dependencies); preCheck = let pythonEnv = python.withPackages (_: propagatedBuildInputs ++ nativeCheckInputs ++ [ pytest ]); diff --git a/nixpkgs/pkgs/development/python-modules/python-memcached/default.nix b/nixpkgs/pkgs/development/python-modules/python-memcached/default.nix index 27a9eed537bb..4ca7cbbadd25 100644 --- a/nixpkgs/pkgs/development/python-modules/python-memcached/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-memcached/default.nix @@ -1,34 +1,43 @@ { lib , buildPythonPackage , fetchFromGitHub -, six +, setuptools +, memcached , mock , pytestCheckHook }: buildPythonPackage rec { pname = "python-memcached"; - version = "1.59"; - format = "setuptools"; + version = "1.62"; + pyproject = true; src = fetchFromGitHub { owner = "linsomniac"; repo = "python-memcached"; rev = version; - hash = "sha256-tHqkwNloPTXOrEGtuDLu1cTw4SKJ4auv8UUbqdNp698="; + hash = "sha256-Qko4Qr9WofeklU0uRRrSPrT8YaBYMCy0GP+TF7YZHLI="; }; - propagatedBuildInputs = [ - six + nativeBuildInputs = [ + setuptools ]; nativeCheckInputs = [ + memcached mock pytestCheckHook ]; - # all tests fail - doCheck = false; + preCheck = '' + memcached & + ''; + + postCheck = '' + kill %% + ''; + + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "memcache" ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix index 670fdaad51c8..ef8c7cb59fae 100644 --- a/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "6.3.0"; + version = "6.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-m6C9+NAwh+WFtAqNzEKc673V/ewkwdYKECv58zEyDfE="; + hash = "sha256-EvwZNH9rGb/iw28Rx6GEH0FaLufxi5WUE8ISGZe4SVE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python_openzwave/cython.patch b/nixpkgs/pkgs/development/python-modules/python-openzwave/cython.patch index e01ffdbdc0d0..e01ffdbdc0d0 100644 --- a/nixpkgs/pkgs/development/python-modules/python_openzwave/cython.patch +++ b/nixpkgs/pkgs/development/python-modules/python-openzwave/cython.patch diff --git a/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix b/nixpkgs/pkgs/development/python-modules/python-openzwave/default.nix index dbd9c3d8c469..4611039e34d9 100644 --- a/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-openzwave/default.nix @@ -4,14 +4,15 @@ , six, pydispatcher, urwid }: buildPythonPackage rec { - pname = "python_openzwave"; + pname = "python-openzwave"; version = "0.4.19"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { - inherit pname version; + pname = "python_openzwave"; + inherit version; sha256 = "6b40c7711383eeb3535cf5504f1cf47cc1ac7018eb820f299642a5a2795aef84"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix b/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix index d6137cf191e2..675f72d5e035 100644 --- a/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix @@ -4,41 +4,29 @@ , buildPythonPackage , cryptography , fetchFromGitHub -, fetchpatch , pytest-asyncio , pytestCheckHook , pythonOlder , setuptools , voluptuous -, wheel }: buildPythonPackage rec { pname = "python-otbr-api"; - version = "2.5.0"; - format = "pyproject"; + version = "2.6.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "python-otbr-api"; rev = "refs/tags/${version}"; - hash = "sha256-bPN2h60ypjlKpXs1xDS7bZcGRXvatA3EdlAX/HLxxTM="; + hash = "sha256-RMj4NdEbMIxh2PDzbhUWgmcdzRXY8RxcQNN/bbGOW5Q="; }; - patches = [ - # https://github.com/home-assistant-libs/python-otbr-api/pull/68 - (fetchpatch { - name = "relax-setuptools-dependency.patch"; - url = "https://github.com/home-assistant-libs/python-otbr-api/commit/37eb19c12d17ac7d040ded035d8401def872fbda.patch"; - hash = "sha256-JGsaLQNbUfz0uK/MeGnR2XTJDs4RnTOEg7BavfDPArg="; - }) - ]; - nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index fe6d13423bc3..1346e9b35b7a 100644 --- a/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.39.0"; + version = "0.39.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-t+ZjLsnsLcWYNlx2eRxDhQLw3levdiCk4FUrcjtSmq8="; + hash = "sha256-iFLzrjbCwBuV9RQSHoP5LOG0PIPjiTMCpvk3wqGtMgk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix index cb525a5922be..6ad8a1dc9a54 100644 --- a/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix @@ -3,24 +3,29 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools , text-unidecode , unidecode }: buildPythonPackage rec { pname = "python-slugify"; - version = "8.0.1"; - format = "setuptools"; + version = "8.0.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "un33k"; - repo = pname; + repo = "python-slugify"; rev = "refs/tags/v${version}"; - hash = "sha256-MJac63XjgWdUQdyyEm8O7gAGVszmHxZzRF4frJtR0BU="; + hash = "sha256-zReUMIkItnDot3XyYCoPUNHrrAllbClWFYcxdTy3A30="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ text-unidecode ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix b/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix index 3f73bf1e5a94..916288860fb5 100644 --- a/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.16"; + version = "0.16.1"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "rytilahti"; repo = "python-songpal"; rev = "refs/tags/release/${version}"; - hash = "sha256-wHyq63RG0lhzG33ssWyvzLjc7s1OqquXMN26N2MBHU8="; + hash = "sha256-qlypUGrObvn6YyzFhJe2rJvVdI6v+PkWLfjMpc1Lm2k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-sql/default.nix b/nixpkgs/pkgs/development/python-modules/python-sql/default.nix index 424c1635f91a..2605080729c7 100644 --- a/nixpkgs/pkgs/development/python-modules/python-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-sql/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.4.2"; + version = "1.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-stuHXGcgwblayCyD6lLOu5RMQHvmii7wN8zdi6ucxTw="; + hash = "sha256-YmC+/4NaNdOgrsTx2jUbC+nKoaDZSmy6lAp82Nz2Ymk="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-tado/default.nix b/nixpkgs/pkgs/development/python-modules/python-tado/default.nix index 80687b9d3e1f..60247f15d95b 100644 --- a/nixpkgs/pkgs/development/python-modules/python-tado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-tado/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-tado"; - version = "0.17.3"; + version = "0.17.4"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -16,9 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; - # https://github.com/wmalgadey/PyTado/issues/62 rev = "refs/tags/${version}"; - hash = "sha256-whpNYiAb2cqKI4m0HJN2lPt51FLuEzrkrRTSWs6uznU="; + hash = "sha256-Wdd9HdsQjaYlL8knhMuO87+dom+aTsmrLRK0UdrpsbQ="; }; propagatedBuildInputs = [ @@ -30,9 +29,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = - "Python binding for Tado web API. Pythonize your central heating!"; + description = "Python binding for Tado web API. Pythonize your central heating!"; homepage = "https://github.com/wmalgadey/PyTado"; + changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jamiemagee ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index 7fab5e1364a1..9ac37aa4f596 100644 --- a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -21,16 +21,16 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "20.7"; - format = "pyproject"; + version = "20.8"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "python-telegram-bot"; + repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-lUErrBF4iucgWRRT535pwaayYY+gLgsT6Zmc+FM8aE0="; + hash = "sha256-FvVUl0bV95IDPbG+6N9b3ZIsnLAUwVcdS4cu0I1aNDw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix b/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix index b4e7194b842c..d76d5d4a2b97 100644 --- a/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix @@ -14,7 +14,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; + pname = "python_trovo"; + inherit version; hash = "sha256-3EVSF4+nLvvM2RocNM2xz9Us5VrRRTCu/MWCcqwwikw="; }; diff --git a/nixpkgs/pkgs/development/python-modules/pythran/default.nix b/nixpkgs/pkgs/development/python-modules/pythran/default.nix index 047a4ea1af07..3e62fa882cc9 100644 --- a/nixpkgs/pkgs/development/python-modules/pythran/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythran/default.nix @@ -25,14 +25,14 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.14.0"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; rev = version; - hash = "sha256-in0ty0aBAIx7Is13hjiHZGS8eKbhxb6TL3bENzfx5vQ="; + hash = "sha256-TpD8YZnnv48PKYrUqR0/qvJG1XRbcMBcrkcERh6Q4q0="; }; patches = [ @@ -41,17 +41,12 @@ in buildPythonPackage rec { src = ./0001-hardcode-path-to-libgomp.patch; gomp = "${if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; }) - (fetchpatch { - # Python 3.12 support - url = "https://github.com/serge-sans-paille/pythran/commit/258ab9aaf26172f669eab1bf2a346b5f65db3ac0.patch"; - hash = "sha256-T+FLptDYIgzHBSXShULqHr/G8ttBFamq1M5JlB2HxDM="; - }) ]; # xsimd: unvendor this header-only C++ lib postPatch = '' - rm -r third_party/xsimd - ln -s '${lib.getDev xsimd}'/include/xsimd third_party/ + rm -r pythran/xsimd + ln -s '${lib.getDev xsimd}'/include/xsimd pythran/ ''; nativeBuildInputs = [ @@ -84,5 +79,6 @@ in buildPythonPackage rec { description = "Ahead of Time compiler for numeric kernels"; homepage = "https://github.com/serge-sans-paille/pythran"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix b/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix index 012a470c1b5f..1ba80dae8037 100644 --- a/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytoolconfig"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "bagel897"; repo = "pytoolconfig"; rev = "refs/tags/v${version}"; - hash = "sha256-V7dANGnvhBhRy8IyO/gg73BMwpWRaV/xTF8JmRC7DPA="; + hash = "sha256-h21SDgVsnCDZQf5GS7sFE19L/p+OlAFZGEYKc0RHn30="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix b/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix index 9a60920dd7b8..d880602a5123 100644 --- a/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.3.9.2"; + version = "0.3.10"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NxxuyLnzJ8T2jaQ761O943rpBbNwp/F4PygyQULkXzw="; + hash = "sha256-B3K9wDFj7uSgs6BsJUnD6r2JVcH7u7UrbVXUTMGqmQE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix b/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix deleted file mode 100644 index 33efaf5f790a..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, nunavut -, pyserial , pytest, ruamel-yaml}: - - buildPythonPackage rec { - pname = "pyuavcan"; - version = "1.1.0.dev1"; - format = "setuptools"; - disabled = pythonOlder "3.7"; # only python>=3.7 is supported - - src = fetchFromGitHub { - owner = "UAVCAN"; - repo = pname; - rev = version; - hash = "sha256-ChNoYHuZulPLrxYvxeVO9Tyt8rymlk3p/OkYaG2rqzo="; - }; - - propagatedBuildInputs = [ - numpy - nunavut - pyserial - pytest - ruamel-yaml - ]; - - # allow for writable directory for darwin - preBuild = '' - export HOME=$TMPDIR - export PYTHONASYNCIODEBUG=1 - ''; - - # tests fail ATM. - doCheck = false; - - # check at least that import works, as tests fail - pythonImportsCheck = [ - "pyuavcan" - ]; - - meta = with lib; { - description = "A full-featured implementation of the UAVCAN protocol stack"; - longDescription = '' - It is intended for non-embedded, user-facing applications such as GUI - software, diagnostic tools, automation scripts, prototypes, and various - R&D cases. PyUAVCAN consists of a Python library (package) and a simple - CLI tool for basic diagnostics and shell script automation. - ''; - homepage = "https://pyuavcan.readthedocs.io"; - maintainers = with maintainers; [ wucke13 ]; - license = licenses.mit; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix b/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix index d25f8fa2775a..cc846a024d8e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.23.2"; + version = "4.23.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "briis"; repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-X4LRi2hNpKgnmk3GeoI+ziboBKIosSZye5lPWaBPL1s="; + hash = "sha256-QWIiBuKDhSNYVyEm45QV4a2UxADDrBdiCBeJI+a6v7c="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix b/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix index 04e21f6e52ac..8d5bc83ed165 100644 --- a/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "3.3.1"; + version = "3.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-vg1eNxIkdHM1MMTkCof/ED6nqFhwSgEiKjYmqAyHMp0="; + hash = "sha256-n6WlJc7Hh7SArJ8Z0fikxidtpXaPQvKTDGn6HukL2q8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyutil/default.nix b/nixpkgs/pkgs/development/python-modules/pyutil/default.nix index 9b4023bc498d..91f5d0d89f89 100644 --- a/nixpkgs/pkgs/development/python-modules/pyutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyutil/default.nix @@ -1,33 +1,66 @@ { lib , buildPythonPackage , fetchPypi -, simplejson +, isPyPy , mock +, pytestCheckHook +, pythonAtLeast +, pythonOlder +, setuptools +, simplejson , twisted -, isPyPy +, versioneer }: buildPythonPackage rec { pname = "pyutil"; version = "3.3.6"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-XcPWu5xbq6u10Ldz4JQEXXVxLos0ry0psOKGAmaCZ8A="; }; - propagatedBuildInputs = [ simplejson ]; - - nativeCheckInputs = [ mock twisted ]; - prePatch = lib.optionalString isPyPy '' grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g" ''; - meta = with lib; { - description = "Pyutil, a collection of mature utilities for Python programmers"; + nativeBuildInputs = [ + setuptools + versioneer + ]; + passthru.optional-dependencies = { + jsonutil = [ + simplejson + ]; + # Module not available + # randcookie = [ + # zbase32 + # ]; + }; + + nativeCheckInputs = [ + mock + twisted + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "pyutil" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/tpltnt/pyutil/issues/10 + "test_decimal" + "test_float" + ]; + + meta = with lib; { + description = "Collection of mature utilities for Python programmers"; longDescription = '' These are a few data structures, classes and functions which we've needed over many years of Python programming and which @@ -37,7 +70,6 @@ buildPythonPackage rec { Python language or its standard library, thus showing that we're not alone in wanting tools like these. ''; - homepage = "https://github.com/tpltnt/pyutil"; license = licenses.gpl2Plus; maintainers = with maintainers; [ prusnak ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyvista/default.nix b/nixpkgs/pkgs/development/python-modules/pyvista/default.nix index 0493509e976b..6f6e909f1a56 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvista/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvista/default.nix @@ -8,13 +8,14 @@ , pooch , pythonOlder , scooby +, setuptools , vtk }: buildPythonPackage rec { pname = "pyvista"; - version = "0.43.1"; - format = "setuptools"; + version = "0.43.3"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,9 +23,13 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H7WkRK9lP92L47nFNDT1WusWfU0bLgXBA+KQqTyedL4="; + hash = "sha256-yJEggiWK73zzUPvOsPucpalmSMxywinE9t2e2dqBM9M="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ imageio matplotlib diff --git a/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix b/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix index 501d0a56f783..38d605317a60 100644 --- a/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "1.14.0"; + version = "1.14.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-bDbhZ5JoIZ5pO6lA2yvyVMJAygJmTeECtyaa/DxUVzE="; + hash = "sha256-+I1+K/XofGFt+wS4yVwRkjjFEWWbAvc17nfMFoQoVe4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pywfa/default.nix b/nixpkgs/pkgs/development/python-modules/pywfa/default.nix index 529417db9896..2aca36a07da7 100644 --- a/nixpkgs/pkgs/development/python-modules/pywfa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywfa/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "kcleal"; repo = "pywfa"; rev = "refs/tags/v${version}"; - hash = "sha256-oeVXK9uyH4E98tApKrA7dXifQYb41KuDTAZ40XgAaF8="; + hash = "sha256-TeJ7Jq4LR+I1+zeMeBtHZa9dR+CRJJG5sT99tB227P8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pywinrm/default.nix b/nixpkgs/pkgs/development/python-modules/pywinrm/default.nix index 40e8c70ba83b..2455b476a4d9 100644 --- a/nixpkgs/pkgs/development/python-modules/pywinrm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywinrm/default.nix @@ -5,7 +5,7 @@ , mock , pytestCheckHook , requests -, requests_ntlm +, requests-ntlm , six , xmltodict }: @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests - requests_ntlm + requests-ntlm six xmltodict ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyzipper/default.nix b/nixpkgs/pkgs/development/python-modules/pyzipper/default.nix index a0ad73fb8a3b..5aa583228b49 100644 --- a/nixpkgs/pkgs/development/python-modules/pyzipper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyzipper/default.nix @@ -4,12 +4,13 @@ , pythonOlder , pytestCheckHook , pycryptodomex +, setuptools }: buildPythonPackage rec { pname = "pyzipper"; version = "0.3.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,12 +21,16 @@ buildPythonPackage rec { hash = "sha256-+fZXoAUeB/bUI3LrIFlMTktJgn+GNFBiDHvH2Jgo0pg="; }; + __darwinAllowLocalNetworking = true; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pycryptodomex ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ pytestCheckHook ]; @@ -45,6 +50,8 @@ buildPythonPackage rec { "test_main" "test_temp_dir__forked_child" "test_test_command" + # Test wants to import asyncore + "test_CleanImport" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix b/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix index d7b733f83322..3bbbbedf1d22 100644 --- a/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -2,33 +2,31 @@ , buildPythonPackage , fetchPypi , requests -, six , urllib3 , packaging , setuptools -, wheel +, setuptools-scm }: buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2023.11.57"; - format = "pyproject"; + version = "2024.1.58"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-fmFJW4PDQc7szu0ymE+fV9k6wUDLRHkOriEHDnzDSQg="; + hash = "sha256-6JyU9mr0xfRLB7AJOcnPc+PpF0EWi/R/Wy3lCKanAmA="; }; propagatedBuildInputs = [ requests - six urllib3 packaging ]; nativeBuildInputs = [ setuptools - wheel + setuptools-scm ]; # Tests require internet access diff --git a/nixpkgs/pkgs/development/python-modules/qcodes/default.nix b/nixpkgs/pkgs/development/python-modules/qcodes/default.nix index 779e7b390b21..b8b7ca6a5eb9 100644 --- a/nixpkgs/pkgs/development/python-modules/qcodes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qcodes/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.42.1"; + version = "0.44.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -57,7 +57,7 @@ buildPythonPackage rec { owner = "QCoDeS"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-oNQLIL5L3gtFS6yxqgLDI1s4s9UYqxGc8ASqHuZv6Rk="; + hash = "sha256-AggAVq/yfJUZRwoQb29QoIbVIAdV3solKCjivqucLZk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix b/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix index 0b38510d6603..60ed1433794a 100644 --- a/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix @@ -6,7 +6,7 @@ , httpx , iso8601 , poetry-core -, pydantic +, pydantic_1 , pyjwt , pytest-asyncio , pytestCheckHook @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; version = "0.23.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -46,6 +46,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "attrs" "httpx" + "iso8601" ]; nativeBuildInputs = [ @@ -57,7 +58,7 @@ buildPythonPackage rec { attrs httpx iso8601 - pydantic + pydantic_1 pyjwt python-dateutil retrying diff --git a/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix b/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix index e57e607afcf3..27b453c497dc 100644 --- a/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.7.0"; + version = "1.7.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fC28uQK4mAN21VdAeT4NbezZY1qZVOIK3rs3v31S39Q="; + hash = "sha256-VU2/kK7zpiuHbPtt1Qh8pdgen4KoIIKsyC479LATO84="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qemu/default.nix b/nixpkgs/pkgs/development/python-modules/qemu/default.nix new file mode 100644 index 000000000000..ba730548bca8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/qemu/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, pythonOlder +, qemu +, setuptools +, fuseSupport ? false, fusepy +, tuiSupport ? false, urwid, urwid-readline, pygments +}: + +buildPythonPackage { + pname = "qemu"; + version = "0.6.1.0a1"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = qemu.src; + + prePatch = '' + cd python + ''; + + # ensure the version matches qemu-xxx/python/VERSION + preConfigure = '' + if [ "$version" != "$(cat ./VERSION)" ]; then + echo "The nix package version attribute is not in sync with the QEMU source version" > /dev/stderr + echo "Please update the version attribute in the nix expression of python3Packages.qemu to '$version'" > /dev/stderr + exit 1 + fi + ''; + + buildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ ] + ++ lib.optionals fuseSupport [ fusepy ] + ++ lib.optionals tuiSupport [ urwid urwid-readline pygments ]; + + # Project requires avocado-framework for testing, therefore replacing check phase + checkPhase = '' + for bin in $out/bin/*; do + $bin --help + done + ''; + + pythonImportsCheck = [ "qemu" ]; + + preFixup = + (lib.optionalString (! tuiSupport) '' + rm $out/bin/qmp-tui + '') + + (lib.optionalString (! fuseSupport) '' + rm $out/bin/qom-fuse + ''); + + meta = with lib; { + homepage = "http://www.qemu.org/"; + description = "Python tooling used by the QEMU project to build, configure, and test QEMU"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ devplayer0 davhau ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix b/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix index 7c7431b01e87..1a678a2db496 100644 --- a/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "qingping-ble"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h2PVrwesUaJfwJtuNf44bd1MefpSmOm7Q4A/URvd+IY="; + hash = "sha256-5w3KGJLdHFv6kURKTz3YImZNjaETiVqbbJTJpBSLSo8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 24bee7d9dbc4..030f94efc852 100644 --- a/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -6,7 +6,7 @@ , nest-asyncio , qiskit-terra , requests -, requests_ntlm +, requests-ntlm , websocket-client # Visualization inputs , withVisualization ? true @@ -57,7 +57,7 @@ buildPythonPackage rec { nest-asyncio qiskit-terra requests - requests_ntlm + requests-ntlm websocket-client websockets ] ++ lib.optionals withVisualization visualizationPackages; diff --git a/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix b/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix index 9f0538136afc..7a1844616a36 100644 --- a/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix @@ -4,44 +4,68 @@ , buildPythonPackage , unittestCheckHook , flit-core +, numpy +, scipy + +# optional dependencies +, clarabel +, cvxopt , daqp , ecos -, numpy +, gurobipy , osqp -, scipy -, scs , quadprog +, scs }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.2.0"; - format = "pyproject"; + version = "4.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; rev = "refs/tags/v${version}"; - hash = "sha256-brniRAGwN/areB7MnaGeF7CdNku7DG/Q+8TmCXY99iU="; + hash = "sha256-/HLc9dFf9F/6W7ux2Fj2yJuV/xCVeGyO6MblddwIGdM="; }; + nativeBuildInputs = [ + flit-core + ]; + pythonImportsCheck = [ "qpsolvers" ]; propagatedBuildInputs = [ - daqp - ecos numpy - osqp scipy - scs ]; + passthru.optional-dependencies = { + # FIXME commented out solvers have not been packaged yet + clarabel = [ clarabel ]; + cvxopt = [ cvxopt ]; + daqp = [ daqp ]; + ecos = [ ecos ]; + gurobi = [ gurobipy ]; + # highs = [ highspy ]; + # mosek = [ cvxopt mosek ]; + osqp = [ osqp ]; + # piqp = [ piqp ]; + # proxqp = [ proxsuite ]; + # qpalm = [ qpalm ]; + quadprog = [ quadprog ]; + scs = [ scs ]; + open_source_solvers = with passthru.optional-dependencies; lib.flatten [ + clarabel cvxopt daqp ecos /* highs */ osqp /* piqp proxqp qpalm */ quadprog scs + ]; + }; + nativeCheckInputs = [ - flit-core - quadprog unittestCheckHook - ]; + ] ++ passthru.optional-dependencies.open_source_solvers; meta = with lib; { + changelog = "https://github.com/qpsolvers/qpsolvers/blob/${src.rev}/CHANGELOG.md"; description = "Quadratic programming solvers in Python with a unified API"; homepage = "https://github.com/qpsolvers/qpsolvers"; license = licenses.lgpl3Plus; diff --git a/nixpkgs/pkgs/development/python-modules/qrcode/default.nix b/nixpkgs/pkgs/development/python-modules/qrcode/default.nix index 43379422263d..0b8f69889c33 100644 --- a/nixpkgs/pkgs/development/python-modules/qrcode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qrcode/default.nix @@ -1,20 +1,21 @@ { lib , buildPythonPackage , fetchPypi -, setuptools +, mock , pillow , pypng -, typing-extensions -, mock , pytestCheckHook -, testers +, pythonAtLeast , qrcode +, setuptools +, testers +, typing-extensions }: buildPythonPackage rec { pname = "qrcode"; version = "7.4.2"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -48,11 +49,15 @@ buildPythonPackage rec { }; }; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + "test_change" + ]; + meta = with lib; { description = "Python QR Code image generator"; homepage = "https://github.com/lincolnloop/python-qrcode"; changelog = "https://github.com/lincolnloop/python-qrcode/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/qtile-extras/default.nix b/nixpkgs/pkgs/development/python-modules/qtile-extras/default.nix index aa6eed8ec573..1661918152f1 100644 --- a/nixpkgs/pkgs/development/python-modules/qtile-extras/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtile-extras/default.nix @@ -5,25 +5,27 @@ , pytestCheckHook , xorgserver , imagemagick +, gobject-introspection , pulseaudio , pytest-asyncio , pytest-lazy-fixture , qtile , keyring , requests -, stravalib +, librsvg +, gtk3 }: buildPythonPackage rec { pname = "qtile-extras"; - version = "0.23.0"; + version = "0.24.0"; format = "pyproject"; src = fetchFromGitHub { owner = "elParaguayo"; repo = pname; rev = "v${version}"; - hash = "sha256-WI1z8vrbZiJw6fDHK27mKA+1FyZEQTMttIDNzSIX+PU="; + hash = "sha256-DJmnJcqhfCfl39SF3Ypv0PGtI4r8heaVv9JmpiCBGJo="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -32,6 +34,7 @@ buildPythonPackage rec { pytestCheckHook xorgserver imagemagick + gobject-introspection ]; checkInputs = [ pytest-asyncio @@ -40,59 +43,41 @@ buildPythonPackage rec { pulseaudio keyring requests - stravalib + # stravalib # marked as broken due to https://github.com/stravalib/stravalib/issues/379 ]; disabledTests = [ - # AttributeError: 'ImgMask' object has no attribute '_default_size'. Did you mean: 'default_size'? - # cairocffi.pixbuf.ImageLoadingError: Pixbuf error: Unrecognized image file format - "test_draw" - "test_icons" - "1-x11-GithubNotifications-kwargs3" - "1-x11-SnapCast-kwargs8" - "1-x11-TVHWidget-kwargs10" - "test_tvh_widget_not_recording" - "test_tvh_widget_recording" - "test_tvh_widget_popup" - "test_snapcast_options" - "test_snapcast_icon" - "test_snapcast_icon_colour" - "test_snapcast_http_error" - "test_syncthing_not_syncing" - "test_syncthing_is_syncing" - "test_syncthing_http_error" - "test_githubnotifications_colours" - "test_githubnotifications_logging" - "test_githubnotifications_icon" - "test_githubnotifications_reload_token" - "test_image_size_horizontal" - "test_image_size_vertical" - "test_image_size_mask" - # ValueError: Namespace Gdk not available - # AssertionError: Window never appeared... - "test_statusnotifier_menu" - # AttributeError: 'str' object has no attribute 'canonical' - "test_strava_widget_display" - "test_strava_widget_popup" # Needs a running DBUS "test_brightness_power_saving" - "test_upower_all_batteries" - "test_upower_named_battery" - "test_upower_low_battery" - "test_upower_critical_battery" - "test_upower_charging" - "test_upower_show_text" "test_global_menu" "test_mpris2_popup" + "test_statusnotifier_menu" # No network connection "test_wifiicon_internet_check" - # AssertionErrors - "test_widget_init_config" + # Image difference is outside tolerance "test_decoration_output" + # Needs github token + "test_githubnotifications_reload_token" + # AttributeError: 'NoneType' object has no attribute 'theta' + "test_image_size_horizontal" + "test_image_size_vertical" + ]; + disabledTestPaths = [ + # Needs a running DBUS + "test/widget/test_iwd.py" + "test/widget/test_upower.py" + # Marked as broken due to https://github.com/stravalib/stravalib/issues/379 + "test/widget/test_strava.py" ]; preCheck = '' export HOME=$(mktemp -d) + export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache + sed -i 's#/usr/bin/sleep#sleep#' test/widget/test_snapcast.py ''; + propagatedBuildInputs = [ + gtk3 + ]; + pythonImportsCheck = [ "qtile_extras" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/qtile/default.nix b/nixpkgs/pkgs/development/python-modules/qtile/default.nix index ef1df14b2184..43e6cb00bfe2 100644 --- a/nixpkgs/pkgs/development/python-modules/qtile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtile/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "qtile"; - version = "0.23.0"; + version = "0.24.0"; format = "setuptools"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - hash = "sha256-WxnpkKqYGGEsFTt/1iCSiCzdESJP6HFJ6BztaMsMbYo="; + hash = "sha256-mgMRkoKT0Gp5/OfVQbkeDTkg9QRFn4PU3ziM5E6V+oI="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/quart/default.nix b/nixpkgs/pkgs/development/python-modules/quart/default.nix index 6cf51d6920ff..1effbadf3b67 100644 --- a/nixpkgs/pkgs/development/python-modules/quart/default.nix +++ b/nixpkgs/pkgs/development/python-modules/quart/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder # build-system , poetry-core @@ -9,6 +10,7 @@ , aiofiles , blinker , click +, flask , hypercorn , importlib-metadata , itsdangerous @@ -29,14 +31,14 @@ buildPythonPackage rec { pname = "quart"; - version = "0.18.4"; + version = "0.19.4"; format = "pyproject"; src = fetchFromGitHub { owner = "pallets"; repo = "quart"; rev = "refs/tags/${version}"; - hash = "sha256-iT/pePUtH1hwNIOG8Y/YbqCVseNXVOKC0nrXfB2RTlQ="; + hash = "sha256-EgCZ0AXK2vGxo55BWAcDVv6zNUrWNbAYNnEXEBJk+84="; }; nativeBuildInputs = [ @@ -52,15 +54,17 @@ buildPythonPackage rec { aiofiles blinker click + flask hypercorn - importlib-metadata itsdangerous jinja2 markupsafe pydata-sphinx-theme python-dotenv - typing-extensions werkzeug + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + typing-extensions ]; pythonImportsCheck = [ @@ -75,11 +79,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # remove after 0.18.4 - "tests/test_signals.py" - ]; - meta = with lib; { description = "An async Python micro framework for building web applications"; homepage = "https://github.com/pallets/quart/"; diff --git a/nixpkgs/pkgs/development/python-modules/quaternion/default.nix b/nixpkgs/pkgs/development/python-modules/quaternion/default.nix index 4b7eef5c5ab2..3b3e6a1ea790 100644 --- a/nixpkgs/pkgs/development/python-modules/quaternion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/quaternion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "quaternion"; - version = "2022.4.4"; + version = "2023.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "moble"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fgyi50purfqUIe7zuz/52K6Sw3TjuvAX0EnzkXD//B4="; + hash = "sha256-G5Xbo6Ns98oqtY/AKz9CE7nt8j2b6+Hv14ZoKtlDCMQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qutip/default.nix b/nixpkgs/pkgs/development/python-modules/qutip/default.nix index 0b58eafa398d..6c57c8f3c076 100644 --- a/nixpkgs/pkgs/development/python-modules/qutip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qutip/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qutip"; - version = "4.7.3"; + version = "4.7.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cpzUHjZBpAbNEnYRuY1wUZouAEAgBaN9rWdxRSfI3bs="; + hash = "sha256-4nXZPZFu9L+Okha3qvPil1KvLGO1EbrzotQjqQ8r9l8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix b/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix index 67acfee32d73..ab043450e40e 100644 --- a/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.8.4"; + version = "1.8.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-dy0+q1i/rE+eIQUZXX9S4y2RiOBM0Kc49PqdvtFAE90="; + hash = "sha256-wAOmO5bev1zgPcJoiqKlS4anUKayo8HsncQXM+b1clQ="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index 97f2a09e55e2..3dcffdd2ecc5 100644 --- a/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.5.2"; - format = "pyproject"; + version = "3.6.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-D7Z0xKqAJAPKSAEK+3Mpz/LaEKqKYczp+m6SqfzufwA="; + hash = "sha256-QJVRT+d/IIGxkWfSNoXFSmbW017+8CTKuWD4W+TzvBs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/rdkit/default.nix b/nixpkgs/pkgs/development/python-modules/rdkit/default.nix index 7d0632ebc836..8a29bc837cfa 100644 --- a/nixpkgs/pkgs/development/python-modules/rdkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rdkit/default.nix @@ -42,7 +42,7 @@ let in buildPythonPackage rec { pname = "rdkit"; - version = "2023.09.3"; + version = "2023.09.4"; pyproject = false; src = @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - hash = "sha256-bewOdmpnm6cArD5iaMKNqT8z4GUIpih+JzJ+wdo/lrI="; + hash = "sha256-yPpt7F3w17tZEe+HECODZ7p27QidNt1sd5f/T2V87NE="; }; unpackPhase = '' @@ -141,7 +141,7 @@ buildPythonPackage rec { checkPhase = '' export QT_QPA_PLATFORM='offscreen' export RDBASE=$(realpath ..) - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" (cd $RDBASE/rdkit/Chem && python $RDBASE/rdkit/TestRunner.py test_list.py) ''; diff --git a/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix b/nixpkgs/pkgs/development/python-modules/readme-renderer/default.nix index 983de37f3932..983de37f3932 100644 --- a/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/readme-renderer/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/readme/default.nix b/nixpkgs/pkgs/development/python-modules/readme/default.nix index 3d18bb8df7f5..2e959bf26871 100644 --- a/nixpkgs/pkgs/development/python-modules/readme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/readme/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, readme_renderer +, readme-renderer }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - readme_renderer + readme-renderer ]; checkPhase = '' @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; # tests are not included with pypi release - # package is not readme_renderer + # package is not readme-renderer doCheck = false; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix b/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix index b9f29be757fe..30d0efc83432 100644 --- a/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -9,18 +9,21 @@ , pytestCheckHook , responses , setuptools +, pythonOlder }: buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.52.0"; - format = "pyproject"; + version = "14.54.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-VdJZnwo+DwVDZuuuqk0X26CXs7ZrUFXqC8qEYaX74Zc="; + hash = "sha256-Q7ubT7SBHNxyvfqFhDmBjnW7ssoXBsMZR+eYg5CntHY="; }; nativeBuildInputs = [ @@ -40,16 +43,19 @@ buildPythonPackage rec { responses ]; - disabledTestPaths = [ - # This is not actual code, just some pre-written boiler-plate template - "templates/test_scraper.py" + disabledTests = [ + # Fixture is broken + "test_instructions" ]; - pythonImportsCheck = [ "recipe_scrapers" ]; + pythonImportsCheck = [ + "recipe_scrapers" + ]; meta = with lib; { - description = "Python package for scraping recipes data "; + description = "Python package for scraping recipes data"; homepage = "https://github.com/hhursev/recipe-scrapers"; + changelog = "https://github.com/hhursev/recipe-scrapers/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ambroisie ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/reconplogger/default.nix b/nixpkgs/pkgs/development/python-modules/reconplogger/default.nix new file mode 100644 index 000000000000..29f3c8b649aa --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/reconplogger/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, logmatic-python +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, setuptools +, testfixtures +}: + +buildPythonPackage rec { + pname = "reconplogger"; + version = "4.15.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "omni-us"; + repo = "reconplogger"; + rev = "refs/tags/v${version}"; + hash = "sha256-0+YOrMqyDK6uAni2h5b6P850veIkUiifX6aHzCnRHD0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + logmatic-python + pyyaml + ]; + + passthru.optional-dependencies = { + all = [ + flask + requests + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + testfixtures + ]; + + pythonImportsCheck = [ + "reconplogger" + ]; + + pytestFlagsArray = [ + "reconplogger_tests.py" + ]; + + meta = with lib; { + description = "Module to ease the standardization of logging within omni:us"; + homepage = "https://github.com/omni-us/reconplogger"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix index 499ad3c23d07..e42988eeff9a 100644 --- a/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = '' - dst=$out/lib/${python.libPrefix}/site-packages + dst=$out/${python.sitePackages} mkdir -p $dst cp sitecustomize.* $dst/ ''; diff --git a/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix b/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix index f0845e50d519..01f2766216e2 100644 --- a/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.0.917"; + version = "2.0.918"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "aws"; repo = "amazon-redshift-python-driver"; rev = "refs/tags/v${version}"; - hash = "sha256-Qrh6ruB/e7ZeZ33fD9VmtAX+I6OUL5I/zjRv9oh1bO0="; + hash = "sha256-hGj/KZz3QYpA/MQE4TcX4wYazMs10RIJCDNyZ+puEYY="; }; # remove addops as they add test directory and coverage parameters to pytest diff --git a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index e3fb2889470e..d76c06fe5d34 100644 --- a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2023.12.0"; + version = "2024.01.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "regenmaschine"; rev = "refs/tags/${version}"; - hash = "sha256-9VBqLmbWJCrfDw9T1qmE9KkdlS+MDnvoG8O9dPCuJDs="; + hash = "sha256-Vd8ACF2AXbT7FE/b0koIPUrNd9DgmjgS5unBuRiq784="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/regress/default.nix b/nixpkgs/pkgs/development/python-modules/regress/default.nix index 4526c735a189..b70e52008778 100644 --- a/nixpkgs/pkgs/development/python-modules/regress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/regress/default.nix @@ -1,7 +1,9 @@ { lib +, stdenv , fetchPypi , buildPythonPackage , rustPlatform +, libiconv }: buildPythonPackage rec { @@ -17,6 +19,8 @@ buildPythonPackage rec { nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; diff --git a/nixpkgs/pkgs/development/python-modules/reproject/default.nix b/nixpkgs/pkgs/development/python-modules/reproject/default.nix index 488a045211a1..bbab3a462dbb 100644 --- a/nixpkgs/pkgs/development/python-modules/reproject/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reproject/default.nix @@ -4,7 +4,7 @@ , astropy-healpix , buildPythonPackage , cloudpickle -, cython +, cython_3 , dask , fetchPypi , fsspec @@ -21,9 +21,9 @@ buildPythonPackage rec { pname = "reproject"; version = "0.13.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ astropy-extension-helpers - cython + cython_3 numpy oldest-supported-numpy setuptools-scm @@ -75,6 +75,7 @@ buildPythonPackage rec { description = "Reproject astronomical images"; downloadPage = "https://github.com/astropy/reproject"; homepage = "https://reproject.readthedocs.io"; + changelog = "https://github.com/astropy/reproject/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ smaret ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/reptor/default.nix b/nixpkgs/pkgs/development/python-modules/reptor/default.nix index d48a84025e4c..1f35854766f0 100644 --- a/nixpkgs/pkgs/development/python-modules/reptor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reptor/default.nix @@ -15,6 +15,7 @@ , pytest , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pyyaml , reptor , requests @@ -22,16 +23,17 @@ , setuptools , sqlparse , termcolor -, toml +, tomli , tomli-w +, tomlkit , urllib3 , xmltodict }: buildPythonPackage rec { pname = "reptor"; - version = "0.7"; - format = "pyproject"; + version = "0.9"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -39,10 +41,13 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-d76Hsf+leJKYOh7k/RVuo6adfjMW6yAYt+vh7KNh7sA="; + hash = "sha256-CjTedIl7ZkSFfKKhHmCadTd7zdz3gP7Q4uCscv5An38="; }; + pythonRelaxDeps = true; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; @@ -61,7 +66,8 @@ buildPythonPackage rec { rich sqlparse termcolor - toml + tomli + tomlkit tomli-w urllib3 xmltodict diff --git a/nixpkgs/pkgs/development/python-modules/requests_download/default.nix b/nixpkgs/pkgs/development/python-modules/requests-download/default.nix index b31573a91ca0..0d1a5fb10a45 100644 --- a/nixpkgs/pkgs/development/python-modules/requests_download/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-download/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - pname = "requests_download"; + pname = "requests-download"; version = "0.1.2"; format = "wheel"; @@ -16,7 +16,8 @@ buildPythonPackage rec { #}; src = fetchPypi { - inherit pname version format; + pname = "requests_download"; + inherit version format; sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; }; diff --git a/nixpkgs/pkgs/development/python-modules/requests_ntlm/default.nix b/nixpkgs/pkgs/development/python-modules/requests-ntlm/default.nix index 43a002e1e19e..43a002e1e19e 100644 --- a/nixpkgs/pkgs/development/python-modules/requests_ntlm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-ntlm/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix b/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix index 4c939064d759..87f20922a712 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.22"; + version = "1.24"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - hash = "sha256-YMFeWbPTwxP/+lYojXEbJf87FNHL6QrzOdOKF5JERSE="; + hash = "sha256-JLFUdg7kbjhlpGgrQ29U1TRTKhjDlvMGc/FRE+awfLc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/restview/default.nix b/nixpkgs/pkgs/development/python-modules/restview/default.nix index 43e877686beb..88004743d73b 100644 --- a/nixpkgs/pkgs/development/python-modules/restview/default.nix +++ b/nixpkgs/pkgs/development/python-modules/restview/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , docutils -, readme_renderer +, readme-renderer , packaging , pygments , pytestCheckHook @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docutils - readme_renderer + readme-renderer packaging pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/reuse/default.nix b/nixpkgs/pkgs/development/python-modules/reuse/default.nix index 572c29931ad3..ee96a52fc0eb 100644 --- a/nixpkgs/pkgs/development/python-modules/reuse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reuse/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "reuse"; - version = "2.1.0"; + version = "3.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-MEQiuBxe/ctHlAnmLhQY4QH62uAcHb7CGfZz+iZCRSk="; + hash = "sha256-hDvOT9BP/E95FTa8rvtdxQoEDYgfMAkCSbX5KKV3qbQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rflink/default.nix b/nixpkgs/pkgs/development/python-modules/rflink/default.nix index fc829a40e5c8..354c66c41adc 100644 --- a/nixpkgs/pkgs/development/python-modules/rflink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rflink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rflink"; - version = "0.0.65"; + version = "0.0.66"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "aequitas"; repo = "python-rflink"; rev = "refs/tags/${version}"; - hash = "sha256-DUnhuA84nkmYkREa7vUiyLg7JUdEEeLewg3vFFlcar8="; + hash = "sha256-n6VLa0xX1qewMS7Kv+kiitezWRbRvDJRNuOmA7IV6u0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rich-pixels/default.nix b/nixpkgs/pkgs/development/python-modules/rich-pixels/default.nix index a086065725b5..7b77e59b6c9f 100644 --- a/nixpkgs/pkgs/development/python-modules/rich-pixels/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rich-pixels/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytestCheckHook , syrupy @@ -21,6 +22,14 @@ buildPythonPackage rec { hash = "sha256-fbpnHEfBPWLSYhgETqKbdmmzt7Lu/4oKgetjgNvv04c="; }; + patches = [ + (fetchpatch { + name = "fix-version.patch"; + url = "https://github.com/darrenburns/rich-pixels/commit/ff1cc3fef789321831f29e9bf282ae6b337eddb2.patch"; + hash = "sha256-58ZHBNg1RCuOfuE034qF1SbAgoiWMNlSG3c5pCSLUyI="; + }) + ]; + nativeBuildInputs = [ poetry-core pythonRelaxDepsHook diff --git a/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix b/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix index 91e8f2b34d22..5db47dfc65ea 100644 --- a/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "rich-rst"; - version = "1.1.7"; + version = "1.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "wasi-master"; repo = pname; - rev = "v${version}"; - hash = "sha256-s48hdJo1LIRXTf+PeSBa6y/AH1NLmnyAafFydJ+exDk="; + rev = "refs/tags/v${version}"; + hash = "sha256-jFPboZ5/T2I6EuyVM+45lrLWen8Kqf94gWXS1WDf1qU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix index 8065fea978bf..82a24a3b3f41 100644 --- a/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.8.5"; + version = "0.8.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-WYoElfkq0/uK3GPcIwDUP9w8l5zN9G2X/KDJbJNse9s="; + hash = "sha256-Awi0Wa/ayzhpecTCKWRt+2bQvvvDxbjN+bIKAdorETs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix index f2ddbff5d43f..6cc0471b854b 100644 --- a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "riscv-config"; - version = "3.14.3"; + version = "3.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "riscv-software-src"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-a6rTKCLAHrdfP/M8Q8YYSck4q+7tmospMFcCdIdNyy0="; + hash = "sha256-dMs900w5sXggqxU+2W8qKrKjGpyrXhA2QEbXQeaKZTs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix b/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix index d7e12ba2293f..4a9263f389c2 100644 --- a/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix @@ -6,22 +6,27 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "rki-covid-parser"; version = "1.3.3"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "thebino"; - repo = pname; - rev = "v${version}"; + repo = "rki-covid-parser"; + rev = "refs/tags/v${version}"; hash = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; @@ -45,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for working with data from the Robert-Koch Institut"; homepage = "https://github.com/thebino/rki-covid-parser"; + changelog = "https://github.com/thebino/rki-covid-parser/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/rmrl/default.nix b/nixpkgs/pkgs/development/python-modules/rmrl/default.nix index 48a33ca47cde..3b93126aa73c 100644 --- a/nixpkgs/pkgs/development/python-modules/rmrl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rmrl/default.nix @@ -3,8 +3,10 @@ , pythonOlder , fetchFromGitHub , poetry-core +, pythonRelaxDepsHook , pdfrw , reportlab +, rmscene , setuptools , svglib , xdg @@ -12,26 +14,34 @@ buildPythonPackage rec { pname = "rmrl"; - version = "unstable-2022-12-11"; + version = "0.2.1-unstable-2023-06-1"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { - owner = "naturale0"; + owner = "benneti"; repo = "rmrl"; - rev = "3c908536f11dfa92f81e7127ae76f18f0b2cc3e3"; - hash = "sha256-13pMfRe2McWDpBTlJy/TBT0W5wyd0EXDoocxeIzmqCo="; + rev = "e6f20322c80c6551174da1826c78261dfb3b74fe"; + hash = "sha256-jGWYrw6kcNSb4zhyCjap3l8+YCdOkk5kb5UCiBgW8u0="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "reportlab" + "rmscene" + "xdg" ]; propagatedBuildInputs = [ pdfrw reportlab + rmscene setuptools svglib xdg @@ -44,7 +54,7 @@ buildPythonPackage rec { meta = { description = "Render reMarkable documents to PDF"; - homepage = "https://github.com/naturale0/rmrl"; + homepage = "https://github.com/benneti/rmrl"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/rmscene/default.nix b/nixpkgs/pkgs/development/python-modules/rmscene/default.nix new file mode 100644 index 000000000000..9e6bba74d05b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rmscene/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, packaging +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "rmscene"; + version = "0.5.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "ricklupton"; + repo = "rmscene"; + rev = "v${version}"; + hash = "sha256-uIvoKdW7caOfc8OEGIcyDwyos9NLwtZ++CeZdUO/G8M="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + packaging + ]; + + pythonImportsCheck = [ "rmscene" ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/ricklupton/rmscene/blob/${src.rev}/README.md#changelog"; + description = "Read v6 .rm files from the reMarkable tablet"; + homepage = "https://github.com/ricklupton/rmscene"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rns/default.nix b/nixpkgs/pkgs/development/python-modules/rns/default.nix index 4b1ccc9bad62..3fc348be7561 100644 --- a/nixpkgs/pkgs/development/python-modules/rns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rns/default.nix @@ -5,12 +5,13 @@ , netifaces , pyserial , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "rns"; - version = "0.6.9"; - format = "setuptools"; + version = "0.7.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-L99eeDGbXXS9bff+r4j5AmmuICfeNKRD8+71+ojw320="; + hash = "sha256-iwW52jPSCwelfByerKHxKgH4NbWwCJLPyHXyBeJPwaM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography netifaces diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index d24bcf5bfc7a..39b45d5816bd 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , setuptools , robotframework +, robotframework-excellib +, pytestCheckHook }: buildPythonPackage rec { @@ -10,9 +12,11 @@ buildPythonPackage rec { version = "1.4.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-/n4+xA/eLrcVEwlWyLQLrkX5waYaJKRkphwT22b7hTU="; + src = fetchFromGitHub { + owner = "MarketSquare"; + repo = "Robotframework-Database-Library"; + rev = "refs/tags/v${version}"; + hash = "sha256-BCVXmlrYOaG+Dh67OytUfQnJ9Ak3MtHR3swOXdAN/HU="; }; nativeBuildInputs = [ @@ -22,14 +26,18 @@ buildPythonPackage rec { propagatedBuildInputs = [ robotframework + robotframework-excellib ]; - # unit tests are impure - doCheck = false; + pythonImportsCheck = [ "DatabaseLibrary" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Database Library contains utilities meant for Robot Framework"; - homepage = "https://github.com/franz-see/Robotframework-Database-Library"; + homepage = "https://github.com/MarketSquare/Robotframework-Database-Library"; license = licenses.asl20; maintainers = with maintainers; [ talkara ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-excellib/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-excellib/default.nix new file mode 100644 index 000000000000..550cc45e8ca3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/robotframework-excellib/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, openpyxl +, robotframework +}: + +buildPythonPackage rec { + pname = "robotframework-excellib"; + version = "2.0.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ZzAwlYM8DgWD1hfWRnY8u2RnZc3V368kgigBApeDZYg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + openpyxl + robotframework + ]; + + pythonImportsCheck = [ "ExcelLibrary" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Robot Framework library for working with Excel documents"; + homepage = "https://github.com/peterservice-rnd/robotframework-excellib"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index d014d0441975..961d967b31e6 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -41,24 +41,9 @@ buildPythonPackage rec { robotstatuschecker ]; - disabledTestPaths = [ - # https://github.com/robotframework/SeleniumLibrary/issues/1804 - "utest/test/keywords/test_webdrivercache.py" - ]; - - disabledTests = [ - "test_create_opera_executable_path_not_set" - "test_create_opera_executable_path_set" - "test_create_opera_with_options" - "test_create_opera_with_service_log_path_real_path" - "test_get_executable_path" - "test_get_ff_profile_instance_FirefoxProfile" - "test_has_options" - "test_importer" - "test_log_file_with_index_exist" - "test_opera" - "test_single_method" - ]; + preCheck = '' + mkdir utest/output_dir + ''; meta = with lib; { changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.rev}/docs/SeleniumLibrary-${version}.rst"; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework/default.nix index 31bd894f5c01..f87fe2bdd37a 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework/default.nix @@ -1,24 +1,40 @@ -{ lib, fetchFromGitHub, buildPythonPackage, jsonschema }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, jsonschema +, python +}: buildPythonPackage rec { pname = "robotframework"; - version = "6.1.1"; - format = "setuptools"; + version = "7.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "robotframework"; + repo = "robotframework"; rev = "refs/tags/v${version}"; - hash = "sha256-vtP0TVkCMrm0CRXlpZvVTBf7yd8+3p+nRArMWyQUn4k="; + hash = "sha256-IyOm2MTHj2rOew/IkyGIfI4XZSFU88+Tx8KHKIRT2G4="; }; - nativeCheckInputs = [ jsonschema ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + jsonschema + ]; checkPhase = '' - python3 utest/run.py + ${python.interpreter} utest/run.py ''; meta = with lib; { + changelog = "https://github.com/robotframework/robotframework/blob/master/doc/releasenotes/rf-${version}.rst"; description = "Generic test automation framework"; homepage = "https://robotframework.org/"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix b/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix index ef338ef0d341..fb0d137c9b06 100644 --- a/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,9 +1,15 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, robotframework +, python +}: buildPythonPackage rec { - version = "3.0.1"; - format = "setuptools"; pname = "robotstatuschecker"; + version = "3.0.1"; + pyproject = true; # no tests included in PyPI tarball src = fetchFromGitHub { @@ -13,10 +19,24 @@ buildPythonPackage rec { hash = "sha256-yW6353gDwo/IzoWOB8oelaS6IUbvTtwwDT05yD7w6UA="; }; + postPatch = '' + # https://github.com/robotframework/statuschecker/issues/46 + substituteInPlace test/tests.robot \ + --replace-fail BuiltIn.Log Log + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ robotframework ]; checkPhase = '' + runHook preCheck + ${python.interpreter} test/run.py + + runHook postCheck ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix b/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix index 34a5c17a4772..00f710060cc7 100644 --- a/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.18.2"; + version = "0.19.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-fgnR3TZh+cHvC8qJnvwfrrtxCdEr89Uw8ciACzaQPYE="; + hash = "sha256-e7BY0Y2SdAtECKqOCUZfq7PcCR2bhQ4lESQD9jTaqpI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rpyc4/default.nix b/nixpkgs/pkgs/development/python-modules/rpyc4/default.nix new file mode 100644 index 000000000000..c883ebef4dc6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rpyc4/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, setuptools +, hatchling +, plumbum +, pytestCheckHook +, pythonOlder +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "rpyc4"; + # Pinned version for linien, see also: + # https://github.com/linien-org/pyrp3/pull/10#discussion_r1302816237 + version = "4.1.5"; + format = "pyproject"; + + # Since this is an outdated version, upstream might have fixed the + # compatibility issues with Python3.12, but we can't enjoy them yet. + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; + + src = fetchFromGitHub { + owner = "tomerfiliba"; + repo = "rpyc"; + rev = version; + hash = "sha256-8NOcXZDR3w0TNj1+LZ7lzQAt7yDgspjOp2zk1bsbVls="; + }; + + nativeBuildInputs = [ + setuptools + hatchling + ]; + + propagatedBuildInputs = [ + plumbum + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Disable tests that requires network access + "test_api" + "test_close_timeout" + "test_deploy" + "test_listing" + "test_pruning" + "test_rpyc" + # Test is outdated + # ssl.SSLError: [SSL: NO_CIPHERS_AVAILABLE] no ciphers available (_ssl.c:997) + "test_ssl_conenction" + ]; + disabledTestPaths = [ + "tests/test_ssh.py" + "tests/test_teleportation.py" + ]; + + pythonImportsCheck = [ + "rpyc" + ]; + + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; + homepage = "https://rpyc.readthedocs.org"; + changelog = "https://github.com/tomerfiliba-org/rpyc/blob/${version}/CHANGELOG.rst"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rtfunicode/default.nix b/nixpkgs/pkgs/development/python-modules/rtfunicode/default.nix new file mode 100644 index 000000000000..2de60bc6bef9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rtfunicode/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "rtfunicode"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "mjpieters"; + repo = "rtfunicode"; + rev = "refs/tags/${version}"; + hash = "sha256-5lmiazxiEENpdqzVgoKQoG2OW/w5nGmC8odulo2XaLo="; + }; + + nativeBuildInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "rtfunicode" ]; + + meta = with lib; { + description = "Encoder for unicode to RTF 1.5 command sequences"; + maintainers = [ maintainers.lucasew ]; + license = licenses.bsd2; + homepage = "https://github.com/mjpieters/rtfunicode"; + changelog = "https://github.com/mjpieters/rtfunicode/releases/tag/${version}"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rtree/default.nix b/nixpkgs/pkgs/development/python-modules/rtree/default.nix index b4a2cc68ab8f..ff4b3b85e9cf 100644 --- a/nixpkgs/pkgs/development/python-modules/rtree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rtree/default.nix @@ -1,23 +1,27 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , libspatialindex , numpy , pytestCheckHook , pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "rtree"; - version = "1.1.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "Rtree"; - inherit version; - hash = "sha256-b47lBN3l0AWyWwiq9b4LNASvOtX+zm4d3N41kIp5ipU="; + version = "1.2.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Toblerity"; + repo = "rtree"; + rev = "refs/tags/${version}"; + hash = "sha256-RmAiyYrkUMBN/ebmo27WvFcRmYlKkywuQHLLUbluTTw="; }; postPatch = '' @@ -25,6 +29,11 @@ buildPythonPackage rec { 'find_library("spatialindex_c")' '"${libspatialindex}/lib/libspatialindex_c${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; + nativeBuildInputs = [ + setuptools + wheel + ]; + buildInputs = [ libspatialindex ]; nativeCheckInputs = [ @@ -36,7 +45,8 @@ buildPythonPackage rec { meta = with lib; { description = "R-Tree spatial index for Python GIS"; - homepage = "https://toblerity.org/rtree/"; + homepage = "https://github.com/Toblerity/rtree"; + changelog = "https://github.com/Toblerity/rtree/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ bgamari ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix b/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix index e5b2108831df..4131200f2276 100644 --- a/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix @@ -11,32 +11,23 @@ buildPythonPackage rec { pname = "ruyaml"; version = "0.91.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pycontribs"; - repo = pname; - rev = "v${version}"; - sha256 = "0gxvwry7n1gczxkjzyfrr3fammllkvnnamja4yln8xrg3n1h89al"; + repo = "ruyaml"; + rev = "refs/tags/v${version}"; + hash = "sha256-A37L/voBrn2aZ7xT8+bWdZJxbWRjnxbstQtSyUeN1sA="; }; - patches = [ - (fetchpatch { - name = "remove-setuptools-scm-git-archive-from-setupcfg.patch"; - url = "https://github.com/pycontribs/ruyaml/commit/8922dd826cbb97b29e9826b00fb28a65d584e985.patch"; - includes = [ "setup.cfg" ]; - hash = "sha256-XAsORoPvYRElHswlZ4S377UwuJNCU1JuCz5iyFXoXOQ="; - }) - + postPatch = '' # https://github.com/pycontribs/ruyaml/pull/107 - (fetchpatch { - name = "remove-setuptools-scm-git-archive-from-pyproject.patch"; - url = "https://github.com/pycontribs/ruyaml/commit/4d605bf63f799696c8ba3c1f0a0f505db0ca33ce.patch"; - hash = "sha256-X6HWXBot5ZIo+odoSHhXMb03tgpQfRw/Ze8nFgH43ZI="; - }) - ]; + substituteInPlace pyproject.toml \ + --replace '"pip >= 19.3.1",' "" \ + --replace '"setuptools_scm_git_archive >= 1.1",' "" + ''; nativeBuildInputs = [ setuptools-scm @@ -58,9 +49,17 @@ buildPythonPackage rec { "ruyaml" ]; + disabledTests = [ + # Assertion error + "test_issue_60" + "test_issue_60_1" + "test_issue_61" + ]; + meta = with lib; { description = "YAML 1.2 loader/dumper package for Python"; homepage = "https://ruyaml.readthedocs.io/"; + changelog = "https://github.com/pycontribs/ruyaml/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/safe-pysha3/default.nix b/nixpkgs/pkgs/development/python-modules/safe-pysha3/default.nix index a71cce569ce7..bb96ee1c2dcb 100644 --- a/nixpkgs/pkgs/development/python-modules/safe-pysha3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/safe-pysha3/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, python }: buildPythonPackage rec { @@ -16,6 +15,12 @@ buildPythonPackage rec { hash = "sha256-5CkUax7dGYssqTSiBGplZWxdMbDsiUu9YFUSf03q/xc="; }; + # AttributeError: 'Keccak_224Tests' object has no attribute 'failIf'. + postPatch = '' + substituteInPlace tests.py \ + --replace "failIf" "assertFalse" + ''; + pythonImportsCheck = [ "sha3" ]; diff --git a/nixpkgs/pkgs/development/python-modules/safetensors/default.nix b/nixpkgs/pkgs/development/python-modules/safetensors/default.nix index 976d6b9b3fa8..4005a620d8a6 100644 --- a/nixpkgs/pkgs/development/python-modules/safetensors/default.nix +++ b/nixpkgs/pkgs/development/python-modules/safetensors/default.nix @@ -16,22 +16,22 @@ buildPythonPackage rec { pname = "safetensors"; - version = "0.3.3"; - format = "pyproject"; + version = "0.4.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "huggingface"; - repo = pname; + repo = "safetensors"; rev = "refs/tags/v${version}"; - hash = "sha256-U+indMoLFN6vMZkJTWFG08lsdXuK5gOfgaHmUVl6DPk="; + hash = "sha256-hdPUI8k7CCQwt2C/AsjUHRmAL6ob+yCN97KkWtqOQL8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/bindings/python"; - hash = "sha256-MhRs9tFCmVZI5O0EVRUbo4ZnUVRQ0EfQTU+E1K+qKZI="; + hash = "sha256-7n9aYlha6IaPsZ2zMfD5EIkrk8ENwMBwj41s6QU7ml0="; }; sourceRoot = "${src.name}/bindings/python"; @@ -41,6 +41,7 @@ buildPythonPackage rec { cargo rustc rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -54,6 +55,9 @@ buildPythonPackage rec { "tests/test_flax_comparison.py" "tests/test_paddle_comparison.py" "tests/test_tf_comparison.py" + ] ++ lib.optionals stdenv.isDarwin [ + # don't require mlx (not in Nixpkgs) to run tests + "tests/test_mlx_comparison.py" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index db1d0b3f0abd..6d0949a96e3f 100644 --- a/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.199.0"; + version = "2.207.1"; 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-zAYO8zf3FpEI1sr6Iv9WP56NFmwYGH2dtRTSJhsSYC8="; + hash = "sha256-nSFBx2s6vy5Ug2tBiPqNu4Q29LGW2LijoDKlC6m4CL4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix index 2e617fa8c3fc..86a1ba65598d 100644 --- a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -2,29 +2,30 @@ , black , buildPythonPackage , cachecontrol -, fetchPypi +, fetchFromGitHub , importlib-resources -, lockfile , mistune -, mypy +, mypy-extensions , pytestCheckHook , pythonOlder , rdflib +, requests , ruamel-yaml -, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "schema-salad"; - version = "8.5.20231201181309"; + version = "8.5.20240102191336.dev7+g8e95468"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-q4djcBt+8PEUekWNKlivKnDXrJBAUKGZ1252ym/E4bI="; + src = fetchFromGitHub { + owner = "common-workflow-language"; + repo = "schema_salad"; + rev = "8e954684b08d222d54b7eff680eaa4d4e65920a9"; + hash = "sha256-VoFFKe6XHDytj5UlmsN14RevKcgpl+DSDMGDVS2Ols4="; }; nativeBuildInputs = [ @@ -33,14 +34,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ cachecontrol - importlib-resources - lockfile mistune - mypy + mypy-extensions rdflib + requests ruamel-yaml - setuptools # needs pkg_resources at runtime - ] ++ cachecontrol.optional-dependencies.filecache; + ] ++ cachecontrol.optional-dependencies.filecache + ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; nativeCheckInputs = [ pytestCheckHook @@ -51,6 +53,7 @@ buildPythonPackage rec { ''; disabledTests = [ + "test_load_by_yaml_metaschema" # Setup for these tests requires network access "test_secondaryFiles" "test_outputBinding" @@ -75,7 +78,5 @@ buildPythonPackage rec { changelog = "https://github.com/common-workflow-language/schema_salad/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; - # https://github.com/common-workflow-language/schema_salad/issues/721 - broken = versionAtLeast mistune.version "2.1"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix b/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix index bf4bcee43758..441e668f81fc 100644 --- a/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pyparsing , matplotlib , latex2mathml @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "schemdraw"; - version = "0.17"; + version = "0.18"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,9 +23,13 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-wa/IeNGZynU/xKwyFwebXcFaruhBFqGWsrZYaIEVa8Q="; + hash = "sha256-JJc3LA+fqB+2g7pPIZ8YMV921EyYpLZrHSJCYyYThZg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyparsing ]; diff --git a/nixpkgs/pkgs/development/python-modules/schwifty/default.nix b/nixpkgs/pkgs/development/python-modules/schwifty/default.nix index 9f07bb88d58e..1a33c71f7ff5 100644 --- a/nixpkgs/pkgs/development/python-modules/schwifty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schwifty/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2023.11.2"; + version = "2024.1.1.post0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lyyAx8VDIRO72xW64gjcsZw2C31hV3YCLIGSmdlIJeI="; + hash = "sha256-ZFDu+stuKdsVc8bTuSZ4LZX8BuQhORjyEMosnrk1rX0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix index de78e1dc9360..fd4e5100c287 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.35"; + version = "0.4.38"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1SROsrl7zBaZRDju1M6wlKLZypk9OswA8kromiJGeqw="; + hash = "sha256-/+1eENbpng/X1g108cEGiTZlIkdcqqnm9wyN9ECH5D4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix index cd66ed54be76..4b33027fb99b 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.3.2"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ovVMdqzMFaNL+5Bm5selbB5yNd2ldiuZB5IzC1LM+wU="; + hash = "sha256-1Dc8mE66IOOTIW7dUaPj7t5Wy+k9QkdRbSBWQ8O5MSE="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix index 6ab88fea48b8..bde55615e7bf 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "0.30.0"; + version = "0.31.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "scikit-rf"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rJjuraiTvCmZgz8ysFBbYPowkLIuwt8RaFNl+gDSfLk="; + hash = "sha256-MSFlajXdNZ/BfTLuegy+T9iNFdXk/TWN8J3TcYbYLbI="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix index caca48153b72..b2a58d71c0b1 100644 --- a/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -13,6 +13,9 @@ , pkg-config , pythran , wheel +, nose +, setuptools +, hypothesis , pytestCheckHook , pytest-xdist , numpy @@ -31,8 +34,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.11.4"; - srcHash = "sha256-hNAZOMDFYqZpb67Pzg/WALWagFYvqYO1jOmcipDDRbE="; + version = "1.12.0"; + srcHash = "sha256-PuiyYTgSegDTV9Kae5N68FOXT1jyJrNv9p2aFP70Z20="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -73,15 +76,18 @@ in buildPythonPackage { "doc/source/dev/contributor/meson_advanced.rst" ]; }) + (fetchpatch { + name = "openblas-0.3.26-compat.patch"; + url = "https://github.com/scipy/scipy/commit/8c96a1f742335bca283aae418763aaba62c03378.patch"; + hash = "sha256-SGoYDxwSAkr6D5/XEqHLerF4e4nmmI+PX+z+3taWAps="; + }) ]; - # Relax deps a bit + # Upstream complicated numpy version pinning is causing issues in the + # configurePhase, so we pass on it. postPatch = '' substituteInPlace pyproject.toml \ - --replace 'meson-python>=0.12.1,<0.15.0' 'meson-python' \ - --replace 'numpy==' 'numpy>=' \ - --replace "pybind11>=2.10.4,<2.11.1" "pybind11>=2.10.4,<2.12.0" \ - --replace 'wheel<0.41.0' 'wheel' + --replace-fail 'numpy==' 'numpy>=' \ ''; nativeBuildInputs = [ @@ -91,6 +97,7 @@ in buildPythonPackage { pythran pkg-config wheel + setuptools ]; buildInputs = [ @@ -108,6 +115,8 @@ in buildPythonPackage { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ + nose + hypothesis pytestCheckHook pytest-xdist ]; @@ -157,42 +166,9 @@ in buildPythonPackage { # hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - checkPhase = '' - runHook preCheck - - # Adapted from pytestCheckHook because scipy uses a custom check phase. - # It needs to pass `$args` as a Python list to `scipy.test` rather than as - # arguments to pytest on the command-line. - args="" - if [ -n "$disabledTests" ]; then - disabledTestsString=$(_pytestComputeDisabledTestsString "''${disabledTests[@]}") - args+="'-k','$disabledTestsString'" - fi - - if [ -n "''${disabledTestPaths-}" ]; then - eval "disabledTestPaths=($disabledTestPaths)" - fi - - for path in ''${disabledTestPaths[@]}; do - if [ ! -e "$path" ]; then - echo "Disabled tests path \"$path\" does not exist. Aborting" - exit 1 - fi - args+="''${args:+,}'--ignore=\"$path\"'" - done - args+="''${args:+,}$(printf \'%s\', "''${pytestFlagsArray[@]}")" - args=''${args%,} - - pushd "$out" + preCheck = '' export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) - ${python.interpreter} -c "import scipy, sys; sys.exit(scipy.test( - 'fast', - verbose=10, - extra_argv=[$args], - parallel=$NIX_BUILD_CORES - ) != True)" - popd - runHook postCheck + cd $out ''; requiredSystemFeatures = [ "big-parallel" ]; # the tests need lots of CPU time diff --git a/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix b/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix index 281ff4cb1814..611949ae6515 100644 --- a/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "2.0.3"; + version = "2.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-P+Mbf8adSvQPkUgnTSPrqzvHc6lR0ns2mJ0/x9YGPKs="; + hash = "sha256-KG7Y+1qqsgDwgRYsb3XbZnF6FduHJCAEizfuugBi0Go="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scs/default.nix b/nixpkgs/pkgs/development/python-modules/scs/default.nix index 5e95bed4cbdb..c1ca83ed4ba1 100644 --- a/nixpkgs/pkgs/development/python-modules/scs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scs/default.nix @@ -41,6 +41,13 @@ buildPythonPackage rec { url = "https://github.com/bodono/scs-python/commit/dd17e2e5282ebe85f2df8a7c6b25cfdeb894970d.patch"; hash = "sha256-vSeSJeeu5Wx3RXPyB39YTo0RU8HtAojrUw85Q76/QzA="; }) + # fix test_solve_random_cone_prob on linux after scipy 1.12 update + # https://github.com/bodono/scs-python/pull/82 + (fetchpatch { + name = "scipy-1.12-fix.patch"; + url = "https://github.com/bodono/scs-python/commit/4baf4effdc2ce7ac2dd1beaf864f1a5292eb06c6.patch"; + hash = "sha256-U/F5MakwYZN5hCaeAkcCG38WQxX9mXy9OvhyEQqN038="; + }) ]; nativeBuildInputs = [ @@ -62,12 +69,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "scs" ]; - disabledTests = lib.lists.optional (stdenv.system == "x86_64-linux") [ - # `test/test_scs_rand.py` hang on "x86_64-linux" (https://github.com/NixOS/nixpkgs/pull/244532#pullrequestreview-1598095858) - "test_feasible" - "test_infeasibl" - "test_unbounded" - ]; meta = with lib; { description = "Python interface for SCS: Splitting Conic Solver"; diff --git a/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/nixpkgs/pkgs/development/python-modules/seaborn/default.nix index fef58d973ccf..a296478b176c 100644 --- a/nixpkgs/pkgs/development/python-modules/seaborn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/seaborn/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.13.0"; + version = "0.13.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mwaskom"; repo = "seaborn"; rev = "refs/tags/v${version}"; - hash = "sha256-RbtBNKTjUHdCFe1V7IvACgbSNIPhVFMYmtE34GKVIzs="; + hash = "sha256-aGIVcdG/XN999nYBHh3lJqGa3QVt0j8kmzaxdkULznY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/segments/default.nix b/nixpkgs/pkgs/development/python-modules/segments/default.nix index 19a833bd0ee5..10d50ed59233 100644 --- a/nixpkgs/pkgs/development/python-modules/segments/default.nix +++ b/nixpkgs/pkgs/development/python-modules/segments/default.nix @@ -2,31 +2,36 @@ , buildPythonPackage , fetchFromGitHub , isPy27 +, setuptools , regex , csvw , clldutils -, mock , pytestCheckHook , pytest-mock }: buildPythonPackage rec { pname = "segments"; - version = "2.2.0"; - format = "setuptools"; + version = "2.2.1"; + pyproject = true; disabled = isPy27; src = fetchFromGitHub { owner = "cldf"; - repo = pname; + repo = "segments"; rev = "v${version}"; - sha256 = "04yc8q79zk09xj0wnal0vdg5azi9jlarfmf2iyljqyr80p79gwvv"; + sha256 = "sha256-Z9AQnsK/0HUCZDzdpQKNfSBWxfAOjWNBytcfI6yBY84="; }; patchPhase = '' - substituteInPlace setup.cfg --replace "--cov" "" + substituteInPlace setup.cfg \ + --replace-fail "--cov" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ regex csvw @@ -34,12 +39,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mock pytestCheckHook pytest-mock ]; meta = with lib; { + changelog = "https://github.com/cldf/segments/blob/${src.rev}/CHANGES.md"; description = "Unicode Standard tokenization routines and orthography profile segmentation"; homepage = "https://github.com/cldf/segments"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/nixpkgs/pkgs/development/python-modules/selenium/default.nix index 5a5c4304c636..09ddebebe240 100644 --- a/nixpkgs/pkgs/development/python-modules/selenium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/selenium/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; postInstall = '' - DST_PREFIX=$out/lib/${python.libPrefix}/site-packages/selenium/webdriver/ + DST_PREFIX=$out/${python.sitePackages}/selenium/webdriver/ DST_REMOTE=$DST_PREFIX/remote/ DST_FF=$DST_PREFIX/firefox cp ../rb/lib/selenium/webdriver/atoms/getAttribute.js $DST_REMOTE diff --git a/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix index 35c0b4b6f4f8..cc91f276c0e7 100644 --- a/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , aiohttp , ciso8601 , async-timeout @@ -14,8 +15,8 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.12.2"; - format = "setuptools"; + version = "0.12.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,14 +24,18 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-OVFRM31LwHNeJUx+s/TN/1o4wvjMQEKaZEPI+y+S64s="; + hash = "sha256-aAPDYg5ttOAkKF5c1ft2apIQoReh4t22+78PtmLZNlI="; }; postPatch = '' substituteInPlace setup.py \ - --replace "{{VERSION_PLACEHOLDER}}" "${version}" + --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp async-timeout diff --git a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index a4027953796b..cee2e2fc599e 100644 --- a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -27,6 +27,7 @@ , pytest-watch , pytestCheckHook , pythonOlder +, quart , rq , sanic , setuptools @@ -37,7 +38,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.39.0"; + version = "1.40.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -46,7 +47,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-tYfnQ6L91KrRCR32dgzcDtA7eO+LHRAHBklxU8cXkK8="; + hash = "sha256-durgUKpJ5H+xd4FBpNWVtfmMlreTbvQvUaTVPoJw5wQ="; }; nativeBuildInputs = [ @@ -96,7 +97,7 @@ buildPythonPackage rec { pure-eval ]; quart = [ - # quart missing + quart blinker ]; rq = [ @@ -133,11 +134,12 @@ buildPythonPackage rec { disabledTests = [ # Issue with the asseration "test_auto_enabling_integrations_catches_import_error" + "test_default_release" ]; disabledTestPaths = [ # Varius integration tests fail every once in a while when we - # upgrade depencies, so don't bother testing them. + # upgrade dependencies, so don't bother testing them. "tests/integrations/" ] ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ # test crashes on aarch64 diff --git a/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix index 231580cf9675..7cacc0ca5a4d 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "69.0.2"; + version = "69.0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; rev = "refs/tags/v${version}"; - hash = "sha256-7xOZC85glpXPKdPTYOpwjQHRpkKL1hgbMFgJF3q5EW0="; + hash = "sha256-38csULki+SBcg7StScj0/09A+JZesm8iwOBjSgXyXMA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/sharp-aquos-rc/default.nix b/nixpkgs/pkgs/development/python-modules/sharp-aquos-rc/default.nix new file mode 100644 index 000000000000..5dc7580467e8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sharp-aquos-rc/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pyyaml +}: + +buildPythonPackage rec { + pname = "sharp-aquos-rc"; + version = "0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jmoore987"; + repo = "sharp_aquos_rc"; + rev = "refs/tags/${version}"; + hash = "sha256-w/XA58iT/pmNCy9up5fayjxBsevzgr8ImKgPiNtYHAM="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ pyyaml ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "sharp_aquos_rc" ]; + + meta = with lib; { + homepage = "https://github.com/jmoore987/sharp_aquos_rc"; + description = "Control Sharp Aquos SmartTVs through the IP interface"; + changelog = "https://github.com/jmoore987/sharp_aquos_rc/releases/tag/${version}"; + maintainers = with maintainers; [ jamiemagee ]; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/shiv/default.nix b/nixpkgs/pkgs/development/python-modules/shiv/default.nix index 57e67567c7c8..a508ee2ec695 100644 --- a/nixpkgs/pkgs/development/python-modules/shiv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shiv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "shiv"; - version = "1.0.4"; + version = "1.0.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-j2n3gXolRalMyOB6jsWXN1z4biwb0OWD7nU9bzH4UGA="; + hash = "sha256-3eryU4+4HFfMIrmst1Vlm6GounzvtCfFiAYFhAH/RdU="; }; propagatedBuildInputs = [ click pip setuptools wheel ]; diff --git a/nixpkgs/pkgs/development/python-modules/sigstore/default.nix b/nixpkgs/pkgs/development/python-modules/sigstore/default.nix index ae64e1eb057b..24322a18723e 100644 --- a/nixpkgs/pkgs/development/python-modules/sigstore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sigstore/default.nix @@ -1,27 +1,23 @@ { lib +, appdirs , buildPythonPackage +, cryptography , fetchFromGitHub - -# build-system , flit-core - -# dependencies -, appdirs -, cryptography , id , importlib-resources +, pretend , pydantic , pyjwt , pyopenssl +, pytestCheckHook , requests , rich , securesystemslib , sigstore-protobuf-specs , sigstore-rekor-types , tuf - -# tests -, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -29,10 +25,12 @@ buildPythonPackage rec { version = "2.1.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "sigstore"; repo = "sigstore-python"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-WH6Pme8ZbfW5xqBT056eVJ3HZP1D/lAULtyN6k0uMaA="; }; @@ -57,17 +55,35 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pretend pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "sigstore" ]; + disabledTests = [ + # Tests require network access + "test_fail_init_url" + "test_get_identity_token_bad_code" + "test_identity_proof_claim_lookup" + "test_init_url" + "test_production" + "test_sct_verify_keyring" + "test_sign_rekor_entry_consistent" + "test_verification_materials_retrieves_rekor_entry" + "test_verifier" + ]; + meta = with lib; { description = "A codesigning tool for Python packages"; homepage = "https://github.com/sigstore/sigstore-python"; - changelog = "https://github.com/sigstore/sigstore-python/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index 59a24e96feb0..f417a5f6368d 100644 --- a/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2023.12.0"; + version = "2024.01.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "simplisafe-python"; rev = "refs/tags/${version}"; - hash = "sha256-Nr4HvjIOLk/WMKCjj/ZX67OBSImRhs9SfZtLjFs81Sk="; + hash = "sha256-ewbR2FI0t2F8HF0ZL5omsclB9OPAjHygGLPtSkVlvgM="; }; diff --git a/nixpkgs/pkgs/development/python-modules/sip/default.nix b/nixpkgs/pkgs/development/python-modules/sip/default.nix index 4053e20a08d0..32c28211cd06 100644 --- a/nixpkgs/pkgs/development/python-modules/sip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sip/default.nix @@ -9,17 +9,22 @@ , ply , toml , tomli + +# tests +, poppler-qt5 +, qgis +, qgis-ltr }: buildPythonPackage rec { pname = "sip"; - version = "6.8.0"; + version = "6.8.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-LtGQSCDLZhtyB+sdzPrr7BpUY9ytkDukSK0ZRVAtCJw="; + hash = "sha256-MALfQV4WisP/45OULbxxMcuCreUAAOFSb0aoit4m9Zg="; }; nativeBuildInputs = [ @@ -36,6 +41,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "sipbuild" ]; + passthru.tests = { + # test depending packages + inherit poppler-qt5 qgis qgis-ltr; + }; + meta = with lib; { description = "Creates C++ bindings for Python modules"; homepage = "https://riverbankcomputing.com/"; diff --git a/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix b/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix index f47dada7b631..989b5711a810 100644 --- a/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.3.9"; + version = "1.3.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = "skodaconnect"; rev = "refs/tags/${version}"; - hash = "sha256-7QDelJzyRnYNqVP9IuREpCm5s+qJ8cxSEn1YcqnYepA="; + hash = "sha256-H45rL9GFuTnP5VP0cRyqlmWJmX1Zvh7A7JcSKgcZCwA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix index 238bae491a90..1c1edb663e3c 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "skytemple-dtef"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-ngIjM8DW9HQJpa/U2f1sy+6CeWdccayp60vbJmos+A8="; + hash = "sha256-vVh4WRjx/iFJnTZC7D/OCi0gOwKaXs/waVXUEu5Cda8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index faac31c81521..5e60c73de699 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.6.1"; + version = "1.6.3"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-P0VME1keazqcyb0JuQ4iXPyJH7/gTmYE7uASpjvhqUo="; + hash = "sha256-OkokbVD8j+Sgypj25demzSZdiAEf8TJrnl0QRIM2HsI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix index d33a87f50662..c92f9175bfb2 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix @@ -13,18 +13,18 @@ buildPythonPackage rec { pname = "skytemple-rust"; - version = "1.6.1"; + version = "1.6.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Qg2KAzjSV7yQTpRHmNMkHRwOJSbfsgcdT0RHQru2lBI="; + hash = "sha256-z9Vu9mj82hwuPva56tmav4jN9RCoNIZxL+C3GYtYsOo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ZJ5eYof9RZ07iP0YowIBorHuNUntQVW9JWcSVe2emig="; + hash = "sha256-2or419evNxi99HIvL2TlSWFFh4BCky8qI/dVQbq/X38="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index b497c4406147..5e5d0c8d7951 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-Zqp/NSF3uoxktycg+Q3BLFUMzbHFKUkYCg+DvEcRydU="; + hash = "sha256-lMlBCAmmenEwxzt4ft5jwwvqedzu2omeoNx5g6lA+PE="; }; buildInputs = [ gtk3 gtksourceview4 ]; diff --git a/nixpkgs/pkgs/development/python-modules/slowapi/default.nix b/nixpkgs/pkgs/development/python-modules/slowapi/default.nix index dfa583bc0d3b..089d4d2743e9 100644 --- a/nixpkgs/pkgs/development/python-modules/slowapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slowapi/default.nix @@ -5,6 +5,7 @@ , limits , mock , hiro +, httpx , poetry-core , pytestCheckHook , pythonAtLeast @@ -50,6 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ fastapi hiro + httpx mock pytestCheckHook starlette diff --git a/nixpkgs/pkgs/development/python-modules/snakemake-interface-common/default.nix b/nixpkgs/pkgs/development/python-modules/snakemake-interface-common/default.nix index bccad271d4a1..7b3cfd791219 100644 --- a/nixpkgs/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-interface-common"; - version = "1.15.0"; + version = "1.15.3"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Rf2eMkRvkTCR2swB53ekjv8U8DzTPgjhIkBVrn6gTTI="; + hash = "sha256-MiwdNr8+xX5oD1ilhDDhJcf4wWnfkayDMcnDyjYSWlo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix index 358fdd614163..38b42fc9d1e8 100644 --- a/nixpkgs/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snakemake-interface-executor-plugins"; - version = "8.1.3"; + version = "8.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QBLdqhR6WrO/zT0Ux5xcUtr5HbrDy91qiWuSjAA5c3E="; + hash = "sha256-ZkhayXWy83/INRH7FYwFkhgHL+nSj7ReYC9I97SEeTM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 96efc55f2c4b..d9b673ca49cd 100644 --- a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.6.0"; + version = "3.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FWZ6kYeA152nVeamC79pGAUYVJUej1bM31aSKD6ahHk="; + hash = "sha256-sr+uxkBZMHsIyq2tQCFNSI/vtKI/zXVTrHX16nWKkWk="; }; # snowflake-connector-python requires arrow 10.0.1, which we don't have in diff --git a/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix b/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix index e92218f0dfea..05c1e8988b38 100644 --- a/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "social-auth-core"; - version = "4.5.1"; + version = "4.5.2"; 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-yji10s3oHwUcKUs1njctkkmODyQRgiQDSRqolJFTifw="; + hash = "sha256-4oUSGTDNJc+qZRYiexRUaz8IOaZRXlwqswfPiEzTuR4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/socialscan/default.nix b/nixpkgs/pkgs/development/python-modules/socialscan/default.nix index db9cd3c1f8ca..7a6cc52e3514 100644 --- a/nixpkgs/pkgs/development/python-modules/socialscan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/socialscan/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "socialscan"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "iojw"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jiyTcpJ00DvfweChawj1ugdCVHHAdwDbHEp9jivH7gs="; + hash = "sha256-4JJVhB6x1NGagtfzE03Jae2GOr25hh+4l7gQ23zc7Ck="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/nixpkgs/pkgs/development/python-modules/somajo/default.nix index 06246e5d1963..d7453d0955cf 100644 --- a/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.4.0"; + version = "2.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-k0sjA6IgFKwS1dCAeCHSLdU4GJZ3uMSQ/my0KQvVx50="; + hash = "sha256-44avfokFgOQ62dswGpsNX+mywrtZLMTkMV4s+y0UusE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/nixpkgs/pkgs/development/python-modules/spacy/default.nix index ccbfef1568e8..406d687bba96 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.7.2"; + version = "3.7.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zt9JJ78NP+x3OmzkjV0skb2wL+08fV7Ae9uHPxEm8aA="; + hash = "sha256-mSZQKPvcbhIknFMwXkYfeaEDY3sOaGbCivDkY2X3UeE="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/spatial-image/default.nix b/nixpkgs/pkgs/development/python-modules/spatial-image/default.nix new file mode 100644 index 000000000000..e578ac7e5420 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/spatial-image/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, flit-core +, pytestCheckHook +, numpy +, xarray +, xarray-dataclasses +}: + +buildPythonPackage rec { + pname = "spatial-image"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "spatial-image"; + repo = "spatial-image"; + rev = "refs/tags/v${version}"; + hash = "sha256-nCsxPhIgGmZZntYbhQ3KnzptcKdN288eNixbQDgECSQ="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + numpy + xarray + xarray-dataclasses + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "spatial_image" ]; + + meta = with lib; { + description = "A multi-dimensional spatial image data structure for scientific Python"; + homepage = "https://github.com/spatial-image/spatial-image"; + changelog = "https://github.com/spatial-image/spatial-image/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/nixpkgs/pkgs/development/python-modules/spglib/default.nix index 95d73246aab9..b7d172c93cfd 100644 --- a/nixpkgs/pkgs/development/python-modules/spglib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spglib/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "spglib"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-gUNUX9/8EfvNpNcFpra81Iid6bw1JLeN+GajbdDeCks="; + hash = "sha256-Snxx9q24YMvhSs39bKQ9zSns2a7T84wCzXbagP+l0Bw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix index dc9ab56ed3fc..b67667ca804d 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-markdown-parser/default.nix @@ -1,24 +1,27 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage +, commonmark , fetchFromGitHub -, sphinx , markdown -, commonmark -, recommonmark , pydash +, pytestCheckHook +, pythonOlder , pyyaml +, recommonmark +, setuptools +, sphinx , unify , yapf -, python }: buildPythonPackage rec { pname = "sphinx-markdown-parser"; version = "0.2.4"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; - # PyPi release does not include requirements.txt src = fetchFromGitHub { owner = "clayrisser"; repo = "sphinx-markdown-parser"; @@ -28,20 +31,44 @@ buildPythonPackage rec { sha256 = "0i0hhapmdmh83yx61lxi2h4bsmhnzddamz95844g2ghm132kw5mv"; }; - propagatedBuildInputs = [ sphinx markdown commonmark pydash pyyaml unify yapf recommonmark ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + commonmark + markdown + pydash + pyyaml + recommonmark + unify + yapf + ]; + + buildInputs = [ + sphinx + ]; - # Avoids running broken tests in test_markdown.py - checkPhase = '' - ${python.interpreter} -m unittest -v tests/test_basic.py tests/test_sphinx.py - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "sphinx_markdown_parser" ]; + pythonImportsCheck = [ + "sphinx_markdown_parser" + ]; + + disabledTests = [ + # AssertionError + "test_heading" + "test_headings" + "test_integration" + ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Write markdown inside of docutils & sphinx projects"; homepage = "https://github.com/clayrisser/sphinx-markdown-parser"; license = licenses.mit; maintainers = with maintainers; [ FlorianFranzen ]; + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix index e9f5d9c4519d..0621c2867d03 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , flit-core , pythonImportsCheckHook +, pythonOlder # documentation build dependencies , sphinxHook , sphinx-prompt @@ -12,18 +13,25 @@ , sphinxemoji # runtime dependencies , sphinx +, setuptools }: buildPythonPackage rec { pname = "sphinx-notfound-page"; version = "1.0.0"; - format = "pyproject"; - outputs = [ "out" "doc" ]; + pyproject = true; + + disabled = pythonOlder "3.8"; + + outputs = [ + "out" + "doc" + ]; src = fetchFromGitHub { owner = "readthedocs"; repo = "sphinx-notfound-page"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-tG71UuYbdlWNgq6Y5xRH3aWc9/eTr/RlsRNWSUjrbBE="; }; @@ -38,13 +46,22 @@ buildPythonPackage rec { sphinxemoji ]; - propagatedBuildInputs = [ sphinx ]; + buildInputs = [ + sphinx + ]; - pythonImportsCheck = [ "notfound" ]; + propagatedBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "notfound" + ]; meta = with lib; { description = "A sphinx extension to create a custom 404 page with absolute URLs hardcoded"; homepage = "https://github.com/readthedocs/sphinx-notfound-page"; + changelog = "https://github.com/readthedocs/sphinx-notfound-page/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kaction ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix index 04630f189d5a..e11db20b64d7 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "sphinx-tabs"; - version = "3.4.4"; + version = "3.4.5"; format = "pyproject"; outputs = [ "out" "doc" ]; @@ -27,13 +27,9 @@ buildPythonPackage rec { owner = "executablebooks"; repo = "sphinx-tabs"; rev = "refs/tags/v${version}"; - hash = "sha256-RcCADGJfwXP/U7Uws/uX+huaJzRDRUabQOnc9gqMUzM="; + hash = "sha256-uFSnIhvnmg3ZURJGbSOUpLVx0EDUs/9SewspM7gtNRk="; }; - postPatch = '' - substituteInPlace setup.py --replace 'docutils~=0.18.0' 'docutils' - ''; - nativeBuildInputs = [ setuptools sphinxHook diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix index d6d150d6e92b..9b8e3246af32 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sphinx-thebe"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_thebe"; - hash = "sha256-xg2rG1m5LWouq41xGeh8BzBHDaYvPIS/bKdWkEh9BQU="; + hash = "sha256-V2BH9FVg6C9kql8VIAsesJTc/hxbj1MaimW9II4lpJM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix index 1fb89f3a2849..7561fcd0dba5 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -3,13 +3,15 @@ , fetchFromGitHub , fetchpatch , pythonImportsCheckHook +, pythonOlder +, setuptools , sphinx -, sphinxHook , sphinx-autoapi +, sphinx-prompt , sphinx-rtd-theme , sphinx-tabs -, sphinx-prompt , sphinxemoji +, sphinxHook }: # Latest tagged release release "1.1.2" (Nov 2018) does not contain @@ -18,9 +20,14 @@ buildPythonPackage { pname = "sphinx-version-warning"; version = "unstable-2019-08-10"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; src = fetchFromGitHub { owner = "humitos"; @@ -40,21 +47,27 @@ buildPythonPackage { nativeBuildInputs = [ pythonImportsCheckHook - sphinxHook sphinx-autoapi + sphinx-prompt sphinx-rtd-theme sphinx-tabs - sphinx-prompt sphinxemoji + sphinxHook + setuptools ]; - propagatedBuildInputs = [ sphinx ]; + buildInputs = [ + sphinx + ]; - pythonImportsCheck = [ "versionwarning" ]; + pythonImportsCheck = [ + "versionwarning" + ]; meta = with lib; { description = "A sphinx extension to show a warning banner at the top of your documentation"; homepage = "https://github.com/humitos/sphinx-version-warning"; + changelog = "https://github.com/humitos/sphinx-version-warning/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kaction ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index 3945f8bf4c4f..327ff267eebc 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchPypi , pbr +, setuptools }: buildPythonPackage rec { pname = "sphinxcontrib-apidoc"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,8 +20,9 @@ buildPythonPackage rec { rm test-requirements.txt requirements.txt ''; - propagatedBuildInputs = [ + nativeBuildInputs = [ pbr + setuptools ]; # Check is disabled due to circular dependency of sphinx diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index dc7798015cb7..6b282371f22b 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-Zpe2n131afnq4IhQEEZtquvSEkkjv/uznXt2tQhGfZA="; + hash = "sha256-q3+GwMVWMRu4eWwbdXcbPQzpBhBXcZEMFTpbEO+teLk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/nixpkgs/pkgs/development/python-modules/spyder/default.nix index a70ef94409f7..47010b63a7c1 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.5.0"; + version = "5.5.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-zjQmUmkqwtXNnZKssNpl24p4FQscZKGiiJj5iwYl2UM="; + hash = "sha256-+z8Jj0eA/mYH1r8ZQUyYUFMk7h1mBxjoTD5YZk0cH0k="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyse-python/default.nix b/nixpkgs/pkgs/development/python-modules/spyse-python/default.nix index 0064454a1eaf..56ffdfe8c080 100644 --- a/nixpkgs/pkgs/development/python-modules/spyse-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyse-python/default.nix @@ -7,32 +7,23 @@ , pythonOlder , requests , responses +, setuptools }: buildPythonPackage rec { pname = "spyse-python"; version = "2.2.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "spyse-com"; - repo = pname; - rev = "v${version}"; - sha256 = "041k0037anwaxp2mh7mdk8rdsw9hdr3arigyyqfxfn35x8j41c3k"; + repo = "spyse-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-c7BAJOplWNcd9v7FrEZuMHHdMpqtHljF7YpbdQYAMxA="; }; - propagatedBuildInputs = [ - requests - dataclasses-json - responses - limiter - ]; - - # Tests requires an API token - doCheck = false; - patches = [ # Update limiter import and rate limit, https://github.com/spyse-com/spyse-python/pull/11 (fetchpatch { @@ -45,11 +36,26 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "'dataclasses~=0.6'," "" \ + --replace "dataclasses-json~=0.5.4" "dataclasses-json>=0.5.4" \ --replace "responses~=0.13.3" "responses>=0.13.3" \ --replace "limiter~=0.1.2" "limiter>=0.1.2" \ --replace "requests~=2.26.0" "requests>=2.26.0" ''; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + dataclasses-json + responses + limiter + ]; + + # Tests requires an API token + doCheck = false; + pythonImportsCheck = [ "spyse" ]; @@ -57,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for spyse.com API"; homepage = "https://github.com/spyse-com/spyse-python"; + changelog = "https://github.com/spyse-com/spyse-python/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/spython/default.nix b/nixpkgs/pkgs/development/python-modules/spython/default.nix new file mode 100644 index 000000000000..e5a2fdf161c8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/spython/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "spython"; + version = "0.3.12"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "singularityhub"; + repo = "singularity-cli"; + rev = "refs/tags/${version}"; + hash = "sha256-fRtqOpDgVMYlVDwbPkrnpd7PT4fV+2WS6RmpJoxaKdQ="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "spython" + ]; + + disabledTests = [ + # Assertion errors + "test_has_no_instances" + "test_check_install" + "test_check_get_singularity_version" + ]; + + disabledTestPaths = [ + # Tests are looking for something that doesn't exist + "spython/tests/test_client.py" + ]; + + meta = with lib; { + description = "Streamlined singularity python client (spython) for singularity"; + homepage = "https://github.com/singularityhub/singularity-cli"; + changelog = "https://github.com/singularityhub/singularity-cli/blob/${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 84b42ad27f2f..9fd3c75adcc6 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder # runtime @@ -48,6 +49,12 @@ buildPythonPackage rec { patches = [ ./skip-database-tests.patch + + (fetchpatch { + # sqlalchemy 2.0.22+ compat; https://github.com/kvesteri/sqlalchemy-utils/pull/725 + url = "https://github.com/kvesteri/sqlalchemy-utils/commit/712aabaefc5c8ca3680751c705cf5a5984c74af1.patch"; + hash = "sha256-xBdiUtFWjlUhBzHgGFbaKBt3at6NDo+mv9sd8WwiPOA="; + }) ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index 9ea29db26c8d..edee5d1d4414 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.21"; + version = "2.0.25"; 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-ldBn+pdZfqnBKdYkOcG47ScH/hBgeJBeIvn1hCIBw/A="; + hash = "sha256-nfkYzLpWyNXDuRUJl5pzaedw5v7jHpG7kpmr6VTGUaw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix b/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix index 76c6027fca4b..f02a32d0f64f 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix @@ -1,41 +1,56 @@ { lib , buildPythonPackage +, duckdb , fetchFromGitHub -, pythonOlder , pytestCheckHook , python-dateutil -, duckdb +, pythonOlder +, setuptools , setuptools-scm }: + buildPythonPackage rec { pname = "sqlglot"; - version = "17.14.2"; - format = "setuptools"; + version = "20.9.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { repo = "sqlglot"; owner = "tobymao"; - rev = "v${version}"; - hash = "sha256-aImshQ5jf0k62ucpK4X8G7uHGAFQkhGgjMYo4mvSvew="; + rev = "refs/tags/v${version}"; + hash = "sha256-4czhmAJUDRj0x8dCmIXg5BQ1Uvie5vx+UtWdSSY5mnM="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - # optional dependency used in the sqlglot optimizer - propagatedBuildInputs = [ python-dateutil ]; + propagatedBuildInputs = [ + # Optional dependency used in the sqlglot optimizer + python-dateutil + ]; - nativeCheckInputs = [ pytestCheckHook duckdb ]; + nativeCheckInputs = [ + pytestCheckHook + duckdb + ]; - # these integration tests assume a running Spark instance - disabledTestPaths = [ "tests/dataframe/integration" ]; + disabledTestPaths = [ + # These integration tests assume a running Spark instance + "tests/dataframe/integration" + ]; - pythonImportsCheck = [ "sqlglot" ]; + pythonImportsCheck = [ + "sqlglot" + ]; meta = with lib; { description = "A no dependency Python SQL parser, transpiler, and optimizer"; homepage = "https://github.com/tobymao/sqlglot"; + changelog = "https://github.com/tobymao/sqlglot/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 465346926576..d2bdaa146789 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jbsgTuNuV8Ej/1DwQjRRdN/SYvPtCgRO2NclE3lHK6E="; + hash = "sha256-DypzKg8ajqevVFDoeEW6Mj82x90U9OUb7dgIhp+KyZg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/starlette-wtf/default.nix b/nixpkgs/pkgs/development/python-modules/starlette-wtf/default.nix index 113c1442a99e..3ca744a71f2f 100644 --- a/nixpkgs/pkgs/development/python-modules/starlette-wtf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/starlette-wtf/default.nix @@ -6,6 +6,8 @@ , python-multipart , starlette , wtforms +, httpx +, jinja2 , pytestCheckHook }: @@ -33,6 +35,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + httpx + jinja2 ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 137bd59c703c..4f248044cc7f 100644 --- a/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -1,37 +1,42 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub + +# build-system , hatchling -# runtime -, ApplicationServices +# dependencies , anyio +, typing-extensions + +# optional dependencies , itsdangerous , jinja2 , python-multipart , pyyaml , httpx -, typing-extensions # tests , pytestCheckHook , pythonOlder , trio + +# reverse dependencies +, fastapi }: buildPythonPackage rec { pname = "starlette"; - version = "0.32.0.post1"; - format = "pyproject"; + version = "0.35.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1twyN3fSlxwfDtyqaFFuCAVehLZ8vCV4voCT7CVSEbk="; + hash = "sha256-ynT1KowVJ1QdKLSOXYWVe5Q/PrYEWQDUbj395ebfk6Y="; }; nativeBuildInputs = [ @@ -40,38 +45,37 @@ buildPythonPackage rec { propagatedBuildInputs = [ anyio + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions + ]; + + passthru.optional-dependencies.full = [ itsdangerous jinja2 python-multipart pyyaml httpx - ] ++ lib.optionals (pythonOlder "3.10") [ - typing-extensions - ] ++ lib.optionals stdenv.isDarwin [ - ApplicationServices ]; nativeCheckInputs = [ pytestCheckHook trio typing-extensions - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" "-W" "ignore::trio.TrioDeprecationWarning" ]; - disabledTests = [ - # asserts fail due to inclusion of br in Accept-Encoding - "test_websocket_headers" - "test_request_headers" - ]; - pythonImportsCheck = [ "starlette" ]; + passthru.tests = { + inherit fastapi; + }; + meta = with lib; { changelog = "https://github.com/encode/starlette/releases/tag/${version}"; downloadPage = "https://github.com/encode/starlette"; diff --git a/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix b/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix index 443dc56aee11..677d282f0653 100644 --- a/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "stdlibs"; - version = "2023.12.15"; + version = "2024.1.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "omnilib"; repo = "stdlibs"; rev = "refs/tags/v${version}"; - hash = "sha256-1Av10FNJkCC2XGNx1LDqd0GwiNPIDPXPFatW8+2XoaI="; + hash = "sha256-xf46ih7viVUKNIT1tLs5MQPNjNtQlQ2N9BJIGPt4Srk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/stem/default.nix b/nixpkgs/pkgs/development/python-modules/stem/default.nix index 8cd6ff3f3d6e..a3ed8cb819a2 100644 --- a/nixpkgs/pkgs/development/python-modules/stem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stem/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "stem"; - version = "1.8.2"; + version = "1.8.3-unstable-2024-02-11"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "torproject"; repo = "stem"; - rev = "refs/tags/${version}"; - hash = "sha256-9BXeE/sVa13jr8G060aWjc49zgDVBhjaR6nt4lSxc0g="; + rev = "9f1fa4ac53cf83a4cdd7155cc487212bf8bc08af"; + hash = "sha256-AMyF4ir9Utb91dp1Swheyw1zQH6ZvgyW9kFp1g9JoQQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/stravalib/default.nix b/nixpkgs/pkgs/development/python-modules/stravalib/default.nix index df64dbebab50..a87f18b929e4 100644 --- a/nixpkgs/pkgs/development/python-modules/stravalib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stravalib/default.nix @@ -1,57 +1,62 @@ { lib -, buildPythonPackage -, fetchPypi -, nose -, setuptools -, setuptools-scm -, wheel , arrow -, requests -, units +, buildPythonPackage +, fetchFromGitHub , pint -, pydantic +, pydantic_1 # use pydantic 2 on next release +, pythonOlder , pytz -, six +, requests +, responses +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "stravalib"; - version = "1.5"; - format = "pyproject"; + version = "1.6"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-OEdMRg3KjUrXt/CgJgsUqa/sVFAE0JONNZg5MBKtxmY="; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "stravalib"; + repo = "stravalib"; + rev = "refs/tags/v${version}"; + hash = "sha256-U+QlSrijvT77/m+yjhFxbcVTQe51J+PR4Kc8N+qG+wI="; }; + postPatch = '' + # Remove on next release + sed -i 's/pydantic==1.10.9/pydantic/' pyproject.toml + ''; + nativeBuildInputs = [ setuptools setuptools-scm - wheel - ]; - - nativeCheckInputs = [ - nose ]; propagatedBuildInputs = [ arrow - requests - units pint - pydantic + pydantic_1 pytz - six + requests + responses ]; - # tests require network access - # testing strava api + # Tests require network access, testing strava API doCheck = false; + pythonImportsCheck = [ + "stravalib" + ]; + meta = with lib; { description = "Python library for interacting with Strava v3 REST API"; homepage = "https://github.com/stravalib/stravalib"; + changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ sikmir ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix b/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix index 194d942669ad..8cdffc96759f 100644 --- a/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.215.1"; + version = "0.217.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -51,7 +51,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-7jWG9bk7NN3BhpzS2fi7OkAsxL0446hnqiNqhwiBGHc="; + hash = "sha256-Rorbqh/YwBlrkVgS7rV5vb4n773V/EmGAMGP0fuF6V4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/strct/default.nix b/nixpkgs/pkgs/development/python-modules/strct/default.nix index 7244002d4169..061e2a90c07c 100644 --- a/nixpkgs/pkgs/development/python-modules/strct/default.nix +++ b/nixpkgs/pkgs/development/python-modules/strct/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage , setuptools , pytestCheckHook @@ -18,11 +19,24 @@ buildPythonPackage rec { hash = "sha256-ctafvdfSOdp7tlCUYg7d5XTXR1qBcWvOVtGtNUnhYIw="; }; + patches = [ + # https://github.com/shaypal5/strct/pull/4 + (fetchpatch { + name = "fix-versioneer-on-python312.patch"; + url = "https://github.com/shaypal5/strct/commit/a1e5b6ca9045b52efdfdbb3c82e12a01e251d41b.patch"; + hash = "sha256-xXADCSIhq1ARny2twzrhR1J8LkMFWFl6tmGxrM8RvkU="; + }) + ]; + postPatch = '' substituteInPlace pytest.ini \ --replace \ "--cov" \ "#--cov" + + # configure correct version, which fails due to missing .git + substituteInPlace versioneer.py strct/_version.py \ + --replace '"0+unknown"' '"${version}"' ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/strenum/default.nix b/nixpkgs/pkgs/development/python-modules/strenum/default.nix index b7d2661ce2c8..b3ae130af270 100644 --- a/nixpkgs/pkgs/development/python-modules/strenum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/strenum/default.nix @@ -1,14 +1,16 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "strenum"; version = "0.4.15"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +21,15 @@ buildPythonPackage rec { hash = "sha256-LrDLIWiV/zIbl7CwKh7DAy4LoLyY7+hfUu8nqduclnA="; }; + patches = [ + # Replace SafeConfigParser and readfp, https://github.com/milanmeu/aioaseko/pull/6 + (fetchpatch { + name = "replace-safeconfigparser.patch"; + url = "https://github.com/irgeek/StrEnum/commit/896bef1b7e4a50c8b53d90c8d2fb5c0164f08ecd.patch"; + hash = "sha256-dmmEzhy17huclo1wOubpBUDc2L7vqEU5b/6a5loM47A="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" @@ -26,6 +37,10 @@ buildPythonPackage rec { --replace " --cov=strenum --cov-report term-missing --black --pylint" "" ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,7 +50,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "MOdule for enum that inherits from str"; + description = "Module for enum that inherits from str"; homepage = "https://github.com/irgeek/StrEnum"; changelog = "https://github.com/irgeek/StrEnum/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/nixpkgs/pkgs/development/python-modules/stupidartnet/default.nix b/nixpkgs/pkgs/development/python-modules/stupidartnet/default.nix new file mode 100644 index 000000000000..6092682d2afe --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/stupidartnet/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "stupidartnet"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "cpvalente"; + repo = "stupidArtnet"; + rev = "refs/tags/${version}"; + hash = "sha256-2LfK63FJcdnXfDLuUzYNlspj1jmtw00S6el49cH+RRM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "stupidArtnet" + ]; + + meta = with lib; { + description = "Library implementation of the Art-Net protocol"; + homepage = "https://github.com/cpvalente/stupidArtnet"; + changelog = "https://github.com/cpvalente/stupidArtnet/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/nixpkgs/pkgs/development/python-modules/subarulink/default.nix index 603acb73884b..9eeb7e99aaa0 100644 --- a/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.9"; + version = "0.7.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dRhZWV58tHoGpJ2bDWFov1timTHYnqTPILySauutyzg="; + hash = "sha256-OKZ55J294I3wPo2vL+wuMMCA4N1ejgtquA8Bf7wPiIs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix b/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix index d52180a3d0c4..7955ed3d8d89 100644 --- a/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix @@ -7,6 +7,8 @@ , pbr , python-dateutil , stestr +, testresources +, testscenarios }: buildPythonPackage rec { @@ -29,6 +31,8 @@ buildPythonPackage rec { mock oslo-concurrency stestr + testresources + testscenarios ]; checkPhase = '' @@ -52,5 +56,7 @@ buildPythonPackage rec { homepage = "https://opendev.org/opendev/subunit2sql"; license = licenses.asl20; maintainers = teams.openstack.members; + # version 1.10.0 is incomptaible with oslo-db 14.0.0 + broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sudachidict/default.nix b/nixpkgs/pkgs/development/python-modules/sudachidict/default.nix index 72826908612c..41a359110474 100644 --- a/nixpkgs/pkgs/development/python-modules/sudachidict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sudachidict/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , sudachidict , setuptools +, sudachipy }: buildPythonPackage rec { @@ -33,6 +34,10 @@ buildPythonPackage rec { setuptools ]; + propagatedBuildInputs = [ + sudachipy + ]; + # we need to prepare some files before the build # https://github.com/WorksApplications/SudachiDict/blob/develop/package_python.sh preBuild = '' diff --git a/nixpkgs/pkgs/development/python-modules/sudachipy/default.nix b/nixpkgs/pkgs/development/python-modules/sudachipy/default.nix index bfaf9be85846..3e3bd5b4adf6 100644 --- a/nixpkgs/pkgs/development/python-modules/sudachipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sudachipy/default.nix @@ -10,6 +10,7 @@ , pytestCheckHook , sudachidict-core , tokenizers +, sudachipy }: buildPythonPackage rec { @@ -19,7 +20,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Am+ae2lgnndSDzf0GF8R1i6OPLdIlm2dLThqYqXbscA="; + hash = "sha256-ARwvThfATDdzBTjPFr9yjbE/0eYvp/TCZOEGbUupJmU="; }; nativeBuildInputs = [ @@ -37,6 +38,9 @@ buildPythonPackage rec { cd python ''; + # avoid infinite recursion due to sudachidict + doCheck = false; + nativeCheckInputs = [ pytestCheckHook sudachidict-core @@ -47,6 +51,20 @@ buildPythonPackage rec { "sudachipy" ]; + passthru = { + inherit (sudachi-rs) updateScript; + tests = { + pytest = sudachipy.overridePythonAttrs ( + _: { + doCheck = true; + # avoid catchConflicts of sudachipy + # we don't need to install this package since it is just a test + dontInstall = true; + } + ); + }; + }; + meta = sudachi-rs.meta // { homepage = "https://github.com/WorksApplications/sudachi.rs/tree/develop/python"; mainProgram = "sudachipy"; diff --git a/nixpkgs/pkgs/development/python-modules/summarytools/default.nix b/nixpkgs/pkgs/development/python-modules/summarytools/default.nix index a46cf5080c7c..4bbbae78c88b 100644 --- a/nixpkgs/pkgs/development/python-modules/summarytools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/summarytools/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , ipython , matplotlib , numpy @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "summarytools"; version = "0.2.3"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,6 +23,8 @@ buildPythonPackage rec { hash = "sha256-wsDf9IXCMQe0cVfQQuRVwMhxkhhUxbPu06yWZPLvgw4="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ ipython matplotlib diff --git a/nixpkgs/pkgs/development/python-modules/sv-ttk/default.nix b/nixpkgs/pkgs/development/python-modules/sv-ttk/default.nix index 660d32a6735c..a5518b094431 100644 --- a/nixpkgs/pkgs/development/python-modules/sv-ttk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sv-ttk/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, tkinter }: buildPythonPackage rec { @@ -20,6 +21,10 @@ buildPythonPackage rec { # No tests available doCheck = false; + propagatedBuildInputs = [ + tkinter + ]; + pythonImportsCheck = [ "sv_ttk" ]; diff --git a/nixpkgs/pkgs/development/python-modules/svg-py/default.nix b/nixpkgs/pkgs/development/python-modules/svg-py/default.nix new file mode 100644 index 000000000000..f2971a0b4144 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/svg-py/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pytestCheckHook +, pythonOlder +, pyyaml +}: + +buildPythonPackage rec { + pname = "svg-py"; + version = "1.4.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "orsinium-labs"; + repo = "svg.py"; + rev = "refs/tags/${version}"; + hash = "sha256-GbXPDYDq6zlsPJ/PAjR6OvarVrp7x3LGhseyTMwY8Dg="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + pythonImportsCheck = [ + "svg" + ]; + + disabledTestPaths = [ + # Tests need additional files + "tests/test_attributes.py" + ]; + + meta = with lib; { + description = "Type-safe Python library to generate SVG files"; + homepage = "https://github.com/orsinium-labs/svg.py"; + changelog = "https://github.com/orsinium-labs/svg.py/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix b/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix index 257a901aa720..7e24071c9c7c 100644 --- a/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "svg2tikz"; - version = "3.0.0"; + version = "3.0.1"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "xyz2tex"; repo = "svg2tikz"; rev = "refs/tags/v${version}"; - hash = "sha256-YnWkj4xvjGzpKQv+H+spage+dy+fC9fJkqsOaQ6C1Ho="; + hash = "sha256-hvGvJFxhu7llj+tFfZvz12dZ8QYjY7zcLzB5S44l+IM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/svgutils/default.nix b/nixpkgs/pkgs/development/python-modules/svgutils/default.nix new file mode 100644 index 000000000000..ea2c7c547e43 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/svgutils/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, lxml +, matplotlib +, pytestCheckHook +, nose +}: + +buildPythonPackage rec { + pname = "svgutils"; + version = "0.3.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "btel"; + repo = "svg_utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-ITvZx+3HMbTyaRmCb7tR0LKqCxGjqDdV9/2taziUD0c="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + lxml + matplotlib + ]; + + nativeCheckInputs = [ pytestCheckHook nose ]; + + pythonImportsCheck = [ "svgutils" ]; + + meta = with lib; { + description = "Python tools to create and manipulate SVG files"; + homepage = "https://github.com/btel/svg_utils"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/switchbot-api/default.nix b/nixpkgs/pkgs/development/python-modules/switchbot-api/default.nix new file mode 100644 index 000000000000..32df6d5185ca --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/switchbot-api/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "switchbot-api"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "SeraphicCorp"; + repo = "py-switchbot-api"; + rev = "refs/tags/v${version}"; + hash = "sha256-QM8oVfd+hdVNdhOgI3ujyY82Im0Yr5Nl+OcqzEtZ7XE="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck= false; + + pythonImportsCheck = [ + "switchbot_api" + ]; + + meta = with lib; { + description = "An asynchronous library to use Switchbot API"; + homepage = "https://github.com/SeraphicCorp/py-switchbot-api"; + changelog = "https://github.com/SeraphicCorp/py-switchbot-api/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/synologydsm-api/default.nix b/nixpkgs/pkgs/development/python-modules/synologydsm-api/default.nix index e86361979c1b..52dc544acb4d 100644 --- a/nixpkgs/pkgs/development/python-modules/synologydsm-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/synologydsm-api/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , fetchpatch , poetry-core +, pythonRelaxDepsHook , requests , urllib3 , pytestCheckHook @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "synologydsm-api"; version = "1.0.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = "synologydsm-api"; rev = "v${version}"; - sha256 = "0gyahf1x6i6j9pslh1y3pyh3si5jvxb06r1w761b9gsxyk14y1si"; + hash = "sha256-UQdPwvRdv7SCOTxkA1bfskQ9oL/DB0j1TdJE04ODyj8="; }; patches = [ @@ -29,12 +30,17 @@ buildPythonPackage rec { (fetchpatch { name = "switch-to-poetry-core.patch"; url = "https://github.com/hacf-fr/synologydsm-api/commit/f1ea2be927388bdff6d43d09027b82a854635e34.patch"; - sha256 = "120pdgp2i4ds6y3rf9j372f9zdcf4y8rsgl1xjbkgdhkp76bkkgr"; + hash = "sha256-+c25zLkTtjeX7IE+nZEnjrWfnDhDJpeHN7qRKO5rF4g="; }) ]; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "urllib3" ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tabcmd/default.nix b/nixpkgs/pkgs/development/python-modules/tabcmd/default.nix index 617968006843..3958ace5aacf 100644 --- a/nixpkgs/pkgs/development/python-modules/tabcmd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tabcmd/default.nix @@ -1,39 +1,69 @@ { lib +, appdirs +, argparse , buildPythonPackage -, python3 -, pythonOlder +, doit , fetchPypi , ftfy -, appdirs +, mock +, pyinstaller-versionfile +, pytestCheckHook +, python3 +, pythonOlder , requests +, pythonRelaxDepsHook +, setuptools , setuptools-scm -, types-mock +, tableauserverclient , types-appdirs +, types-mock , types-requests , types-setuptools -, argparse -, doit -, pyinstaller-versionfile -, tableauserverclient -, pytestCheckHook -, mock +, urllib3 }: buildPythonPackage rec { pname = "tabcmd"; version = "2.0.12"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nsQJWDzSzSc1WRk5TBl/E7Mpfk8wGD1CsETAWILKxCM="; + hash = "sha256-nsQJWDzSzSc1WRk5TBl/E7Mpfk8wGD1CsETAWILKxCM="; }; - propagatedBuildInputs = [ ftfy appdirs requests setuptools-scm types-mock types-appdirs argparse doit pyinstaller-versionfile types-requests types-setuptools tableauserverclient ]; + pythonRelaxDeps = [ + "tableauserverclient" + "urllib3" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + + propagatedBuildInputs = [ + appdirs + argparse + doit + ftfy + pyinstaller-versionfile + requests + setuptools-scm + tableauserverclient + types-appdirs + types-mock + types-requests + types-setuptools + urllib3 + ]; - nativeCheckInputs = [ pytestCheckHook mock ]; + nativeCheckInputs = [ + mock + pytestCheckHook + ]; # Remove an unneeded dependency that can't be resolved prePatch = '' @@ -58,10 +88,11 @@ buildPythonPackage rec { ''; - meta = { + meta = with lib; { description = "A command line client for working with Tableau Server."; - homepage = "https://pypi.org/project/tabcmd/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + homepage = "https://github.com/tableau/tabcmd"; + changelog = "https://github.com/tableau/tabcmd/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix b/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix index 76a028fe2fc0..3ddf8c9a2d15 100644 --- a/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix @@ -1,26 +1,44 @@ { lib , buildPythonPackage -, fetchPypi , defusedxml -, requests +, fetchPypi , packaging -, requests-mock , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, requests +, requests-mock +, setuptools +, versioneer }: buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.29"; - format = "setuptools"; + version = "0.30"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FVJeKt1+qL4XuxFNqhWRtCJu5yEmcP/RLeQQyXndU0c="; + hash = "sha256-MIE6V84xLEbgmTwvP6jQC0H//gBnMTO1sowL1HIMbpQ="; }; + postPatch = '' + # Remove vendorized versioneer + rm versioneer.py + ''; + + pythonRelaxDeps = [ + "urllib3" + ]; + + nativeBuildInputs = [ + setuptools + pythonRelaxDepsHook + versioneer + ]; + propagatedBuildInputs = [ defusedxml requests diff --git a/nixpkgs/pkgs/development/python-modules/tables/default.nix b/nixpkgs/pkgs/development/python-modules/tables/default.nix index 56cb2898bf1f..fd034b209133 100644 --- a/nixpkgs/pkgs/development/python-modules/tables/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tables/default.nix @@ -1,6 +1,5 @@ { lib , fetchPypi -, fetchpatch , buildPythonPackage , pythonOlder , blosc2 @@ -23,7 +22,7 @@ buildPythonPackage rec { pname = "tables"; version = "3.9.2"; - pyproject = true; + format = "setuptools"; disabled = pythonOlder "3.8"; @@ -32,20 +31,6 @@ buildPythonPackage rec { hash = "sha256-1HAmPC5QxLfIY1oNmawf8vnnBMJNceX6M8RSnn0K2cM="; }; - patches = [ - (fetchpatch { - name = "numpy-1.25-compatibility.patch"; - url = "https://github.com/PyTables/PyTables/commit/337792561e5924124efd20d6fea6bbbd2428b2aa.patch"; - hash = "sha256-pz3A/jTPWXXlzr+Yl5PRUvdSAinebFsoExfek4RUHkc="; - }) - (fetchpatch { - name = "numexpr-2.8.5-compatibility.patch"; - url = "https://github.com/PyTables/PyTables/commit/1a235490ebe1a138da1139cfa19829b5f0a2af37.patch"; - includes = [ "tables/tests/test_queries.py" ]; - hash = "sha256-uMS+Z2Zcz68ILMQaBdIDMnCyasozCaCGOiGIyw0+Evc="; - }) - ]; - nativeBuildInputs = [ blosc2 cython @@ -56,6 +41,7 @@ buildPythonPackage rec { buildInputs = [ bzip2 c-blosc + blosc2.c-blosc2 hdf5 lzo ]; @@ -90,6 +76,7 @@ buildPythonPackage rec { "--lzo=${lib.getDev lzo}" "--bzip2=${lib.getDev bzip2}" "--blosc=${lib.getDev c-blosc}" + "--blosc2=${lib.getDev blosc2.c-blosc2}" ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tcxreader/default.nix b/nixpkgs/pkgs/development/python-modules/tcxreader/default.nix index 1334708fc7f7..7509b02e94e2 100644 --- a/nixpkgs/pkgs/development/python-modules/tcxreader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tcxreader/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tcxreader"; - version = "0.4.6"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "alenrajsp"; repo = "tcxreader"; rev = "refs/tags/v${version}"; - hash = "sha256-J7yzJfJr2EK/0hZLVgk+Poqr/vY/9bsgA6cePTQ45U0="; + hash = "sha256-N/YsH1P8F9bSuzTgrYNU6xEO/yldXNIXMN0pQgIesfc="; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "A reader for Garmin’s TCX file format"; homepage = "https://github.com/alenrajsp/tcxreader"; + changelog = "https://github.com/alenrajsp/tcxreader/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/telegram-text/default.nix b/nixpkgs/pkgs/development/python-modules/telegram-text/default.nix index b79cd78bf4b9..ca37dde8fb86 100644 --- a/nixpkgs/pkgs/development/python-modules/telegram-text/default.nix +++ b/nixpkgs/pkgs/development/python-modules/telegram-text/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "telegram-text"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "SKY-ALIN"; repo = "telegram-text"; - rev = "v${version}"; - hash = "sha256-p8SVQq7IvkVuOFE8VDugROLY5Wk0L2HmXyacTzFFSP4="; + rev = "refs/tags/v${version}"; + hash = "sha256-eUy4kyCmM/5Ag/0s9hYW2IIg+OTX2L7EsoOYivhd0pU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/templateflow/default.nix b/nixpkgs/pkgs/development/python-modules/templateflow/default.nix new file mode 100644 index 000000000000..c879b7064d0f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/templateflow/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools-scm +, nipreps-versions +, pybids +, requests +, tqdm +}: + +buildPythonPackage rec { + pname = "templateflow"; + version = "23.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "templateflow"; + repo = "python-client"; + rev = "refs/tags/${version}"; + hash = "sha256-8AdXC1IFGfYZ5cvCAyBz0tD3zia+KBILX0tL9IcO2NA="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ + nipreps-versions + pybids + requests + tqdm + ]; + + doCheck = false; # most tests try to download data + #pythonImportsCheck = [ "templateflow" ]; # touches $HOME/.cache, hence needs https://github.com/NixOS/nixpkgs/pull/120300 + + meta = with lib; { + homepage = "https://templateflow.org/python-client"; + description = "Python API to query TemplateFlow via pyBIDS"; + changelog = "https://github.com/templateflow/python-client/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tensordict/default.nix b/nixpkgs/pkgs/development/python-modules/tensordict/default.nix new file mode 100644 index 000000000000..1c5bad17e8a0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tensordict/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, torch +, wheel +, which +, cloudpickle +, numpy +, h5py +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tensordict"; + version = "0.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "tensordict"; + rev = "refs/tags/v${version}"; + hash = "sha256-XTFUzPs/fqX3DPtu/qSE1hY+7r/HToPVPaTyVRzDT/E="; + }; + + nativeBuildInputs = [ + setuptools + torch + wheel + which + ]; + + propagatedBuildInputs = [ + cloudpickle + numpy + torch + ]; + + pythonImportsCheck = [ + "tensordict" + ]; + + # We have to delete the source because otherwise it is used instead of the installed package. + preCheck = '' + rm -rf tensordict + ''; + + nativeCheckInputs = [ + h5py + pytestCheckHook + ]; + + meta = with lib; { + description = "A pytorch dedicated tensor container"; + changelog = "https://github.com/pytorch/tensordict/releases/tag/v${version}"; + homepage = "https://github.com/pytorch/tensordict"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix b/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix index 5e8631062394..7ad175d70077 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorstore/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , lib +, ml-dtypes , numpy , python , stdenv @@ -14,15 +15,17 @@ let "aarch64-darwin" = "macosx_11_0_arm64"; }; hashes = { - "310-x86_64-linux" = "sha256-Zuy2zBLV950CMbdtpLNpIWqnXHw2jkjrZG48eGtm42w="; - "311-x86_64-linux" = "sha256-Bg5j8QB5z8Ju4bEQsZDojJHTJ4UoQF1pkd4ma83Sc/s="; - "310-aarch64-darwin" = "sha256-6Tta4ru1TnobFa4FXWz8fm9rAxF0G09Y2Pj/KaQPVnE="; - "311-aarch64-darwin" = "sha256-Sb0tv9ZPQJ4n9b0ybpjJWpreQPZvSC5Sd7CXuUwHCn0="; + "310-x86_64-linux" = "sha256-1b6w9wgT6fffTTpJ3MxdPSrFD7Xaby6prQYFljVn4x4="; + "311-x86_64-linux" = "sha256-8+HlzaxH30gB5N+ZKR0Oq+yswhq5gjiSF9jVsg8U22E="; + "312-x86_64-linux" = "sha256-e8iEQzB4D3RSXgrcPC4me/vsFKoXf1QFNZfQ7968zQE="; + "310-aarch64-darwin" = "sha256-2C60yJk/Pbx2woV7hzEmWGzNKWWnySDfTPm247PWIRA="; + "311-aarch64-darwin" = "sha256-rdLB7l/8ZYjV589qKtORiyu1rC7W30wzrsz1uihNRpk="; + "312-aarch64-darwin" = "sha256-DpbYMIbqceQeiL7PYwnvn9jLtv8EmfHXmxvPfZCw914="; }; in buildPythonPackage rec { pname = "tensorstore"; - version = "0.1.40"; + version = "0.1.53"; format = "wheel"; # The source build involves some wonky Bazel stuff. @@ -38,7 +41,10 @@ buildPythonPackage rec { nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + ml-dtypes + numpy + ]; pythonImportsCheck = [ "tensorstore" ]; diff --git a/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix b/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix new file mode 100644 index 000000000000..9d498f37ecbc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +, aiohttp +}: + +buildPythonPackage rec { + pname = "tesla-fleet-api"; + version = "0.4.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "Teslemetry"; + repo = "python-tesla-fleet-api"; + rev = "refs/tags/v${version}"; + hash = "sha256-iKA2PuKEytF9ko4D+eHf+Nu+MzRDytz9Kc0zAPyOQ88="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck =false; + + pythonImportsCheck = [ + "tesla_fleet_api" + ]; + + meta = with lib; { + description = "Python library for Tesla Fleet API and Teslemetry"; + homepage = "https://github.com/Teslemetry/python-tesla-fleet-api"; + changelog = "https://github.com/Teslemetry/python-tesla-fleet-api/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tesla-powerwall/default.nix b/nixpkgs/pkgs/development/python-modules/tesla-powerwall/default.nix index 1feefef49b6f..fcdab982a02d 100644 --- a/nixpkgs/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -3,14 +3,16 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder -, requests -, responses +, aiohttp +, urllib3 +, orjson +, aresponses , setuptools }: buildPythonPackage rec { pname = "tesla-powerwall"; - version = "0.4.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +21,7 @@ buildPythonPackage rec { owner = "jrester"; repo = "tesla_powerwall"; rev = "refs/tags/v${version}"; - hash = "sha256-IqUxWwEvrSEbLAEnHG84oCV75qO0L5LmgpHOfaM6G8o="; + hash = "sha256-if/FCfxAB48WGXZOMvCtdSOW2FWO43OrlcHZbXIPmGE="; }; nativeBuildInputs = [ @@ -27,12 +29,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - requests + aiohttp + urllib3 + orjson ]; nativeCheckInputs = [ + aresponses pytestCheckHook - responses ]; pytestFlagsArray = [ diff --git a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 0c2b87bade1c..6113762d77a2 100644 --- a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.9"; + version = "3.9.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9ySUgRz1Zp0tkHCEkDcygm97mji4mjA5ltrriP9zAiQ="; + hash = "sha256-DNac9rrHJkFWlYRLvDB49kjmJV2EMvs5Y2ndSGY7uvk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/testbook/default.nix b/nixpkgs/pkgs/development/python-modules/testbook/default.nix index 4b49755bf891..331a7b61160c 100644 --- a/nixpkgs/pkgs/development/python-modules/testbook/default.nix +++ b/nixpkgs/pkgs/development/python-modules/testbook/default.nix @@ -7,6 +7,7 @@ , ipykernel , pandas , pytestCheckHook +, setuptools , traitlets }: @@ -29,6 +30,10 @@ buildPythonPackage rec { nbformat ]; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ ipykernel pandas diff --git a/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix b/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix index 8d240fe19e3e..1297ef2895c1 100644 --- a/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "thefuzz"; - version = "0.20.0"; + version = "0.22.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ol5JeGscRgPH/G4taea8ZgmCopGWmLU2/4NU4GMcxA0="; + hash = "sha256-cTgDmn7PVA2jI3kthZLvmQKx1563jBR9TyBmTeefNoA="; }; propagatedBuildInputs = [ levenshtein ]; diff --git a/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix b/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix index b03038c4aa5f..573047f99fe8 100644 --- a/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermopro-ble"; - version = "0.5.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4lk/K9XW9naPDRXmuqKFBdOwMtLlQE8etJFEbNgfIvA="; + hash = "sha256-xaRbp9XLCDGJ0NE0TzJygn2OzqvSFszs97vGHawCkzU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tilequant/default.nix b/nixpkgs/pkgs/development/python-modules/tilequant/default.nix index fe4a748fa238..220f40354dcc 100644 --- a/nixpkgs/pkgs/development/python-modules/tilequant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tilequant/default.nix @@ -4,6 +4,7 @@ , click , ordered-set , pythonOlder +, pythonRelaxDepsHook , pillow , sortedcollections , setuptools_dso @@ -21,6 +22,14 @@ buildPythonPackage rec { hash = "sha256-uW1g3nlT6Y+1beifo/MOlGxsGL7on/jcAROxSddySHk="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pillow" + ]; + propagatedBuildInputs = [ click ordered-set diff --git a/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix b/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix index a0a72de7bb17..c39b04cd3fe7 100644 --- a/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.2.0"; - format = "pyproject"; + version = "6.4.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jannikmi"; - repo = pname; + repo = "timezonefinder"; rev = "refs/tags/${version}"; - hash = "sha256-n6TcTezu5seKy34KDlzGikAVaqAud00gxywwJA3MaWM="; + hash = "sha256-e9Zx236X76GYFuADCw9+5HWs2craeq44gVNclkc4th0="; }; nativeBuildInputs = [ @@ -42,11 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'numpy = "^1.22"' 'numpy = "*"' - ''; - pythonImportsCheck = [ "timezonefinder" ]; diff --git a/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix b/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix index 497d10d84fe8..0805ee9dea39 100644 --- a/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix @@ -2,14 +2,16 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "token-bucket"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,11 +22,24 @@ buildPythonPackage rec { hash = "sha256-dazqJRpC8FUHOhgKFzDnIl5CT2L74J2o2Hsm0IQf4Cg="; }; + patches = [ + # Replace imp with importlib, https://github.com/falconry/token-bucket/pull/24 + (fetchpatch { + name = "remove-imp.patch"; + url = "https://github.com/falconry/token-bucket/commit/10a3c9f4de00f4933349f66b4c72b6c96db6e766.patch"; + hash = "sha256-Hk5+i3xzeA3F1kXRaRarWT9mff2lT2WNmTfTZvYzGYI="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner'" "" ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/torch/bin.nix b/nixpkgs/pkgs/development/python-modules/torch/bin.nix index 9b12470cdde8..bea1769439a0 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/bin.nix +++ b/nixpkgs/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.1.2"; + version = "2.2.0"; in buildPythonPackage { inherit version; @@ -47,6 +47,17 @@ in buildPythonPackage { # $out/${sitePackages}/nvfuser/_C*.so wants libnvToolsExt.so.1 but torch/lib only ships # libnvToolsExt-$hash.so.1 cuda_nvtx + + cuda_cudart + cuda_cupti + cuda_nvrtc + cudnn + libcublas + libcufft + libcurand + libcusolver + libcusparse + nccl ]); autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.isLinux [ @@ -79,18 +90,6 @@ in buildPythonPackage { postFixup = lib.optionalString stdenv.isLinux '' addAutoPatchelfSearchPath "$out/${python.sitePackages}/torch/lib" - - patchelf $out/${python.sitePackages}/torch/lib/libcudnn.so.8 --add-needed libcudnn_cnn_infer.so.8 - - pushd $out/${python.sitePackages}/torch/lib || exit 1 - for LIBNVRTC in ./libnvrtc* - do - case "$LIBNVRTC" in - ./libnvrtc-builtins*) true;; - ./libnvrtc*) patchelf "$LIBNVRTC" --add-needed libnvrtc-builtins* ;; - esac - done - popd || exit 1 ''; # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. @@ -106,7 +105,7 @@ in buildPythonPackage { # https://docs.nvidia.com/cuda/eula/index.html # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html # torch's license is BSD3. - # torch-bin includes CUDA and MKL binaries, therefore unfreeRedistributable is set. + # torch-bin used to vendor CUDA. It still links against CUDA and MKL. license = with licenses; [ bsd3 issl unfreeRedistributable ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix b/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix index b22d01262065..ef4386142900 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/nixpkgs/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.1.2" = { + "2.2.0" = { x86_64-linux-38 = { - name = "torch-2.1.2-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-2qF5u1WPePIWXbl0pnROyN4upx62qvNiva52FgEsAwI="; + 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="; }; x86_64-linux-39 = { - name = "torch-2.1.2-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-6q9pB+NyPAymqR314Bp+74yr7JMSDppQc59aXxSiqkY="; + 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="; }; x86_64-linux-310 = { - name = "torch-2.1.2-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-shhLdynvO5sQBlwHSjfB5gP9mfkeODduJct+1uHVRpY="; + 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="; }; x86_64-linux-311 = { - name = "torch-2.1.2-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-ygXK6TNFBNGQPhbFDd8EUymoWdWxon7S3B1Y7QZt9vo="; + 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="; }; x86_64-darwin-38 = { - name = "torch-2.1.2-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-jiId7M0N72wrrf9r5APgxTSRgF7ZkV4sAprbzbh6trU="; + 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="; }; x86_64-darwin-39 = { - name = "torch-2.1.2-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-aYTNUFfAyXezyXVyVOmJ0/EST0zp0HyqbLY3eDxx1Co="; + 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="; }; x86_64-darwin-310 = { - name = "torch-2.1.2-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-none-macosx_10_9_x86_64.whl"; - hash = "sha256-2bU1ytDfPROZfb6L1orDPg465Td2OcmIGUjkB5SmFAM="; + 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="; }; x86_64-darwin-311 = { - name = "torch-2.1.2-cp311-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-none-macosx_10_9_x86_64.whl"; - hash = "sha256-dtN5Z8McmVSK0sTT8s8ZHbSEdvLmmzWgk3E3EW2jVqE="; + 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="; }; aarch64-darwin-38 = { - name = "torch-2.1.2-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-BbGFlPYKkRoMTwI/OKi9p3Ex+6X9dBvaYm6X3PWj3Qo="; + 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="; }; aarch64-darwin-39 = { - name = "torch-2.1.2-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-vBldeSf+q8DrfBEORXyVXtKrYW88fChDndQYjPWJaZ8="; + 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="; }; aarch64-darwin-310 = { - name = "torch-2.1.2-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-+aVdVa8Cgm6/ut9Om2gvDyd2a8M9+CNrSNKNcFWHho8="; + 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="; }; aarch64-darwin-311 = { - name = "torch-2.1.2-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-4tg/B7SqyYNFPqW/j5qp2s8ieKjTEkf12QN/N778YOQ="; + 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="; }; aarch64-linux-38 = { - name = "torch-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-4yJfR9ULtm91b+kZanaAVdHCawIVTrH3cM5HoleNOqc="; + 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="; }; aarch64-linux-39 = { - name = "torch-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-2TunD2ewjCrlWY7nEcvFRqG8gQLO+TiQS4yFwgiaUaA="; + 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="; }; aarch64-linux-310 = { - name = "torch-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-vvaZbCfY9ukupOE6dy2JYR2g4QO0h5DeeBMeMIz3MHY="; + 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="; }; aarch64-linux-311 = { - name = "torch-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-jzLOWRYWowME83p9XqgLacqeG5S7p/MIGEv2Fv2uoVU="; + 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="; }; }; } diff --git a/nixpkgs/pkgs/development/python-modules/torch/default.nix b/nixpkgs/pkgs/development/python-modules/torch/default.nix index 8a499d763a4a..899b692c47ed 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -21,6 +21,7 @@ Accelerate, CoreServices, libobjc, # Propagated build inputs + astunparse, fsspec, filelock, jinja2, @@ -126,8 +127,8 @@ let in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.1.2"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; disabled = pythonOlder "3.8.0"; @@ -144,7 +145,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-E/GQCRWBf3hYsDCCk0twaL9gkVOCEQeCvO3Va+jgIdE="; + hash = "sha256-FfFjgx6yrPEQlF8CLglsWq+zWGr6MD4z0F+lYoy6grc="; }; patches = lib.optionals cudaSupport [ @@ -247,6 +248,9 @@ in buildPythonPackage rec { # Also avoids pytorch exporting the headers of pybind11 USE_SYSTEM_PYBIND11 = true; + # NB technical debt: building without NNPACK as workaround for missing `six` + USE_NNPACK = 0; + preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES ${python.pythonOnBuildForHost.interpreter} setup.py build --cmake-only @@ -383,6 +387,7 @@ in buildPythonPackage rec { ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; propagatedBuildInputs = [ + astunparse cffi click numpy diff --git a/nixpkgs/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch b/nixpkgs/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch index 508118cc2e8a..45587d3fe7b9 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch +++ b/nixpkgs/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch @@ -1,19 +1,8 @@ -From aa7e7cfd5a5fe0c839406c1b197b81ef955a7ef5 Mon Sep 17 00:00:00 2001 -From: Gaetan Lepage <gaetan@glepage.com> -Date: Thu, 23 Nov 2023 00:39:26 +0100 -Subject: [PATCH] fix-cmake-cuda-toolkit - ---- - CMakeLists.txt | 4 ---- - cmake/public/cuda.cmake | 12 +++++++++--- - tools/setup_helpers/cmake.py | 2 ++ - 3 files changed, 11 insertions(+), 7 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a48eaf4e29..3aaeef2593a 100644 +index 9194e520bb0..d05fdcfb6cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1152,10 +1152,6 @@ if(BUILD_SHARED_LIBS) +@@ -1160,10 +1160,6 @@ if(BUILD_SHARED_LIBS) ${PROJECT_SOURCE_DIR}/cmake/Modules_CUDA_fix DESTINATION share/cmake/Caffe2/ COMPONENT dev) @@ -25,16 +14,16 @@ index 3a48eaf4e29..3aaeef2593a 100644 ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUSPARSELT.cmake DESTINATION share/cmake/Caffe2/ diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake -index 32f3ba375b5..c8b666e4c78 100644 +index c7595774d81..4fc43771810 100644 --- a/cmake/public/cuda.cmake +++ b/cmake/public/cuda.cmake -@@ -62,9 +62,15 @@ cmake_policy(POP) +@@ -61,9 +61,15 @@ find_package(CUDAToolkit REQUIRED) + cmake_policy(POP) - if(NOT CMAKE_CUDA_COMPILER_VERSION STREQUAL CUDAToolkit_VERSION OR - NOT CUDA_INCLUDE_DIRS STREQUAL CUDAToolkit_INCLUDE_DIR) -- message(FATAL_ERROR "Found two conflicting CUDA installs:\n" + if(NOT CMAKE_CUDA_COMPILER_VERSION VERSION_EQUAL CUDAToolkit_VERSION) +- message(FATAL_ERROR "Found two conflicting CUDA versions:\n" - "V${CMAKE_CUDA_COMPILER_VERSION} in '${CUDA_INCLUDE_DIRS}' and\n" -- "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIR}'") +- "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIRS}'") + if(CUDA_INCLUDE_DIRS IN_LIST CUDAToolkit_INCLUDE_DIR) + message(STATUS "CUDA_INCLUDE_DIRS is a substring of CUDAToolkit_INCLUDE_DIR. " + "Setting CUDA_INCLUDE_DIRS to CUDAToolkit_INCLUDE_DIR.") @@ -60,6 +49,3 @@ index fb19b66dfba..3f83bef32fe 100644 "CUDA_SEPARABLE_COMPILATION", "CUDNN_LIBRARY", "CUDNN_INCLUDE_DIR", --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix b/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix index c3567506337d..edde12213bc6 100644 --- a/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.1.2"; + version = "2.2.0"; format = "wheel"; src = diff --git a/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 964e122168f7..14b7400562c3 100644 --- a/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/nixpkgs/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.1.2" = { + "2.2.0" = { x86_64-linux-38 = { - name = "torchaudio-2.1.2-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-nptbhxqUhL5rUK687w+M8Cb5w9MLhtfEz0mHbDAwGBU="; + 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="; }; x86_64-linux-39 = { - name = "torchaudio-2.1.2-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-L1s1TSIGHHm4fdDBoIQamQVtMuqNuIIf2NZz1rB3wbI="; + 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="; }; x86_64-linux-310 = { - name = "torchaudio-2.1.2-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-HoqSB2Mei6bsve48nWbx6dQ4rWKwtNTxhAFti+idaKc="; + 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="; }; x86_64-linux-311 = { - name = "torchaudio-2.1.2-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-jFpvXk1EDXfU/KxVFV7/xGSpkGIddkinFVZ7eJWr8nU="; + 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="; }; x86_64-darwin-38 = { - name = "torchaudio-2.1.2-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-0O/QCMNd7JYrgPXc40aL0biDAc9lFSu/p/dMAAWhfok="; + 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="; }; x86_64-darwin-39 = { - name = "torchaudio-2.1.2-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-rlDc801cb3MYDPaUGV7jEZS51gkDKFdcMKWWC8cW+lI="; + 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="; }; x86_64-darwin-310 = { - name = "torchaudio-2.1.2-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-BvjAKBTmzdeGJrv0StK7ivpbOatlDGrxgyijIxFGEFg="; + 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="; }; x86_64-darwin-311 = { - name = "torchaudio-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-wQhO7fTO0a+f3RiRBpD/YV+JuuswsyAwgGVD+8bzZX4="; + 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="; }; aarch64-darwin-38 = { - name = "torchaudio-2.1.2-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-MK2XESQSWSUYlT88ws0bauFT1lY91b2eq2qXIxX+nZ4="; + 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="; }; aarch64-darwin-39 = { - name = "torchaudio-2.1.2-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-FHKcyd9S3vpnT89e1N4NZQcDjvGAErlqL1anftcGdt0="; + 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="; }; aarch64-darwin-310 = { - name = "torchaudio-2.1.2-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-nWdmc8HOTdEfyhReOmzZtOW4l8/60PYX0pBvLT/Iw6k="; + 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="; }; aarch64-darwin-311 = { - name = "torchaudio-2.1.2-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-hgrMMuZQcGPywT2B4mcYGZ4hXzSivNbJYJol6b8hqjY="; + 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="; }; aarch64-linux-38 = { - name = "torchaudio-2.1.2-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-/3FWsw6wXpEkKGwwyA2oS5PiJ9AJrblusZSJYAtFkzI="; + 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="; }; aarch64-linux-39 = { - name = "torchaudio-2.1.2-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-s7u1Mk5wXe13YW5UZZGySa51iNNaPowsTB2Yal6lHvQ="; + 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="; }; aarch64-linux-310 = { - name = "torchaudio-2.1.2-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-+CZX/E7DtHO/bHUsDuYtf1Ea+e835RQ/gznsBJUE12c="; + 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="; }; aarch64-linux-311 = { - name = "torchaudio-2.1.2-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-mmut6KJJWnJPTuastehoKP9Ag9xsfFfGOGtUoOp6/nE="; + 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="; }; }; } diff --git a/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix b/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix index 81863b4dec18..7f81a044f0eb 100644 --- a/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.1.2"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-kSBDQtOi0ZEnIg801kTtvqBAEbzaUNhWG/9jot2O3o4="; + hash = "sha256-Z6Xc8bR6bqBHyzWfoB3F33YZEwzuvXByB6s1kSer1DY="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/torchrl/default.nix b/nixpkgs/pkgs/development/python-modules/torchrl/default.nix new file mode 100644 index 000000000000..371a178ab5c9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/torchrl/default.nix @@ -0,0 +1,140 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, ninja +, setuptools +, wheel +, which +, cloudpickle +, numpy +, torch +, ale-py +, gym +, pygame +, gymnasium +, mujoco +, moviepy +, git +, hydra-core +, tensorboard +, tqdm +, wandb +, packaging +, tensordict +, imageio +, pytest-rerunfailures +, pytestCheckHook +, pyyaml +, scipy +}: + +buildPythonPackage rec { + pname = "torchrl"; + version = "0.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "rl"; + rev = "refs/tags/v${version}"; + hash = "sha256-ngl/gbNm+62W6UFNo8GOhSaIuK9FERDxGBCr++7B4gw="; + }; + + nativeBuildInputs = [ + ninja + setuptools + wheel + which + ]; + + propagatedBuildInputs = [ + cloudpickle + numpy + packaging + tensordict + torch + ]; + + passthru.optional-dependencies = { + atari = [ + ale-py + gym + pygame + ]; + gym-continuous = [ + gymnasium + mujoco + ]; + rendering = [ + moviepy + ]; + utils = [ + git + hydra-core + tensorboard + tqdm + wandb + ]; + }; + + # torchrl needs to create a folder to store datasets + preBuild = '' + export D4RL_DATASET_DIR=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "torchrl" + ]; + + # We have to delete the source because otherwise it is used instead of the installed package. + preCheck = '' + rm -rf torchrl + + export XDG_RUNTIME_DIR=$(mktemp -d) + ''; + + nativeCheckInputs = [ + gymnasium + imageio + pytest-rerunfailures + pytestCheckHook + pyyaml + scipy + ] + ++ passthru.optional-dependencies.atari + ++ passthru.optional-dependencies.gym-continuous + ++ passthru.optional-dependencies.rendering; + + disabledTests = [ + # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called + "test_vecenvs_env" + + # ValueError: Can't write images with one color channel. + "test_log_video" + + # Those tests require the ALE environments (provided by unpackaged shimmy) + "test_collector_env_reset" + "test_gym" + "test_gym_fake_td" + "test_recorder" + "test_recorder_load" + "test_rollout" + "test_parallel_trans_env_check" + "test_serial_trans_env_check" + "test_single_trans_env_check" + "test_td_creation_from_spec" + "test_trans_parallel_env_check" + "test_trans_serial_env_check" + "test_transform_env" + ]; + + meta = with lib; { + description = "A modular, primitive-first, python-first PyTorch library for Reinforcement Learning"; + homepage = "https://github.com/pytorch/rl"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix index 3f4afca9f308..4448f97a1c23 100644 --- a/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix +++ b/nixpkgs/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.16.2"; + version = "0.17.0"; in buildPythonPackage { inherit version; diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix b/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix index 713228240cab..44052910a03a 100644 --- a/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/nixpkgs/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.16.2" = { + "0.17.0" = { x86_64-linux-38 = { - name = "torchvision-0.16.2-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-AmZyfQifUSqpAK6tKQhTD1TZB3eEveHnykb2a49Wfpg="; + 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="; }; x86_64-linux-39 = { - name = "torchvision-0.16.2-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-qhMlpuBBYD3uzvxWnmS4x1psmhuHbimi3vKYuoRWR00="; + 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="; }; x86_64-linux-310 = { - name = "torchvision-0.16.2-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-uqeXDGtUNzEuXdC9DyVxogt4bD4oW6/W7T5PYqXDx24="; + 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="; }; x86_64-linux-311 = { - name = "torchvision-0.16.2-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-CS1ZEQqf7PfDtE0YsbWqELqJjiVB4HtnT+WSaFIeuMs="; + 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="; }; x86_64-darwin-38 = { - name = "torchvision-0.16.2-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-uCcy3Ph2o3yFJ3I0KqbuNIDAO7PiqAKuEJ/F9+KNJuk="; + 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="; }; x86_64-darwin-39 = { - name = "torchvision-0.16.2-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-VhFSaLN/C3U2TjZU5HrZq8Zqw0wfnl49+omiLWpAAXo="; + 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="; }; x86_64-darwin-310 = { - name = "torchvision-0.16.2-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-vIbygAyywMGgnFgUCc3Wv/ZuYvED3IP8Y/czRiZMN1Y="; + 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="; }; x86_64-darwin-311 = { - name = "torchvision-0.16.2-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-Z7Gq+LjLAs513URfKRonyANqUC+MCqduKMN6D6rC4VM="; + 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="; }; aarch64-darwin-38 = { - name = "torchvision-0.16.2-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-SwZRQ9GnIP6KkHf9S+NdSR+YgZ7ICz27w+xk0LcHqQY="; + 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="; }; aarch64-darwin-39 = { - name = "torchvision-0.16.2-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-goBfhEWwlPnR53A5DubMhoVeiZVeCM40ry4idPwOXEU="; + 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="; }; aarch64-darwin-310 = { - name = "torchvision-0.16.2-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-sCS9QS3206AH3OvzEaiU6zxcIeGvgNEr44K7ywl6fDo="; + 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="; }; aarch64-darwin-311 = { - name = "torchvision-0.16.2-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-vvMNA+HRxil2H03KUdO32KDcCszm9AaKsqFjTo57ZOA="; + 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="; }; }; } diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index fc8526395f94..013d1886b684 100644 --- a/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -17,7 +17,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.16.2"; + version = "0.17.0"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-fSFoMZbF0bYqonvgoNAE8ZzwCsjhCdVo2BJ0pOC2zd0="; + hash = "sha256-ZAmvVEVLzZ+AWER4vGssAhvFscoFooS1VaZnvgVDeNk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix index 4b0f9adba51b..b6f43516f3a3 100644 --- a/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -55,6 +55,15 @@ buildPythonPackage rec { sha256 = "sha256-Wxe9u7Cvv2vKMGTcK3X8W1Mq/nCt70zrzWUKA+83Sas="; }) + # Inheritance in newer cryptography is not possible anymore + # for `RSAPrivateNumbers` because of a Rust implementation. + # https://github.com/tpm2-software/tpm2-pytss/pull/562 + (fetchpatch { + name = "fix-newer-cryptography-42-0-1-support.patch"; + url = "https://github.com/tpm2-software/tpm2-pytss/commit/0fbb9d099370c0a7031dd13990986538f586836a.patch"; + sha256 = "sha256-xnQIr4/iJra0+rn5estVqSvG8pXcuwWykmmayBpCzgw="; + }) + # Fix hardcoded `fapi-config.json` configuration path ./fapi-config.patch ]; diff --git a/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index 6cf4c9713f9e..84489b22ce4a 100644 --- a/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi -, pythonAtLeast +, pythonOlder , setuptools , setuptools-scm , wheel @@ -20,9 +20,6 @@ buildPythonPackage rec { version = "4.66.1"; format = "pyproject"; - # https://github.com/tqdm/tqdm/issues/1537 - disabled = pythonAtLeast "3.12"; - src = fetchPypi { inherit pname version; hash = "sha256-2I5lH5242FUaYlVtPP+eMDQnTKXWbpMZfPJJDi3Lacc="; @@ -34,6 +31,9 @@ buildPythonPackage rec { wheel ]; + # https://github.com/tqdm/tqdm/issues/1537 + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ pytestCheckHook pytest-asyncio diff --git a/nixpkgs/pkgs/development/python-modules/trafilatura/default.nix b/nixpkgs/pkgs/development/python-modules/trafilatura/default.nix new file mode 100644 index 000000000000..5ebb2280f31b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/trafilatura/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, certifi +, charset-normalizer +, courlan +, htmldate +, justext +, lxml +, urllib3 +}: + +buildPythonPackage rec { + pname = "trafilatura"; + version = "1.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-oWbmfwBaahLvGU9Ix8n6ThsONnVv3Stk4CRzw1aWLwQ="; + }; + + propagatedBuildInputs = [ + certifi + charset-normalizer + courlan + htmldate + justext + lxml + urllib3 + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # disable tests that require an internet connection + disabledTests = [ + "test_download" + "test_fetch" + "test_redirection" + "test_meta_redirections" + "test_crawl_page" + "test_whole" + "test_probing" + "test_cli_pipeline" + ]; + + # patch out gui cli because it is not supported in this packaging + # nixify path to the trafilatura binary in the test suite + postPatch = '' + substituteInPlace setup.py --replace '"trafilatura_gui=trafilatura.gui:main",' "" + substituteInPlace tests/cli_tests.py --replace "trafilatura_bin = 'trafilatura'" "trafilatura_bin = '$out/bin/trafilatura'" + ''; + + pythonImportsCheck = [ "trafilatura" ]; + + meta = with lib; { + description = "Python package and command-line tool designed to gather text on the Web"; + homepage = "https://trafilatura.readthedocs.io"; + changelog = "https://github.com/adbar/trafilatura/blob/v${version}/HISTORY.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jokatzke ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 98f7773e225e..ea72ad9f0424 100644 --- a/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.36.2"; + version = "4.37.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -62,7 +62,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-sasaqgQ+CM344qJeD6PU9wbAmuZRpaSSvUjSNw5DQRk="; + hash = "sha256-O8A+6f6Qwr/OqwzA3i3MPCmcwg1BoQY6mvhozrLz16Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index 3199218ef659..d05cefe6ebe4 100644 --- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.0.8"; + version = "4.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FvMFC1h3gu61jZPSPmxYHQmxnxYKmtYAecc/0IT9E8I="; + hash = "sha256-SIHIA6HKo3Ka6rmZrBZfSmN/sNfEjSImYUtbtQs3ozQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix b/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix index 3485c0f1fd2c..f65c9e651bed 100644 --- a/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix @@ -10,14 +10,14 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.11.29"; + version = "2024.1.8"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/49/2Cx5MhE7RufvZ0LHAJHMY2QMjGXbANkfLpQLlRQ="; + hash = "sha256-bjbK9DD/ZIXEtXpMazZKE/aomNFrlBfGw3Rn5ZwUsFo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/nixpkgs/pkgs/development/python-modules/trytond/default.nix index bb1835ff7b9b..f196b3a3d472 100644 --- a/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.0.2"; + version = "7.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/Xb6YOQ8nV+bXTdt/iAgYkBkmV6fRVFjR+86SfKU+aw="; + hash = "sha256-UTDONJrb28gnGkoV6Rb/2ChsgcLIxCmDhSd4gvFxq14="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 3c9af2fd7652..2deb71addc84 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -14,12 +14,13 @@ , pythonOlder , pytz , requests +, setuptools }: buildPythonPackage rec { pname = "twilio"; - version = "8.11.1"; - format = "setuptools"; + version = "8.13.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,9 +28,13 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-cByrE0/sKZ0dWnuQS1KOOCHbSYF6YJchqGrdkmVp9DM="; + hash = "sha256-HlHT7fJbDz8+7pTWHortK2xKDzoIQElJPbUTxmIdGCs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aiohttp-retry diff --git a/nixpkgs/pkgs/development/python-modules/twine/default.nix b/nixpkgs/pkgs/development/python-modules/twine/default.nix index 9bd98fd5adbe..e656970ef627 100644 --- a/nixpkgs/pkgs/development/python-modules/twine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twine/default.nix @@ -5,7 +5,7 @@ , importlib-metadata , keyring , pkginfo -, readme_renderer +, readme-renderer , requests , requests-toolbelt , rich @@ -31,7 +31,7 @@ buildPythonPackage rec { importlib-metadata keyring pkginfo - readme_renderer + readme-renderer requests requests-toolbelt rfc3986 diff --git a/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix b/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix index 5c672eef4c2a..8dc26553d422 100644 --- a/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix @@ -3,7 +3,6 @@ , pythonOlder , fetchFromGitHub , setuptools -, wheel , aiohttp , python-dateutil , typing-extensions @@ -11,22 +10,21 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "4.1.0"; + version = "4.2.0"; disabled = pythonOlder "3.7"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "refs/tags/v${version}"; - hash = "sha256-aYYuHyILd3nT0jG59wJcRgSeri26YsC3NpwuQ9dsI1I="; + hash = "sha256-QAxLYujnsudaiz9UepwrBA835Pct5h4VcE9ZrbkwMmg="; }; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index ada4762cffe8..17058a40a088 100644 --- a/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -52,701 +52,701 @@ rec { types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.8.0" "sha256-ib044RjF+1projrSoyiMdj9LkbT1BJrfObxs1ukSNHo="; - types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.9.0" "sha256-lNp/rvyWKvD9jY9J9vU98CFyB/ysiS8JslXrjK2BtgE="; + types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.11.0" "sha256-FF1VOkekfT4cSx2y61smPVMTD5k3FBIsnslOTnxy+5o="; - types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.9.0" "sha256-OiejoMmWNnF3dBKPWInCurB2xe0hnKG/FAR8NVuIeiU="; + types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.11.0" "sha256-PzA8ooo026gvNYL+xgjJ1EJomCC+lq1QDbY54k067BM="; - types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.9.0" "sha256-LUW+yAw4K8kOxSqF3tJuqXqHc83+3thnCbdWcz/PnO0="; + types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.11.0" "sha256-RCC+fkQJMKYrv0TdAUGOXLyufeCJyV9luXKOXvjXc+s="; - types-aiobotocore-amplifybackend = buildTypesAiobotocorePackage "amplifybackend" "2.9.0" "sha256-TTmpkylWnRxNs+1s75qTdQ+GgWnyfyUZhfE1e1eSYXE="; + types-aiobotocore-amplifybackend = buildTypesAiobotocorePackage "amplifybackend" "2.11.0" "sha256-U5BemtvxVynvFaQ9gxiI3kFB5+HJjpFTZkXMLFaMeRE="; - types-aiobotocore-amplifyuibuilder = buildTypesAiobotocorePackage "amplifyuibuilder" "2.9.0" "sha256-ovLWirPFaMwFjk6e7zZbSoDxiXp0/ll6HnT9pxEJCaY="; + types-aiobotocore-amplifyuibuilder = buildTypesAiobotocorePackage "amplifyuibuilder" "2.11.0" "sha256-4oQMgEJD6RT8ukcdoDF7dWAnNj51gBWOYITKjzLGTBo="; - types-aiobotocore-apigateway = buildTypesAiobotocorePackage "apigateway" "2.9.0" "sha256-mexH2IJbHyMzKRL1jVUuqiUdHBOOHRhCDR29GVIOgmc="; + types-aiobotocore-apigateway = buildTypesAiobotocorePackage "apigateway" "2.11.0" "sha256-YGOdBuM5250bIoM2rJeJv51zF6kB1zvGYksmr56SW8g="; - types-aiobotocore-apigatewaymanagementapi = buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.9.0" "sha256-ISlXwESp+llqSMTv2T7CwtTAuIXfiRTGwQnIejOb7aU="; + types-aiobotocore-apigatewaymanagementapi = buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.11.0" "sha256-LFI4IJyDQnPYKq0WHk9y56LjdtW6nHHUN2GLGk+ZdLs="; - types-aiobotocore-apigatewayv2 = buildTypesAiobotocorePackage "apigatewayv2" "2.9.0" "sha256-h2C2CZVVH72OML31/f0Yl8Ril2uGEvFKwHnumP9FoVo="; + types-aiobotocore-apigatewayv2 = buildTypesAiobotocorePackage "apigatewayv2" "2.11.0" "sha256-3gJkB9xUtxHqGnl0BIt37bDpM5GJQhjtiHkwDVOWaP0="; - types-aiobotocore-appconfig = buildTypesAiobotocorePackage "appconfig" "2.9.0" "sha256-SO7ZAepv4lNrfZ6u3krEsN62LxLsK3p/hD3Bi68pYog="; + types-aiobotocore-appconfig = buildTypesAiobotocorePackage "appconfig" "2.11.0" "sha256-zGtX4wRie1PtMZAHH187+tr7sBKKDGI0rtmobYbuOMg="; - types-aiobotocore-appconfigdata = buildTypesAiobotocorePackage "appconfigdata" "2.9.0" "sha256-qApIy0bwsg3T5LY1CzqpKfg8F+5MU/1Ygt7qN+TYI4c="; + types-aiobotocore-appconfigdata = buildTypesAiobotocorePackage "appconfigdata" "2.11.0" "sha256-yh1GVL7P6yRVE3o4mKBFFKhrXRN+7dO6PAAcdFENci0="; - types-aiobotocore-appfabric = buildTypesAiobotocorePackage "appfabric" "2.9.0" "sha256-wolhhyFXsLIp8phvKat8baoUd6WJTv23J6eoThQ4QJ0="; + types-aiobotocore-appfabric = buildTypesAiobotocorePackage "appfabric" "2.11.0" "sha256-1HfybuUtT3ZPjOTgI2qOHZcXitlfzfVMFnHEvvpXYHI="; - types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.9.0" "sha256-QO6o0BPDJ/qOul8XkN+BW36aQomv//+1kG6sa8gljuE="; + types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.11.0" "sha256-7gCktOrsUm6y3KId+7i6rl7QA5vGhPletY6gKyJdG6k="; - types-aiobotocore-appintegrations = buildTypesAiobotocorePackage "appintegrations" "2.9.0" "sha256-/zUXglyQUewxMcRgoCLPHHrc8fIjm68C547o4DOn/j8="; + types-aiobotocore-appintegrations = buildTypesAiobotocorePackage "appintegrations" "2.11.0" "sha256-NUmmtV2RcREzC030heh5Vq2LvHCfTv25NMefwIk6hfA="; - types-aiobotocore-application-autoscaling = buildTypesAiobotocorePackage "application-autoscaling" "2.9.0" "sha256-G2pTcy4uLL7ypl3PcKvI1g5jD7Ytxu37jxWs+i1opHM="; + types-aiobotocore-application-autoscaling = buildTypesAiobotocorePackage "application-autoscaling" "2.11.0" "sha256-ag+5kqW+j0c9MC/Ua4yUPPW72Gbj1LbA1QWG9CwCC7U="; - types-aiobotocore-application-insights = buildTypesAiobotocorePackage "application-insights" "2.9.0" "sha256-YwwGYTwwFOsyfsyY8L5dKhFl+uGTT+oKYEXSgo1UPXE="; + types-aiobotocore-application-insights = buildTypesAiobotocorePackage "application-insights" "2.11.0" "sha256-pKLm6w1+j56QX+jxoywew8Polgeq4H2/xQpqQ71vQCA="; - types-aiobotocore-applicationcostprofiler = buildTypesAiobotocorePackage "applicationcostprofiler" "2.9.0" "sha256-ghooPwffm8YMs50MpYT82WJz7vHsMi/HZy0drnSXJUA="; + types-aiobotocore-applicationcostprofiler = buildTypesAiobotocorePackage "applicationcostprofiler" "2.11.0" "sha256-BnIdJmvh76xDITk+iEkoxTHeEBa9FZDV84fn1uvWz6g="; - types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.9.0" "sha256-tydjCV77K/EAyddwmiMDXsEC469GbgNcZRLMmy61Zh4="; + types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.11.0" "sha256-8f0vxVqWWdm8UYl7rtHBSDR5PJGd8bAC6DTopPUbdwk="; - types-aiobotocore-apprunner = buildTypesAiobotocorePackage "apprunner" "2.9.0" "sha256-nt2evZ5TqcCrwjGPornCrY27nlQX09RpYEHoYRb9XUA="; + types-aiobotocore-apprunner = buildTypesAiobotocorePackage "apprunner" "2.11.0" "sha256-uZtrlWm1Hc3RsgtAzYf+ZY9G/G56fhbgxq0Aqo0SmIU="; - types-aiobotocore-appstream = buildTypesAiobotocorePackage "appstream" "2.9.0" "sha256-q/LwAh7O9SZOXjGawKwCcZFwRGmztfRjZ0sUkS/QuOc="; + types-aiobotocore-appstream = buildTypesAiobotocorePackage "appstream" "2.11.0" "sha256-fI/BuF5aulwnH2IviGqp4PPcIInwGrBNyghiCu4AGzo="; - types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.9.0" "sha256-e4AE0rYgr61INMVTIuv3G35ywBnfnGo0+ZkAUbJCxS8="; + types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.11.0" "sha256-/eL7b7ZQp47BlLRGbxqwg6JnfYljXAtQOfRjnqWHndo="; - types-aiobotocore-arc-zonal-shift = buildTypesAiobotocorePackage "arc-zonal-shift" "2.9.0" "sha256-PM6yAXmqwLXs7NAC6hnFUVCnkWg3iNz8hCN7soWSxPE="; + types-aiobotocore-arc-zonal-shift = buildTypesAiobotocorePackage "arc-zonal-shift" "2.11.0" "sha256-WiWU20Yc3bWARmkbYnBA1Wy315vStIq16mLF4UHRksQ="; - types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.9.0" "sha256-uMKc1u/u3ppRCVVPZ05VTlXoEfxCY9tyLqYpxnl+CWc="; + types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.11.0" "sha256-UtJadPx8k7JfoOXexAY/Sz6bfsrapCsdYtz0L0zIXxc="; - types-aiobotocore-auditmanager = buildTypesAiobotocorePackage "auditmanager" "2.9.0" "sha256-gPzB/GSkjq44Q2SjjDWJyidFNzg4veag0PvQ7nFl+pY="; + types-aiobotocore-auditmanager = buildTypesAiobotocorePackage "auditmanager" "2.11.0" "sha256-Xe0Hn8XpfnmtObeKRtm0focC+s2eHLoTdERnDZmAs4g="; - types-aiobotocore-autoscaling = buildTypesAiobotocorePackage "autoscaling" "2.9.0" "sha256-AaCvm94dtOdLlOA1X8k5r2K1sbpTerX6cJEjdGs3L6Y="; + types-aiobotocore-autoscaling = buildTypesAiobotocorePackage "autoscaling" "2.11.0" "sha256-eJnuoN6ciE3k97/hLhr45ppWtq4jEpPcqpkZ2H+qd6Y="; - types-aiobotocore-autoscaling-plans = buildTypesAiobotocorePackage "autoscaling-plans" "2.9.0" "sha256-p43Kie/Ax1BNmIN2Sny05NlxHWuasbXLlRbTNpvI8eM="; + types-aiobotocore-autoscaling-plans = buildTypesAiobotocorePackage "autoscaling-plans" "2.11.0" "sha256-cESQHBGUvT8saQhqNsOqSpyO7gIZmnAb2jhGO0kt5AE="; - types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.9.0" "sha256-CO6ETR9Q1Lkj0o4d24iVfhvLyN3FBTpWQYrWStvPVP4="; + types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.11.0" "sha256-+r02pZW1xLqPlt5kHKrLXKFRwdSiHKWxZAxuji9TFvg="; - types-aiobotocore-backup-gateway = buildTypesAiobotocorePackage "backup-gateway" "2.9.0" "sha256-TGtFwgq00PrrVKxJYhiIWMzUGpsvFMYVjS5xBxEorWI="; + types-aiobotocore-backup-gateway = buildTypesAiobotocorePackage "backup-gateway" "2.11.0" "sha256-dEqYpn7xF5JRzFgVANFeXw/ukeoduvI4LBOEwYwjLxg="; - types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.9.0" "sha256-gNXODf0OIkG0Dw4JOZU0XuRKmf8CIc+GTcgZ8PUnRcY="; + types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.11.0" "sha256-65luTwPeI4SHfJUhWLR9YJQwbdcB6J1ON6EBhojok/k="; - types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.9.0" "sha256-x/sNVy1MmdBelRwb+ytT13K9FcgUdnoahgckniLN9Gs="; + types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.11.0" "sha256-A94x70FSnAUJSt5NM9yzhq4r7f2fsaHLx8oXeCq//PE="; - types-aiobotocore-billingconductor = buildTypesAiobotocorePackage "billingconductor" "2.9.0" "sha256-wsbM8GYdwDf1ILZZBM/lBQo/qTduA49pljwfVlNTPo8="; + types-aiobotocore-billingconductor = buildTypesAiobotocorePackage "billingconductor" "2.11.0" "sha256-Ze1Bsuw4fDgGJ8nVsRtmGQPH0ZPfxE+OUb6T8Q5hrBI="; - types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.9.0" "sha256-Wi8Y5Ue4xiVm+3Ol9e3nDOS8QL1LjcUQsySIWc1R16M="; + types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.11.0" "sha256-upNbHBQLQVlgHItd8NuFq1C7DkM/1F1BAxESQevmeZs="; - types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.9.0" "sha256-PU74F6DnMXB435pCmee7IAPS7YSR0pFBjDqgPMfORT4="; + types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.11.0" "sha256-SKgVqVkHPX9ytLBR+yUpnVz82AGdxpJ+BLO7kBGJ3/k="; - types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.9.0" "sha256-0drcozC0lKqYuHK3vSF2QG/7lywN6yKxbwJxqMIrIDM="; + types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.11.0" "sha256-th7HVQIlLgfwYgZ3GFlYU5Cg5jjfEJbulaOaLFnQbUk="; - types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.9.0" "sha256-IGF7YcjgZy99X4KZA0CYJDMcJP8S9GZHwInW8eqLsCc="; + types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.11.0" "sha256-s3VHCPLNHFHNYNHBzp2mhToY45+2bua8Wwy38rvNmjM="; - types-aiobotocore-chime-sdk-identity = buildTypesAiobotocorePackage "chime-sdk-identity" "2.9.0" "sha256-MwfvczW4j4IjZBPUTyA0WcT8sqSTYhrnEzkKrVXuIY4="; + types-aiobotocore-chime-sdk-identity = buildTypesAiobotocorePackage "chime-sdk-identity" "2.11.0" "sha256-BJsXT1lVo/Qfwc37nCGmxIFSN4nGtvVZZxOfLWDXj8U="; - types-aiobotocore-chime-sdk-media-pipelines = buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.9.0" "sha256-PsEsAjsehN5w5pV+ZHajY+r+9+9SCSutEKA5UGvePeY="; + types-aiobotocore-chime-sdk-media-pipelines = buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.11.0" "sha256-n5OniJhfpUA2ieVsaJasxyzV79sGG4QGR+bsy0XxqnQ="; - types-aiobotocore-chime-sdk-meetings = buildTypesAiobotocorePackage "chime-sdk-meetings" "2.9.0" "sha256-XDyk+ljdPfm8poC4A65rz30zviN5XqBo4Ud4K/SN8bY="; + types-aiobotocore-chime-sdk-meetings = buildTypesAiobotocorePackage "chime-sdk-meetings" "2.11.0" "sha256-KjhknFjnVlZpdKQQ7ggBlcTPEB/C9PKvta90oD84yTE="; - types-aiobotocore-chime-sdk-messaging = buildTypesAiobotocorePackage "chime-sdk-messaging" "2.9.0" "sha256-7MQKlLPYRS64OH0CA8SYXJhE52gT9v4BkCzoypV2I/k="; + types-aiobotocore-chime-sdk-messaging = buildTypesAiobotocorePackage "chime-sdk-messaging" "2.11.0" "sha256-gyvW6RoMv66Y7xIi1ak1f/9ivOFaNANQhgD08VlWGPM="; - types-aiobotocore-chime-sdk-voice = buildTypesAiobotocorePackage "chime-sdk-voice" "2.9.0" "sha256-Do/nRj4qmUABDW20dkTU+KK8O/C7yhRIEjV6bCbfjGs="; + types-aiobotocore-chime-sdk-voice = buildTypesAiobotocorePackage "chime-sdk-voice" "2.11.0" "sha256-fK2BzOdlvbacOePr7OacTRd+XEFEAjq6fKXC4nOzZeo="; - types-aiobotocore-cleanrooms = buildTypesAiobotocorePackage "cleanrooms" "2.9.0" "sha256-wfLyaQu2gfOe2+GT+Umwo6VBo70wjmhpKF3qGquaoZo="; + types-aiobotocore-cleanrooms = buildTypesAiobotocorePackage "cleanrooms" "2.11.0" "sha256-jri5DT8VP2J/mdsAR5uO+ZqZJdHexTiyER3tTAGLZd8="; - types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.9.0" "sha256-tt+houhkHEPlRxagLzVKn/SVP4Uj9Sv1UsPyidSNLVM="; + types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.11.0" "sha256-wh39UKjVcRoFpHZw6es7/iWMSqWr793WGJd1K0arxU4="; - types-aiobotocore-cloudcontrol = buildTypesAiobotocorePackage "cloudcontrol" "2.9.0" "sha256-QIsTkVZnkkzFvZAOFYvF/erH2ov/F01lRDWFglY3Tmw="; + types-aiobotocore-cloudcontrol = buildTypesAiobotocorePackage "cloudcontrol" "2.11.0" "sha256-O0UvfR9zN7G5VLXn3o++xj9NgPfF4HJfD22OiXjFV8c="; - types-aiobotocore-clouddirectory = buildTypesAiobotocorePackage "clouddirectory" "2.9.0" "sha256-gNcIZFG9zk+VZPcT9yxYYVjKPcqO2RJNFjpPNfbnK7E="; + types-aiobotocore-clouddirectory = buildTypesAiobotocorePackage "clouddirectory" "2.11.0" "sha256-z97kNaW0Ku6kdWNfEpVUbQSMA1RBoX3ekiZ/IjcEzxs="; - types-aiobotocore-cloudformation = buildTypesAiobotocorePackage "cloudformation" "2.9.0" "sha256-zdEa2iNNy8gFFkK15ifS3TO7lbauVxDfLyzM8a27NyI="; + types-aiobotocore-cloudformation = buildTypesAiobotocorePackage "cloudformation" "2.11.0" "sha256-uIdbpjOfxxe0+LsrZAg/ygqzvCRNRbivyDMjoaEr7ew="; - types-aiobotocore-cloudfront = buildTypesAiobotocorePackage "cloudfront" "2.9.0" "sha256-S7FeyJ8x4C+/PeeR4kXa1YhyDm5DX2XmoTk4AZMjxKo="; + types-aiobotocore-cloudfront = buildTypesAiobotocorePackage "cloudfront" "2.11.0" "sha256-1J4uH1XM3j7LgXQ8kmuGw0MMMPMh0sfIjGl5xlKbj6U="; - types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.9.0" "sha256-epgeZ3U179/91Qy4GZ/fLQGFyIQkn222wHoSOUE2+w0="; + types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.11.0" "sha256-NXW9PwF9skgzZ8nRUEqNw0RoO2p0f7PsSzwChG5hR80="; - types-aiobotocore-cloudhsmv2 = buildTypesAiobotocorePackage "cloudhsmv2" "2.9.0" "sha256-wDbY2WENp0RgQ7TwJztZApfUyRQG1hXeMSLInRh5Ot8="; + types-aiobotocore-cloudhsmv2 = buildTypesAiobotocorePackage "cloudhsmv2" "2.11.0" "sha256-/fKdFf3u1C75HiLoKV29Ao67+504P+CduF4BNGJObiE="; - types-aiobotocore-cloudsearch = buildTypesAiobotocorePackage "cloudsearch" "2.9.0" "sha256-c+W60cxtipCAW8sM4QyTRLmZo8xZBm3FCyzqGNwK/Zc="; + types-aiobotocore-cloudsearch = buildTypesAiobotocorePackage "cloudsearch" "2.11.0" "sha256-yfHcWilKZbtxZcJmrOgDJxMybo+GxvFLaoXSW0IxNj4="; - types-aiobotocore-cloudsearchdomain = buildTypesAiobotocorePackage "cloudsearchdomain" "2.9.0" "sha256-WR5b8vBbUxFmsH8tNnho4jqY6jrPsHYXljflL6y6JHc="; + types-aiobotocore-cloudsearchdomain = buildTypesAiobotocorePackage "cloudsearchdomain" "2.11.0" "sha256-vxc4o8AG+y0rA5yqadgOE8K3vCOLMs9uN2G2Xcq2vv4="; - types-aiobotocore-cloudtrail = buildTypesAiobotocorePackage "cloudtrail" "2.9.0" "sha256-roSPY8CJBwX/wCMRd7qLLjLSkk0ys2HT3n4ZFpEE+VU="; + types-aiobotocore-cloudtrail = buildTypesAiobotocorePackage "cloudtrail" "2.11.0" "sha256-FgxQugrLHvORUMcIKJaOJ0/C30WOSRJ9gPbQO3nIQCo="; - types-aiobotocore-cloudtrail-data = buildTypesAiobotocorePackage "cloudtrail-data" "2.9.0" "sha256-t+1vtSNNEBhMieXbkdoUBEXCTPd5me1fDOdHaI5tNfE="; + types-aiobotocore-cloudtrail-data = buildTypesAiobotocorePackage "cloudtrail-data" "2.11.0" "sha256-jc3/f4g5qKpgMhQPetRlfDv1Evh4/JZvzJaHSGhdAZE="; - types-aiobotocore-cloudwatch = buildTypesAiobotocorePackage "cloudwatch" "2.9.0" "sha256-LxuZoxlhUwRorUAGDxTfAIhgTzJm4jMTUS13zMnfaZY="; + types-aiobotocore-cloudwatch = buildTypesAiobotocorePackage "cloudwatch" "2.11.0" "sha256-SUmy1ZUCcLMverR5FoyGowraVQ22xjPLc9P2fDFjIDI="; - types-aiobotocore-codeartifact = buildTypesAiobotocorePackage "codeartifact" "2.9.0" "sha256-eEI1k5dZpy0TuuoYDRFGp9OPWzFXg0mtx0HwB2H4OsM="; + types-aiobotocore-codeartifact = buildTypesAiobotocorePackage "codeartifact" "2.11.0" "sha256-h/BcvTSIOPSN+RdP84UcPNi9pqvL+ITrxDNvH7X7/Pc="; - types-aiobotocore-codebuild = buildTypesAiobotocorePackage "codebuild" "2.9.0" "sha256-AyFoSrmu8DA8UFb7o8Bd4eoUSoTXvdHoADkKH5DBVxM="; + types-aiobotocore-codebuild = buildTypesAiobotocorePackage "codebuild" "2.11.0" "sha256-QBleKtvFchbE6liuxlmCYm55VWLa0Eu38ydTl9AAPrg="; - types-aiobotocore-codecatalyst = buildTypesAiobotocorePackage "codecatalyst" "2.9.0" "sha256-IT7jtWd5QrAaeRG+kgu21KVcWtKiAyEB04E2BsDTPzQ="; + types-aiobotocore-codecatalyst = buildTypesAiobotocorePackage "codecatalyst" "2.11.0" "sha256-OfmohOrk90MjqjmSu+0xiATJrh99myqaUbirDpMj/ag="; - types-aiobotocore-codecommit = buildTypesAiobotocorePackage "codecommit" "2.9.0" "sha256-8wsxzSNeMKOr1N0UJo9sn0Jcp+WCvLOufA67aL49FjQ="; + types-aiobotocore-codecommit = buildTypesAiobotocorePackage "codecommit" "2.11.0" "sha256-gWLVnH0Rm3jlcDff0tUKjmrKqJswkXybn/BbyX1ogxA="; - types-aiobotocore-codedeploy = buildTypesAiobotocorePackage "codedeploy" "2.9.0" "sha256-7NsJWQv4gw2zBYQTxm9p0hEis70WnTNgT5isd55mnt8="; + types-aiobotocore-codedeploy = buildTypesAiobotocorePackage "codedeploy" "2.11.0" "sha256-AIh+hTvPCxsQ1wML574FXpa95QYmcDB61tAL2zepZPA="; - types-aiobotocore-codeguru-reviewer = buildTypesAiobotocorePackage "codeguru-reviewer" "2.9.0" "sha256-zzl4ICc11BaNsYjJZG3lK8ehQlVFi8fWDxunVK4y6wA="; + types-aiobotocore-codeguru-reviewer = buildTypesAiobotocorePackage "codeguru-reviewer" "2.11.0" "sha256-QdYU6pjF9r7fWbqGwKgmsfkJw04Dwyq3zYM/Ffth6Is="; - types-aiobotocore-codeguru-security = buildTypesAiobotocorePackage "codeguru-security" "2.9.0" "sha256-gEYXn3oLTVMgskv43TJLnj4lC+RmiEQMO7ngz8a/dws="; + types-aiobotocore-codeguru-security = buildTypesAiobotocorePackage "codeguru-security" "2.11.0" "sha256-aQ0jJkHU7Unez+DsVae9ly7fBXC8VYaA+euec4zHvcg="; - types-aiobotocore-codeguruprofiler = buildTypesAiobotocorePackage "codeguruprofiler" "2.9.0" "sha256-mrEhrQcd/SmrBFs1AVv6ddPqWairhYHMdIxBeL/JiNI="; + types-aiobotocore-codeguruprofiler = buildTypesAiobotocorePackage "codeguruprofiler" "2.11.0" "sha256-Fh3+RnPI1DYqwRdiY5wphJ4/sa6phldf5Jw26EAy+yA="; - types-aiobotocore-codepipeline = buildTypesAiobotocorePackage "codepipeline" "2.9.0" "sha256-wLaqSsUgOosJ+0zUST9DVEPtW12QbPLQ4zHz6GAuJrQ="; + types-aiobotocore-codepipeline = buildTypesAiobotocorePackage "codepipeline" "2.11.0" "sha256-TqW+JQcWLUkH63lmTSgM2RBpxiUce8H4sYhuBsG/y3Q="; - types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.9.0" "sha256-TB+XKOtfpjEtyHpmlAggN8LlrPVU2J7J8dGOtNN0jGo="; + types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.11.0" "sha256-SKowg/6Z+XkwRYvqLMVv2DNuqjYWDGxfAH9qDIfIYQs="; - types-aiobotocore-codestar-connections = buildTypesAiobotocorePackage "codestar-connections" "2.9.0" "sha256-fI+dnGtR3w87Pkqgk8my60jiB03gsEYFHtGGoU1/uYY="; + types-aiobotocore-codestar-connections = buildTypesAiobotocorePackage "codestar-connections" "2.11.0" "sha256-HKd/vW31qD4NxoP3tpCVrWhFxzUx3WFmpSNXR5MUGNU="; - types-aiobotocore-codestar-notifications = buildTypesAiobotocorePackage "codestar-notifications" "2.9.0" "sha256-xwE39rQ720hvrqAPosru14lVIJ84GI8CvN80NQVQA8o="; + types-aiobotocore-codestar-notifications = buildTypesAiobotocorePackage "codestar-notifications" "2.11.0" "sha256-mp0wBISY78Or4TniwKFXbR/fiu5JWhEkccKrz14WlUY="; - types-aiobotocore-cognito-identity = buildTypesAiobotocorePackage "cognito-identity" "2.9.0" "sha256-XuqXsgCd+loZYn6TMZUALvNJJv0WUdLsQuO6c0KW/bs="; + types-aiobotocore-cognito-identity = buildTypesAiobotocorePackage "cognito-identity" "2.11.0" "sha256-fSGb8vmEdIjvfnm60Ib6iQtLt3vhvGyFA+bhv1RLYt4="; - types-aiobotocore-cognito-idp = buildTypesAiobotocorePackage "cognito-idp" "2.9.0" "sha256-/TKEYsj+xGxfw2FmQHdsXa5T96OIhiSukUjUStuW5eM="; + types-aiobotocore-cognito-idp = buildTypesAiobotocorePackage "cognito-idp" "2.11.0" "sha256-qK/97mzT5xbNHRBU1d7lbPPhAbmUZv4A12UxDO/NHOY="; - types-aiobotocore-cognito-sync = buildTypesAiobotocorePackage "cognito-sync" "2.9.0" "sha256-nceU9SKeGSl5JuiuKTpBAfijsReTn7dRyboy8f74ecw="; + types-aiobotocore-cognito-sync = buildTypesAiobotocorePackage "cognito-sync" "2.11.0" "sha256-KJiEL5qkQAsF1aW42M0WJNRkmY5kuz+y+x2zhPl++oI="; - types-aiobotocore-comprehend = buildTypesAiobotocorePackage "comprehend" "2.9.0" "sha256-meEKFbIuWqGrg9ZL7XJW8POWwgjiHxbIgXJPjIrkeU0="; + types-aiobotocore-comprehend = buildTypesAiobotocorePackage "comprehend" "2.11.0" "sha256-+4ZC5tDNqIVE/tpdjgq0OOxz8nP3nnXuChBn1vH+GmY="; - types-aiobotocore-comprehendmedical = buildTypesAiobotocorePackage "comprehendmedical" "2.9.0" "sha256-5NmX7q2dBWUFR+MZ3L37nSKUofJnjQ4CUNzJ0buxwYo="; + types-aiobotocore-comprehendmedical = buildTypesAiobotocorePackage "comprehendmedical" "2.11.0" "sha256-tgGh+wbiC5iUl89kqsPhW+ppYOa0el6D2aAF53e0OOU="; - types-aiobotocore-compute-optimizer = buildTypesAiobotocorePackage "compute-optimizer" "2.9.0" "sha256-66KGrkc1LMXyJqCl4hLhEqYd5f4x5n+A1aiNmEeY0Ic="; + types-aiobotocore-compute-optimizer = buildTypesAiobotocorePackage "compute-optimizer" "2.11.0" "sha256-SS7WVEni76ixWOMMGkuVpvBL46kzEtc+nZVXLgVR7qM="; - types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.9.0" "sha256-Jal8H6TgvHWBMkTtGM3Gcth77cJfkiew6uIGmCIoZqA="; + types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.11.0" "sha256-788nwZ08Yd7Jm9hbMtbikiekaCD5BJXGQizYA+C6v7s="; - types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.9.0" "sha256-iQgYO2rjkaMI0xRslJRVAQ2HPcvj8tYM+/g2xQySY7I="; + types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.11.0" "sha256-/DHba3kzpgIfMOdWDo9EqDTGsx6qliHkTcOqRvyqVQs="; - types-aiobotocore-connect-contact-lens = buildTypesAiobotocorePackage "connect-contact-lens" "2.9.0" "sha256-4dVbw+1XCJnxkJLNyxTpibr1u2KPnuM9aSzk1/UuBxc="; + types-aiobotocore-connect-contact-lens = buildTypesAiobotocorePackage "connect-contact-lens" "2.11.0" "sha256-oB6joxqVfw+dcdA1Fp/V3VqHKTV3AzSF87WQliIjZOM="; - types-aiobotocore-connectcampaigns = buildTypesAiobotocorePackage "connectcampaigns" "2.9.0" "sha256-SpQk9aatNLlOxwNTghJYoOqlmv8NQBxVyMPsx0kDhFY="; + types-aiobotocore-connectcampaigns = buildTypesAiobotocorePackage "connectcampaigns" "2.11.0" "sha256-LKzrXJ3glGOLyZd+Cvt+S8d4kmqfJwDmWOpO8jVtZ/k="; - types-aiobotocore-connectcases = buildTypesAiobotocorePackage "connectcases" "2.9.0" "sha256-CaU1bmYjX/4+rgDqkkoOihLpzTxOoiquriDEGxruxoE="; + types-aiobotocore-connectcases = buildTypesAiobotocorePackage "connectcases" "2.11.0" "sha256-/A13kQO/qzO1vnslZiMRgB1QWgF8ap0mZDFQzowOpck="; - types-aiobotocore-connectparticipant = buildTypesAiobotocorePackage "connectparticipant" "2.9.0" "sha256-AsHLSsmfYb4WC0068U1VLvsA/h/V+IPpSsshPDj0yD8="; + types-aiobotocore-connectparticipant = buildTypesAiobotocorePackage "connectparticipant" "2.11.0" "sha256-TY4kD0Fyb195X8vjFavszY4KIirBxdu5TsWdpcHvcqY="; - types-aiobotocore-controltower = buildTypesAiobotocorePackage "controltower" "2.9.0" "sha256-oUPutZNbGyiIOow0sjhdyCmrcymVtVUfmV22CTa3jk8="; + types-aiobotocore-controltower = buildTypesAiobotocorePackage "controltower" "2.11.0" "sha256-XQID3eh3curqT6wBJ//7giHl+ALEMtdIhM+Ns8Bm3i0="; - types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.9.0" "sha256-PGAEGW5hQNiSvUmaO1c9ruV4p/geuSXuKUBBqfCn9h0="; + types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.11.0" "sha256-TiXil9jLCdO/pCFDUNIJpH2NC1TTdr9j+82Azgcdtfw="; - types-aiobotocore-customer-profiles = buildTypesAiobotocorePackage "customer-profiles" "2.9.0" "sha256-6TkyPbfYX4l+rg5fYAxL7YRk+q7btyAnUmZsddEEMKI="; + types-aiobotocore-customer-profiles = buildTypesAiobotocorePackage "customer-profiles" "2.11.0" "sha256-M2hWm/UhFkEMaY/ZojmAgTHXYmwJUAqOyhn37WNwGWE="; - types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.9.0" "sha256-dMNEL+UBheYxenwHbopFigH8y/WaVN9W37Qsm8hj2LI="; + types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.11.0" "sha256-mH+/ZBD/wW5KRCmt5Fmg6Bmd6svZfQw8NZgB89A3oY0="; - types-aiobotocore-dataexchange = buildTypesAiobotocorePackage "dataexchange" "2.9.0" "sha256-+fQQWK+j80sUcm5+cm1x4dmexMyzYLj+/wwSs7doPGM="; + types-aiobotocore-dataexchange = buildTypesAiobotocorePackage "dataexchange" "2.11.0" "sha256-jykGzUF1W5pVg5mzAC4J3EkhYgMNnXyyj0VesOyJfh0="; - types-aiobotocore-datapipeline = buildTypesAiobotocorePackage "datapipeline" "2.9.0" "sha256-Xbqot0kb2uRuzVw4mBDwXgUyxJmXNb7s00DfE12gnK0="; + types-aiobotocore-datapipeline = buildTypesAiobotocorePackage "datapipeline" "2.11.0" "sha256-XKdSE4yJdaoaHoER/9ktK0gmSco5RcZNi0oAuSh7zVc="; - types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.9.0" "sha256-h1JZgAPPSynyE2R3ZFr94gql6NNBtAAZzT/vLu36974="; + types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.11.0" "sha256-t72a9Uy1pw/PgN80VR6aG7sgTE35EnLN1zToP9j9jcc="; - types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.9.0" "sha256-m5XoWZXVHsz/tnVJTJikanRovgdjn9YA6fqCih+J2FY="; + types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.11.0" "sha256-60GCMrXfcFO/mDm1ThuHZIajDhWheUXR/FGdkRNb8Oo="; - types-aiobotocore-detective = buildTypesAiobotocorePackage "detective" "2.9.0" "sha256-u/RH0O+wJ+zSxENwkZ34qsvRyCLxYVcaXUwJSrRoWa8="; + types-aiobotocore-detective = buildTypesAiobotocorePackage "detective" "2.11.0" "sha256-HEGUGjXjiQd0jkPYFHQ29ZN4M12Gy/l9VEUHnu/G4RI="; - types-aiobotocore-devicefarm = buildTypesAiobotocorePackage "devicefarm" "2.9.0" "sha256-yZiJ42Tux6ElMCAonjsrlHIvIRMF8TndCgj8m2dqPgI="; + types-aiobotocore-devicefarm = buildTypesAiobotocorePackage "devicefarm" "2.11.0" "sha256-L8PKB1DfzGiKd5dEBT5EkxcR3a+P9wx5k4/J3yD2mSQ="; - types-aiobotocore-devops-guru = buildTypesAiobotocorePackage "devops-guru" "2.9.0" "sha256-YG4OKgu+APHPvnPJxWhb7F8P7mAzhg//0A5I34mL2WA="; + types-aiobotocore-devops-guru = buildTypesAiobotocorePackage "devops-guru" "2.11.0" "sha256-YtSwdniKZHpoOAfGy7w7QtkwdDuNtlUiiAxEraSMn6Y="; - types-aiobotocore-directconnect = buildTypesAiobotocorePackage "directconnect" "2.9.0" "sha256-hSaANopHROSG3tI1Oo76m+MMCN/BwlhdkIil5ej47b8="; + types-aiobotocore-directconnect = buildTypesAiobotocorePackage "directconnect" "2.11.0" "sha256-Vglr/xHMsRHm5yKu98ufddszmFtT0LeBVxyJRbZXzEU="; - types-aiobotocore-discovery = buildTypesAiobotocorePackage "discovery" "2.9.0" "sha256-4bT4zpTZ7dS2dnfIRCQO9kx4LxMqct+sGX0RwFYm3q4="; + types-aiobotocore-discovery = buildTypesAiobotocorePackage "discovery" "2.11.0" "sha256-wlZo+BFJ1MfwO2gF0jKRf/aUNlU9PGL8BmIXnRY8mzU="; - types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.9.0" "sha256-3CJqMAU6V6BnwImfNmDdTvvcbbhLTC6txb1rYsroiW8="; + types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.11.0" "sha256-yehavKHvxjCDzDo8YB25tgKzmxAGjEtRQDxgHtaFxPo="; - types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.9.0" "sha256-4LLK2nScAVX2XtHIj0ajO7MZhz7OV+xarlCr5Y2bjXU="; + types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.11.0" "sha256-BJXDtvCyJK/LDiVXzgOEH8rnK/EhsC1i/wF7f4bcAgY="; - types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.9.0" "sha256-jBEpqZFqzAY8KOsG7RhBzg0HVEtfwkmc6KfrpOmHQJs="; + types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.11.0" "sha256-fMM1lBiBdBpiEX9LCOtK85QDgiduht3tu3xdv4Yu/DM="; - types-aiobotocore-docdb-elastic = buildTypesAiobotocorePackage "docdb-elastic" "2.9.0" "sha256-WnGjpT3cf+KucO+p2uoerdyMvnW2vPEpSiPtSrPwqWg="; + types-aiobotocore-docdb-elastic = buildTypesAiobotocorePackage "docdb-elastic" "2.11.0" "sha256-VmQrMq6ia+qw2Fk1DxZsHgjTNccY9LnOo855YEmFNKw="; - types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.9.0" "sha256-ZS7Ux9Oa24Yvwl2R4ahsJMJKK2+ZkB0Gl5vymbF1KuI="; + types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.11.0" "sha256-As0IUtS4mDeiGRDY1rsz3WLURzIuvyO0/dKNGC7UvqI="; - types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.9.0" "sha256-LyM6Mu6f0Ophm5D7li+RORL3pPKMF31FGAjhKifFgK0="; + types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.11.0" "sha256-psuIC2nu/K6kLi0v1s5vhq0CCAqvuPy+E8J362qTLM8="; - types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.9.0" "sha256-11VNAEeYMpdv1QeHzfZF8s6eELfHAf+6kwZ98lZVtss="; + types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.11.0" "sha256-3ItFb+9nzA0hNEg62peBcYEPEFZVxR0Qa9z5vXfjkzc="; - types-aiobotocore-dynamodbstreams = buildTypesAiobotocorePackage "dynamodbstreams" "2.9.0" "sha256-V3KpPB/ZFn4ekwqCzAYlCd7Sm2eOmDSErKrW5Inq6bw="; + types-aiobotocore-dynamodbstreams = buildTypesAiobotocorePackage "dynamodbstreams" "2.11.0" "sha256-2Bwhic0Jag/dXemObH0WC5ZJR98VmE9lqLRKLOLyTZ8="; - types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.9.0" "sha256-P/xyl8314GuciTxaWNDqBxvTNIgBrmgwEGnf3ndFhhY="; + types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.11.0" "sha256-/cu++CeWRlZ54fD6YRH/qRJLHI+nKzCIbjAKYFiM/Ak="; - types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.9.0" "sha256-hZl7h0GbT4uW+xFrj+DrM78oBxVVkklUtdvPhiwD4IU="; + types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.11.0" "sha256-Hco3i5jPJAzAsgKxFQP+MNRNNeiYfJCGIG8l+C7gWnc="; - types-aiobotocore-ec2-instance-connect = buildTypesAiobotocorePackage "ec2-instance-connect" "2.9.0" "sha256-bsREnDH2iIpXXJTaAeFpdqTFUW8NXFYrnilCldvsZeU="; + types-aiobotocore-ec2-instance-connect = buildTypesAiobotocorePackage "ec2-instance-connect" "2.11.0" "sha256-OhpF/CqFX3EkigzPqDIuIun2nr3F+gH0O+5hsB4jXWg="; - types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.9.0" "sha256-aRogeu240sXzGG3SqtgPlMro/VgfZ+ab8mN8llrd0BM="; + types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.11.0" "sha256-Kw4ZzkV/dXvhOiPeFLJxdSJvMy1cTR+KpxTc56ejhQ8="; - types-aiobotocore-ecr-public = buildTypesAiobotocorePackage "ecr-public" "2.9.0" "sha256-me4OICl7bpjD8So1+Fi3WAPStmHN03Iy/UpSKkJ9vjs="; + types-aiobotocore-ecr-public = buildTypesAiobotocorePackage "ecr-public" "2.11.0" "sha256-VE4bwmg1i9Nai6xGz9AK6gREkxSIBs3QiUCyR04O12g="; - types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.9.0" "sha256-j7Uii76S/VHqEaCwY0oazbiZPjhHGzgNpDftur9sAdQ="; + types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.11.0" "sha256-A4KkWqtwvvDSBdHB3xBdwmaC033AdMvoVY9yloXz++M="; - types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.9.0" "sha256-RglLUdWAGoXqlhDeJ5YDuKRGBuN3L4/bX1ooiextOGM="; + types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.11.0" "sha256-tW4UvAdlX0edPquPSPxJU4ktMEXism8ghUtwZS6J/2g="; - types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.9.0" "sha256-VrEKbEiAKCuBQyKBRCY/XYD/4akxVF/x2aHpwTsp/gk="; + types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.11.0" "sha256-CIsxmM4gJ5Ds6FyNRixuTOrn2iigVWVjfOhnySLIC8o="; - types-aiobotocore-elastic-inference = buildTypesAiobotocorePackage "elastic-inference" "2.9.0" "sha256-gkzqiodMq81O8d8WTwsSHcXVRdcsW+fcH0UDkWVm6NU="; + types-aiobotocore-elastic-inference = buildTypesAiobotocorePackage "elastic-inference" "2.11.0" "sha256-qY+Cr4xGjG2ULl+CTHwbH5ljGHJopNLfrbMdkuOI7IA="; - types-aiobotocore-elasticache = buildTypesAiobotocorePackage "elasticache" "2.9.0" "sha256-v27Lu2Oe+kTjXR82WcJ+ocSSiYcepLt8J4E0e3gTSQQ="; + types-aiobotocore-elasticache = buildTypesAiobotocorePackage "elasticache" "2.11.0" "sha256-MDGyOh+cwmUoNXs/bQNss5lgCzplAOVKcKC4djAGykw="; - types-aiobotocore-elasticbeanstalk = buildTypesAiobotocorePackage "elasticbeanstalk" "2.9.0" "sha256-2NBo1cUIyXTWkrMQaGt5oQfLovrhdZAtNIrA3KmyBNI="; + types-aiobotocore-elasticbeanstalk = buildTypesAiobotocorePackage "elasticbeanstalk" "2.11.0" "sha256-gQcy3oD2JDa/yncQP8wb1xl+WNDbQphO8YBQEeJ4BHQ="; - types-aiobotocore-elastictranscoder = buildTypesAiobotocorePackage "elastictranscoder" "2.9.0" "sha256-eDz+7wmr8LIkO1LtxvLoHrfVllycbcQRHA8HLfK/Aig="; + types-aiobotocore-elastictranscoder = buildTypesAiobotocorePackage "elastictranscoder" "2.11.0" "sha256-8MNsjca7iVgs5t7v0zvIXV26vL6gKxXlGzFEONlKgHs="; - types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.9.0" "sha256-nj8CLLrTrGS7GOC90xGxDqVLhxK3mvmWthUucwcf7VU="; + types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.11.0" "sha256-XXf6dX4HXJGjmEvexMOTb8Pv+lF4bXJyKE44kXJwlig="; - types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.9.0" "sha256-ILngqOQ5oVsgGj6LRYlx/LrfKf85aakeRP+z96z2FnE="; + types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.11.0" "sha256-oOPJPa6Tn9+BrlTENXFhmvN/KI+0w0BKrKnmYbu6x9Q="; - types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.9.0" "sha256-pazXV8RBOciYO4DT8N5Ztl+prpSMqY4PtHTw6fpDVrk="; + types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.11.0" "sha256-+xoCUWrwXEi8q+7Hm3b3kvEzXS/JymrP2fYJIPWLzRI="; - types-aiobotocore-emr-containers = buildTypesAiobotocorePackage "emr-containers" "2.9.0" "sha256-rgnCpxI5VF5PIks1ucO18odXbdJLY6avolYSSYM/ucs="; + types-aiobotocore-emr-containers = buildTypesAiobotocorePackage "emr-containers" "2.11.0" "sha256-F0hz9aHxAf/aHqhXsuA+mvHcFr/5pfVVKdsmmDW7rI4="; - types-aiobotocore-emr-serverless = buildTypesAiobotocorePackage "emr-serverless" "2.9.0" "sha256-ONqc3bBUEpKy6+GlOtZf8Sqf+NaQXbRvVdu/NtA8g/U="; + types-aiobotocore-emr-serverless = buildTypesAiobotocorePackage "emr-serverless" "2.11.0" "sha256-Ge3xhHySq3tXxe1JCj7hdaUjeAfzZkCncJb0Navz6Ic="; - types-aiobotocore-entityresolution = buildTypesAiobotocorePackage "entityresolution" "2.9.0" "sha256-du/tPdrQIaCvndaZMU5Bz3biL8GxT1PQGR/rRbSioTk="; + types-aiobotocore-entityresolution = buildTypesAiobotocorePackage "entityresolution" "2.11.0" "sha256-ey4rDsAWGsJrRECRbPousQb/NSGfwRRshWHqDrDBhqs="; - types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.9.0" "sha256-2zELfFO2ukQ3CIBA72Ktd67H+VtLSpXEJ8bAARb+Nas="; + types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.11.0" "sha256-6cDHUdWst+oatMZP9S13vySIyZUQ02GqRlfaOGUkPDQ="; - types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.9.0" "sha256-wluojbZEFpeJcLDmNqcBzVyAbXi2oe65MNDsSxizwbI="; + types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.11.0" "sha256-OIZdgxxmfz7HXfZbRlzqK6x1aITXN9NXRp4LBxFmlM4="; - types-aiobotocore-evidently = buildTypesAiobotocorePackage "evidently" "2.9.0" "sha256-y2ZTQ/N2YXFBylexjWfEoeUxlhSNEykUNqzhFvjDprE="; + types-aiobotocore-evidently = buildTypesAiobotocorePackage "evidently" "2.11.0" "sha256-1/YBIoqBgY1RPCrP/REd5iMYpqFXUXm3AFB6CfUo7F8="; - types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.9.0" "sha256-JJ1KeDC+sUkixipaE/eEPZLxu4e1IP+yaGrHr/eh2kQ="; + types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.11.0" "sha256-Zlv1GzIn79GTgvtOe+4loAHXwDaYX1BiQYG3Fg4y9c0="; - types-aiobotocore-finspace-data = buildTypesAiobotocorePackage "finspace-data" "2.9.0" "sha256-9KCNrLD1vKELitGKWmEKLDsniQTZ+CSLPqJIXU/Ndkg="; + types-aiobotocore-finspace-data = buildTypesAiobotocorePackage "finspace-data" "2.11.0" "sha256-Zb5qmBxMqvuxczqOcwQCL7T4Ur4w9ESiWHAu+Wdq2zM="; - types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.9.0" "sha256-NY8XyhCzze30cdDT76faqaFRuhwD43DjTc59h6LwN4M="; + types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.11.0" "sha256-O5is88jjNqe02YEXhxQojonvzXFCUW+YPl9DM5GmKjQ="; - types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.9.0" "sha256-oVOz3nStBFvOrlJEy4v9kKjkBbM/cubP/01KUnGGKIk="; + types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.11.0" "sha256-Vmtl3JWRi38gMtA0XEPObaROjUKjzv9LToWWOANx1Ds="; - types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.9.0" "sha256-YdsSwRZitM81L1VrQ8MWLAo5OzMVYHhHlLn0cr+rX1M="; + types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.11.0" "sha256-fIbCkSX6wG5J+IJQh2JXD6TtZOPTOIZQHXlHdVz1LcU="; - types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.9.0" "sha256-PSlAjO+J5FmGeerxaXGLblTsxCV/N3pgrp9YE+wbuLE="; + types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.11.0" "sha256-kISZKBx6dlTqXUZ6PO3nlZzccw8daR1EZpN0AaBpcbI="; - types-aiobotocore-forecastquery = buildTypesAiobotocorePackage "forecastquery" "2.9.0" "sha256-6wtsWxphhZX6EXACPnQoOEk5jhYU2F0O6uQWd4YcmMU="; + types-aiobotocore-forecastquery = buildTypesAiobotocorePackage "forecastquery" "2.11.0" "sha256-j9jlpZjefqX4sB5D0hnMTd0ZQ8ht+4rt9kJuAByBgGU="; - types-aiobotocore-frauddetector = buildTypesAiobotocorePackage "frauddetector" "2.9.0" "sha256-baWI2JgVwKt009qHelIWdlinITQx3PMmDL2GR4JYs7s="; + types-aiobotocore-frauddetector = buildTypesAiobotocorePackage "frauddetector" "2.11.0" "sha256-DJN85JyJyhX3JDahAmFQbwoKbGR1oYvUs9VsPuiHcrY="; - types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.9.0" "sha256-9U5ZyZVlovbMhAEpdxatXMdG+4UiNDzCgOPcolFVz+o="; + types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.11.0" "sha256-XCkjME0B8wKycmqHu+magBP6dtVdLRa9j4I9H7gwHKM="; - types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.9.0" "sha256-zMDERQRfFSDc1ULOKnxh0pCJFto19rc/S4MpPWp/AIQ="; + types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.11.0" "sha256-xolmKH6/Ea0JGBF8ZnNGxG31SDFiGIP4+l2hq7CAwTo="; types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.6.0" "sha256-9iV7bpGMnzz9TH+g1YpPjbKBSKY3rcL/OJvMOzwLC1M="; - types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.9.0" "sha256-gwWW/i5HfpPyNOTW+B2oXm8RiTMBWrlzfdrS15ysR3g="; + types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.11.0" "sha256-K96KMoNKQuVzQMsBg8PC+Vp0tZCmkgjuWXHc//hlS84="; - types-aiobotocore-globalaccelerator = buildTypesAiobotocorePackage "globalaccelerator" "2.9.0" "sha256-5w83+uCKnfu2JzAhyhNgyw2fJGHOzLOgS9ihuZ5mjXc="; + types-aiobotocore-globalaccelerator = buildTypesAiobotocorePackage "globalaccelerator" "2.11.0" "sha256-wneACGl4MR+jarW0rIqg15lHBFou/rnULzG2Jv8aI+k="; - types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.9.0" "sha256-UWnIh8+CcSpWPvAHnWJrLORqFKkMSHvxV2QIO2kLHxg="; + types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.11.0" "sha256-/RUFpcd1Jglx7Wxs74W7fFIPTbAVPhicCLfxl5Vtp8U="; - types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.9.0" "sha256-LWncyuBU2zDhoF5ob81cg+NWlOI8QiZkbpUSRRolh9E="; + types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.11.0" "sha256-Zat6MDfQ/rCSB5Ydn7FPO8LMKl2wRNYZCpVKoXLKrpo="; - types-aiobotocore-greengrass = buildTypesAiobotocorePackage "greengrass" "2.9.0" "sha256-pjBy3YHHblL5JWCycMfZxpFQdPyAGla9TVmLLceRsrY="; + types-aiobotocore-greengrass = buildTypesAiobotocorePackage "greengrass" "2.11.0" "sha256-hxGI5jMrscgxIF9Mke6s7tM0CDllDM4EHU57Q/EdK4Y="; - types-aiobotocore-greengrassv2 = buildTypesAiobotocorePackage "greengrassv2" "2.9.0" "sha256-IAlQveKtmaP02odHz8WQdNdWLFjz0gPr66HMSyOhnMs="; + types-aiobotocore-greengrassv2 = buildTypesAiobotocorePackage "greengrassv2" "2.11.0" "sha256-FiTsLALc/FvB4AsDWThiHfC2+M/J9mrS7GixrzqEv/M="; - types-aiobotocore-groundstation = buildTypesAiobotocorePackage "groundstation" "2.9.0" "sha256-qcjfgSR8lbOus3bcx/zlPSuGJ53B/Kuo1GCyU4VsYMo="; + types-aiobotocore-groundstation = buildTypesAiobotocorePackage "groundstation" "2.11.0" "sha256-aOvnThGfSamrhxPypI7MKIwd8zEMuhw/o/UeGxZmmDU="; - types-aiobotocore-guardduty = buildTypesAiobotocorePackage "guardduty" "2.9.0" "sha256-ecsB0KFITMENFwZX2EKpmToi1iYTeeRtrooAX3zXfpc="; + types-aiobotocore-guardduty = buildTypesAiobotocorePackage "guardduty" "2.11.0" "sha256-N1EyD7esyQYNdEk3qWcekH+/kpebR9kCgkBtiBuTLBU="; - types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.9.0" "sha256-nz7sUPMH8gVy5Oz+eatRd8iLfHKxcDHFRIqh80EuZWE="; + types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.11.0" "sha256-5P2n0Fgk2ESOm99uEdgZoe+Sba20vyCUsJdl0n5Aylk="; - types-aiobotocore-healthlake = buildTypesAiobotocorePackage "healthlake" "2.9.0" "sha256-S8Ds3s45HY0b007saVNSd0bfmvP3lbSNXEWUSBCsD/8="; + types-aiobotocore-healthlake = buildTypesAiobotocorePackage "healthlake" "2.11.0" "sha256-Y8+aQARCeYuIfuxLU31gjY5NGbp4p6Hpamgn0XtyuM0="; - types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.9.0" "sha256-+D9MESYNaP60NSl/5OKLVyHQQqikU4AHR6CV+wb1J58="; + types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.11.0" "sha256-E1L7Q11HLXscHOrxPss2fRNjEykdQRa28yKmGzvgIk4="; - types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.9.0" "sha256-b1VvcL7w/QC4svZCuDnP+OC+wOHWvrArUFLCw94S7Vw="; + types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.11.0" "sha256-/ukLk4kKSVtsJ8MNXw58bn6l+0mlAeDPVaO1EwiD9oA="; - types-aiobotocore-identitystore = buildTypesAiobotocorePackage "identitystore" "2.9.0" "sha256-qsU85n679BxZn3QgC0iSXnX+GANPhdUNQuSn5/WIjq4="; + types-aiobotocore-identitystore = buildTypesAiobotocorePackage "identitystore" "2.11.0" "sha256-JSGf1XwnNTVEEQR2KyI2krBqSEgEFw84IR1gdrdPdi0="; - types-aiobotocore-imagebuilder = buildTypesAiobotocorePackage "imagebuilder" "2.9.0" "sha256-U3PWbTbhSb48R1QPdzH1kLBI/Y6Iv1MnQz1IeuaQGj8="; + types-aiobotocore-imagebuilder = buildTypesAiobotocorePackage "imagebuilder" "2.11.0" "sha256-fOVxWpaqJVa1sjhEm4ZzgfdnxIQlIxUeORbLG5a4A0A="; - types-aiobotocore-importexport = buildTypesAiobotocorePackage "importexport" "2.9.0" "sha256-vnnAftGX1FxCdqz9ROaWcuaugIDXPfySRWVJieU33VA="; + types-aiobotocore-importexport = buildTypesAiobotocorePackage "importexport" "2.11.0" "sha256-YVcmN00t47DMu1L9toL4D33rWPfqkQa190RZJ9KcEbM="; - types-aiobotocore-inspector = buildTypesAiobotocorePackage "inspector" "2.9.0" "sha256-4tYe+EtujEhaVYbddCBuVSoGzai0+oiJPxkZ+fxxz9M="; + types-aiobotocore-inspector = buildTypesAiobotocorePackage "inspector" "2.11.0" "sha256-8A93fS8hGK8DMZB4t5fK68PDKzxrYmVDa+UCkhhMUxA="; - types-aiobotocore-inspector2 = buildTypesAiobotocorePackage "inspector2" "2.9.0" "sha256-VXniTrBibInkgj0jMWbb9RD8+Er9JUJ0xfAeWfwKdXE="; + types-aiobotocore-inspector2 = buildTypesAiobotocorePackage "inspector2" "2.11.0" "sha256-PqoT60G1gxTFoIx5ro2Q0aCnE9wCXTz5nZO+CVNzUKM="; - types-aiobotocore-internetmonitor = buildTypesAiobotocorePackage "internetmonitor" "2.9.0" "sha256-70lW/bzAirzq1ui/TtiFyKGesZMJ3Z8jwGgc3j0GoUk="; + types-aiobotocore-internetmonitor = buildTypesAiobotocorePackage "internetmonitor" "2.11.0" "sha256-YbIqecsNgBdG0ruscwRiPhOQHmejIDopHVDG7RfeYxA="; - types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.9.0" "sha256-j8i0uB5Ul4pxxMjyPdR94ssh1lus4MAR1Il31ueJiw0="; + types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.11.0" "sha256-XVJ6Te10TqF8y9+A7GN+fD751K4twpLvA4SmTSqc10I="; - types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.9.0" "sha256-9gblz4bopGjfFh3dgw0Jy7KVl8SNO+kE8l+l5mAgUws="; + types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.11.0" "sha256-XG1i5KepPmHiuCVPBK7YeQCEIM8ZqgnvIqEtcI90xN4="; - types-aiobotocore-iot-jobs-data = buildTypesAiobotocorePackage "iot-jobs-data" "2.9.0" "sha256-wykkgo48vdRg401bVR1TxCFFZXzESjeZM8Tc7wPVI6w="; + types-aiobotocore-iot-jobs-data = buildTypesAiobotocorePackage "iot-jobs-data" "2.11.0" "sha256-pPreUhwzaK65rZi/TjNX+HMFYF0pr53xKKrL7euxX84="; - types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.9.0" "sha256-ufnfEl+MjD/FAJ6ga2/rAvVrAbg+lCqwXxh58VDezxk="; + types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.11.0" "sha256-p3SLJJSU/dwGtZxRacLBVIagJ0b52j+IL4Mni2E0pVo="; - types-aiobotocore-iot1click-devices = buildTypesAiobotocorePackage "iot1click-devices" "2.9.0" "sha256-8TF24GJwZT8c0XBV15XOJqP4/pMPdanURcxnbVu8gRg="; + types-aiobotocore-iot1click-devices = buildTypesAiobotocorePackage "iot1click-devices" "2.11.0" "sha256-cTPED/zwtypKNxX2s3ZkOsVhGNvCRs26REiL+1EpCgI="; - types-aiobotocore-iot1click-projects = buildTypesAiobotocorePackage "iot1click-projects" "2.9.0" "sha256-IV8WCyvx2BVG5R3JUM2Q8r5n+qlVd/JiLUneW6DcQTw="; + types-aiobotocore-iot1click-projects = buildTypesAiobotocorePackage "iot1click-projects" "2.11.0" "sha256-vshDzMpLr67eVAXaQIFXk+EbLL9rnw0qTQDarvfXMk0="; - types-aiobotocore-iotanalytics = buildTypesAiobotocorePackage "iotanalytics" "2.9.0" "sha256-00lziwTYF800ejKy11K26LL1GpFi3e+57OQwQk4KN4s="; + types-aiobotocore-iotanalytics = buildTypesAiobotocorePackage "iotanalytics" "2.11.0" "sha256-pH5VdrjZbMgaPIzDdG02aUvTzfuQAVHt++Bf7V5pn68="; - types-aiobotocore-iotdeviceadvisor = buildTypesAiobotocorePackage "iotdeviceadvisor" "2.9.0" "sha256-/FnVwPFQTDi0XGYf1N5rzUUV9HLqy+xrDIdIlwbhEqY="; + types-aiobotocore-iotdeviceadvisor = buildTypesAiobotocorePackage "iotdeviceadvisor" "2.11.0" "sha256-fSlti+/6WF21b7wO24zK3PC4eftPnRvJM6MqFWMsnRU="; - types-aiobotocore-iotevents = buildTypesAiobotocorePackage "iotevents" "2.9.0" "sha256-Tsj+xTdDp2iP3suK6Y09hLwOOA80xJ/HH76f6rmbsSI="; + types-aiobotocore-iotevents = buildTypesAiobotocorePackage "iotevents" "2.11.0" "sha256-Nrx27vWS8QFcWGQ0fE/gUwbwJ8mj3seWnuauTuJvVDY="; - types-aiobotocore-iotevents-data = buildTypesAiobotocorePackage "iotevents-data" "2.9.0" "sha256-DPq/6llPXr+gUikXOqRuakoSL5pOLu21AXFabe2krk0="; + types-aiobotocore-iotevents-data = buildTypesAiobotocorePackage "iotevents-data" "2.11.0" "sha256-Rbw4qP/duKCSEvQMeGLMrT0dBiR9tTqzt9BOwgX0QYI="; - types-aiobotocore-iotfleethub = buildTypesAiobotocorePackage "iotfleethub" "2.9.0" "sha256-C56Ab8SK7LVCL0rQ0MaykTpfh+7q1GWvNpO1T6QLxYw="; + types-aiobotocore-iotfleethub = buildTypesAiobotocorePackage "iotfleethub" "2.11.0" "sha256-NNZk/u0xUBPZiWFtnwZRibnTVYVfHYFCBz4wZIsLOUM="; - types-aiobotocore-iotfleetwise = buildTypesAiobotocorePackage "iotfleetwise" "2.9.0" "sha256-Sdnl//LbfuifTiQXyvDprkaZi9/MG1i51QijsKNyvp0="; + types-aiobotocore-iotfleetwise = buildTypesAiobotocorePackage "iotfleetwise" "2.11.0" "sha256-x+dKJMb8cpGyFf3L2ErOrjt2xNEg9gasDbbdoVaTYSY="; - types-aiobotocore-iotsecuretunneling = buildTypesAiobotocorePackage "iotsecuretunneling" "2.9.0" "sha256-d4/KliyqdzNJRICYyU6aTs1rrzF+W7B7xpywPG5KDik="; + types-aiobotocore-iotsecuretunneling = buildTypesAiobotocorePackage "iotsecuretunneling" "2.11.0" "sha256-r4uPC1GPoGvoIs9+lJW5rjhgKSI5hJiTKBd4lpCuVxk="; - types-aiobotocore-iotsitewise = buildTypesAiobotocorePackage "iotsitewise" "2.9.0" "sha256-6+nlzU+QZYgNoaE39Md9hT0vYM3DLQoRl5jIEK2HiGQ="; + types-aiobotocore-iotsitewise = buildTypesAiobotocorePackage "iotsitewise" "2.11.0" "sha256-NUH187B29S4bnOdiJHFUnpVPIZHuf/IJ2Ejy4yZW6r0="; - types-aiobotocore-iotthingsgraph = buildTypesAiobotocorePackage "iotthingsgraph" "2.9.0" "sha256-Ou+3C8Gir/InKP5sLv08F6M9FOH51/bQSpqoAezjr44="; + types-aiobotocore-iotthingsgraph = buildTypesAiobotocorePackage "iotthingsgraph" "2.11.0" "sha256-Pr5O3c/zjCwBNdw8t17Rt5yrfeJFW9O5HvUohh/Xza4="; - types-aiobotocore-iottwinmaker = buildTypesAiobotocorePackage "iottwinmaker" "2.9.0" "sha256-9fi9KvxlvSjBSDBtpvzKUQ8AA1Bl+awBgA4kckOF5+w="; + types-aiobotocore-iottwinmaker = buildTypesAiobotocorePackage "iottwinmaker" "2.11.0" "sha256-NNd0gsoQzqZVUYYncNoqyP6OMl9J+ijBXKuApPiqkFY="; - types-aiobotocore-iotwireless = buildTypesAiobotocorePackage "iotwireless" "2.9.0" "sha256-GIPR7G7l1BTFVrURSJsJKwCwjXozrIyHZqdLzWrLj2A="; + types-aiobotocore-iotwireless = buildTypesAiobotocorePackage "iotwireless" "2.11.0" "sha256-RD48FPh2hh9A8Q2KdFkMGmqE8mzI5eKhhYFaOIo+tx4="; - types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.9.0" "sha256-XXUYFZqxU9K6UZEpFxQORvqmpC/b3/JFOI3P1IX08kc="; + types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.11.0" "sha256-IRhw8nWeCMzviscWn0ksaBcuW5K2Ha5S/zShZJ5RFw0="; - types-aiobotocore-ivs-realtime = buildTypesAiobotocorePackage "ivs-realtime" "2.9.0" "sha256-HFRzKZmGZQJO//hoP6Buha2KH1JVbwvQW8N4IG69ZdA="; + types-aiobotocore-ivs-realtime = buildTypesAiobotocorePackage "ivs-realtime" "2.11.0" "sha256-kfOtvZ/f5awN9x6Npbf6aMFcm5UlzlJiBewaeBsuRjo="; - types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.9.0" "sha256-P+PaFBQs24/KTvcmAU7AtLeKW/sfePbRj++m8lQdgLY="; + types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.11.0" "sha256-w9RDhBEeUPI/w3ZdlVUR6MkUQnh8lyJB6k+5txpS7TU="; - types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.9.0" "sha256-TCgBYbKAaohObSeBuJ8jOjHZASNJrS16RTVdSCFLOjc="; + types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.11.0" "sha256-gS3ehhl6Ff1py+SNktpEbfzCyZb0hYqpgI8IBr5zyug="; - types-aiobotocore-kafkaconnect = buildTypesAiobotocorePackage "kafkaconnect" "2.9.0" "sha256-w8XWZ2J7LKHe9fmS/bI0tzX/Pp8ezHYZs6bgSeI0CxI="; + types-aiobotocore-kafkaconnect = buildTypesAiobotocorePackage "kafkaconnect" "2.11.0" "sha256-8mM82WjPweo68zoeDPG+oBPaukE7HdfqNAgzAXwgEmw="; - types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.9.0" "sha256-4T9pwC8a61FQZgWj57NbH4uJBN3OeDAmOJLd/ZQOf04="; + types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.11.0" "sha256-ux8BoOOyqSN9IQGapfJMrAF1hOKQ2VnXUQtjWsn6Rgg="; - types-aiobotocore-kendra-ranking = buildTypesAiobotocorePackage "kendra-ranking" "2.9.0" "sha256-MYirajXde6U4Qy1gMT9WeZ8A778jVNeSV7ms4IWmwRA="; + types-aiobotocore-kendra-ranking = buildTypesAiobotocorePackage "kendra-ranking" "2.11.0" "sha256-qqT07tPM/7SUrMCzjJ1LnF6/q09+MjjdpClU+GEWOPY="; - types-aiobotocore-keyspaces = buildTypesAiobotocorePackage "keyspaces" "2.9.0" "sha256-VMRYuJ97TdlvfYLbnzIzh/bDrYM5JfMS0eEHltXT1Hc="; + types-aiobotocore-keyspaces = buildTypesAiobotocorePackage "keyspaces" "2.11.0" "sha256-Q9j7pWVHEsO94u6YIEJxpjqgGsamHGiaVUMR2R6r2EE="; - types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.9.0" "sha256-EV//x+21dM7Olz876nZlUZVFlabuCothyxFrT7MpcqA="; + types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.11.0" "sha256-8cSzwbzat/TVgRGca3ASOM+BkxkztRKKWth5nWoXwyE="; - types-aiobotocore-kinesis-video-archived-media = buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.9.0" "sha256-lP+YgnzAB5e1F2OAwFyPHslYiNZswc6tSLZ4F9OpfD4="; + types-aiobotocore-kinesis-video-archived-media = buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.11.0" "sha256-yYVAiUmpQgeeBGHFsjAGK1VrbbjOsQe82uq9JYgYnds="; - types-aiobotocore-kinesis-video-media = buildTypesAiobotocorePackage "kinesis-video-media" "2.9.0" "sha256-VvXlHziQ/ehNaZ7r8DRwXCviK1Zwi04805+josYiIjg="; + types-aiobotocore-kinesis-video-media = buildTypesAiobotocorePackage "kinesis-video-media" "2.11.0" "sha256-rdX7ZPvQBsmYDW/w6BD/e5O62FZ1RClg0icPnIlr8DU="; - types-aiobotocore-kinesis-video-signaling = buildTypesAiobotocorePackage "kinesis-video-signaling" "2.9.0" "sha256-essOlk7mViB1gaphCiybJncXX7USKk3K7Rt1r+ecTBk="; + types-aiobotocore-kinesis-video-signaling = buildTypesAiobotocorePackage "kinesis-video-signaling" "2.11.0" "sha256-Cs8FzA2hr4ZKLc5OVAtxIG46+yrYtSUwi8QHXAlkBD4="; - types-aiobotocore-kinesis-video-webrtc-storage = buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.9.0" "sha256-KGlU4WaBWQh7nvaqmktkpaSvyJSGtQ2//io9puKB9qA="; + types-aiobotocore-kinesis-video-webrtc-storage = buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.11.0" "sha256-TuhN5P8g8bFPeM3V6vqd5uikG5tDcmhxx28h5d/bb4I="; - types-aiobotocore-kinesisanalytics = buildTypesAiobotocorePackage "kinesisanalytics" "2.9.0" "sha256-2SnuovecO3+lQwNfA1+CtifQWkuall8zQbMNvH7fQGo="; + types-aiobotocore-kinesisanalytics = buildTypesAiobotocorePackage "kinesisanalytics" "2.11.0" "sha256-lBIa5TTvs10qxZX8v/Okkx2bNByYtJu+wqQmH6oPO4s="; - types-aiobotocore-kinesisanalyticsv2 = buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.9.0" "sha256-O0W2jEiHV1XCmZq+DtrkRZXJSIiUulsX7Tt+oVLjOcY="; + types-aiobotocore-kinesisanalyticsv2 = buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.11.0" "sha256-U0XmJlt1SAA2gsOB8uPGYci6xUxRCEKYNkEubZo0sj4="; - types-aiobotocore-kinesisvideo = buildTypesAiobotocorePackage "kinesisvideo" "2.9.0" "sha256-tv1mzlK2ccp6Ea9bBNrTHo5E6gCWr1OHR/M7119bM00="; + types-aiobotocore-kinesisvideo = buildTypesAiobotocorePackage "kinesisvideo" "2.11.0" "sha256-m0+AuxYJ4pkd4+vvIDbL00wky2+ni5ct7b1+G4TmorM="; - types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.9.0" "sha256-I3NUNatXbcd5bJJlwox92ZLHH8K0i7Eg05ygdPsgT8E="; + types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.11.0" "sha256-4d/xpDpgi35aYBw01TKs2HBtQlTTYJVogLiL/o8b6dI="; - types-aiobotocore-lakeformation = buildTypesAiobotocorePackage "lakeformation" "2.9.0" "sha256-jcCQw7bdwDGSkkPFI9t7vxvHpVRuqI99myHWzFG+ivc="; + types-aiobotocore-lakeformation = buildTypesAiobotocorePackage "lakeformation" "2.11.0" "sha256-v3ybODPtGQ6gYb21EDJhTY3z7y92lsk0oFzsr1KjSjQ="; - types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.9.0" "sha256-p0gG1HwHYTk7TuE6BiPPhxEcegoCqu4JLdXoFpyy5Ps="; + types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.11.0" "sha256-Q9aPKenHsfsdak1rrJ67nnG6qqyr+sQBxLTYN0Hiccs="; - types-aiobotocore-lex-models = buildTypesAiobotocorePackage "lex-models" "2.9.0" "sha256-iapgXNpWmUuQtDmSouZoBf770ZFFeBg2qCxkmhNR1lc="; + types-aiobotocore-lex-models = buildTypesAiobotocorePackage "lex-models" "2.11.0" "sha256-4H/KRmYnp41L4A2nU1h0DEmEDSZlxuciykDERYGjt70="; - types-aiobotocore-lex-runtime = buildTypesAiobotocorePackage "lex-runtime" "2.9.0" "sha256-9A47OeYzpWp+k02C77P8gHpdEHom7XmEH8JS2mh5TAA="; + types-aiobotocore-lex-runtime = buildTypesAiobotocorePackage "lex-runtime" "2.11.0" "sha256-sfeUFQBySYHD8m21P6UtcRxQi5TqfSIYgRraz5pMXL4="; - types-aiobotocore-lexv2-models = buildTypesAiobotocorePackage "lexv2-models" "2.9.0" "sha256-IqM3pr5JDBylz73YilEChhlEvvk1H9+lx24E0DvbPMA="; + types-aiobotocore-lexv2-models = buildTypesAiobotocorePackage "lexv2-models" "2.11.0" "sha256-ytU6H7PUtQXvxECRLYAc8VF344ttXAwmhCZyx+pPPLM="; - types-aiobotocore-lexv2-runtime = buildTypesAiobotocorePackage "lexv2-runtime" "2.9.0" "sha256-8Uuu8yCz7GkVoAyCAJGO8TdKyVAV9aScjLguHvPzMT0="; + types-aiobotocore-lexv2-runtime = buildTypesAiobotocorePackage "lexv2-runtime" "2.11.0" "sha256-BgGVEaDqaqQGZMMKNjlZ5AQvoQqjyTwrXh3DO47GKZo="; - types-aiobotocore-license-manager = buildTypesAiobotocorePackage "license-manager" "2.9.0" "sha256-LFojS+okyetuWB/i2NBXWb2rAkqziigx0cq5xj+YSsk="; + types-aiobotocore-license-manager = buildTypesAiobotocorePackage "license-manager" "2.11.0" "sha256-SePLjtNFOw0io9+IF9TOAZ75mK5LTjFqTyu9zgMIXII="; - types-aiobotocore-license-manager-linux-subscriptions = buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.9.0" "sha256-XQC3AGX/PtX9/c5NmwuIBPsXIuaUobSf6Bn+WYgSvJw="; + types-aiobotocore-license-manager-linux-subscriptions = buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.11.0" "sha256-Nvngx57lLhCHJe1J2kW9giuVqVlDTWt2G0/V+F3qhbQ="; - types-aiobotocore-license-manager-user-subscriptions = buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.9.0" "sha256-sdUnhXztbU0Ud39fzE/bWvOknrivY+qpLgSY5myURro="; + types-aiobotocore-license-manager-user-subscriptions = buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.11.0" "sha256-sogBe6kjxz5m5pWuMyoDnxAV57W1sLPa2hGLpfSBrx8="; - types-aiobotocore-lightsail = buildTypesAiobotocorePackage "lightsail" "2.9.0" "sha256-tTrZxkme+JeyXeuyWI3F7lr9mB+thfJaukNmIyaPBZc="; + types-aiobotocore-lightsail = buildTypesAiobotocorePackage "lightsail" "2.11.0" "sha256-qF/6aoOLZ6s9L+kemCc/F7+d0AgTRlfQws2YZAi3kVY="; - types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.9.0" "sha256-5Tiufq/wTJ89p3K4x1k/40cbL89M0O3dF6POFYMNr4A="; + types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.11.0" "sha256-w5B+PvK4s+oQN79qTBCp0FXnPNT9WqFuUHQEzPAamCU="; - types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.9.0" "sha256-FrDg0lFXFTwBE81DZ4VOICgZLvDscip0k5oOGVXdRQ0="; + types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.11.0" "sha256-D+loPH8h5FX9Hu47ITN10TleVofFJOHfid+GjdpL3mg="; - types-aiobotocore-lookoutequipment = buildTypesAiobotocorePackage "lookoutequipment" "2.9.0" "sha256-IhhEOxTZVrKs6HxrkjssZEjV33wYX9rCpPG7SdinTRw="; + types-aiobotocore-lookoutequipment = buildTypesAiobotocorePackage "lookoutequipment" "2.11.0" "sha256-EJ3cdEwiwcSorBLVGol94HKFyD+ChDBhPjJ7mnA32e8="; - types-aiobotocore-lookoutmetrics = buildTypesAiobotocorePackage "lookoutmetrics" "2.9.0" "sha256-TKzrgxj0rLBfeolbqKTSPjjZIJa7BC0wdpV2pY1K2BA="; + types-aiobotocore-lookoutmetrics = buildTypesAiobotocorePackage "lookoutmetrics" "2.11.0" "sha256-kuj4ZPqhtW3O7jpPEHwuAW5JsySJlyeno5P+azunwl4="; - types-aiobotocore-lookoutvision = buildTypesAiobotocorePackage "lookoutvision" "2.9.0" "sha256-TZKj6Vo0pEmwN7jlC2JxXhm9/IX58FJDRHqZSILF0zk="; + types-aiobotocore-lookoutvision = buildTypesAiobotocorePackage "lookoutvision" "2.11.0" "sha256-oz/Q5mpo1K9lX8M9JQ9vI6S1jxCpF/2MIZiecN46zAU="; - types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.9.0" "sha256-7DFARf/Jd0cPLKl3sxttpLn2cBZpC/xMyzQZbIsiko0="; + types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.11.0" "sha256-JIUQzdIxJHbzgELIy+EmYytNvv4efsi0YL7g44VAEk4="; - types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.9.0" "sha256-UPTKT53+mTHnVmuMSaGhBT+KEYsaTvOdBcQ1Em/SEis="; + types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.11.0" "sha256-KPyxVo5foHyKEMpjT0Su3PzD45TUBEb9FhcG2k/YA2k="; types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.6.0" "sha256-gbl7jEgjk4twoxGM+WRg4MZ/nkGg7btiPOsPptR7yfw="; - types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.9.0" "sha256-GmSUlIinWqaxsQpTsIWNgEsZXUdheMiDs/qpHfbGAUs="; + types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.11.0" "sha256-sCwedjPAwXdID4eCENDCbqqazrNFemM9OodgxaXqnas="; - types-aiobotocore-managedblockchain = buildTypesAiobotocorePackage "managedblockchain" "2.9.0" "sha256-8ZTWT2U0eMkXqCbOTCMkKWo7x2lIyEAbSYZ2P0ssp3c="; + types-aiobotocore-managedblockchain = buildTypesAiobotocorePackage "managedblockchain" "2.11.0" "sha256-njTF1fiVk8VezuzSRPNgA+HYZ089cXFTiGsci/yJ/RQ="; - types-aiobotocore-managedblockchain-query = buildTypesAiobotocorePackage "managedblockchain-query" "2.9.0" "sha256-0KUY9/My/m2dcxtw59yFZJHdCSZcrSfkdzHDgxBtEnE="; + types-aiobotocore-managedblockchain-query = buildTypesAiobotocorePackage "managedblockchain-query" "2.11.0" "sha256-reshSY32SwJFCMiT1lifRqQkxofXeDGwiEuVc+sA5jg="; - types-aiobotocore-marketplace-catalog = buildTypesAiobotocorePackage "marketplace-catalog" "2.9.0" "sha256-Bj1SMCXCljNw+1nakhnyvzqinyWliaE5YzvOaWrThfc="; + types-aiobotocore-marketplace-catalog = buildTypesAiobotocorePackage "marketplace-catalog" "2.11.0" "sha256-WM4dEyBqocZmCE3iG72SN6kR9u/InT3C2YY2PVl3drw="; - types-aiobotocore-marketplace-entitlement = buildTypesAiobotocorePackage "marketplace-entitlement" "2.9.0" "sha256-DDozTz6pHq/BHmU8ikS18G+uIXGldY2QsOOAMycvogA="; + types-aiobotocore-marketplace-entitlement = buildTypesAiobotocorePackage "marketplace-entitlement" "2.11.0" "sha256-HG7VV4MGdVbqNuLqM/es1WoKURm16hEI6soGUcTEOHY="; - types-aiobotocore-marketplacecommerceanalytics = buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.9.0" "sha256-/QjGbtwTKhmADkR2NXN304fDH3+oiB3I1Ykvsajexl4="; + types-aiobotocore-marketplacecommerceanalytics = buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.11.0" "sha256-FFe+imaR9rnLakPlGAZu/oSY4A7s/BO5InYKtkRx77A="; - types-aiobotocore-mediaconnect = buildTypesAiobotocorePackage "mediaconnect" "2.9.0" "sha256-kYZBNr9zEjtTFXgk69fw2ZpsDxw49XzmtCVoqmIRBpA="; + types-aiobotocore-mediaconnect = buildTypesAiobotocorePackage "mediaconnect" "2.11.0" "sha256-UOJmvsLMvq2PlCvWstIGs3sE8JPTYSsFY13xFhyLIB8="; - types-aiobotocore-mediaconvert = buildTypesAiobotocorePackage "mediaconvert" "2.9.0" "sha256-HnCyx0mhKwwyKKF1gsMkUbHUSBXJURtZKL2krl3wPyY="; + types-aiobotocore-mediaconvert = buildTypesAiobotocorePackage "mediaconvert" "2.11.0" "sha256-a+t4nGBLASBOZfuadcF/VRMpekjOyfiZXl81vE/ZfO0="; - types-aiobotocore-medialive = buildTypesAiobotocorePackage "medialive" "2.9.0" "sha256-VGqfVzvxAgF12UktAKEEvp7gdwF/Uvs1wF0Fv23/o7U="; + types-aiobotocore-medialive = buildTypesAiobotocorePackage "medialive" "2.11.0" "sha256-/+T6CRjrWy7ZDRJrqXB0urITj55s6OeJD8+BM65dMMg="; - types-aiobotocore-mediapackage = buildTypesAiobotocorePackage "mediapackage" "2.9.0" "sha256-E/5E4rIgle3Ge8h1jXg0EImztJamLWGTx3unCS3i3Wo="; + types-aiobotocore-mediapackage = buildTypesAiobotocorePackage "mediapackage" "2.11.0" "sha256-BxuwoFU+HEZDzh+PjmVK8NTqeBDMIThibFN0EMFwfTY="; - types-aiobotocore-mediapackage-vod = buildTypesAiobotocorePackage "mediapackage-vod" "2.9.0" "sha256-Ly2iBYcmbmfzFhjXwVpnVkLYiYBVnb2cIQLEQ1PHHPs="; + types-aiobotocore-mediapackage-vod = buildTypesAiobotocorePackage "mediapackage-vod" "2.11.0" "sha256-I9QfN8izkZyhtx5jlSCCKKUVtEqSXrTeXtmEvmLZU7o="; - types-aiobotocore-mediapackagev2 = buildTypesAiobotocorePackage "mediapackagev2" "2.9.0" "sha256-j7vEKKolHogemhfN8p3RDdLLUCIm4XK4LbgTN1RjHVc="; + types-aiobotocore-mediapackagev2 = buildTypesAiobotocorePackage "mediapackagev2" "2.11.0" "sha256-Z4QKqqeXtw1FihA9bJuUdbfah0bpUkuF80/MmMecgIo="; - types-aiobotocore-mediastore = buildTypesAiobotocorePackage "mediastore" "2.9.0" "sha256-sijOkeKG3EZU2aMkgVHhfnEVJCw/6LjCj3yn514BxHE="; + types-aiobotocore-mediastore = buildTypesAiobotocorePackage "mediastore" "2.11.0" "sha256-qpYMY/8FLidczmsGyurHHZT+gGq69GNmYzZOI1Qo33c="; - types-aiobotocore-mediastore-data = buildTypesAiobotocorePackage "mediastore-data" "2.9.0" "sha256-YmAiMfw/OPkzyFQCqutBCcPHLgGnTTd64zZA+IQktSQ="; + types-aiobotocore-mediastore-data = buildTypesAiobotocorePackage "mediastore-data" "2.11.0" "sha256-b8wIvWFHwQPwoMD3rsuQ00nNPvtGK41zlqTEsnIK4WU="; - types-aiobotocore-mediatailor = buildTypesAiobotocorePackage "mediatailor" "2.9.0" "sha256-fvf8n0wwbaJQd6T+zag7fLW4DYFs97YA7PS4LjvrK6g="; + types-aiobotocore-mediatailor = buildTypesAiobotocorePackage "mediatailor" "2.11.0" "sha256-l15NK1qBbxyTtSVIf6tafpn9ORXP++xIntIvfoJXMmw="; - types-aiobotocore-medical-imaging = buildTypesAiobotocorePackage "medical-imaging" "2.9.0" "sha256-APuySk3bcst59XgijDYhuphIM2jqUFpjwiI1B9IcVA8="; + types-aiobotocore-medical-imaging = buildTypesAiobotocorePackage "medical-imaging" "2.11.0" "sha256-xauRwOuUy/b0NolFHz/ieBts6rNxfJKW7l/kap3XKKo="; - types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.9.0" "sha256-k0gaSat1viRrS1vH+xuGxO8zUAY5BucpbKFshKR/Gv0="; + types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.11.0" "sha256-P0kuhYy6Eqfq2E4Zk1bJWIziNSdB42hQk4MnuGMyKNg="; - types-aiobotocore-meteringmarketplace = buildTypesAiobotocorePackage "meteringmarketplace" "2.9.0" "sha256-MS5ZMEW0iaHhjIgqTXLNNuYEBN9L5djCQupJfayNLx4="; + types-aiobotocore-meteringmarketplace = buildTypesAiobotocorePackage "meteringmarketplace" "2.11.0" "sha256-GyF+vCtU16QqjNX2CYCIzFDnOCkjDpMBYNnBx7n5uvg="; - types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.9.0" "sha256-g0uAmEucyImVVykA5g4BBclrd/n8Cl9hm2vkPpL21Vo="; + types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.11.0" "sha256-eeXyYEsc8+Z50Fi5BPXQ655IWnRb7V2ztUz6Dg4Bfl8="; - types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.9.0" "sha256-xNecFvFbcQGCeE4ImLQYAB+/gv7ThrQC/E0CPoslcdA="; + types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.11.0" "sha256-DosgEjRG1Yb0T8veRz4MhWtcNN7yeRAKWp5C81LKPJo="; - types-aiobotocore-migration-hub-refactor-spaces = buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.9.0" "sha256-zPm3aK/YaBfrkcnU2l1zN1RMl+hdiqcsBke1zwlxbt4="; + types-aiobotocore-migration-hub-refactor-spaces = buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.11.0" "sha256-D2U7NuLrjBn1j0NOpITmocfx/YVdqNZoZpLYpfk/5Dg="; - types-aiobotocore-migrationhub-config = buildTypesAiobotocorePackage "migrationhub-config" "2.9.0" "sha256-XG30N9nTD8JPdIsbRb3A1YgUpzZCFx4CH9Q6i5LOPJM="; + types-aiobotocore-migrationhub-config = buildTypesAiobotocorePackage "migrationhub-config" "2.11.0" "sha256-5xOjAO88phwD9WVgZBL9C3x9soNPN/45jtrqn51Fd2E="; - types-aiobotocore-migrationhuborchestrator = buildTypesAiobotocorePackage "migrationhuborchestrator" "2.9.0" "sha256-umzeHkjT+3mMucBJ8Md4V2RCuv7K51gZ/bJniv00+9Q="; + types-aiobotocore-migrationhuborchestrator = buildTypesAiobotocorePackage "migrationhuborchestrator" "2.11.0" "sha256-K5EXiQhluhNWYEnwom9E5I/rmrUv17CknO5ZVY5Dxig="; - types-aiobotocore-migrationhubstrategy = buildTypesAiobotocorePackage "migrationhubstrategy" "2.9.0" "sha256-AkZAtkQXJ9ygWVerPMbd2qLmeaXpe0tztITkVlSjuzU="; + types-aiobotocore-migrationhubstrategy = buildTypesAiobotocorePackage "migrationhubstrategy" "2.11.0" "sha256-uHg3yqEdNpjXLGPOX7JBDrYo/uxwc1M1pdBd46H/gDw="; - types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.9.0" "sha256-KLXvbCcc3OAEC5vBeDeBzaVaK1Kxw0jjhUS/1OdwOb8="; + types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.11.0" "sha256-e5dVP8R6EsEygjpvPZnfcapj0kqJocsa5aL4olZZrEc="; - types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.9.0" "sha256-mi26QEURtPYs0r1iCEOpDlcKl1ioESD3GDh6shUQUzw="; + types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.11.0" "sha256-dV1OwwWzWauCnF52N4JtpE01HzYPlCxsTBAKgFu7Czc="; - types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.9.0" "sha256-X9E9lrFhfRHqfPZmOj1PtAHMLlz+2elYsUrb10/Wgzc="; + types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.11.0" "sha256-QLDpZcvPwW1OggflukTSnhgR+l1xTeeepLuwdzztMCk="; - types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.9.0" "sha256-l0ObDU6cjOCZOdcs047zx/1yoaZ8KN/3HEjAwYe9VK8="; + types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.11.0" "sha256-x7p23ZzGvdJn01XEGWTSjx+HX/QUicfLiqMGF0ZV8Lg="; - types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.9.0" "sha256-cTEuEXJU/SzRNgxH1XjfFi/r7JCcB2Pru7mKckjBQ7U="; + types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.11.0" "sha256-Wg12l88mDmZuXgxZ+UFsdBVbbt2I0Nxxfi/2AH3QARA="; - types-aiobotocore-network-firewall = buildTypesAiobotocorePackage "network-firewall" "2.9.0" "sha256-WtJSxvpB1T9CCaKnjBpsOJSelZtP8ySwpWeYiaJD1MA="; + types-aiobotocore-network-firewall = buildTypesAiobotocorePackage "network-firewall" "2.11.0" "sha256-di9s15+U+nsgG9a5WTajYyucCNo86+8Bv2BI7OWGXQE="; - types-aiobotocore-networkmanager = buildTypesAiobotocorePackage "networkmanager" "2.9.0" "sha256-tDkjd34+PRsaypovhsY9AER8VbnyrrCx/njtxO7CJEk="; + types-aiobotocore-networkmanager = buildTypesAiobotocorePackage "networkmanager" "2.11.0" "sha256-2sGnCprlQQ00g4WjSu2N1CuENwyfGt+P/i5NfKd4Feg="; - types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.9.0" "sha256-JuAsL2FAqZL8n8ODVpmQo38YJKBKzHT2VRAWVmPgvzI="; + types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.11.0" "sha256-d4cjbqZRiK3VpLY7jxureug+nBtCTVQ2OUjXKQLufZw="; - types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.9.0" "sha256-GQVHH8NbG8Uzd0dPc5MaNpDIPGct/07JsokCwi3JfxY="; + types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.11.0" "sha256-lTKQ1xNAy9AqyPoRuk3ThwlMd4xlFjtm3jAcZjLmKCs="; - types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.9.0" "sha256-Aq/0h7leT1KU+nQZWjg+KNhgV3osRREQv+QTMpYTZek="; + types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.11.0" "sha256-ZB3c29FJiopBwP3NcMGErMMJj45IcQ1KnDFWXePaI2Q="; - types-aiobotocore-opensearch = buildTypesAiobotocorePackage "opensearch" "2.9.0" "sha256-lHZbMOVxTMolfPUCikFyK2REkgjnCMY49P5U4W4g/Iw="; + types-aiobotocore-opensearch = buildTypesAiobotocorePackage "opensearch" "2.11.0" "sha256-hNs5/R/dSV1GaNj83OMIYRiqmEsTHQ1lVjGqFqvRPBo="; - types-aiobotocore-opensearchserverless = buildTypesAiobotocorePackage "opensearchserverless" "2.9.0" "sha256-COWGlK+XlrEtq5Xqg7x+hrFO7HU7uCLEOXDE2p9U3aI="; + types-aiobotocore-opensearchserverless = buildTypesAiobotocorePackage "opensearchserverless" "2.11.0" "sha256-aum5y7noTMkaTc7Diz2lzlkqLJaN7schCQAmau19vAc="; - types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.9.0" "sha256-8W8uYZ/HqFcFgJubslCwIp1CpbrUNza3Ef0Pk7V76zg="; + types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.11.0" "sha256-QcLO5rG7Q+55XRszr2vNJsSkXamYvOEe3BTnsu8adzc="; - types-aiobotocore-opsworkscm = buildTypesAiobotocorePackage "opsworkscm" "2.9.0" "sha256-b5K01pxx7Mc5ykpssw/bxY7/PBSSa7a/nIcbcd3oz7w="; + types-aiobotocore-opsworkscm = buildTypesAiobotocorePackage "opsworkscm" "2.11.0" "sha256-t2K3hypn4E1sVoQn8JAIUuycQ2lizBXokpz4N+2XgH8="; - types-aiobotocore-organizations = buildTypesAiobotocorePackage "organizations" "2.9.0" "sha256-H92GHj8b2aeN2REWpG1EvyLv2HWjFZxg2DgQXH9BbPg="; + types-aiobotocore-organizations = buildTypesAiobotocorePackage "organizations" "2.11.0" "sha256-fGyv3mf9POvGFB+JpHldbxMfi1kUiS2YNkpVabgrDIw="; - types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.9.0" "sha256-0Dxf0aa76MBWX5TSdSWoFemHJ7wKqzj+vPDgZ9yMQTY="; + types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.11.0" "sha256-c6XSyeAa80f5TnoyMvsAmqESpqaq+y94sfRXF6cFpt8="; - types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.9.0" "sha256-62W37n830OMhhCTsEP1r5mrCY8MZZM+OPgvZ/ox4S70="; + types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.11.0" "sha256-cQNQz1xgCbLiKWR1i1sgDmc1unP+7IoF1c6ZwH1G7SI="; - types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.9.0" "sha256-OBQI+qRwV3nB29WFuIPxXIc2fV5RaMaaCiJtYTKp28A="; + types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.11.0" "sha256-h4R5ErD7YDqOYLxRgNioB4dhL9b+OwiA38AM3EoXapE="; - types-aiobotocore-payment-cryptography = buildTypesAiobotocorePackage "payment-cryptography" "2.9.0" "sha256-3qawANwA/wOWqNl3Q6RKS2CLb1pw8K6dbX4jW2MAHEc="; + types-aiobotocore-payment-cryptography = buildTypesAiobotocorePackage "payment-cryptography" "2.11.0" "sha256-VgJWOfWEdZI+9udvORUBl+cbAlBAb2YW3+rqyqOIGdk="; - types-aiobotocore-payment-cryptography-data = buildTypesAiobotocorePackage "payment-cryptography-data" "2.9.0" "sha256-adLvjvZNRcNM07nvr3Frh5a2X7wgOuxdZ21iLnw9crU="; + types-aiobotocore-payment-cryptography-data = buildTypesAiobotocorePackage "payment-cryptography-data" "2.11.0" "sha256-6S/4awBPSegC+GeEysxFmne+5K4I6UlQdnnK6q/7kBE="; - types-aiobotocore-personalize = buildTypesAiobotocorePackage "personalize" "2.9.0" "sha256-apNRfsAdZHuqs3SMUgnuZun8GbCog/5s7MSdyVIHz5Y="; + types-aiobotocore-personalize = buildTypesAiobotocorePackage "personalize" "2.11.0" "sha256-k78zJdv3w79v1ocoem8d1VuBKTga7iPpPYUw0QyjHkU="; - types-aiobotocore-personalize-events = buildTypesAiobotocorePackage "personalize-events" "2.9.0" "sha256-sxcApDREahAvxXswhv7iZkrYXcjdOGa//SFSvtlHMJ0="; + types-aiobotocore-personalize-events = buildTypesAiobotocorePackage "personalize-events" "2.11.0" "sha256-klAYYRH+DUBzs/JISvYAVNXedeje1yhyd80FASAOwzk="; - types-aiobotocore-personalize-runtime = buildTypesAiobotocorePackage "personalize-runtime" "2.9.0" "sha256-eurE8IY3eyuUjj3rhT59xu0KHRnbJy/OL05XKBov0Y8="; + types-aiobotocore-personalize-runtime = buildTypesAiobotocorePackage "personalize-runtime" "2.11.0" "sha256-HpVZnkJvQgK9Mz+J9ZmJfDGoj9REpZqFjJBkfkvI3Ww="; - types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.9.0" "sha256-bWg/J1JyM4pkKalsMqUMPMYJ+T+SSzR4P0+VJTSodWM="; + types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.11.0" "sha256-icSP1n2t7qcZAt0EK6/WK24T/JJfNzFzxmX3R8KMqYc="; - types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.9.0" "sha256-jKAsxMwQCI/DOY8HiRmmXdVqWAoVD4ULdwSoU18kmJs="; + types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.11.0" "sha256-UNBJarFF4t5NjLKLqdYbr7d+LPqanzZz5HtO0zr/hzQ="; - types-aiobotocore-pinpoint-email = buildTypesAiobotocorePackage "pinpoint-email" "2.9.0" "sha256-JgTZiFxdBNTAHT7X3LdTTEvI5Z+MjF6JcZ8zbjZxsSA="; + types-aiobotocore-pinpoint-email = buildTypesAiobotocorePackage "pinpoint-email" "2.11.0" "sha256-bxmMClb6G0+/Sc1c8YrhmPpTlfM26KiFxfIiRXm3zwY="; - types-aiobotocore-pinpoint-sms-voice = buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.9.0" "sha256-HGsiBhxwTVKUFQgGlx17n0/HUEL7/FIHgxKxFg4Vsc8="; + types-aiobotocore-pinpoint-sms-voice = buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.11.0" "sha256-0DafiqdMAXbuxVXg8vz3uHuiiDANvOLAMnClSt6yglY="; - types-aiobotocore-pinpoint-sms-voice-v2 = buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.9.0" "sha256-fXszL3FutdKRAkh3gWvu5xiGlvy3Nn/r0MCKYW5UAYg="; + types-aiobotocore-pinpoint-sms-voice-v2 = buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.11.0" "sha256-QRtJLMtoD7m7p+HPYzpPsaFapejDGjHPrZDFTbfAATc="; - types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.9.0" "sha256-Qs9ndgWnw7yUvKJcI36i8c1imwWvX3isJocEYjj93Ls="; + types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.11.0" "sha256-S774aDCAbVL40vFcerr3IrO8jejU3oM5ECTO62PvK+8="; - types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.9.0" "sha256-9PNsD5t7iZh+Bcnbqbq1RV7IMbDT/IptteaUsJB+AKs="; + types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.11.0" "sha256-h0MgZfxNlzEnqgN1AgX2mEbN45O+RToVEyEaM4SUrnA="; - types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.9.0" "sha256-zYgDgmqCshI/LbmZYO+X9+sq1Bi3xlBDugnqVfewu1Q="; + types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.11.0" "sha256-EUXjUigF6Ntifj0QGvEo/i99lZlIujbxNAPAJTCJi40="; - types-aiobotocore-privatenetworks = buildTypesAiobotocorePackage "privatenetworks" "2.9.0" "sha256-QX/fr036L4eVPdUnUexEDJc++oIx8WJRwI1YmnFuYqc="; + types-aiobotocore-privatenetworks = buildTypesAiobotocorePackage "privatenetworks" "2.11.0" "sha256-mnAD4olYuQG1hIurWbfWj8yVZipellgH9werYLZCVHc="; - types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.9.0" "sha256-zx4Zt8J/xgql2vu/tZgwmFLWq+2bhhq2u6q08L5nkBY="; + types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.11.0" "sha256-MlK0fPBPZzHheJ/oaL4ficKVUhQnm+ERN3G7fuqmG6s="; - types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.9.0" "sha256-0Ob22rt0ZfEuoez9knN5BegTWTI+T0cwH96rkKHWVWg="; + types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.11.0" "sha256-DqdxwO+VCX4eqcecT3kQSaUZa0XWJHICKeqE3CyuPOE="; - types-aiobotocore-qldb-session = buildTypesAiobotocorePackage "qldb-session" "2.9.0" "sha256-TVm24eYojgTrdWzFKgL2pkjekx9Bd8cqTKVGybs+2Bw="; + types-aiobotocore-qldb-session = buildTypesAiobotocorePackage "qldb-session" "2.11.0" "sha256-81KbDwWUcjY7frYXgpH2o+U8mi8fMxP1X0VzFUh7o3o="; - types-aiobotocore-quicksight = buildTypesAiobotocorePackage "quicksight" "2.9.0" "sha256-RTV8LwRM/lNYFCx4L2PnJhXHCjeDHKsMmHATcUOd2R8="; + types-aiobotocore-quicksight = buildTypesAiobotocorePackage "quicksight" "2.11.0" "sha256-riJj0umKScbQ9MCV88fNeHiuLcigzJqtWRgIhcuI3Ww="; - types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.9.0" "sha256-twdBnpMqPTyb+tVD7Qa37C29hds3UM7Y6/63qr4IBxM="; + types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.11.0" "sha256-taaVPQtZfF1L9bCSL0ppyGy8YZE4pvJA2hK0YAcE2Oc="; - types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.9.0" "sha256-FxYiwMon/E3g5uphHutjXsZ4gvhyoy4BE7gfX9v9KOY="; + types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.11.0" "sha256-nm1s53U2rmuw4Ko21DOW11neknjfBAyq4S0dBzJQRPc="; - types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.9.0" "sha256-4UwgKkbnHgSrDIjVgp729mt1LWtTTmr4Vqk+MGkyHDg="; + types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.11.0" "sha256-UlpkN8g+rBmf9hu0MrWTaH4S1SaNQK6mFeBw65hF4Nk="; - types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.9.0" "sha256-1bOOeQqg9AdlHIuznEUF2Q8+1iN4ZwvFfRMnzAew9xQ="; + types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.11.0" "sha256-rxdvCAEeoUqduN/56yMNxZnfadedkTaPpg7+XJhcHGc="; - types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.9.0" "sha256-uUhg8pu/tPO5ufx3oAA803ddLMIJb8ZRFqYYY7asprU="; + types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.11.0" "sha256-AHUOMZn6kUKnY9BAteySrzFr8KC8kE3nolHEZ+gn+Tk="; - types-aiobotocore-redshift-data = buildTypesAiobotocorePackage "redshift-data" "2.9.0" "sha256-HtJan10OMZZP0DTFw4b4iadl+ufHbbCGkypk6gTHevA="; + types-aiobotocore-redshift-data = buildTypesAiobotocorePackage "redshift-data" "2.11.0" "sha256-YsFxhXd2xxW4vT2zDCHRCzFOeINKL7JypENiTcoAJ+I="; - types-aiobotocore-redshift-serverless = buildTypesAiobotocorePackage "redshift-serverless" "2.9.0" "sha256-TL4NDdKm50bgUZV+bkxqRY1P5C48tT7+E4wiNMgMLG4="; + types-aiobotocore-redshift-serverless = buildTypesAiobotocorePackage "redshift-serverless" "2.11.0" "sha256-IuaCCYxuLrrg6JPQQD98EiW/VSxs9I0Aidiv+UDp/ow="; - types-aiobotocore-rekognition = buildTypesAiobotocorePackage "rekognition" "2.9.0" "sha256-zAYEPrQ5SexvufL2aSagLLWx2VPFURLRu+YwL/m4cWA="; + types-aiobotocore-rekognition = buildTypesAiobotocorePackage "rekognition" "2.11.0" "sha256-9hVBbXOYT+qn6JwUJyJFIsMemvcQ7DyxxlbBKxtTyIU="; - types-aiobotocore-resiliencehub = buildTypesAiobotocorePackage "resiliencehub" "2.9.0" "sha256-3C1PcG2DzbRT3Yrloipng73tZKdcGiYniU5n095Lodc="; + types-aiobotocore-resiliencehub = buildTypesAiobotocorePackage "resiliencehub" "2.11.0" "sha256-rshRL2vH9hHEeYbWbFlnDkotiQezo9kLIjnK+Kioocs="; - types-aiobotocore-resource-explorer-2 = buildTypesAiobotocorePackage "resource-explorer-2" "2.9.0" "sha256-UzzHOnTX2tLVEY+xJVrDu4I8/RP8/rx2rNZcINs4DOM="; + types-aiobotocore-resource-explorer-2 = buildTypesAiobotocorePackage "resource-explorer-2" "2.11.0" "sha256-yyoFe/7AqXu9H1hZs6yfTGt+d+peDu1GQEWQ6+G2gfE="; - types-aiobotocore-resource-groups = buildTypesAiobotocorePackage "resource-groups" "2.9.0" "sha256-w7MJhBAtOsbZqZQlJdFiP4q8qpk7nc1YEXCgbw3Fd20="; + types-aiobotocore-resource-groups = buildTypesAiobotocorePackage "resource-groups" "2.11.0" "sha256-v20pt5uv3Hj7xek3Xm8X2GLkRk+vRZpqZSENLOYx1hY="; - types-aiobotocore-resourcegroupstaggingapi = buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.9.0" "sha256-dkRibrcQpSnU4ChhRSibjQbosbOy6wd42P91MVrD7+o="; + types-aiobotocore-resourcegroupstaggingapi = buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.11.0" "sha256-qCVYQmM2F2uYY7+LbyrUGaFFf0/s6wyYilwrHckyPag="; - types-aiobotocore-robomaker = buildTypesAiobotocorePackage "robomaker" "2.9.0" "sha256-n5zLgWXRlVz+dXVOeEg4ZVq2mCiBDB/4pJfHeFF6Z5Q="; + types-aiobotocore-robomaker = buildTypesAiobotocorePackage "robomaker" "2.11.0" "sha256-2s48UBjDJqtQ1iBr2yV6rvqoGNsLBpNaEP1WNsp+qPg="; - types-aiobotocore-rolesanywhere = buildTypesAiobotocorePackage "rolesanywhere" "2.9.0" "sha256-HNjHfM7Oi4HKmYL5Sgwqjg2hWyKmLXYq1nDwhmVN6cs="; + types-aiobotocore-rolesanywhere = buildTypesAiobotocorePackage "rolesanywhere" "2.11.0" "sha256-ci+uWwMNglRm2inRUzGtX8F27Bv2KaRZNNjHxMT+gnk="; - types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.9.0" "sha256-d54iOVNPFrwS9Cw/uDZO7CCIsj2QzeKkgKy+cWehfcQ="; + types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.11.0" "sha256-e4jmows4W8JjUbBr0LhteSRp/V8LBk/em2SYWFTHhfk="; - types-aiobotocore-route53-recovery-cluster = buildTypesAiobotocorePackage "route53-recovery-cluster" "2.9.0" "sha256-MLPzjWP6xBrczesskwbvKVbjFT8ZC8MV7jgkR/AAxu0="; + types-aiobotocore-route53-recovery-cluster = buildTypesAiobotocorePackage "route53-recovery-cluster" "2.11.0" "sha256-mK5CXukLRr3978LJBAHn/KWOxiIf8zpBZ1ETiXIC/9Y="; - types-aiobotocore-route53-recovery-control-config = buildTypesAiobotocorePackage "route53-recovery-control-config" "2.9.0" "sha256-nl1PsCKbjiizg+oPVkYvkb1iuN/egoBQp6EN1BWcrQw="; + types-aiobotocore-route53-recovery-control-config = buildTypesAiobotocorePackage "route53-recovery-control-config" "2.11.0" "sha256-ISNRJ5/A+/QzuIqWoRQEnPeld7INZGvTcuqfQWK1FJY="; - types-aiobotocore-route53-recovery-readiness = buildTypesAiobotocorePackage "route53-recovery-readiness" "2.9.0" "sha256-cFWmcjptrX/infPksVRugvHdnKFU0SG/90OU+HPl5ZY="; + types-aiobotocore-route53-recovery-readiness = buildTypesAiobotocorePackage "route53-recovery-readiness" "2.11.0" "sha256-TwXt40LBCATVrunDjm17phBbcpMHU8HkWQ7/avBozvo="; - types-aiobotocore-route53domains = buildTypesAiobotocorePackage "route53domains" "2.9.0" "sha256-1LucO4/jgl1YpMlbYuIJXrhxkLx6tdKTMaoMAWTDybM="; + types-aiobotocore-route53domains = buildTypesAiobotocorePackage "route53domains" "2.11.0" "sha256-kxLh2DKFccRxmD2uHTlrf62qasZ/FuRQOLjhzTa7nX4="; - types-aiobotocore-route53resolver = buildTypesAiobotocorePackage "route53resolver" "2.9.0" "sha256-s8DoTrQEjGpqwwYlwEkoCNopDow+M7rbQZCqU2aBdZ4="; + types-aiobotocore-route53resolver = buildTypesAiobotocorePackage "route53resolver" "2.11.0" "sha256-jCqxuCWdgTbV+ul+vtauiWaA/cjiIpbjlYRrfaV6zQY="; - types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.9.0" "sha256-dRncp/7Z8FeJ/sBqHFHO7z4XZKgWeOuRPGzXf4djzg4="; + types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.11.0" "sha256-/jG0DPAYhycTN0VKAO2i2EO4htRnLMbUHwLxND5SiDw="; - types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.9.0" "sha256-KwNH+X1Kl61L+iuK+XtZWGhTl71RpHyJhCfB+Hw1IyU="; + types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.11.0" "sha256-287Znbh373X2EgFilTvFjQMYI8ol+EHmMS0krMsCMIo="; - types-aiobotocore-s3control = buildTypesAiobotocorePackage "s3control" "2.9.0" "sha256-/earpJzKe0zF+fjxUa/Z6JKmxxWfOlMngxlia6aTFxs="; + types-aiobotocore-s3control = buildTypesAiobotocorePackage "s3control" "2.11.0" "sha256-X//a8jbgKvgYb10yLsha5Ekw7JfBZ4ZJDpZtdj8DQy4="; - types-aiobotocore-s3outposts = buildTypesAiobotocorePackage "s3outposts" "2.9.0" "sha256-lLp/gUu5jrOJ6ZXQ4qKVfREsN4WYl/h9zgfgTUtYiiQ="; + types-aiobotocore-s3outposts = buildTypesAiobotocorePackage "s3outposts" "2.11.0" "sha256-SZO4Xo3+xZjtHGKCWMgcV9VgRkFsLEEqzWq3uKul340="; - types-aiobotocore-sagemaker = buildTypesAiobotocorePackage "sagemaker" "2.9.0" "sha256-kAunITSH13bGe6XWTlG/QSelzDFnINih/o/zuFR34us="; + types-aiobotocore-sagemaker = buildTypesAiobotocorePackage "sagemaker" "2.11.0" "sha256-fOqlUtOyJR5EpBc24tJwRJakp8OpnoxIfQgdEFlFNjw="; - types-aiobotocore-sagemaker-a2i-runtime = buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.9.0" "sha256-U9cVOg2CkVclCqSqr4okJJSC0ZmGIH390KTNKMJUBhw="; + types-aiobotocore-sagemaker-a2i-runtime = buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.11.0" "sha256-SCfymFM/imhxod2yTR4wWrm+bNQ4Ey+3GhXND1pigwk="; - types-aiobotocore-sagemaker-edge = buildTypesAiobotocorePackage "sagemaker-edge" "2.9.0" "sha256-Oe78n3fu201OmZpPb4cjhLY1x1KTT5MYLXdy9M4KkOE="; + types-aiobotocore-sagemaker-edge = buildTypesAiobotocorePackage "sagemaker-edge" "2.11.0" "sha256-vZd4RpmMnviYbcEwAff0DmMFsIcHiYV7to1K4bgP8D8="; - types-aiobotocore-sagemaker-featurestore-runtime = buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.9.0" "sha256-xmRI5TMR99TROVf1CPif60NeLhCqNpb6Lt662fGK+WY="; + types-aiobotocore-sagemaker-featurestore-runtime = buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.11.0" "sha256-+4g0HkfkBA2Vi7VHUJEWRyShCVool+21bEpn/t9QNUo="; - types-aiobotocore-sagemaker-geospatial = buildTypesAiobotocorePackage "sagemaker-geospatial" "2.9.0" "sha256-OPIq8UKHJNDe7lMbHkHt4z57k3L7y6ys0a9TSJiiFIg="; + types-aiobotocore-sagemaker-geospatial = buildTypesAiobotocorePackage "sagemaker-geospatial" "2.11.0" "sha256-SP4nUssP7jYS/huBwNf9vVcBKBKSH4X0jJEjWXNC3Fc="; - types-aiobotocore-sagemaker-metrics = buildTypesAiobotocorePackage "sagemaker-metrics" "2.9.0" "sha256-oyBG62dmdxbZaIAIb5cXq+qWYD/yDPHvHu6Z+wOg9Jc="; + types-aiobotocore-sagemaker-metrics = buildTypesAiobotocorePackage "sagemaker-metrics" "2.11.0" "sha256-e/NlinVQRHRIEqdN4MeK9yD2WkBMgIZazrGvfsXLiWk="; - types-aiobotocore-sagemaker-runtime = buildTypesAiobotocorePackage "sagemaker-runtime" "2.9.0" "sha256-KDkf3G/inaFjLe0jfgdUQ31ugbj8mmgYzJKvb1W15lA="; + types-aiobotocore-sagemaker-runtime = buildTypesAiobotocorePackage "sagemaker-runtime" "2.11.0" "sha256-a1yu68zlG6N+ezicX6aLH99A2kYLNCPV1cXMYEeI2ok="; - types-aiobotocore-savingsplans = buildTypesAiobotocorePackage "savingsplans" "2.9.0" "sha256-f4DbYsiuX1xrLMZ9foOyJC5NhVtMym3mnj8RD+MvlIo="; + types-aiobotocore-savingsplans = buildTypesAiobotocorePackage "savingsplans" "2.11.0" "sha256-Q3t3g2FiolXVGGlCAodY1dweI9WlNaYESvFLB7vzyCk="; - types-aiobotocore-scheduler = buildTypesAiobotocorePackage "scheduler" "2.9.0" "sha256-HuXw6MBuBzaDpf6HfR++F8LC+5WgpThF+BQz2nO1LHQ="; + types-aiobotocore-scheduler = buildTypesAiobotocorePackage "scheduler" "2.11.0" "sha256-bLwQkmNKbuqUyKh8QlVDsDfx1pcgC78K7B2vumrJZNc="; - types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.9.0" "sha256-du/fn168xn0Nzox8vbEOJXnIcRBWatgihJZRGTzy4pE="; + types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.11.0" "sha256-giit/TrRCMiaT/qJzyvKFS8dGnJh9VrTw4CRv76rXVo="; - types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.9.0" "sha256-zgWv9fUOlUWDeBSZwHLG1Oc8CRY7uK/Hu3EJAJsVcEQ="; + types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.11.0" "sha256-yZw/D6C+Cj/du6j2ii2muxXOp8lrpXfPgZp0xit7uyM="; - types-aiobotocore-secretsmanager = buildTypesAiobotocorePackage "secretsmanager" "2.9.0" "sha256-fdnSUH7SuYoKqWohGCmJRbKVJwkNgalBIdL+ZSA95uY="; + types-aiobotocore-secretsmanager = buildTypesAiobotocorePackage "secretsmanager" "2.11.0" "sha256-5nj1I2OszOyuSvZtEnfrMlPBMmTrI4S5Qf2PK2aSesQ="; - types-aiobotocore-securityhub = buildTypesAiobotocorePackage "securityhub" "2.9.0" "sha256-i02XTjgEgzXFnsHqgReWb/p+OhWdXA90pduejrStXug="; + types-aiobotocore-securityhub = buildTypesAiobotocorePackage "securityhub" "2.11.0" "sha256-UMEnin0Gc9CRacjlG1e3h3IWJCrp4EsewTzk1GFMjck="; - types-aiobotocore-securitylake = buildTypesAiobotocorePackage "securitylake" "2.9.0" "sha256-tZq7D3UPg/G05ZHl0btwePfrKz69vfo4Kpwf5haepv4="; + types-aiobotocore-securitylake = buildTypesAiobotocorePackage "securitylake" "2.11.0" "sha256-vhu5PJX3NsaG2BXy39y930Bf+70zV7EfZpqlCbtZVhk="; - types-aiobotocore-serverlessrepo = buildTypesAiobotocorePackage "serverlessrepo" "2.9.0" "sha256-6Z4f/NRtoFtdiFFcVc+3a908H8JcRKNzcImAVPk4quo="; + types-aiobotocore-serverlessrepo = buildTypesAiobotocorePackage "serverlessrepo" "2.11.0" "sha256-AEb2dQnJ+QN0FAbDtjYfAwb7ZAeVqod+NIVE7iBVvBI="; - types-aiobotocore-service-quotas = buildTypesAiobotocorePackage "service-quotas" "2.9.0" "sha256-U3S8VoxZD2YIW9yHUU+jk9QqG6gI+wiJBaeXEx964p0="; + types-aiobotocore-service-quotas = buildTypesAiobotocorePackage "service-quotas" "2.11.0" "sha256-tVSi4HLeb/QiKs3uLfp19Kzuwi7BspYOh8W8xa/yjVM="; - types-aiobotocore-servicecatalog = buildTypesAiobotocorePackage "servicecatalog" "2.9.0" "sha256-xYV3AUOEcU1fuzntpgoNT2gFykL2CmvYi7AnVoTrtjA="; + types-aiobotocore-servicecatalog = buildTypesAiobotocorePackage "servicecatalog" "2.11.0" "sha256-01wTzG20lsCat32U3ewxYNUxVbHEJzLAxnodJRIqGBI="; - types-aiobotocore-servicecatalog-appregistry = buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.9.0" "sha256-1fYP1lZcVAdtOjmN4hfLJbZ1526Gaf7xqxj0xmqZimA="; + types-aiobotocore-servicecatalog-appregistry = buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.11.0" "sha256-kJ05BDT2EJBRNmWbm9PUY0yh5H/PHonvIvQQyHg6Nak="; - types-aiobotocore-servicediscovery = buildTypesAiobotocorePackage "servicediscovery" "2.9.0" "sha256-SPAmhlm5j8zhyJeERoHo4oaJ73PSdTpQWbseY21jJw8="; + types-aiobotocore-servicediscovery = buildTypesAiobotocorePackage "servicediscovery" "2.11.0" "sha256-a/BkGzBQLhgQmPdXQx90VSxLgrr7wVitI0zeefC14vA="; - types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.9.0" "sha256-GM3RaxZuprL1PBlTbk3UOO9M5pu1nQekIcUzrCbSXC8="; + types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.11.0" "sha256-vsEfls5Rf8vWb96jB1WTcAwAXP3GDIkmNwL+dEhBlJ8="; - types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.9.0" "sha256-bn0DLwQuzoyrZ8odMQcDfFApt/GTnPNdeT693yF/k3s="; + types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.11.0" "sha256-ZE1VA2mExcHfHwJ9pIJRlXeV0NDH5Lkvm9yOS+nDFoM="; - types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.9.0" "sha256-g2WTDLMdIrSJLQj87lHT9aO54Nuo8IVSzqkpuQqqJBE="; + types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.11.0" "sha256-MzlJ9CeaHiwEKd+miQO4TdIr9JG/u1XW4P1l/kGVgkI="; - types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.9.0" "sha256-4izCsd6sv53hqImdd5eYJmBg8zSvHkQ6rcqOLfKJF44="; + types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.11.0" "sha256-k6rcuFumGuas7qOMa5vhp6rfxK+J5wWq47Gwfo54p30="; - types-aiobotocore-simspaceweaver = buildTypesAiobotocorePackage "simspaceweaver" "2.9.0" "sha256-3cJaY6BwMo1G6BguoEYjbUHNb0OkWOIcyh8kxN06t3E="; + types-aiobotocore-simspaceweaver = buildTypesAiobotocorePackage "simspaceweaver" "2.11.0" "sha256-l9jFLw3A6yIQ8JsRJO66CUetSeitYx3hE1fTTAPCKh0="; - types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.9.0" "sha256-PsLWqcPoKDgofkcIeC1P9DKzFVdkhq9A9IjA7uavoIk="; + types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.11.0" "sha256-sUkTUxkwSClz09NZ3TxkKyLUWENJt1L0on4Nva2ZQ7U="; - types-aiobotocore-sms-voice = buildTypesAiobotocorePackage "sms-voice" "2.9.0" "sha256-+AyzDu7C0wnniV5dphcvlswRDjktAJS9JPc52Jy5Mqk="; + types-aiobotocore-sms-voice = buildTypesAiobotocorePackage "sms-voice" "2.11.0" "sha256-EMZGeA34sNVNqv3AJSabyz1HoMbic617CQPp8O2droY="; - types-aiobotocore-snow-device-management = buildTypesAiobotocorePackage "snow-device-management" "2.9.0" "sha256-boSrX4EczJXDyxYFDFcn4uaTJ1GJfWHV47Mt0iWUYXY="; + types-aiobotocore-snow-device-management = buildTypesAiobotocorePackage "snow-device-management" "2.11.0" "sha256-651JlGJYbt7VAdIkk57nxH0PWvi1voTruVzz8tC7rbc="; - types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.9.0" "sha256-5ofD5IlGtmtd4k0Tja/qXOn2cWddeqMSvorIAv0mfIE="; + types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.11.0" "sha256-Np8fPiIjW5F+co1s20R3hDZS/fb8U0pYoKNC1hzEQrU="; - types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.9.0" "sha256-6yF9zXzRUyi+EvmIeEt1sjsyOkwoT0bKdr3Dtz4q9oE="; + types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.11.0" "sha256-EXqbUM4pYsmprvd04fDghy5Sy8u4jgP+OWSg7sWRr1c="; - types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.9.0" "sha256-bN1OXfRr0M9TGdOxZ3hzF4yVRo8qLtdJ1GIqp1WwY8g="; + types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.11.0" "sha256-POwMTLFUjTNa+nLi8Fxq8UihOkX0z1NuFaETuI6uLns="; - types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.9.0" "sha256-IdkwP86TCIY2v6ZV35SYMmxUqW204y7HXTFtoA3Z/A4="; + types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.11.0" "sha256-gEIBYw1ncrS8R6bSS5uMCpSGMpDvItAyeXuMJN6vsi4="; - types-aiobotocore-ssm-contacts = buildTypesAiobotocorePackage "ssm-contacts" "2.9.0" "sha256-xyQkxMnmInrwXdTcjv+2V5BUYS1OrQXbZLPjgMOIvwQ="; + types-aiobotocore-ssm-contacts = buildTypesAiobotocorePackage "ssm-contacts" "2.11.0" "sha256-6HCfXbZ7hO63x+N6n9jA48+UshaHgKHsvEGYgZh2qAY="; - types-aiobotocore-ssm-incidents = buildTypesAiobotocorePackage "ssm-incidents" "2.9.0" "sha256-DhGvTnJzNCZgSSZ63kjWhPYnH/SF+S2QHMU/0fgx8Mg="; + types-aiobotocore-ssm-incidents = buildTypesAiobotocorePackage "ssm-incidents" "2.11.0" "sha256-mEVJMqWKv6u5Idw+stqcTcOB6RVOfExMXYnuuExEhNU="; - types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.9.0" "sha256-j1QoIAprz33FLjIAmHj+v+2SYFQnL4XFEc+hyMLt78U="; + types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.11.0" "sha256-m5l6ewMNnOnDUN9Y0h5rxjAyaO6OZK2BdzxXM4Vox3k="; - types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.9.0" "sha256-TQxkfWv0SiS1smEPwlBKgtbhJhU+7ieokyx5zilAlNU="; + types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.11.0" "sha256-hv8XkRsnIgvLGr2XIjyYm2upv8Vj4i42UF8BpKil+S4="; - types-aiobotocore-sso-admin = buildTypesAiobotocorePackage "sso-admin" "2.9.0" "sha256-1vMwGFdAnCgwgwlV1fS0/w+o9gza4bokOIRmnse+Zh0="; + types-aiobotocore-sso-admin = buildTypesAiobotocorePackage "sso-admin" "2.11.0" "sha256-m92lE8qaVgwKQFA/gv9saL6a7Zey7MtO9dzGbahVx5k="; - types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.9.0" "sha256-iTJyIepGMJ5NUX/khzrdliVl4/uJkDmXfTBdHk4k9mo="; + types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.11.0" "sha256-LPqXAPzwkTt0maMEyZE1JTYVYzxEeN/ST7+B6Fbw5dk="; - types-aiobotocore-stepfunctions = buildTypesAiobotocorePackage "stepfunctions" "2.9.0" "sha256-mdunNfOw87uR9BYgy/XILp5KoJRIUHWQvdoYTPY4i0M="; + types-aiobotocore-stepfunctions = buildTypesAiobotocorePackage "stepfunctions" "2.11.0" "sha256-t4Pdd0mLzw08rWQG55Sz5rHJJApuiVSBDyT5IejqlX0="; - types-aiobotocore-storagegateway = buildTypesAiobotocorePackage "storagegateway" "2.9.0" "sha256-Ag1LkXIdiQGyMP5V3c1M5DFtarjcnUX5+UN6oEPf8nk="; + types-aiobotocore-storagegateway = buildTypesAiobotocorePackage "storagegateway" "2.11.0" "sha256-PXigzc5hHwKFKzGf4UHMUbX6Rh6DTdm+Rh74O+3SP+0="; - types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.9.0" "sha256-51P6hpVcVTUtLxN9/QGVCAWnv5Lnb9pMNE7WzKq5U9w="; + types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.11.0" "sha256-JkWCjmi5SWKdwqnNUUW6t8iGwc8NjWoQQUQo1pCqeoY="; - types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.9.0" "sha256-c1Nip/gBkVabW4oFq4B6fdi9DauiYZfOLHD4LUR9fLw="; + types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.11.0" "sha256-/KrG8QIZkSKPGOEe4nJlCzdgvdChKU5Xrop2JnUkdGA="; - types-aiobotocore-support-app = buildTypesAiobotocorePackage "support-app" "2.9.0" "sha256-8A6p38j1R6e/2ptWRfKkvpAnjeZPUWgciHpj7Sg0N60="; + types-aiobotocore-support-app = buildTypesAiobotocorePackage "support-app" "2.11.0" "sha256-u2O7hDKAVfXcgX8JY+m0WgeEwoCyqfQbwp5xlfUSmCk="; - types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.9.0" "sha256-1QtnA3BohFWVLso1DdbNO0ZOOAODhXmfT6r/Espp/vI="; + types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.11.0" "sha256-/+7mljg9y9FMwwbJ8NYi9k7bs2fxsmhR9Vvin/Y2JJc="; - types-aiobotocore-synthetics = buildTypesAiobotocorePackage "synthetics" "2.9.0" "sha256-1Cr8kzYLGroxGtHxx9eiyRW3I6sbyNIRweW6pAW6pFQ="; + types-aiobotocore-synthetics = buildTypesAiobotocorePackage "synthetics" "2.11.0" "sha256-N0FrmOkrt8aLx4tfzAmuwRW6/oy3XHVRT96/IXtSUyY="; - types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.9.0" "sha256-hSWUOXPsqVpQ0a6jOMll17W43wEbKv6i4fllIo0xLzw="; + types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.11.0" "sha256-c53Wqgux7PN4xV7c2/nsksQkDQ4wI9cXcF2QLajNqC8="; - types-aiobotocore-timestream-query = buildTypesAiobotocorePackage "timestream-query" "2.9.0" "sha256-a+fTXaX82nlaUvDmkDUIW+t/wsNXWZx7BqQj7H/jnVM="; + types-aiobotocore-timestream-query = buildTypesAiobotocorePackage "timestream-query" "2.11.0" "sha256-Sz2Q9OPDWeI5i3F4vWbcYqjoEsnclAYUu2I7jIJA4KI="; - types-aiobotocore-timestream-write = buildTypesAiobotocorePackage "timestream-write" "2.9.0" "sha256-YGZa1FOkq9snM5K1DZQv7efgBvMx8axCKbsoviJWSrE="; + types-aiobotocore-timestream-write = buildTypesAiobotocorePackage "timestream-write" "2.11.0" "sha256-JUIL7o1dC8slMcUla3NFPsjSAy/D2RjTNcqJY/1a2VE="; - types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.9.0" "sha256-afMNaqyMd84FTSTTLTpBQ/jfUuCvVmpyg7rdXavOJPQ="; + types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.11.0" "sha256-BiRk9QfVBLHQTfq3v6QdZAVewO8QZvTQl1ARcnEouao="; - types-aiobotocore-transcribe = buildTypesAiobotocorePackage "transcribe" "2.9.0" "sha256-jFdJigP2fLlRtw9WzhaSFicg4TBTfD3wVZEV8PeOqcM="; + types-aiobotocore-transcribe = buildTypesAiobotocorePackage "transcribe" "2.11.0" "sha256-2UBVBsFZsk4Zo3JNo9WThqzY8SUaEecMYD0c05pd5Io="; - types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.9.0" "sha256-rXLszhZTZBPCMlGwqZWsdCnoNy2MTyzzH+IrQ75Jxu0="; + types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.11.0" "sha256-c0GwHy3OHQrBMLhxyIaKPoHvtF79ySSL//NFOngfeL0="; - types-aiobotocore-translate = buildTypesAiobotocorePackage "translate" "2.9.0" "sha256-6CJeDPdwIWQMGBkAtxO8PJclkXGeY5iTbpNlWgGFcKs="; + types-aiobotocore-translate = buildTypesAiobotocorePackage "translate" "2.11.0" "sha256-MqggOwWPYz1wTDvGL+64dukGHNisK1S/ZJnkec9WOkc="; - types-aiobotocore-verifiedpermissions = buildTypesAiobotocorePackage "verifiedpermissions" "2.9.0" "sha256-abQQMTXvqkZ4V/82XnYRA4HXqPqYVDFlyn97stA6/6Y="; + types-aiobotocore-verifiedpermissions = buildTypesAiobotocorePackage "verifiedpermissions" "2.11.0" "sha256-/+83iitPdMoKHY8sbYoBgN+KtMd3GjcBtiBdM0vnbbc="; - types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.9.0" "sha256-f66AVRU3jXSzWWiDO1CWS+F742WmhcGlf2IXvAOPwjI="; + types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.11.0" "sha256-iEy+2H7bRE/kbX3EMpdLWu4DYMNv4ksyfANaY/Tc6x0="; - types-aiobotocore-vpc-lattice = buildTypesAiobotocorePackage "vpc-lattice" "2.9.0" "sha256-sA6mKo/co3Z9hPha4kHHUud9AO/CLhEijh66wlp2uOk="; + types-aiobotocore-vpc-lattice = buildTypesAiobotocorePackage "vpc-lattice" "2.11.0" "sha256-MSLS2rEhdAHWxjdU+ZRWVPR9ZtAeMcwyifULhx0CTno="; - types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.9.0" "sha256-Js6x76EgqKu4IJcgG8FpMge4nfhlKj/7HRZjgi/f5tA="; + types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.11.0" "sha256-A/YgoRKpFSfE5/eu2Gts1u0U/p4D+j2xLXa2fU+f1Kc="; - types-aiobotocore-waf-regional = buildTypesAiobotocorePackage "waf-regional" "2.9.0" "sha256-YCTW8axxeeDNCH57xUSKsRXNyproIYsUqHN7Kb/c9Lc="; + types-aiobotocore-waf-regional = buildTypesAiobotocorePackage "waf-regional" "2.11.0" "sha256-WTsE8VJc4EWTA5G/5B7mHje4VDZCSbBsFxwIDkExq2A="; - types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.9.0" "sha256-8lZTtK93+IQyfQ/QQ3WSgpD3VlzPq5aQn/Avife21nI="; + types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.11.0" "sha256-Zzr96zjueB5KT37r0feaTj18kd0IwVp9jXMjsIuWhCE="; - types-aiobotocore-wellarchitected = buildTypesAiobotocorePackage "wellarchitected" "2.9.0" "sha256-BzafdUAL6TrYMuP1TwPXTS/aOlhjZbM99ZtEQ3wxQV0="; + types-aiobotocore-wellarchitected = buildTypesAiobotocorePackage "wellarchitected" "2.11.0" "sha256-p/WikTCNYa/Bwv7PXOKzsHX5rBBtquKWf+RPD5fnbxE="; - types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.9.0" "sha256-WkpW8vk7U4WkqeX13RhzahEtZrdQ49X2NoeSIpRQMQM="; + types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.11.0" "sha256-CqBfDmR5WUUTK0jH+ihiJpugjEZtY5zvL9hZ9Wk+Jy8="; - types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.9.0" "sha256-kLp8nHOB6A47nmAd9jXwr+nXS8xnv10eGkI/zd53wRI="; + types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.11.0" "sha256-XEbZfg7jxW9PwZdsQ9XzY3/i2DIV9yUBlaCbubDcFjU="; - types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.9.0" "sha256-4g39qn3h//b4/Dd+C0zasVvmyENfkvhPIj+EklHf9iY="; + types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.11.0" "sha256-nNQ7Dq1qENRdoIfzVULZZ3JDvc6EEMJF2yJO6iXCMVg="; - types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.9.0" "sha256-WSAQekT3lmS/2miTbK0eYWde7eDIleY7yP+1HdMcCXM="; + types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.11.0" "sha256-abkID9Xww52uDpNABuUI9v3fknUNBkZ+fMjAr9mWv+0="; - types-aiobotocore-workmailmessageflow = buildTypesAiobotocorePackage "workmailmessageflow" "2.9.0" "sha256-Y7scQU1qMyGMrkOdmpJuRKdxR9nlsKsoiDCBT1Qa1F4="; + types-aiobotocore-workmailmessageflow = buildTypesAiobotocorePackage "workmailmessageflow" "2.11.0" "sha256-57+QvrdJTJK9psRohrA4HfPuTVy1AKVK7YUWGHOX0jU="; - types-aiobotocore-workspaces = buildTypesAiobotocorePackage "workspaces" "2.9.0" "sha256-AIIU5d6D+hVd36Qo0hpq8tNakoCVpmqjYKVgGUjtVOU="; + types-aiobotocore-workspaces = buildTypesAiobotocorePackage "workspaces" "2.11.0" "sha256-xs8/fAuglhlUQcHKC5m+tbkjYKvN5EEUQV7lzrnaFUc="; - types-aiobotocore-workspaces-web = buildTypesAiobotocorePackage "workspaces-web" "2.9.0" "sha256-fchpLQ4yB6LzpzvKJBraHIFEMKsMltWoMzihUkwUedg="; + types-aiobotocore-workspaces-web = buildTypesAiobotocorePackage "workspaces-web" "2.11.0" "sha256-RvEVbetUhE54iLlEvloG5F+9tkmmSFCUgwoXVRSDfX0="; - types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.9.0" "sha256-L+y55NnvYeTgXVp+DJ/dgKPQYBIFsu48qgRjwAX7nBs="; + types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.11.0" "sha256-COUTKrzFCLI8VSa/MBNPAeBkgGAlhBvOayyYqnYHaNQ="; } diff --git a/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix b/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix index 4bfe70497175..e69d9ab8e5df 100644 --- a/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,12 +364,12 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.9.0"; + version = "2.11.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QSZDFXiVEXFHTE7FrLZVUeLOOyPTG96PIMg9lziiwDc="; + hash = "sha256-bnYg/u2BvG3/iBJ5xKQwiMG/n8vREpnOGHYaSlwlnRs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-aiobotocore/update.sh b/nixpkgs/pkgs/development/python-modules/types-aiobotocore/update.sh index 455488fb793e..84fd0c612801 100644 --- a/nixpkgs/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/nixpkgs/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.9.0" +version="2.11.0" nix-update python311Packages.types-aiobotocore --commit --build diff --git a/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix index d35cfcc2afe9..c2adf4dd7b7b 100644 --- a/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.20.0"; + version = "0.20.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-mXeMlS4erhDMelNGhBMAEXcCbJQ0NFvwASC7LqW3kQk="; + hash = "sha256-BqhZGJoynKjmbVbO7vI5FIjjm4ePvSFB8RXqtNQW/iI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix b/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix index e23352724167..6651855d9569 100644 --- a/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.20240106"; + version = "0.4.15.20240205"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-SQlrTEy/yqEWmaBHDDbk9WMfGT+5gBiOAT6mREXTVlY="; + hash = "sha256-euT1jUB9OH9PmLJNgeG3ZX7HVOodxGGa5b0n8MNnY34="; }; # Module has no tests diff --git a/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix b/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix index 5962e0083910..13cd4f61f93c 100644 --- a/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.20.0.20240106"; + version = "0.20.0.20240201"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-A5kuyXb74IDbWI4eVqg8Xkq6XHMwIrJbsmy4Q5e5YEk="; + hash = "sha256-ukv9T/bdGWQLp6tdk5ADk6ZYl4gPNlCZeWSpQ/Tnmms="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-markdown/default.nix b/nixpkgs/pkgs/development/python-modules/types-markdown/default.nix index 8b65e9c05945..e0b1301062a6 100644 --- a/nixpkgs/pkgs/development/python-modules/types-markdown/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-markdown/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-markdown"; - version = "3.5.0.20240106"; + version = "3.5.0.20240129"; pyproject = true; src = fetchPypi { pname = "types-Markdown"; inherit version; - hash = "sha256-vkfTXL5h1Fi9F67BJ/HaIzzW7Zb6mhMccQN4pOiFcDA="; + hash = "sha256-ms02/vJk2e1aljRcRffYDw2WcFnpIhOZizBG+7ZPZ/w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index 841edf89f4c6..362681861f59 100644 --- a/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.24.0.20240106"; + version = "4.24.0.20240129"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Ak8DTzteK7K7/1XrxNWR7Q0igNkPrO7csUi55xSj8+4="; + hash = "sha256-ioPdO5t2oz4I2GNsXaohKs4TlkGO2Rg3Y1/NVkpiSJE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix b/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix index ba256ebc78de..c22fec8de7dd 100644 --- a/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20240106"; + version = "2.9.21.20240201"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-DQo1BElxS6KESMTxCgo67Dbp4+/RRQcw4ifhe3BKS+o="; + hash = "sha256-daknNfYro2OXQJrkdY8CQcvEqbsw8fldO0pmD+p+dxE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix b/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix index 3af4ba92b01a..7a0a60049296 100644 --- a/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "23.3.0.20240106"; + version = "24.0.0.20240130"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-PW80Yr7AwmDKrfk/uzdyJcEmZht3nH2auZttrVyhDbk="; + hash = "sha256-yBLlwcNSSfde9ZNXCLKpl9Yqv5dFviIuX5S5WVRyqyU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix b/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix index 9433d55512ec..bf1b49ccc918 100644 --- a/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "types-pytz"; - version = "2023.3.1.1"; - format = "setuptools"; + version = "2024.1.0.20240203"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zCPQGSzUnI9rukTuDIHkWGqPMCBJcPwIlNIJprCNq5o="; + hash = "sha256-yTdR7iDfxuBUoBSPj1InuaALeckKTTyfRkcRpzF5yJ4="; }; + nativeBuildInputs = [ + setuptools + ]; + # Modules doesn't have tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 74ebca264a61..25538aa7c897 100644 --- a/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.31.0.20240106"; + version = "2.31.0.20240125"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-DhxzHBfzNhjsWOAithShouzCX33IaACzbvNBOAQCxhI="; + hash = "sha256-A6KM4dfNVBmRSOBDsgec3e0i1nldGaLCpnkaSyteLrU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix b/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix index d98aea408b94..0b7e0d91b2a6 100644 --- a/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "68.2.0.2"; + version = "69.0.0.20240115"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Ce/DgK1cf3jjC8oVRvcGRpVozyYITPq3Ps+D3qHShEY="; + hash = "sha256-GpyGOJn0DL4gU9DNHQDd7wMwtJIzVGfQGPc8H+yUYqM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/typeshed-client/default.nix b/nixpkgs/pkgs/development/python-modules/typeshed-client/default.nix new file mode 100644 index 000000000000..03877756e572 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/typeshed-client/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, importlib-resources +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "typeshed-client"; + version = "2.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "JelleZijlstra"; + repo = "typeshed_client"; + rev = "refs/tags/v${version}"; + hash = "sha256-g3FECKebKeM3JPWem6+Y9T27PcAxVxj1SiBd5siLSJ4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + importlib-resources + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "typeshed_client" + ]; + + pytestFlagsArray = [ + "tests/test.py" + ]; + + meta = with lib; { + description = "Retrieve information from typeshed and other typing stubs"; + homepage = "https://github.com/JelleZijlstra/typeshed_client"; + changelog = "https://github.com/JelleZijlstra/typeshed_client/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index 2e69e4568f82..68c72fe80fed 100644 --- a/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.6.5"; + version = "1.6.8"; format = "setuptools"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-uamqp-python"; rev = "refs/tags/v${version}"; - hash = "sha256-q8FxM4PBXLD5q68nrUJ+TGkui1yQJ3HHNF7jn+e+HkA="; + hash = "sha256-L4E7nnsVZ/VrOM0t4KtztU9ALmtGfi1vDzUi0ogtZOc="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ diff --git a/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix b/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix index f0d517732805..6daa54a31e81 100644 --- a/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix @@ -1,28 +1,25 @@ { lib -, buildPythonPackage -, fetchPypi - -# build -, setuptools-scm - -# runtime , booleanoperations +, buildPythonPackage , cffsubr , compreffor , cu2qu , defcon +, fetchPypi , fonttools +, pytestCheckHook +, pythonOlder +, setuptools-scm , skia-pathops , ufolib2 - -# tests -, pytestCheckHook }: buildPythonPackage rec { pname = "ufo2ft"; version = "2.33.4"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; @@ -50,19 +47,27 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + disabledTests = [ # Do not depend on skia. - "--deselect=tests/integration_test.py::IntegrationTest::test_removeOverlaps_CFF_pathops" - "--deselect=tests/integration_test.py::IntegrationTest::test_removeOverlaps_pathops" - "--deselect=tests/preProcessor_test.py::TTFPreProcessorTest::test_custom_filters_as_argument" - "--deselect=tests/preProcessor_test.py::TTFInterpolatablePreProcessorTest::test_custom_filters_as_argument" + "test_removeOverlaps_CFF_pathops" + "test_removeOverlaps_pathops" + "test_custom_filters_as_argument" + "test_custom_filters_as_argument" + # Some integration tests fail + "test_compileVariableCFF2" + "test_compileVariableTTF" + "test_drop_glyph_names_variable" + "test_drop_glyph_names_variable" ]; - pythonImportsCheck = [ "ufo2ft" ]; + pythonImportsCheck = [ + "ufo2ft" + ]; meta = with lib; { description = "Bridge from UFOs to FontTools objects"; homepage = "https://github.com/googlefonts/ufo2ft"; + changelog = "https://github.com/googlefonts/ufo2ft/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix b/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix index e68d0be6ad35..abb17d43040f 100644 --- a/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix @@ -1,16 +1,24 @@ { lib +, bokeh , buildPythonPackage +, colorcet +, datashader , fetchFromGitHub -, fetchpatch -, keras +, holoviews +, matplotlib , numba , numpy +, pandas , pynndescent , pytestCheckHook , pythonOlder +, scikit-image , scikit-learn , scipy +, seaborn +, tbb , tensorflow +, tensorflow-probability , tqdm }: @@ -19,7 +27,7 @@ buildPythonPackage rec { version = "0.5.5"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "lmcinnes"; @@ -37,10 +45,32 @@ buildPythonPackage rec { tqdm ]; + passthru.optional-dependencies = rec { + plot = [ + bokeh + colorcet + datashader + holoviews + matplotlib + pandas + scikit-image + seaborn + ]; + + parametric_umap = [ + tensorflow + tensorflow-probability + ]; + + tbb = [ + tbb + ]; + + all = plot ++ parametric_umap ++ tbb; + }; + nativeCheckInputs = [ - keras pytestCheckHook - tensorflow ]; preCheck = '' @@ -50,8 +80,9 @@ buildPythonPackage rec { disabledTests = [ # Plot functionality requires additional packages. # These test also fail with 'RuntimeError: cannot cache function' error. - "test_umap_plot_testability" "test_plot_runs_at_all" + "test_umap_plot_testability" + "test_umap_update_large" # Flaky test. Fails with AssertionError sometimes. "test_sparse_hellinger" diff --git a/nixpkgs/pkgs/development/python-modules/unearth/default.nix b/nixpkgs/pkgs/development/python-modules/unearth/default.nix index 7af5740fe315..649e305aeeb3 100644 --- a/nixpkgs/pkgs/development/python-modules/unearth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.12.1"; + version = "0.14.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TKrZQbYPUeUP3BCYZiNNQHkQrvd/EjOqG2tdFox0J+4="; + hash = "sha256-883fuUrA+GX7z5ZCMVVu9xgwEDecALASBVF6UMeKGG0="; }; nativeBuildInputs = [ @@ -32,8 +32,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging requests - ] ++ lib.optionals (pythonOlder "3.8") [ - cached-property ]; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/python-modules/unify/default.nix b/nixpkgs/pkgs/development/python-modules/unify/default.nix index 58bee2b6e52e..fc0cd0d4f67e 100644 --- a/nixpkgs/pkgs/development/python-modules/unify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unify/default.nix @@ -1,26 +1,47 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder +, setuptools +, pytestCheckHook , untokenize -, unittestCheckHook }: buildPythonPackage rec { pname = "unify"; version = "0.5"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.9"; - # PyPi release is missing tests (see https://github.com/myint/unify/pull/18) src = fetchFromGitHub { owner = "myint"; repo = "unify"; - rev = "v${version}"; - sha256 = "1l6xxygaigacsxf0g5f7w5gpqha1ava6mcns81kqqy6vw91pyrbi"; + rev = "refs/tags/v${version}"; + hash = "sha256-cWV/Q+LbeIxnQNqyatRWQUF8X+HHlQdc10y9qJ7v3dA="; }; - propagatedBuildInputs = [ untokenize ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + untokenize + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "unify" + ]; - nativeCheckInputs = [ unittestCheckHook ]; + disabledTests = [ + # https://github.com/myint/unify/issues/21 + "test_format_code" + "test_format_code_with_backslash_in_comment" + ]; meta = with lib; { description = "Modifies strings to all use the same quote where possible"; diff --git a/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 3872cd5ce2a5..938856691b7a 100644 --- a/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, pythonRelaxDepsHook # build-system , setuptools @@ -26,21 +27,27 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.15"; + version = "0.0.18"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "v${version}"; - hash = "sha256-5hA1i2XzKzQDRrZfOaA6I3X7hU+nSd7HpcHHNIzZO7g="; + hash = "sha256-XUMpWzDqouhbsP+s0b13f6N0YGdXJK6qhbWQLqMzNHM="; }; nativeBuildInputs = [ + pythonRelaxDepsHook setuptools setuptools-git-versioning ]; + pythonRelaxDeps = [ + # https://github.com/NabuCasa/universal-silabs-flasher/pull/50 + "gpiod" + ]; + propagatedBuildInputs = [ async-timeout bellows diff --git a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix index 5cbf65a99d43..ac1f937a44b4 100644 --- a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.12.0"; + version = "0.12.4"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-NXpl/WUyOfWspppXT5iUWJd4eRd51bdQgl9xyf/+e8s="; + hash = "sha256-lfsCmEhF6CTrEIa4y98NgDw6EgfLk39BVsTmYZD6MkU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 79c925c012a5..288758dfb34a 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -3,10 +3,12 @@ , fetchFromGitHub , pythonOlder , awkward +, hatch-vcs , hatchling , numpy , fsspec , packaging +, pandas , pytestCheckHook , lz4 , pytest-timeout @@ -18,7 +20,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.2.1"; + version = "5.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,10 +29,11 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-3BGGtA99MoagFtGcCeGiDyvzqixf+lbEu9Dn/62RQto="; + hash = "sha256-7X8oIMvOSC1JXQrZTPXLiqsUnfSc2Rx3KCvxKbhvPzM="; }; nativeBuildInputs = [ + hatch-vcs hatchling ]; @@ -42,6 +45,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pandas pytestCheckHook lz4 pytest-timeout diff --git a/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/nixpkgs/pkgs/development/python-modules/urwid/default.nix index 66a8d830cc2d..cf42463c19b2 100644 --- a/nixpkgs/pkgs/development/python-modules/urwid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/urwid/default.nix @@ -1,26 +1,32 @@ { lib , buildPythonPackage +, exceptiongroup , fetchFromGitHub - -# build-system -, setuptools -, setuptools-scm - -# tests , glibcLocales +, pygobject3 +, pyserial , pytestCheckHook +, pythonOlder +, pyzmq +, setuptools +, setuptools-scm +, tornado +, trio +, twisted }: buildPythonPackage rec { pname = "urwid"; - version = "2.2.3"; - format = "pyproject"; + version = "2.4.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-oPb2h/+gaqkZTXIiESjExMfBNnOzDvoMkXvkZ/+KVwo="; + hash = "sha256-raDsUZaXBC4s/48KNH8Thrpm8Bq8wj9+Rahk+LkxcDo="; }; postPatch = '' @@ -32,10 +38,35 @@ buildPythonPackage rec { setuptools-scm ]; + passthru.optional-dependencies = { + glib = [ + pygobject3 + ]; + tornado = [ + tornado + ]; + trio = [ + exceptiongroup + trio + ]; + twisted = [ + twisted + ]; + zmq = [ + pyzmq + ]; + serial = [ + pyserial + ]; + lcd = [ + pyserial + ]; + }; + nativeCheckInputs = [ glibcLocales pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); env.LC_ALL = "en_US.UTF8"; @@ -53,8 +84,8 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/urwid/urwid/releases/tag/${version}"; description = "A full-featured console (xterm et al.) user interface library"; + changelog = "https://github.com/urwid/urwid/releases/tag/${version}"; downloadPage = "https://github.com/urwid/urwid"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix b/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix index 2d82aa97c507..8d4aaea83371 100644 --- a/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "4.0.3"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-L6uLA8iVYzh3wFVSwxzleHhu22sQeomq9N9A1oAxpf4="; + hash = "sha256-w2mke37hYfBCT1W2OUCH5AtrnV3RF4eAgNyUSQlSmcE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/vncdo/default.nix b/nixpkgs/pkgs/development/python-modules/vncdo/default.nix index 51b5abbe9ea2..2fbee9f2d65a 100644 --- a/nixpkgs/pkgs/development/python-modules/vncdo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vncdo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vncdo"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sibson"; repo = "vncdotool"; rev = "refs/tags/v${version}"; - hash = "sha256-m8msWa8uUuDEjEUlXHCgYi0HFPKXLVXpXLyuQ3quNbA="; + hash = "sha256-QrD6z/g85FwaZCJ1PRn8CBKCOQcbVjQ9g0NpPIxguqk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/vtjp/default.nix b/nixpkgs/pkgs/development/python-modules/vtjp/default.nix new file mode 100644 index 000000000000..4e193ea2eb48 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/vtjp/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, setuptools +, tabulate +}: + +buildPythonPackage rec { + pname = "vtjp"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Miicroo"; + repo = "python-vasttrafik"; + rev = "refs/tags/v${version}"; + hash = "sha256-3/toHY2PkG87J5bIMNJZHF/4mUvWaeHamMzPa1St7Xo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + tabulate + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "vasttrafik" + ]; + + meta = with lib; { + description = "A Python wrapper and cli for Västtrafik public API"; + homepage = "https://github.com/Miicroo/python-vasttrafik"; + changelog = "https://github.com/Miicroo/python-vasttrafik/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/vulture/default.nix b/nixpkgs/pkgs/development/python-modules/vulture/default.nix index 5578b54ccd28..43d6f8b00fcd 100644 --- a/nixpkgs/pkgs/development/python-modules/vulture/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vulture/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.10"; + version = "2.11"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KlwxYL/7p3WVtubfzEEgFr0qCc1LZs33+7qRNoSJn28="; + hash = "sha256-8Pu2C85lEarYfuBzbFAkVnN0kKgtkZpE5tkiYss18cI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/wagtail/default.nix b/nixpkgs/pkgs/development/python-modules/wagtail/default.nix index f2f924b5c124..0e7bf3a3f185 100644 --- a/nixpkgs/pkgs/development/python-modules/wagtail/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wagtail/default.nix @@ -37,7 +37,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" \ - --replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" + --replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" \ + --replace "django-taggit>=2.0,<5.0" "django-taggit>=2.0,<6.0" \ + --replace "Willow[heif]>=1.6.2,<1.7" "Willow[heif]>=1.6.2,<2" ''; propagatedBuildInputs = [ @@ -64,7 +66,9 @@ buildPythonPackage rec { # on wagtail (wagtail-factories) doCheck = false; - passthru.tests.wagtail = callPackage ./tests.nix {}; + passthru.tests.wagtail = callPackage ./tests.nix { }; + + pythonImportsCheck = [ "wagtail" ]; meta = with lib; { description = "A Django content management system focused on flexibility and user experience"; diff --git a/nixpkgs/pkgs/development/python-modules/watermark/default.nix b/nixpkgs/pkgs/development/python-modules/watermark/default.nix index 6e9e169ace5e..daac4416fc08 100644 --- a/nixpkgs/pkgs/development/python-modules/watermark/default.nix +++ b/nixpkgs/pkgs/development/python-modules/watermark/default.nix @@ -29,7 +29,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipython - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix b/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix index e87694dfe50e..35a4c5527533 100644 --- a/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.26.0"; + version = "3.26.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7oCb8tH1pQDJpoxe3C6xdKtRQqNoAuJ0qySv5nX/sos="; + hash = "sha256-Y+xwg5tkkJgQpkqns+W4UIhGLpPH4u08MuvvtwLzZyM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/webargs/default.nix b/nixpkgs/pkgs/development/python-modules/webargs/default.nix index acee1e965f8d..800649a09388 100644 --- a/nixpkgs/pkgs/development/python-modules/webargs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webargs/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.3.0"; + version = "8.4.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-yrIHlBsGhsTQhsgjYy3c1DQxUWRDQaMvz1C46qceMcc="; + hash = "sha256-6pk2ghSkzmE5JL6Z1x21jCaWMele/0+gm3NU5S3ABqU="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index 35c5f943cb19..e59eda006e6e 100644 --- a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -3,27 +3,39 @@ , buildPythonPackage , pythonOlder , fetchPypi + +# build-system , flit-core + +# dependencies +, markupsafe + +# optional-dependencies , watchdog + +# tests +, cryptography , ephemeral-port-reserve +, greenlet , pytest-timeout , pytest-xprocess , pytestCheckHook -, markupsafe -# for passthru.tests -, moto, sentry-sdk + +# reverse dependencies +, moto +, sentry-sdk }: buildPythonPackage rec { pname = "werkzeug"; - version = "2.3.8"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-VUslfHS763oNJUFgpPj/4YUkP1KlIDUGC3Ycpi2XfwM="; + hash = "sha256-UH6BHs6nKxikBJR63tSzOQ4duPgmtJTXZVDvRbs7Hcw="; }; nativeBuildInputs = [ @@ -36,16 +48,19 @@ buildPythonPackage rec { passthru.optional-dependencies = { watchdog = lib.optionals (!stdenv.isDarwin) [ - # watchdog requires macos-sdk 10.13[ + # watchdog requires macos-sdk 10.13 watchdog ]; }; nativeCheckInputs = [ + cryptography ephemeral-port-reserve pytest-timeout pytest-xprocess pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.11") [ + greenlet ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = lib.optionals stdenv.isDarwin [ @@ -68,6 +83,7 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://werkzeug.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${replaceStrings [ "." ] [ "-" ] version}"; homepage = "https://palletsprojects.com/p/werkzeug/"; description = "The comprehensive WSGI web application library"; longDescription = '' diff --git a/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix b/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix index c8ce155c788f..7d79d18f443b 100644 --- a/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix @@ -8,7 +8,7 @@ , packaging , pytestCheckHook , pythonOlder -, readme_renderer +, readme-renderer , wheel-filename }: @@ -31,7 +31,7 @@ buildPythonPackage rec { entry-points-txt headerparser packaging - readme_renderer + readme-renderer wheel-filename ]; diff --git a/nixpkgs/pkgs/development/python-modules/wheezy-captcha/default.nix b/nixpkgs/pkgs/development/python-modules/wheezy-captcha/default.nix index 4006bedf14e1..fc0701704d79 100644 --- a/nixpkgs/pkgs/development/python-modules/wheezy-captcha/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wheezy-captcha/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "wheezy.captcha"; - version = "3.0.2"; + version = "3.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PdtOhoVOopQsX2raPqh0P8meM8/MysgKsIe27HNtl3s="; + hash = "sha256-UtTpgrPK5eRr7sq97jptjdJyvAyrM2oU07+GZr2Ad7s="; }; propagatedBuildInputs = [ pillow ]; diff --git a/nixpkgs/pkgs/development/python-modules/whispers/default.nix b/nixpkgs/pkgs/development/python-modules/whispers/default.nix index bba0f14e159b..5106ee3b0556 100644 --- a/nixpkgs/pkgs/development/python-modules/whispers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whispers/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , crossplane , fetchFromGitHub +, fetchpatch , jellyfish , jproperties , luhn @@ -12,22 +13,52 @@ , pytestCheckHook , pythonOlder , pyyaml +, setuptools }: buildPythonPackage rec { pname = "whispers"; version = "2.2.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "adeptex"; - repo = pname; + repo = "whispers"; rev = "refs/tags/${version}"; hash = "sha256-9vXku8BWJtlf+lmAcQ8a7qTisRNc+xVw0T0Eunc4lt4="; }; + patches = [ + # Support astroid > 3, https://github.com/adeptex/whispers/pull/117 + (fetchpatch { + url = "https://github.com/adeptex/whispers/commit/ff25e81cb3d775e5fb186c2d135b77c27d9ed43a.patch"; + hash = "sha256-jKm7fs04mGUD7MZYAA/3xt01e9knuLun3c3u8PlLebg="; + }) + (fetchpatch { + url = "https://github.com/adeptex/whispers/commit/ba6a56dddb12d1cb62f94dd7659ba24fdc4363ee.patch"; + hash = "sha256-eHWnXHT0lzS7BqneMqfvV3w6GfrCiTJ5i+av82J+fpk="; + }) + (fetchpatch { + url = "https://github.com/adeptex/whispers/commit/8b7b1593eb86abfc09b3581d463fc7d0e06309dc.patch"; + hash = "sha256-JcRdv5eIyXKWaVqbJZlYqiSieE4z0MKF4dvO/hRBBMs="; + }) + (fetchpatch { + url = "https://github.com/adeptex/whispers/commit/71dcb614e4d9e0247afc50cd4214659739f8844e.patch"; + hash = "sha256-7XIFuc8Rf2ValN3BoAJOjSqjgmiOauxCFonMgGljFg0="; + }) + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ astroid beautifulsoup4 @@ -44,11 +75,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner"' "" - ''; - preCheck = '' # Some tests need the binary available in PATH export PATH=$out/bin:$PATH @@ -60,7 +86,8 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to identify hardcoded secrets in static structured text"; - homepage = "https://github.com/Skyscanner/whispers"; + homepage = "https://github.com/adeptex/whispers"; + changelog = "https://github.com/adeptex/whispers/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/whodap/default.nix b/nixpkgs/pkgs/development/python-modules/whodap/default.nix index c991e5a5922c..f6707f9fc310 100644 --- a/nixpkgs/pkgs/development/python-modules/whodap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whodap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.11"; + version = "0.1.12"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IX4sxuOxH4rXZlpRiWncXvaB2TkfZl1rKioZ3eqDGHs="; + hash = "sha256-kw7bmkpDNb/PK/Q2tSbG+ju0G+6tdSy3RaNDaNOVYnE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/willow/default.nix b/nixpkgs/pkgs/development/python-modules/willow/default.nix index 7f5b06223ee6..2b0058357d88 100644 --- a/nixpkgs/pkgs/development/python-modules/willow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/willow/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "willow"; - version = "1.7.0"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "2.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "wagtail"; repo = "Willow"; rev = "refs/tags/v${version}"; - hash = "sha256-+ubylc/Zuw3DSSgtTg2dO3Zj0gpTJcLbb1J++caxS7w="; + hash = "sha256-g9/v56mdo0sJe5Pl/to/R/kXayaKK3qaYbnnPXpFjXE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/wled/default.nix b/nixpkgs/pkgs/development/python-modules/wled/default.nix index c1a5f51956d1..7d90c554907c 100644 --- a/nixpkgs/pkgs/development/python-modules/wled/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -9,6 +9,7 @@ , yarl , aresponses , pytest-asyncio +, pytest-xdist , pytestCheckHook , pythonOlder }: @@ -49,6 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-xdist pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/wyoming/default.nix b/nixpkgs/pkgs/development/python-modules/wyoming/default.nix index 715c20b842ac..debc6ad7bba1 100644 --- a/nixpkgs/pkgs/development/python-modules/wyoming/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wyoming/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "wyoming"; - version = "1.4.0"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming"; rev = "refs/tags/${version}"; - hash = "sha256-59/6tRHHAu31VFuKhj2LCEUqkdVi81fu5POuGJmw9bw="; + hash = "sha256-2bc5coKL5KlTeL9fdghPmRF66NXfimHOKGtE2yPXgrA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xarray-dataclasses/default.nix b/nixpkgs/pkgs/development/python-modules/xarray-dataclasses/default.nix new file mode 100644 index 000000000000..aae2cdd7f1d7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/xarray-dataclasses/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, pytestCheckHook +, numpy +, typing-extensions +, xarray +}: + +buildPythonPackage rec { + pname = "xarray-dataclasses"; + version = "1.7.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "astropenguin"; + repo = "xarray-dataclasses"; + rev = "refs/tags/v${version}"; + hash = "sha256-fyRUH6t2+9tsxRQFfJR2EHinYtwCmWeCB77kpmBgdBA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + numpy + typing-extensions + xarray + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "xarray_dataclasses" ]; + + meta = with lib; { + description = "xarray data creation made easy by dataclass"; + homepage = "https://github.com/astropenguin/xarray-dataclasses"; + changelog = "https://github.com/astropenguin/xarray-dataclasses/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/nixpkgs/pkgs/development/python-modules/xarray/default.nix index 70b99d5091f6..aa89ff792eea 100644 --- a/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -8,25 +8,23 @@ , pythonOlder , setuptools , setuptools-scm -, wheel }: buildPythonPackage rec { pname = "xarray"; - version = "2023.11.0"; - format = "pyproject"; + version = "2024.1.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-mkXhB0GES1+UjY4edotGDffpBpbRji7/LB1H9dnVAlI="; + hash = "sha256-oboth6dIkuITycg/SkYtvN9oISMgpOMbNL14m6emTjU="; }; nativeBuildInputs = [ setuptools setuptools-scm - wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xdoctest/default.nix b/nixpkgs/pkgs/development/python-modules/xdoctest/default.nix index 357e605d8534..68eb1a0f426b 100644 --- a/nixpkgs/pkgs/development/python-modules/xdoctest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xdoctest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "xdoctest"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Erotemic"; repo = "xdoctest"; rev = "refs/tags/v${version}"; - hash = "sha256-yTu5ldr9TkpYRP8hjgUPpexBVLjaK2gfPvISjMJLY74="; + hash = "sha256-MOjT8adJoSxigSG2Gy5gqRfYswjUsgbBOV1ZU0LBDN8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xformers/0001-fix-allow-building-without-git.patch b/nixpkgs/pkgs/development/python-modules/xformers/0001-fix-allow-building-without-git.patch new file mode 100644 index 000000000000..54b79e3e2f69 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/xformers/0001-fix-allow-building-without-git.patch @@ -0,0 +1,25 @@ +From 4c2b65c47d328c2f20cc74adcec2286fee6cb5de Mon Sep 17 00:00:00 2001 +From: Yaroslav Bolyukin <iam@lach.pw> +Date: Tue, 30 Jan 2024 18:18:35 +0100 +Subject: [PATCH] fix: allow building without git + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index e01c008..92eca62 100644 +--- a/setup.py ++++ b/setup.py +@@ -71,7 +71,7 @@ def get_flash_version() -> str: + ["git", "describe", "--tags", "--always"], + cwd=flash_dir, + ).decode("ascii")[:-1] +- except subprocess.CalledProcessError: ++ except Exception: + version = flash_dir / "version.txt" + if version.is_file(): + return version.read_text().strip() +-- +2.43.0 + diff --git a/nixpkgs/pkgs/development/python-modules/xformers/default.nix b/nixpkgs/pkgs/development/python-modules/xformers/default.nix index 164513da94c8..c909559ca59a 100644 --- a/nixpkgs/pkgs/development/python-modules/xformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xformers/default.nix @@ -25,7 +25,8 @@ #, flash-attn }: let - version = "0.03"; + inherit (torch) cudaCapabilities cudaPackages cudaSupport; + version = "0.0.23.post1"; in buildPythonPackage { pname = "xformers"; @@ -38,17 +39,34 @@ buildPythonPackage { owner = "facebookresearch"; repo = "xformers"; rev = "refs/tags/v${version}"; - hash = "sha256-G8f7tny5B8SAQ6+2uOjhY7nD0uOT4sskIwtTdwivQXo="; + hash = "sha256-AJXow8MmX4GxtEE2jJJ/ZIBr+3i+uS4cA6vofb390rY="; fetchSubmodules = true; }; + patches = [ + ./0001-fix-allow-building-without-git.patch + ]; + preBuild = '' cat << EOF > ./xformers/version.py # noqa: C801 __version__ = "${version}" EOF + '' + lib.optionalString cudaSupport '' + export CUDA_HOME=${cudaPackages.cuda_nvcc} + export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}" ''; + buildInputs = lib.optionals cudaSupport (with cudaPackages; [ + # flash-attn build + cuda_cudart # cuda_runtime_api.h + libcusparse.dev # cusparse.h + cuda_cccl.dev # nv/target + libcublas.dev # cublas_v2.h + libcusolver.dev # cusolverDn.h + libcurand.dev # curand_kernel.h + ]); + nativeBuildInputs = [ which ]; diff --git a/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix index c79e41d82545..6e2ac49cc348 100644 --- a/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.21.2"; + version = "0.25.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x9FQk3oGSxFrFj/F+QU9n7UMRTn0N4HsGonuNEEe9ug="; + hash = "sha256-awztZiUgEMGR8m/aXhDBLdm4IXIKIAHgX922m+PTTfg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/nixpkgs/pkgs/development/python-modules/xknx/default.nix index 6151edfb5066..91721fdd169a 100644 --- a/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -2,7 +2,6 @@ , async-timeout , buildPythonPackage , fetchFromGitHub -, fetchpatch , cryptography , ifaddr , pytest-asyncio @@ -14,26 +13,18 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.11.2"; - format = "pyproject"; + version = "2.12.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "XKNX"; - repo = pname; + repo = "xknx"; rev = "refs/tags/${version}"; - hash = "sha256-rKvHb0wkWVuZO8M8uIQdOiY1N6DmGSpqUgz4YYbUfSM="; + hash = "sha256-Fwo76tvkLLx8QJeokuGohhnt83eGBMyWIUSHJGuQWJ4="; }; - patches = [ - (fetchpatch { - name = "unpin-setuptools.patch"; - url = "https://github.com/XKNX/xknx/commit/c0826aec52ab69b8bd81f600bea154fae16f334e.patch"; - hash = "sha256-EpfgEq4pIx7ahqJZalzo30ruj8NlZYHcKHxFXCGL98w="; - }) - ]; - nativeBuildInputs = [ setuptools wheel diff --git a/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix b/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix index 56d08ad5146d..f5e47f196dca 100644 --- a/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix @@ -12,8 +12,8 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.4.1"; - format = "pyproject"; + version = "3.6.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-J257Y8Y0mVtlFHiHju5lxPyV0yx3IAYH8ikbmZlI3fY="; + hash = "sha256-7WK4TgrTuUwR33d1N8+VmgZ6iylyfIJbFCyxh49luL0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xstatic/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic/default.nix index 39e5f233ccd2..d9d6e0398355 100644 --- a/nixpkgs/pkgs/development/python-modules/xstatic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xstatic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit version pname; - sha256 = "80b78dfe37bce6dee4343d64c65375a80bcf399b46dd47c0c7d56161568a23a8"; + sha256 = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg="; }; # no tests implemented diff --git a/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix b/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix index 18f4fbfead6b..b32403a6a97d 100644 --- a/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.4.0"; + version = "2.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kdEeLd+83Pdno1ZzirZUrRk/7q0WFc/XfqvuKvVQ8/s="; + hash = "sha256-u6Mhqt6DcPiini8EvtqKoVAYUwb31hvWfCNb/sbqvWQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yalexs/default.nix b/nixpkgs/pkgs/development/python-modules/yalexs/default.nix index 19d40b4f8051..02e72f9244fc 100644 --- a/nixpkgs/pkgs/development/python-modules/yalexs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.10.0"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7LFKqC8IHzXKKU5Pw6Qud9jqJFc0lSEJFn636T6CsfQ="; + hash = "sha256-FHaHXbRtgbBrveHPbrPsP+vGIvscot3ilpPFucISces="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix b/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix index 122a39d82615..26b39ed87ed5 100644 --- a/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix @@ -3,7 +3,8 @@ , click , fetchFromGitHub , maison -, pdm-pep517 +, pdm-backend +, pytest-freezegun , pytest-xdist , pytestCheckHook , pythonOlder @@ -13,21 +14,21 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "1.13.0"; - format = "pyproject"; + version = "1.16.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lyz-code"; - repo = pname; + repo = "yamlfix"; rev = "refs/tags/${version}"; - hash = "sha256-GoCQtanQHYOFrhRvZjzk/cCPnUFwYUAclZuYGZfNg5E="; + hash = "sha256-nadyBIzXHbWm0QvympRaYU38tuPJ3TPJg8EbvVv+4L0="; }; nativeBuildInputs = [ setuptools - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -37,14 +38,39 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-freezegun pytest-xdist pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "yamlfix" ]; + disabledTests = [ + # AssertionError: assert ... Fixed <stdin> in... + "test_check_one_file_no_changes" + "test_config_parsing" + "test_corrects_code_from_stdin" + "test_corrects_one_file" + "test_corrects_three_files" + "test_empty_list_inline_comment_indentation" + "test_find_files" + "test_fix_code_converts_non_valid_false_booleans" + "test_ignores_correct_files" + "test_include_exclude_files" + "test_read_prefixed_environment_variables" + "test_section_whitelines" + "test_whitelines" + "test_sequence_style_env_enum_parsing" + "test_verbose_option" + "test_enforcing_flow_style_together_with_adjustable_newlines" + ]; + meta = with lib; { description = "Python YAML formatter that keeps your comments"; homepage = "https://github.com/lyz-code/yamlfix"; diff --git a/nixpkgs/pkgs/development/python-modules/yappi/default.nix b/nixpkgs/pkgs/development/python-modules/yappi/default.nix index cb12c4f63f37..1e20c1ba2eab 100644 --- a/nixpkgs/pkgs/development/python-modules/yappi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yappi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "yappi"; - version = "1.4.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sumerc"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AogBnqhLcwsyTHLP+Uxc+EOgYzhdwX5rbi9RMCuC2IU="; + hash = "sha256-zA4apOGyrbjBOxUKBARiKmmM9rSVFVGWsDpOaItOoLU="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/yara-python/default.nix b/nixpkgs/pkgs/development/python-modules/yara-python/default.nix index 403ee6df52bd..cff5b329e6ca 100644 --- a/nixpkgs/pkgs/development/python-modules/yara-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yara-python/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook , pythonOlder , yara @@ -8,8 +9,8 @@ buildPythonPackage rec { pname = "yara-python"; - version = "4.3.1"; - format = "setuptools"; + version = "4.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,20 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - hash = "sha256-WjH27pOOBXmbj8ghr42TLTp8eAKiTq4eRTYnim56J/8="; + hash = "sha256-Fl/0ordXDKC1CBBmPx0fEwZZjqSiMxnwNvQqD98MjRo="; }; + # undefined symbol: yr_finalize + # https://github.com/VirusTotal/yara-python/issues/7 + postPatch = '' + substituteInPlace setup.py \ + --replace "include_dirs=['yara/libyara/include', 'yara/libyara/', '.']" "libraries = ['yara']" + ''; + + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ yara ]; diff --git a/nixpkgs/pkgs/development/python-modules/yaramod/default.nix b/nixpkgs/pkgs/development/python-modules/yaramod/default.nix index 1f459858dfa0..78920969bc95 100644 --- a/nixpkgs/pkgs/development/python-modules/yaramod/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yaramod/default.nix @@ -20,7 +20,7 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "3.20.2"; + version = "3.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ in owner = "avast"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OLsTvG+qaUJlKdHwswGBifzoT/uNunrrVWQg7hJxkhE="; + hash = "sha256-YkMDoFwWPrDhAgDnPpNCU1NlnAPhwYQF/KFaRFn+juQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/yfinance/default.nix b/nixpkgs/pkgs/development/python-modules/yfinance/default.nix index b8ec40d9e03b..fb771047db11 100644 --- a/nixpkgs/pkgs/development/python-modules/yfinance/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yfinance/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.35"; + version = "0.2.36"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uLcnTH3teLxW6LZCJUD3jOPLm1a2jAK1bg4tKSSNXKU="; + hash = "sha256-oBpkWKQZ5FA+nyNWVOlRzoEyShCfh6SqCCrkFZBu1rQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix b/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix index ceff77e4d2b7..5c155094cf64 100644 --- a/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.3.4"; + version = "0.3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wDZlzl178SIXxo5SacbbXWHhF4wOsjBU4a9h0jBYA4c="; + hash = "sha256-P9Hu3JhoFDwKylTAZmXYX2AI2CPf/GbYhJCU4wX/aWY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/youtubeaio/default.nix b/nixpkgs/pkgs/development/python-modules/youtubeaio/default.nix new file mode 100644 index 000000000000..94056aca5bd3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/youtubeaio/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +, pydantic +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +, syrupy +}: + +buildPythonPackage rec { + pname = "youtubeaio"; + version = "1.1.5"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "joostlek"; + repo = "python-youtube"; + rev = "refs/tags/v${version}"; + hash = "sha256-utkf5t6yrf0f9QBIaDH6MxKduNZOsjfEWfQnuVyUoRM="; + }; + + postPatch = '' + sed -i "/^addopts/d" pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pydantic + yarl + ]; + + pythonImportsCheck = [ "youtubeaio" ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + meta = { + changelog = "https://github.com/joostlek/python-youtube/releases/tag/v${version}"; + description = "Asynchronous Python client for the YouTube V3 API"; + homepage = "https://github.com/joostlek/python-youtube"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index d0aebbc5138c..700a250130aa 100644 --- a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.4.2"; + version = "1.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-Ho8JEARmw9Pd7A/sYM6Fkp3gfYx4bXbFIvh9pSE7f5c="; + hash = "sha256-3dJ9Mu1cblBJh3BVEyxdfO+RD8kSxpdvnvox7ljMWT4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zcbor/default.nix b/nixpkgs/pkgs/development/python-modules/zcbor/default.nix index 1525a7610c73..9bce9e925c1d 100644 --- a/nixpkgs/pkgs/development/python-modules/zcbor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zcbor/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "zcbor"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-47HwITfFcHNze3tt4vJxHB4BQ7oyl17DM8IV0WomM5Q="; + hash = "sha256-U3Y/r3tBhzK6bGnMxdqKzS7bLHyAzgpGZ5PVK9pw7Pk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zconfig/default.nix b/nixpkgs/pkgs/development/python-modules/zconfig/default.nix index c8e852135764..8947badb91bf 100644 --- a/nixpkgs/pkgs/development/python-modules/zconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zconfig/default.nix @@ -1,32 +1,62 @@ { lib , stdenv -, fetchPypi , buildPythonPackage -, zope-testrunner -, manuel , docutils +, fetchPypi +, manuel , pygments +, pytestCheckHook +, pythonOlder +, setuptools +, zope-testrunner }: buildPythonPackage rec { - pname = "ZConfig"; - version = "3.6.1"; + pname = "zconfig"; + version = "4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-RCLH1mOvdizXeVd1NmvGpnq0QKGreW6w90JbDpA08HY="; + pname = "ZConfig"; + inherit version; + hash = "sha256-+NZC+6a6mNCGMb4sH3GtGVfAUf70qj0/ufHgjcYdAVY="; }; patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; - buildInputs = [ manuel docutils ]; - propagatedBuildInputs = [ zope-testrunner ]; - nativeCheckInputs = [ pygments ]; + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + docutils + manuel + ]; + + propagatedBuildInputs = [ + zope-testrunner + ]; + + nativeCheckInputs = [ + pygments + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ZConfig" + ]; + + pytestFlagsArray = [ + "-s" + ]; meta = with lib; { description = "Structured Configuration Library"; - homepage = "https://pypi.python.org/pypi/ZConfig"; + homepage = "https://github.com/zopefoundation/ZConfig"; + changelog = "https://github.com/zopefoundation/ZConfig/blob/${version}/CHANGES.rst"; license = licenses.zpl20; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/zfec/default.nix b/nixpkgs/pkgs/development/python-modules/zfec/default.nix index fc3b710919bc..1e135da34b3a 100644 --- a/nixpkgs/pkgs/development/python-modules/zfec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zfec/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, setuptools +, hypothesis , pyutil +, setuptools , twisted }: @@ -20,17 +21,26 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ pyutil ]; + propagatedBuildInputs = [ + pyutil + ]; - nativeCheckInputs = [ twisted ]; + nativeCheckInputs = [ + hypothesis + twisted + ]; - checkPhase = "trial zfec"; + checkPhase = '' + trial zfec + ''; - pythonImportsCheck = [ "zfec" ]; + pythonImportsCheck = [ + "zfec" + ]; meta = with lib; { homepage = "https://github.com/tahoe-lafs/zfec"; - description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; + description = "Fast erasure codec which can be used with the command-line, C, Python, or Haskell"; longDescription = '' Fast, portable, programmable erasure coding a.k.a. "forward error correction": the generation of redundant blocks of diff --git a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 9063ecd02db0..f3fcfc74d4f5 100644 --- a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.109"; + version = "0.0.111"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-fkE44j+wXdIJekJJNoO67YzsghalTUpyNx9R/B2Vn1Y="; + hash = "sha256-e2Ho/LBdnEKn7hgykhstjv8ZUYAn41e1+rsgA1MEmf4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/ziafont/default.nix b/nixpkgs/pkgs/development/python-modules/ziafont/default.nix index 4e55583b211b..788dda332941 100644 --- a/nixpkgs/pkgs/development/python-modules/ziafont/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ziafont/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytestCheckHook , nbval }: buildPythonPackage rec { pname = "ziafont"; - version = "0.6"; + version = "0.7"; format = "pyproject"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-3ZVj1ZxbFkFDDYbsIPzo7GMWGx7f5qWZQlcGCVXv73M="; + hash = "sha256-DQEVWYOgiGSP3WlmZzEweyRa0UY7fxjjpbued+5EH5I="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook nbval diff --git a/nixpkgs/pkgs/development/python-modules/ziamath/default.nix b/nixpkgs/pkgs/development/python-modules/ziamath/default.nix index 5e24f3c41670..c2d72a25f810 100644 --- a/nixpkgs/pkgs/development/python-modules/ziamath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ziamath/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , ziafont , pytestCheckHook , nbval @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "ziamath"; - version = "0.8.1"; + version = "0.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-Bbwq4Ods3P/724KO94jSmMLD1ubfaMHP/gTlOL/2pnE="; + hash = "sha256-ISd+J7R8qZ0NXdlyHMj+torzr+541UAhNCSaUH8ytSQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ziafont ]; diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix index ac6cf8901e04..721905fb17b8 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.22.4"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MtF9k7Ogsv7gjeZSBvFLsh9LHUFy5z+qYleUI9BC2es="; + hash = "sha256-8U/3YzXyrQ6pOklvfuVFAk2r/mpcUM7HokfBJUhtyh4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index 94fa9cdb0d38..8bc40b8a5566 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -8,6 +8,7 @@ , pytest-mock , pytest-rerunfailures , pytest-timeout +, pytest-xdist , pytestCheckHook , pythonOlder , setuptools @@ -53,6 +54,7 @@ buildPythonPackage rec { pytest-mock pytest-rerunfailures pytest-timeout + pytest-xdist pytestCheckHook ]; @@ -60,6 +62,17 @@ buildPythonPackage rec { "--reruns=3" ]; + disabledTests = [ + # failing since zigpy 0.60.0 + "test_join_device" + "test_nonstandard_profile" + "test_permit_join" + "test_request_recovery_route_rediscovery_zdo" + "test_watchdog" + "test_zigpy_request" + "test_zigpy_request_failure" + ]; + pythonImportsCheck = [ "zigpy_znp" ]; diff --git a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index c3f1c2b5d43e..9038d29222d5 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.60.2"; - format = "pyproject"; + version = "0.62.3"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-3hYgb2uvyFQmtfdVKBorGhTgVt/Dq1roXTu7xvE7SHY="; + hash = "sha256-LMcyYDUH/jGrDW8sjrT9kHdIWQ20fOOcOJRhUpKMGi8="; }; postPatch = '' |