Skip to content

Commit

Permalink
Revert "Merge #97847 python27Packages.anytree: fix build"
Browse files Browse the repository at this point in the history
Moving to staging.  It's a really large rebuild.
This reverts commit 9a8bd1e, reversing
changes made to 9866abf.
  • Loading branch information
vcunat committed Sep 13, 2020
1 parent b441d09 commit 97e2ca3
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions 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 {
Expand All @@ -28,6 +26,10 @@ buildPythonPackage rec {
})
];

checkInputs = [
nose
];

propagatedBuildInputs = [
six
];
Expand All @@ -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";
Expand Down

0 comments on commit 97e2ca3

Please sign in to comment.