about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAshley Gillman <gillmanash@gmail.com>2018-09-05 12:37:28 +0100
committerAshley Gillman <gillmanash@gmail.com>2018-09-05 22:26:34 +0100
commit12c0dd5432e8d43c05e4ed81239ab2ea358c2943 (patch)
tree7ea0668c540335d10ca7aa51791a9b850bf5f399 /pkgs
parent3074027738f5ca724ddbd92bbb26ee059926fedc (diff)
downloadnixlib-12c0dd5432e8d43c05e4ed81239ab2ea358c2943.tar
nixlib-12c0dd5432e8d43c05e4ed81239ab2ea358c2943.tar.gz
nixlib-12c0dd5432e8d43c05e4ed81239ab2ea358c2943.tar.bz2
nixlib-12c0dd5432e8d43c05e4ed81239ab2ea358c2943.tar.lz
nixlib-12c0dd5432e8d43c05e4ed81239ab2ea358c2943.tar.xz
nixlib-12c0dd5432e8d43c05e4ed81239ab2ea358c2943.tar.zst
nixlib-12c0dd5432e8d43c05e4ed81239ab2ea358c2943.zip
python.pkgs.nipype: Futures is python 2 only. Also fix building.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/nipype/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 8b0ee06b3495..a092123da826 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -18,6 +18,8 @@
 , psutil
 , pydot
 , pytest
+, pytest_xdist
+, pytest-forked
 , scipy
 , simplejson
 , traits
@@ -47,8 +49,6 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace nipype/interfaces/base/tests/test_core.py \
       --replace "/usr/bin/env bash" "${bash}/bin/bash"
-
-    rm pytest.ini
   '';
 
   propagatedBuildInputs = [
@@ -56,7 +56,6 @@ buildPythonPackage rec {
     dateutil
     funcsigs
     future
-    futures
     networkx
     nibabel
     numpy
@@ -70,9 +69,10 @@ buildPythonPackage rec {
     xvfbwrapper
   ] ++ stdenv.lib.optional (!isPy3k) [
     configparser
+    futures
   ];
 
-  checkInputs = [ pytest mock pytestcov codecov which glibcLocales ];
+  checkInputs = [ pytest mock pytestcov pytest_xdist pytest-forked codecov which glibcLocales ];
 
   checkPhase = ''
     LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype