diff options
Diffstat (limited to 'pkgs/development/python-modules')
62 files changed, 250 insertions, 381 deletions
diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index eb412275a8821..99271645f19a5 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -1,10 +1,8 @@ { buildPythonPackage , lib -, pythonOlder , fetchPypi , setuptools , six -, enum34 }: buildPythonPackage rec { @@ -23,8 +21,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ six - ] ++ lib.optionals (pythonOlder "3.4") [ - enum34 ]; # checks use bazel; should be revisited diff --git a/pkgs/development/python-modules/ago/default.nix b/pkgs/development/python-modules/ago/default.nix index ad095c441db26..59aaf184a6fcd 100644 --- a/pkgs/development/python-modules/ago/default.nix +++ b/pkgs/development/python-modules/ago/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchPypi - -, pythonOlder - , pytestCheckHook - , setuptools }: @@ -14,8 +10,6 @@ buildPythonPackage rec { version = "0.0.95"; pyproject = true; - disabled = pythonOlder "3.3"; - src = fetchPypi { inherit pname version; hash = "sha256-0gEPXqw99UTsSOwRYQLgaFkaNFsaWA8ylz24pQX8p0Q="; diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix index da1d4a3dca4ca..2e08bef31d70e 100644 --- a/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -1,7 +1,6 @@ { lib , fetchPypi , buildPythonPackage -, pythonOlder , attrs , pluggy , six @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "2.13.5"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-pWkLVfBrLEhdhuTE95K3aqrhEY2wEyo5uRzuJC3ngjE="; diff --git a/pkgs/development/python-modules/android-backup/default.nix b/pkgs/development/python-modules/android-backup/default.nix index 647a36f78b330..e958e853b046c 100644 --- a/pkgs/development/python-modules/android-backup/default.nix +++ b/pkgs/development/python-modules/android-backup/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pycrypto -, pythonOlder -, enum34 , python }: @@ -21,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycrypto - ] ++ lib.optional (pythonOlder "3.4") enum34; + ]; checkPhase = '' ${python.interpreter} -m android_backup.tests diff --git a/pkgs/development/python-modules/anyascii/default.nix b/pkgs/development/python-modules/anyascii/default.nix index d781a552cca10..3e001d5a18743 100644 --- a/pkgs/development/python-modules/anyascii/default.nix +++ b/pkgs/development/python-modules/anyascii/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi , pytestCheckHook }: @@ -9,7 +8,6 @@ buildPythonPackage rec { pname = "anyascii"; version = "0.3.2"; format = "setuptools"; - disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 6c4d629e0843a..7768dd5a8d7c5 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, numpy, scipy, @@ -16,10 +15,6 @@ buildPythonPackage rec { version = "0.6.1"; pyproject = true; - # Python 2 not supported and not some old Python 3 because MPL doesn't support - # them properly. - disabled = pythonOlder "3.4"; - src = fetchFromGitHub { owner = "bayespy"; repo = "bayespy"; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 232350e9869bb..d5666ac03e7cf 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.106"; + version = "1.34.107"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-1IQhTwKkT27syAEO82MwPclTfxPoElur9HYGaYrGjCA="; + hash = "sha256-ii93ArgE69LK2oUXGVSYHrvW++TxfuZManUOsdnVNnY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix index 23a19f89f2797..3a0c5fbd3dd12 100644 --- a/pkgs/development/python-modules/buienradar/default.nix +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub , docopt , pytz @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "1.0.5"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchFromGitHub { owner = "mjj4791"; repo = "python-buienradar"; diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index da4fec24f36ba..e61e75da117f5 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -46,7 +46,13 @@ buildPythonPackage rec { pytestFlagsArray = [ "cramjam-python/tests" ]; - disabledTestPaths = [ "cramjam-python/benchmarks/test_bench.py" ]; + disabledTestPaths = [ + "cramjam-python/benchmarks/test_bench.py" + # test_variants.py appears to be flaky + # + # https://github.com/NixOS/nixpkgs/pull/311584#issuecomment-2117656380 + "cramjam-python/tests/test_variants.py" + ]; pythonImportsCheck = [ "cramjam" ]; diff --git a/pkgs/development/python-modules/domeneshop/default.nix b/pkgs/development/python-modules/domeneshop/default.nix index 8778dfc6aa935..c48d7603a045d 100644 --- a/pkgs/development/python-modules/domeneshop/default.nix +++ b/pkgs/development/python-modules/domeneshop/default.nix @@ -1,12 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , setuptools , urllib3 -, pyopenssl -, cryptography -, idna , certifi }: @@ -15,8 +11,6 @@ buildPythonPackage rec { version = "0.4.4"; pyproject = true; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-UCxIDnhIAkxZ1oQXYRyAMdGgUsUZ6AlYXwsxL49TFAg="; diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix index 49c5dbb51db42..fc051d105bf65 100644 --- a/pkgs/development/python-modules/dronecan/default.nix +++ b/pkgs/development/python-modules/dronecan/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , pytestCheckHook }: @@ -9,7 +8,6 @@ buildPythonPackage rec { pname = "dronecan"; version = "1.0.26"; format = "setuptools"; - disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 7cfc29c9ff813..e66763b23d5e1 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pythonAtLeast , pytestCheckHook }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "dugong"; version = "3.8.1"; format = "setuptools"; - disabled = pythonOlder "3.3"; src = fetchFromGitHub { owner = "python-dugong"; diff --git a/pkgs/development/python-modules/dynalite-panel/default.nix b/pkgs/development/python-modules/dynalite-panel/default.nix index 33be58906c750..960f5544d30ed 100644 --- a/pkgs/development/python-modules/dynalite-panel/default.nix +++ b/pkgs/development/python-modules/dynalite-panel/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi , setuptools }: @@ -10,8 +9,6 @@ buildPythonPackage rec { version = "0.0.4"; pyproject = true; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-m7nQzbxRe2qXUWAMeQlDZtc9F01DsbTzF/kI0ci3TFE="; diff --git a/pkgs/development/python-modules/functools32/default.nix b/pkgs/development/python-modules/functools32/default.nix deleted file mode 100644 index be907e963c100..0000000000000 --- a/pkgs/development/python-modules/functools32/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy3k -}: - -if isPy3k then null else buildPythonPackage rec { - pname = "functools32"; - version = "3.2.3-2"; - - src = fetchPypi { - inherit pname version; - sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn"; - }; - - meta = with lib; { - description = "This is a backport of the functools standard library module from"; - homepage = "https://github.com/MiCHiLU/python-functools32"; - license = licenses.psfl; - }; - -} diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 31a750c9ae589..a7811fbf5c03f 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = "goodwe"; rev = "refs/tags/v${version}"; - hash = "sha256-5Z8eHhCqfCTswS0C56z9TUQfoIdifuqcdWOupVlOJt8="; + hash = "sha256-Zptw8iEPjakMQ/OytGAqDaG973XuMy5UzsNv4LONlRU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index 307e8dfb63b80..1ec16d8216aa3 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -2,7 +2,6 @@ , cryptography , fetchPypi , lib -, pythonOlder , protobuf , pycryptodome , requests @@ -12,7 +11,6 @@ buildPythonPackage rec { version = "0.4.4"; format = "setuptools"; pname = "gpapi"; - disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3 src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index ac32e43cf9322..ecaa475906d68 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.80.0"; + version = "0.81.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-8KxnS6LTK077/hr81JOiOj8GaNWBXO8XlvpYBm/sZbI="; + hash = "sha256-61pdl9bjtvC9Fa7jCtSPEz/5PJiANmKqOSSHjK7is2s="; }; pythonRelaxDeps = [ "acme" ]; diff --git a/pkgs/development/python-modules/hcs-utils/default.nix b/pkgs/development/python-modules/hcs-utils/default.nix index 2dc90870b6143..d8d6bb67e47fc 100644 --- a/pkgs/development/python-modules/hcs-utils/default.nix +++ b/pkgs/development/python-modules/hcs-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: buildPythonPackage rec { pname = "hcs-utils"; @@ -21,8 +21,6 @@ buildPythonPackage rec { buildInputs = [ six glibcLocales ]; nativeCheckInputs = [ pytest ]; - disabled = pythonOlder "3.4"; - meta = with lib; { description = "Library collecting some useful snippets"; homepage = "https://pypi.python.org/pypi/hcs_utils/1.3"; diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix index 6d13740758863..59530ab5a7046 100644 --- a/pkgs/development/python-modules/httpserver/default.nix +++ b/pkgs/development/python-modules/httpserver/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, docopt, pythonOlder }: +{ lib, fetchPypi, buildPythonPackage, docopt }: buildPythonPackage rec { pname = "httpserver"; @@ -11,9 +11,6 @@ buildPythonPackage rec { # drivers. doCheck = false; - # Because it uses asyncio - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; sha256 = "1q62g324dvb0hqdwwrnj41sqr4d3ly78v9nc26rz1whj4pwdmhsv"; diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index d8a3fa92e4832..2c60b0b294b86 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -1,8 +1,6 @@ { lib -, pythonOlder , buildPythonPackage , fetchPypi -, monotonic }: buildPythonPackage rec { @@ -15,8 +13,6 @@ buildPythonPackage rec { sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"; }; - propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic; - # humanfriendly tests depends on coloredlogs which itself depends on # humanfriendly. This lead to infinite recursion when trying to # build this package so we have to disable the test suite :( diff --git a/pkgs/development/python-modules/hurry-filesize/default.nix b/pkgs/development/python-modules/hurry-filesize/default.nix index 62bd1f810f9d5..7dd168bf9704e 100644 --- a/pkgs/development/python-modules/hurry-filesize/default.nix +++ b/pkgs/development/python-modules/hurry-filesize/default.nix @@ -1,9 +1,6 @@ { lib , buildPythonPackage , fetchPypi - -, pythonOlder - , setuptools }: @@ -12,8 +9,6 @@ buildPythonPackage rec { version = "0.9"; pyproject = true; - disabled = pythonOlder "3.3"; - src = fetchPypi { pname = "hurry.filesize"; inherit version; diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index e96a5b37db430..6b976adc6b1ed 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = "json-schema-for-humans"; rev = "refs/tags/v${version}"; - hash = "sha256-ZlGIttfFOL4uLgzXIFvmyFDGrm8/Vr94QaFSn4/5ITI="; + hash = "sha256-SSMUHC4IsMIIhmRrG0ZWNO2MNKKvoBSybmEEibAY5q0="; }; pythonRelaxDeps = [ "dataclasses-json" ]; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index b95c2b295257a..989967719d09a 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, python, fetchFromGitHub , fetchpatch -, cmake, sip4, protobuf, pythonOlder }: +, cmake, sip4, protobuf }: buildPythonPackage rec { pname = "libarcus"; @@ -23,8 +23,6 @@ buildPythonPackage rec { }) ]; - disabled = pythonOlder "3.4"; - propagatedBuildInputs = [ sip4 ]; nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/matlink-gpapi/default.nix b/pkgs/development/python-modules/matlink-gpapi/default.nix index 3c3cda1bf8db0..c88638e4391f3 100644 --- a/pkgs/development/python-modules/matlink-gpapi/default.nix +++ b/pkgs/development/python-modules/matlink-gpapi/default.nix @@ -2,7 +2,6 @@ , cryptography , fetchPypi , lib -, pythonOlder , protobuf , pycryptodome , requests @@ -12,7 +11,6 @@ buildPythonPackage rec { version = "0.4.4.5"; format = "setuptools"; pname = "matlink-gpapi"; - disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3 src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/memestra/default.nix b/pkgs/development/python-modules/memestra/default.nix index db7d4e254a738..0bbf08a846987 100644 --- a/pkgs/development/python-modules/memestra/default.nix +++ b/pkgs/development/python-modules/memestra/default.nix @@ -6,7 +6,6 @@ , gast , nbconvert , nbformat -, pythonOlder , pyyaml }: @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "0.2.1"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-6shwf9BoDfZMy0itP8esNP4ov6fw6LJpO3Y5ZahwDZw="; diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index 704054c46c040..413c5f832d296 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, mock }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "mock-open"; @@ -13,15 +13,6 @@ buildPythonPackage rec { sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm"; }; - patches = lib.optional (pythonOlder "3.0") - (fetchpatch { - name = "ascii-only.patch"; - url = "https://github.com/das-g/mock-open/commit/521ff260da127949fe4aceff1667cba223c5b07b.patch"; - sha256 = "0ampbhk7kwkn0q5d2h9wrflkr8fji2bybmdck4qdzw1qkslfwwrn"; - }); - - propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; - meta = with lib; { homepage = "https://github.com/nivbend/mock-open"; description = "A better mock for file I/O"; diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 7dc4e3fd062f2..5740955f6d63f 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.2.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-UaGdusPGWlF7gTzpCq9WrF/evdDSK5srrkH8/Vz9O8M="; + hash = "sha256-afnxk79duKzTykNnSHPE6lZhMkOt+9JhEskj/KjQpQI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix index 7c010a224340d..04ae611925db5 100644 --- a/pkgs/development/python-modules/nidaqmx/default.nix +++ b/pkgs/development/python-modules/nidaqmx/default.nix @@ -5,8 +5,6 @@ , numpy , pytestCheckHook , pykka -, enum34 -, pythonOlder , pythonAtLeast }: @@ -32,8 +30,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy six - ] ++ lib.optionals (pythonOlder "3.4") [ - enum34 ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/opencensus-ext-azure/default.nix b/pkgs/development/python-modules/opencensus-ext-azure/default.nix index 4effafe3311a0..121b162b2fe18 100644 --- a/pkgs/development/python-modules/opencensus-ext-azure/default.nix +++ b/pkgs/development/python-modules/opencensus-ext-azure/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , azure-core , azure-identity , opencensus @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "1.1.13"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-rsMEchdwBTebpWpwKgl9YYxfV1WOG7ZnbsdflIEwaSo="; diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index 0fa4ba74deabc..7aa65b2d1d229 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , setuptools , attrs , pytest @@ -11,8 +10,6 @@ buildPythonPackage rec { pname = "outcome"; version = "1.3.0.post0"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-nc8C5l8pcbgAR7N3Ro5yomjhXArzzxI45v8U9/kRQ7g="; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 15238a8589908..ab1948005fe88 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -5,7 +5,6 @@ , pythonOlder , scandir ? null , glibcLocales -, mock , typing }: @@ -21,8 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.5") [ scandir typing ]; - nativeCheckInputs = [ glibcLocales ] - ++ lib.optional (pythonOlder "3.3") mock; + nativeCheckInputs = [ glibcLocales ]; preCheck = '' export LC_ALL="en_US.UTF-8" diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index d6be608aaa2bb..52ddc93672511 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , path -, pathlib2 -, pythonOlder }: buildPythonPackage rec { @@ -16,8 +14,7 @@ buildPythonPackage rec { sha256 = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"; }; - propagatedBuildInputs = [ path ] - ++ lib.optional (pythonOlder "3.4") pathlib2; + propagatedBuildInputs = [ path ]; # No proper test suite doCheck = false; diff --git a/pkgs/development/python-modules/prometrix/default.nix b/pkgs/development/python-modules/prometrix/default.nix index 58b3ac27361e3..fefbfd5f8298a 100644 --- a/pkgs/development/python-modules/prometrix/default.nix +++ b/pkgs/development/python-modules/prometrix/default.nix @@ -1,36 +1,46 @@ { lib -, buildPythonPackage -, fetchFromGitHub , boto3 , botocore +, buildPythonPackage , dateparser +, fetchFromGitHub , matplotlib , numpy , pandas , poetry-core , prometheus-api-client -, pydantic_1 +, pydantic +, pythonRelaxDepsHook , requests }: buildPythonPackage rec { pname = "prometrix"; - version = "unstable-2024-02-20"; - format = "pyproject"; + version = "0.1.18-unstable-2024-04-30"; + pyproject = true; src = fetchFromGitHub { owner = "robusta-dev"; repo = "prometrix"; - rev = "ab2dad2192ed3df91c1a25446a4f54b8f2f6742f"; - hash = "sha256-/72Qkd2BojYgiQi5rq7dVsEje7M0aQQXhenvIM7lSy4="; + # https://github.com/robusta-dev/prometrix/issues/19 + rev = "35128847d46016b88455e0a98f0eeec08d042107"; + hash = "sha256-g8ZqgL9ETVwpKLMQS7s7A4GpSGfaFEDLOr8JBvFl2C4="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'pydantic = "^1.8.1"' 'pydantic = "*"' - ''; + pythonRelaxDeps = [ + "pydantic" + "urllib3" + ]; + + build-system = [ + poetry-core + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; - propagatedBuildInputs = [ + dependencies = [ boto3 botocore dateparser @@ -38,13 +48,13 @@ buildPythonPackage rec { numpy pandas prometheus-api-client - pydantic_1 + pydantic requests ]; - nativeBuildInputs = [ - poetry-core - ]; + # Fixture is missing + # https://github.com/robusta-dev/prometrix/issues/9 + doCheck = false; pythonImportsCheck = [ "prometrix" @@ -56,7 +66,11 @@ buildPythonPackage rec { This Python package provides a unified Prometheus client that can be used to connect to and query various types of Prometheus instances. ''; + homepage = "https://github.com/robusta-dev/prometrix"; license = licenses.mit; maintainers = with maintainers; [ azahi ]; + # prometheus-api-client 0.5.5 is not working + # https://github.com/robusta-dev/prometrix/issues/14 + broken = versionAtLeast prometheus-api-client.version "0.5.3"; }; } diff --git a/pkgs/development/python-modules/pure-cdb/default.nix b/pkgs/development/python-modules/pure-cdb/default.nix index f8df017c9b18c..b07843c8eaa6c 100644 --- a/pkgs/development/python-modules/pure-cdb/default.nix +++ b/pkgs/development/python-modules/pure-cdb/default.nix @@ -1,10 +1,9 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, flake8 }: +{ lib, fetchFromGitHub, buildPythonPackage, flake8 }: buildPythonPackage rec { pname = "pure-cdb"; version = "4.0.0"; format = "setuptools"; - disabled = pythonOlder "3.4"; # Archive on pypi has no tests. src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index 9ae0d1a1d3dbd..bf860e83e6b67 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , morphys , pytestCheckHook -, pythonOlder , six , varint }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "2.0.1"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchFromGitHub { owner = "multiformats"; repo = pname; diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index e0f4e1d190a7f..fc601fca868d1 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -1,38 +1,42 @@ -{ lib -, boto3 -, buildPythonPackage -, envs -, fetchFromGitHub -, isPy27 -, freezegun -, mock -, moto -, pyjwt -, pytestCheckHook -, requests -, requests-mock +{ + lib, + boto3, + buildPythonPackage, + envs, + fetchFromGitHub, + freezegun, + mock, + moto, + pyjwt, + pytestCheckHook, + pythonOlder, + requests, + requests-mock, + setuptools, }: buildPythonPackage rec { pname = "pycognito"; - version = "2024.2.0"; - format = "setuptools"; - disabled = isPy27; + version = "2024.5.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pvizeli"; - repo = pname; + repo = "pycognito"; rev = "refs/tags/${version}"; - hash = "sha256-VYko5KcJvnhPUceTll2BBJWb88SYnSL7S3mZ7XSLPSQ="; + hash = "sha256-U23fFLru4j6GnWMcYtsCW9BVJkVcCoefPH6oMijYGew="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ boto3 envs pyjwt requests - ] - ++ pyjwt.optional-dependencies.crypto; + ] ++ pyjwt.optional-dependencies.crypto; nativeCheckInputs = [ freezegun @@ -40,18 +44,12 @@ buildPythonPackage rec { moto pytestCheckHook requests-mock - ] - ++ moto.optional-dependencies.cognitoidp; - - postPatch = '' - substituteInPlace setup.py \ - --replace 'python-jose[cryptography]' 'python-jose' - ''; + ] ++ moto.optional-dependencies.cognitoidp; pytestFlagsArray = [ "tests.py" ]; disabledTests = [ - # requires network access + # Test requires network access "test_srp_requests_http_auth" ]; @@ -60,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support"; homepage = "https://github.com/pvizeli/pycognito"; + changelog = "https://github.com/NabuCasa/pycognito/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index bfeb5e4a5eeef..284fb8368ffd7 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -1,49 +1,49 @@ -{ lib -, aiohttp -, aresponses -, awesomeversion -, backoff -, buildPythonPackage -, deepmerge -, fetchFromGitHub -, poetry-core -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, yarl +{ + lib, + aiohttp, + aresponses, + async-timeout, + awesomeversion, + backoff, + buildPythonPackage, + deepmerge, + fetchFromGitHub, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + yarl, }: buildPythonPackage rec { pname = "pyipp"; - version = "0.15.0"; - format = "pyproject"; + version = "0.16.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "ctalkington"; - repo = "python-ipp"; - rev = "refs/tags/${version}"; - hash = "sha256-k7NSCmugGov+lJXWeopUwKkGKL/EGhvxSSiby4CcmFM="; + owner = "ctalkington"; + repo = "python-ipp"; + rev = "refs/tags/${version}"; + hash = "sha256-ddI9K0lJDZbVgO+hptP4I+EH//5vOoFDYXWxGALF8Ik="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ + --replace-fail "--cov" "" ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp awesomeversion backoff deepmerge yarl - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; nativeCheckInputs = [ aresponses @@ -53,9 +53,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ - "pyipp" - ]; + pythonImportsCheck = [ "pyipp" ]; meta = with lib; { changelog = "https://github.com/ctalkington/python-ipp/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix index 8326580395319..02d00afd628f5 100644 --- a/pkgs/development/python-modules/pykrakenapi/default.nix +++ b/pkgs/development/python-modules/pykrakenapi/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub , krakenex , pandas @@ -10,8 +9,6 @@ buildPythonPackage rec { pname = "pykrakenapi"; version = "0.3.2"; - disabled = pythonOlder "3.3"; - format = "setuptools"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index 755c03501e562..6a4736c3fb213 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder , bson , pytestCheckHook , pyyaml @@ -12,7 +11,6 @@ buildPythonPackage rec { pname = "pymarshal"; version = "2.2.0"; format = "setuptools"; - disabled = pythonOlder "3.0"; src = fetchFromGitHub { owner = "stargateaudio"; diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 7e609cbe1ccd9..b900618e4dd29 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , click , colorama -, enum34 , fetchPypi , git , gnugrep @@ -12,7 +11,6 @@ , pbr , pexpect , pythonAtLeast -, pythonOlder , substituteAll , tree , xclip @@ -53,7 +51,7 @@ buildPythonPackage rec { click colorama pexpect - ] ++ lib.optional (pythonOlder "3.4") enum34; + ]; nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index a515c5acfcd15..ea51736d6dd96 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -3,8 +3,6 @@ , buildPythonPackage , fetchPypi , unittestCheckHook -, pythonOlder -, isPy3k }: buildPythonPackage rec { @@ -12,9 +10,6 @@ buildPythonPackage rec { version = "3.5"; format = "setuptools"; - # Supports Python 2.7 and 3.4+ - disabled = isPy3k && pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-PHfgFBcN//vYFub/wgXphC77EL6fWOwW0+hnW0klzds="; diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix index 1b573628edda1..1bfd129cf21e9 100644 --- a/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -1,12 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, sqlcipher }: +{ lib, buildPythonPackage, fetchPypi, sqlcipher }: buildPythonPackage rec { pname = "pysqlcipher3"; version = "1.2.0"; format = "setuptools"; - disabled = pythonOlder "3.3"; - src = fetchPypi { inherit pname version; hash = "sha256-PIAzgSZVlH6/KagJrFEGsrxpvgJ06szva1j0WAyNBsU="; diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 44251a333ed9c..57db690b04cbb 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , lib -, python , fetchPypi , systemd , lxml @@ -19,8 +18,6 @@ buildPythonPackage rec { hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ="; }; - disabled = python.pythonOlder "3.4"; - buildInputs = [ systemd ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 13ed448938d96..0130c690ef4c3 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -22,7 +22,7 @@ }: let pname = "python-glanceclient"; - version = "4.5.0"; + version = "4.6.0"; disabledTests = [ "test_http_chunked_response" @@ -42,7 +42,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-ZGTE1be+S/4Tbhw6Px+9qMgkNTZgoDn6lnAJhNvVYuA="; + hash = "sha256-gJm4TzxtIjvkpOlbN82MPbY0JmDdiwlEMGGxZvTR+Po="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 2cb13c747742e..4a659c1e26a5b 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub , pytestCheckHook, mock, pytest-cov, coverage -, future, futures ? null, ujson}: +, future, ujson}: buildPythonPackage rec { pname = "python-jsonrpc-server"; @@ -22,8 +22,7 @@ buildPythonPackage rec { pytestCheckHook mock pytest-cov coverage ]; - propagatedBuildInputs = [ future ujson ] - ++ lib.optional (pythonOlder "3.2") futures; + propagatedBuildInputs = [ future ujson ]; meta = with lib; { homepage = "https://github.com/palantir/python-jsonrpc-server"; diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index b2fbfef19f8cf..61fbc746f7ccd 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.8.0"; + version = "4.9.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-TwvDtbYGkDZFIsr0GgwD2R0Il7pV2GCuDw3OZXxDXso="; + hash = "sha256-Q7ADjuGQh5C88WqT5II+NMYLYFwTip/bzZinca/xqFY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 7d746131636e1..1417b78a9235c 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-qyaERNaisfDWXW1IeyFMOV6nLqT+0O9QJ4U02LOyiuE="; + hash = "sha256-W/42NUs3fQKCxM6hlJTmNQ7E8FevxO3XJCOYyZHQsqs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qreactor/default.nix b/pkgs/development/python-modules/qreactor/default.nix index e4648919d9f7c..77d2c30fa32b6 100644 --- a/pkgs/development/python-modules/qreactor/default.nix +++ b/pkgs/development/python-modules/qreactor/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub , twisted , qtpy @@ -18,8 +17,6 @@ buildPythonPackage rec { sha256 = "1nb5iwg0nfz86shw28a2kj5pyhd4jvvxhf73fhnfbl8scgnvjv9h"; }; - disabled = pythonOlder "3.0"; - propagatedBuildInputs = [ twisted qtpy ]; diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index eca756a0f0338..d390acea281d0 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "roadtx"; - version = "1.8.1"; + version = "1.8.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hhxmwD1+mZtU/VmB8yXeQESh0AGtjhdpDXRG3+mYfEk="; + hash = "sha256-BJYBQBxgYbozY0rPgxpiduUxb6wEFBJxXY8TRVlLz5M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index 87dc4e91e6e90..7e9e7971e1372 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchPypi , mock -, pythonOlder , repeated-test , setuptools-scm , sphinx @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "4.0.1"; format = "pyproject"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw="; diff --git a/pkgs/development/python-modules/simple-term-menu/default.nix b/pkgs/development/python-modules/simple-term-menu/default.nix index 7a348b1f602da..f6b808cf31c86 100644 --- a/pkgs/development/python-modules/simple-term-menu/default.nix +++ b/pkgs/development/python-modules/simple-term-menu/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi , setuptools }: @@ -10,8 +9,6 @@ buildPythonPackage rec { version = "1.6.4"; pyproject = true; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-vpxdvY3xKkBLFM2Oldb8AtWMYOJVX2Xd3kF3fEh/s7k="; diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index 94291d7a9cc41..8b2e41c782c42 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -1,33 +1,35 @@ -{ aiohttp -, bottle -, buildPythonPackage -, chalice -, cherrypy -, django -, docker -, falcon -, fastapi -, fetchFromGitHub -, flask -, flask-sockets -, gunicorn -, lib -, moto -, numpy -, pyramid -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, sanic -, setuptools -, sanic-testing -, slack-sdk -, starlette -, tornado -, uvicorn -, websocket-client -, websockets -, werkzeug +{ + lib, + aiohttp, + bottle, + buildPythonPackage, + chalice, + cherrypy, + django, + docker, + falcon, + fastapi, + fetchFromGitHub, + fetchpatch, + flask, + flask-sockets, + gunicorn, + moto, + numpy, + pyramid, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + sanic, + setuptools, + sanic-testing, + slack-sdk, + starlette, + tornado, + uvicorn, + websocket-client, + websockets, + werkzeug, }: buildPythonPackage rec { @@ -44,19 +46,23 @@ buildPythonPackage rec { hash = "sha256-UwVStemFVA4hgqnSpCKpQGwLYG+p5z7MwFXXnIhrvNk="; }; - # The packaged pytest-runner version is too new as of 2023-07-27. It's not really needed anyway. Unfortunately, - # pythonRelaxDepsHook doesn't work on setup_requires packages. postPatch = '' - substituteInPlace setup.py --replace "pytest-runner==5.2" "" + substituteInPlace setup.py \ + --replace-fail "pytest-runner==5.2" "" ''; - nativeBuildInputs = [ - setuptools + patches = [ + # moto >=5 support, https://github.com/slackapi/bolt-python/pull/1046 + (fetchpatch { + name = "moto-support.patch"; + url = "https://github.com/slackapi/bolt-python/commit/69c2015ef49773de111f184dca9668aefac9e7c0.patch"; + hash = "sha256-KW7KPeOqanV4n1UOv4DCadplJsqsPY+ju4ry0IvUqpA="; + }) ]; - propagatedBuildInputs = [ - slack-sdk - ]; + build-system = [ setuptools ]; + + dependencies = [ slack-sdk ]; passthru.optional-dependencies = { async = [ @@ -91,7 +97,6 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - # Work around "Read-only file system: '/homeless-shelter'" errors preCheck = '' export HOME="$(mktemp -d)" ''; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 2782b5eea5db7..4ef216531c622 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -1,27 +1,28 @@ -{ stdenv -, lib -, aiodns -, aiohttp -, boto3 -, buildPythonPackage -, codecov -, fetchFromGitHub -, flake8 -, flask-sockets -, moto -, pythonOlder -, psutil -, pytest-asyncio -, pytestCheckHook -, setuptools -, sqlalchemy -, websocket-client -, websockets +{ + lib, + stdenv, + aiodns, + aiohttp, + boto3, + buildPythonPackage, + codecov, + fetchFromGitHub, + flake8, + flask-sockets, + moto, + pythonOlder, + psutil, + pytest-asyncio, + pytestCheckHook, + setuptools, + sqlalchemy, + websocket-client, + websockets, }: buildPythonPackage rec { pname = "slack-sdk"; - version = "3.27.1"; + version = "3.27.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +31,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-fBHu4e6pSt8yzXbLWr5cwjRFDfvdH2jzpSNzdMBg4N0="; + hash = "sha256-1I08OUseiwCN9vUd56f9IFzCSB9kGjTLojyWm2dIimE="; }; postPatch = '' @@ -38,11 +39,9 @@ buildPythonPackage rec { --replace-fail ', "pytest-runner"' "" ''; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiodns aiohttp boto3 @@ -78,15 +77,13 @@ buildPythonPackage rec { "test_issue_690_oauth_access" ]; - pythonImportsCheck = [ - "slack_sdk" - ]; + pythonImportsCheck = [ "slack_sdk" ]; meta = with lib; { description = "Slack Developer Kit for Python"; homepage = "https://slack.dev/python-slack-sdk/"; changelog = "https://github.com/slackapi/python-slack-sdk/releases/tag/v${version}"; - license = with licenses; [ mit ]; + 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 10df697818267..a0192ee1188e0 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -1,36 +1,37 @@ -{ lib -, stdenv -, setuptools -, async-timeout -, attrs -, buildPythonPackage -, cryptography -, fetchFromGitHub -, pytest-aiohttp -, pytestCheckHook -, pythonAtLeast -, pythonOlder +{ + lib, + stdenv, + aiohttp, + async-timeout, + attrs, + buildPythonPackage, + cryptography, + fetchFromGitHub, + pytest-aiohttp, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "snitun"; - version = "0.36.2"; + version = "0.39.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "NabuCasa"; repo = "snitun"; rev = "refs/tags/${version}"; - hash = "sha256-ViNsmTq1iLxNujA71b9JZB5AZ79ZbiqdTyDeBGd4gUA="; + hash = "sha256-jewDQqvLUh/066BSEADXkCvjLFRnodKtUPKfvi0KUpI="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + aiohttp async-timeout attrs cryptography @@ -41,41 +42,44 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # AssertionError: Expected 'fileno' to not have been called. Called 1 times. - "test_client_stop_no_wait" - ] ++ lib.optionals stdenv.isDarwin [ - "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 - # port binding conflicts - "test_snitun_single_runner_timeout" - "test_snitun_single_runner_throttling" - # ConnectionResetError: [Errno 54] Connection reset by peer - "test_peer_listener_timeout" - ] ++ lib.optionals (pythonAtLeast "3.12") [ - # blocking - "test_flow_client_peer" - "test_close_client_peer" - "test_init_connector" - "test_flow_connector" - "test_close_connector_remote" - "test_init_connector_whitelist" - "test_init_multiplexer_server" - "test_init_multiplexer_client" - "test_init_multiplexer_server_throttling" - "test_init_multiplexer_client_throttling" - "test_multiplexer_ping" - "test_multiplexer_ping_error" - "test_multiplexer_init_channel_full" - "test_multiplexer_close_channel_full" - "test_init_dual_peer_with_multiplexer" - ]; + disabledTests = + [ + # AssertionError: Expected 'fileno' to not have been called. Called 1 times. + "test_client_stop_no_wait" + ] + ++ lib.optionals stdenv.isDarwin [ + "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 + # port binding conflicts + "test_snitun_single_runner_timeout" + "test_snitun_single_runner_throttling" + # ConnectionResetError: [Errno 54] Connection reset by peer + "test_peer_listener_timeout" + ] + ++ lib.optionals (pythonAtLeast "3.12") [ + # blocking + "test_flow_client_peer" + "test_close_client_peer" + "test_init_connector" + "test_flow_connector" + "test_close_connector_remote" + "test_init_connector_whitelist" + "test_init_multiplexer_server" + "test_init_multiplexer_client" + "test_init_multiplexer_server_throttling" + "test_init_multiplexer_client_throttling" + "test_multiplexer_ping" + "test_multiplexer_ping_error" + "test_multiplexer_init_channel_full" + "test_multiplexer_close_channel_full" + "test_init_dual_peer_with_multiplexer" + ]; pythonImportsCheck = [ "snitun" ]; meta = with lib; { + description = "SNI proxy with TCP multiplexer"; changelog = "https://github.com/NabuCasa/snitun/releases/tag/${version}"; homepage = "https://github.com/nabucasa/snitun"; - description = "SNI proxy with TCP multiplexer"; license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix index 8fb0d72761418..9bd76b15d2bd2 100644 --- a/pkgs/development/python-modules/srt/default.nix +++ b/pkgs/development/python-modules/srt/default.nix @@ -3,7 +3,6 @@ , fetchPypi , hypothesis , pytestCheckHook -, pythonOlder }: buildPythonPackage rec { @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "3.5.3"; format = "setuptools"; - disabled = pythonOlder "2.7"; - src = fetchPypi { inherit pname version; sha256 = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA="; diff --git a/pkgs/development/python-modules/stashy/default.nix b/pkgs/development/python-modules/stashy/default.nix index fbac0df71f1de..24a1573606367 100644 --- a/pkgs/development/python-modules/stashy/default.nix +++ b/pkgs/development/python-modules/stashy/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , decorator , fetchPypi -, pythonOlder , requests }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "stashy"; version = "0.7"; format = "setuptools"; - disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stickytape/default.nix b/pkgs/development/python-modules/stickytape/default.nix index 99e63ebd3dfb2..71d5327ef5cfc 100644 --- a/pkgs/development/python-modules/stickytape/default.nix +++ b/pkgs/development/python-modules/stickytape/default.nix @@ -1,10 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose -, pytestCheckHook -, pythonOlder -, spur }: buildPythonPackage rec { @@ -12,8 +8,6 @@ buildPythonPackage rec { version = "0.2.1"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchFromGitHub { owner = "mwilliamson"; repo = pname; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index f4c3b51fa20e9..5b0513a0d8316 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1148"; + version = "3.0.1149"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-dGLc/oPwQlzNKuw/xszgld0KQf/l7roG3H7jIlJspp0="; + hash = "sha256-3c5MxP2u539++7R6ZMfRMqcxu9THTAWGjaPSdGbqTC8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 31317cd7b7b43..95b4e84390b10 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.5.9"; + version = "0.5.11"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-aDejd9UHGXkBa5xyCJaLOkT1A2cWmnx1rKJkXjjw0fc="; + hash = "sha256-CwgIWTcLHlV+0ZoSUduQIX/lzmz65dFb+rWkQ/qfKY4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/theano/default.nix b/pkgs/development/python-modules/theano/default.nix index 78a2a0836e765..ef8b809533906 100644 --- a/pkgs/development/python-modules/theano/default.nix +++ b/pkgs/development/python-modules/theano/default.nix @@ -53,7 +53,7 @@ in buildPythonPackage rec { version = "1.0.5"; format = "setuptools"; - disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); + disabled = isPyPy || pythonOlder "2.6"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 2b0058357d88d..cb4d128eb2467 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder # build-system , flit-core @@ -26,8 +25,6 @@ buildPythonPackage rec { version = "1.8.0"; format = "pyproject"; - disabled = pythonOlder "2.7"; - src = fetchFromGitHub { owner = "wagtail"; repo = "Willow"; diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index bd4e2cbb0f2d6..3b06401c39246 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -2,14 +2,12 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pythonOlder }: buildPythonPackage rec { pname = "xmltodict"; version = "0.13.0"; format = "setuptools"; - disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; |