ENH: refreshed patches

Author: yarikoptic

debian/changelog

@@ -1,3 +1,9 @@
+nipype (1.1.7-1) unstable; urgency=medium
+
+  * Fresh upstream release
+
+ -- Yaroslav Halchenko <[email protected]>  Mon, 17 Dec 2018 14:45:19 -0500
+
 nipype (1.1.3-1) unstable; urgency=medium
 
   * Fresh upstream release

debian/patches/changeset_bf-networkx-graph-compat.diff

@@ -68,7 +68,7 @@
 --- a/doc/_templates/navbar.html
 +++ b/doc/_templates/navbar.html
 @@ -1,4 +1,3 @@
--<link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
+-<link rel="stylesheet" href="https://www.google.com/cse/style/look/default.css" type="text/css" />
  <style type="text/css">
      a.navbar {
      color: {{ theme_linkcolor }};

debian/patches/changeset_bf-resource-monitor.diff

@@ -15,16 +15,16 @@ Last-Update: 2017-05-23
 -future>=0.16.0
 +future>=0.15.2
  simplejson>=3.8.0
- prov==1.5.0
- click>=6.6.0
+ prov>=1.5.2
+ neurdflib
 --- a/nipype/info.py
 +++ b/nipype/info.py
-@@ -106,7 +106,7 @@ SCIPY_MIN_VERSION = '0.14'
+@@ -109,7 +109,7 @@ SCIPY_MIN_VERSION = '0.14'
  TRAITS_MIN_VERSION = '4.6'
  DATEUTIL_MIN_VERSION = '2.2'
- PYTEST_MIN_VERSION = '3.0'
+ PYTEST_MIN_VERSION = '3.6'
 -FUTURE_MIN_VERSION = '0.16.0'
 +FUTURE_MIN_VERSION = '0.15.2'
  SIMPLEJSON_MIN_VERSION = '3.8.0'
- PROV_VERSION = '1.5.0'
+ PROV_VERSION = '1.5.2'
  CLICK_MIN_VERSION = '6.6.0'

debian/patches/deb_disable_google_online_snippets

@@ -12,6 +12,6 @@ Last-Update: 2017-05-23
  [commit hash]
  # The line below may contain a valid hash if it has been substituted during 'git archive'
 -archive_subst_hash=%h
-+archive_subst_hash=ec7457c235fdf5364536b0a8ab2bdfe461af5beb
++archive_subst_hash=f2bbcc917899c98102bdeb84db61ea4b84cbf2f5
  # This line may be modified by the install process
  install_hash=

debian/patches/deb_down_future

@@ -1,6 +1,6 @@
 --- a/nipype/info.py
 +++ b/nipype/info.py
-@@ -145,8 +145,8 @@ REQUIRES = [
+@@ -150,8 +150,8 @@ REQUIRES = [
      'pytest>=%s' % PYTEST_MIN_VERSION,
      'pytest-xdist',
      'mock',

debian/patches/deb_git_hash

@@ -1,27 +1,18 @@
 --- a/nipype/info.py
 +++ b/nipype/info.py
-@@ -103,12 +103,13 @@ NIBABEL_MIN_VERSION = '2.1.0'
- NETWORKX_MIN_VERSION = '1.9'
- NUMPY_MIN_VERSION = '1.9.0'
+@@ -106,12 +106,13 @@ NUMPY_MIN_VERSION = '1.9.0'
+ # https://www.opensourceanswers.com/blog/you-shouldnt-use-python-37-for-data-science-right-now.html
+ NUMPY_MIN_VERSION_37 = '1.15.3'
  SCIPY_MIN_VERSION = '0.14'
 -TRAITS_MIN_VERSION = '4.6'
 +TRAITS_MIN_VERSION = '4.5'
  DATEUTIL_MIN_VERSION = '2.2'
- PYTEST_MIN_VERSION = '3.0'
+ PYTEST_MIN_VERSION = '3.6'
  FUTURE_MIN_VERSION = '0.15.2'
  SIMPLEJSON_MIN_VERSION = '3.8.0'
--PROV_VERSION = '1.5.0'
+-PROV_VERSION = '1.5.2'
 +# yoh: so far did not find support to demand 1.5.0 and we have only 1.4.0 on nd16.04
-+PROV_MIN_VERSION = '1.4.0'
++PROV_VERSION = '1.4.0'
  CLICK_MIN_VERSION = '6.6.0'
  PYDOT_MIN_VERSION = '1.2.3'
 
-@@ -139,7 +140,7 @@ REQUIRES = [
-     'traits>=%s' % TRAITS_MIN_VERSION,
-     'future>=%s' % FUTURE_MIN_VERSION,
-     'simplejson>=%s' % SIMPLEJSON_MIN_VERSION,
--    'prov==%s' % PROV_VERSION,
-+    'prov>=%s' % PROV_MIN_VERSION,
-     'click>=%s' % CLICK_MIN_VERSION,
-     'funcsigs',
-     'pytest>=%s' % PYTEST_MIN_VERSION,

debian/patches/deb_no_explicit_pydot

@@ -10,7 +10,7 @@ Last-Update: 2018-08-09
 
 --- a/nipype/info.py
 +++ b/nipype/info.py
-@@ -148,7 +148,7 @@ REQUIRES = [
+@@ -153,7 +153,7 @@ REQUIRES = [
      'pydotplus',
      'pydot>=%s' % PYDOT_MIN_VERSION,
      'packaging',

debian/patches/deb_no_strict_versions

@@ -1,5 +1,3 @@
-changeset_bf-networkx-graph-compat.diff
-changeset_bf-resource-monitor.diff
 deb_simplify_requires
 deb_pytest_xdist_no-nauto
 deb_no_explicit_pydot