From af0b93c3ce7b9b99f8b56489df0e570b42226bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 11:44:12 +0200 Subject: [PATCH] python39Packages.pytest-relaxed: switch to pytestCheckHook, relax decorator dependency, comment partial breakage --- .../python-modules/pytest-relaxed/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 19d031b6a2b1..1030f76050ca 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -4,6 +4,7 @@ , pytest , six , decorator +, pytestCheckHook }: buildPythonPackage rec { @@ -15,22 +16,23 @@ buildPythonPackage rec { sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6"; }; + # newer decorator versions are incompatible and cause the test suite to fail + # but only a few utility functions are used from this package which means it has no actual impact on test execution in paramiko and Fabric + postPatch = '' + substituteInPlace setup.py \ + --replace "decorator>=4,<5" "decorator>=4" \ + --replace "pytest>=3,<5" "pytest>=3" + ''; + buildInputs = [ pytest ]; - checkInputs = [ pytest ]; propagatedBuildInputs = [ six decorator ]; - patchPhase = '' - sed -i "s/pytest>=3,<5/pytest/g" setup.py - ''; + checkInputs = [ pytestCheckHook ]; - # skip tests due to dir requirements + # lots of assertion errors mainly around decorator doCheck = false; - checkPhase = '' - pytest tests - ''; - meta = with lib; { homepage = "https://pytest-relaxed.readthedocs.io/"; description = "Relaxed test discovery/organization for pytest";