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

Merge pull request #46125 from ashgillman/nipype-futures-py2-only

Browse Source 
python.pkgs.nipype: Futures is python 2 only. Also fix building.
This commit is contained in:
Jörg Thalheim 2018-09-06 08:25:33 +01:00 committed by GitHub
commit df2cc4121b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/python-modules/nipype/default.nix
View File

@ -18,6 +18,8 @@
, psutil , psutil
, pydot , pydot
, pytest , pytest
, pytest_xdist
, pytest-forked
, scipy , scipy
, simplejson , simplejson
, traits , traits
@ -47,8 +49,6 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace nipype/interfaces/base/tests/test_core.py \ substituteInPlace nipype/interfaces/base/tests/test_core.py \
--replace "/usr/bin/env bash" "${bash}/bin/bash" --replace "/usr/bin/env bash" "${bash}/bin/bash"
rm pytest.ini
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -56,7 +56,6 @@ buildPythonPackage rec {
dateutil dateutil
funcsigs funcsigs
future future
futures
networkx networkx
nibabel nibabel
numpy numpy
@ -70,9 +69,10 @@ buildPythonPackage rec {
xvfbwrapper xvfbwrapper
] ++ stdenv.lib.optional (!isPy3k) [ ] ++ stdenv.lib.optional (!isPy3k) [
configparser configparser
futures
]; ];
checkInputs = [ pytest mock pytestcov codecov which glibcLocales ]; checkInputs = [ pytest mock pytestcov pytest_xdist pytest-forked codecov which glibcLocales ];
checkPhase = '' checkPhase = ''
LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype