diff options
author | Ben Darwin <bcdarwin@gmail.com> | 2023-04-24 22:24:15 -0400 |
---|---|---|
committer | Ben Darwin <bcdarwin@gmail.com> | 2023-04-25 13:51:49 -0400 |
commit | 363bbd4233f7b8bc4024d40c45f5fb8cf1962173 (patch) | |
tree | 4965c9393ca22b472742e79146ad128bed5fa624 | |
parent | daa0521a3140ccc8310913844f0087e05b96654b (diff) |
python310Packages.nipype: unbreak
-rw-r--r-- | pkgs/development/python-modules/nipype/default.nix | 27 | ||||
-rw-r--r-- | pkgs/development/python-modules/nipype/neurdflib.nix | 38 |
2 files changed, 12 insertions, 53 deletions
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 4252df40fa42c..3c295a72cc297 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -1,7 +1,8 @@ { lib, stdenv , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, pythonRelaxDepsHook # python dependencies , click , python-dateutil @@ -9,6 +10,7 @@ , filelock , funcsigs , future +, looseversion , mock , networkx , nibabel @@ -26,9 +28,7 @@ , simplejson , traits , xvfbwrapper -, pytest-cov , codecov -, sphinx # other dependencies , which , bash @@ -40,17 +40,11 @@ , useNeurdflib ? false }: -let - - # This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo. - neurdflib = callPackage ./neurdflib.nix { }; - -in - buildPythonPackage rec { pname = "nipype"; version = "1.8.5"; - disabled = isPy27; + disabled = pythonOlder "3.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -63,9 +57,11 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - sphinx + pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "traits" ]; + propagatedBuildInputs = [ click python-dateutil @@ -73,6 +69,7 @@ buildPythonPackage rec { filelock funcsigs future + looseversion networkx nibabel numpy @@ -80,11 +77,12 @@ buildPythonPackage rec { prov psutil pydot + rdflib scipy simplejson traits xvfbwrapper - ] ++ [ (if useNeurdflib then neurdflib else rdflib) ]; + ]; nativeCheckInputs = [ pybids @@ -94,7 +92,6 @@ buildPythonPackage rec { pytest pytest-forked pytest-xdist - pytest-cov which ]; @@ -102,7 +99,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display' + LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display and not test_no_et_multiproc' ''; pythonImportsCheck = [ "nipype" ]; diff --git a/pkgs/development/python-modules/nipype/neurdflib.nix b/pkgs/development/python-modules/nipype/neurdflib.nix deleted file mode 100644 index 6fb1ee04569bb..0000000000000 --- a/pkgs/development/python-modules/nipype/neurdflib.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isodate -, html5lib -, sparqlwrapper -, networkx -, nose -, python -}: - -buildPythonPackage rec { - pname = "neurdflib"; - version = "5.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "d34493cee15029ff5db16157429585ff863ba5542675a4d8a94a0da1bc6e3a50"; - }; - - propagatedBuildInputs = [ isodate html5lib sparqlwrapper ]; - - nativeCheckInputs = [ networkx nose ]; - - # Python 2 syntax - # Failing doctest - doCheck = false; - - checkPhase = '' - ${python.interpreter} run_tests.py - ''; - - meta = with lib; { - description = "A temporary convenience package for changes waiting to be merged into the primary rdflib repo"; - homepage = "https://pypi.org/project/neurdflib"; - license = licenses.bsd3; - }; -} |