From 421dc8f4242f48997574ec7e9e503fd4ac9debc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 9 Mar 2021 10:23:35 +0100 Subject: [PATCH 1/2] pythonPackages.async-upnp-client: fix test execution --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 6697cb5d13e8..5f6d68b9ca53 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml -, pytest_6, pytest-asyncio }: +, pytestCheckHook, pytest-asyncio }: buildPythonPackage rec { pname = "async-upnp-client"; @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest_6 + pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 326f26331fc6..4cea5183b5e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -526,7 +526,9 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; - async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { + pytestCheckHook = self.pytestCheckHook.override { pytest = self.pytest_6_1; }; + }; asyncwhois = callPackage ../development/python-modules/asyncwhois { }; From babb021209f96981e27267e49bd4bf9e9288f7bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 9 Mar 2021 10:23:52 +0100 Subject: [PATCH 2/2] pythonPackages.werkzeug: fix test execution, add empty maintainers field --- pkgs/development/python-modules/werkzeug/default.nix | 1 + pkgs/top-level/python-packages.nix | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 7f35dd124d86..73bebd8366ec 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -25,5 +25,6 @@ buildPythonPackage rec { homepage = "https://palletsprojects.com/p/werkzeug/"; description = "A WSGI utility library for Python"; license = licenses.bsd3; + maintainers = [ ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4cea5183b5e0..2c38be653050 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8526,7 +8526,13 @@ in { webthing = callPackage ../development/python-modules/webthing { }; - werkzeug = callPackage ../development/python-modules/werkzeug { }; + werkzeug = callPackage ../development/python-modules/werkzeug { + pytestCheckHook = self.pytestCheckHook.override { pytest = self.pytest_6_1; }; + pytest-timeout = self.pytest-timeout.override { + pytest = self.pytest_6_1; + pytestCheckHook = self.pytestCheckHook.override { pytest = self.pytest_6_1; }; + }; + }; west = callPackage ../development/python-modules/west { };