Skip to content

Commit 2d8ed0a

Browse files
committed
debian/patches - added deb_no_neurdflib to avoid requiring neurdflib for now.
All the RDF handling dependencies are too much in flux ATM. Let's see if the reset of functionality/tests pass during building.
1 parent fb01d1d commit 2d8ed0a

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

debian/changelog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
nipype (1.1.7-1) unstable; urgency=medium
22

33
* Fresh upstream release
4+
* debian/patches
5+
- refreshed and upstramed changeset_* dropped
6+
- added deb_no_neurdflib to avoid requiring neurdflib for now.
7+
All the RDF handling dependencies are too much in flux ATM.
8+
Let's see if the reset of functionality/tests pass during building.
49

510
-- Yaroslav Halchenko <[email protected]> Mon, 17 Dec 2018 14:45:19 -0500
611

debian/patches/deb_no_neurdflib

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
--- a/nipype/info.py
2+
+++ b/nipype/info.py
3+
@@ -145,7 +145,8 @@ REQUIRES = [
4+
'future>=%s' % FUTURE_MIN_VERSION,
5+
'simplejson>=%s' % SIMPLEJSON_MIN_VERSION,
6+
'prov>=%s' % PROV_VERSION,
7+
- 'neurdflib',
8+
+ # Disabled for now for Debian build
9+
+ #'neurdflib',
10+
'click>=%s' % CLICK_MIN_VERSION,
11+
'funcsigs',
12+
'pytest>=%s' % PYTEST_MIN_VERSION,
13+
--- a/requirements.txt
14+
+++ b/requirements.txt
15+
@@ -7,7 +7,7 @@ nibabel>=2.1.0
16+
future>=0.15.2
17+
simplejson>=3.8.0
18+
prov>=1.5.2
19+
-neurdflib
20+
+#neurdflib
21+
click>=6.6.0
22+
funcsigs
23+
configparser

debian/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ deb_no_explicit_pydot
44
deb_imgmath_optional
55
deb_down_future
66
deb_no_strict_versions
7+
deb_no_neurdflib
78
deb_robust_apidocgen
89
deb_disable_google_online_snippets
910
# should be the last one, not to be applied under git, requires exported tree

0 commit comments

Comments
 (0)