Revert "Merge #97847 python27Packages.anytree: fix build"
Moving to staging. It's a really large rebuild. This reverts commit9a8bd1e564, reversing changes made to9866abf63b.
This commit is contained in:
@@ -1,15 +1,13 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, pythonOlder
|
|
||||||
, substituteAll
|
, substituteAll
|
||||||
|
, fetchpatch
|
||||||
|
, nose
|
||||||
, six
|
, six
|
||||||
, withGraphviz ? true
|
, withGraphviz ? true
|
||||||
, graphviz
|
, graphviz
|
||||||
, fontconfig
|
, fontconfig
|
||||||
# Tests
|
|
||||||
, pytestCheckHook
|
|
||||||
, nose
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
@@ -28,6 +26,10 @@ buildPythonPackage rec {
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
nose
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
six
|
six
|
||||||
];
|
];
|
||||||
@@ -40,13 +42,13 @@ buildPythonPackage rec {
|
|||||||
# circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree
|
# circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree
|
||||||
doCheck = withGraphviz;
|
doCheck = withGraphviz;
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook nose ];
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
|
|
||||||
pytestFlagsArray = lib.optionals (pythonOlder "3.4") [
|
nosetests
|
||||||
# Use enums, which aren't available pre-python3.4
|
|
||||||
"--ignore=tests/test_resolver.py"
|
runHook postCheck
|
||||||
"--ignore=tests/test_search.py"
|
'';
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Powerful and Lightweight Python Tree Data Structure";
|
description = "Powerful and Lightweight Python Tree Data Structure";
|
||||||
|
|||||||
Reference in New Issue
Block a user