public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge #97847 python27Packages.anytree: fix build"

Browse Source 
Moving to staging.  It's a really large rebuild.
This reverts commit 9a8bd1e564ed033a6f5773fd95297a3cfe2e43ed, reversing
changes made to 9866abf63babc2bc9578e5fc23d5d006850464bc.
This commit is contained in:
Vladimír Čunát 2020-09-13 08:13:00 +02:00
parent b441d09fad
commit 97e2ca3447
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/python-modules/anytree/default.nix
View File

@ -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";