Merge pull request #99971 from bcdarwin/nipype-disable-neurdflib-by-default
This commit is contained in:
commit
d26aa3293c
1 changed files with 8 additions and 13 deletions
|
@ -1,23 +1,19 @@
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, isPy3k
|
, isPy27
|
||||||
, isPy38
|
|
||||||
# python dependencies
|
# python dependencies
|
||||||
, click
|
, click
|
||||||
, configparser ? null
|
|
||||||
, dateutil
|
, dateutil
|
||||||
, etelemetry
|
, etelemetry
|
||||||
, filelock
|
, filelock
|
||||||
, funcsigs
|
, funcsigs
|
||||||
, future
|
, future
|
||||||
, futures
|
|
||||||
, mock
|
, mock
|
||||||
, networkx
|
, networkx
|
||||||
, nibabel
|
, nibabel
|
||||||
, numpy
|
, numpy
|
||||||
, packaging
|
, packaging
|
||||||
, pathlib2
|
|
||||||
, prov
|
, prov
|
||||||
, psutil
|
, psutil
|
||||||
, pybids
|
, pybids
|
||||||
|
@ -25,6 +21,7 @@
|
||||||
, pytest
|
, pytest
|
||||||
, pytest_xdist
|
, pytest_xdist
|
||||||
, pytest-forked
|
, pytest-forked
|
||||||
|
, rdflib
|
||||||
, scipy
|
, scipy
|
||||||
, simplejson
|
, simplejson
|
||||||
, traits
|
, traits
|
||||||
|
@ -37,10 +34,12 @@
|
||||||
, bash
|
, bash
|
||||||
, glibcLocales
|
, glibcLocales
|
||||||
, callPackage
|
, callPackage
|
||||||
|
# causes Python packaging conflict with any package requiring rdflib,
|
||||||
|
# so use the unpatched rdflib by default (disables Nipype provenance tracking);
|
||||||
|
# see https://github.com/nipy/nipype/issues/2888:
|
||||||
|
, useNeurdflib ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert !isPy3k -> configparser != null;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
# This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo.
|
# This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo.
|
||||||
|
@ -51,6 +50,7 @@ in
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "nipype";
|
pname = "nipype";
|
||||||
version = "1.5.1";
|
version = "1.5.1";
|
||||||
|
disabled = isPy27;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
@ -74,7 +74,6 @@ buildPythonPackage rec {
|
||||||
funcsigs
|
funcsigs
|
||||||
future
|
future
|
||||||
networkx
|
networkx
|
||||||
neurdflib
|
|
||||||
nibabel
|
nibabel
|
||||||
numpy
|
numpy
|
||||||
packaging
|
packaging
|
||||||
|
@ -85,11 +84,7 @@ buildPythonPackage rec {
|
||||||
simplejson
|
simplejson
|
||||||
traits
|
traits
|
||||||
xvfbwrapper
|
xvfbwrapper
|
||||||
] ++ stdenv.lib.optionals (!isPy3k) [
|
] ++ [ (if useNeurdflib then neurdflib else rdflib) ];
|
||||||
configparser
|
|
||||||
futures
|
|
||||||
pathlib2 # darwin doesn't receive this transitively, but it is in install_requires
|
|
||||||
];
|
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
pybids
|
pybids
|
||||||
|
|
Loading…
Reference in a new issue