git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commit97e2ca34472734d24b0468c95340fb13a532e1a7 authorVladimír Čunát <v@cunat.cz> dateSun 13 Sep 2020, 08:13 (6 years ago) parentb441d09
1 file changed+12−10
pkgs/development/python-modules/anytree/default.nix+12−10
pkgs/development/python-modules/anytree/default.nix+12−10
@@ -1,15 +1,13 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4−, pythonOlder
54, substituteAll
5+, fetchpatch
6+, nose
67, six
78, withGraphviz ? true
89, graphviz
910, fontconfig
10−# Tests
11−, pytestCheckHook
12−, nose
1311}:
1412
1513buildPythonPackage rec {
@@ -28,6 +26,10 @@ buildPythonPackage rec {
2826 })
2927 ];
3028
29+ checkInputs = [
30+ nose
31+ ];
32+
3133 propagatedBuildInputs = [
3234 six
3335 ];
@@ -40,13 +42,13 @@ buildPythonPackage rec {
4042 # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree
4143 doCheck = withGraphviz;
4244
43− checkInputs = [ pytestCheckHook nose ];
45+ checkPhase = ''
46+ runHook preCheck
4447
45− pytestFlagsArray = lib.optionals (pythonOlder "3.4") [
46− # Use enums, which aren't available pre-python3.4
47− "--ignore=tests/test_resolver.py"
48− "--ignore=tests/test_search.py"
49− ];
48+ nosetests
49+
50+ runHook postCheck
51+ '';
5052
5153 meta = with lib; {
5254 description = "Powerful and Lightweight Python Tree Data Structure";