From 97e2ca34472734d24b0468c95340fb13a532e1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 13 Sep 2020 08:13:00 +0200 Subject: [PATCH] Revert "Merge #97847 python27Packages.anytree: fix build" Moving to staging. It's a really large rebuild. This reverts commit 9a8bd1e564ed033a6f5773fd95297a3cfe2e43ed, reversing changes made to 9866abf63babc2bc9578e5fc23d5d006850464bc. --- .../python-modules/anytree/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index c11833ba579..6b25952493b 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -1,15 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , substituteAll +, fetchpatch +, nose , six , withGraphviz ? true , graphviz , fontconfig -# Tests -, pytestCheckHook -, nose }: buildPythonPackage rec { @@ -28,6 +26,10 @@ buildPythonPackage rec { }) ]; + checkInputs = [ + nose + ]; + propagatedBuildInputs = [ six ]; @@ -40,13 +42,13 @@ buildPythonPackage rec { # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree doCheck = withGraphviz; - checkInputs = [ pytestCheckHook nose ]; + checkPhase = '' + runHook preCheck - pytestFlagsArray = lib.optionals (pythonOlder "3.4") [ - # Use enums, which aren't available pre-python3.4 - "--ignore=tests/test_resolver.py" - "--ignore=tests/test_search.py" - ]; + nosetests + + runHook postCheck + ''; meta = with lib; { description = "Powerful and Lightweight Python Tree Data Structure";