Re-revert "Merge #97847 python27Packages.anytree: fix build"
Moved to staging. This reverts commit 97e2ca34472734d24b0468c95340fb13a532e1a7.
This commit is contained in:
parent
4cf1247851
commit
6705f79d42
@ -1,13 +1,15 @@
|
|||||||
{ 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 {
|
||||||
@ -26,10 +28,6 @@ buildPythonPackage rec {
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
|
||||||
nose
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
six
|
six
|
||||||
];
|
];
|
||||||
@ -42,13 +40,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;
|
||||||
|
|
||||||
checkPhase = ''
|
checkInputs = [ pytestCheckHook nose ];
|
||||||
runHook preCheck
|
|
||||||
|
|
||||||
nosetests
|
pytestFlagsArray = lib.optionals (pythonOlder "3.4") [
|
||||||
|
# Use enums, which aren't available pre-python3.4
|
||||||
runHook postCheck
|
"--ignore=tests/test_resolver.py"
|
||||||
'';
|
"--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";
|
||||||
|
Loading…
Reference in New Issue
Block a user