diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 1978ce816375..fe08e1f0789e 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -44,15 +44,13 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.1.7"; + version = "1.1.8"; src = fetchPypi { inherit pname version; - sha256 = "0iyi5w2h42bpssqj52ixm2kxp56yxfxdacb6xv5r24yv3hmwd4yn"; + sha256 = "d5eec6de7d8e7020106c42b37d17f99de92824440cc79dfa6080f7c2e6d9fecc"; }; - patches = [ ./move-uneeded-requires.patch ]; - postPatch = '' substituteInPlace nipype/interfaces/base/tests/test_core.py \ --replace "/usr/bin/env bash" "${bash}/bin/bash" diff --git a/pkgs/development/python-modules/nipype/move-uneeded-requires.patch b/pkgs/development/python-modules/nipype/move-uneeded-requires.patch deleted file mode 100644 index 89324285d182..000000000000 --- a/pkgs/development/python-modules/nipype/move-uneeded-requires.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/nipype/info.py b/nipype/info.py -index c6503ac..4379643 100644 ---- a/nipype/info.py -+++ b/nipype/info.py -@@ -147,9 +147,6 @@ REQUIRES = [ - 'neurdflib', - 'click>=%s' % CLICK_MIN_VERSION, - 'funcsigs', -- 'pytest>=%s' % PYTEST_MIN_VERSION, -- 'pytest-xdist', -- 'mock', - 'pydotplus', - 'pydot>=%s' % PYDOT_MIN_VERSION, - 'packaging', -@@ -159,7 +156,15 @@ REQUIRES = [ - if sys.version_info <= (3, 4): - REQUIRES.append('configparser') - --TESTS_REQUIRES = ['pytest-cov', 'codecov', 'pytest-env', 'coverage<5'] -+TESTS_REQUIRES = [ -+ 'pytest>=%s' % PYTEST_MIN_VERSION, -+ 'pytest-xdist', -+ 'mock', -+ 'pytest-cov', -+ 'codecov', -+ 'pytest-env', -+ 'coverage<5' -+] - - EXTRA_REQUIRES = { - 'doc': ['Sphinx>=1.4', 'numpydoc', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'],