diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index c0ddb81a1920..368bb2cc2f85 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, setuptools-scm, fusepy, fuse, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "acme-tiny"; version = "5.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,12 +20,15 @@ buildPythonPackage rec { }; patchPhase = '' - substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/utils.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf + substituteInPlace acme_tiny.py --replace-fail '"openssl"' '"${openssl.bin}/bin/openssl"' + substituteInPlace tests/test_module.py --replace-fail '"openssl"' '"${openssl.bin}/bin/openssl"' + substituteInPlace tests/utils.py --replace-fail /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf ''; - buildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; nativeCheckInputs = [ fusepy diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index 7ef10347207c..ad33e08ef8a9 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, docopt, fetchFromGitHub, + setuptools, jdk11, psutil, pythonOlder, @@ -11,25 +12,27 @@ buildPythonPackage rec { pname = "adb-enhanced"; version = "2.5.24"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ashishb"; - repo = pname; + repo = "adb-enhanced"; rev = "refs/tags/${version}"; hash = "sha256-0HxeL6VGM+HTiAxs3NFRcEFbmH9q+0/pJdGyF1hl4hU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ psutil docopt ]; postPatch = '' substituteInPlace adbe/adb_enhanced.py \ - --replace "cmd = 'java" "cmd = '${jdk11}/bin/java" + --replace-fail "cmd = 'java" "cmd = '${jdk11}/bin/java" ''; # Disable tests because they require a dedicated Android emulator diff --git a/pkgs/development/python-modules/aiolip/default.nix b/pkgs/development/python-modules/aiolip/default.nix index 5baebc529b02..06c23bc68bea 100644 --- a/pkgs/development/python-modules/aiolip/default.nix +++ b/pkgs/development/python-modules/aiolip/default.nix @@ -3,26 +3,29 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + setuptools, pythonOlder, }: buildPythonPackage rec { pname = "aiolip"; version = "1.1.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "aiolip"; rev = version; sha256 = "1bgmcl8q1p6f2xm3w2qylvla6vf6bd1p2hfwj4l8w6w0w04vr02g"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' - substituteInPlace setup.py --replace "'pytest-runner'," "" + substituteInPlace setup.py --replace-fail "'pytest-runner'," "" ''; pythonImportsCheck = [ "aiolip" ]; diff --git a/pkgs/development/python-modules/ambee/default.nix b/pkgs/development/python-modules/ambee/default.nix index 45dbce4ff1d4..91cf9f27b2e1 100644 --- a/pkgs/development/python-modules/ambee/default.nix +++ b/pkgs/development/python-modules/ambee/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ambee"; version = "0.4.0"; disabled = pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "frenck"; @@ -25,9 +25,9 @@ buildPythonPackage rec { hash = "sha256-2wX2CLr6kdVw2AGPW6DmYI2OBfQFI/iWVorok2d3wx4="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp yarl ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" + --replace-fail "0.0.0" "${version}" ''; pythonImportsCheck = [ "ambee" ]; diff --git a/pkgs/development/python-modules/atc-ble/default.nix b/pkgs/development/python-modules/atc-ble/default.nix index 76e572401904..1b099a8d0f41 100644 --- a/pkgs/development/python-modules/atc-ble/default.nix +++ b/pkgs/development/python-modules/atc-ble/default.nix @@ -6,6 +6,7 @@ poetry-core, pycryptodomex, pytestCheckHook, + pytest-cov-stub, pythonOlder, sensor-state-data, }: @@ -13,31 +14,29 @@ buildPythonPackage rec { pname = "atc-ble"; version = "0.1.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "atc-ble"; rev = "refs/tags/v${version}"; hash = "sha256-rwOFKxUlbbNIDJRdCmZpHstXwxcTnvlExgcVDdGbIVY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=atc_ble --cov-report=term-missing:skip-covered" "" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ bluetooth-sensor-state-data pycryptodomex sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "atc_ble" ]; diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index 0ecb14291c3a..f9e843ec7a57 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -8,6 +8,7 @@ orjson, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, syrupy, @@ -33,8 +34,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" + --replace-fail "0.0.0" "${version}" ''; build-system = [ poetry-core ]; @@ -51,6 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook syrupy ]; diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix index a2e9c344c564..cc85bb4611a6 100644 --- a/pkgs/development/python-modules/avro3k/default.nix +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -2,13 +2,14 @@ lib, buildPythonPackage, fetchPypi, + setuptools, isPy3k, }: buildPythonPackage rec { pname = "avro3k"; version = "1.7.7-SNAPSHOT"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchPypi { @@ -19,9 +20,11 @@ buildPythonPackage rec { # setuptools.extern.packaging.version.InvalidVersion: Invalid version: '1.7.7-SNAPSHOT' postPatch = '' substituteInPlace setup.py \ - --replace "1.7.7-SNAPSHOT" "1.7.7" + --replace-fail "1.7.7-SNAPSHOT" "1.7.7" ''; + build-system = [ setuptools ]; + doCheck = false; # No such file or directory: './run_tests.py meta = with lib; { diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index 8668ecb99d52..93875a62e84e 100644 --- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrestazure, azure-common, azure-mgmt-core, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-commerce"; version = "6.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,7 +20,9 @@ buildPythonPackage rec { sha256 = "6f5447395503b2318f451d24f8021ee08db1cac44f1c3337ea690700419626b6"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrestazure azure-common azure-mgmt-core @@ -28,8 +31,6 @@ buildPythonPackage rec { prePatch = '' rm -f azure_bdist_wheel.py tox.ini - substituteInPlace setup.py \ - --replace "wheel==0.30.0" "wheel" sed -i "/azure-namespace-package/c\ " setup.cfg ''; @@ -43,8 +44,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Commerce Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ - maxwilson - ]; + maintainers = with maintainers; [ maxwilson ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index b300fe7f17b6..5e47775d2b1e 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrestazure, azure-common, azure-mgmt-core, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-consumption"; version = "10.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,7 +20,9 @@ buildPythonPackage rec { hash = "sha256-BqCGQ2wXN/d6uGiU1R9Zc7bg+l7fVlWOTCllieurkTA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrestazure azure-common azure-mgmt-core @@ -28,8 +31,6 @@ buildPythonPackage rec { preBuild = '' rm -f azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-nspkg" "" ''; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index ced59697c8e3..0086fa381973 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrestazure, azure-common, azure-mgmt-core, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-relay"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,7 +20,9 @@ buildPythonPackage rec { sha256 = "c93b7550e64b6734bf23ce57ca974a3ea929b734c58d1fe3669728c4fd2d2eb3"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrestazure azure-common azure-mgmt-core @@ -28,8 +31,6 @@ buildPythonPackage rec { preBuild = '' rm -f azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-nspkg" "" ''; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index e07567ff1be0..6c02b8e8cb20 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, pytestCheckHook, future, numpy, @@ -16,18 +17,20 @@ buildPythonPackage rec { pname = "batchgenerators"; version = "0.25"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MIC-DKFZ"; - repo = pname; + repo = "batchgenerators"; rev = "v${version}"; hash = "sha256-L2mWH2t8PN9o1M67KDdl1Tj2ZZ02MY4icsJY2VNrj3A="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ future numpy pillow @@ -38,10 +41,7 @@ buildPythonPackage rec { ]; # see https://github.com/MIC-DKFZ/batchgenerators/pull/78 - postPatch = '' - substituteInPlace setup.py \ - --replace '"unittest2",' "" - ''; + pythonRemoveDeps = [ "unittest2" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 65190dcca668..d3a7b7213d6b 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "block-io"; version = "2.0.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -22,7 +22,11 @@ buildPythonPackage rec { hash = "sha256-M7czfpagXqoWWSu4enB3Z2hc2GtAaskI6cnJzJdpC8I="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "base58" ]; + + dependencies = [ base58 bitcoin-utils-fork-minimal pycryptodome @@ -30,11 +34,6 @@ buildPythonPackage rec { setuptools ]; - preConfigure = '' - substituteInPlace setup.py \ - --replace "base58==2.1.0" "base58>=2.1.0" - ''; - # Tests needs a BlockIO API key to run properly # https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18 doCheck = false; diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix index d9936a7593e9..9be58802c5e3 100644 --- a/pkgs/development/python-modules/boiboite-opener-framework/default.nix +++ b/pkgs/development/python-modules/boiboite-opener-framework/default.nix @@ -23,10 +23,7 @@ buildPythonPackage rec { hash = "sha256-atKqHRX24UjF/9Dy0aYXAN+80nBJKCd07FmaR5Vl1q4="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "scapy==2.5.0rc1" "scapy" - ''; + pythonRelaxDeps = [ "scapy" ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/celery-singleton/default.nix b/pkgs/development/python-modules/celery-singleton/default.nix index de011ca70d0b..3d75770e932a 100644 --- a/pkgs/development/python-modules/celery-singleton/default.nix +++ b/pkgs/development/python-modules/celery-singleton/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "celery-singleton"; version = "0.3.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "steinitzu"; @@ -33,9 +33,9 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ celery redis ]; diff --git a/pkgs/development/python-modules/cemm/default.nix b/pkgs/development/python-modules/cemm/default.nix index 83ff151d7c8b..39159b404162 100644 --- a/pkgs/development/python-modules/cemm/default.nix +++ b/pkgs/development/python-modules/cemm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cemm"; version = "0.5.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -38,12 +38,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' + --replace-fail '"0.0.0"' '"${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp yarl ]; diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 1643c6acfa47..478591d51df3 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "ciscoconfparse"; version = "1.7.24"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mpenning"; - repo = pname; + repo = "ciscoconfparse"; rev = "refs/tags/${version}"; hash = "sha256-vL/CQdYcOP356EyRToviWylP1EBtxmeov6qkhfQNZ2Y="; }; @@ -35,16 +35,14 @@ buildPythonPackage rec { sed -i '/requires-python/d' pyproject.toml substituteInPlace pyproject.toml \ - --replace '"poetry>=1.3.2",' "" + --replace-fail '"poetry>=1.3.2",' "" patchShebangs tests ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ passlib deprecat dnspython diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 89e85bcd7b0b..7f06b59df3e2 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -3,6 +3,7 @@ jdk8, buildPythonPackage, fetchPypi, + setuptools, six, py4j, pythonOlder, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "databricks-connect"; version = "11.3.33"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,9 @@ buildPythonPackage rec { sourceRoot = "."; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ py4j six jdk8 @@ -31,14 +34,11 @@ buildPythonPackage rec { # requires network access doCheck = false; - prePatch = '' - substituteInPlace setup.py \ - --replace "py4j==0.10.9" "py4j" - ''; + pythonRelaxDeps = [ "py4j" ]; preFixup = '' substituteInPlace "$out/bin/find-spark-home" \ - --replace find_spark_home.py .find_spark_home.py-wrapped + --replace-fail find_spark_home.py .find_spark_home.py-wrapped ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/django-payments/default.nix b/pkgs/development/python-modules/django-payments/default.nix index 714bc0253bfe..935808b32c79 100644 --- a/pkgs/development/python-modules/django-payments/default.nix +++ b/pkgs/development/python-modules/django-payments/default.nix @@ -9,6 +9,7 @@ mercadopago, pythonOlder, requests, + setuptools, setuptools-scm, sphinx-rtd-theme, stripe, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "django-payments"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,12 +32,15 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "django-phonenumber-field[phonenumberslite]" "django-phonenumber-field" + --replace-fail "django-phonenumber-field[phonenumberslite]" "django-phonenumber-field" ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ django django-phonenumber-field requests diff --git a/pkgs/development/python-modules/django-scim2/default.nix b/pkgs/development/python-modules/django-scim2/default.nix index 2c9c2922f481..bb4b5d7c508c 100644 --- a/pkgs/development/python-modules/django-scim2/default.nix +++ b/pkgs/development/python-modules/django-scim2/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "django-scim2"; version = "0.19.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "15five"; - repo = pname; + repo = "django-scim2"; rev = "refs/tags/${version}"; hash = "sha256-larDh4f9/xVr11/n/WfkJ2Tx45DMQqyK3ZzkWAvzeig="; }; @@ -31,13 +31,13 @@ buildPythonPackage rec { # remove this when upstream releases a new version > 0.19.0 postPatch = '' substituteInPlace pyproject.toml \ - --replace "poetry>=0.12" "poetry-core>=1.5.2" \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" + --replace-fail "poetry>=0.12" "poetry-core>=1.5.2" \ + --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ django scim2-filter-parser ]; diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix index 0806d423a4b8..ff5fb07f11c0 100644 --- a/pkgs/development/python-modules/eiswarnung/default.nix +++ b/pkgs/development/python-modules/eiswarnung/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, pytz, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "eiswarnung"; version = "2.0.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -30,14 +31,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' \ - --replace 'addopts = "--cov"' "" \ - --replace 'pytz = ">=2022.7.1,<2024.0.0"' 'pytz = "*"' + --replace-fail '"0.0.0"' '"${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "pytz" ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiohttp pytz yarl @@ -46,6 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index 121c57a89106..960e629d1474 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, routerFeatures, + setuptools, janus, ncclient, paramiko, @@ -18,7 +19,7 @@ let if routerFeatures then { prePatch = '' - substituteInPlace ./setup.py --replace "extra_deps = []" "extra_deps = router_feature_deps" + substituteInPlace ./setup.py --replace-fail "extra_deps = []" "extra_deps = router_feature_deps" ''; extraBuildInputs = [ janus @@ -36,7 +37,7 @@ in buildPythonPackage rec { pname = "entrance"; version = "1.1.20"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -49,7 +50,9 @@ buildPythonPackage rec { # No useful tests doCheck = false; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyyaml sanic ] ++ opts.extraBuildInputs; diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix index 3f91c0c69e6a..46a8249d9e2f 100644 --- a/pkgs/development/python-modules/envoy-reader/default.nix +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, envoy-utils, fetchFromGitHub, + setuptools, httpx, pyjwt, pytest-asyncio, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "envoy-reader"; version = "0.21.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +28,9 @@ buildPythonPackage rec { hash = "sha256-aIpZ4ln4L57HwK8H0FqsyNnXosnAp3ingrJI6/MPS90="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ beautifulsoup4 envoy-utils httpx @@ -41,10 +44,11 @@ buildPythonPackage rec { respx ]; + pythonRelaxDeps = [ "pyjwt" ]; + postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner>=5.2" "" \ - --replace "pyjwt==2.1.0" "pyjwt>=2.1.0" + --replace-fail "pytest-runner>=5.2" "" ''; pythonImportsCheck = [ "envoy_reader" ]; diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index feb52ac8b3f1..16a3e0c67666 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -33,16 +33,19 @@ buildPythonPackage rec { hash = "sha256-2iTZqZIxlt1GKhElasTcnys18UbNNDwHoZziHBOIGBo="; }; + pythonRelaxDeps = [ + "aiosmtplib" + "pydantic" + ]; + postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "1.2.5"' 'version = "${version}"' \ - --replace 'aiosmtplib = "^2.0"' 'aiosmtplib = "*"' \ - --replace 'pydantic = "^2.0"' 'pydantic = "*"' \ + --replace-fail 'version = "1.2.5"' 'version = "${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aioredis aiosmtplib blinker diff --git a/pkgs/development/python-modules/fhir-py/default.nix b/pkgs/development/python-modules/fhir-py/default.nix index 6e156e7da72b..f03666938c48 100644 --- a/pkgs/development/python-modules/fhir-py/default.nix +++ b/pkgs/development/python-modules/fhir-py/default.nix @@ -9,6 +9,7 @@ requests, pytestCheckHook, pytest-asyncio, + pytest-cov-stub, responses, }: @@ -26,15 +27,9 @@ buildPythonPackage rec { hash = "sha256-kYqoRso1ypN5novRxMMzz1h2NGNybbw5lK4+HErG79I="; }; - preBuild = '' - substituteInPlace pyproject.toml \ - --replace "--cov=fhirpy" "" \ - --replace "--cov-report=xml" "" - ''; + build-system = [ flit-core ]; - nativeBuildInputs = [ flit-core ]; - - propagatedBuildInputs = [ + dependencies = [ aiohttp pytz requests @@ -43,6 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-asyncio + pytest-cov-stub responses ]; diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index 7e0ad12fd798..0c3ff788d468 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, beautifulsoup4, datetime, lxml, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "finvizfinance"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -26,17 +27,14 @@ buildPythonPackage rec { hash = "sha256-4aR1x9GgbxnJUpn1+i95djZEVBFTAIzhMLxHe2FaciY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" - ''; + build-system = [ setuptools ]; nativeCheckInputs = [ pytest-mock pytestCheckHook ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 datetime lxml diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 88d7f959b89a..8ea9f8c7d73d 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -6,6 +6,7 @@ isPy38, isPy39, pythonAtLeast, + setuptools, flake8, six, python, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "flake8-future-import"; version = "0.4.7"; - format = "setuptools"; + pyproject = true; # PyPI tarball doesn't include the test suite src = fetchFromGitHub { @@ -36,10 +37,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace "test_flake8_future_import.py" \ - --replace "'flake8'" "'${lib.getExe flake8}'" + --replace-fail "'flake8'" "'${lib.getExe flake8}'" ''; - propagatedBuildInputs = [ flake8 ]; + build-system = [ setuptools ]; + + dependencies = [ flake8 ]; nativeCheckInputs = [ six ]; diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix index 0c912cd7005b..faf3c0bdb030 100644 --- a/pkgs/development/python-modules/flake8-polyfill/default.nix +++ b/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchpatch, fetchPypi, + setuptools, flake8, mock, pep8, @@ -12,14 +13,16 @@ buildPythonPackage rec { pname = "flake8-polyfill"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4"; }; - propagatedBuildInputs = [ flake8 ]; + build-system = [ setuptools ]; + + dependencies = [ flake8 ]; nativeCheckInputs = [ mock @@ -39,7 +42,7 @@ buildPythonPackage rec { postPatch = '' # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. substituteInPlace setup.cfg \ - --replace pytest 'tool:pytest' + --replace-fail pytest 'tool:pytest' ''; pythonImportsCheck = [ "flake8_polyfill" ]; diff --git a/pkgs/development/python-modules/flask-gravatar/default.nix b/pkgs/development/python-modules/flask-gravatar/default.nix index 9194a9436ac6..81a29a3c56fa 100644 --- a/pkgs/development/python-modules/flask-gravatar/default.nix +++ b/pkgs/development/python-modules/flask-gravatar/default.nix @@ -12,13 +12,14 @@ # tests pytestCheckHook, + pytest-cov-stub, pygments, }: buildPythonPackage rec { pname = "flask-gravatar"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "Flask-Gravatar"; @@ -39,18 +40,18 @@ buildPythonPackage rec { -e "s|tests_require=tests_require,||g" \ -e "s|extras_require=extras_require,||g" \ -e "s|setup_requires=setup_requires,||g" - # pep8 is deprecated and cov not needed + # pep8 is deprecated substituteInPlace pytest.ini \ - --replace "--pep8" "" \ - --replace "--cov=flask_gravatar --cov-report=term-missing" "" + --replace-fail "--pep8" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ flask ]; + dependencies = [ flask ]; nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub pygments ];