diff options
| author | Robert Schütz <rschuetz17@gmail.com> | 2018-03-31 21:08:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 21:08:41 +0200 |
| commit | 10e029514b9b197722f944f08dc01a2c058df437 (patch) | |
| tree | fd573676b261393f091e084950f1be4b25d81a8d /pkgs/development/python-modules | |
| parent | 1c2c7a976c0ddcdc2c5045ba1d1f738f7cafc702 (diff) | |
| parent | ee1896d63dec108be02489f73b677ace1c656a74 (diff) | |
| download | nixlib-10e029514b9b197722f944f08dc01a2c058df437.tar nixlib-10e029514b9b197722f944f08dc01a2c058df437.tar.gz nixlib-10e029514b9b197722f944f08dc01a2c058df437.tar.bz2 nixlib-10e029514b9b197722f944f08dc01a2c058df437.tar.lz nixlib-10e029514b9b197722f944f08dc01a2c058df437.tar.xz nixlib-10e029514b9b197722f944f08dc01a2c058df437.tar.zst nixlib-10e029514b9b197722f944f08dc01a2c058df437.zip | |
Merge pull request #37952 from Ma27/fix-nipype
pythonPackage.nipype: fix build
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/nipype/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/development/python-modules/nipype/prov-version.patch | 21 |
2 files changed, 39 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 30ee2b28561a..668e34a22476 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -21,8 +21,12 @@ , simplejson , traits , xvfbwrapper +, pytestcov +, codecov # other dependencies , which +, bash +, glibcLocales }: assert !isPy3k -> configparser != null; @@ -36,9 +40,14 @@ buildPythonPackage rec { sha256 = "47f62fda3d6b9a37aa407a6b78c80e91240aa71e61191ed00da68b02839fe258"; }; - doCheck = false; # fails with TypeError: None is not callable - checkInputs = [ which ]; - buildInputs = [ pytest mock ]; # required in installPhase + # see https://github.com/nipy/nipype/issues/2240 + patches = [ ./prov-version.patch ]; + + postPatch = '' + substituteInPlace nipype/interfaces/base/tests/test_core.py \ + --replace "/usr/bin/env bash" "${bash}/bin/bash" + ''; + propagatedBuildInputs = [ click dateutil @@ -59,6 +68,12 @@ buildPythonPackage rec { configparser ]; + checkInputs = [ pytest mock pytestcov codecov which glibcLocales ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype + ''; + meta = with stdenv.lib; { homepage = http://nipy.org/nipype/; description = "Neuroimaging in Python: Pipelines and Interfaces"; diff --git a/pkgs/development/python-modules/nipype/prov-version.patch b/pkgs/development/python-modules/nipype/prov-version.patch new file mode 100644 index 000000000000..133295d0560b --- /dev/null +++ b/pkgs/development/python-modules/nipype/prov-version.patch @@ -0,0 +1,21 @@ +diff --git a/nipype/info.py b/nipype/info.py +index 1daa382e2..da338d0ea 100644 +--- a/nipype/info.py ++++ b/nipype/info.py +@@ -108,7 +108,6 @@ DATEUTIL_MIN_VERSION = '2.2' + PYTEST_MIN_VERSION = '3.0' + FUTURE_MIN_VERSION = '0.16.0' + SIMPLEJSON_MIN_VERSION = '3.8.0' +-PROV_VERSION = '1.5.0' + CLICK_MIN_VERSION = '6.6.0' + PYDOT_MIN_VERSION = '1.2.3' + +@@ -140,7 +139,7 @@ REQUIRES = [ + 'traits>=%s' % TRAITS_MIN_VERSION, + 'future>=%s' % FUTURE_MIN_VERSION, + 'simplejson>=%s' % SIMPLEJSON_MIN_VERSION, +- 'prov==%s' % PROV_VERSION, ++ 'prov<2', + 'click>=%s' % CLICK_MIN_VERSION, + 'funcsigs', + 'pytest>=%s' % PYTEST_MIN_VERSION, |