From aa67ed0afcf21aaa733cf51f675305ea5fa876de Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:00 +0200 Subject: [PATCH 01/13] python311Packages.pytest-cov-stub: add note about not fiddling with version --- pkgs/development/python-modules/pytest-cov-stub/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pytest-cov-stub/default.nix b/pkgs/development/python-modules/pytest-cov-stub/default.nix index 0d2ab63bd9bd..1a177559f319 100644 --- a/pkgs/development/python-modules/pytest-cov-stub/default.nix +++ b/pkgs/development/python-modules/pytest-cov-stub/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pytest-cov-stub"; + # please use pythonRemoveDeps rather than change this version version = (lib.importTOML ./src/pyproject.toml).project.version; pyproject = true; From 5c8c311dfb96e66e4f9e4331de6d727f4ba93159 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:49 +0200 Subject: [PATCH 02/13] cffconvert: migrate to pytest-cov-stub --- pkgs/development/python-modules/cffconvert/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cffconvert/default.nix b/pkgs/development/python-modules/cffconvert/default.nix index fcf6f222984c..befd378ac31d 100644 --- a/pkgs/development/python-modules/cffconvert/default.nix +++ b/pkgs/development/python-modules/cffconvert/default.nix @@ -9,7 +9,7 @@ pykwalify, jsonschema, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -34,11 +34,9 @@ buildPythonPackage rec { jsonschema ]; - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ - # addopts uses --no-cov - pytest-cov + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub ]; disabledTestPaths = [ From b1be0decb3e35f45c36c2705d805d95635858c84 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:50 +0200 Subject: [PATCH 03/13] python311Packages.aionotion: migrate to pytest-cov-stub --- pkgs/development/python-modules/aionotion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 645bbc39c14c..50336dddb687 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -13,7 +13,7 @@ pytest-aiohttp, pytest-asyncio, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pythonOlder, yarl, }: @@ -50,7 +50,7 @@ buildPythonPackage rec { aresponses pytest-aiohttp pytest-asyncio - pytest-cov + pytest-cov-stub pytestCheckHook ]; From 1d71d1c4f676fad41bca9192d1d72e69bbd8ff52 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:50 +0200 Subject: [PATCH 04/13] python311Packages.binance-connector: migrate to pytest-cov-stub --- pkgs/development/python-modules/binance-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/binance-connector/default.nix b/pkgs/development/python-modules/binance-connector/default.nix index 0b1b760bf95a..5e76268d7cf4 100644 --- a/pkgs/development/python-modules/binance-connector/default.nix +++ b/pkgs/development/python-modules/binance-connector/default.nix @@ -7,7 +7,7 @@ requests, websocket-client, # dependencies for tests - pytest-cov, + pytest-cov-stub, pytest, sure, responses, @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytest sure responses From a57ad65fd8da4423d5c5e86015f064603ee4e7f8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:50 +0200 Subject: [PATCH 05/13] python311Packages.brottsplatskartan: migrate to pytest-cov-stub --- pkgs/development/python-modules/brottsplatskartan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix index 71a8f3ce37aa..8de7c2194ab2 100644 --- a/pkgs/development/python-modules/brottsplatskartan/default.nix +++ b/pkgs/development/python-modules/brottsplatskartan/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-cov, + pytest-cov-stub, pytestCheckHook, requests, }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytestCheckHook ]; From 87c3b5d56c6209e2a0b55e6a4922bd3e5fb32dca Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:51 +0200 Subject: [PATCH 06/13] python311Packages.cashews: migrate to pytest-cov-stub --- pkgs/development/python-modules/cashews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cashews/default.nix b/pkgs/development/python-modules/cashews/default.nix index 3d75bc80c475..83ff91c16f11 100644 --- a/pkgs/development/python-modules/cashews/default.nix +++ b/pkgs/development/python-modules/cashews/default.nix @@ -9,7 +9,7 @@ lib, pytest, pytest-asyncio, - pytest-cov, + pytest-cov-stub, pytest-rerunfailures, pytestCheckHook, redis, @@ -46,7 +46,7 @@ buildPythonPackage rec { hypothesis pytest pytest-asyncio - pytest-cov + pytest-cov-stub pytest-rerunfailures pytestCheckHook ]; From 9c4c7d7625f44c111b7cec2f050b70bae86b575a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:51 +0200 Subject: [PATCH 07/13] python311Packages.hydrawiser: migrate to pytest-cov-stub --- pkgs/development/python-modules/hydrawiser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix index 971583742ef8..84ffe3bcc7e3 100644 --- a/pkgs/development/python-modules/hydrawiser/default.nix +++ b/pkgs/development/python-modules/hydrawiser/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytest-asyncio, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, requests, @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio - pytest-cov + pytest-cov-stub pytestCheckHook requests requests-mock From d263c412e2b78c1219358b96aa32000e7910ca39 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:51 +0200 Subject: [PATCH 08/13] python311Packages.ipydatawidgets: migrate to pytest-cov-stub --- pkgs/development/python-modules/ipydatawidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index 45695a23166e..635e55b53382 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -4,7 +4,7 @@ fetchPypi, isPy27, pytest, - pytest-cov, + pytest-cov-stub, nbval, jupyter-packaging, ipywidgets, @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub nbval ]; From ea70a0b57d5705b5ed2c0afa33a7426a0667f2dc Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:52 +0200 Subject: [PATCH 09/13] python311Packages.ndindex: migrate to pytest-cov-stub --- pkgs/development/python-modules/ndindex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index ee44e9b1544c..5bd31f3042a1 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -11,7 +11,7 @@ # tests hypothesis, - pytest-cov, + pytest-cov-stub, pytestCheckHook, }: @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ - --replace "--cov=ndindex/ --cov-report=term-missing --flakes" "" + --replace "--flakes" "" ''; passthru.optional-dependencies.arrays = [ numpy ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - pytest-cov # uses cov markers + pytest-cov-stub pytestCheckHook ] ++ passthru.optional-dependencies.arrays; From 044b3270f1f0eec5292c69257262876fdb3d77bf Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:52 +0200 Subject: [PATCH 10/13] python311Packages.pure-protobuf: migrate to pytest-cov-stub --- pkgs/development/python-modules/pure-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix index d5388bb849fd..5bbed7bb1b8d 100644 --- a/pkgs/development/python-modules/pure-protobuf/default.nix +++ b/pkgs/development/python-modules/pure-protobuf/default.nix @@ -8,7 +8,7 @@ typing-extensions, pytestCheckHook, pytest-benchmark, - pytest-cov, + pytest-cov-stub, pydantic, }: @@ -39,7 +39,7 @@ buildPythonPackage rec { pydantic pytestCheckHook pytest-benchmark - pytest-cov + pytest-cov-stub ]; pytestFlagsArray = [ "--benchmark-disable" ]; From 5f0d09b2c10d8a502f52819dfdcfb02bd0af94d3 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:52 +0200 Subject: [PATCH 11/13] python311Packages.pyexcel-ods: migrate to pytest-cov-stub --- pkgs/development/python-modules/pyexcel-ods/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix index e7683a259fd3..8d0196473c09 100644 --- a/pkgs/development/python-modules/pyexcel-ods/default.nix +++ b/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -9,7 +9,7 @@ pyexcel-xls, psutil, pytestCheckHook, - pytest-cov, + pytest-cov-stub, setuptools, }: @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pyexcel pyexcel-xls psutil From b91302a526427b190aa8f78f5d339d94f5087903 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:52 +0200 Subject: [PATCH 12/13] python311Packages.pynws: migrate to pytest-cov-stub --- pkgs/development/python-modules/pynws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index 444b28ddbb4d..a923be9c4a33 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -7,7 +7,7 @@ metar, pytest-aiohttp, pytest-asyncio, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -45,7 +45,7 @@ buildPythonPackage rec { freezegun pytest-aiohttp pytest-asyncio - pytest-cov + pytest-cov-stub pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); From 7465c916c132606bef7105171adac014910c2424 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 22:28:53 +0200 Subject: [PATCH 13/13] python311Packages.pyvera: migrate to pytest-cov-stub --- pkgs/development/python-modules/pyvera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix index 7fbc696ec598..5a6c502e2eb0 100644 --- a/pkgs/development/python-modules/pyvera/default.nix +++ b/pkgs/development/python-modules/pyvera/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - pytest-cov, + pytest-cov-stub, pytest-asyncio, pytest-timeout, responses, @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytest-timeout - pytest-cov + pytest-cov-stub pytestCheckHook responses ];