summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorUli Baum <xeji@cat3.de>2018-09-16 17:37:28 +0200
committerUli Baum <xeji@cat3.de>2018-09-16 17:37:28 +0200
commita66c00d780ef40a42c031fcdb1c33ff28a93e2a5 (patch)
tree47dc545f19445e44054d1fe79747bcbd4172267c /pkgs/development/python-modules
parent0e33c56662eb3f072e22950ebf8cf8d7969f078d (diff)
downloadnixlib-a66c00d780ef40a42c031fcdb1c33ff28a93e2a5.tar
nixlib-a66c00d780ef40a42c031fcdb1c33ff28a93e2a5.tar.gz
nixlib-a66c00d780ef40a42c031fcdb1c33ff28a93e2a5.tar.bz2
nixlib-a66c00d780ef40a42c031fcdb1c33ff28a93e2a5.tar.lz
nixlib-a66c00d780ef40a42c031fcdb1c33ff28a93e2a5.tar.xz
nixlib-a66c00d780ef40a42c031fcdb1c33ff28a93e2a5.tar.zst
nixlib-a66c00d780ef40a42c031fcdb1c33ff28a93e2a5.zip
pythonPackages.dendropy: fix build
Build failed after update to 4.4.0 because the tests are incorrectly
packages in the pypi version.
Switch to upstream github repo, fix tests, disable failing test cases
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/dendropy/default.nix24
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix
index 6220a1e15f0c..6409a5d12e59 100644
--- a/pkgs/development/python-modules/dendropy/default.nix
+++ b/pkgs/development/python-modules/dendropy/default.nix
@@ -1,29 +1,33 @@
 { lib
 , pkgs
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pytest
 }:
 
 buildPythonPackage rec {
   pname   = "DendroPy";
   version = "4.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f0a0e2ce78b3ed213d6c1791332d57778b7f63d602430c1548a5d822acf2799c";
+  # tests are incorrectly packaged in pypi version
+  src = fetchFromGitHub {
+    owner = "jeetsukumaran";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "097hfyv2kaf4x92i4rjx0paw2cncxap48qivv8zxng4z7nhid0x9";
   };
 
-  prePatch = ''
-    # Test removed/disabled and reported upstream: https://github.com/jeetsukumaran/DendroPy/issues/74
-    rm -f dendropy/test/test_dataio_nexml_reader_tree_list.py
-  '';
-
   preCheck = ''
     # Needed for unicode python tests
     export LC_ALL="en_US.UTF-8"
+    cd tests  # to find the 'support' module
   '';
 
-  checkInputs = [ pkgs.glibcLocales ];
+  checkInputs = [ pytest pkgs.glibcLocales ];
+
+  checkPhase = ''
+    pytest -k 'not test_dataio_nexml_reader_tree_list and not test_pscores_with'
+  '';
 
   meta = {
     homepage = http://dendropy.org/;