From 5680f319fd8e0225bcad0550ee0fb25a0590e1dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 20:53:29 +0100 Subject: [PATCH 001/108] python311Packages.pytest7CheckHook: init and migrate existing overrides. --- pkgs/applications/version-management/commitizen/default.nix | 2 +- pkgs/development/python-modules/accelerate/default.nix | 5 ++--- pkgs/development/python-modules/aiohttp/default.nix | 5 ++--- pkgs/development/python-modules/cloudpathlib/default.nix | 5 ++--- pkgs/development/python-modules/falcon/default.nix | 5 ++--- pkgs/development/python-modules/flow-record/default.nix | 5 ++--- pkgs/development/python-modules/fonttools/default.nix | 5 ++--- pkgs/development/python-modules/homematicip/default.nix | 5 ++--- pkgs/development/python-modules/ipython/default.nix | 5 ++--- .../python-modules/lightning-utilities/default.nix | 5 ++--- pkgs/development/python-modules/openapi-core/default.nix | 5 ++--- pkgs/development/python-modules/pook/default.nix | 5 ++--- pkgs/development/python-modules/pydantic/1.nix | 5 ++--- pkgs/development/python-modules/pysiaalarm/default.nix | 5 ++--- pkgs/development/python-modules/pytest-snapshot/default.nix | 5 ++--- pkgs/development/python-modules/pytest-unordered/default.nix | 5 ++--- pkgs/development/python-modules/rdflib/default.nix | 5 ++--- pkgs/development/python-modules/scipy/default.nix | 5 ++--- pkgs/tools/misc/thefuck/default.nix | 4 ++-- pkgs/tools/virtualization/cloud-init/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 21 files changed, 40 insertions(+), 55 deletions(-) diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 537c1bfcd607..0ae03fe4473b 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { pytest-freezer pytest-mock pytest-regressions - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook ]; doCheck = true; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 1c31b8292809..eecbd37a9063 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -3,8 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , setuptools , numpy , packaging @@ -47,7 +46,7 @@ buildPythonPackage rec { nativeCheckInputs = [ evaluate parameterized - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook transformers ]; preCheck = '' diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 823a0f9e14b7..e46b5989dd76 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -21,8 +21,7 @@ , freezegun , gunicorn , pytest-mock -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , python-on-whales , re-assert , trustme @@ -83,7 +82,7 @@ buildPythonPackage rec { freezegun gunicorn pytest-mock - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook python-on-whales re-assert ] ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index 3f14fae210d2..063ba6ce1056 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -11,8 +11,7 @@ , boto3 , psutil , pydantic -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , pytest-cases , pytest-cov , pytest-xdist @@ -66,7 +65,7 @@ buildPythonPackage rec { google-cloud-storage psutil pydantic - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook pytest-cases pytest-cov pytest-xdist diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 5dc0dd2e0b56..2cb7c3cc7895 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -17,8 +17,7 @@ , mujson , orjson , pytest-asyncio -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , pyyaml , rapidjson , requests @@ -61,7 +60,7 @@ buildPythonPackage rec { nativeCheckInputs = [ # https://github.com/falconry/falcon/blob/master/requirements/tests - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook pyyaml requests rapidjson diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index b3a57c134a12..3e836772aa85 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -5,8 +5,7 @@ , fetchFromGitHub , lz4 , msgpack -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , pythonOlder , setuptools , setuptools-scm @@ -52,7 +51,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 6d48088a2660..be573a627e99 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -21,8 +21,7 @@ , xattr , skia-pathops , uharfbuzz -, pytestCheckHook -, pytest_7 +, pytest7CheckHook }: buildPythonPackage rec { @@ -65,7 +64,7 @@ buildPythonPackage rec { nativeCheckInputs = [ # test suite fails with pytest>=8.0.1 # https://github.com/fonttools/fonttools/issues/3458 - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook ] ++ lib.concatLists (lib.attrVals ([ "woff" # "interpolatable" is not included because it only contains 2 tests at the time of writing but adds 270 extra dependencies diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 4de61606e0c6..34016262e93b 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -5,8 +5,7 @@ , async-timeout , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , pythonAtLeast , pythonOlder , pytest-aiohttp @@ -50,7 +49,7 @@ buildPythonPackage rec { aiohttp-wsgi pytest-aiohttp pytest-asyncio - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 7dacc7e2aa3c..06829aefe412 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,8 +22,7 @@ # Test dependencies , pickleshare , pytest-asyncio -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , testpath }: @@ -72,7 +71,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pickleshare pytest-asyncio - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook testpath ]; diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index f1d94bad1af2..3af06818b8ee 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -11,8 +11,7 @@ # tests , pytest-timeout -, pytestCheckHook -, pytest_7 +, pytest7CheckHook }: buildPythonPackage rec { @@ -42,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-timeout - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook ]; disabledTests = [ diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 59611e1af362..5e1c1d8ae960 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -19,8 +19,7 @@ , parse , poetry-core , pytest-aiohttp -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , pythonOlder , responses , requests @@ -94,7 +93,7 @@ buildPythonPackage rec { nativeCheckInputs = [ httpx pytest-aiohttp - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook responses webob ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index b40f93b04af5..6abc4b43f34e 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -7,8 +7,7 @@ , jsonschema , pytest-asyncio , pytest-httpbin -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , pythonOlder , requests , xmltodict @@ -43,7 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytest-httpbin - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index 6a1f5c52116c..ffe38546148e 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -4,8 +4,7 @@ , email-validator , fetchFromGitHub , pytest-mock -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , python-dotenv , pythonAtLeast , pythonOlder @@ -52,7 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mock - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix index c5a7cdae56a5..db5973207f7e 100644 --- a/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -7,8 +7,7 @@ , setuptools-scm , pytest-asyncio , pytest-cases -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , pytz }: @@ -44,7 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytest-cases - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index 60b81487a987..c04c9b74e3b3 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -4,8 +4,7 @@ , packaging , pytest , setuptools-scm -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , pythonOlder }: @@ -37,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ # https://github.com/joseph-roitman/pytest-snapshot/issues/71 - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pytest-unordered/default.nix b/pkgs/development/python-modules/pytest-unordered/default.nix index b14a1e12ada5..d0446e764645 100644 --- a/pkgs/development/python-modules/pytest-unordered/default.nix +++ b/pkgs/development/python-modules/pytest-unordered/default.nix @@ -2,8 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest -, pytest_7 -, pytestCheckHook +, pytest7CheckHook }: buildPythonPackage rec { @@ -24,7 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ # https://github.com/utapyngo/pytest-unordered/issues/15 - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index cef9ea902bb6..d0f62efa6a78 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -23,8 +23,7 @@ # tests , pip , pytest-cov -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , setuptools }: @@ -69,7 +68,7 @@ buildPythonPackage rec { pip pytest-cov # Failed: DID NOT WARN. No warnings of type (,) were emitted. - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook setuptools ] ++ passthru.optional-dependencies.networkx diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 2870e5ec3bbd..2819229eaec2 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -15,8 +15,7 @@ , wheel , setuptools , hypothesis -, pytestCheckHook -, pytest_7 +, pytest7CheckHook , pytest-xdist , numpy , pybind11 @@ -117,7 +116,7 @@ in buildPythonPackage { nativeCheckInputs = [ hypothesis # Failed: DID NOT WARN. No warnings of type (, , ) were emitted. - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook pytest-xdist ]; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 150913c31d13..48d4f395b047 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six -, go, mock, pytestCheckHook, pytest-mock, pytest_7 +, go, mock, pytest7CheckHook, pytest-mock }: buildPythonApplication rec { @@ -16,7 +16,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ colorama decorator psutil pyte six ]; - nativeCheckInputs = [ go mock (pytestCheckHook.override { pytest = pytest_7; }) pytest-mock ]; + nativeCheckInputs = [ go mock pytest7CheckHook pytest-mock ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_settings_defaults" diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index e5385bf7fbca..3b8e619e864d 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication rec { ]; nativeCheckInputs = with python3.pkgs; [ - (pytestCheckHook.override { pytest = pytest_7; }) + pytest7CheckHook httpretty dmidecode # needed for tests; at runtime we rather want the setuid wrapper diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc44a98191ce..4bca4de4f593 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11775,6 +11775,8 @@ self: super: with self; { pytest_7 = callPackage ../development/python-modules/pytest/7.nix { }; + pytest7CheckHook = pytestCheckHook.override { pytest = pytest_7; }; + pytest-aio = callPackage ../development/python-modules/pytest-aio { }; pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; From f7c4bb3f000f003fe75131b33a2ea529fbed255f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 02:44:49 +0100 Subject: [PATCH 002/108] python312Packages.setuptools: 69.1.1 -> 69.2.0 https://setuptools.pypa.io/en/stable/history.html#v69-2-0 --- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 0185f2ca24d2..46a2597ed141 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "69.1.1"; + version = "69.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; rev = "refs/tags/v${version}"; - hash = "sha256-TWW8kW7ZjRsl5Y0CEVHqhIVJsiRixSSYe/ctSO1c/78="; + hash = "sha256-kll4zYFQn4g/8Fq0Y5vLvDXtotxYMbiNAgGa0sClFQk="; }; patches = [ From e06f4af9fb003b6975d04f90b9702235556b4da7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 02:44:57 +0100 Subject: [PATCH 003/108] python312Packages.hatchling: 1.21.1 -> 1.22.3 https://github.com/pypa/hatch/releases/tag/hatchling-v1.22.0 https://github.com/pypa/hatch/releases/tag/hatchling-v1.22.1 https://github.com/pypa/hatch/releases/tag/hatchling-v1.22.2 https://github.com/pypa/hatch/releases/tag/hatchling-v1.22.3 https://github.com/pypa/hatch/releases/tag/hatchling-v1.22.4 --- pkgs/development/python-modules/hatchling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 49af4f0fb0ff..4d5d345d625d 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "hatchling"; - version = "1.21.1"; + version = "1.22.4"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-u6RARToiTn1EeEV/oujYw2M3Zbr6Apdaa1O5v5F5gLw="; + hash = "sha256-ii3OyW1/uEg4LvWEjlrEP9rmQfNaCKP6tRFr1JXzQW4="; }; # listed in backend/pyproject.toml From 663a11749aaade4fd7c709e8078b01040786a652 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 02:45:06 +0100 Subject: [PATCH 004/108] python312Packages.pytest: 8.0.2 -> 8.1.1 https://github.com/pytest-dev/pytest/releases/tag/8.1.0 (yanked) https://github.com/pytest-dev/pytest/releases/tag/8.1.1 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 86dc3f8f9aef..9b99112a5f0e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "8.0.2"; + version = "8.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1AUdYjouC35RlgupYxk7Cc5trrl1mkUYRKIeTd7fwb0="; + hash = "sha256-rJeBQadZSJSIF9NgKXt6rg/LnW/2vJ7G1RS4XVplwEQ="; }; outputs = [ From 3b44190ef486f81ea051867bf0cd662c7c0e4d16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 02:53:43 +0100 Subject: [PATCH 005/108] python312Packages.pytest-asyncio: 0.23.5.post1 -> 0.23.6 https://github.com/pytest-dev/pytest-asyncio/blob/v0.23.6/docs/source/reference/changelog.rst --- pkgs/development/python-modules/pytest-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 8b74f5314930..b7762e12175c 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.23.5.post1"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "0.23.6"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = "pytest-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-k+EmbUptZB2ZLiygwY9WwFA4PNJA+9fEAZYu0xaPZSQ="; + hash = "sha256-+kyKcVzW05kqtLeC81rk3fJpOtyW3xSYshgl5gqIddE="; }; outputs = [ From ea752a4b687aafe2cfc01ab657ffad9533b35dec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 03:07:35 +0100 Subject: [PATCH 006/108] python312Packages.hypothesis: 6.98.17 -> 6.99.12 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-99-12 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 2c99b43f9487..5cf3408c89b7 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.98.17"; + version = "6.99.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-2knFmaa334vFo8bbLCmrWAXRDXFcC+GPRqj7RG3FqEQ="; + hash = "sha256-0nzjRDv4L3bxxnC0lBY5S7FP9CFhyzHzNchWXoX91Zg="; }; # I tried to package sphinx-selective-exclude, but it throws From b974abcc5d85bf1a1a121ff1ef41936ff1ae900c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 03:15:30 +0100 Subject: [PATCH 007/108] python312Packages.flaky: 3.7.0 -> 3.8.1 https://github.com/box/flaky/releases/tag/v3.8.0 https://github.com/box/flaky/releases/tag/v3.8.1 --- pkgs/development/python-modules/flaky/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index 43b3288f94b9..884593dbabfa 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -1,20 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , mock , pytest }: buildPythonPackage rec { pname = "flaky"; - version = "3.7.0"; - format = "setuptools"; + version = "3.8.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OtEAeAchoZEfV6FlgJt+omWnhjMFrLZnCCIIIMr4qg0="; + hash = "sha256-RyBKgeyQXz1az71h2uq8raj51AMWFtm8sGGEYXKWmfU="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ mock pytest @@ -29,6 +34,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/box/flaky/blob/v${version}/HISTORY.rst"; homepage = "https://github.com/box/flaky"; description = "Plugin for nose or py.test that automatically reruns flaky tests"; license = licenses.asl20; From 528354e66c26cf947b04cc94db7185f5d127ca31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 03:25:37 +0100 Subject: [PATCH 008/108] python312Packages.cython: 0.29.36 -> 3.0.9 Folds the cython_3 attribute into the primary cython attribute and migrates all packages from the versioned attribute. The old version will be provided through the cython_0 attribute in an effort to phase it out. --- .../science/biology/macs2/default.nix | 2 +- .../math/sage/python-modules/sage-setup.nix | 4 +- .../science/math/sage/sagelib.nix | 4 +- .../python-modules/aioesphomeapi/default.nix | 4 +- .../python-modules/astropy/default.nix | 4 +- .../python-modules/blis/default.nix | 4 +- .../python-modules/blosc2/default.nix | 4 +- .../bluetooth-data-tools/default.nix | 4 +- .../cached-ipaddress/default.nix | 4 +- .../cassandra-driver/default.nix | 4 +- .../chacha20poly1305-reuseable/default.nix | 4 +- .../clickhouse-cityhash/default.nix | 4 +- .../clickhouse-connect/default.nix | 4 +- .../clickhouse-driver/default.nix | 4 +- .../python-modules/cpyparsing/default.nix | 4 +- .../python-modules/cypari2/default.nix | 4 +- .../python-modules/cysignals/default.nix | 4 +- pkgs/development/python-modules/cython/0.nix | 91 +++++++++++++++++++ .../python-modules/cython/default.nix | 28 +----- .../python-modules/daqp/default.nix | 5 +- .../python-modules/dbus-fast/default.nix | 4 +- .../python-modules/dtlssocket/default.nix | 4 +- .../python-modules/editdistance/default.nix | 4 +- .../python-modules/editdistpy/default.nix | 4 +- .../python-modules/falcon/default.nix | 4 +- .../python-modules/fiona/default.nix | 4 +- .../python-modules/fpylll/default.nix | 4 +- .../python-modules/frozenlist/default.nix | 4 +- .../python-modules/fugashi/default.nix | 4 +- .../python-modules/gbinder-python/default.nix | 4 +- .../python-modules/gevent/default.nix | 4 +- .../python-modules/h5py/default.nix | 4 +- .../python-modules/hidapi/default.nix | 4 +- .../python-modules/in-n-out/default.nix | 4 +- .../python-modules/kivy/default.nix | 4 +- .../python-modules/levenshtein/default.nix | 4 +- .../python-modules/libgpuarray/default.nix | 4 +- .../python-modules/line-profiler/default.nix | 4 +- .../python-modules/llfuse/default.nix | 4 +- .../python-modules/lupa/default.nix | 4 +- .../python-modules/lxml/default.nix | 4 +- .../python-modules/mdtraj/default.nix | 4 +- .../memory-allocator/default.nix | 4 +- .../python-modules/ndindex/default.nix | 4 +- .../python-modules/nipy/default.nix | 4 +- .../python-modules/numpy/default.nix | 4 +- .../python-modules/openstep-plist/default.nix | 5 +- .../python-modules/oracledb/default.nix | 4 +- .../python-modules/pandas/default.nix | 4 +- .../python-modules/pplpy/default.nix | 4 +- .../python-modules/primecountpy/default.nix | 4 +- .../python-modules/psycopg/default.nix | 4 +- .../python-modules/py-libzfs/default.nix | 4 +- .../python-modules/pyarrow/default.nix | 4 +- .../development/python-modules/pydantic/1.nix | 4 +- .../python-modules/pyfftw/default.nix | 4 +- .../python-modules/pyfuse3/default.nix | 4 +- .../python-modules/pygame-sdl2/default.nix | 4 +- .../python-modules/pygame/default.nix | 4 +- .../python-modules/pygeos/default.nix | 4 +- .../python-modules/pykdtree/default.nix | 4 +- .../pylibjpeg-libjpeg/default.nix | 4 +- .../python-modules/pyliblo/default.nix | 6 +- .../pyopengl-accelerate/default.nix | 4 +- .../python-modules/pyreadstat/default.nix | 4 +- .../python-modules/pyrevolve/default.nix | 4 +- .../python-modules/pysam/default.nix | 4 +- .../python-modules/python-box/default.nix | 4 +- .../python-modules/python-openems/default.nix | 5 +- .../python-modules/python-rtmidi/default.nix | 4 +- .../python-modules/pyyaml/default.nix | 4 +- .../python-modules/pyzmq/default.nix | 4 +- .../python-modules/qutip/default.nix | 4 +- .../python-modules/rapidfuzz/default.nix | 4 +- .../python-modules/rasterio/default.nix | 4 +- .../python-modules/reproject/default.nix | 4 +- .../python-modules/rtmidi-python/default.nix | 4 +- .../python-modules/scikit-learn/default.nix | 4 +- .../python-modules/seabreeze/default.nix | 4 +- .../python-modules/sfepy/default.nix | 7 +- .../python-modules/shapely/1.8.nix | 4 +- .../python-modules/shapely/default.nix | 4 +- .../python-modules/soxr/default.nix | 4 +- .../python-modules/sphinx/default.nix | 5 +- .../python-modules/srsly/default.nix | 4 +- .../python-modules/textnets/default.nix | 4 +- .../python-modules/thinc/default.nix | 4 +- .../python-modules/uamqp/default.nix | 4 +- .../python-modules/uharfbuzz/default.nix | 4 +- .../python-modules/uvloop/default.nix | 4 +- .../python-modules/vispy/default.nix | 4 +- .../python-modules/wikipedia2vec/default.nix | 6 +- .../python-modules/yarl/default.nix | 4 +- .../python-modules/zeroconf/default.nix | 4 +- .../tools/steamos-devkit/default.nix | 2 +- pkgs/servers/home-assistant/default.nix | 2 +- pkgs/top-level/python-packages.nix | 9 +- 97 files changed, 285 insertions(+), 224 deletions(-) create mode 100644 pkgs/development/python-modules/cython/0.nix diff --git a/pkgs/applications/science/biology/macs2/default.nix b/pkgs/applications/science/biology/macs2/default.nix index 73f12af6a605..26ec138048f7 100644 --- a/pkgs/applications/science/biology/macs2/default.nix +++ b/pkgs/applications/science/biology/macs2/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonPackage rec { ]; nativeBuildInputs = with python3.pkgs; [ - cython + cython_0 numpy setuptools wheel diff --git a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix index a96f7ccd5d4c..e1c497678d50 100644 --- a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix +++ b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , sage-src -, cython_3 +, cython , jinja2 , pkgconfig # the python module, not the pkg-config alias }: @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sage-setup"; src = sage-src; - nativeBuildInputs = [ cython_3 ]; + nativeBuildInputs = [ cython ]; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ jinja2 ]; diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index b67b74e3a0f2..0a2bd8011b0b 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -48,7 +48,7 @@ , cvxopt , cypari2 , cysignals -, cython_3 +, cython , fpylll , gmpy2 , importlib-metadata @@ -153,7 +153,7 @@ buildPythonPackage rec { cvxopt cypari2 cysignals - cython_3 + cython fpylll gmpy2 importlib-metadata diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index c17f2df97fa2..c3a77eb76754 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -4,7 +4,7 @@ , pythonOlder # build-system -, cython_3 +, cython , setuptools # dependencies @@ -39,7 +39,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - cython_3 + cython ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index d770eb196a28..eb391ab1ae00 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -5,7 +5,7 @@ # build time , astropy-extension-helpers -, cython_3 +, cython , jinja2 , oldest-supported-numpy , setuptools-scm @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ astropy-extension-helpers - cython_3 + cython jinja2 oldest-supported-numpy setuptools-scm diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index eec563c79a9d..8b465bcebdc1 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools -, cython +, cython_0 , hypothesis , numpy , pytestCheckHook @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - cython + cython_0 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index d960139a7d6e..efaec4ead713 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -4,7 +4,7 @@ # build-system , cmake -, cython_3 +, cython , ninja , oldest-supported-numpy , pkg-config @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake - cython_3 + cython ninja oldest-supported-numpy pkg-config diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 95d6207de10a..fbaf458be3f3 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , cryptography -, cython_3 +, cython , poetry-core , pytestCheckHook , pythonOlder @@ -28,7 +28,7 @@ buildPythonPackage rec { env.REQUIRE_CYTHON = 1; nativeBuildInputs = [ - cython_3 + cython poetry-core setuptools ]; diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index c4d29b98bd76..5e4781ec7503 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, cython_3 +, cython , fetchFromGitHub , poetry-core , pytestCheckHook @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython_3 + cython poetry-core setuptools wheel diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index e985ed544d3c..8c05e5e0bbb6 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , cryptography -, cython +, cython_0 , eventlet , fetchFromGitHub , geomet @@ -43,7 +43,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython + cython_0 ]; buildInputs = [ diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index dbab53868f66..429467d65e30 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -4,7 +4,7 @@ , pythonOlder # build-system -, cython_3 +, cython , poetry-core , setuptools @@ -34,7 +34,7 @@ buildPythonPackage { }; nativeBuildInputs = [ - cython_3 + cython poetry-core setuptools ]; diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix index d8fad65bef0d..ecb3f3bf290e 100644 --- a/pkgs/development/python-modules/clickhouse-cityhash/default.nix +++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, cython_3 +, cython , fetchPypi , pythonOlder , setuptools @@ -19,7 +19,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython setuptools ]; diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index 277216a3f968..58831fb4bef8 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -4,7 +4,7 @@ , pythonOlder , pytestCheckHook # build_requires -, cython_3 +, cython # install_requires , certifi , importlib-metadata @@ -36,7 +36,7 @@ buildPythonPackage rec { hash = "sha256-YEtcM9+GO8mYv2pyaBYmXdmWLXVuteKtQIJR4H+Xsd4="; }; - nativeBuildInputs = [ cython_3 ]; + nativeBuildInputs = [ cython ]; setupPyBuildFlags = [ "--inplace" ]; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix index 716914b3caee..1ddaa5398d9d 100644 --- a/pkgs/development/python-modules/clickhouse-driver/default.nix +++ b/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , clickhouse-cityhash -, cython_3 +, cython , fetchFromGitHub , freezegun , lz4 @@ -29,7 +29,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython setuptools ]; diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix index c475652799ea..e063e8847d43 100644 --- a/pkgs/development/python-modules/cpyparsing/default.nix +++ b/pkgs/development/python-modules/cpyparsing/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cython_3 +, cython , pexpect , python , pythonOlder @@ -23,7 +23,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython setuptools ]; diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index f93e04629728..025692de1f74 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -5,7 +5,7 @@ , fetchPypi , pari , gmp -, cython_3 +, cython , cysignals }: @@ -45,7 +45,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cysignals - cython_3 + cython ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index 107b552a631c..62cc3dd30d8a 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -2,7 +2,7 @@ , autoreconfHook , fetchPypi , buildPythonPackage -, cython_3 +, cython , pariSupport ? true, pari # for interfacing with the PARI/GP signal handler }: @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - cython_3 + cython ] ++ lib.optionals pariSupport [ # When cysignals is built with pari, including cysignals into the # buildInputs of another python package will cause cython to link against diff --git a/pkgs/development/python-modules/cython/0.nix b/pkgs/development/python-modules/cython/0.nix new file mode 100644 index 000000000000..72ba4a68f038 --- /dev/null +++ b/pkgs/development/python-modules/cython/0.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, fetchpatch +, setuptools +, python +, pkg-config +, gdb +, numpy +, ncurses +}: + +let + excludedTests = [ "reimport_from_subinterpreter" ] + # cython's testsuite is not working very well with libc++ + # We are however optimistic about things outside of testsuite still working + ++ lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ] + # Some tests in the test suite isn't working on aarch64. Disable them for + # now until upstream finds a workaround. + # Upstream issue here: https://github.com/cython/cython/issues/2308 + ++ lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] + ++ lib.optionals stdenv.isi686 [ "future_division" "overflow_check_longlong" ] + ; + +in buildPythonPackage rec { + pname = "cython"; + version = "0.29.36"; + pyproject = true; + + src = fetchPypi { + pname = "Cython"; + inherit version; + hash = "sha256-QcDP0tdU44PJ7rle/8mqSrhH0Ml0cHfd18Dctow7wB8="; + }; + + nativeBuildInputs = [ + pkg-config + setuptools + ]; + + nativeCheckInputs = [ + gdb numpy ncurses + ]; + + LC_ALL = "en_US.UTF-8"; + + patches = [ + # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series. + # it does not affect Python code unless the code explicitly uses the feature. + # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267) + ./trashcan.patch + # The above commit introduces custom trashcan macros, as well as + # compiler changes to use them in Cython-emitted code. The latter + # change is still useful, but the former has been upstreamed as of + # Python 3.8, and the patch below makes Cython use the upstream + # trashcan macros whenever available. This is needed for Python + # 3.11 support, because the API used in Cython's implementation + # changed: https://github.com/cython/cython/pull/4475 + (fetchpatch { + name = "disable-trashcan.patch"; + url = "https://github.com/cython/cython/commit/e337825cdcf5e94d38ba06a0cb0188e99ce0cc92.patch"; + hash = "sha256-q0f63eetKrDpmP5Z4v8EuGxg26heSyp/62OYqhRoSso="; + }) + ]; + + checkPhase = '' + export HOME="$NIX_BUILD_TOP" + ${python.interpreter} runtests.py -j$NIX_BUILD_CORES \ + --no-code-style \ + ${lib.optionalString (builtins.length excludedTests != 0) + ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''} + ''; + + # https://github.com/cython/cython/issues/2785 + # Temporary solution + doCheck = false; + # doCheck = !stdenv.isDarwin; + + # force regeneration of generated code in source distributions + # https://github.com/cython/cython/issues/5089 + setupHook = ./setup-hook.sh; + + meta = { + changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst"; + description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; + homepage = "https://cython.org"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index 72ba4a68f038..4467dc3b459c 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch , setuptools , python , pkg-config @@ -25,16 +24,16 @@ let in buildPythonPackage rec { pname = "cython"; - version = "0.29.36"; + version = "3.0.9"; pyproject = true; src = fetchPypi { pname = "Cython"; inherit version; - hash = "sha256-QcDP0tdU44PJ7rle/8mqSrhH0Ml0cHfd18Dctow7wB8="; + hash = "sha256-otNU8FnR8FXTTPqmLFtovHisLOq2QHFI1H+1CM87pPM="; }; - nativeBuildInputs = [ + build-system = [ pkg-config setuptools ]; @@ -43,26 +42,7 @@ in buildPythonPackage rec { gdb numpy ncurses ]; - LC_ALL = "en_US.UTF-8"; - - patches = [ - # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series. - # it does not affect Python code unless the code explicitly uses the feature. - # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267) - ./trashcan.patch - # The above commit introduces custom trashcan macros, as well as - # compiler changes to use them in Cython-emitted code. The latter - # change is still useful, but the former has been upstreamed as of - # Python 3.8, and the patch below makes Cython use the upstream - # trashcan macros whenever available. This is needed for Python - # 3.11 support, because the API used in Cython's implementation - # changed: https://github.com/cython/cython/pull/4475 - (fetchpatch { - name = "disable-trashcan.patch"; - url = "https://github.com/cython/cython/commit/e337825cdcf5e94d38ba06a0cb0188e99ce0cc92.patch"; - hash = "sha256-q0f63eetKrDpmP5Z4v8EuGxg26heSyp/62OYqhRoSso="; - }) - ]; + env.LC_ALL = "en_US.UTF-8"; checkPhase = '' export HOME="$NIX_BUILD_TOP" diff --git a/pkgs/development/python-modules/daqp/default.nix b/pkgs/development/python-modules/daqp/default.nix index 2b134f9f723d..e5ae5e62be90 100644 --- a/pkgs/development/python-modules/daqp/default.nix +++ b/pkgs/development/python-modules/daqp/default.nix @@ -1,9 +1,8 @@ { lib -, stdenv , fetchFromGitHub , buildPythonPackage , unittestCheckHook -, cython +, cython_0 , setuptools , wheel , numpy @@ -32,7 +31,7 @@ buildPythonPackage rec { unittestFlagsArray = [ "-s" "test" "-p" "'*.py'" "-v" ]; nativeBuildInputs = [ - cython + cython_0 setuptools wheel ]; diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 014e7ad01f72..d4db4490415b 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -1,7 +1,7 @@ { lib , async-timeout , buildPythonPackage -, cython_3 +, cython , fetchFromGitHub , poetry-core , pytest-asyncio @@ -30,7 +30,7 @@ buildPythonPackage rec { env.REQUIRE_CYTHON = 1; nativeBuildInputs = [ - cython_3 + cython poetry-core setuptools wheel diff --git a/pkgs/development/python-modules/dtlssocket/default.nix b/pkgs/development/python-modules/dtlssocket/default.nix index 80831ea0eb50..bad1a6c73377 100644 --- a/pkgs/development/python-modules/dtlssocket/default.nix +++ b/pkgs/development/python-modules/dtlssocket/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , autoconf -, cython +, cython_0 , setuptools }: @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ autoconf - cython + cython_0 setuptools ]; diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix index d7c55b265a45..b4f62dd6e823 100644 --- a/pkgs/development/python-modules/editdistance/default.nix +++ b/pkgs/development/python-modules/editdistance/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, cython_3 +, cython , pdm-backend , setuptools , pythonOlder @@ -23,7 +23,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython pdm-backend setuptools ]; diff --git a/pkgs/development/python-modules/editdistpy/default.nix b/pkgs/development/python-modules/editdistpy/default.nix index a785e1b05b67..537f4851f6a9 100644 --- a/pkgs/development/python-modules/editdistpy/default.nix +++ b/pkgs/development/python-modules/editdistpy/default.nix @@ -7,7 +7,7 @@ , pythonOlder , setuptools -, cython_3 +, cython , symspellpy , numpy @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools - cython_3 + cython ]; # error: infinite recursion encountered diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 2cb7c3cc7895..51f9bfd79a35 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -6,7 +6,7 @@ , fetchFromGitHub # build -, cython_3 +, cython , setuptools # tests @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ] ++ lib.optionals (!isPyPy) [ - cython_3 + cython ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index e19875296ff0..35c9b57ce555 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cython_3 +, cython , gdal , oldest-supported-numpy , setuptools @@ -34,7 +34,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython gdal # for gdal-config oldest-supported-numpy setuptools diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 54d3d8f34f79..7e2b0b5ed069 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -5,7 +5,7 @@ # build-system , cysignals -, cython_3 +, cython , pkgconfig , setuptools @@ -39,7 +39,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython_3 + cython cysignals pkgconfig setuptools diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 7e2646045518..73860b6f79ff 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, cython_3 +, cython , expandvars , fetchFromGitHub , pep517 @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ expandvars - cython_3 + cython pep517 setuptools wheel diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index 021ac6dd1d11..64f5ef9afcdb 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -3,7 +3,7 @@ , pythonOlder , pytestCheckHook , buildPythonPackage -, cython +, cython_0 , mecab , setuptools-scm , ipadic @@ -24,7 +24,7 @@ buildPythonPackage rec { hash = "sha256-4i7Q+TtXTQNSJ1EIcS8KHrVPdCJAgZh86Y6lB8772XU="; }; - nativeBuildInputs = [ cython mecab setuptools-scm ]; + nativeBuildInputs = [ cython_0 mecab setuptools-scm ]; nativeCheckInputs = [ ipadic pytestCheckHook ] ++ passthru.optional-dependencies.unidic-lite; diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix index 6608cf305063..bb64e0c5e6a8 100644 --- a/pkgs/development/python-modules/gbinder-python/default.nix +++ b/pkgs/development/python-modules/gbinder-python/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildPythonPackage -, cython +, cython_0 , pkg-config , libgbinder }: @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython + cython_0 pkg-config ]; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index d6264794a505..ca3a7c1ff9a5 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -5,7 +5,7 @@ , python , libev , cffi -, cython_3 +, cython , greenlet , importlib-metadata , setuptools @@ -34,7 +34,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython setuptools wheel ] ++ lib.optionals (!isPyPy) [ diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index a11578f832ba..4afd562e033d 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -7,7 +7,7 @@ , wheel , numpy , hdf5 -, cython +, cython_0 , pkgconfig , mpi4py ? null , openssh @@ -50,7 +50,7 @@ in buildPythonPackage rec { preBuild = lib.optionalString mpiSupport "export CC=${lib.getDev mpi}/bin/mpicc"; nativeBuildInputs = [ - cython + cython_0 oldest-supported-numpy pkgconfig setuptools diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 9b4e76186f26..84f62c239c8b 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , xcbuild -, cython +, cython_0 , libusb1 , udev , darwin @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; - propagatedBuildInputs = [ cython ] + propagatedBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.isLinux [ libusb1 udev ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]); diff --git a/pkgs/development/python-modules/in-n-out/default.nix b/pkgs/development/python-modules/in-n-out/default.nix index 39c7a3f7de88..ffd68b29b90d 100644 --- a/pkgs/development/python-modules/in-n-out/default.nix +++ b/pkgs/development/python-modules/in-n-out/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, cython_3 +, cython , fetchPypi , future , pytestCheckHook @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython hatchling hatch-vcs ]; diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index d9b8e23fe416..63c918f8b9fd 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , buildPythonPackage, fetchFromGitHub, fetchpatch -, pkg-config, cython, docutils +, pkg-config, cython_0, docutils , kivy-garden , mesa, mtdev, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer , Accelerate, ApplicationServices, AVFoundation, libcxx @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config - cython + cython_0 docutils ]; diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 9b4d9caaf699..453ec1be9052 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , cmake -, cython_3 +, cython , fetchFromGitHub , pytestCheckHook , pythonOlder @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake - cython_3 + cython scikit-build ]; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 710ef3dd1398..d186233ccdc4 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -4,7 +4,7 @@ , buildPythonPackage , fetchFromGitHub , cmake -, cython +, cython_0 , numpy , six , nose @@ -67,13 +67,13 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake + cython_0 ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ - cython nose ]; diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index d50b3fa36f49..f8a3c5378bb0 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, cython_3 +, cython , isPyPy , ipython , scikit-build @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython cmake scikit-build ]; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 85c6d0fb50fd..5e1ce47bdc67 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cython_3 +, cython , fuse , pkg-config , pytestCheckHook @@ -27,7 +27,7 @@ buildPythonPackage rec { hash = "sha256-6/iW5eHmX6ODVPLFkOo3bN9yW8ixqy2MHwQ2r9FA0iI="; }; - nativeBuildInputs = [ cython_3 pkg-config setuptools ]; + nativeBuildInputs = [ cython pkg-config setuptools ]; buildInputs = [ fuse ]; diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index c79f0de9dd89..4b879a90966f 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, cython_3 +, cython , fetchPypi , pythonOlder , setuptools @@ -19,7 +19,7 @@ buildPythonPackage rec { }; build-system = [ - cython_3 + cython setuptools ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index e6d7234a59ce..d1d7036eda2e 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub # build-system -, cython_3 +, cython , setuptools # native dependencies @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ libxml2.dev libxslt.dev - cython_3 + cython setuptools ] ++ lib.optionals stdenv.isDarwin [ xcodebuild diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index ad20cdbf0671..971688348a1d 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -5,7 +5,7 @@ , fetchpatch , llvmPackages , zlib -, cython +, cython_0 , oldest-supported-numpy , setuptools , wheel @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython + cython_0 oldest-supported-numpy setuptools wheel diff --git a/pkgs/development/python-modules/memory-allocator/default.nix b/pkgs/development/python-modules/memory-allocator/default.nix index 90c75d0bb7fe..bb9b7dd47509 100644 --- a/pkgs/development/python-modules/memory-allocator/default.nix +++ b/pkgs/development/python-modules/memory-allocator/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, cython_3 +, cython }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-E4BcKuHAG3SJ+rXo6sk2FmK08sAkEuNlLuzkj/aVMWI="; }; - propagatedBuildInputs = [ cython_3 ]; + propagatedBuildInputs = [ cython ]; pythonImportsCheck = [ "memory_allocator" ]; diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index 5e98ea185700..5ee682994575 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub # build-system -, cython_3 +, cython # optional , numpy @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython ]; postPatch = '' diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index 1a1813ebb8af..a5807ae224d5 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -3,7 +3,7 @@ , fetchPypi # build-system -, cython_3 +, cython , meson-python , ninja , setuptools @@ -37,7 +37,7 @@ buildPythonPackage rec { ''; build-system = [ - cython_3 + cython meson-python setuptools ninja diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index b3c80a49798c..7aee840ab9d3 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -8,7 +8,7 @@ , writeTextFile # build-system -, cython_3 +, cython , gfortran , meson-python , mesonEmulatorHook @@ -91,7 +91,7 @@ in buildPythonPackage rec { ''; nativeBuildInputs = [ - cython_3 + cython gfortran meson-python pkg-config diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix index 2aa81629c623..fc37d86016f6 100644 --- a/pkgs/development/python-modules/openstep-plist/default.nix +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -3,8 +3,7 @@ , fetchPypi , setuptools-scm , pytestCheckHook -, cython -, pythonImportsCheckHook +, cython_0 }: buildPythonPackage rec { @@ -19,7 +18,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ setuptools-scm cython ]; + nativeBuildInputs = [ setuptools-scm cython_0 ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "openstep_plist" ]; diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index da45e616b42c..60055f7e6182 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , cryptography -, cython_3 +, cython , fetchPypi , pythonOlder , setuptools @@ -21,7 +21,7 @@ buildPythonPackage rec { }; build-system = [ - cython_3 + cython setuptools wheel ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 6cb46d6777c9..c42472682a7e 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -6,7 +6,7 @@ , pythonOlder # build-system -, cython_3 +, cython , meson-python , meson , oldest-supported-numpy @@ -84,7 +84,7 @@ let pandas = buildPythonPackage rec { ''; nativeBuildInputs = [ - cython_3 + cython meson-python meson numpy diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index c3a1f8192acf..ec9bddb5ec99 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -5,7 +5,7 @@ , mpfr , libmpc , ppl -, cython_3 +, cython , cysignals , gmpy2 , sphinx @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - cython_3 + cython cysignals gmpy2 ]; diff --git a/pkgs/development/python-modules/primecountpy/default.nix b/pkgs/development/python-modules/primecountpy/default.nix index 6653a65671b3..463a0cf50be6 100644 --- a/pkgs/development/python-modules/primecountpy/default.nix +++ b/pkgs/development/python-modules/primecountpy/default.nix @@ -2,7 +2,7 @@ , fetchPypi , buildPythonPackage , primecount -, cython_3 +, cython , cysignals }: @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ primecount ]; - propagatedBuildInputs = [ cython_3 cysignals ]; + propagatedBuildInputs = [ cython cysignals ]; # depends on pytest-cython for "pytest --doctest-cython" doCheck = false; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 84161d1a8781..65d9e3523620 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -15,7 +15,7 @@ , typing-extensions # psycopg-c -, cython_3 +, cython , tomli # docs @@ -72,7 +72,7 @@ let ''; nativeBuildInputs = [ - cython_3 + cython postgresql setuptools tomli diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix index d22e931cd937..661a79dd6485 100644 --- a/pkgs/development/python-modules/py-libzfs/default.nix +++ b/pkgs/development/python-modules/py-libzfs/default.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, cython +, cython_0 , zfs }: @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-vBLbjP1gQEQNsTLc2W6uRzCFHQXZp+jGiwE0Pe8VTuw="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ cython_0 ]; buildInputs = [ zfs ]; # Passing CFLAGS in configureFlags does not work, see https://github.com/truenas/py-libzfs/issues/107 diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 7c19bdefd4f6..da50d8f45735 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -8,7 +8,7 @@ , cffi , cloudpickle , cmake -, cython +, cython_0 , fsspec , hypothesis , numpy @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake - cython + cython_0 pkg-config setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index ffe38546148e..6078acc356ce 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, cython +, cython_0 , email-validator , fetchFromGitHub , pytest-mock @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - cython + cython_0 ]; buildInputs = lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index e47184f9b15c..746377c3c131 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }: +, fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython_0, dask }: buildPythonPackage rec { version = "0.13.1"; @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ fftw fftwFloat fftwLongDouble]; - propagatedBuildInputs = [ numpy scipy cython dask ]; + propagatedBuildInputs = [ numpy scipy cython_0 dask ]; # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix index d33938905753..851b37bbfb9c 100644 --- a/pkgs/development/python-modules/pyfuse3/default.nix +++ b/pkgs/development/python-modules/pyfuse3/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cython_3 +, cython , pkg-config , setuptools , fuse3 @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython_3 + cython pkg-config setuptools ]; diff --git a/pkgs/development/python-modules/pygame-sdl2/default.nix b/pkgs/development/python-modules/pygame-sdl2/default.nix index 93eea02a9041..0201c9cb4a8a 100644 --- a/pkgs/development/python-modules/pygame-sdl2/default.nix +++ b/pkgs/development/python-modules/pygame-sdl2/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchurl, isPy27, renpy -, cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: +, cython_0, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { pname = "pygame-sdl2"; @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - SDL2.dev cython + SDL2.dev cython_0 ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 6bc41339d927..a219804f34b8 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -6,7 +6,7 @@ , pythonOlder # build-system -, cython_3 +, cython , setuptools , pkg-config @@ -70,7 +70,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython_3 + cython pkg-config SDL2 setuptools diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index 657da35b4ad3..298d4bdff7fe 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -4,7 +4,7 @@ , python , geos_3_11 , pytestCheckHook -, cython +, cython_0 , numpy }: @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ geos_3_11 # for geos-config - cython + cython_0 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index b81bba27f1a4..b720f5b838b3 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -3,7 +3,7 @@ , fetchPypi # build-system -, cython_3 +, cython , numpy , setuptools @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython numpy setuptools ]; diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index 3872fa6b2417..9040f955efb4 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook -, cython_3 +, cython , poetry-core , setuptools , numpy @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython poetry-core setuptools ]; diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index db962d165f8b..0735fdcb7216 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -4,7 +4,7 @@ , isPyPy , pythonAtLeast , liblo -, cython +, cython_0 }: buildPythonPackage rec { @@ -25,7 +25,9 @@ buildPythonPackage rec { }) ]; - buildInputs = [ liblo cython ]; + build-system = [ cython_0 ]; + + buildInputs = [ liblo ]; meta = with lib; { homepage = "https://das.nasophon.de/pyliblo/"; diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index f85e825f2645..4dc8803fa037 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonAtLeast , fetchPypi -, cython_3 +, cython , numpy , setuptools , wheel @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython numpy setuptools wheel diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 1a575db7c2e2..b8eaa04b1a93 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, cython_3 +, cython , fetchFromGitHub , libiconv , pandas @@ -26,7 +26,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pyrevolve/default.nix b/pkgs/development/python-modules/pyrevolve/default.nix index d60b2164051c..48eed5323214 100644 --- a/pkgs/development/python-modules/pyrevolve/default.nix +++ b/pkgs/development/python-modules/pyrevolve/default.nix @@ -4,7 +4,7 @@ , contexttimer , setuptools , versioneer -, cython +, cython_0 , numpy , pytestCheckHook , pythonOlder @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython + cython_0 setuptools versioneer ]; diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index d2887eda5847..269b2249887a 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -4,7 +4,7 @@ , bzip2 , bcftools , curl -, cython_3 +, cython , htslib , libdeflate , xz @@ -30,7 +30,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython samtools setuptools ]; diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 3145debc745c..9a7350c34eb8 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, cython_3 +, cython , fetchFromGitHub , msgpack , poetry-core @@ -29,7 +29,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython setuptools ]; diff --git a/pkgs/development/python-modules/python-openems/default.nix b/pkgs/development/python-modules/python-openems/default.nix index 8da6b87f8ba5..c4b07b18cafa 100644 --- a/pkgs/development/python-modules/python-openems/default.nix +++ b/pkgs/development/python-modules/python-openems/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitHub -, cython +, cython_0 , openems , csxcad , boost @@ -20,7 +19,7 @@ buildPythonPackage rec { sourceRoot = "${src.name}/python"; nativeBuildInputs = [ - cython + cython_0 boost ]; diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 6265d9500810..9f073fd0a6ae 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -7,7 +7,7 @@ , CoreMIDI , CoreServices , Foundation -, cython_3 +, cython , fetchPypi , flake8 , libjack2 @@ -33,7 +33,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython meson-python ninja pkg-config diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index a7270958387d..ce562e48ce54 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cython +, cython_0 , setuptools , libyaml , python @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython + cython_0 setuptools ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 0493381718c1..51429d535df4 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -4,7 +4,7 @@ , isPyPy # build-system -, cython_3 +, cython , setuptools , setuptools-scm , packaging @@ -40,7 +40,7 @@ buildPythonPackage rec { ] ++ (if isPyPy then [ cffi ] else [ - cython_3 + cython ]); buildInputs = [ diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 6c57c8f3c076..d30759869cc8 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , cvxopt , cvxpy -, cython +, cython_0 , fetchFromGitHub , ipython , matplotlib @@ -31,7 +31,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython + cython_0 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 5a1a6296b48d..13c04b2f1dc0 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -4,7 +4,7 @@ , pythonOlder , fetchFromGitHub , cmake -, cython_3 +, cython , ninja , scikit-build , setuptools @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake - cython_3 + cython ninja scikit-build setuptools diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index eef18524c217..b919a3afe062 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -13,7 +13,7 @@ , click , click-plugins , cligj -, cython_3 +, cython , gdal , hypothesis , ipython @@ -55,7 +55,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython_3 + cython gdal numpy oldest-supported-numpy diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index bbab3a462dbb..ff6e3070cf7e 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -4,7 +4,7 @@ , astropy-healpix , buildPythonPackage , cloudpickle -, cython_3 +, cython , dask , fetchPypi , fsspec @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ astropy-extension-helpers - cython_3 + cython numpy oldest-supported-numpy setuptools-scm diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index 33f6ba217882..462207a2fea4 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi -, cython +, cython_0 , alsa-lib , CoreAudio , CoreMIDI @@ -23,7 +23,7 @@ buildPythonPackage rec { rm rtmidi_python.cpp ''; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ cython_0 ]; buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index b6c703d7870d..7ffe72261f44 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -4,7 +4,7 @@ , fetchPypi # build-system -, cython_3 +, cython , gfortran , numpy , scipy @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; build-system = [ - cython_3 + cython numpy scipy setuptools diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 24aa665bccfc..119e36d663ef 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage # build-system -, cython_3 +, cython , git , pkgconfig , setuptools @@ -40,7 +40,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython git pkgconfig setuptools diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 676c2510f6b9..8e2c18fb1e62 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchFromGitHub , numpy @@ -7,7 +6,7 @@ , matplotlib , pyparsing , tables -, cython +, cython_0 , python , sympy , meshio @@ -34,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - cython + cython_0 scipy matplotlib pyparsing diff --git a/pkgs/development/python-modules/shapely/1.8.nix b/pkgs/development/python-modules/shapely/1.8.nix index 0e1c3135ab99..4382ba93ec5e 100644 --- a/pkgs/development/python-modules/shapely/1.8.nix +++ b/pkgs/development/python-modules/shapely/1.8.nix @@ -6,7 +6,7 @@ , pythonOlder , substituteAll -, cython +, cython_0 , geos_3_11 , numpy , oldest-supported-numpy @@ -44,7 +44,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython + cython_0 geos_3_11 # for geos-config oldest-supported-numpy setuptools diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 3db9ce9e2af6..07bdd27ac020 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , pythonOlder -, cython +, cython_0 , geos , numpy , oldest-supported-numpy @@ -26,7 +26,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython + cython_0 geos # for geos-config oldest-supported-numpy setuptools diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index b000900d3a7b..7cd1cc0af6bc 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub # build-system -, cython_3 +, cython , numpy , oldest-supported-numpy , setuptools @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython_3 + cython gnutar numpy oldest-supported-numpy diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 56c626d4591d..ace17d1fc667 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -27,7 +27,6 @@ , sphinxcontrib-websupport # check phase -, cython , filelock , html5lib , pytestCheckHook @@ -83,7 +82,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - cython filelock html5lib pytestCheckHook @@ -108,6 +106,8 @@ buildPythonPackage rec { "test_class_alias_having_doccomment" "test_class_alias_for_imported_object_having_doccomment" "test_decorators" + # requires cython_0, but fails miserably on 3.11 + "test_cython" ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous @@ -117,7 +117,6 @@ buildPythonPackage rec { "test_autodoc_inherited_members_None" "test_automethod_for_builtin" "test_builtin_function" - "test_cython" "test_isattributedescriptor" "test_methoddescriptor" "test_partialfunction" diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index c3549ca3df02..be1871c0dd14 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder -, cython +, cython_0 , catalogue , mock , numpy @@ -26,7 +26,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython + cython_0 setuptools ]; diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index 2ba5ff701919..399bc5288022 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , cairocffi -, cython_3 +, cython , fetchPypi , igraph , leidenalg @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook - cython_3 + cython poetry-core setuptools ]; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index db5398550689..b62c408a77fb 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -9,7 +9,7 @@ , CoreGraphics , CoreVideo , cymem -, cython +, cython_0 , fetchPypi , hypothesis , mock @@ -50,7 +50,7 @@ buildPythonPackage rec { ]; buildInputs = [ - cython + cython_0 ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreFoundation diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 334a4ce20e4b..2881c8ef0d6b 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, cython +, cython_0 , certifi , CFNetwork , cmake @@ -68,7 +68,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake - cython + cython_0 ]; buildInputs = [ diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index 15c0d79984b2..b4ea16f1abd5 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, cython_3 +, cython , setuptools , setuptools-scm , pytestCheckHook @@ -26,7 +26,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 9ee7fec91944..7aa551086869 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -5,7 +5,7 @@ , fetchPypi # build-system -, cython +, cython_0 , setuptools # native dependencies @@ -33,7 +33,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython + cython_0 setuptools ]; diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 21d8c68e7438..e25133dfda5b 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , substituteAll , fetchPypi -, cython_3 +, cython , fontconfig , freetype-py , hsluv @@ -39,7 +39,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython_3 + cython oldest-supported-numpy setuptools setuptools-scm diff --git a/pkgs/development/python-modules/wikipedia2vec/default.nix b/pkgs/development/python-modules/wikipedia2vec/default.nix index 12f7ef753a59..2e379b9ccb1e 100644 --- a/pkgs/development/python-modules/wikipedia2vec/default.nix +++ b/pkgs/development/python-modules/wikipedia2vec/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , click -, cython_3 +, cython , fetchFromGitHub , jieba , joblib @@ -30,13 +30,13 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - cython_3 + cython setuptools ]; propagatedBuildInputs = [ click - cython_3 + cython jieba joblib lmdb diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 6b8e17d2ed19..a0c75cd23856 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder -, cython_3 +, cython , expandvars , setuptools , idna @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython_3 + cython expandvars setuptools ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index c721259efa43..c592ca1d68cc 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,5 +1,5 @@ { lib -, cython_3 +, cython , async-timeout , buildPythonPackage , fetchFromGitHub @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython_3 + cython poetry-core setuptools ]; diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/development/tools/steamos-devkit/default.nix index 4b2cabac6396..894bfff77da8 100644 --- a/pkgs/development/tools/steamos-devkit/default.nix +++ b/pkgs/development/tools/steamos-devkit/default.nix @@ -23,7 +23,7 @@ let }; nativeBuildInputs = with python3.pkgs; [ - cython + cython_0 pkg-config SDL2 ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 797b2ecae5f6..4e64f23b43f0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -257,7 +257,7 @@ let }; nativeBuildInputs = with self; [ - cython_3 + cython setuptools libxml2.dev libxslt.dev diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4bca4de4f593..a7aa3534f3c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2613,14 +2613,7 @@ self: super: with self; { cython = callPackage ../development/python-modules/cython { }; - cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.9"; - src = old.src.override { - inherit version; - hash = "sha256-otNU8FnR8FXTTPqmLFtovHisLOq2QHFI1H+1CM87pPM="; - }; - patches = [ ]; - }); + cython_0 = callPackage ../development/python-modules/cython/0.nix { }; cython-test-exception-raiser = callPackage ../development/python-modules/cython-test-exception-raiser { }; From bd3016357f70ddf770df27d537f7772dbaa3ea43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 03:36:36 +0100 Subject: [PATCH 009/108] python312Packages.pystemmer: 2.2.0 -> 2.2.0.1 Convert to PEP517 build and apply patch to relax cython constraint. --- .../python-modules/pystemmer/default.nix | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 0df510e0b55d..0c298904fdcd 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -1,40 +1,39 @@ { lib , python -, fetchPypi , fetchFromGitHub -, fetchpatch +, fetchpatch2 , buildPythonPackage , cython +, setuptools , libstemmer }: buildPythonPackage rec { pname = "pystemmer"; - version = "2.2.0"; - format = "setuptools"; + version = "2.2.0.1"; + pyproejct = true; src = fetchFromGitHub { owner = "snowballstem"; repo = "pystemmer"; rev = "refs/tags/v${version}"; - hash = "sha256-bJVFeO7XP+aZ2nowQiuws5ziL/FmS1eaOllW6QxA70U="; + hash = "sha256-ngPx95ybgJmndpNPBwCa3BCNsozRg+dlEw+nhlIwI58="; }; - nativeBuildInputs = [ cython ]; - patches = [ - (fetchpatch { - # Allow building with system libstemmer - url = "https://github.com/snowballstem/pystemmer/commit/2f52b4b2ff113fe6c33cebe14ed4fd4388bb1742.patch"; - hash = "sha256-JqR/DUmABgWaq23CNjoKSasL0mNhM2QuU986mouK6A8="; - }) - (fetchpatch { - # Fix doctests - url = "https://github.com/snowballstem/pystemmer/commit/b2826f19fe8ba65238b5f3b4cee7096a698f048e.patch"; - hash = "sha256-VTZydjYaJJ/KoHD4KbON36kZnkuAyO51H0Oeg6VXTqg="; + (fetchpatch2 { + # relax cython constraint + name = "pystemmer-relax-cython.patch"; + url = "https://github.com/snowballstem/pystemmer/commit/d3d423dc877b4f49e0ab1776f7edaff37feb6799.patch"; + hash = "sha256-9K6gy/cLFPfW82XYHVVPXUbQhf8XyB4NUi4YqNtyWcw="; }) ]; + build-system = [ + cython + setuptools + ]; + postConfigure = '' export PYSTEMMER_SYSTEM_LIBSTEMMER="${lib.getDev libstemmer}/include" ''; @@ -59,8 +58,12 @@ buildPythonPackage rec { meta = with lib; { description = "Snowball stemming algorithms, for information retrieval"; + downloadPage = "https://github.com/snowballstem/pystemmer"; homepage = "http://snowball.tartarus.org/"; - license = licenses.mit; + license = with licenses; [ + bsd3 + mit + ]; platforms = platforms.unix; }; } From d72f272463e9b50aef06e52826a3f17c07a48141 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 04:06:26 +0100 Subject: [PATCH 010/108] python312Packages.certifi: 2023.11.17 -> 2024.02.02 https://github.com/certifi/python-certifi/compare/2023.11.17...2024.02.02 --- .../python-modules/certifi/default.nix | 4 +-- .../python-modules/certifi/env.patch | 25 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index c6eaa72d2df1..73492baa076a 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2023.11.17"; + version = "2024.02.02"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-H3zsFJjWt2+tT7yqQOOZZwSL5y0AtfDz6Fqxwpm4Wl8="; + hash = "sha256-gnWJjZy5E/0lvAeLftXNtcHH6RHL/dUomXOBgumiWX8="; }; patches = [ diff --git a/pkgs/development/python-modules/certifi/env.patch b/pkgs/development/python-modules/certifi/env.patch index 292f977ef2c0..97a48b46e05f 100644 --- a/pkgs/development/python-modules/certifi/env.patch +++ b/pkgs/development/python-modules/certifi/env.patch @@ -1,13 +1,17 @@ diff --git a/certifi/core.py b/certifi/core.py -index de02898..c033d20 100644 +index 91f538b..1110ce0 100644 --- a/certifi/core.py +++ b/certifi/core.py -@@ -4,15 +4,25 @@ certifi.py +@@ -4,6 +4,7 @@ certifi.py This module returns the installation location of cacert.pem or its contents. """ +import os import sys + import atexit + +@@ -11,12 +12,21 @@ def exit_cacert_ctx() -> None: + _CACERT_CTX.__exit__(None, None, None) # type: ignore[union-attr] +def get_cacert_path_from_environ(): @@ -29,17 +33,16 @@ index de02898..c033d20 100644 def where() -> str: # This is slightly terrible, but we want to delay extracting the file -@@ -39,14 +49,16 @@ if sys.version_info >= (3, 11): +@@ -44,6 +54,8 @@ if sys.version_info >= (3, 11): return _CACERT_PATH def contents() -> str: -- return files("certifi").joinpath("cacert.pem").read_text(encoding="ascii") + if _CACERT_PATH is not None: + return open(_CACERT_PATH, encoding="utf-8").read() -+ return files("certifi").joinpath("cacert.pem").read_text(encoding="utf-8") + return files("certifi").joinpath("cacert.pem").read_text(encoding="ascii") elif sys.version_info >= (3, 7): - +@@ -51,7 +63,7 @@ elif sys.version_info >= (3, 7): from importlib.resources import path as get_path, read_text _CACERT_CTX = None @@ -48,7 +51,7 @@ index de02898..c033d20 100644 def where() -> str: # This is slightly terrible, but we want to delay extracting the -@@ -74,7 +86,9 @@ elif sys.version_info >= (3, 7): +@@ -80,7 +92,9 @@ elif sys.version_info >= (3, 7): return _CACERT_PATH def contents() -> str: @@ -59,7 +62,7 @@ index de02898..c033d20 100644 else: import os -@@ -84,6 +98,8 @@ else: +@@ -90,6 +104,8 @@ else: Package = Union[types.ModuleType, str] Resource = Union[str, "os.PathLike"] @@ -68,7 +71,7 @@ index de02898..c033d20 100644 # This fallback will work for Python versions prior to 3.7 that lack the # importlib.resources module but relies on the existing `where` function # so won't address issues with environments like PyOxidizer that don't set -@@ -102,7 +118,14 @@ else: +@@ -108,7 +124,13 @@ else: def where() -> str: f = os.path.dirname(__file__) @@ -78,9 +81,7 @@ index de02898..c033d20 100644 return os.path.join(f, "cacert.pem") def contents() -> str: -- return read_text("certifi", "cacert.pem", encoding="ascii") + if _CACERT_PATH is not None: + with open(_CACERT_PATH, encoding="utf-8") as data: + return data.read() -+ -+ return read_text("certifi", "cacert.pem", encoding="utf-8") + return read_text("certifi", "cacert.pem", encoding="ascii") From b984244adb53de0238ded48a0e04cd0a0f7f83f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 10:05:32 +0100 Subject: [PATCH 011/108] python312Packages.flexmock: 0.11.3 -> 0.12.0 --- .../python-modules/flexmock/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index 437868b70c82..45b2981ba959 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -3,32 +3,33 @@ , fetchPypi , pytestCheckHook , pythonOlder +, poetry-core , teamcity-messages , testtools }: buildPythonPackage rec { pname = "flexmock"; - version = "0.11.3"; - format = "setuptools"; + version = "0.12.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sf419qXzJUe1zTGhXAYNmrhj3Aiv8BjNc9x40bZR7dQ="; + hash = "sha256-YdBvPRRCuBW3qoWh9HvoONBW9fXRTO/teuv7A0c9FKs="; }; + build-system = [ + poetry-core + ]; + nativeCheckInputs = [ pytestCheckHook teamcity-messages testtools ]; - disabledTests = [ - "test_failed_test_case" - ]; - pythonImportsCheck = [ "flexmock" ]; From 885b5666f2fd7b1fe4f6d8498823c285536d0aba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 10:46:00 +0100 Subject: [PATCH 012/108] python311Packages.alembic: test with pytest_7 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 9f4131778818..cd7b0696afd4 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -14,7 +14,7 @@ , typing-extensions # tests -, pytestCheckHook +, pytest7CheckHook , pytest-xdist , python-dateutil }: @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + pytest7CheckHook pytest-xdist python-dateutil ]; From 35a12fc9b1b86be21607211353da12f0e48813a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 10:57:58 +0100 Subject: [PATCH 013/108] python312Packages.apsw: 3.45.1.0 -> 3.45.2.0 https://github.com/rogerbinns/apsw/blob/3.45.2.0/doc/changes.rst --- pkgs/development/python-modules/apsw/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 153b8b3b05dd..19d013c070b3 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , sqlite , isPyPy , python @@ -8,8 +9,8 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.45.1.0"; - format = "setuptools"; + version = "3.45.2.0"; + pyproject = true; disabled = isPyPy; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-NkpkciLR2TgfK/7UQHEzvQu8qRj4UJyOlGQbiV23qrc="; + hash = "sha256-tTi3/10W4OoGH6PQVhvPWc5o09on5BZrWoAvrfh4C/E="; }; + build-system = [ + setuptools + ]; + buildInputs = [ sqlite ]; @@ -36,6 +41,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/rogerbinns/apsw/blob/${src.rev}/doc/changes.rst"; description = "A Python wrapper for the SQLite embedded relational database engine"; homepage = "https://github.com/rogerbinns/apsw"; license = licenses.zlib; From fdb60267ab631dc8ba3ace6342dc8d46569f4e6e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 11:02:35 +0100 Subject: [PATCH 014/108] python311Packages.vine: disable failing tests --- pkgs/development/python-modules/vine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index 033e50ba2c40..46330ac4247b 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" + disabledTestPaths = [ + # https://github.com/celery/vine/issues/106 + "t/unit/test_synchronization.py" ]; pythonImportsCheck = [ From b88f337e4746bdb01aa7b21e885689ead2833d52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 11:09:53 +0100 Subject: [PATCH 015/108] python312Packages.nocaselist: test with pytest_7 --- pkgs/development/python-modules/nocaselist/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index d5f886ab1a1e..fcad1844e2f6 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook +, pytest7CheckHook , pythonOlder , six }: @@ -23,11 +23,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" + pytest7CheckHook ]; pythonImportsCheck = [ From 811e4ff12485794c07fb85f162c62d2c5a31cc1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 11:34:28 +0100 Subject: [PATCH 016/108] python312Packages.paramiko: patch pytest8 compat --- pkgs/development/python-modules/paramiko/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 2b3b6ff2507e..36bc0c793f7a 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -31,6 +31,11 @@ buildPythonPackage rec { url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; }) + (fetchpatch { + name = "paramiko-pytest8-compat.patch"; + url = "https://github.com/paramiko/paramiko/commit/d71046151d9904df467ff72709585cde39cdd4ca.patch"; + hash = "sha256-4CTIZ9BmzRdh+HOwxSzfM9wkUGJOnndctK5swqqsIvU="; + }) ]; propagatedBuildInputs = [ @@ -52,10 +57,6 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - disabledTestPaths = [ # disable tests that require pytest-relaxed, which is broken "tests/test_client.py" From d57e54b504307fd2c3d8acd85be3e58b36c7b91e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 12:12:47 +0100 Subject: [PATCH 017/108] python312Packages.pint: disable failing tests & benchmarks --- pkgs/development/python-modules/pint/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 99e8da4cdd30..9a9029aca062 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -50,6 +50,10 @@ buildPythonPackage rec { uncertainties ]; + pytestFlagsArray = [ + "--benchmark-disable" + ]; + preCheck = '' export HOME=$(mktemp -d) ''; @@ -57,6 +61,8 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/hgrecco/pint/issues/1898 "test_load_definitions_stage_2" + # pytest8 deprecation + "test_nonnumeric_magnitudes" ]; meta = with lib; { From fad18b0c0e4d33c115a79e0f23821ba5a30ee885 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 12:15:20 +0100 Subject: [PATCH 018/108] python312Packages.isort: disable failing test --- pkgs/development/python-modules/isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index a3e935907341..100155f83a2e 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -52,8 +52,6 @@ buildPythonPackage rec { "--ignore=tests/benchmark/" # requires pytest-benchmark "--ignore=tests/integration/" # pulls in 10 other packages "--ignore=tests/unit/profiles/test_black.py" # causes infinite recursion to include black - # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. - "-W" "ignore::pytest.PytestRemovedIn8Warning" ]; disabledTests = [ @@ -74,6 +72,8 @@ buildPythonPackage rec { "test_value_assignment_list" # profiles not available "test_isort_supports_shared_profiles_issue_970" + # https://github.com/PyCQA/isort/issues/2234 + "test_isort_should_warn_on_empty_custom_config_issue_1433" ]; meta = with lib; { From bad4ddcfd404a6057a85c3abaed1cd6717cb0ae6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 12:43:08 +0100 Subject: [PATCH 019/108] ceph: disable failing test in pyopenssl --- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 27d766060704..8f33527a56f4 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -239,8 +239,8 @@ let inherit version; hash = "sha256-hBSYub7GFiOxtsR+u8AjZ8B9YODhlfGXkIF/EMyNsLc="; }; - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" + disabledTests = old.disabledTests or [ ] ++ [ + "test_export_md5_digest" ]; }); From 37606d323b600c3395eb90f9151a0710d86565a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 12:50:25 +0100 Subject: [PATCH 020/108] python312Packages.ndindex: restore disabled test --- pkgs/development/python-modules/ndindex/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index 5ee682994575..55704e1eef08 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -49,11 +49,6 @@ buildPythonPackage rec { pytestCheckHook ] ++ passthru.optional-dependencies.arrays; - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. - "--deselect=ndindex/tests/test_ndindex.py::test_ndindex_invalid" - ]; - meta = with lib; { description = ""; homepage = "https://github.com/Quansight-Labs/ndindex"; From c7eb0179e32e2a416bac2ef3e59cb85b982d2584 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 12:58:32 +0100 Subject: [PATCH 021/108] python312Packages.fastjsonschema: 2.18.1 -> 2.19.1 https://github.com/horejsek/python-fastjsonschema/blob/v2.19.1/CHANGELOG.txt --- .../python-modules/fastjsonschema/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index c5381986d1c9..330bf096b2ce 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -2,13 +2,14 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch2 , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.18.1"; + version = "2.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,17 +19,21 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-t6JnqQgsWAL8oL8+LO0xrXMYsZOlTF3DlXkRiqUzYtU="; + hash = "sha256-UxcxVB4ldnGAYJKWEccivon1CwZD588mNiVJOJPNeN8="; }; + patches = [ + (fetchpatch2 { + name = "fastjsonschema-pytest8-compat.patch"; + url = "https://github.com/horejsek/python-fastjsonschema/commit/efc04daf4124a598182dfcfd497615cd1e633d18.patch"; + hash = "sha256-G1/PIpdN+KFfRP9pUFf/ANXLq3mzrocEHyBNWQMVOZM="; + }) + ]; + nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - dontUseSetuptoolsCheck = true; disabledTests = [ From 9d9885e9491e1375f48fdb21880c38a6b2676271 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 17:07:01 +0100 Subject: [PATCH 022/108] python311Packages.torchsde: test with pytest_7 --- pkgs/development/python-modules/torchsde/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/torchsde/default.nix b/pkgs/development/python-modules/torchsde/default.nix index bffbeeaa2c97..66e23a594f91 100644 --- a/pkgs/development/python-modules/torchsde/default.nix +++ b/pkgs/development/python-modules/torchsde/default.nix @@ -13,7 +13,7 @@ , trampoline # tests -, pytestCheckHook +, pytest7CheckHook }: buildPythonPackage rec { @@ -49,11 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "torchsde" ]; nativeCheckInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" + pytest7CheckHook ]; disabledTests = [ From 2e2ec07f9decde5ddac366ab064c5d6318c829e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 18:05:35 +0100 Subject: [PATCH 023/108] python312Packages.devtools: drop pytest8 removal warning ignore --- pkgs/development/python-modules/devtools/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index 08a5f2e7f50c..a36da40bece4 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -39,11 +39,6 @@ buildPythonPackage rec { pytest-mock ]; - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. - "-W ignore::pytest.PytestRemovedIn8Warning" - ]; - disabledTests = [ # Test for Windows32 "test_print_subprocess" From 2d191c4e7a2e223fcf732249e635c9172f634b5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 18:54:08 +0100 Subject: [PATCH 024/108] python311Packages.pmdarima: test with pytest_7 --- pkgs/development/python-modules/pmdarima/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pmdarima/default.nix b/pkgs/development/python-modules/pmdarima/default.nix index 3223d071bdec..9592ae32e09d 100644 --- a/pkgs/development/python-modules/pmdarima/default.nix +++ b/pkgs/development/python-modules/pmdarima/default.nix @@ -12,7 +12,7 @@ , urllib3 , pythonOlder , python -, pytestCheckHook +, pytest7CheckHook }: buildPythonPackage rec { @@ -49,11 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ matplotlib - pytestCheckHook - ]; - - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" + pytest7CheckHook ]; disabledTests= [ From 7d6e33f8200e5c100159d19749c431f339eecfaf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 20:12:15 +0100 Subject: [PATCH 025/108] python311Packages.dask: 2024.1.1 -> 2024.2.1 https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 44614185f73f..be177b033f07 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2024.1.1"; + version = "2024.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-L8bRh2bx36CYrAFXYJF67rCeCRfm5ufhTkMFRJo0yYo="; + hash = "sha256-8VFtKPaF0PqCjqFB+plFe1GjUno5j7j86+wxKhzByyw="; }; nativeBuildInputs = [ @@ -127,8 +127,6 @@ buildPythonPackage rec { "--reruns 3" # Don't run tests that require network access "-m 'not network'" - # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. - "-W" "ignore::pytest.PytestRemovedIn8Warning" ]; disabledTests = lib.optionals stdenv.isDarwin [ From 375a4132df27d7eec92e346193ffc18bb45180e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 20:15:11 +0100 Subject: [PATCH 026/108] python311Packages.aws-encryption-sdk: disable failing test --- .../python-modules/aws-encryption-sdk/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix index c525d79e4b6d..13f8d29ca913 100644 --- a/pkgs/development/python-modules/aws-encryption-sdk/default.nix +++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -41,16 +41,17 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - disabledTestPaths = [ # Tests require networking "examples" "test/integration" ]; + disabledTests = [ + # pytest 8 compat issue + "test_happy_version" + ]; + pythonImportsCheck = [ "aws_encryption_sdk" ]; From a48a34965754c5c44ae892578e6d9f50a85724d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 20:40:01 +0100 Subject: [PATCH 027/108] python311Packages.deal: 4.24.3 -> 4.24.4 https://github.com/life4/deal/compare/refs/tags/4.24.3...4.24.4 --- pkgs/development/python-modules/deal/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index b24d8be44826..506913d616fa 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "deal"; - version = "4.24.3"; + version = "4.24.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "life4"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QlM3d/jmg6v3L3D45+cgcCej71U1dl4uZ6sAYGGm3tU="; + hash = "sha256-4orpoYfPGSvquhg9w63uUe8QbBa2RUpxaEJ9uy28+fU="; }; postPatch = '' @@ -62,10 +62,6 @@ buildPythonPackage rec { flake8 ]; - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - disabledTests = [ # needs internet access "test_smoke_has" From 312523f9f5078106bba947979fadb7ed775e42c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 20:48:07 +0100 Subject: [PATCH 028/108] python311Packages.scikit-fuzzy: refactor --- .../python-modules/scikit-fuzzy/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/scikit-fuzzy/default.nix b/pkgs/development/python-modules/scikit-fuzzy/default.nix index 5ed9d994c0e0..03f10f129cbd 100644 --- a/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub , fetchpatch +, pythonAtLeast +, setuptools , matplotlib , networkx , nose , numpy , scipy -, pytestCheckHook +, pytest7CheckHook }: buildPythonPackage rec { pname = "scikit-fuzzy"; version = "unstable-2022-11-07"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + # code depends on distutils + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = pname; @@ -44,11 +46,20 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ networkx numpy scipy ]; - nativeCheckInputs = [ matplotlib nose pytestCheckHook ]; + build-system = [ + setuptools + ]; - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" + propagatedBuildInputs = [ + networkx + numpy + scipy + ]; + + nativeCheckInputs = [ + matplotlib + nose + pytest7CheckHook ]; pythonImportsCheck = [ "skfuzzy" ]; From 41aace96d25b87e0f5ae4985045e1f5870ea0509 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 21:05:24 +0100 Subject: [PATCH 029/108] python311PAckages.detect-secrets: test with pytest 7 --- .../python-modules/detect-secrets/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix index 589df5624778..a50b6dbd810c 100644 --- a/pkgs/development/python-modules/detect-secrets/default.nix +++ b/pkgs/development/python-modules/detect-secrets/default.nix @@ -5,7 +5,7 @@ , mock , pkgs , pyahocorasick -, pytestCheckHook +, pytest7CheckHook , pythonOlder , pyyaml , requests @@ -37,17 +37,12 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - pytestCheckHook + pytest7CheckHook responses unidiff pkgs.gitMinimal ]; - pytestFlagsArray = [ - # Pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - preCheck = '' export HOME=$(mktemp -d); ''; From 0781e7f976515487b476ccb04f4e5b64ccdafc0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 21:10:56 +0100 Subject: [PATCH 030/108] python311Packages.cssutils: test with pytest 7 --- pkgs/development/python-modules/cssutils/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 10f62f29280c..911895d49d6a 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonPackage -, pythonAtLeast , pythonOlder -, fetchpatch , fetchPypi , setuptools , setuptools-scm @@ -10,7 +8,7 @@ , jaraco-test , lxml , mock -, pytestCheckHook +, pytest7CheckHook , importlib-resources }: @@ -37,16 +35,11 @@ buildPythonPackage rec { jaraco-test lxml mock - pytestCheckHook + pytest7CheckHook ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - disabledTests = [ # access network "test_parseUrl" From ccaa2b9ff34eb7ef904720e9d2a3b0333e09dc89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 21:14:38 +0100 Subject: [PATCH 031/108] python311Packages.chalice: test with pytest 7 --- pkgs/development/python-modules/chalice/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 2e880508e0b4..25b9998433a6 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -10,7 +10,7 @@ , mock , mypy-extensions , pip -, pytestCheckHook +, pytest7CheckHook , pythonOlder , pyyaml , requests @@ -61,15 +61,11 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis mock - pytestCheckHook + pytest7CheckHook requests websocket-client ]; - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - disabledTestPaths = [ # Don't check the templates and the sample app "chalice/templates" From a4c2f399b86eaddec7ab60ffef672311bca319d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 21:16:18 +0100 Subject: [PATCH 032/108] python311Packages.demes: test with pytest 7 --- pkgs/development/python-modules/demes/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/demes/default.nix b/pkgs/development/python-modules/demes/default.nix index 4eadd670a1e1..522b075d2a6e 100644 --- a/pkgs/development/python-modules/demes/default.nix +++ b/pkgs/development/python-modules/demes/default.nix @@ -5,7 +5,7 @@ , ruamel-yaml , attrs , pythonOlder -, pytestCheckHook +, pytest7CheckHook , pytest-xdist , numpy }: @@ -36,16 +36,11 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - pytestCheckHook + pytest7CheckHook pytest-xdist numpy ]; - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - disabledTestPaths = [ "tests/test_spec.py" ]; From 3bfe29446dbd9683175519b241f7ccb30835b1f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 21:34:49 +0100 Subject: [PATCH 033/108] python311Packages.ipywidgets: test with pytest 7 --- pkgs/development/python-modules/ipywidgets/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index b4cefff029dd..bbc1a102fbd0 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -8,7 +8,7 @@ , jsonschema , jupyterlab-widgets , lib -, pytestCheckHook +, pytest7CheckHook , pytz , traitlets , widgetsnbextension @@ -40,15 +40,10 @@ buildPythonPackage rec { nativeCheckInputs = [ ipykernel jsonschema - pytestCheckHook + pytest7CheckHook pytz ]; - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - meta = { description = "IPython HTML widgets for Jupyter"; homepage = "https://github.com/jupyter-widgets/ipywidgets"; From 91b95f5b1eff9a00a309e1f00937c31abe38497c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 22:00:19 +0100 Subject: [PATCH 034/108] python311Packages.papermill: disable failing test --- pkgs/development/python-modules/papermill/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 6124b14b4b93..5f29603ff217 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -91,11 +91,10 @@ buildPythonPackage rec { "papermill" ]; - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # pytest 8 compat + "test_read_with_valid_file_extension" + ] ++ lib.optionals stdenv.isDarwin [ # might fail due to the sandbox "test_end2end_autosave_slow_notebook" ]; From 4607bde2028226993d03fc52c7956d9f74a1f6c1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 22:04:18 +0100 Subject: [PATCH 035/108] python311Packages.hid-parser: test with pytest 7 --- pkgs/development/python-modules/hid-parser/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/hid-parser/default.nix b/pkgs/development/python-modules/hid-parser/default.nix index 15b7f3c587f3..dc0bbb433fd1 100644 --- a/pkgs/development/python-modules/hid-parser/default.nix +++ b/pkgs/development/python-modules/hid-parser/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools -, pytestCheckHook +, pytest7CheckHook , hypothesis }: @@ -21,14 +21,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + pytest7CheckHook hypothesis ]; - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - pythonImportsCheck = [ "hid_parser" ]; meta = with lib; { From 968876ed8368363083c89a9683680e9bc833ae57 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 22:55:13 +0100 Subject: [PATCH 036/108] python311Packages.nocasedict: test with pytest 7 --- pkgs/development/python-modules/nocasedict/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 9ab5c801da5c..9d727ec0ecba 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook +, pytest7CheckHook , six }: @@ -20,11 +20,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" + pytest7CheckHook ]; pythonImportsCheck = [ From 73072f314a3007d8b87c9bab6d75c5ca3f2f3c05 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 06:00:00 +0100 Subject: [PATCH 037/108] python311Packages.djangorestframework: test with pytest 7 --- .../python-modules/djangorestframework/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 1499469c06b8..8bec94e66519 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -6,7 +6,7 @@ , django-guardian , pythonOlder , pytest-django -, pytestCheckHook +, pytest7CheckHook , pytz , pyyaml , uritemplate @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-django - pytestCheckHook + pytest7CheckHook # optional tests coreapi @@ -41,11 +41,6 @@ buildPythonPackage rec { uritemplate ]; - pytestFlagsArray = [ - # ytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - pythonImportsCheck = [ "rest_framework" ]; meta = with lib; { From db6c2bcf1a90b608d5368aecf8be30f6ef805d43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 22:59:13 +0100 Subject: [PATCH 038/108] python311Packages.django-filter: 23.5 -> 24.1 https://github.com/carltongibson/django-filter/blob/v24.1/CHANGES.rst --- .../python-modules/django-filter/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index 8f91712ba0b7..9f9a22ae48ed 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -6,22 +6,22 @@ , djangorestframework , pytestCheckHook , pytest-django -, python +, pytz }: buildPythonPackage rec { pname = "django-filter"; - version = "23.5"; - format = "pyproject"; + version = "24.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Z1g6pDuR/oxJ90qDLZX02EQr5ij9TG1l6fgR9RU6Tlw="; + hash = "sha256-ZctDzicgd+Wsaq4QVNdsEhzWtVLilqgqE5Iek3G6+ME="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; pythonImportsCheck = [ "django_filters" @@ -31,6 +31,7 @@ buildPythonPackage rec { djangorestframework pytestCheckHook pytest-django + pytz ]; env.DJANGO_SETTINGS_MODULE = "tests.settings"; From 3bef83ba5725f0678fa0335f8664814d65d2f1c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:00:56 +0100 Subject: [PATCH 039/108] python311Packages.graphene: test with pytest 7 --- pkgs/development/python-modules/graphene/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index 551ff8a86e64..e6de2b449cf4 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -8,7 +8,7 @@ , pytest-asyncio , pytest-benchmark , pytest-mock -, pytestCheckHook +, pytest7CheckHook , pythonOlder , pytz , snapshottest @@ -39,7 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + pytest7CheckHook pytest-asyncio pytest-benchmark pytest-mock @@ -49,7 +49,6 @@ buildPythonPackage rec { pytestFlagsArray = [ "--benchmark-disable" - "-W ignore::pytest.PytestRemovedIn8Warning" ]; pythonImportsCheck = [ From f8107134fa7675d0ad33bc0469deceeab987f425 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:23:25 +0100 Subject: [PATCH 040/108] python311Packages.graphene-django: test with pytest 7, disable failing tests --- .../graphene-django/default.nix | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 64d07a538429..b6a8ab680fe4 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , buildPythonPackage -, pythonAtLeast , pythonOlder , fetchFromGitHub @@ -17,7 +16,7 @@ , py , pytest-django , pytest-random-order -, pytestCheckHook +, pytest7CheckHook }: buildPythonPackage rec { @@ -58,20 +57,15 @@ buildPythonPackage rec { py pytest-django pytest-random-order - pytestCheckHook + pytest7CheckHook ]; - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - - disabledTests = lib.optionals (pythonAtLeast "3.11") [ - # Python 3.11 support, https://github.com/graphql-python/graphene-django/pull/1365 - "test_django_objecttype_convert_choices_enum_naming_collisions" - "test_django_objecttype_choices_custom_enum_name" - "test_django_objecttype_convert_choices_enum_list" - "test_schema_representation" + disabledTests = [ + # https://github.com/graphql-python/graphene-django/issues/1510 + "test_should_filepath_convert_string" + "test_should_choice_convert_enum" + "test_should_multiplechoicefield_convert_to_list_of_enum" + "test_perform_mutate_success_with_enum_choice_field" ] ++ lib.optionals stdenv.isDarwin [ # this test touches files in the "/" directory and fails in darwin sandbox "test_should_filepath_convert_string" From f32a6a6d7c290dd0b429b0baabd8212dfe120bed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:25:40 +0100 Subject: [PATCH 041/108] python311Packages.marshmallow-enum: test with pytest 7 and use PEP517 builder. --- .../marshmallow-enum/default.nix | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix index 17f674271194..fdf2771deebd 100644 --- a/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -1,16 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , marshmallow -, pytestCheckHook -, isPy27 -, enum34 +, pytest7CheckHook }: buildPythonPackage rec { pname = "marshmallow-enum"; version = "1.5.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "justanr"; @@ -23,22 +22,16 @@ buildPythonPackage rec { sed -i '/addopts/d' tox.ini ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ marshmallow - ] ++ lib.optionals isPy27 [ enum34 ]; + ]; nativeCheckInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - - disabledTests = [ - "test_custom_error_in_deserialize_by_name" - "test_custom_error_in_deserialize_by_value" + pytest7CheckHook ]; meta = with lib; { From 51df12a53b3359a45e9a4459f7d6299bd3e2c272 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:27:34 +0100 Subject: [PATCH 042/108] python311Packages.favicon: test with pytest 7 --- pkgs/development/python-modules/favicon/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 0800994eb61d..db6b70cbf893 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -2,7 +2,7 @@ , beautifulsoup4 , buildPythonPackage , fetchPypi -, pytestCheckHook +, pytest7CheckHook , pythonOlder , requests , requests-mock @@ -30,14 +30,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + pytest7CheckHook requests-mock ]; - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - pythonImportsCheck = [ "favicon" ]; From d493ffff030da9d770b4ef534107854d8b62c6ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:29:35 +0100 Subject: [PATCH 043/108] python311Packages.anytree: 2.12.0 -> 2.12.1 https://github.com/c0fec0de/anytree/releases/tag/2.12.1 --- pkgs/development/python-modules/anytree/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index f18fa10557f3..0fe64bbe8f62 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -4,7 +4,7 @@ , fontconfig , graphviz , poetry-core -, pytestCheckHook +, pytest7CheckHook , pythonOlder , six , substituteAll @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "anytree"; - version = "2.12.0"; + version = "2.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "c0fec0de"; repo = "anytree"; rev = "refs/tags/${version}"; - hash = "sha256-8mV9Lf6NLPUDVurXCxG+tqe7+3TrIn2H+7tHa6BpTzk="; + hash = "sha256-5HU8kR3B2RHiGBraQ2FTgVtGHJi+Lha9U/7rpNsYCCI="; }; patches = lib.optionals withGraphviz [ @@ -41,12 +41,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" + pytest7CheckHook ]; # Tests print “Fontconfig error: Cannot load default config file” From 064e5e034fd19fae4589c565fc28ee59c46b3bf0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:32:39 +0100 Subject: [PATCH 044/108] python311Packages.quart: test with pytest 7 --- pkgs/development/python-modules/quart/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix index 5a79054e8951..0d88a7ee3a1f 100644 --- a/pkgs/development/python-modules/quart/default.nix +++ b/pkgs/development/python-modules/quart/default.nix @@ -26,7 +26,7 @@ , mock , py , pytest-asyncio -, pytestCheckHook +, pytest7CheckHook }: buildPythonPackage rec { @@ -76,12 +76,7 @@ buildPythonPackage rec { mock py pytest-asyncio - pytestCheckHook - ]; - - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. - "-W" "ignore::pytest.PytestRemovedIn8Warning" + pytest7CheckHook ]; meta = with lib; { From 95f00d82f7ee7c8ef337ccdf5b732162d1ff46bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:34:32 +0100 Subject: [PATCH 045/108] python311Packages.librouteros: test with pytest 7 --- pkgs/development/python-modules/librouteros/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/librouteros/default.nix b/pkgs/development/python-modules/librouteros/default.nix index 5bb2072b7117..5ba5f86aab10 100644 --- a/pkgs/development/python-modules/librouteros/default.nix +++ b/pkgs/development/python-modules/librouteros/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest-xdist -, pytestCheckHook +, pytest7CheckHook , pythonOlder , setuptools }: @@ -27,12 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-xdist - pytestCheckHook - ]; - - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" + pytest7CheckHook ]; disabledTests = [ From 38edccbcb46ac3942f13986d9d1af4a2b880b4cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:41:47 +0100 Subject: [PATCH 046/108] python311Packages.kombu: test with pytest 7 --- pkgs/development/python-modules/kombu/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 1651d25c69ea..a6867075d9b5 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -15,7 +15,7 @@ , pycurl , pymongo #, pyro4 -, pytestCheckHook +, pytest7CheckHook , pythonOlder , pyyaml , redis @@ -89,14 +89,9 @@ buildPythonPackage rec { nativeCheckInputs = [ case hypothesis - pytestCheckHook + pytest7CheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - pythonImportsCheck = [ "kombu" ]; From aa83e777392ec833cf984ec6ea23ff3991042d12 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:43:24 +0100 Subject: [PATCH 047/108] python311Packages.barectf: test with pytest 7 --- pkgs/development/python-modules/barectf/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix index 9875cdf0ac1c..ed9be93dd021 100644 --- a/pkgs/development/python-modules/barectf/default.nix +++ b/pkgs/development/python-modules/barectf/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core -, pytestCheckHook +, pytest7CheckHook , pythonRelaxDepsHook , setuptools , jsonschema @@ -47,11 +47,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" + pytest7CheckHook ]; meta = with lib; { From 3bf5b41d2288acea755a8c758da4611e57d065a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:48:07 +0100 Subject: [PATCH 048/108] python311Packages.uarray: test with pytest7 and refactor to use PEP517 builder and lingo. --- .../python-modules/uarray/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 7429ed5750ac..ab22d07049c4 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -2,18 +2,19 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, setuptools , matchpy , numpy , astunparse , typing-extensions -, pytestCheckHook +, pytest7CheckHook , pytest-cov }: buildPythonPackage rec { pname = "uarray"; version = "0.8.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Quansight-Labs"; @@ -31,14 +32,32 @@ buildPythonPackage rec { } )]; - nativeCheckInputs = [ pytestCheckHook pytest-cov ]; - propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ]; + build-system = [ + setuptools + ]; + + dependencies = [ + astunparse + matchpy + numpy + typing-extensions + ]; + + nativeCheckInputs = [ + pytest7CheckHook + pytest-cov + ]; # Tests must be run from outside the source directory preCheck = '' cd $TMP ''; - pytestFlagsArray = ["--pyargs" "uarray" "-W" "ignore::pytest.PytestRemovedIn8Warning" ]; + + pytestFlagsArray = [ + "--pyargs" + "uarray" + ]; + pythonImportsCheck = [ "uarray" ]; meta = with lib; { From db5d5bb7535e48448793e5707068313cdeb035d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:49:31 +0100 Subject: [PATCH 049/108] python311Packages.json-tricks: test with pytest 7 --- pkgs/development/python-modules/json-tricks/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix index 2d348403c499..1576cd141d4e 100644 --- a/pkgs/development/python-modules/json-tricks/default.nix +++ b/pkgs/development/python-modules/json-tricks/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder -, pytestCheckHook +, pytest7CheckHook , numpy , pandas , pytz @@ -26,11 +26,7 @@ buildPythonPackage rec { numpy pandas pytz - pytestCheckHook - ]; - - pytestFlagsArray = [ - "-W" "ignore::pytest.PytestRemovedIn8Warning" + pytest7CheckHook ]; pythonImportsCheck = [ From e1feaa95441947ea7f5361a05b60a46b744820ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Mar 2024 23:51:22 +0100 Subject: [PATCH 050/108] radicale: test with pytest 7 --- pkgs/servers/radicale/3.x.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 92db274bf708..c9523233379e 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -35,15 +35,10 @@ python3.pkgs.buildPythonApplication rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook + pytest7CheckHook waitress ]; - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - passthru.tests = { inherit (nixosTests) radicale; }; From bfd67ec538ba4633d9774fab005b28d8ab245162 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 Mar 2024 02:01:11 +0100 Subject: [PATCH 051/108] python312Packages.starlette: 0.37.1 -> 0.37.2 https://www.starlette.io/release-notes/#0372 --- .../python-modules/starlette/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 6ea82d9b02a2..5bdc0c505a09 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchPypi # build-system , hatchling @@ -18,7 +17,6 @@ , httpx # tests -, pytest , pytestCheckHook , pythonOlder , trio @@ -29,7 +27,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.37.1"; + version = "0.37.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +36,7 @@ buildPythonPackage rec { owner = "encode"; repo = "starlette"; rev = "refs/tags/${version}"; - hash = "sha256-SJdBss1WKC30oulVTYUwUAJ8WM0KF5xbn/gvV97WM2g="; + hash = "sha256-GiCN1sfhLu9i19d2OcLZrlY8E64DFrFh+ITRSvLaxdE="; }; nativeBuildInputs = [ @@ -60,18 +58,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - (pytestCheckHook.override { - # pytest 8 changes warning message - # see https://github.com/encode/starlette/commit/8da52c2243b8855426c40c16ae24b27734824078 - pytest = pytest.overridePythonAttrs (old: rec { - version = "8.1.0"; - src = fetchPypi { - pname = "pytest"; - inherit version; - hash = "sha256-+PoEq4+Y0YUROuYOptecIvgUOxS8HK7O1EoKuESSgyM="; - }; - }); - }) + pytestCheckHook trio typing-extensions ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); From a184e834528ac729b8ea1c914008c351e766b0e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 25 Mar 2024 03:49:29 +0100 Subject: [PATCH 052/108] python311Packages.openpyxl: test with pytest 7 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 94252131d9a0..c8934bf888a1 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -5,7 +5,7 @@ , lxml , pandas , pillow -, pytestCheckHook +, pytest7CheckHook , pythonAtLeast , pythonOlder , setuptools @@ -38,7 +38,7 @@ buildPythonPackage rec { lxml pandas pillow - pytestCheckHook + pytest7CheckHook ]; pytestFlagsArray = [ From 44ee4bbc608e87646d7a37a9505527fe096b208b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 01:10:36 +0100 Subject: [PATCH 053/108] python312Packages.pytest-doctestplus: 1.2.0 -> 1.2.1 --- .../development/python-modules/pytest-doctestplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index c54179d9b690..ff5e1b0ef2b6 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xa12Oi+uXu5bZ4jPVedU1AQOxJsOIoj8ncmgFe+buTI="; + hash = "sha256-JHKoosjOo00vZfZJlUP663SO7LWcWXhS/ZiDm0cwdnk="; }; postPatch = '' From 8919ff737bba11de4c49d1b6ba96fb3cbf972765 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 01:13:30 +0100 Subject: [PATCH 054/108] python311Packages.pymeeus: refactor - normalize pname - use PEP517 builder and lingo - use pytest7CheckHook --- .../python-modules/pymeeus/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix index 821ad49e8206..8799de923245 100644 --- a/pkgs/development/python-modules/pymeeus/default.nix +++ b/pkgs/development/python-modules/pymeeus/default.nix @@ -1,8 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pytest7CheckHook +}: buildPythonPackage rec { pname = "pymeeus"; version = "0.5.12"; + pyproject = true; src = fetchPypi { pname = "PyMeeus"; @@ -10,11 +16,13 @@ buildPythonPackage rec { hash = "sha256-VI9xhr2LlsvAac9kmo6ON33OSax0SGcJhJ/mOpnK1oQ="; }; - nativeCheckInputs = [ pytest ]; + build-system = [ + setuptools + ]; - checkPhase = '' - pytest . - ''; + nativeCheckInputs = [ + pytest7CheckHook + ]; meta = with lib; { homepage = "https://github.com/architest/pymeeus"; From bc08c0d477b733e630633280c8a13d256cc51f31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 01:36:24 +0100 Subject: [PATCH 055/108] python311Packages.pylint: test with pytest 7 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 2d46d041df47..046277a5fa58 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -17,7 +17,7 @@ , py , pytest-timeout , pytest-xdist -, pytestCheckHook +, pytest7CheckHook }: buildPythonPackage rec { @@ -57,7 +57,7 @@ buildPythonPackage rec { py pytest-timeout pytest-xdist - pytestCheckHook + pytest7CheckHook requests typing-extensions ]; From 9664cf9671a75d08be356a39fe4380adecdffaa9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 02:24:41 +0100 Subject: [PATCH 056/108] python312Packages.protobuf3: fix tests --- pkgs/development/python-modules/protobuf/3.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/protobuf/3.nix b/pkgs/development/python-modules/protobuf/3.nix index d9e3cce5f918..9685ec88d99c 100644 --- a/pkgs/development/python-modules/protobuf/3.nix +++ b/pkgs/development/python-modules/protobuf/3.nix @@ -45,6 +45,9 @@ buildPythonPackage { # postPatch = '' sed -i "/extra_compile_args.append('-std=c++14')/d" setup.py + + substituteInPlace google/protobuf/internal/json_format_test.py \ + --replace-fail assertRaisesRegexp assertRaisesRegex ''; nativeBuildInputs = lib.optional isPyPy tzdata; From 354ccf49802d3313190756444d5a824b1af89c27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 02:55:31 +0100 Subject: [PATCH 057/108] python311Packages.limits: 3.9.0 -> 3.10.1 https://github.com/alisaifee/limits/releases/tag/3.10.1 --- pkgs/development/python-modules/limits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 4fafc1180baf..9849541282f8 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "limits"; - version = "3.9.0"; + version = "3.10.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-X4nf9ifhJjTNKnQuAxRNK9j/MzfAC58kv+19zMWtKg8="; + hash = "sha256-Ax0P9rYTPOrhtOw7FLElSNTGQ3WWCboM3FodTOGZWu8="; }; postPatch = '' From 48ff13dcd7901b98743c99661df5044554bd2d32 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 03:31:04 +0100 Subject: [PATCH 058/108] python312Packages.rpyc: fix tests --- pkgs/development/python-modules/rpyc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 7c9a13fc4d17..a5f0541cd918 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -34,6 +34,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export PYTHONPATH=$(pwd)/tests:$PYTHONPATH + ''; + disabledTests = [ # Disable tests that requires network access "test_api" From 3d3f4d4db50696d8059a383d555e8f676b857d75 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 04:12:51 +0100 Subject: [PATCH 059/108] python311Packages.rangehttpserver: test with pytest 7 --- pkgs/development/python-modules/rangehttpserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rangehttpserver/default.nix b/pkgs/development/python-modules/rangehttpserver/default.nix index bab8f73b412b..6fbcebbffed8 100644 --- a/pkgs/development/python-modules/rangehttpserver/default.nix +++ b/pkgs/development/python-modules/rangehttpserver/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools -, pytestCheckHook +, pytest7CheckHook , requests }: @@ -25,7 +25,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - pytestCheckHook + pytest7CheckHook requests ]; From 268640cf0d2ec2d8dc366600f949172fd37782f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 04:14:54 +0100 Subject: [PATCH 060/108] python311Packages.colorcet: fix build --- pkgs/development/python-modules/colorcet/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 0b64ccabdbe1..08951a18fc49 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, setuptools +, setuptools-scm , param , pyct , pytest-mpl @@ -10,14 +12,19 @@ buildPythonPackage rec { pname = "colorcet"; version = "3.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-KSGzzYGiKIqvLWPbwM48JtzYgujDicxQXWiGv3qppOs="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ param pyct ]; From 8b50e4c4be8b9ef81a77ce7915584355744a4422 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 04:31:17 +0100 Subject: [PATCH 061/108] python311Packages.smart-open: 7.0.1 -> 7.0.3 https://github.com/piskvorky/smart_open/releases/tag/v7.0.3 --- pkgs/development/python-modules/smart-open/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 53aa2d76f6aa..b9fe9338f1c9 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "7.0.1"; + version = "7.0.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "refs/tags/v${version}"; - hash = "sha256-yGy4xNoHCE+LclBBTMVtTKP6GYZ5w09NJ0OmsUPnir4="; + hash = "sha256-2G0sAAUc+fpEY/ggPSRbJjclSJwTFetKmMEBJcz8YFY="; }; build-system = [ @@ -88,6 +88,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/piskvorky/smart_open/releases/tag/v${version}"; description = "Library for efficient streaming of very large file"; homepage = "https://github.com/RaRe-Technologies/smart_open"; license = licenses.mit; From befeb64a9c8872bef95a4798468aa69f4353b24d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 04:42:04 +0100 Subject: [PATCH 062/108] python312Packages.pytest-bdd: 6.1.1 -> 7.1.2 https://github.com/pytest-dev/pytest-bdd/compare/refs/tags/6.1.1...7.1.2 --- .../python-modules/pytest-bdd/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index 3660dc709f31..82ece96bfc01 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , mako , parse , parse-type @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-bdd"; - version = "6.1.1"; + version = "7.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,17 +22,9 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+76jIgfDQPdIoesTr1+QUu8wmOnrdf4KT+TJr9F2Hqk="; + hash = "sha256-PC4VSsUU5qEFp/C/7OTgHINo8wmOo0w2d1Hpe0EnFzE="; }; - patches = [ - (fetchpatch { - name = "remove-setuptools.patch"; - url = "https://github.com/pytest-dev/pytest-bdd/commit/5d8eda3a30b47d3bd27849884a851adafca765cb.patch"; - hash = "sha256-G2WHaRKlQ9HINufh8wl7+ly7HfDGobMLzzlbwDwd+o8="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; From 928984152777e58c4dac6753d8fba09ee09b4d3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 04:45:26 +0100 Subject: [PATCH 063/108] python312Packages.langchain-core: 0.1.32 -> 0.1.33 --- pkgs/development/python-modules/langchain-core/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 350e9a903690..c217eaaaf89e 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.32"; + version = "0.1.33"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,11 +24,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-1iaDvsvyD1HxKHV5GgQjIPReqgyHomfTC8A7waB/XsI="; + hash = "sha256-VF7/Peg8xYIxvSsMbWcjI/wgd7lNMmuhoyGRGK8dGmY="; }; pythonRelaxDeps = [ "langsmith" + "packaging" ]; nativeBuildInputs = [ From 11e596c56d9c0e6519189aa740c60d6f571cc8ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 05:06:55 +0100 Subject: [PATCH 064/108] python311Packages.lz4: fix pname, use pep517 builder --- pkgs/development/python-modules/lz4/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 4110a96a3328..cf1ac6294499 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -6,20 +6,21 @@ , pytestCheckHook , python , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { - pname = "python-lz4"; + pname = "lz4"; version = "4.3.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; # get full repository in order to run tests src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "python-lz4"; + repo = "python-lz4"; rev = "refs/tags/v${version}"; hash = "sha256-ZvGUkb9DoheYY2/sejUhxgh2lS5eoBrFCXR4E0IcFcs="; }; @@ -28,9 +29,10 @@ buildPythonPackage rec { sed -i '/pytest-cov/d' setup.py ''; - nativeBuildInputs = [ + build-system = [ pkgconfig setuptools-scm + setuptools ]; pythonImportsCheck = [ @@ -46,7 +48,7 @@ buildPythonPackage rec { ]; # for lz4.steam - PYLZ4_EXPERIMENTAL = true; + env.PYLZ4_EXPERIMENTAL = true; # prevent local lz4 directory from getting imported as it lacks native extensions preCheck = '' From 4dd692fb1ae43b5a5effce061735e2088a9d87f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 15:56:25 +0100 Subject: [PATCH 065/108] python312Packages.protobuf: fix build --- pkgs/development/python-modules/protobuf/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 610313302ad8..73e013d00af8 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -60,6 +60,11 @@ buildPythonPackage { # postPatch = '' sed -i "/extra_compile_args.append('-std=c++14')/d" setup.py + + # The former function has been renamed into the latter in Python 3.12. + # Does not apply to all protobuf versions, hence --replace-warn. + substituteInPlace google/protobuf/internal/json_format_test.py \ + --replace-warn assertRaisesRegexp assertRaisesRegex ''; nativeBuildInputs = lib.optional isPyPy tzdata; From a87b43072d60300ce161f7bb445394d7c0dd5e34 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 16:07:42 +0100 Subject: [PATCH 066/108] python312Packages.nibabel: fix tests --- pkgs/development/python-modules/nibabel/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 7d8e021fd0cf..9b70a4fe2074 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , pythonOlder , hatchling , hatch-vcs @@ -15,7 +16,7 @@ , pytest-doctestplus , pytest-httpserver , pytest-xdist -, pytestCheckHook +, pytest7CheckHook }: buildPythonPackage rec { @@ -70,13 +71,18 @@ buildPythonPackage rec { pytest-doctestplus pytest-httpserver pytest-xdist - pytestCheckHook + pytest7CheckHook ] ++ passthru.optional-dependencies.all; preCheck = '' export PATH=$out/bin:$PATH ''; + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ + # uses distutils + "nisext/tests/test_sexts.py" + ]; + meta = with lib; { homepage = "https://nipy.org/nibabel"; changelog = "https://github.com/nipy/nibabel/blob/${version}/Changelog"; From 12da7d7d1913b83448b2cba81ed06fa63408b3ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 16:21:23 +0100 Subject: [PATCH 067/108] python312Packages.kubernetes: fix tests --- pkgs/development/python-modules/kubernetes/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index bb3bd33e469e..d91fda46f5a9 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -36,6 +36,11 @@ buildPythonPackage rec { hash = "sha256-NKrxv5a5gkgpNG7yViTKYBYnU249taWl6fkPJa7/Rzo="; }; + postPatch = '' + substituteInPlace ./kubernetes/base/config/kube_config_test.py \ + --replace-fail assertEquals assertEqual + ''; + propagatedBuildInputs = [ adal certifi From 1cc5891098190ad7568b89ab84580e9e3ed8e406 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 16:26:19 +0100 Subject: [PATCH 068/108] python311Packages.pydash: test with pytest 7 --- pkgs/development/python-modules/pydash/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix index 05ae5e165c27..b9ac4770f71e 100644 --- a/pkgs/development/python-modules/pydash/default.nix +++ b/pkgs/development/python-modules/pydash/default.nix @@ -1,10 +1,9 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub , invoke , mock -, pytestCheckHook +, pytest7CheckHook , pythonOlder , setuptools , sphinx-rtd-theme @@ -41,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ invoke mock - pytestCheckHook + pytest7CheckHook sphinx-rtd-theme ]; From e4156a9b61b9a1c95ba204417e5159889d331acf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Mar 2024 16:27:59 +0100 Subject: [PATCH 069/108] python312Packages.ed25519: disable --- pkgs/development/python-modules/ed25519/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index 7b2c20c39a04..745c2c38cd0d 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -1,10 +1,13 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, pythonAtLeast }: buildPythonPackage rec { pname = "ed25519"; version = "1.5"; format = "setuptools"; + # last commit in 2019, various compat issues with 3.12 + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182"; From 86fcd19953e0380435d085ca9e8fc183d1b180d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 03:44:52 +0100 Subject: [PATCH 070/108] python311Packages.palace: fix build, refactor --- .../python-modules/palace/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/palace/default.nix b/pkgs/development/python-modules/palace/default.nix index 09aa409a42c1..5529d344dfff 100644 --- a/pkgs/development/python-modules/palace/default.nix +++ b/pkgs/development/python-modules/palace/default.nix @@ -1,11 +1,19 @@ -{ lib, buildPythonPackage, fetchFromSourcehut, pythonOlder -, cmake, cython, alure2, typing-extensions +{ lib +, buildPythonPackage +, fetchFromSourcehut +, pythonOlder +, cmake +, cython_0 +, setuptools +, alure2 +, typing-extensions }: buildPythonPackage rec { pname = "palace"; version = "0.2.5"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromSourcehut { @@ -21,15 +29,20 @@ buildPythonPackage rec { --replace IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE ''; + build-system = [ + cmake + cython_0 + setuptools + ]; + dontUseCmakeConfigure = true; - nativeBuildInputs = [ cmake ]; - buildInputs = [ cython ]; - propagatedBuildInputs = [ alure2 ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions + propagatedBuildInputs = [ + alure2 ]; doCheck = false; # FIXME: tests need an audio device + pythonImportsCheck = [ "palace" ]; meta = with lib; { From 4913815067f023c627d1ebab0bc0b99c8e15c119 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 04:30:07 +0100 Subject: [PATCH 071/108] python311Packages.taskw: fix build, use pep517 build, reformat --- .../python-modules/taskw/default.nix | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 40acca5735e3..36ac9293e1d4 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -1,20 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, nose -, tox -, six -, python-dateutil -, kitchen -, pytestCheckHook -, pytz + +# build-system +, setuptools + +# native dependencies , pkgs + +# dependencies +, kitchen +, python-dateutil +, pytz + +# tests +, pytest7CheckHook }: buildPythonPackage rec { pname = "taskw"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -31,11 +37,19 @@ buildPythonPackage rec { --replace '@@taskwarrior@@' '${pkgs.taskwarrior}' ''; + build-system = [ + setuptools + ]; + buildInputs = [ pkgs.taskwarrior ]; - propagatedBuildInputs = [ six python-dateutil kitchen pytz ]; + dependencies = [ + kitchen + python-dateutil + pytz + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest7CheckHook ]; meta = with lib; { homepage = "https://github.com/ralphbean/taskw"; From 97011cdd1c9f3c8ac713e82653447a46830eb769 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 04:41:58 +0100 Subject: [PATCH 072/108] python311Packages.mido: fix build, set up optional dependencies --- .../python-modules/mido/default.nix | 42 +++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 90b5128e4747..b5375b4f1dff 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -3,12 +3,27 @@ , buildPythonPackage , fetchPypi , substituteAll -, portmidi -, python-rtmidi -, pytestCheckHook -, pythonOlder + +# build-system , setuptools , setuptools-scm +, pythonRelaxDepsHook + +# dependencies +, packaging + +# native dependencies +, portmidi + +# optional-dependencies +, pygame +, python-rtmidi +, rtmidi-python + +# tests +, pytestCheckHook +, pythonOlder + }: buildPythonPackage rec { @@ -20,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Ouootu1zD3N9WxLaNXjevp3FAFj6Nw/pzt7ZGJtnw0g="; + hash = "sha256-Ouootu1zD3N9WxLaNXjevp3FAFj6Nw/pzt7ZGJtnw0g="; }; patches = [ @@ -30,15 +45,26 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm + pythonRelaxDepsHook ]; - propagatedBuildInputs = [ - python-rtmidi + pythonRelaxDeps = [ + "packaging" ]; + dependencies = [ + packaging + ]; + + optional-dependencies = { + ports-pygame = [ pygame ]; + ports-rtmidi = [ python-rtmidi ]; + ports-rtmidi-python = [ rtmidi-python ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; From 4389e321d1279cdca7fdc01428cdf78fd58fcc90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 04:43:50 +0100 Subject: [PATCH 073/108] python312Packages.pytest-factoryboy: 2.5.1 -> 2.6.1 https://github.com/pytest-dev/pytest-factoryboy/compare/2.5.1...2.6.1 --- pkgs/development/python-modules/pytest-factoryboy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 349ccf311dde..c1a89dbe012e 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pytest-factoryboy"; - version = "2.5.1"; + version = "2.6.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-factoryboy"; rev = version; - sha256 = "sha256-zxgezo2PRBKs0mps0qdKWtBygunzlaxg8s9BoBaU1Ig="; + sha256 = "sha256-GYqYwtbmMWVqImVPPBbZNRJJGcbksUPsIbi6QuPRMco="; }; nativeBuildInputs = [ From 7dbce171d7296385b7df22d402e0bf50a49d27b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 04:56:39 +0100 Subject: [PATCH 074/108] python311Packages.python-zbar: fix build disable on Python 3.12. --- ...ython-enum-fix-build-for-Python-3.11.patch | 61 ------------------- .../python-modules/python-zbar/default.nix | 27 ++++---- 2 files changed, 15 insertions(+), 73 deletions(-) delete mode 100644 pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch diff --git a/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch b/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch deleted file mode 100644 index 11b554151790..000000000000 --- a/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 64de7911d2938fc3601fec39c08008465b9d4f6f Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Tue, 7 Feb 2023 17:12:50 +0800 -Subject: [PATCH] python: enum: fix build for Python 3.11 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Python 3.9 introduced Py_SET_SIZE function to set size instead of -relying on Py_SIZE() as a macro [3.9]. - -Python 3.10 started to encourage to use Py_SET_SIZE instead of -assigning into return value of Py_SIZE [3.10]. - -Python 3.11 flips the switch, turn Py_SIZE into a function [3.11], -thus Py_SIZE(obj) will be a rvalue. We need to use Py_SET_SIZE -to set size now. - -[3.9]: https://docs.python.org/3.9/c-api/structures.html#c.Py_SET_SIZE -[3.10]: https://docs.python.org/3.10/c-api/structures.html#c.Py_SIZE -[3.11]: https://docs.python.org/3.11/c-api/structures.html#c.Py_SIZE - -Adapted from https://github.com/mchehab/zbar/pull/231 - -Signed-off-by: Đoàn Trần Công Danh -Signed-off-by: Nick Cao ---- - python/enum.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/python/enum.c b/python/enum.c -index dfe1b1e..4833a20 100644 ---- a/python/enum.c -+++ b/python/enum.c -@@ -52,7 +52,11 @@ enumitem_new (PyTypeObject *type, - - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ -+#if PY_VERSION_HEX >= 0x030900A4 -+ Py_SET_SIZE(&self->val, Py_SIZE(longval)); -+#else - Py_SIZE(&self->val) = Py_SIZE(longval); -+#endif - self->val.ob_digit[0] = longval->ob_digit[0]; - Py_DECREF(longval); - #else -@@ -143,7 +147,11 @@ zbarEnumItem_New (PyObject *byname, - - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ -+#if PY_VERSION_HEX >= 0x030900A4 -+ Py_SET_SIZE(&self->val, Py_SIZE(longval)); -+#else - Py_SIZE(&self->val) = Py_SIZE(longval); -+#endif - self->val.ob_digit[0] = longval->ob_digit[0]; - Py_DECREF(longval); - --- -2.39.1 - diff --git a/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix index a7c28b2992d4..539823f064ac 100644 --- a/pkgs/development/python-modules/python-zbar/default.nix +++ b/pkgs/development/python-modules/python-zbar/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast +, setuptools , pillow , zbar , pytestCheckHook @@ -9,7 +11,10 @@ buildPythonPackage rec { pname = "python-zbar"; version = "0.23.93"; - format = "setuptools"; + pyproject = true; + + # distutils usage in setup.py + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "mchehab"; @@ -18,23 +23,18 @@ buildPythonPackage rec { hash = "sha256-6gOqMsmlYy6TK+iYPIBsCPAk8tYDliZYMYeTOidl4XQ="; }; - patches = [ - # python: enum: fix build for Python 3.11 - # https://github.com/mchehab/zbar/pull/231 - # the patch is reworked as it does not cleanly apply - ./0001-python-enum-fix-build-for-Python-3.11.patch - ]; + postPatch = '' + cd python + ''; - propagatedBuildInputs = [ pillow ]; + build-system = [ setuptools ]; + + dependencies = [ pillow ]; buildInputs = [ zbar ]; nativeCheckInputs = [ pytestCheckHook ]; - preBuild = '' - cd python - ''; - disabledTests = [ #AssertionError: b'Y800' != 'Y800' "test_format" @@ -42,6 +42,9 @@ buildPythonPackage rec { #Requires loading a recording device #zbar.SystemError: "test_processing" + # Version too long? + # self.assertEqual(len(ver), 2) + "test_version" ]; pythonImportsCheck = [ "zbar" ]; From 500ab0f102001d628ac575c840534aa9017a201e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 05:09:32 +0100 Subject: [PATCH 075/108] python311Packages.pynetdicom: test with pytest 7 --- pkgs/development/python-modules/pynetdicom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 4a78f020f3b7..65fcd8f98b7a 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -5,7 +5,7 @@ , fetchpatch , pydicom , pyfakefs -, pytestCheckHook +, pytest7CheckHook , sqlalchemy , pythonOlder }: @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pyfakefs - pytestCheckHook + pytest7CheckHook sqlalchemy ]; From 906f524a9dfd099d4e12cb78a2ddc6feb631b3d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 05:12:04 +0100 Subject: [PATCH 076/108] python311Packages.psd-tools: drop pytest cov parameters --- pkgs/development/python-modules/psd-tools/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index f9a59e620d90..0d4e6a68bd3a 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -28,6 +28,10 @@ buildPythonPackage rec { hash = "sha256-HUFJ2FP9WGcG9pkukS2LHIgPYFRAXAneiVK6VfYQ+zU="; }; + postPatch = '' + sed -i "/addopts =/d" pyproject.toml + ''; + nativeBuildInputs = [ cython ]; From afb3a23307ad261be9aceff3ac9fa60d402c8284 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 06:21:58 +0100 Subject: [PATCH 077/108] pretix: relax django-filter constraint --- pkgs/by-name/pr/pretix/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 7b238ff6f8e4..d5d59dd851a5 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -94,6 +94,7 @@ python.pkgs.buildPythonApplication rec { --replace-fail psycopg2-binary psycopg2 \ --replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \ --replace-fail "bleach==5.0.*" bleach \ + --replace-fail "django-filter==23.5" django-filter \ --replace-fail "dnspython==2.5.*" dnspython \ --replace-fail "importlib_metadata==7.*" importlib_metadata \ --replace-fail "protobuf==4.25.*" protobuf \ @@ -107,7 +108,6 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ gettext nodejs - pythonRelaxDepsHook setuptools tomli ]; From 107e42fe1a824bd73a628db4f7bf341a38fe5286 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 06:22:23 +0100 Subject: [PATCH 078/108] pretalx: relax django-filter constraint --- pkgs/by-name/pr/pretalx/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index bea6f3cc41c4..faf0d0912aee 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -86,6 +86,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "django-csp" + "django-filter" "python-dateutil" ]; From 1aaa4413765f3155455c08b948c06db232a98a28 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 06:29:55 +0100 Subject: [PATCH 079/108] python311Packages.betterproto: test with pytest 7 --- pkgs/development/python-modules/betterproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index e1d9f75a9a90..32b19be4dc4c 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -10,7 +10,7 @@ , isort , python , pydantic -, pytestCheckHook +, pytest7CheckHook , pytest-asyncio , pytest-mock , typing-extensions @@ -53,7 +53,7 @@ buildPythonPackage rec { pydantic pytest-asyncio pytest-mock - pytestCheckHook + pytest7CheckHook tomlkit ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); From 34c24ad3c178092e674fb413505d8f4ad4e85439 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 06:41:00 +0100 Subject: [PATCH 080/108] python311Packages.chart-studio: fix hash --- pkgs/development/python-modules/chart-studio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 998174d6ccbb..4f78d8728120 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-LSZGaefxQC6h9VAJ2wgZyaQPR6vs0wrp2oxd51I3pL8="; + hash = "sha256-i//LKTNmoIrusBnpfSGc9cDijPxg/dY/7fumV3kfTAY="; }; sourceRoot = "${src.name}/packages/python/chart-studio"; From 729d8031257e18718820d0af80b048d69018f5fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 06:41:17 +0100 Subject: [PATCH 081/108] python311Packages.awswrangler: relax packaging constraint --- pkgs/development/python-modules/awswrangler/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 7cd356214d56..17453da82d32 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -19,6 +19,7 @@ , pyparsing , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , redshift-connector , requests-aws4auth }: @@ -39,6 +40,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "packaging" ]; propagatedBuildInputs = [ From 1c1182c2e2152d60c54988942898fd292092177a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 15:26:26 +0100 Subject: [PATCH 082/108] python311Packages.mlflow: relax packaging constraint --- pkgs/development/python-modules/mlflow/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 0a0efaab4372..7e25db19ffcb 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -56,7 +56,11 @@ buildPythonPackage rec { setuptools ]; pythonRemoveDeps = [ "shap" ]; - pythonRelaxDeps = [ "pytz" "pyarrow" ]; + pythonRelaxDeps = [ + "packaging" + "pytz" + "pyarrow" + ]; propagatedBuildInputs = [ alembic From ceaf99b977750cf1cc245cfc26784d2df91a32cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 15:29:04 +0100 Subject: [PATCH 083/108] python312Packages.logical-unification: disable failing test --- .../python-modules/logical-unification/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix index c129202dbf16..adc6141f11db 100644 --- a/pkgs/development/python-modules/logical-unification/default.nix +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , toolz , multipledispatch , py @@ -33,6 +34,11 @@ buildPythonPackage rec { pytest-benchmark # Needed for the `--benchmark-skip` flag ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # Failed: DID NOT RAISE + "test_reify_recursion_limit" + ]; + pytestFlagsArray = [ "--benchmark-skip" "--html=testing-report.html" From d23258c45d54c2e9a26bf8ec759cd5d5ffdb545c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 15:32:43 +0100 Subject: [PATCH 084/108] python311Packages.dbt-core: relax pathspec constraint --- pkgs/development/python-modules/dbt-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index b537da2a3055..7c6d8e1ebc15 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { "mashumaro" "networkx" "logbook" + "pathspec" "urllib3" ]; From f76b61649553ee825db81a9aad49f768ac794263 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 15:33:38 +0100 Subject: [PATCH 085/108] python311Packages.nampa: test with pytest 7 --- pkgs/development/python-modules/nampa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix index d5d411728315..a48cb4f222d4 100644 --- a/pkgs/development/python-modules/nampa/default.nix +++ b/pkgs/development/python-modules/nampa/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , future -, pytestCheckHook +, pytest7CheckHook }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + pytest7CheckHook ]; postPatch = '' From bfdfb5476a5c65b10bb2d64a9948c6834386e40e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 15:45:25 +0100 Subject: [PATCH 086/108] python311Packages.sparse: fix build --- .../python-modules/sparse/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 1ecf340e975e..c2a15ff80535 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -4,15 +4,17 @@ , fetchPypi , numba , numpy -, pytestCheckHook +, pytest7CheckHook , pythonOlder +, setuptools +, setuptools-scm , scipy }: buildPythonPackage rec { pname = "sparse"; version = "0.15.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +23,16 @@ buildPythonPackage rec { hash = "sha256-lzrcuIqNuOPYBHlTMx4m0/ZKVlf5tGprhZxHZjw+75k="; }; - propagatedBuildInputs = [ + postPatch = '' + sed -i "/addopts =/d" pytest.ini + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ numba numpy scipy @@ -29,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ dask - pytestCheckHook + pytest7CheckHook ]; pythonImportsCheck = [ From 6678c6bb08eb607ad755509d3f894a710a117828 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 15:53:55 +0100 Subject: [PATCH 087/108] python311Packages.razdel: test with pytest 7 --- pkgs/development/python-modules/razdel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/razdel/default.nix b/pkgs/development/python-modules/razdel/default.nix index 0c9ade3931f8..519abbd734f4 100644 --- a/pkgs/development/python-modules/razdel/default.nix +++ b/pkgs/development/python-modules/razdel/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook +, pytest7CheckHook }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { hash = "sha256-QzTA/f401OiIzw7YVJaMnfFPClR9+Qmnf0Y0+f/mJuY="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest7CheckHook ]; pytestFlagsArray = [ "razdel" ]; pythonImportsCheck = [ "razdel" ]; From 6510f6425912d13091138dfc24227bb9a5393090 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 16:04:25 +0100 Subject: [PATCH 088/108] python311Packages.shlib: fix build --- .../python-modules/shlib/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/shlib/default.nix b/pkgs/development/python-modules/shlib/default.nix index a29ba450df8d..81ffccead0e4 100644 --- a/pkgs/development/python-modules/shlib/default.nix +++ b/pkgs/development/python-modules/shlib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , pytestCheckHook , braceexpand , inform @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "shlib"; version = "1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "KenKundert"; @@ -18,18 +19,25 @@ buildPythonPackage rec { hash = "sha256-f2jJgpjybutCpYnIT+RihtoA1YlXdhTs+MvV8bViSMQ="; }; - pythonImportsCheck = [ "shlib" ]; postPatch = '' patchShebangs . ''; - nativeCheckInputs = [ - pytestCheckHook + + build-system = [ + flit-core ]; - propagatedBuildInputs = [ + + dependencies = [ braceexpand inform ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "shlib" ]; + meta = with lib; { description = "shell library"; homepage = "https://github.com/KenKundert/shlib"; From dccedfd9eaf39bdfd92f3876a1c2317f2f7c2ee4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 16:05:28 +0100 Subject: [PATCH 089/108] python311Packages.sqlmodel: test with pytest 7 --- pkgs/development/python-modules/sqlmodel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix index fb5f6fd185a9..8ef0af8582a8 100644 --- a/pkgs/development/python-modules/sqlmodel/default.nix +++ b/pkgs/development/python-modules/sqlmodel/default.nix @@ -6,7 +6,7 @@ , poetry-core , pydantic , pytest-asyncio -, pytestCheckHook +, pytest7CheckHook , pythonOlder , sqlalchemy }: @@ -38,7 +38,7 @@ buildPythonPackage rec { dirty-equals fastapi pytest-asyncio - pytestCheckHook + pytest7CheckHook ]; pythonImportsCheck = [ From 6c72529eaee3d4ee9f9595eaa975ba55960baa02 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 17:02:57 +0100 Subject: [PATCH 090/108] vyper: relax packaging constraint --- pkgs/development/compilers/vyper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index fb83f299bd8c..078cb7dac925 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "asttokens" + "packaging" ]; propagatedBuildInputs = [ From ae7d16c46ba277f23aaa9fa8a126319e810d3120 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 17:07:06 +0100 Subject: [PATCH 091/108] streamlit: relax packaging constraint --- pkgs/development/python-modules/streamlit/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 94144c92ab08..4ce529ef5c06 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -18,6 +18,7 @@ , pympler , python-dateutil , pythonOlder +, pythonRelaxDepsHook , setuptools , requests , rich @@ -44,6 +45,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "packaging" ]; propagatedBuildInputs = [ From 44ebcb5ea735c651f8620a744f283dde3e933ce0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 17:12:26 +0100 Subject: [PATCH 092/108] virt-manager: test with pytest 7 --- pkgs/applications/virtualization/virt-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 3e0c24877fdf..813e77db435c 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { ''; nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook + pytest7CheckHook cpio cdrtools xorriso From 5e66d3a50c5cfded493dc1718dbae5600e1577b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 17:13:30 +0100 Subject: [PATCH 093/108] python311Packages.rmscene: relax packaging constraint --- pkgs/development/python-modules/rmscene/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/rmscene/default.nix b/pkgs/development/python-modules/rmscene/default.nix index 9e6bba74d05b..a7eb4d2c632c 100644 --- a/pkgs/development/python-modules/rmscene/default.nix +++ b/pkgs/development/python-modules/rmscene/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , pythonOlder +, pythonRelaxDepsHook , fetchFromGitHub , poetry-core , packaging @@ -24,6 +25,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "packaging" ]; propagatedBuildInputs = [ From b879dfd10fe62166e2f514b54d34831d8088eec6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 17:22:38 +0100 Subject: [PATCH 094/108] python311Packages.woob: relax packaging constraint --- pkgs/development/python-modules/woob/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 0887533adb9a..abc876b388a8 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -2,7 +2,7 @@ , babel , buildPythonPackage , fetchFromGitLab -, fetchpatch +, pythonRelaxDepsHook , html2text , lxml , packaging @@ -37,6 +37,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "packaging" ]; propagatedBuildInputs = [ From 98d8acbcf1e6b8c553606130112a2b20ba212bff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 17:46:55 +0100 Subject: [PATCH 095/108] python312Packages.notus-scanner: relax packaging constraint --- pkgs/development/python-modules/notus-scanner/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index 263aebada6a5..51a41bedc920 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { }; pythonRelaxDeps = [ + "packaging" "python-gnupg" ]; From d675450a98141a6267c2ff1e4c0d15caddea0636 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 17:59:54 +0100 Subject: [PATCH 096/108] python311Packages.diffsync: relax packaging constraint --- pkgs/development/python-modules/diffsync/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix index 877322259c42..ff96650b920f 100644 --- a/pkgs/development/python-modules/diffsync/default.nix +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { pythonRelaxDepsHook ]; + pythonRelaxDeps = [ + "packaging" + "structlog" + ]; + propagatedBuildInputs = [ colorama packaging @@ -35,10 +40,6 @@ buildPythonPackage rec { structlog ]; - pythonRelaxDeps = [ - "structlog" - ]; - pythonImportsCheck = [ "diffsync" ]; From bcec8bc401307cba004c94f8b44de52864360840 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 18:01:46 +0100 Subject: [PATCH 097/108] python311Packages.flet: relax packaging constraint --- pkgs/development/python-modules/flet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 0dbed81022a6..3e9a7d1f7bf0 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -36,9 +36,10 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "websockets" "cookiecutter" + "packaging" "watchdog" + "websockets" ]; propagatedBuildInputs = [ From 607215653b1ff0bc745c4685ddc6bf4e8843d7df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 18:16:51 +0100 Subject: [PATCH 098/108] onlykey-cli: don't propagate cython Propagating it will lead to multiple cython versions in the PYTHONPATH, which will fail the build during pythonCatchConflictsPhase. --- pkgs/tools/security/onlykey-cli/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/tools/security/onlykey-cli/default.nix index 624290c6d555..6d43a4df4aff 100644 --- a/pkgs/tools/security/onlykey-cli/default.nix +++ b/pkgs/tools/security/onlykey-cli/default.nix @@ -10,9 +10,12 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-ZmQnyZx9YlIIxMMdZ0U2zb+QANfcwrtG7iR1LpgzmBQ="; }; + build-system = with python3Packages; [ + cython + ]; + propagatedBuildInputs = with python3Packages; [ aenum - cython ecdsa hidapi onlykey-solo-python From 3ef70b3fcf347b09cd954d7a84c7921c38f4cb68 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 18:18:49 +0100 Subject: [PATCH 099/108] python311Packages.hidapi: don't propagate cython --- pkgs/development/python-modules/hidapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 84f62c239c8b..6ad7b62d05a8 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -19,10 +19,10 @@ buildPythonPackage rec { sha256 = "a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be"; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; + nativeBuildInputs = [ cython_0 ] + ++ lib.optionals stdenv.isDarwin [ xcbuild ]; - propagatedBuildInputs = [ cython_0 ] - ++ lib.optionals stdenv.isLinux [ libusb1 udev ] + propagatedBuildInputs = lib.optionals stdenv.isLinux [ libusb1 udev ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]); # Fix the USB backend library lookup From 1118661647cec194c691fbc52da9f06d5fe33df2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 18:23:06 +0100 Subject: [PATCH 100/108] gnome-extensions-cli: relax packaging constraint --- pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix b/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix index 03f5075a791f..e7d18a0d3c0d 100644 --- a/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix @@ -33,6 +33,7 @@ buildPythonApplication rec { pythonRelaxDeps = [ "more-itertools" + "packaging" ]; propagatedBuildInputs = [ From 6575699cbb0d83f30208d33eeb52d7a1f0289c27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 18:24:10 +0100 Subject: [PATCH 101/108] git-up: test with pytest 7 --- pkgs/applications/version-management/git-up/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 851cb8464c5b..5f91aacf63d8 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication rec { nativeCheckInputs = [ git - pythonPackages.pytestCheckHook + pythonPackages.pytest7CheckHook ]; # 1. git fails to run as it cannot detect the email address, so we set it From 50e0624367e00e058a4b749d08f66aeb49bd4372 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 18:29:00 +0100 Subject: [PATCH 102/108] electron-cash: don't propagate cython Propagating it will lead to multiple cython versions in the PYTHONPATH, which will fail the build during pythonCatchConflictsPhase. --- pkgs/applications/misc/electron-cash/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index f28d1bf7e043..f8914a7bb8f4 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -12,6 +12,10 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-xOyj5XerOwgfvI0qj7+7oshDvd18h5IeZvcJTis8nWo="; }; + build-system = with python3Packages; [ + cython + ]; + propagatedBuildInputs = with python3Packages; [ # requirements pyaes @@ -36,7 +40,6 @@ python3Packages.buildPythonApplication rec { cryptography # requirements-hw - cython trezor keepkey btchip-python From 82d206fbb5f3b36daff73d0b29a2b12439e3122a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Mar 2024 18:34:40 +0100 Subject: [PATCH 103/108] checkov: relax packaging constraint --- pkgs/development/tools/analysis/checkov/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index a29cd3f894ed..1a1a963e3f8e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { "networkx" "openai" "packageurl-python" + "packaging" "pycep-parser" "termcolor" ]; From d34e8544edb0fd768c945b6c1c4128843e979f14 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 28 Mar 2024 02:24:45 +0100 Subject: [PATCH 104/108] python311Packages.smart-open: 7.0.3 -> 7.0.4 https://github.com/piskvorky/smart_open/releases/tag/v7.0.4 --- pkgs/development/python-modules/smart-open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index b9fe9338f1c9..b9622276bdf8 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "7.0.3"; + version = "7.0.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "refs/tags/v${version}"; - hash = "sha256-2G0sAAUc+fpEY/ggPSRbJjclSJwTFetKmMEBJcz8YFY="; + hash = "sha256-4HOTaF6AKXGlVCvSGKnnaH73aa4IO0aRxz03XQ4gSd8="; }; build-system = [ From 0ba196c57c178744b8abbb7dfb3312659ba4b654 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 28 Mar 2024 02:27:10 +0100 Subject: [PATCH 105/108] python311Packages.chex: 0.1.85 -> 0.1.86 https://github.com/google-deepmind/chex/releases/tag/v0.1.86 --- pkgs/development/python-modules/chex/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 559d047032c6..08ce0916c25e 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , absl-py , cloudpickle , dm-tree @@ -15,8 +16,8 @@ buildPythonPackage rec { pname = "chex"; - version = "0.1.85"; - format = "setuptools"; + version = "0.1.86"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -24,10 +25,14 @@ buildPythonPackage rec { owner = "deepmind"; repo = "chex"; rev = "refs/tags/v${version}"; - hash = "sha256-7k/+2dNNbPBXtbabuOEVpAI7T1SuM4JDf074dmTg/vs="; + hash = "sha256-Z5Ns4fG5pC99I4xdGjDMKX6YZpTtd1y0TWcIOtr7dug="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ absl-py jaxlib jax From 7b09e8e8d5b2951a42e8f1eb1dbc676d02844859 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 28 Mar 2024 02:46:11 +0100 Subject: [PATCH 106/108] python312Packages.openstep-plist: 0.3.0.post1 -> 0.3.1 https://github.com/fonttools/openstep-plist/releases/tag/v0.3.1 --- .../python-modules/openstep-plist/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix index fc37d86016f6..7921023f2942 100644 --- a/pkgs/development/python-modules/openstep-plist/default.nix +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -1,28 +1,39 @@ { lib , buildPythonPackage , fetchPypi +, cython +, setuptools , setuptools-scm , pytestCheckHook -, cython_0 }: buildPythonPackage rec { pname = "openstep-plist"; - version = "0.3.0.post1"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; src = fetchPypi { pname = "openstep_plist"; inherit version; - hash = "sha256-GK/z1e3tnr++3+ukRKPASDJGl7+KObsENhwN1Tv+qws="; - extension = "zip"; + hash = "sha256-Au6taO+57Ost4slTlwc86A/ImFXZerZRab2S/ENo5PI="; }; - nativeBuildInputs = [ setuptools-scm cython_0 ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "openstep_plist" ]; + build-system = [ + cython + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "openstep_plist" + ]; meta = { + changelog = "https://github.com/fonttools/openstep-plist/releases/tag/v${version}"; description = "Parser for the 'old style' OpenStep property list format also known as ASCII plist"; homepage = "https://github.com/fonttools/openstep-plist"; license = lib.licenses.mit; From 92a268479041f2556e873ab4b05a5da1b6274e59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 28 Mar 2024 03:10:00 +0100 Subject: [PATCH 107/108] python312Packages.pathtools: disable --- pkgs/development/python-modules/pathtools/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix index 754669eb42fe..453dc9df36ef 100644 --- a/pkgs/development/python-modules/pathtools/default.nix +++ b/pkgs/development/python-modules/pathtools/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast }: buildPythonPackage rec { @@ -8,6 +9,9 @@ buildPythonPackage rec { version = "0.1.2"; format = "setuptools"; + # imp and distuils usage, last commit in 2016 + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; sha256 = "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw"; From 2a1c9c5062deadc5d82755b89b2ee4d3afb7364e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 28 Mar 2024 03:35:25 +0100 Subject: [PATCH 108/108] miniplayer: fix build --- pkgs/applications/audio/miniplayer/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/miniplayer/default.nix b/pkgs/applications/audio/miniplayer/default.nix index 018fd6c8b78f..e3837baeca04 100644 --- a/pkgs/applications/audio/miniplayer/default.nix +++ b/pkgs/applications/audio/miniplayer/default.nix @@ -15,7 +15,11 @@ buildPythonApplication rec { hash = "sha256-iUUsVIDLQAiaMomfA2LvvJZ2ePhgADtC6GCwIpRC1MA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ colorthief ffmpeg-python mpd2 @@ -25,6 +29,8 @@ buildPythonApplication rec { ueberzug ]; + doCheck = false; # no tests + # pythonImportsCheck is disabled because this package doesn't expose any modules. meta = with lib; {