diff options
Diffstat (limited to 'pkgs/development/python-modules')
252 files changed, 1952 insertions, 843 deletions
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 9ed55214b4c7f..2671c25e59f7d 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.21.0"; + version = "3.22.0"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-H65Ar/+9AwhKFNRK/SZyU8XzrMt3myjBo+YNJYtQ0b4="; + sha256 = "sha256-XnB6aSTKRV72WjcXx9jPZ+FGmCNh6dvwiau7WDlyE5M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index c38851160c22a..bf3f124b02e2f 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "adb-enhanced"; - version = "2.5.12"; + version = "2.5.14"; disabled = pythonOlder "3.4"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ashishb"; repo = pname; rev = version; - sha256 = "sha256-OZSLk5qXX6rEclo6JC8o/7Mz0Y2sJqUsLhnrVK4gkVI="; + sha256 = "sha256-GaPOYBQEGI40MutjjY8exABqGge2p/buk9v+NcZ5oJs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 94c47ab62a0e8..ef606a027d06c 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-UbcPxYEyuX8W0uZXeCu00yBshdcPBAQKzZqhAYXTf+8="; + hash = "sha256-qWKvNhiOAonUi0qpOWtwbNZa2lgBQ+gaGrAHMgDdr4Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index f00a75961b9c3..b0629483d0147 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.16"; + version = "0.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "v${version}"; - hash = "sha256-u3SwrSxeBJrBTHfqKY/mAb2p1jqW2AvRsHomKsI81gM="; + hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix new file mode 100644 index 0000000000000..5a51661b8e1a5 --- /dev/null +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -0,0 +1,40 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioairzone"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Noltari"; + repo = pname; + rev = version; + hash = "sha256-QruXxC/+61P2Mi0UILUIKp4S3wS1+E+WmzBbiUqlVe4="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "aioairzone" + ]; + + meta = with lib; { + description = "Module to control AirZone devices"; + homepage = "https://github.com/Noltari/aioairzone"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index ef39f451d59d0..01066c127be58 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.1.1"; + version = "2.1.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2+mrmXhRwkWLB6hfaCvizPNdZ51d4Pj1cSKfdArXunE="; + sha256 = "sha256-AP1/Q8wEhNjtJ0/QvkkqoWp/6medvqlqYCu3IspMLSI="; }; # relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index f96fa8820384c..f6d9b5d97ec72 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -92,7 +92,10 @@ buildPythonPackage rec { # Probably because we run `python -m pytest` instead of `pytest` in the hook. preCheck = '' cd tests - ''; + '' + lib.optionalString stdenv.isDarwin '' + # Work around "OSError: AF_UNIX path too long" + export TMPDIR="/tmp" + ''; meta = with lib; { description = "Asynchronous HTTP Client/Server for Python and asyncio"; diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 7c3def1ec5547..2b4cb28bbb59d 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2021.12.2"; + version = "2022.03.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-QFUXWleHRMBgaRsMNt2xFb3XcbCNI2kKQHKCBrUuG6Q="; + hash = "sha256-UiHT1YbBb9UTughVw2oJxRtvhUDVqQWqEcXMEXwy2cI="; }; nativeBuildInputs = [ @@ -49,12 +49,6 @@ buildPythonPackage rec { types-pytz ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'titlecase = "^2.3"' 'titlecase = "*"' \ - --replace 'pytz = "^2021.3"' 'pytz = "*"' - ''; - disabledTests = [ # AssertionError: assert datetime.date(... "test_get_next_pickup_event" diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index 1fd619a846aa8..9d815dfac0590 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.2.0"; # re-enable tests after 1.2.0 + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -23,8 +23,6 @@ buildPythonPackage rec { frozenlist ]; - # not compatible w ith latest asyncio - doCheck = false; checkInputs = [ pytest-asyncio pytestCheckHook @@ -32,6 +30,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ + --replace "filterwarnings = error" "" \ --replace "--cov=aiosignal" "" ''; diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix new file mode 100644 index 0000000000000..e7cd81d5b5d55 --- /dev/null +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, behave +, allure-python-commons +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "allure-behave"; + version = "2.9.45"; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-aK0SgQIXpuUoSTz8jg5IPKQM2Xvk2EfkSGigsy/GFNo="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + pythonImportsCheck = [ "allure_behave" ]; + + propagatedBuildInputs = [ + allure-python-commons + behave + ]; + + meta = with lib; { + description = "Allure behave integration."; + homepage = "https://github.com/allure-framework/allure-python"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index 697b9bba00fab..dcdf918344a35 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.9.4"; + version = "1.9.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "sha256-smwPKZLevolNvpkLxoFR3NGL9YFPlBk3WYQqJXBaS7s="; + sha256 = "sha256-An7MnGtZsmEZU/y6E0sivdexFD6HJRTB1juXqHfbDzE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index d09daa273b81e..80f726bdc1818 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.64"; + version = "0.0.65"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-CJJ+mWAX9XG1/E2PljUZ8oz/la3hYXF1tMfuKt0Zvjw="; + hash = "sha256-bhXmPplRT9gzeD/GdD2HxN+Z4vvaiaxBwkqSml9SJUs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 93a4b22f5dd13..1881da62f5065 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-4DUM1c3M/naJFqN/gdrX/NnJrY3ElUEOQ34cwcpSC+s="; + hash = "sha256-GaW1XyFOnjU28HqptFC6+Fe41zYZMR716Nsq0dPy660="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 21eeeb2369dfa..8164190cd49c0 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-nZGAuWp07VMpOvqw38FGSiUhaFjJOfCzOaam4Ex7qbY="; + hash = "sha256-lhwlZ7eHaEMaTW7c+WCRSeGSIQ5IeEx6XALyYJH+Ey0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index a7ab23a366618..173e620703a42 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.16"; + version = "2.10.17"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2XQhTtA6wSnCmZZ6pMmCBZQ7o28gBA5/63JI4MPi6hU="; + sha256 = "sha256-75JYgsqNTDwszQkc3hmeDIaQJMytDQejN9zyB7/zLzQ="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 6b54bd275ba64..fc242ccd10ace 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,17 +23,17 @@ let ansible-collections = callPackage ./collections.nix { - version = "5.2.0"; - sha256 = "sha256:1jwraha3s15s692d47kgcr7jy1ngbg6ipmkb0ak7fjnb57r4im66"; + version = "5.5.0"; + sha256 = "sha256-uKdtc3iJyb/Q5rDyJ23PjYNtpmcGejVXdvNQTXpm1Rg="; }; in buildPythonPackage rec { pname = "ansible-core"; - version = "2.12.2"; + version = "2.12.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256:1hz7j8gsgxbfjdf9562cbyxia3c4crdv50fm0p0wp4js79rf2ydw"; + sha256 = "sha256-ihNan3TJfKtndZKTdErTQ1D3GVI+i9m7kAjfTPlTryA="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index d8a369d6da04e..e84e3eb301b5d 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,17 +12,20 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.2a2"; + version = "0.2"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-pcVoYGBhp9jyuWBJ/Rpi8cjwDgPjhJ1PrPblj5DQTpk="; + hash = "sha256-xvr/NDAjCjhpImzNlCOcI4x5dIAefJ1TnUgoBhgdhPA="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ numpy @@ -35,7 +38,9 @@ buildPythonPackage rec { # tests require a physical FPGA doCheck = false; - pythonImportsCheck = [ "apycula" ]; + pythonImportsCheck = [ + "apycula" + ]; meta = with lib; { description = "Open Source tools for Gowin FPGAs"; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index add8e72d8e7e3..f9affcddd122b 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , nose , pythonOlder @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-D1YssHa14q2jxn4HtOYZlTdwGPkiiMhWuOh08fj87ic="; + hash = "sha256-nv/hwQZgKv/cM8fF6GqI8zY9GAe8aCZ/AGFOmhz+bMM="; }; checkInputs = [ @@ -25,6 +26,15 @@ buildPythonPackage rec { pytestCheckHook ]; + patches = [ + # Make archinfo import without installing pyvex, https://github.com/angr/archinfo/pull/113 + (fetchpatch { + name = "fix-import-issue.patch"; + url = "https://github.com/angr/archinfo/commit/d29c108f55ffd458ff1d3d65db2d651c76b19267.patch"; + sha256 = "sha256-9vi0QyqQLIPQxFuB8qrpcnPXWOJ6d27/IXJE/Ui6HhM="; + }) + ]; + pythonImportsCheck = [ "archinfo" ]; diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 839429bc948be..4ecf5fbc5f0d1 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -23,7 +23,8 @@ buildPythonPackage rec { sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; }; - propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; + propagatedBuildInputs = [ cffi six argon2-cffi-bindings ] + ++ lib.optional (!isPy3k) enum34; propagatedNativeBuildInputs = [ argon2-cffi-bindings diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix index fb7dec6d6ed46..6f6da10a87f9c 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy35, pytest, pytest-asyncio }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "async-generator"; @@ -12,17 +18,17 @@ buildPythonPackage rec { sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"; }; - # no longer compatible with pytest-asyncio - doCheck = false; - checkInputs = [ pytest pytest-asyncio ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; - checkPhase = '' - pytest -W error -ra -v --pyargs async_generator - ''; + pythonImportsCheck = [ "async_generator" ]; meta = with lib; { description = "Async generators and context managers for Python 3.5+"; homepage = "https://github.com/python-trio/async_generator"; license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix index 53bd099fce500..93b4aca2aa71a 100644 --- a/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.1.2"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZpxiFV9Ch46vIDxNDYm0BBD5EY8+j8AzOu6lKsQpGrY="; + sha256 = "sha256-bE9eOjOLERnioOunIBN7Hc/Nvs1zDXMSMzqZsVRg6Jo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index db168c9b325e0..0aac1e71e7c45 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.13.0"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "sha256-t04g65TPeOYgEQw6kPJrlJN1ssQrsN9kl7g69J4pPwo="; + sha256 = "sha256-ypzo0cYvP8LV74cQMzHIFDk3LH0bbEB4UxPxRuqe2fc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 6bc4c63aefb56..77c67e5a2aed4 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.3"; + version = "0.13.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1GaKDpOGX/YbM4rByTw0nYgwHYFvOLHZ0GRvanX3vAU="; + hash = "sha256-aZ1Mquc4IfrdWjOaHMipjNb6gLGGbdKS8ah5b33eqGo="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 70161d3fd6a02..fc188ae683c6a 100644 --- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "AWSIoTPythonSDK"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-iot-device-sdk-python"; rev = "v${version}"; - sha256 = "0bmvwv471mvlwj2rfz08j9qvzsp4vyjz67cbzkvsy6kmihx3wfqh"; + sha256 = "sha256-UpfgoCVbweOpWbgaqNebAAkWmhjkZu3txVoTZ/qhl3g="; }; # Module has no tests diff --git a/pkgs/development/python-modules/azure-containerregistry/default.nix b/pkgs/development/python-modules/azure-containerregistry/default.nix new file mode 100644 index 0000000000000..bc1aaf5f8bd1b --- /dev/null +++ b/pkgs/development/python-modules/azure-containerregistry/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, azure-core +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-containerregistry"; + version = "1.0.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-DIZCHZM5aeKtmJrgwAk5J26ltaxNxKUn3rR+FbmuyZc="; + extension = "zip"; + }; + + propagatedBuildInputs = [ azure-core msrest msrestazure ]; + + # tests require azure-devtools which are not published (since 2020) + # https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/containerregistry/azure-containerregistry/dev_requirements.txt + doCheck = false; + + pythonImportsCheck = [ "azure.core" "azure.containerregistry" ]; + + meta = with lib; { + description = "Microsoft Azure Container Registry client library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerregistry/azure-containerregistry"; + license = licenses.mit; + maintainers = with maintainers; [ peterromfeldhk ]; + }; +} diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 9a128d8134895..b7d330e6eff90 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 , aiodns , aiohttp , flask @@ -51,7 +51,18 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/" ]; # disable tests which touch network - disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ]; + disabledTests = [ + "aiohttp" + "multipart_send" + "response" + "request" + "timeout" + # disable 8 tests failing on some darwin machines with errors: + # azure.core.polling.base_polling.BadStatus: Invalid return status 403 for 'GET' operation + # azure.core.exceptions.HttpResponseError: Operation returned an invalid status 'Forbidden' + ] ++ lib.optional stdenv.isDarwin [ + "location_polling_fail" + ]; disabledTestPaths = [ # requires testing modules which aren't published, and likely to create cyclic dependencies "tests/test_connection_string_parsing.py" diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index ca662f6b1455a..af3a30a117fdc 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "11.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; + sha256 = "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index fae47547cc747..66818ce5b056a 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , msrest , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "3.0.0"; + version = "3.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "91ddb7333bf2b9541a53864cc8d2501e3694a03a9c0e41cbfae3348558675ce6"; + hash = "sha256-ROcUAm0KgIjO2A2XBpS00IeEPgd8x4cjoMfn6X9C+Gw="; }; propagatedBuildInputs = [ @@ -24,13 +26,13 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; - pythonNamespaces = [ "azure.mgmt" ]; + pythonNamespaces = [ + "azure.mgmt" + ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index edf8057e503c1..8c2ec661f8c1d 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , azure-common , azure-mgmt-core , msrest @@ -6,13 +9,14 @@ }: buildPythonPackage rec { - version = "6.0.1"; pname = "azure-mgmt-netapp"; - disabled = isPy27; + version = "7.0.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6ce683587be1638d8d77620b7af118060b8b7dfc4fd23d46a623a66edcb388e1"; + hash = "sha256-ziaddG+6MoPG18OYZyQ9HRx8nfGsz2UbWPC1pWacKto="; extension = "zip"; }; @@ -26,7 +30,10 @@ buildPythonPackage rec { # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.netapp" ]; + pythonImportsCheck = [ + "azure.common" + "azure.mgmt.netapp" + ]; meta = with lib; { description = "Microsoft Azure NetApp Files Management Client Library for Python"; diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index ea6f47183abba..9bafac41ef33e 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cd4f184be8c9ca8aca969f93ed50dc7fe556d28ca11520440fc182cf876abdf9"; + sha256 = "sha256-ZRiqnxPRdSOqyRMwuvxqKiZcxMbhVEYJ09CIlepc/B4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/beancount_docverif/default.nix b/pkgs/development/python-modules/beancount_docverif/default.nix index 44ebb5d94f01e..b39b52970f01f 100644 --- a/pkgs/development/python-modules/beancount_docverif/default.nix +++ b/pkgs/development/python-modules/beancount_docverif/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.0.1"; pname = "beancount_docverif"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1kjc0axrxpvm828lqq5m2ikq0ls8xksbmm7312zw867gdx56x5aj"; + sha256 = "sha256-CFBv1FZP5JO+1MPnD86ttrO42zZlvE157zqig7s4HOg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 097971c9ce35e..8aeda35741cf5 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.10.2"; + version = "0.10.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Lo1AUxj+QR7N2Tdif58zGBMSp5Pr0jmz2nacRDnLS5g="; + hash = "sha256-JOxp9qf05ul69APQjeJw3vMkhRgGAycJXSOxxN9kvyo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index dcb83d1ca2a79..c96c2e8707b70 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -4,16 +4,19 @@ , nose , parts , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "bitlist"; - version = "0.6.2"; + version = "0.7.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "69cf632ca61b5fb5d2fd7587ddf023bcab8f327302f15070ec9079b68df9082a"; + sha256 = "sha256-p3Gws48u1/AzltbtPyWvSX4O0u4MgSXiVq4GstpPCCg="; }; propagatedBuildInputs = [ @@ -29,6 +32,11 @@ buildPythonPackage rec { "bitlist" ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=bitlist --cov-report term-missing" "" + ''; + meta = with lib; { description = "Python library for working with little-endian list representation of bit strings"; homepage = "https://github.com/lapets/bitlist"; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 13f05fa61365a..064fe8187edcc 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -1,8 +1,12 @@ -{ stdenv, lib -, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, pytestCheckHook +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +, pytestCheckHook , aiohttp , aiohttp-cors -, attrs , click , colorama , dataclasses @@ -19,13 +23,13 @@ buildPythonPackage rec { pname = "black"; - version = "21.12b0"; + version = "22.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-d7gPaTpWni5SeVhFljTxjfmwuiYluk4MLV2lvkLm8rM="; + hash = "sha256-p8AZLTVjX2/BF0vldct5FekuXdYp7nn9rw3PpBqAr7U="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -61,17 +65,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp aiohttp-cors - attrs click colorama mypy-extensions pathspec platformdirs tomli - typed-ast # required for tests and python2 extra uvloop - ] ++ lib.optional (pythonOlder "3.7") dataclasses - ++ lib.optional (pythonOlder "3.8") typing-extensions; + ] ++ lib.optional (pythonOlder "3.8") typed-ast + ++ lib.optional (pythonOlder "3.10") typing-extensions; meta = with lib; { description = "The uncompromising Python code formatter"; diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 27b7ba03d450d..ae509418b7b1a 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.18.0"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "v${version}"; - hash = "sha256-96HoGXVQE5PbUbu0oDOC0es0HXYig4ScTeexiUhGse4="; + hash = "sha256-niUGfktP1zVdrRCDy81ou4yAoscnYveHje9423IKcso="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index f80a8deb9ab44..e697d97fea781 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "20.7.1"; + version = "22.3.2"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "41caa32e5778323471d87033f23537f6178a7aea64fba894c7f2b2579b51f7ed"; + sha256 = "sha256-Yo37xdXxCQKkA+lrFEZp1DxjJy216Q6aYYT68PEx9JU="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch b/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch new file mode 100644 index 0000000000000..ac56210423753 --- /dev/null +++ b/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch @@ -0,0 +1,53 @@ +Index: python-boto/tests/unit/utils/test_utils.py +=================================================================== +--- python-boto.orig/tests/unit/utils/test_utils.py ++++ python-boto/tests/unit/utils/test_utils.py +@@ -85,7 +85,7 @@ class TestPassword(unittest.TestCase): + def hmac_hashfunc(cls, msg): + if not isinstance(msg, bytes): + msg = msg.encode('utf-8') +- return hmac.new(b'mysecretkey', msg) ++ return hmac.new(b'mysecretkey', msg, digestmod='sha256') + + class HMACPassword(Password): + hashfunc = hmac_hashfunc +@@ -95,15 +95,15 @@ class TestPassword(unittest.TestCase): + password.set('foo') + + self.assertEquals(str(password), +- hmac.new(b'mysecretkey', b'foo').hexdigest()) ++ hmac.new(b'mysecretkey', b'foo', digestmod='sha256').hexdigest()) + + def test_constructor(self): +- hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg) ++ hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg, digestmod='sha256') + + password = Password(hashfunc=hmac_hashfunc) + password.set('foo') + self.assertEquals(password.str, +- hmac.new(b'mysecretkey', b'foo').hexdigest()) ++ hmac.new(b'mysecretkey', b'foo', digestmod='sha256').hexdigest()) + + + class TestPythonizeName(unittest.TestCase): +Index: python-boto/boto/ecs/item.py +=================================================================== +--- python-boto.orig/boto/ecs/item.py ++++ python-boto/boto/ecs/item.py +@@ -22,6 +22,7 @@ + + import xml.sax + import cgi ++from html import escape + from boto.compat import six, StringIO + + class ResponseGroup(xml.sax.ContentHandler): +@@ -67,7 +68,7 @@ class ResponseGroup(xml.sax.ContentHandl + return None + + def endElement(self, name, value, connection): +- self._xml.write("%s</%s>" % (cgi.escape(value).replace("&amp;", "&"), name)) ++ self._xml.write("%s</%s>" % (escape(value).replace("&amp;", "&"), name)) + if len(self._nodepath) == 0: + return + obj = None diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 5199ca6450913..586f023f8009a 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonAtLeast -, isPy38 , python , nose , mock @@ -13,18 +12,23 @@ buildPythonPackage rec { pname = "boto"; version = "2.49.0"; - disabled = pythonAtLeast "3.9"; # no longer compatible with hmac std lib package + disabled = pythonAtLeast "3.10"; # cannot import name 'Mapping' from 'collections' src = fetchPypi { inherit pname version; sha256 = "ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"; }; + patches = [ + # fixes hmac tests + # https://sources.debian.org/src/python-boto/2.49.0-4/debian/patches/bug-953970_python3.8-compat.patch/ + ./bug-953970_python3.8-compat.patch + ]; + checkPhase = '' ${python.interpreter} tests/test.py default ''; - doCheck = !isPy38; # hmac functionality has changed checkInputs = [ nose mock ]; propagatedBuildInputs = [ requests httpretty ]; diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index dc1e4f37f3c49..ba635a39257d1 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -2,22 +2,26 @@ , buildPythonPackage , fetchPypi , cryptography +, pythonOlder }: buildPythonPackage rec { pname = "broadlink"; - version = "0.18.0"; + version = "0.18.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c66b3e4a097d6549f0fcc9ccdf289bd88f73f647ad9449e1c4e2958301ad1b04"; + hash = "sha256-KMfL1mY4th87gjPrdhvzQjdXucgwSChsykOCO3cPAD8="; }; propagatedBuildInputs = [ cryptography ]; - # no tests available + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -28,5 +32,6 @@ buildPythonPackage rec { description = "Python API for controlling Broadlink IR controllers"; homepage = "https://github.com/mjg59/python-broadlink"; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 6e0637d2a6bc6..d1926c9631aa7 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -1,24 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, six}: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, six +}: buildPythonPackage rec { pname = "bumps"; - version = "0.8.1"; + version = "0.9.0"; + format = "setuptools"; - propagatedBuildInputs = [six]; - - # Bumps does not provide its own tests.py, so the test - # always fails - doCheck = false; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f4f2ee712a1e468a2ce5c0a32f67739a83331f0cb7b9c50b9e7510daefc12169"; + hash = "sha256-BY9kg0ksKfrpQgsl1aDDJJ+zKJmURqwTtKxlITxse+o="; }; + propagatedBuildInputs = [ + six + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "bumps" + ]; + meta = with lib; { - homepage = "https://www.reflectometry.org/danse/software.html"; description = "Data fitting with bayesian uncertainty analysis"; - maintainers = with maintainers; [ rprospero ]; + homepage = "https://bumps.readthedocs.io/"; license = licenses.publicDomain; + maintainers = with maintainers; [ rprospero ]; }; } diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index 7105e360561ed..e47e77b9eb49b 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "catalogue"; - version = "2.0.6"; + version = "2.0.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0idjhx2s8cy6ppd18k1zy246d97gdd6i217m5q26fwa47xh3asik"; + sha256 = "sha256-U10zrnnr0hyimFUdhdoYaui44d82sPsCRtp3QWPsLWs="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix index e1c27d9e4fb17..587d0d1f6c126 100644 --- a/pkgs/development/python-modules/cchardet/default.nix +++ b/pkgs/development/python-modules/cchardet/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , python @@ -20,9 +21,14 @@ buildPythonPackage rec { checkInputs = [ nose ]; + # on non x86-64 some charsets are identified as their superset, so we skip these tests (last checked with version 2.1.7) preCheck = '' cp -R src/tests $TMPDIR pushd $TMPDIR + '' + lib.optionalString (stdenv.hostPlatform.system != "x86_64-linux") '' + rm $TMPDIR/tests/testdata/th/tis-620.txt # identified as iso-8859-11, which is fine for all practical purposes + rm $TMPDIR/tests/testdata/ga/iso-8859-1.txt # identified as windows-1252, which is fine for all practical purposes + rm $TMPDIR/tests/testdata/fi/iso-8859-1.txt # identified as windows-1252, which is fine for all practical purposes ''; checkPhase = '' diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index c7383e98219d8..803104d85471e 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "channels-redis"; - version = "3.3.1"; + version = "3.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "channels_redis"; - sha256 = "899dc6433f5416cf8ad74505baaf2acb5461efac3cad40751a41119e3f68421b"; + sha256 = "sha256-Xf/UzBYXQSW9QEP8j+dGLKdAPPgB1Zqfp0EO0QH6alc="; }; buildInputs = [ redis hiredis ]; diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index ba7dd1db3b9a3..d406ea15fbd38 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "2.0.10"; + version = "2.0.12"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; rev = version; - hash = "sha256-QsUqrC2oycvyCbOzGmHahgNi40YZ0sujb3Cj8EnsGS8="; + hash = "sha256-d5vWnZtFR669l1Meg4ZSsYIyBlJZya7SpXJMx2AP8NU="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 28e777e8fdd2c..30a620b5ad6f3 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.5.0"; + version = "5.6.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "04hsh1z2ngfslmvi8fdzfccssg6i0ziksil84j129f049m96wd51"; + sha256 = "sha256-mf4QASdvO7doV5pKAAEzaKJP66w29osBlbLrJuopUvA="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 608f3a0cac684..6c91633e8af05 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -8,22 +8,21 @@ , pep517 , pytestCheckHook , toml +, pythonOlder }: buildPythonPackage rec { pname = "check-manifest"; - version = "0.47"; + version = "0.48"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "56dadd260a9c7d550b159796d2894b6d0bcc176a94cbc426d9bb93e5e48d12ce"; + hash = "sha256-O1dfHa3nvrMHjvS/M6lFGYNEV8coHbxyaxXFRmtVxlc="; }; - # Test requires filesystem access - postPatch = '' - substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist" - ''; - propagatedBuildInputs = [ build pep517 @@ -37,11 +36,18 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "check_manifest" ]; + disabledTests = [ + # Test wants to setup a venv + "test_build_sdist_pep517_isolated" + ]; + + pythonImportsCheck = [ + "check_manifest" + ]; meta = with lib; { - homepage = "https://github.com/mgedmin/check-manifest"; description = "Check MANIFEST.in in a Python source package for completeness"; + homepage = "https://github.com/mgedmin/check-manifest"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; }; diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix index 9330a4b49e846..77b30071c070a 100644 --- a/pkgs/development/python-modules/chess/default.nix +++ b/pkgs/development/python-modules/chess/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "chess"; - version = "1.8.0"; + version = "1.9.0"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "niklasf"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "sha256-ghBX0yRnggXliVREtrGxB/Xf0JWICeIi8XriSxS26Go="; + sha256 = "sha256-2/6pHU4gJnnVdO2KyXBe/RAbnEIuc2AY+h4TO70qiRk="; }; pythonImportsCheck = [ "chess" ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 10f5762f0c483..9816ff3782b35 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z50oKwS0MZVBEUeXfj9cgtPYXFAYf4i7QkgJiXdWrxo="; + sha256 = "sha256-YrR8OkDoop6kHAuk4cM4STYYOjjaMLZCQuE07/5IXqs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index e1b1b3b0bf4ec..6c8126172c056 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.1.11752"; + version = "9.1.12332"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-pnbFnv/te7U2jB6gNRvE9DQssBkFsara1g6Gtqf+WVo="; + hash = "sha256-xcj6Skzzmw5g+0KsBMLNOhRyXQA7nbgnc9YyfJLteCM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix index cd11aa03f863b..6f693f369cda5 100644 --- a/pkgs/development/python-modules/cloudscraper/default.nix +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy3k +, pythonOlder , fetchPypi , requests , requests-toolbelt @@ -9,12 +9,14 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.58"; - disabled = !isPy3k; + version = "1.2.60"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1wnzv2k8cm8q1x18r4zg8pcnpm4gsdp82hywwjimp2v2qll918nx"; + hash = "sha256-DTQTsv/59895UTsMmqxYtSfFosUWPRx8wMT4zKHQ9Oc="; }; propagatedBuildInputs = [ @@ -27,10 +29,12 @@ buildPythonPackage rec { # nixpkgs yet, and also aren't included in the PyPI bundle. TODO. doCheck = false; - pythonImportsCheck = [ "cloudscraper" ]; + pythonImportsCheck = [ + "cloudscraper" + ]; meta = with lib; { - description = "A Python module to bypass Cloudflare's anti-bot page"; + description = "Python module to bypass Cloudflare's anti-bot page"; homepage = "https://github.com/venomous/cloudscraper"; license = licenses.mit; maintainers = with maintainers; [ kini ]; diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 92e5a71ee80d1..0320355060054 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.33.7"; + version = "1.42.3"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-KNm2O2kZg+YzjtebsBoL7BOHCuffDELXm2k8vIFtKdk="; + sha256 = "sha256-P0QuKkyFk3jvYJwtul0/eUTrDyj2QKAjU/Ac+4VCYYk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix index 5ff53b8eb753f..de04e444e83a8 100644 --- a/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/pkgs/development/python-modules/coqui-trainer/default.nix @@ -4,7 +4,7 @@ , coqpit , fsspec -, pytorch-bin +, pytorch , pytestCheckHook , soundfile @@ -14,7 +14,7 @@ let pname = "coqui-trainer"; - version = "0.0.4"; + version = "0.0.5"; in buildPythonPackage { inherit pname version; @@ -23,21 +23,19 @@ buildPythonPackage { src = fetchFromGitHub { owner = "coqui-ai"; repo = "Trainer"; - # https://github.com/coqui-ai/Trainer/issues/4 - rev = "776eba829231543d3207927fc69b321d121e527c"; - hash = "sha256-ICveftJjBNsCgegTmd/ewd/Y6XGMg7YOvchx640RFPI="; + rev = "v${version}"; + hash = "sha256-NsgCh+N2qWmRkTOjXqisVCP5aInH2zcNz6lsnIfVLiY="; }; propagatedBuildInputs = [ coqpit fsspec - pytorch-bin + pytorch soundfile tensorboardx ]; - # tests are failing; tests require the clearml library - # https://github.com/coqui-ai/Trainer/issues/5 + # only one test and that requires training data from the internet doCheck = false; checkInputs = [ diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 004d42a81df39..dc0813acefa68 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ul3j1BJd3lKzGCEhPFYxZG0CcAqAZqmOEDi8vGPFItw="; + sha256 = "sha256-iH56c2PO1G/NlLmYC+6sdAMZ+kXvUkpkqxfnl9EmDsQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 196d3b9137764..2a4fd2cef42b0 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "v${version}"; - sha256 = "09253p0zjqfaqap7jgfgjl1jswwnz7mb6x7dqix09id92mnb89mf"; + sha256 = "1xv9br6mm5pcwfy10ykbc1c0n83fqyj1pa81z272kqww7wpkkp6j"; }; propagatedBuildInputs = [ @@ -30,11 +30,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # AssertionError: Type annotations check failed - "test_type_hints" - ]; - pythonImportsCheck = [ "dataclasses_json" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index fd6d4d478f460..a4f71774c4db2 100644 --- a/pkgs/development/python-modules/deep-translator/default.nix +++ b/pkgs/development/python-modules/deep-translator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2u4ZmLUEOwbN2sbPgLu9R1VdNevXBP4lBFuGw2aiRMg="; + sha256 = "sha256-Oi5dzrC19PnlExCOgu+bT5n3/XwgJkDirzl8ra8w7Nw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix index f4940cf7c6153..0295735abd754 100644 --- a/pkgs/development/python-modules/discogs-client/default.nix +++ b/pkgs/development/python-modules/discogs-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discogs-client"; - version = "2.3.13"; + version = "2.3.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "joalla"; repo = "discogs_client"; rev = "v${version}"; - sha256 = "sha256-TOja0pCJv8TAI0ns8M/tamZ5Pp8k5sSKDnvN4SeKtW8="; + sha256 = "sha256-HJxqTwZ9byjZxdftQPTkVo0Ufio9gNGH69q5Q2gYR00="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 4710de2c7ecb5..b1dab2e73c917 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, django, pytest, pytest-django }: +{ lib, buildPythonPackage, fetchFromGitHub, django, pytest, pytest-django, python }: buildPythonPackage rec { pname = "django-picklefield"; version = "3.0.1"; + format = "setuptools"; # The PyPi source doesn't contain tests src = fetchFromGitHub { @@ -14,17 +15,20 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - checkInputs = [ pytest pytest-django ]; + # Tests are failing with Django 3.2 + # https://github.com/gintas/django-picklefield/issues/58 + doCheck = false; checkPhase = '' - PYTHONPATH="$(pwd):$PYTHONPATH" \ - DJANGO_SETTINGS_MODULE=tests.settings \ - pytest tests/tests.py + runHook preCheck + ${python.interpreter} -m django test --settings=tests.settings + runHook postCheck ''; - meta = { + meta = with lib; { description = "A pickled object field for Django"; homepage = "https://github.com/gintas/django-picklefield"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index c4df27beaaa22..727bf304fdb2b 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -5,13 +5,14 @@ }: buildPythonPackage rec { - pname = "Django"; + pname = "django"; version = "2.2.27"; disabled = !isPy3k; src = fetchPypi { - inherit pname version; + pname = "Django"; + inherit version; sha256 = "sha256-HuNwRrC/K2HoOzoB0GcyNRbsO28rF81JsTJt1LqdyRM="; }; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 3ed7024c34992..1538b8a82b470 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -12,13 +12,14 @@ }: buildPythonPackage rec { - pname = "Django"; + pname = "django"; version = "3.2.12"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "Django"; + inherit version; sha256 = "sha256-l3Lmk1cD5Z6ZOWCDLWamFM8CM6HFEjvGIk7MataeQeI="; }; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index b7b0231a806e2..5f64ee3a6fe73 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.22.213"; + version = "2.23.222"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "8a86bba42b5b65f2e0f88ed350115efeb783b444661e2cfcf3a67d5c59bcb0bd"; + sha256 = "sha256-c5XpfEGTkojgzk+ATHCSzzh04zeEVJEEKBp+lPfS+x4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docx2txt/default.nix b/pkgs/development/python-modules/docx2txt/default.nix new file mode 100644 index 0000000000000..6b3c2777d78c7 --- /dev/null +++ b/pkgs/development/python-modules/docx2txt/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "docx2txt"; + version = "0.8"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LAbZjXz+LTlH5XYKV9kk4/8HdFs3nIc3cjki5wCSNuU="; + }; + + pythonImportsCheck = [ + "docx2txt" + ]; + + meta = with lib; { + description = "A pure python-based utility to extract text and images from docx files"; + homepage = "https://github.com/ankushshah89/python-docx2txt"; + license = licenses.mit; + maintainers = with maintainers; [ ilkecan ]; + }; +} diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix new file mode 100644 index 0000000000000..f4a24a7a7f8a7 --- /dev/null +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -0,0 +1,52 @@ +{ lib +, poetry-core +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, importlib-metadata +, packaging +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dunamai"; + version = "1.10.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mtkennerly"; + repo = "dunamai"; + rev = "v${version}"; + sha256 = "sha256-Sp0yfNkFwNc2qR9aSPteBqZcqRokM9whOVmduXVK3CI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + # needs to be able to run dunami from PATH + preCheck = '' + export PATH=$PATH:$out/bin + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "dunamai" ]; + + meta = with lib; { + description = "Dynamic version generation"; + homepage = "https://github.com/mtkennerly/dunamai"; + license = licenses.mit; + maintainers = with maintainers; [ jmgilman ]; + }; +} diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 6449a3da767ca..520167c100f11 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , cmake }: @@ -8,11 +8,12 @@ buildPythonPackage rec { pname = "editorconfig"; version = "0.12.3"; - # fetchgit used to ensure test submodule is available - src = fetchgit { - url = "https://github.com/editorconfig/editorconfig-core-py"; - rev = "1a8fb62b9941fded9e4fb83a3d0599427f5484cb"; # Not tagged - sha256 = "0vx8rl7kii72965jsi01mdsz9rfi1q9bwy13x47iaqm6rmcwc1rb"; + src = fetchFromGitHub { + owner = "editorconfig"; + repo = "editorconfig-core-py"; + rev = "v${version}"; + sha256 = "sha256-KwfGWc2mYhUP6SN4vhIO0eX0dasBRC2LSeLEOA/NqG8="; + fetchSubmodules = true; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 4dc34f92365e3..e756701ab4e4e 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1f3w5zyvrkl4gab81i5z9b41ybs54b37znj5r7hrcf25x8hrqgvv"; + sha256 = "sha256-I2Vg0rpCFH1Z+N+JgtDv2se6lXsggzOsJn3Fj252aTQ="; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 32b3098ffc733..18047eb719aad 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.20"; + version = "0.5.21"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "sha256-gYl5+rtOzci3nhgP74VM37tNk9pPWgcNBfcSSG1fSJs="; + sha256 = "sha256-jildWpYWll5j7siYhNECMBjz9bF41xFA6NyydWNdgQE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 7c8f520647ee8..096279b3453a0 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -57,6 +57,8 @@ buildPythonPackage rec { "test_hosts_no_network" "test_leakage_from_tracebacks" "test_patcher_existing_locks_locked" + # broken with pyopenssl 22.0.0 + "test_sendall_timeout" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 01857660a7497..42f8a4860509a 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; rev = "v${version}"; - sha256 = "sha256-mvYbX8puqcT9kl1Abi785ptmmg9CxKZVTO6gPpk4sKU="; + sha256 = "sha256-NpPVA+fruI/xX0KMjRuRuMK8HYc/0ErbDhJOCNXKhyY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 05afcff5627ce..216a84b9ec6a1 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -6,16 +6,19 @@ , parts , nose , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "fe25519"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-3WFpbt4bA7zPlK+mp5DJXdgk44MBimCbpIMhRjZ5p0o="; + hash = "sha256-Hzdt8932WonJAaQPtL346JFPqxFXkNW4XQvbQlSoJJE="; }; propagatedBuildInputs = [ @@ -29,6 +32,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=fe25519 --cov-report term-missing" "" + ''; + pythonImportsCheck = [ "fe25519" ]; diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index c3974d0e007b8..ee3f46d078ca2 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -1,16 +1,32 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: buildPythonPackage rec { pname = "flake8-blind-except"; - version = "0.2.0"; + version = "0.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "02a860a1a19cb602c006a3fe0778035b0d14d3f57929b4b798bc7d6684f204e5"; + hash = "sha256-8lpXWp3LPus8dgv5wi22C4taIxICJO0fqppD913X3RY="; }; - meta = { - homepage = "https://github.com/elijahandrews/flake8-blind-except"; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "flake8_blind_except" + ]; + + meta = with lib; { description = "A flake8 extension that checks for blind except: statements"; - maintainers = with lib.maintainers; [ johbo ]; - license = lib.licenses.mit; + homepage = "https://github.com/elijahandrews/flake8-blind-except"; + license = licenses.mit; + maintainers = with maintainers; [ johbo ]; }; } diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 083abcaf6b8c2..20e8f58882624 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.1.11"; + version = "22.3.20"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "sha256-sTg69Hgvi77wtLWEH4JtcIAMFk7exr5CBXmyS0nE5Vc="; + sha256 = "sha256-tq008SNytZCttnVY1NLf9/2aeqP+iPLUNsRLZu0k3Uk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flatdict/default.nix b/pkgs/development/python-modules/flatdict/default.nix new file mode 100644 index 0000000000000..186118d30100c --- /dev/null +++ b/pkgs/development/python-modules/flatdict/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "flatdict"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "gmr"; + repo = pname; + rev = version; + hash = "sha256-qH4MMDSXf92BPavnRdCka6lRoWZg+2KnHpHA8kt5JaM="; + }; + + pythonImportsCheck = [ + "flatdict" + ]; + + meta = with lib; { + description = "Python module for interacting with nested dicts as a single level dict with delimited keys"; + homepage = "https://github.com/gmr/flatdict"; + license = licenses.bsd3; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix index 6a77f57acf92e..a1d3741584ca4 100644 --- a/pkgs/development/python-modules/forecast-solar/default.nix +++ b/pkgs/development/python-modules/forecast-solar/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "forecast-solar"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "forecast_solar"; rev = version; - sha256 = "sha256-UrLy+j8YDWuS9pciEDKb/+UoCcw54XWiIUAEYC72/W0="; + sha256 = "sha256-2gex50QEN55uUa8SfAQA7iDZ3SVnpOTXfD3Sxq7KvNw="; }; PACKAGE_VERSION = version; diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index b869d583fc8df..e62eedf0468c1 100644 --- a/pkgs/development/python-modules/fountains/default.nix +++ b/pkgs/development/python-modules/fountains/default.nix @@ -2,16 +2,19 @@ , buildPythonPackage , fetchPypi , bitlist +, pythonOlder }: buildPythonPackage rec { pname = "fountains"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "6de6bc117c376f40a26e111111d638159a2e8a25cfe32f946db0d779decbb70a"; + sha256 = "sha256-c6nw22UtAREYZp0XCEZE6p7GpRvSLukq5y0c9KvVf9w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 34660645b596f..1bc295fbe3325 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.2.0"; - disabled = pythonOlder "3.6"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rTbekdceC5QK0aiySi/4QUwaEoDfTlLrx2t6Kb9bH7U="; + hash = "sha256-cHKqkvsBUN7If+8swbd6aafFrSgnop3YlweBLPOHzyU="; }; nativeBuildInputs = [ @@ -35,7 +37,9 @@ buildPythonPackage rec { cython frozenlist/_frozenlist.pyx ''; - pythonImportsCheck = [ "frozenlist" ]; + pythonImportsCheck = [ + "frozenlist" + ]; meta = with lib; { description = "Python module for list-like structure"; diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index c3541bcc30a0b..0f23415fe6eea 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.5.0"; + version = "3.5.1"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "526f1943dd54efe91fbf45db38049103611fbac5939c42ad172ba9d2dce71fe1"; + sha256 = "sha256-71oYuLhqJ7bst0W7v9tQSoaisjONZSa9zEWzYWtGl2E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ge25519/default.nix b/pkgs/development/python-modules/ge25519/default.nix index 5c9369e005b9e..22c96920be6c4 100644 --- a/pkgs/development/python-modules/ge25519/default.nix +++ b/pkgs/development/python-modules/ge25519/default.nix @@ -7,16 +7,19 @@ , nose , parts , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "ge25519"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-0M9RF8tlEoLyduvY3RvltGAnsus3HF6FEy22b6w6aUs="; + hash = "sha256-8GsNY62SusUmQcaqlhKOPHbd0jvZulCaxMxeob37JJM="; }; propagatedBuildInputs = [ @@ -31,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=ge25519 --cov-report term-missing" "" + ''; + + pythonImportsCheck = [ "ge25519" ]; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index ef809dcf70027..6895db19abc12 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = version; - hash = "sha256-doyKTGPm4tpmLrXQgsDOGklG54HSN8VFCAXa4Q73Uos="; + hash = "sha256-SBLQ+uSZE8YkT+fQWIKGlfhocJXX5k9kSejAbjazjM8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index c7fcb1a48ed18..203053d53cd7c 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -59,6 +59,15 @@ buildPythonPackage rec { "test_request_headers" "test_request_error" "test_request_basic" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # E MemoryError: Cannot allocate write+execute memory for ffi.callback(). + # You might be running on a system that prevents this. + # For more information, see https://cffi.readthedocs.io/en/latest/using.html#callbacks + "test_configure_mtls_channel_with_callback" + "test_configure_mtls_channel_with_metadata" + "TestDecryptPrivateKey" + "TestMakeMutualTlsHttp" + "TestMutualTlsAdapter" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 9ffa885ab4a59..9763cd4e0ba32 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.7.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TUgC/6IZ9kNE5iDtbhKPHJqo3sv9W+nl7KcxuXfrbyM="; + hash = "sha256-TUMgrv1JNt8h6DzCNtk0Fm4LQFC73/FNfpgTs9jhkYs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index fc1ca31212522..ab432454bbafc 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.7.1"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tz2upcRjgE6/4cB0riARwot3Vhw4QSKqqHTlJS3i7is="; + hash = "sha256-7L3SjViQmzTp//5LWWG9VG+TQuPay70KZdUuzhy7HS0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index e3c3e05ac183e..f7c79521b6323 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.9.1"; + version = "2.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-apn1ex/2VX18GHgN5+JYurzTKMqzPTNqTNOAI+DEBLw="; + sha256 = "sha256-W93SDJR8bUPQX9KzoZ6YvV9kU+Twd9huH09Smap481g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index f77c718ed8b93..629c323506b18 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -9,15 +9,19 @@ , google-cloud-testutils , google-resumable-media , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.1.0"; + version = "2.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0a5e7ab1a38d2c24be8e566e50b8b0daa8af8fd49d4ab312b1fda5c147429893"; + hash = "sha256-AkT0YScQy17ERfxndDh1ZOI/mCM2P7QIsock4hAkAbc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 73c09e61c7cbf..a7c49f0cabe96 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.10.2"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EykIDxoO8ePp4hLtINTz/RahfS4KU7GhwS4gkMBA32w="; + sha256 = "sha256-UJSP3a9G6k1arMpoh4/rWrnR4gYtPW6d6LGwWuk5WGg="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix index afcbe157a1e24..2ca6a134ee271 100644 --- a/pkgs/development/python-modules/graphql-subscription-manager/default.nix +++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -8,7 +8,8 @@ buildPythonPackage rec { pname = "graphql-subscription-manager"; - version = "0.5.1"; + version = "0.5.5"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; rev = version; - sha256 = "sha256-PVQa6JmBnToXuL/wNkYO0b+K1e9yrQgRUzWNUbFN5mM="; + hash = "sha256-7MqFsttMNnWmmWKj1zaOORBTDGt6Wm8GU7w56DfPl2c="; }; propagatedBuildInputs = [ @@ -27,7 +28,9 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "graphql_subscription_manager" ]; + pythonImportsCheck = [ + "graphql_subscription_manager" + ]; meta = with lib; { description = "Python3 library for graphql subscription manager"; diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index ad1da8b2917ab..f0824670731d0 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -1,32 +1,33 @@ { lib , buildPythonPackage , fetchFromGitHub -, pkgs +, espeak +, numpy , python }: buildPythonPackage rec { pname = "gruut-ipa"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6pMdBKbp++/5321rc8A2euOSXZCHzHg+wmaEaMZ0egw="; + sha256 = "sha256-Q2UKELoG8OaAPxIrZNCpXgeWZ2fCzb3g3SOVzCm/gg0="; }; postPatch = '' - patchShebangs bin/speak-ipa + patchShebangs bin/* substituteInPlace bin/speak-ipa \ --replace '${"\${src_dir}:"}' "$out/lib/${python.libPrefix}/site-packages:" \ - --replace "do espeak" "do ${pkgs.espeak}/bin/espeak" + --replace "do espeak" "do ${espeak}/bin/espeak" ''; - postInstall = '' - install -m0755 bin/speak-ipa $out/bin/speak-ipa - ''; + propagatedBuildInputs = [ + numpy + ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index f1e490a65cb28..5078c6fdb3901 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -36,14 +36,14 @@ let in buildPythonPackage rec { pname = "gruut"; - version = "2.2.0"; + version = "2.2.3"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9vj3x2IjTso8ksN1cqe5frwg0Y3GhOB6bPWvaBSBOf8="; + sha256 = "sha256-B5fPUW4YaMzDDXxncfrWwxGdUizuaxnPImNMf1ZZJ/I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 515d6ed8d950c..8bde06767844d 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.36.3"; + version = "0.38.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-S5KWyW7aeR2qdBzXQ4ka2nuxGPt69LHyq2CUdRPG9ig="; + sha256 = "sha256-WvcQTaYlKTOYbYwH/FbNTMoHdUhesYeeNYP8RDgQms4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 9a8a8853780af..cd2134418a753 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isDarwin) [ # fails with HTTP 408 Request Timeout, instead of expected 200 OK "test_timeout_subsequent" + "test_connection_close" ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 6345eebad1bc5..b505182b4fb5b 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.15.0"; + version = "3.15.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oHQXgiW80zqgpyt5osbBCtoT3XYCGEk4mgKPIsMmBHY="; + sha256 = "sha256-bGTr8Qf7ywlbsl6/FEJEjFB/bqyyMwfmjVVAsrgmkTg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index e8ecdfff32bab..d169190ef8c8a 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.3.1"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "1x6r8j0xyi81jb0q4pzr6l7aglykrwqz8nw45clv79v33i2sgdcs"; + sha256 = "sha256-AvWcw1VV47v2yvaqukPSql7rA7wVwrvtCDsvYtPZXKs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 9f2a066ebdf24..18a12fe9e1981 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.11"; + version = "2.4.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q86n2uAjmA05h+0NE77TBkbPiKoRYqB1b2H3MbOVmMY="; + sha256 = "sha256-kXhUlt+lcqK3ohOA8eziFcrm4U/FAYWpie4rH5xRejI="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 866721b09f5b0..9d017b2422350 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,15 +7,17 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.51.1"; + version = "0.52.0"; disabled = isPy27; + format = "setuptools"; + src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-ppxQtFK7U006z7qonm3B5gN99CHB9mEX3l0XjrhZQo8="; + hash = "sha256-la2+cpTnHZQn/FXtySp+3zDCBTONiLC16Tm+hDiIERc="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 13b26e337ac25..3917742a55a90 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.10.1"; - format = "setuptools"; + version = "4.11.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-lR8NiltyYOnbXkHUKShbX0UekoR58Z2AgYh4Un026V4="; + hash = "sha256-nl5VO7uhhDy0oAgjAUuQdha+Ru5QPSuboAHSFKjaIY8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 85456fcc15f89..226d43b2bc4c0 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.26.0"; + version = "1.27.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - hash = "sha256-9MI6AgFTEw9dnBWdry3FnPERXnXZJhbYX4tXj9sGMkg="; + hash = "sha256-M0Ob3HjIhlYSIWXGM54NXiEMSCmZzNLLNsCRyxAcjMc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index 90761f76f9d54..a8a4a611fee6e 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "iniconfig"; @@ -9,12 +9,14 @@ buildPythonPackage rec { sha256 = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"; }; + nativeBuildInputs = [ setuptools-scm ]; + doCheck = false; # avoid circular import with pytest pythonImportsCheck = [ "iniconfig" ]; meta = with lib; { description = "brain-dead simple parsing of ini files"; - homepage = "https://github.com/RonnyPfannschmidt/iniconfig"; + homepage = "https://github.com/pytest-dev/iniconfig"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 329d7a77dfde1..b93b9b9c957b4 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "1.0.0"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-lQV5KpASbrz+wCi9x/0rNYrQE+dLCZzsNBFhYAQvPH4="; + hash = "sha256-t3wJQ7dXX65yqxMYsFggViqqGvLCdASw1QLc5DJBn+4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index d197ba9691bfd..c50563f550077 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , fetchPypi , pytest -, six , tqdm , pyyaml , docopt @@ -10,25 +9,25 @@ , args , schema , responses -, backports_csv -, isPy3k , lib , glibcLocales , setuptools , urllib3 +, pythonOlder }: buildPythonPackage rec { pname = "internetarchive"; - version = "2.3.0"; + version = "3.0.0"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "fa89dc4be3e0a0aee24810a4a754e24adfd07edf710c645b4f642422c6078b8d"; + sha256 = "sha256-fRcqsT8p/tqXUpU2/9lAEF1IT8Cy5KK0+jKaeVwZshI="; }; propagatedBuildInputs = [ - six tqdm pyyaml docopt @@ -38,7 +37,7 @@ buildPythonPackage rec { schema setuptools urllib3 - ] ++ lib.optionals (!isPy3k) [ backports_csv ]; + ]; checkInputs = [ pytest responses glibcLocales ]; diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 45c341c209cfa..45711a3dc20e9 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -2,15 +2,19 @@ , bash , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "invoke"; - version = "1.6.0"; + version = "1.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "374d1e2ecf78981da94bfaf95366216aaec27c2d6a7b7d5818d92da55aa258d3"; + hash = "sha256-4zLkneQEY/IBYxX1HfQjE4VXcr6GQ1aGFWvBj0W1zGw="; }; patchPhase = '' @@ -20,8 +24,14 @@ buildPythonPackage rec { # errors with vendored libs doCheck = false; - meta = { + pythonImportsCheck = [ + "invoke" + ]; + + meta = with lib; { description = "Pythonic task execution"; - license = lib.licenses.bsd2; + homepage = "https://www.pyinvoke.org/"; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 432f83e75cc5b..c1c0b049dc8c8 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -26,7 +26,7 @@ , testpath }: -buildPythonPackage (rec { +buildPythonPackage rec { pname = "ipython"; version = "8.0.1"; format = "pyproject"; @@ -76,14 +76,15 @@ buildPythonPackage (rec { testpath ]; + disabledTests = lib.optionals (stdenv.isDarwin) [ + # FileNotFoundError: [Errno 2] No such file or directory: 'pbpaste' + "test_clipboard_get" + ]; + meta = with lib; { description = "IPython: Productive Interactive Computing"; homepage = "http://ipython.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor fridh ]; }; -} // lib.optionalAttrs stdenv.isDarwin { - disabledTests = [ - "test_clipboard_get" # uses pbpaste - ]; -}) +} diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index 5d85ad719527c..b082387e23cfb 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -1,25 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "itemadapter"; - version = "0.4.0"; + version = "0.5.0"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f05df8da52619da4b8c7f155d8a15af19083c0c7ad941d8c1de799560ad994ca"; + hash = "sha256-BbanndMaepk9+y6Dhqkcl+O4xs8otyVT6AjmJeC4fCA="; }; - doCheck = false; # infinite recursion with Scrapy + # Infinite recursion with Scrapy + doCheck = false; - pythonImportsCheck = [ "itemadapter" ]; + pythonImportsCheck = [ + "itemadapter" + ]; meta = with lib; { description = "Common interface for data container classes"; homepage = "https://github.com/scrapy/itemadapter"; changelog = "https://github.com/scrapy/itemadapter/raw/v${version}/Changelog.md"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index d5e5365401959..332cac3133cc2 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -19,7 +19,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.3.1"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "${pname}-v${version}"; - sha256 = "0bpqmyc4hg25i8cfnrx3y2bwgp6h5rri2a1q9i8gb6r0id97zvcn"; + rev = "jax-v${version}"; + sha256 = "sha256-RZqSJP2vtt8U6nmftV2VzfkMGkkk3100QqsjI7PpQbc="; }; patches = [ diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 7e6b00429dfaf..0929831e32a4b 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -120,9 +120,15 @@ buildPythonPackage rec { done ''; - # pip dependencies and optionally cudatoolkit. Note that cudatoolkit is - # necessary since jaxlib looks for "ptxas" in $PATH. - propagatedBuildInputs = [ absl-py flatbuffers scipy ] ++ lib.optional cudaSupport cudatoolkit_11; + propagatedBuildInputs = [ absl-py flatbuffers scipy ]; + + # Note that cudatoolkit is snecessary since jaxlib looks for "ptxas" in $PATH. + # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for + # more info. + postInstall = lib.optional cudaSupport '' + mkdir -p $out/bin + ln -s ${cudatoolkit_11}/bin/ptxas $out/bin/ptxas + ''; pythonImportsCheck = [ "jaxlib" ]; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 664e109719adf..363bfe5613463 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -259,7 +259,13 @@ buildPythonPackage { src = "${bazel-build}/jaxlib-${version}-cp${builtins.replaceStrings ["."] [""] python.pythonVersion}-none-manylinux2010_${stdenv.targetPlatform.linuxArch}.whl"; + # Note that cudatoolkit is necessary since jaxlib looks for "ptxas" in $PATH. + # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for + # more info. postInstall = lib.optionalString cudaSupport '' + mkdir -p $out/bin + ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do addOpenGLRunpath "$lib" patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnn}/lib:${nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index d9884ab3d9f51..f271920706fa1 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -3,9 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, colorama , django -, docopt , pytestCheckHook , parso }: @@ -26,9 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ parso ]; checkInputs = [ - colorama django - docopt pytestCheckHook ]; @@ -50,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors"; - license = licenses.lgpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index c000bb050d89e..fbea0935ff304 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.3.1"; + version = "3.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zkgnmTeccKqH5jtZ4sU3l3nOGGWLkkYM0gu0QVSGWXM="; + sha256 = "sha256-PHFr9VkssoxcVcYVxuW9PvxxiY9pV9E3GbVkeLu7WHo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jxmlease/default.nix b/pkgs/development/python-modules/jxmlease/default.nix index 727548f21d508..5036ede5e5e98 100644 --- a/pkgs/development/python-modules/jxmlease/default.nix +++ b/pkgs/development/python-modules/jxmlease/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { lxml ]; + # tests broken in expat bump + # https://github.com/Juniper/jxmlease/issues/26 + doCheck = false; + checkPhase = '' runHook preCheck ${python.interpreter} -m unittest discover -v diff --git a/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix b/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix new file mode 100644 index 0000000000000..d77dc444f80d1 --- /dev/null +++ b/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-auth +, keyring +, pluggy +, requests +, setuptools-scm +, toml +}: + +buildPythonPackage rec { + pname = "keyrings.google-artifactregistry-auth"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-gvoX5SP0A39Ke0VRlplETJF8gIP+QzK6xNReRxM8UnA="; + }; + + buildInputs = [ + setuptools-scm + toml + ]; + + propagatedBuildInputs = [ + google-auth + keyring + pluggy + requests + ]; + + pythonImportsCheck = [ + "keyrings.gauth" + ]; + + + meta = with lib; { + description = "Python package which allows you to configure keyring to interact with Python repositories stored in Artifact Registry"; + homepage = "https://pypi.org/project/keyrings.google-artifactregistry-auth"; + license = licenses.asl20; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 3df049c1cec60..2342ec5bde4a8 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -54,6 +55,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # AssertionError: <class 'urllib3.poolmanager.ProxyManager'> != <class 'urllib3.poolmanager.Poolmanager'> + "test_rest_proxycare" + ]; + meta = with lib; { description = "Kubernetes python client"; homepage = "https://github.com/kubernetes-client/python"; diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 77aa9e2927a51..d46e86ca106b1 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.4.1"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iPGNoM8/rAr3I+dD+3QdnRviUYge2reloNFimVW1ARs="; + sha256 = "sha256-Bz8QSSl2+qODoisTuCwkmCfP6QoIPHFiDoMW6BWm2zs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index a8e21a698f7f6..d69885fcb0f3b 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "7.10.0"; + version = "8.1.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-I1FNjNwWRyDAUSq2Co9EnjAbzKQtS0Rx8vHgPsFzSYw="; + sha256 = "sha256-/uGxjptiqm5B823z4mcjredj9ZLZC2WTTqhQrQPVfDU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 0467790c29763..27550c30dbfe0 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.2.3"; + version = "2022.3.17"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Jc11hS+WrRnjgYOUpc+GdkRoNV/DUJhQK6rI2lUkEIA="; + hash = "sha256-sSZFbEDlkc+F0PIwvseVEBoQQZVTFypW2nvLmPDD4u0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index b717b44911739..f77aa81bbb600 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -1,37 +1,65 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pkg-config, pango, cython, AppKit, pytestCheckHook }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, python +, pkg-config +, pango +, cython +, AppKit +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "manimpango"; - version = "0.4.0.post2"; + version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BMRlEdvJJOUbsvKEoZx2qJqHSbL475dhBthUpnsXkn4="; + hash = "sha256-ourSUYBAFONdupdsjo/PtwRQpXS7HqLxrHj0Ejr/Wdw="; }; - postPatch = '' - substituteInPlace setup.cfg --replace "--cov --no-cov-on-fail" "" - ''; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + pango + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; propagatedBuildInputs = [ cython ]; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov --no-cov-on-fail" "" + ''; + preBuild = '' ${python.interpreter} setup.py build_ext --inplace ''; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "manimpango" ]; + pythonImportsCheck = [ + "manimpango" + ]; meta = with lib; { + description = "Binding for Pango"; homepage = "https://github.com/ManimCommunity/ManimPango"; license = licenses.mit; - description = "Binding for Pango"; - maintainers = [ maintainers.emilytrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/mat2/bubblewrap-path.patch b/pkgs/development/python-modules/mat2/bubblewrap-path.patch new file mode 100644 index 0000000000000..2c71930b6df85 --- /dev/null +++ b/pkgs/development/python-modules/mat2/bubblewrap-path.patch @@ -0,0 +1,35 @@ +diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py +index 970d5dd..5d3c0b7 100644 +--- a/libmat2/bubblewrap.py ++++ b/libmat2/bubblewrap.py +@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError + + + def _get_bwrap_path() -> str: +- which_path = shutil.which('bwrap') +- if which_path: +- return which_path +- +- raise RuntimeError("Unable to find bwrap") # pragma: no cover ++ return '@bwrap@' + + + def _get_bwrap_args(tempdir: str, +@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, + + # XXX: use --ro-bind-try once all supported platforms + # have a bubblewrap recent enough to support it. +- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] ++ ro_bind_dirs = ['/nix/store', cwd] + for bind_dir in ro_bind_dirs: + if os.path.isdir(bind_dir): # pragma: no cover + ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) + +- ro_bind_files = ['/etc/ld.so.cache'] +- for bind_file in ro_bind_files: +- if os.path.isfile(bind_file): # pragma: no cover +- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) +- + args = ro_bind_args + \ + ['--dev', '/dev', + '--proc', '/proc', diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 97b52855f6bad..1d5a76b7b8041 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , python , pythonOlder @@ -37,7 +38,6 @@ buildPythonPackage rec { # hardcode paths to some binaries (substituteAll ({ src = ./paths.patch; - bwrap = "${bubblewrap}/bin/bwrap"; exiftool = "${exiftool}/bin/exiftool"; ffmpeg = "${ffmpeg}/bin/ffmpeg"; } // lib.optionalAttrs dolphinIntegration { @@ -52,6 +52,11 @@ buildPythonPackage rec { src = ./fix_poppler.patch; poppler_path = "${poppler_gi}/lib/girepository-1.0"; }) + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ + (substituteAll { + src = ./bubblewrap-path.patch; + bwrap = "${bubblewrap}/bin/bwrap"; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch index 50b0c9aaa7893..784e04cda3836 100644 --- a/pkgs/development/python-modules/mat2/paths.patch +++ b/pkgs/development/python-modules/mat2/paths.patch @@ -12,41 +12,6 @@ index 41c8de4..11df258 100644 +Icon=@mat2svg@ +Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U +Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U -diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py -index 970d5dd..5d3c0b7 100644 ---- a/libmat2/bubblewrap.py -+++ b/libmat2/bubblewrap.py -@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError - - - def _get_bwrap_path() -> str: -- which_path = shutil.which('bwrap') -- if which_path: -- return which_path -- -- raise RuntimeError("Unable to find bwrap") # pragma: no cover -+ return '@bwrap@' - - - def _get_bwrap_args(tempdir: str, -@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, - - # XXX: use --ro-bind-try once all supported platforms - # have a bubblewrap recent enough to support it. -- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] -+ ro_bind_dirs = ['/nix/store', cwd] - for bind_dir in ro_bind_dirs: - if os.path.isdir(bind_dir): # pragma: no cover - ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) - -- ro_bind_files = ['/etc/ld.so.cache'] -- for bind_file in ro_bind_files: -- if os.path.isfile(bind_file): # pragma: no cover -- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) -- - args = ro_bind_args + \ - ['--dev', '/dev', - '--proc', '/proc', diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py index eb65b2a..51a0fa1 100644 --- a/libmat2/exiftool.py diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 1ab425ade551e..23bef4bda4058 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.13"; + version = "0.7.14"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "sha256-9ssDe7Wjuwuq2j7xwRyLqKouqeIt6NCUbEXjPdu2VZ8="; + sha256 = "sha256-bImBW6r8g/4MQ9yNrBBhk7AGqKRXFyAew6HHEmqelxw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix new file mode 100644 index 0000000000000..9671c43df081f --- /dev/null +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "meilisearch"; + version = "0.18.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "meilisearch"; + repo = "meilisearch-python"; + rev = "v${version}"; + hash = "sha256-Rd2GmomNzW0+oI2QEGcPY4g8H+4FN7eLKY1ljcibsLw="; + }; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ + "meilisearch" + ]; + + # Tests spin up a local server and are not mocking the requests + doCheck = false; + + meta = with lib; { + description = "Client for the Meilisearch API"; + homepage = "https://github.com/meilisearch/meilisearch-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 9a7c834c0ef35..4c92063de660f 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.90"; + version = "1.2.93"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-n/M1Q6YS3EkUcn45ffiTy0wuj9yKf6qBLLfD2XJkhHU="; + sha256 = "sha256-4jh5AYjr1qnr3nOeJSLwtAzdPlmpW1BBrEXfB86NrL0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index bc5835fac5396..d56a2b77132ce 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "7.0.4"; + version = "8.0.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-424WNG9Yj+Zfo1UTh7emknZ7xTtpFPz7Ph+FpE149FM="; + sha256 = "sha256-Efazsi8BjBrk7lBKSn2APKHxCc7mzxNrC92BL0VsnCM="; }; propagatedBuildInputs = [ @@ -98,8 +98,6 @@ buildPythonPackage rec { requests ]; - doCheck = !stdenv.isDarwin; - postPatch = '' # remove dependency constraints sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix new file mode 100644 index 0000000000000..16a8158091691 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -0,0 +1,41 @@ +{ lib, callPackage, buildPythonApplication, fetchFromGitHub +, jinja2 +, markdown +, mkdocs +, mkdocs-material-extensions +, pygments +, pymdown-extensions +}: + +buildPythonApplication rec { + pname = "mkdocs-material"; + version = "8.2.5"; + + src = fetchFromGitHub { + owner = "squidfunk"; + repo = pname; + rev = version; + sha256 = "0v30x2cgc5i307p0hsy5h58pfd8w6xpnvimsb75614xlmx3ycaqd"; + }; + + propagatedBuildInputs = [ + jinja2 + markdown + mkdocs + mkdocs-material-extensions + pygments + pymdown-extensions + ]; + + # No tests for python + doCheck = false; + + pythonImportsCheck = [ "mkdocs" ]; + + meta = with lib; { + description = "Material for mkdocs"; + homepage = "https://squidfunk.github.io/mkdocs-material/"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix new file mode 100644 index 0000000000000..2d03c8fa8c5d9 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildPythonPackage }: + +buildPythonPackage rec { + pname = "mkdocs-material-extensions"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "facelessuser"; + repo = pname; + rev = version; + sha256 = "1mvc13lz16apnli2qcqf0dvlm8mshy47jmz2vp72lja6x8jfq2p3"; + }; + + doCheck = false; # Circular dependency + + pythonImportsCheck = [ "materialx" ]; + + meta = with lib; { + description = "Markdown extension resources for MkDocs Material"; + homepage = "https://github.com/facelessuser/mkdocs-material-extensions"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index a998e7b74b414..1d9d077437982 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -264,6 +264,8 @@ buildPythonPackage rec { "test_state_machine_creation_fails_with_invalid_names" # needs graphql "test_get_schema_creation_status" + # only appears in aarch64 currently, but best to be safe + "test_state_machine_list_executions_with_filter" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index ee190008f592b..b9701073e0bd4 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , isPy3k , pyparsing }: @@ -10,10 +10,11 @@ buildPythonPackage { version = "0.0.2-2ffa0258ca"; disabled = ! isPy3k; - src = fetchgit { - url = "https://github.com/aroig/mutag.git"; - sha256 = "0axdnwdypfd74a9dnw0g25m16xx1yygyl828xy0kpj8gyqdc6gb1"; + src = fetchFromGitHub { + owner = "aroig"; + repo = "mutag"; rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2"; + sha256 = "sha256-YT3DGvYPyTuB70gg6p/3oXcTahEPcNuSIqe56xu3rSs="; }; propagatedBuildInputs = [ pyparsing ]; diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 567eeaf69698c..f6df7b88f8528 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -8,24 +8,23 @@ , measurement , python-dateutil , requests -, six , rich , pytestCheckHook , mock , nose +, pythonOlder }: -# TODO: Define this package in "all-packages.nix" using "toPythonApplication". -# This currently errors out, complaining about not being able to find "etree" from "lxml" even though "lxml" is defined in "propagatedBuildInputs". - buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.16.6"; + version = "1.17.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "ac07369ede3ca4c6d673e02f2b9e0893b17d079f3085e36fdfdbdd1cba9f37db"; + sha256 = "sha256-UXFvKQtC44EvscYWXK7KI/do3U0wTWI3zKwvsRdzKrs="; }; propagatedBuildInputs = [ @@ -36,7 +35,6 @@ buildPythonPackage rec { measurement python-dateutil requests - six rich ]; diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index b9e19439251ac..3e159dfe7cee4 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -9,6 +9,7 @@ , tls-parser , cacert , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -50,9 +51,11 @@ let "enable-tls1_3" "no-async" ]; - patches = builtins.filter ( - p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch" - ) oldAttrs.patches; + patches = builtins.filter + ( + p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch" + ) + oldAttrs.patches; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ]; meta = oldAttrs.meta // { knownVulnerabilities = [ @@ -76,9 +79,11 @@ let sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"; }; configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon; - patches = builtins.filter ( - p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch" - ) oldAttrs.patches; + patches = builtins.filter + ( + p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch" + ) + oldAttrs.patches; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ]; # openssl_1_0_2 needs `withDocs = false` outputs = lib.remove "doc" oldAttrs.outputs; @@ -87,42 +92,54 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "4.0.1"; + version = "4.0.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-QzO7ABh2weBO6NVFIj7kZpS8ashbDGompuvdKteJeUc="; + hash = "sha256-lLyHXLmBVvT+LgsKBU8DcUXd0qaLSrwvXxFnIB9CHcU="; }; - postPatch = let - legacyOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslLegacyStatic.version; - modernOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslStatic.version; - zlibVersion = zlibStatic.version; - in '' - mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ - cp ${opensslLegacyStatic.out}/lib/libssl.a \ - ${opensslLegacyStatic.out}/lib/libcrypto.a \ - deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ - ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include - ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps + postPatch = + let + legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version; + modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version; + zlibVersion = zlibStatic.version; + in + '' + mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ + cp ${opensslLegacyStatic.out}/lib/libssl.a \ + ${opensslLegacyStatic.out}/lib/libcrypto.a \ + deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ + ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include + ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps - mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ - cp ${opensslStatic.out}/lib/libssl.a \ - ${opensslStatic.out}/lib/libcrypto.a \ - deps/openssl-OpenSSL_${modernOpenSSLVersion}/ - ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include - ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps + mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ + cp ${opensslStatic.out}/lib/libssl.a \ + ${opensslStatic.out}/lib/libcrypto.a \ + deps/openssl-OpenSSL_${modernOpenSSLVersion}/ + ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include + ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps - mkdir -p deps/zlib-${zlibVersion}/ - cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/ - ''; + mkdir -p deps/zlib-${zlibVersion}/ + cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/ + ''; - propagatedBuildInputs = [ tls-parser ]; + nativeBuildInputs = [ + invoke + ]; + + propagatedBuildInputs = [ + tls-parser + ]; - nativeBuildInputs = [ invoke ]; + checkInputs = [ + pytestCheckHook + ]; buildPhase = '' invoke build.nassl @@ -131,19 +148,23 @@ buildPythonPackage rec { doCheck = true; - pythonImportsCheck = [ "nassl" ]; - - checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "nassl" + ]; disabledTests = [ "Online" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_write_bad" + "test_client_authentication_no_certificate_supplied" + "test_client_authentication_succeeds" ]; meta = with lib; { + description = "Low-level OpenSSL wrapper for Python"; homepage = "https://github.com/nabla-c0d3/nassl"; - description = "Low-level OpenSSL wrapper for Python 3.7+"; - platforms = with platforms; linux ++ darwin; license = licenses.agpl3Only; maintainers = with maintainers; [ veehaitch ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/python-modules/neo4j-driver/default.nix b/pkgs/development/python-modules/neo4j-driver/default.nix index 6b81af0c29400..63a2efafbd6ec 100644 --- a/pkgs/development/python-modules/neo4j-driver/default.nix +++ b/pkgs/development/python-modules/neo4j-driver/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "neo4j-driver"; - version = "4.4.1"; + version = "4.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = version; - sha256 = "sha256-aGOqD6mmd3dulQ/SdaDPDZhkCwXdYCucHw+CrkJf1M0="; + sha256 = "sha256-rYedmxQvT+RjVdbDckLv00J4YuEQtMuIc8Q5FGWr3Rw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 8da783dbdb278..8fd06ae3b403c 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.56.0"; + version = "2.60.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-olrWv4c2DoZ7ddm58Wpb5jZntw8WEKJ6IzAND11tdjk="; + hash = "sha256-fXeea4MftVSJWzanHeAuERRiQLBp8l1l1Cw2lG3uz24="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index ed672b7d01c56..a268f34cc71ab 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.4.0"; + version = "13.4.1"; src = fetchFromGitHub { owner = "jbarlow83"; @@ -39,7 +39,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-LgHhF+vztXPCn71d87OMn0umLvps7We6vyjdRJZw+3E="; + sha256 = "sha256-gxgeEwm3cYNllcmRTZhdyIWWGKXTewyVW314k732swE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index bbe9d4a01caf8..4fb744826b794 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.15.0"; + version = "0.16.0"; disabled = pythonOlder "3.7.1"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-HOMBVrAz3cP8r4w8CKXKy6epxf00myYJiKv1PQ1iqhQ="; + sha256 = "sha256-9BxFOiGIf3Cy7OU0as6onV5ltECInM9wwCr+qCMuPbU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index 4c798f43c25c6..65ebd1bf3a15f 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -1,16 +1,19 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "parts"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "6463d5c49142d14029196a6a781b57bc98ba5b3d93244f4ed637f534d08129c1"; + sha256 = "sha256-NrhNpWyzqwn1bNnuqmcyKcUED0A4v7VJE4ZlTHFafJY="; }; # Project has no tests diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 8775faa53c24f..7a03226b4dde9 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.8.0"; + version = "5.8.1"; src = fetchPypi { inherit pname version; - sha256 = "672d8ebee84921862110f23fcec2acea191ef58543d34dfe9ef3d9f13c31cddf"; + sha256 = "sha256-ZrxaNJEvQIuzklvyEjHLb1kgYme39j81A++GXBopLiU="; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index b31334589f5dd..aacb726d6a1d1 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -1,8 +1,8 @@ { buildPythonPackage +, build , git , gnupg , pbr -, mock , sphinx , stestr , testresources @@ -27,9 +27,9 @@ buildPythonPackage rec { checkInputs = [ pbr + build git gnupg - mock sphinx stestr testresources diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 725fb9ab9f934..6d2b0adcf41c7 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,8 +1,8 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, pytestCheckHook }: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20201018"; + version = "20220319"; disabled = !isPy3k; @@ -10,10 +10,10 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr"; + sha256 = "sha256-sjO7jmHSe4EDmJ1rfiXx+lsHxc+DfKeMet37Nbg03WQ="; }; - propagatedBuildInputs = [ chardet cryptography sortedcontainers ]; + propagatedBuildInputs = [ chardet cryptography ]; postInstall = '' for file in $out/bin/*.py; do @@ -21,10 +21,7 @@ buildPythonPackage rec { done ''; - checkInputs = [ nose ]; - checkPhase = '' - nosetests - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "PDF parser and analyzer"; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index d70fa2826d645..5b5462cf4757b 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "4.8.0"; + version = "4.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nRd+rT+jwfXWKjbUUmdUs3bgUEx9S3XLmqUvt3HexrI="; + hash = "sha256-RwGzHYHBBCJlclrzkEUOnZFq10ucF4twEAU4U1keDGo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 7648a7440a75c..ee356f86500a6 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.69"; + version = "2.1.72"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JbQ8yn/uALjjVSRgqKXsQOC4rOCGkMPxb50KqWg89kM="; + sha256 = "sha256-0hhnBkbgt4bSlqjvYKX2Mhty/T1vBGm91HhKmyvVzmA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index c1df3ce275139..8aa1ad1f4c4d0 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -7,13 +7,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "9.0.0"; + version = "9.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf"; + sha256 = "bIvII4p9/a96dfXsWmY/QXP4w2flo5+H5yBJXh7tdfo="; }; passthru.tests = { diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 83c697aa7c861..d36ba25ba474b 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.1.0"; + version = "9.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-jvg/2dL+W4N7rbbBcIUZUrSt0BCV15k4QgYST2lEA5U="; + hash = "sha256-vHJ35MvMw3G1k/A2gifaE97GayoVEOQ9lR6yG6ZkzS4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index f2e8659914876..2be8928f630f4 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.4.1"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Ce1dwE2g/7o91NPkmlM0uv0eMB7WzFCExV/8ZCAn22Y="; + sha256 = "sha256-fppwtY8VX8IQ96H930xItO7mS8LlxxHgBcKlwIL5P2E="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 02831000e8832..29532a23b0c4d 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.10.0"; + version = "4.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-paj1QFSHQw7MfOor1yYwb2vkF9b5RPj6R6dRstK24gA="; + sha256 = "sha256-0j3uf3wSDFSyDGo3oRi99KNKfhuGP2puSi0KgVjsXnQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 6680b19908e9e..9f12f220cfe9c 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "protonvpn-nm-lib"; - version = "3.7.0"; + version = "3.8.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = pname; rev = version; - sha256 = "sha256-RZ10p/Lg9GQj0CohW2v+THch5EaD236rEHETGjNStdY="; + sha256 = "sha256-fAaP9c66LcbZgezadGPUt400YRnrnFoBvpzlc1zxuc4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index 125984554a0cb..33b233bd60969 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proxmoxer"; - version = "1.2.0"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-ElHocXrazwK+b5vdjYSJAYB4ajs2n+V8koj4QKkdDMQ="; + sha256 = "sha256-3EpId20WVVjXA/wxwy1peyHPcXdiT3fprABkcNBpZtE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 0c87391aba01f..c5fbe3d28590f 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.1.0"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "v${version}"; - hash = "sha256-rAeZxCaSY9tgoMk7l+mlqqiZfD2yIGoywITC0Y2z7oI="; + hash = "sha256-QOOPcWhhEqg7c0INQv88+eOP0povN8W4lLoaly9TGu0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 0ae60b381c642..406d81e15bb0d 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , dataclasses -, isPy3k , fetchPypi , jedi , pygments @@ -14,14 +13,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2022.1"; + version = "2022.1.1"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e827a4b489dcad561189535db6677becbf32164b2b44df00786eb2d5e00c587e"; + hash = "sha256-2zvdZkI8nSkHTBwsSfyyJL0Nbwgxn+0bTn6taDkUCD8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index a5de75f70f88b..c56fc990f2c51 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.41"; + version = "3.42"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2G+5lKkLtgZ/2ghU0xVTDqIXbTNykYIKRiwZiagusoc="; + sha256 = "sha256-2/YT36X4UvmmhiaxyJBtCKA3QuibYtReTS6MQ3YGV+c="; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index c9db28324e9e9..fe9d3276e1be0 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.5.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyAthena"; inherit version; - sha256 = "sha256-2Z0KjJm6cWhMTKXa2zBs3Ef2i/e1tqQYZx5sSKIT9a4="; + sha256 = "sha256-GTcDiDtZGgTpdl6YBgPuztv7heEPZ/ymhup/4JwfELA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix index 63edd6e60f8a5..d764e93e3f065 100644 --- a/pkgs/development/python-modules/pyaussiebb/default.nix +++ b/pkgs/development/python-modules/pyaussiebb/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , loguru +, pydantic , poetry-core , pythonOlder , requests @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pyaussiebb"; - version = "0.0.11"; + version = "0.0.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "yaleman"; repo = "aussiebb"; rev = "v${version}"; - hash = "sha256-aL+n2ut7n6UUyymMEHoFMhRvK9iFRRunYE9ZirKFXhc="; + hash = "sha256-Z+xLCKnUnBAH9nm0YR11zx1lyNrIb8BZLFmaZdpnfdw="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { aiohttp requests loguru + pydantic ]; postPatch = '' diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix index f286e6b45bdba..d76f72630a6ba 100644 --- a/pkgs/development/python-modules/pycep-parser/default.nix +++ b/pkgs/development/python-modules/pycep-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycep-parser"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gruebel"; repo = "pycep"; rev = version; - hash = "sha256-S4jBqMgyreWrEp1SuR8J5RVFc+i1O0xbfgux1UvFP5k="; + hash = "sha256-ud26xJQWdu7wtv75/K16HSSw0MvaSr3H1hDZBPjSzYE="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.3.1-alpha.1"' 'version = "${version}"' \ + --replace 'version = "0.3.2-alpha.4"' 'version = "${version}"' \ --replace 'regex = "^2022.3.2"' 'regex = "*"' ''; diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix index ac79eb8293f4d..7d317120ed8d3 100644 --- a/pkgs/development/python-modules/pyclip/default.nix +++ b/pkgs/development/python-modules/pyclip/default.nix @@ -3,19 +3,23 @@ , fetchFromGitHub , buildPythonPackage , pytest +, pythonOlder , xclip , xvfb-run }: buildPythonPackage rec { pname = "pyclip"; - version = "0.5.4"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "spyoungtech"; repo = pname; rev = "v${version}"; - sha256 = "19ff9cgnfx03mbmy5zpbdi986ppx38a5jf97vkqnic4g5sd1qyrn"; + hash = "sha256-NCWmCp4VGwwvubqN8FUUJ0kcZbXjOEyB6+BfGky1Kj4="; }; postPatch = '' @@ -23,7 +27,12 @@ buildPythonPackage rec { --replace docs/README.md README.md ''; - checkInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ xclip xvfb-run ]; + checkInputs = [ + pytest + ] ++ lib.optionals stdenv.isLinux [ + xclip + xvfb-run + ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 44e7ed0ad4aa2..e3e4e6c3a03ab 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -6,13 +6,12 @@ buildPythonPackage rec { pname = "pycryptodome"; - version = "3.12.0"; + version = "3.14.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Esc0OuxaOz31xHJlKBsSthHybsk2e2EpGZ1n2lS3aME="; - extension = "zip"; + hash = "sha256-4E5Ap/jBZpGVU2o3l53YfaLDLb3HPW/jXwB3sMF8gDs="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index c9f622d6c699d..934c021ed9098 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -6,13 +6,12 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.12.0"; + version = "3.14.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ki6drAFm5GF+XHmA0s/2kSputctcE+fs4iJDhlC9f2Y="; - extension = "zip"; + hash = "sha256-LOdu0Agf1qyMdO3HW50U7KIGQXOveYQ8JPpiVzJjwfI="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 0b87aba816551..f2163621506fa 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.45.0"; + version = "7.45.1"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "sha256-UDbFPG9BBukWDQU6S6o0M6AhX7M4YHPiESc8VqOpXz0="; + sha256 = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index a1fd4215faf9b..baf57da4160e6 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,22 +8,29 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.53.3"; - disabled = pythonOlder "3.5"; + version = "0.54.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t4rFsuhcpYdgmQeog+DRFxHk0wpMc+aukQi981vH/44="; + hash = "sha256-vL8jSgTtDvaHuCvaCYmFixILQFasTl82yINL5yRtOwU="; }; - propagatedBuildInputs = [ pyusb pyserial ]; + propagatedBuildInputs = [ + pyserial + pyusb + ]; - # tests requires access to the serial port + # Tests require access to the serial port doCheck = false; - pythonImportsCheck = [ "pyftdi" ]; + pythonImportsCheck = [ + "pyftdi" + ]; meta = with lib; { description = "User-space driver for modern FTDI devices"; diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 6f06065457ede..f7728cfa28db0 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "v${version}"; - sha256 = "1mazljxwh162df971cvv7cwnqr300r17qfs7k09s6yd6hajyhz49"; + sha256 = "sha256-QzqQKnANReSHIsDbiKSZ1ZgMgbj3NAfq4bmRQktnRjQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix new file mode 100644 index 0000000000000..ce489127946f2 --- /dev/null +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, gevent +, click +, colorama +, configparser +, distro +, jinja2 +, paramiko +, python-dateutil +, pywinrm +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "pyinfra"; + version = "1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-r+7ka3WKE6uHP//p1N71hgTGit7Eo3x9INpbKPYbFMI="; + }; + + propagatedBuildInputs = [ + click + colorama + configparser + distro + gevent + jinja2 + paramiko + python-dateutil + pywinrm + setuptools + six + ]; + + doCheck = false; + + pythonImportsCheck = [ + "pyinfra" + ]; + + meta = with lib; { + description = "Python-based infrastructure automation"; + longDescription = '' + pyinfra automates/provisions/manages/deploys infrastructure. It can be used for + ad-hoc command execution, service deployment, configuration management and more. + ''; + homepage = "https://github.com/Fizzadar/pyinfra"; + maintainers = with maintainers; [ totoroot ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index 67a3892cdc025..5daadce41f444 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.3"; + version = "3.0.5"; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; rev = "v${version}"; - hash = "sha256-zQ0IBfbWEGv5t+b3EKF+6tEpmwfAWFMndPqSNSQZ5b4="; + hash = "sha256-lVutG/xJvVP0qS0UnEyS/9KwwqdRX6ownTKek8/VXbU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix index 41efa9a54d248..a064390b1cef1 100644 --- a/pkgs/development/python-modules/pykrakenapi/default.nix +++ b/pkgs/development/python-modules/pykrakenapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pykrakenapi"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dominiktraxl"; repo = "pykrakenapi"; rev = "v${version}"; - hash = "sha256-i2r6t+JcL6INI8Y26gvVvNjv6XxMj4G+pF9Xf/hsx1A="; + hash = "sha256-ZhP4TEWFEGIqI/nk2It1IVFKrX4HKP+dWxu+gLJNIeg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 8bf43a445437d..361f8bff615d0 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.27"; + version = "2.4.29"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DzW1jB7L7sD9WAhk/3/0UD8PW7Nw/bHTI527NmMV6CY="; + sha256 = "sha256-0k6DKkb/Izk15JKrSOC0u5wL3vT4x2CelZt112vc/p0="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymediaroom/default.nix b/pkgs/development/python-modules/pymediaroom/default.nix index e977cb23d7520..364063f786281 100644 --- a/pkgs/development/python-modules/pymediaroom/default.nix +++ b/pkgs/development/python-modules/pymediaroom/default.nix @@ -1,21 +1,19 @@ { lib , async-timeout , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder , xmltodict }: buildPythonPackage rec { pname = "pymediaroom"; - version = "0.6.4.1"; + version = "0.6.5.4"; disabled = pythonOlder "3.5"; - src = fetchFromGitHub { - owner = "dgomes"; - repo = pname; - rev = version; - sha256 = "1klf2dxd8rlq3n4b9m03lzwcsasn9vi6m3hzrjqhqnprhrnp0xmy"; + src = fetchPypi { + inherit pname version; + hash = "sha256-CZh2knpLT7xt5s6+kTQ4Mq9LcpKgWvgdFCkPtMucJTM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 16bfddc8340a2..e4655082af92b 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -6,17 +6,50 @@ , cryptography , pyasn1 , idna -, pytest +, pytestCheckHook , pretend , flaky , glibcLocales , six }: -let - # https://github.com/pyca/pyopenssl/issues/791 - # These tests, we disable in the case that libressl is passed in as openssl. - failingLibresslTests = [ +buildPythonPackage rec { + pname = "pyopenssl"; + version = "22.0.0"; + + src = fetchPypi { + pname = "pyOpenSSL"; + inherit version; + sha256 = "sha256-ZgsbFCWqxKG+odlBaKhdmfCzFEyGndQ5DSdinQCH8b8="; + }; + + outputs = [ "out" "dev" ]; + + # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 + # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. + doCheck = !stdenv.isDarwin; + + nativeBuildInputs = [ openssl ]; + propagatedBuildInputs = [ cryptography pyasn1 idna six ]; + + checkInputs = [ pytestCheckHook pretend flaky glibcLocales ]; + + preCheck = '' + export LANG="en_US.UTF-8" + ''; + + disabledTests = [ + # https://github.com/pyca/pyopenssl/issues/692 + # These tests, we disable always. + "test_set_default_verify_paths" + "test_fallback_default_verify_paths" + # https://github.com/pyca/pyopenssl/issues/768 + "test_wantWriteError" + # https://github.com/pyca/pyopenssl/issues/1043 + "test_alpn_call_failure" + ] ++ lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) [ + # https://github.com/pyca/pyopenssl/issues/791 + # These tests, we disable in the case that libressl is passed in as openssl. "test_op_no_compression" "test_npn_advertise_error" "test_npn_select_error" @@ -29,66 +62,21 @@ let "test_verify_with_revoked" "test_set_notAfter" "test_set_notBefore" - ]; - - # these tests are extremely tightly wed to the exact output of the openssl cli tool, - # including exact punctuation. - failingOpenSSL_1_1Tests = [ + ] ++ lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") [ + # these tests are extremely tightly wed to the exact output of the openssl cli tool, including exact punctuation. "test_dump_certificate" "test_dump_privatekey_text" "test_dump_certificate_request" "test_export_text" - ]; - - disabledTests = [ - # https://github.com/pyca/pyopenssl/issues/692 - # These tests, we disable always. - "test_set_default_verify_paths" - "test_fallback_default_verify_paths" - # https://github.com/pyca/pyopenssl/issues/768 - "test_wantWriteError" - # https://github.com/pyca/pyopenssl/issues/1043 - "test_alpn_call_failure" - ] ++ ( - lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) failingLibresslTests - ) ++ ( - lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests - ) ++ ( + ] ++ lib.optionals stdenv.is32bit [ # https://github.com/pyca/pyopenssl/issues/974 - lib.optionals stdenv.is32bit [ "test_verify_with_time" ] - ); - - # Compose the final string expression, including the "-k" and the single quotes. - testExpression = lib.optionalString (disabledTests != []) - "-k 'not ${lib.concatStringsSep " and not " disabledTests}'"; - -in - -buildPythonPackage rec { - pname = "pyopenssl"; - version = "21.0.0"; + "test_verify_with_time" + ]; - src = fetchPypi { - pname = "pyOpenSSL"; - inherit version; - sha256 = "5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3"; + meta = with lib; { + description = "Python wrapper around the OpenSSL library"; + homepage = "https://github.com/pyca/pyopenssl"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; - - outputs = [ "out" "dev" ]; - - checkPhase = '' - runHook preCheck - export LANG="en_US.UTF-8" - py.test tests ${testExpression} - runHook postCheck - ''; - - # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 - # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. - doCheck = !stdenv.isDarwin; - - nativeBuildInputs = [ openssl ]; - propagatedBuildInputs = [ cryptography pyasn1 idna six ]; - - checkInputs = [ pytest pretend flaky glibcLocales ]; } diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index cd7a322a2aef9..d2ff1aab1a476 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.7.2"; + version = "1.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1wk8jxnysb7sa55zhxx5brylv00ivamqbk1b4lbzi58ziij08p03"; + sha256 = "sha256-Tv0vqKN9AAXdfQRMt/QuqeFB3wNTh1DsWu0XNZukTUc="; }; patches = [ diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix index 96570fce884f4..2d23256ff8440 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyramid_exclog"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "d05ced5c12407507154de6750036bc83861b85c11be70b3ec3098c929652c14b"; + sha256 = "sha256-Tl2rYH/GifNfB9w4nG9UIqAQz0O6kujCED/4iZnPKDw="; }; propagatedBuildInputs = [ pyramid ]; diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index d8820e6d9d0fd..7a13dc79aa991 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.7"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.core"; inherit version; - hash = "sha256-N74cQcWx57lYIPiQTL+/Ec5Kf1rgdMrRkkYIdyaLjN4="; + hash = "sha256-lH0Mi2nR4jqawvpvVfn79U0AflxE8lU1VLKvqAEXDOo="; }; # pyroute2 sub-modules have no tests diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index fe4eac248700f..dae025618b7ae 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.7"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - hash = "sha256-jwPg7xcmQU3F4cVrs2GVUxBXV6waMkrnmyZkHo2kLR0="; + hash = "sha256-6o75plLeSle6ZFgoIZGKLCjx1hg4Z2okOq2RqAT2g8E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index cb40f0b4eff1a..22991fe202683 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.7"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - hash = "sha256-uMEPUleEBIaIV4bCejTmeHYhKeaN9SNcUMzBAODNBEU="; + hash = "sha256-sJ9Zzlrh9FWVWL7StyHpPPuXo6TtNLz2/lQBCl53Wrk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 300b1d21fa1d4..7bf625c088641 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.7"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - hash = "sha256-roNLNXmnW27a+TgxtMi8HO5hF4agxdjQ0DMsYW6O44c="; + hash = "sha256-icEMJno03WKUdIYTZ6BIAo9lm43RwMjxNXcoSkYF81M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 2564e46011997..47c309cbc3219 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.7"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - hash = "sha256-o/rmbOwfRUPw/g1Cc/5otqKvGe3Br3y4iSXad/PfTPw="; + hash = "sha256-ASk6ycw3dQNMV4xmaxPAHDL1KtrY1JGQ5yJYcJ+OgUE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index 6b0b4bc35c926..3c76692016d9c 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.7"; + version = "0.6.9"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-d9LdXxBQGa40MmGuK2cFOOEI7X4Y1pPv0ObW9n7ZUjo="; + sha256 = "sha256-8BLz8IIobmrGb64PhXz1XWfl3KJTOhOL+j1C4/jlXuI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 0050c4aa795e5..387a9b403df5e 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.7"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - hash = "sha256-p+U3Y5vKCxuvMl/yNKlay57tlU4GKttCJrAwctKa5TY="; + hash = "sha256-WZjRexKn1FWXj+5KZxqZXB0aZmnd0ECKWt3hvVDdz4w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index 39308e162e2d9..99c146d41e4db 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.7"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - hash = "sha256-GdququbQcU+exzxifb8UGamkSUMhR94j+auF8I6e7/Q="; + hash = "sha256-7vP4rbid2cVGKlYUM5qsmYXQhUfvIWoaDXYnxSUnSJY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 1fda8265428a6..9b15711ef0f25 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.7"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qBv9jshyg0S9IThdrXHTFcb2neQPDmURmtSbqYCKlWo="; + hash = "sha256-PRxNGnH7VpyrV49V9xNO8C1I6LMYK05+ZrKndWKO2vs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index e658ca40be7a1..1c6d9b45c5682 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "7.1.1"; + version = "7.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uRfcn3nCK+tx6ol6ZFarOSrDOh0cfC9gZXBZ7EICQzw="; + sha256 = "sha256-nyQcQ1OO9PuuQROg+km2vIRF1sZ22MZhiHpmVXWl+is="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix new file mode 100644 index 0000000000000..ab757085d1ca2 --- /dev/null +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pysigma-pipeline-sysmon +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-backend-splunk"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-backend-splunk"; + rev = "v${version}"; + hash = "sha256-EP0gcK05hZ5TCOgTePezfEGbW45dGrnnksWyI9Jo9MQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pysigma-pipeline-sysmon + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.backends.splunk" + ]; + + meta = with lib; { + description = "Library to support Splunk for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-backend-splunk"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix new file mode 100644 index 0000000000000..2d2aadb9eaec6 --- /dev/null +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-crowdstrike"; + version = "0.1.4"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-crowdstrike"; + rev = "v${version}"; + hash = "sha256-Riu2u1IouS1BMtXauXrNMIl06TU11pHdC0jjlOiR71s="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.crowdstrike" + ]; + + meta = with lib; { + description = "Library to support CrowdStrike pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix new file mode 100644 index 0000000000000..7c1e959d74064 --- /dev/null +++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-sysmon"; + version = "0.1.3"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-sysmon"; + rev = "v${version}"; + hash = "sha256-uJgV7emBqQN792EvfOz85BKoZY8DCCr8aUN7Ai8R9js="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.sysmon" + ]; + + meta = with lib; { + description = "Library to support Sysmon pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-sysmon"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix new file mode 100644 index 0000000000000..be35230dbd6ba --- /dev/null +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pyparsing +, pytestCheckHook +, pythonOlder +, pyyaml +}: + +buildPythonPackage rec { + pname = "pysigma"; + version = "0.4.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma"; + rev = "v${version}"; + hash = "sha256-0k6m86RQoP4QTuxmCWBpxiGqaJt3alOLS5BAuOFwdb4="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyparsing + pyyaml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pyparsing = "^3.0.7"' 'pyparsing = "*"' \ + ''; + + pythonImportsCheck = [ + "sigma" + ]; + + meta = with lib; { + description = "Library to parse and convert Sigma rules into queries"; + homepage = "https://github.com/SigmaHQ/pySigma"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyskyqhub/default.nix b/pkgs/development/python-modules/pyskyqhub/default.nix index 1f3ad1874621b..1620db33e4440 100644 --- a/pkgs/development/python-modules/pyskyqhub/default.nix +++ b/pkgs/development/python-modules/pyskyqhub/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyskyqhub"; - version = "0.1.4"; + version = "0.1.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_hub"; rev = version; - sha256 = "EVkTvynMPmCr7DPuDqfpMvVPCvpPpJHfqsNjD3tn8zg="; + sha256 = "sha256-Qc7mb51KKGLNWjeiJKAsFO/RNLefv0sRHWwXodMBi/k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 6fcb9f97d32cd..4aac6902ce3bb 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -1,12 +1,12 @@ -{ buildPythonPackage, fetchPypi, lib, pillow, tesseract, substituteAll }: +{ buildPythonPackage, fetchPypi, lib, pillow, tesseract, substituteAll, packaging }: buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.8"; + version = "0.3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YUigHkN1dghi6PVupxjiK10TsoFFTfRuqNrJgHeT/Fo="; + sha256 = "sha256-fiuvx/SNG7cUQ85GM6VvXiGSWpjyIKNsM2KX7c0ZVtA="; }; patches = [ @@ -17,7 +17,7 @@ buildPythonPackage rec { ]; buildInputs = [ tesseract ]; - propagatedBuildInputs = [ pillow ]; + propagatedBuildInputs = [ pillow packaging ]; # the package doesn't have any tests. doCheck = false; diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 4e45477c8caa5..794bbce74e0cb 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -1,20 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, aiohttp }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, setuptools-scm +, aiohttp +, pytest +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-aiohttp"; - version = "0.3.0"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; + hash = "sha256-DI/rSNyOuAhw4rFTrK9iu7zCB5d+vLdDZf/P4WrcnxU="; }; - buildInputs = [ pytest ]; + patches = [ + # https://github.com/aio-libs/pytest-aiohttp/pull/26 + (fetchpatch { + name = "fix-tests-with-pytest-asyncio-0.18.0.patch"; + url = "https://github.com/aio-libs/pytest-aiohttp/commit/97152c2dfdd368f799ec6bcb5fc315736a726f53.patch"; + hash = "sha256-g7MTyCKUHnufOfrbhVV58WtfbGt1uXx8F7U9U+EaXfg="; + }) + ]; - propagatedBuildInputs = [ aiohttp ]; + nativeBuildInputs = [ + setuptools-scm + ]; - # There are no tests - doCheck = false; + propagatedBuildInputs = [ + aiohttp + pytest + pytest-asyncio + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 6401e1ce2c9be..b8d3dffa3b0b9 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.17.2"; + version = "0.18.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4wDXvO6pDK0dQLnyfJTTa+GXf9Qtsi6ywYDUIdhkgGo="; + hash = "sha256-PE66ogjfzj6cW3+UD5nZHSt6zg7b+j6Q4ACznE4j0j8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -36,6 +36,7 @@ buildPythonPackage rec { checkInputs = [ flaky hypothesis + flaky pytestCheckHook ]; @@ -44,9 +45,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "library for testing asyncio code with pytest"; + description = "Library for testing asyncio code with pytest"; homepage = "https://github.com/pytest-dev/pytest-asyncio"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index 766e07543879e..80e31e8effaec 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.9"; + version = "3.6.11"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bf9favhlHcGj8nf1JxTkMjpo8hMyfBHgMCilOcIL2Sk="; + sha256 = "sha256-9rcXPoGxR3sxX3tFbv1O/T7kfrKnIB2XV1mJvSH5WQ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 6bc6fb22b0318..32ccd22c96925 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-console-scripts"; - version = "1.3"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w8rb9nz7MKHrHMHp5py23kTDpkhCbxub9j6F2XNX/H8="; + hash = "sha256-XGw9qunPn77Q5lUHISiThgAZPcACpc8bGHJIZEugKFc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-json-report/default.nix b/pkgs/development/python-modules/pytest-json-report/default.nix index 2b89fe715921b..95a0bcb325f1f 100644 --- a/pkgs/development/python-modules/pytest-json-report/default.nix +++ b/pkgs/development/python-modules/pytest-json-report/default.nix @@ -5,17 +5,21 @@ , pytest-metadata , pytest-xdist , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pytest-json-report"; - version = "1.4.1"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "numirias"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OS9ASUp9iJ12Ovr931RQU/DHEAXqbgcRMCBP4h+GAhk="; + hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 7f07ed2b6dd13..94db409be9184 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pytest , pytest-asyncio , pytestCheckHook , setuptools-scm @@ -8,15 +9,19 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.6.1"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "40217a058c52a63f1042f0784f62009e976ba824c418cced42e88d5f40ab0e62"; + hash = "sha256-URK9ksyfGG7pbhqS78hJaepJSTnDrq05xQ9CHEzGlTQ="; }; nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ + pytest + ]; + checkInputs = [ pytest-asyncio pytestCheckHook @@ -34,6 +39,6 @@ buildPythonPackage rec { description = "Thin-wrapper around the mock package for easier use with pytest"; homepage = "https://github.com/pytest-dev/pytest-mock"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 0edf2b6958079..30666ef47064d 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "python-box"; - version = "5.4.1"; + version = "6.0.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; rev = version; - sha256 = "sha256-SkteajcWG7rBFMm6Xp6QCfkZfwthRituGL/RtICbtYk="; + hash = "sha256-kH8qHAFuYDXO5Dsl6BpTYCIqh0Xi8Rbwmia+y3sTn6Y="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "box" ]; + pythonImportsCheck = [ + "box" + ]; meta = with lib; { description = "Python dictionaries with advanced dot notation access"; diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index cd2adc48c6fa8..a357df95a43ad 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonAtLeast }: buildPythonPackage rec { @@ -32,5 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/scrapinghub/python-crfsuite"; license = licenses.mit; maintainers = teams.tts.members; + broken = pythonAtLeast "3.10"; # https://github.com/scrapinghub/python-crfsuite/issues/130 }; } diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix index aa2c4d020e55c..78a3b018c7ea2 100644 --- a/pkgs/development/python-modules/python-http-client/default.nix +++ b/pkgs/development/python-modules/python-http-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python_http_client"; - version = "3.3.6"; + version = "3.3.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sendgrid"; repo = "python-http-client"; rev = version; - sha256 = "sha256-Xchf/jVkQ7SYOzI9f81iS/G72k//6wkl2bMvHprOP9Y="; + sha256 = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/python-juicenet/default.nix b/pkgs/development/python-modules/python-juicenet/default.nix index 1547c8914617c..ad27a913257e4 100644 --- a/pkgs/development/python-modules/python-juicenet/default.nix +++ b/pkgs/development/python-modules/python-juicenet/default.nix @@ -1,18 +1,22 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "python-juicenet"; - version = "1.0.2"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jesserockz"; repo = "python-juicenet"; rev = "v${version}"; - sha256 = "04547pj51ds31yhyc7ng47v9giz16h2s3wgb6szc8ivhb5rclqz2"; + hash = "sha256-5RKnVwOfEHzFZCiC8OUpS8exKrENK+I3Ok45HlKEvtU="; }; propagatedBuildInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "pyjuicenet" ]; + pythonImportsCheck = [ + "pyjuicenet" + ]; meta = with lib; { description = "Read and control Juicenet/Juicepoint/Juicebox based EVSE devices"; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 17c3cb07be364..6adfbf5745d27 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-4e9jpUDorZlKCYwWtqrba61zbkJl57oWUhEpFcaS9ak="; + sha256 = "sha256-5Ohks3yfqAAe+CiLEucibezmibl6TtktDXMHAhecXzA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index 4f484a8454024..b41ddf01a8e9a 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.29"; + version = "0.0.30"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-utUpNuemyS8XEVhfhLgOwTRkPFqCBXyK1s1LWemywmU="; + sha256 = "sha256-PzmE0j/sas1Dc/U022dS3krROm292xJlL37+EWPEs+g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 8d815ee1ce9fb..09c2c1ca7a69c 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.31.0"; + version = "2.31.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nuYWJ4nilbXa/1KOuGhc6rB7uXDE4+lcESNud4Ug+3Y="; + sha256 = "sha256-l4wF/I3wsA9nowIdLjNPUxCaTPBu5v5oPQ3oNbLh+/o="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 1cd6de8ef41bf..96669c52634bd 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "1.4.3"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DEDgZXMQrINYImXaWmv/7W7q8RvqK8oMG/B2XsDdZDM="; + sha256 = "sha256-+054tFirjMF3sGLRpTVCZ3V2KN627b57+fFl6GBMMcU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 595b4c3573758..e3a810be91602 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DI+Jc5MtDd2XXfjIDtPd8qt4/eQ/3nwbDUqWE2haUhM="; + hash = "sha256-e1lruHgppQ8mJbTx6xsUDSkLCYQISqM9c1vsjdQU4eI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 7dc17cf74ecd9..b4f23f71d7488 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.10"; + version = "0.15.11"; src = fetchPypi { inherit pname version; - sha256 = "VWfcDhMAuUkYObRiaXRfcB7dI75SM7zVwWWvnlrxV0k="; + sha256 = "sha256-L+59uf3/wqWnmWpqm8RAyIEarbj2Sdwf1Pbweh/z9C8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/pyxbe/default.nix b/pkgs/development/python-modules/pyxbe/default.nix index 4c101ccdc3fb0..43cc501d80e52 100644 --- a/pkgs/development/python-modules/pyxbe/default.nix +++ b/pkgs/development/python-modules/pyxbe/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyxbe"; - version = "unstable-2021-01-10"; + version = "0.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mborgerson"; repo = pname; - rev = "a7ae1bb21b02a57783831eb080c1edbafaad1d5d"; - sha256 = "1cp9a5f41z8j7bzip6nhka8qnxs12v75cdf80sk2nzgf1k15wi2p"; + rev = "v${version}"; + hash = "sha256-mHUmSSy/ygteJhRX6AbgZJ+c5MZMZcgNRoTOfxhV+XQ="; }; checkInputs = [ @@ -25,7 +29,9 @@ buildPythonPackage rec { --replace "'xbefiles'" "'tests/xbefiles'" ''; - pythonImportsCheck = [ "xbe" ]; + pythonImportsCheck = [ + "xbe" + ]; meta = with lib; { description = "Library to work with XBE files"; diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 2c0e893b9c50a..10f78ab5e14be 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - pname = "PyYAML"; + pname = "pyyaml"; version = "6.0"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index ea5325ea660cb..795b8460b5dbe 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.22.0"; + version = "0.23.0"; checkInputs = [ pytestCheckHook ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "685a08247b561ed1c7a7b42e68293f90b412e83556626304a3f826a15be51308"; + sha256 = "sha256-gDn0Nu6ALTr3KyZnYDSA6RE3S5JQj562FP2RI9U3Gxs="; }; doCheck = true; diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 51c762c810753..729954328140d 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -8,18 +8,22 @@ , multiprocess , pefile , pyelftools +, pythonOlder , python-registry +, pyyaml , unicorn }: buildPythonPackage rec { pname = "qiling"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "e72dc5856cbda975f962ddf063063a32bd6c3b825f75e0795e94ba6840a7d45f"; + hash = "sha256-myUGzNP4bf90d2gY5ZlYbVlTG640dj/Qha8/aMydvuw="; }; propagatedBuildInputs = [ @@ -30,14 +34,10 @@ buildPythonPackage rec { pefile pyelftools python-registry + pyyaml unicorn ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pefile==2021.5.24" "pefile>=2021.5.24" - ''; - # Tests are broken (attempt to import a file that tells you not to import it, # amongst other things) doCheck = false; diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index b7709da9dca4e..122c4fdf6653d 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "readme-renderer"; - version = "33.0"; + version = "34.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "readme_renderer"; inherit version; - sha256 = "sha256-47U7yEvWrwVOTMH+NWfcGuGfVUE0IhBDo/jGdOIiCds="; + sha256 = "sha256-37TRfyFwbRRfdHPgthyiRbpY6BDPmyIJpII5Z3+C5bA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index b96c7ca899560..86e591eaf14f1 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -2,25 +2,28 @@ , buildPythonPackage , fetchPypi , python -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "regex"; - version = "2021.11.10"; + version = "2022.1.18"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-80HuLfCZm/33qV5EgHXv/g2yEqWTh94acGkOSssD1MY="; + hash = "sha256-l/MtwDqAVKTEpatddh7Uhh6CiywgD+vU5GhXBppIORY="; }; - # Sources for different Python releases are located in same folder checkPhase = '' - rm -r ${if !isPy27 then "regex_2" else "regex_3"} ${python.interpreter} -m unittest ''; - pythonImportsCheck = [ "regex" ]; + pythonImportsCheck = [ + "regex" + ]; meta = with lib; { description = "Alternative regular expression module, to replace re"; diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 2ddd65790fa0a..2312078c5fc65 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.9"; + version = "0.1.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CZDxJ5vgk9I1cRDXoqcrUHu+buPWYVrEcHaRXcyts7I="; + sha256 = "sha256-PXycRRUrKIkU/MgQbW4BjvBhpEi6InY5jZHPw4Nyv2s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index a742c422ee904..464bbd78515c1 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,17 +1,18 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , cython }: -buildPythonPackage { +buildPythonPackage rec { pname = "rencode"; - version = "git20150810"; + version = "1.0.6"; - src = fetchgit { - url = "https://github.com/aresch/rencode"; - rev = "b45e04abdca0dea36e383a8199783269f186c99e"; - sha256 = "b4bd82852d4220e8a9493d3cfaecbc57b1325708a2d48c0f8acf262edb10dc40"; + src = fetchFromGitHub { + owner = "aresch"; + repo = "rencode"; + rev = "v${version}"; + sha256 = "sha256-PGjjrZuoGYSPMNqXG1KXoZnOoWIe4g6s056jFhqrJ60="; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 86e37419c72d2..95861bda181c9 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -5,25 +5,23 @@ , pytestCheckHook , pythonOlder , requests -, six , urllib3 }: buildPythonPackage rec { pname = "responses"; - version = "0.17.0"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7GdeCA0Gv40fteWmih5c0N9GsJx4IwMV9lCvXkA2vsc="; + hash = "sha256-OAytTBwdyULl6KjqrgtNTt9wj08BDbi3vPr60fzSVP8="; }; propagatedBuildInputs = [ requests - six urllib3 ]; diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index aaf31f06a1cc8..4d0a4aa94f11e 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , capstone +, pythonOlder }: buildPythonPackage rec { pname = "ropgadget"; - version = "6.6"; + version = "6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "v${version}"; - sha256 = "1i0gx0cwhxk6d8byvck17hh83szz3k6ndd118ha3q0r0msap0lz1"; + hash = "sha256-zOTbncsOvmLQMZGpcRLviSZP/d1cQTQHXCLUKyEgVBk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 1237fd09ea410..391e8d36139bd 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -1,12 +1,12 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , capstone , filebytes , pytest }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "ropper"; version = "1.13.6"; diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index 79f21ba6aabde..31d76d78ac7eb 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.17.20"; + version = "0.17.21"; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - sha256 = "sha256-S4ozwe+ytEOpP8qvz6TS5EX46MKcUo2fXNr7fMnkAEw="; + sha256 = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; }; # Tests use relative paths diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix index 99f5d522baf0a..d2dbb2e405819 100644 --- a/pkgs/development/python-modules/sabyenc3/default.nix +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -1,22 +1,32 @@ -{ lib, fetchPypi, python3Packages }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "sabyenc3"; - version = "5.0.1"; + version = "5.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MIKBSPs3CtETDefiozN758hmJhdmw0UqVyG9t224tfw="; + hash = "sha256-muqJCn5FcSp5KNZqfW433NCOxfj1DvFvlZPClmNkPR0="; }; - # tests are not included in pypi distribution + # Tests are not included in pypi distribution doCheck = false; - meta = { + pythonImportsCheck = [ + "sabyenc3" + ]; + + meta = with lib; { description = "yEnc Decoding for Python 3"; homepage = "https://github.com/sabnzbd/sabyenc/"; - license = lib.licenses.lgpl3; - maintainers = [ lib.maintainers.lovek323 ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ lovek323 ]; }; - } diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 9c26c9e2e2b30..99424bbc67c27 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -2,16 +2,18 @@ , buildPythonPackage , numpy , pkgs +, fetchFromGitHub }: buildPythonPackage { pname = "scikits.samplerate"; version = "0.3.3"; - src = pkgs.fetchgit { - url = "https://github.com/cournape/samplerate"; + src = fetchFromGitHub { + owner = "cournape"; + repo = "samplerate"; rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; - sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg"; + sha256 = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU="; }; buildInputs = [ pkgs.libsamplerate ]; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index b4bebb79a0fdb..bed661ce20060 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "samsungtvws"; - version = "2.3.0"; + version = "2.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-2ly9lbnIHGHB55ml10jKE7dC5LdN1ToGW4GqfxTC5kI="; + sha256 = "sha256-LbNHaSbNCwoffox6B8kEUzxjkSJotB+P1bw3wbU7DZk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index f7d0e62ff15b3..700fb05bc67f6 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -8,33 +8,53 @@ , docutils , pyopencl , opencl-headers +, pythonOlder }: buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.5"; + version = "1.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; rev = "v${version}"; - sha256 = "19h30kcgpvg1qirzjm0vhgvp1yn60ivlglc8a8n2b4d9fp0acfyd"; + hash = "sha256-RVEPu07gp1ScciJQmjizyELcOD2WSjIlxunj5LnmXdw="; }; - buildInputs = [ opencl-headers ]; + buildInputs = [ + opencl-headers + ]; + + propagatedBuildInputs = [ + docutils + matplotlib + numpy + scipy + pyopencl + ]; + # Note: the 1.0.5 release should be compatible with pytest6, so this can # be set back to 'pytest' at that point - checkInputs = [ pytest ]; - propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ]; + checkInputs = [ + pytest + ]; checkPhase = '' HOME=$(mktemp -d) py.test -c ./pytest.ini ''; - meta = { + pythonImportsCheck = [ + "sasmodels" + ]; + + meta = with lib; { description = "Library of small angle scattering models"; - homepage = "http://sasview.org"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ rprospero ]; + homepage = "https://github.com/SasView/sasmodels"; + license = licenses.bsd3; + maintainers = with maintainers; [ rprospero ]; }; } diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index d8240fd83333b..803daeb2ab3a6 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.11"; + version = "0.4.12"; format = "pyproject"; # fetch from github as we want the data files @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "18r5nk8d5y79ihzjkjm5l0hiw2sjgj87px7vwb0bxbs73f5v353b"; + sha256 = "sha256-ZnsOmsajW4dDv53I/Cuu97mPJywGiwFhNGpT1WRfxSw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index c26ec74ac310d..073059aec6261 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -22,6 +22,7 @@ , service-identity , sybil , testfixtures +, tldextract , twisted , w3lib , zope_interface @@ -29,13 +30,13 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.5.1"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "Scrapy"; - sha256 = "13af6032476ab4256158220e530411290b3b934dd602bb6dacacbf6d16141f49"; + sha256 = "56fd55a59d0f329ce752892358abee5a6b50b4fc55a40420ea317dc617553827"; }; nativeBuildInputs = [ @@ -54,6 +55,7 @@ buildPythonPackage rec { pyopenssl queuelib service-identity + tldextract twisted w3lib zope_interface @@ -68,22 +70,6 @@ buildPythonPackage rec { testfixtures ]; - patches = [ - # Require setuptools, https://github.com/scrapy/scrapy/pull/5122 - (fetchpatch { - name = "add-setuptools.patch"; - url = "https://github.com/scrapy/scrapy/commit/4f500342c8ad4674b191e1fab0d1b2ac944d7d3e.patch"; - sha256 = "14030sfv1cf7dy4yww02b49mg39cfcg4bv7ys1iwycfqag3xcjda"; - }) - # Make Twisted[http2] installation optional, https://github.com/scrapy/scrapy/pull/5113 - (fetchpatch { - name = "remove-h2.patch"; - url = "https://github.com/scrapy/scrapy/commit/c5b1ee810167266fcd259f263dbfc0fe0204761a.patch"; - sha256 = "0sa39yx9my4nqww8a12bk9zagx7b56vwy7xpxm4xgjapjl6mcc0k"; - excludes = [ "tox.ini" ]; - }) - ]; - LC_ALL = "en_US.UTF-8"; preCheck = '' diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index e939142fd82f3..d3ca445961936 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -1,20 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { - pname = "semantic_version"; - version = "2.8.5"; + pname = "semantic-version"; + version = "2.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; + pname = "semantic_version"; + inherit version; + sha256 = "sha256-q/VIc1U+Xgem/U1fZTt4H1rkEpekk2ZrWdzyFABqErI="; }; - # ModuleNotFoundError: No module named 'tests' - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "semantic_version" + ]; meta = with lib; { description = "A library implementing the 'SemVer' scheme"; - license = licenses.bsdOriginal; + homepage = "https://github.com/rbarrois/python-semanticversion/"; + license = licenses.bsd2; maintainers = with maintainers; [ layus makefu ]; }; } diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index fa813c4b5fd12..1c2c206f87f0b 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.02.1"; + version = "2022.03.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-r+TcSzFkEGRsuTtEHBT/GMNa9r6GsIyvbLaF32cFfeQ="; + sha256 = "sha256-B4Tg122S2lJaBXBKUSN2ndt5EOiC5HyORTQXofZKUpw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 4a4386ff5bc05..4743639c43d1c 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -4,31 +4,25 @@ , aiohttp , fetchPypi , gnupg -, isPy3k , pyasn1 , pyasn1-modules , pytestCheckHook , substituteAll +, pythonOlder }: buildPythonPackage rec { pname = "slixmpp"; - version = "1.8.0.1"; + version = "1.8.1"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J3znZl77jST94KhUBQcCxSK0qnsVWIYTG6u3po5FHh8="; + hash = "sha256-QgTIC+4JtAD9nnS+fJKZwF0aJEIrFmPHkYg8cPgXmcA="; }; - patches = [ - (substituteAll { - src = ./hardcode-gnupg-path.patch; - inherit gnupg; - }) - ]; - propagatedBuildInputs = [ aiodns aiohttp @@ -36,15 +30,28 @@ buildPythonPackage rec { pyasn1-modules ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - # Exclude live tests - disabledTestPaths = [ "tests/live_test.py" ]; + patches = [ + (substituteAll { + src = ./hardcode-gnupg-path.patch; + inherit gnupg; + }) + ]; + + disabledTestPaths = [ + # Exclude live tests + "tests/live_test.py" + ]; - pythonImportsCheck = [ "slixmpp" ]; + pythonImportsCheck = [ + "slixmpp" + ]; meta = with lib; { - description = "Elegant Python library for XMPP"; + description = "Python library for XMPP"; homepage = "https://slixmpp.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index d1645e1fbe740..1b7bd7341ebfc 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = pname; rev = version; - sha256 = "sha256-Ehafb35H462Ffn6omGh/MDJKQX5qJJZeiIBO3n0IGlA="; + hash = "sha256-Ehafb35H462Ffn6omGh/MDJKQX5qJJZeiIBO3n0IGlA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index e79a38d8cf5bd..50a134df2d2a3 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.26.4"; + version = "0.27.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - hash = "sha256-DoONq6Iqi8t47jtqggKYMHSNJAf/Kha3tszR6mYeB9Y="; + hash = "sha256-8U7wfxqen+hgK8j9ooPHCAKvd9kSZicToTyP7XzQFrg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index b23f24ca5014a..5d96f8e1505c3 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.25"; + version = "3.25.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OKlwuXwXGU2WBauE33SYAuHzvPBhNdwYB3nQo5V2sUI="; + sha256 = "sha256-32lfUJoTbkflztLU/BDhbHbuOkW66OGpHLuiyAKFy8k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index f76ba96a5b8f3..bc3e2c238c9f0 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sslyze"; - version = "5.0.2"; + version = "5.0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-8xtnE5oFxH3wo2Smt65/xGDHxivexN6ggUpyUg42Cjk="; + hash = "sha256-d465WJIDsgNAPe8KW5v2KDSgzMH7OPLSiFfFH9n+jiA="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index cbbd3a878d7ef..eb9879a4bf02d 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -1,5 +1,6 @@ { asttokens , buildPythonPackage +, cython , executing , fetchFromGitHub , git @@ -15,13 +16,13 @@ buildPythonPackage rec { pname = "stack-data"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "alexmojaki"; repo = "stack_data"; rev = "v${version}"; - sha256 = "sha256-dRIRDMq0tc1QuBHvppPwJA5PVGHyVRhoBlX5BsdDzec="; + sha256 = "sha256-brXFrk1UU5hxCVeRvGK7wzRA0Hoj9fgqoxTIwInPrEc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -39,6 +40,7 @@ buildPythonPackage rec { ]; checkInputs = [ + cython littleutils pygments pytestCheckHook diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index f627f0e7231e6..3df2a3e2895bf 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "stups-pierone"; - version = "1.1.50"; + version = "1.1.51"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zalando-stups"; repo = "pierone-cli"; rev = version; - hash = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw="; + hash = "sha256-OypGYHfiFUfcUndylM2N2WfPnfXXJ4gvWypUbltYAYE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index 38516ab73c3ec..c15e88ebeb249 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , lxml , isPy27 }: @@ -12,10 +12,12 @@ buildPythonPackage { propagatedBuildInputs = [ lxml ]; - src = fetchgit { - url = "https://github.com/kjellmf/svg2tikz"; - sha256 = "429428ec435e53672b85cdfbb89bb8af0ff9f8238f5d05970729e5177d252d5f"; + src = fetchFromGitHub { + owner = "kjellmf"; + repo = "svg2tikz"; rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; + sha256 = "sha256-QpQo7ENeU2crhc37uJu4rw/5+COPXQWXBynlF30lLV8="; + fetchSubmodules = true; }; meta = with lib; { diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index c2c223586616b..db0f01ae51f0b 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "sha256-kz4M4ghR9Mi8Ig5K+pZC4zHt8XxoP3vU4ATImejqbgg="; + sha256 = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; }; postConfigure = '' diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 18ab606afdd77..b2a719a020b81 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.7.3"; + version = "5.8.0"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "v${version}"; - sha256 = "1d6rnlybj971b5j5glvq288hd4r204nkmssqb0k8rm6cqcwhz292"; + sha256 = "sha256-spTIHiyspjrIV8DKR7YNpNTNO9SlcLOROuABhmu3ckA="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 55bf72aec7697..a25c8d235674b 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.13"; + version = "8.0.15"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R2YqOuM9RFp3tup7dyREgFx7uomR8SLjUNr3Le3IFxo="; + sha256 = "sha256-LjFQINqFw3keGR+/N8SiQz9XzzIuJzgNoM1N6Z2WBTs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 1da2887a12f19..65b22f905ef9a 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonPackage rec { pname = "timetagger"; - version = "22.2.3"; + version = "22.3.1"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tQel+IVqP+MngAvFgr7Yh+XCSIPWpzCBXHOj9b0Os98="; + sha256 = "sha256-pHogDjqXuoQp5afSnPvMPaKoBtPE6u3kMi87SzY5yoU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix index ad35fe501282d..a886e116e458a 100644 --- a/pkgs/development/python-modules/tls-parser/default.nix +++ b/pkgs/development/python-modules/tls-parser/default.nix @@ -7,23 +7,29 @@ buildPythonPackage rec { pname = "tls-parser"; - version = "1.2.2"; + version = "2.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = "tls_parser"; rev = version; - sha256 = "12qj3vg02r5a51w6gbgb1gcxicqc10lbbsdi57jkkfvbqiindbd0"; + hash = "sha256-A1lYRe1sHDoOFdF20DP+xRMcPBWzokIXFphIpaBmwBc="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "tls_parser" ]; + pythonImportsCheck = [ + "tls_parser" + ]; meta = with lib; { - homepage = "https://github.com/nabla-c0d3/tls_parser"; description = "Small library to parse TLS records"; + homepage = "https://github.com/nabla-c0d3/tls_parser"; platforms = with platforms; linux ++ darwin; license = licenses.mit; maintainers = with maintainers; [ veehaitch ]; diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index d09a855bd32a2..dc42ba0972fca 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "traitsui"; - version = "7.3.0"; + version = "7.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZkSz+PYColdgcC3IchuneM51lFBAk68UpIadI56GdPQ="; + hash = "sha256-lHStZ/NF2Wsya0AemgFAXICCyS+kO/R8CwOYGOWHrGk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index de28f70bca001..0323c965ecd73 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.2"; + version = "3.10.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PcR84la6ZJjtpjg4WGVUkyZJqVT8Ge7vjk90X6gStAo="; + sha256 = "sha256-GtdxStdWtioRgf/Y2/broyYElqIJ2RxP3otgROw3epI="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index 425b7eddfe99b..382e90e14c82d 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "twentemilieu"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-twentemilieu"; rev = "v${version}"; - sha256 = "sha256-7HQ0+h8oiyY+TacQdX84K0r994rH0AMZAvZz8PUvQl0="; + sha256 = "sha256-UE7fhbSThXmMns1XfUUQqw0wn5/w/x+UncansIBiank="; }; postPatch = '' diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 93c9c95a62ef6..c5fc7e1c6a441 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "21.1.0"; + version = "22.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6"; + sha256 = "sha256-iaG2XjKks2nWfmwWY4f7xGjMXQUidEjSOaXn6XGKoFM="; }; # Based on what txtorcon tox.ini will automatically test, allow back as far diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index c4977ab082925..87116017063db 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "typed-ast"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "python"; repo = "typed_ast"; rev = version; - hash = "sha256-qfXMT+rSf/WcWHpkg4VZXZMYj/5IKQWAKRsxQ0TRzPU="; + hash = "sha256-Ul1FIS1a1f8l3tX+m8Bj/LsLQW1sXJv6XzEZ9zh8rfI="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index ea5092cb2ae8b..6e903b6840772 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "0.11.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gcyOeUyRAwU5s+XoQO/yM0tx7QHjDsBeyoe5HRZHtIs="; + sha256 = "sha256-c+iOb1F8+9IoRbwpMTdyDfOPW2ZEo4xDAlbzLAxgSfk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index 4614a92ae64f7..4cefc57ed594d 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.9"; + version = "2.8.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kPlaa21Pq6NZKH8XosrlEczJ1KvImwGWm9rBGFgVwF0="; + sha256 = "sha256-a886rnJC5Xk7r9eyvPtOJV63srMUSs0N8OGC3OWMytM="; }; pythonImportsCheck = [ "dateutil-stubs" ]; diff --git a/pkgs/development/python-modules/types-freezegun/default.nix b/pkgs/development/python-modules/types-freezegun/default.nix index 687ddd1b17cc5..a288a25fe5c9b 100644 --- a/pkgs/development/python-modules/types-freezegun/default.nix +++ b/pkgs/development/python-modules/types-freezegun/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-freezegun"; - version = "1.1.6"; + version = "1.1.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-XHCkt0RLjH3SgA4AY9b+chqxEgk5kmT6D3evJT3YsU8="; + hash = "sha256-6dEyfpjGyqj2XeABje0nQ0fo40GY1ZqppcJK2SZdXl4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-paramiko/default.nix b/pkgs/development/python-modules/types-paramiko/default.nix index f43fc5ed507ba..5b87e8079a5e9 100644 --- a/pkgs/development/python-modules/types-paramiko/default.nix +++ b/pkgs/development/python-modules/types-paramiko/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "types-paramiko"; - version = "2.8.16"; + version = "2.8.17"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HWkCWoa5509G2OHyPFijb5RVORAvE1tQEgL7myxP0SI="; + sha256 = "sha256-1toFPkau9cYpvE6lvatWZwhlNerg/P2N6EBpQ7g00uY="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 1fc7dd5f9b611..eecf45c82fa5b 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.3.5"; + version = "2021.3.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/vjeI47pUTWVIimiojv7h71j1abIWYEGpGz89I8Gnqg="; + sha256 = "sha256-dFR/2Q2NirTx7t86NEp9GG2XSGlziV+BIhpxLh4s2ZM="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 165c65f3a9efc..d6d7f752a7a9c 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.11"; + version = "2.27.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-an7SSyF4CvSlteJMMQss2IX7YS31/ZVYTQPYfl8qGVo="; + sha256 = "sha256-BFee4WT3wmWb5GlQ48L41RoIGtJS7xsB1LEvq6XDgQs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 46fe7da5d1c7d..c59baea3c6e3e 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.10"; + version = "57.4.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mhNRNnnGQPZhbi2atQ1DHJnKiumEipckP4h8gP1c8pQ="; + sha256 = "sha256-Ji90BuDH1wWta7RSa1t2H6UAv5nqt03oWsNZIYfWKTU="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 9e5c9b628b2dd..6d7ceade85c9f 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.8.5"; + version = "0.8.6"; src = fetchPypi { inherit pname version; - hash = "sha256-A/KDvzhOoSG3tqWK+zj03vl/MHBPyhOg2mhpNrDzkqw="; + hash = "sha256-P037eVRJwheO1cIU7FEUwESx7t1xrQoQA7xnDwnYcQo="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 7bffc7826a3c5..235535ce97164 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.10"; + version = "1.26.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-omiY9TDmw/Q/JbkH8riESGho/9Vqn6qUy/mz624WXWo="; + hash = "sha256-JNZORBFohR6wXx0CLeGK4xVY9WScjxEX44TC6F4xMVs="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 7dfd5c9d276aa..4c776070ae6e5 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.7.0"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447"; + sha256 = "sha256-1fLlOpoA2zIkqMNjSbU4Dg4i0a7GxpSxT7lIPuk8YgU="; }; pythonImportsCheck = [ "unidiff" ]; diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 9fe43d16f9268..247a192588dea 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -5,7 +5,6 @@ , setuptools , geopy , docopt -, pyyaml , certifi , amqtt , websockets @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.9.2"; + version = "0.10.0"; disabled = pythonOlder "3.8"; @@ -27,24 +26,30 @@ buildPythonPackage rec { owner = "molobrakos"; repo = "volvooncall"; rev = "v${version}"; - hash = "sha256-OTs282z7qzILl/xxM3whaxiQr8FZOfgceO2EY3NJKbA="; + hash = "sha256-HLSanXJs1yPSgYo4oX0zJtrV5sKkxV2yLPhc2dVRHY8="; }; propagatedBuildInputs = [ - geopy - docopt - pyyaml - certifi - amqtt - websockets aiohttp ]; + passthru.extras-require = { + console = [ + certifi + docopt + geopy + ]; + mqtt = [ + amqtt + certifi + ]; + }; + checkInputs = [ - pytestCheckHook asynctest pytest-asyncio - ]; + pytestCheckHook + ] ++ passthru.extras-require.mqtt; pythonImportsCheck = [ "volvooncall" ]; diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 2d0988473ddb8..8228047d9ce9e 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.13.1"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-85ohhynXHWjuwKB18DciB48tNGZcHzafobMDaGoTkoc="; + sha256 = "sha256-901VW56vr6ysMlzspgVbPMLnDIpJRgSEOEQ8ohHp+mc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 3b88afa7e65cd..3bd0d5b55b90e 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.13.0"; + version = "0.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "sha256-n+TIzlnyPeSywTQr7wlGNezsbQ2+S/WYt1H95+Id2Rw="; + sha256 = "sha256-QQPrAfk+BX8mjqn9ISim9hLEZR2nbgxbkwCv+91yeRY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 94234b2626e2b..14e81df65fcd5 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -1,14 +1,27 @@ -{lib, fetchFromGitHub, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4, setuptools}: +{lib +, fetchFromGitHub +, pythonOlder +, buildPythonPackage +, gfortran +, xarray +, wrapt +, numpy +, netcdf4 +, setuptools +}: buildPythonPackage rec { pname = "wrf-python"; - version = "1.3.2.6"; + version = "1.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "NCAR"; repo = "wrf-python"; rev = version; - sha256 = "046kflai71r7xrmdw6jn0ifn5656wj9gpnwlgxkx430dgk7zbc2y"; + hash = "sha256-+v4FEK0FVE0oAIb18XDTOInHKfxXyykb1ngk9Uxwf0c="; }; propagatedBuildInputs = [ @@ -24,9 +37,8 @@ buildPythonPackage rec { checkInputs = [ netcdf4 - ] ++ lib.optional (pythonOlder "3.3") mock; + ]; - doCheck = true; checkPhase = '' runHook preCheck cd ./test/ci_tests @@ -34,10 +46,14 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { + pythonImportsCheck = [ + "wrf" + ]; + + meta = with lib; { description = "WRF postprocessing library for Python"; homepage = "http://wrf-python.rtfd.org"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ mhaselsteiner ]; + license = licenses.asl20; + maintainers = with maintainers; [ mhaselsteiner ]; }; } diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index efdb40cd6f878..5a47fc90f67fd 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -1,34 +1,53 @@ { lib +, arabic-reshaper , buildPythonPackage -, fetchPypi -, pillow +, fetchFromGitHub , html5lib -, pypdf2 -, reportlab -, six +, pillow +, pypdf3 +, pytestCheckHook , python-bidi -, arabic-reshaper -, setuptools +, pythonOlder +, reportlab +, svglib }: buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.5"; + version = "0.2.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-EyIERvAC98LqPTMCdwWqTkm1RiMhikscL0tnMZUHIT8="; + }; propagatedBuildInputs = [ - pillow html5lib pypdf2 reportlab six - setuptools python-bidi arabic-reshaper + arabic-reshaper + html5lib + pillow + pypdf3 + python-bidi + reportlab + svglib ]; - src = fetchPypi { - inherit pname version; - sha256 = "6797e974fac66f0efbe927c1539a2756ca4fe8777eaa5882bac132fc76b39421"; - }; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xhtml2pdf" + ]; meta = with lib; { description = "A PDF generator using HTML and CSS"; homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 1687b113b42f8..8616463915e64 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - version = "1.9.2"; + version = "1.10.0"; pname = "xmlschema"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "1d18x150g0jz3nw5al5dygizwkjgzdnmd5kf46v8ribfz48iirr6"; + sha256 = "sha256-er6+/2fZTw+CDIwCGqTNoXi7KJ3XOsbcWYaH8A2SSgo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 790aaec3ce3d8..13cc5b89c2a21 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , coverage -, nose +, pytestCheckHook }: buildPythonPackage rec { @@ -14,11 +14,13 @@ buildPythonPackage rec { sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21"; }; - checkInputs = [ coverage nose ]; + checkInputs = [ coverage pytestCheckHook ]; - checkPhase = '' - nosetests - ''; + disabledTests = [ + # incompatibilities with security fixes: https://github.com/martinblech/xmltodict/issues/289 + "test_namespace_collapse" + "test_namespace_support" + ]; meta = { description = "Makes working with XML feel like you are working with JSON"; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 22440766fd03b..2eb38dd0784ec 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.22"; + version = "1.1.23"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qtJSGvvYcdGYUUHnRnKe+z+twFqLGAn1Zl47F4CGnvc="; + sha256 = "sha256-CnAVkwCOADBNY0cUvq9Dt6JR+fIr4LiZVMzJIIFqzG0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index f7298f4b8c95e..6795ba5812731 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -1,27 +1,37 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi, httpx }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, httpx +}: buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.2"; + version = "1.6.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PeWi1eygUSgUXZ68bUJ44IoffNDme06JNR9ns6njqMU="; + hash = "sha256-zAza1XMKLIMZFFS0v/4ATqh6j7aEB2Y+eliE/hNPORw="; }; - propagatedBuildInputs = [ httpx ]; + propagatedBuildInputs = [ + httpx + ]; - pythonImportsCheck = [ "youtubesearchpython" ]; + pythonImportsCheck = [ + "youtubesearchpython" + ]; - # project has no tests + # Project has no tests doCheck = false; meta = with lib; { - description = "Search for YouTube videos, channels & playlists & get video information using link WITHOUT YouTube Data API v3"; + description = "Search for YouTube videos, channels & playlists & get video information using link without YouTube Data API"; homepage = "https://github.com/alexmercerind/youtube-search-python"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix new file mode 100644 index 0000000000000..b1f620557bfac --- /dev/null +++ b/pkgs/development/python-modules/zipstream-ng/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "zipstream-ng"; + version = "1.3.4"; + + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { + owner = "pR0Ps"; + repo = "zipstream-ng"; + rev = "v${version}"; + sha256 = "NTsnGCddGDUxdHbEoM2ew756psboex3sb6MkYKtaSjQ="; + }; + + pythonImportsCheck = [ + "zipstream" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Library to generate streamable zip files"; + longDescription = '' + A modern and easy to use streamable zip file generator. It can package and stream many files + and folders on the fly without needing temporary files or excessive memory + ''; + homepage = "https://github.com/pR0Ps/zipstream-ng"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 171e838fa321d..5f4203634acb0 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.35.1"; + version = "0.35.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-WmpXQttcQ3Z/SFkNPfmvPWPGzWectQBoI9+bL2QYeaY="; + sha256 = "sha256-Bte4pAi+atdkMvxYlzdN/UOrHB2WKfl44U9m/vKFMoA="; }; propagatedBuildInputs = [ |