diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-06 08:25:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-06 08:25:33 +0100 |
| commit | df2cc4121b566a16c3400778756862ddf2df3f1a (patch) | |
| tree | 2a16aa01b5aaffb9bc6f95c08cbefc06ef06ffaa /pkgs | |
| parent | 6e6ef8871bb4f99f4f5ecf5cbaf7ccda49f1bab6 (diff) | |
| parent | 12c0dd5432e8d43c05e4ed81239ab2ea358c2943 (diff) | |
| download | nixlib-df2cc4121b566a16c3400778756862ddf2df3f1a.tar nixlib-df2cc4121b566a16c3400778756862ddf2df3f1a.tar.gz nixlib-df2cc4121b566a16c3400778756862ddf2df3f1a.tar.bz2 nixlib-df2cc4121b566a16c3400778756862ddf2df3f1a.tar.lz nixlib-df2cc4121b566a16c3400778756862ddf2df3f1a.tar.xz nixlib-df2cc4121b566a16c3400778756862ddf2df3f1a.tar.zst nixlib-df2cc4121b566a16c3400778756862ddf2df3f1a.zip | |
Merge pull request #46125 from ashgillman/nipype-futures-py2-only
python.pkgs.nipype: Futures is python 2 only. Also fix building.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/nipype/default.nix | 8 |
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 |