Merge pull request #3452 from nipy/mnt/1.8.0.dev

MNT: 1.8.0.dev0

Author: effigies

.circleci/config.yml

@@ -102,7 +102,7 @@ version: 2
 jobs:
   compare_base_dockerfiles:
     docker:
-      - image: docker:17.10.0-ce-git
+      - image: cimg/base:2022.04
     steps:
       - checkout:
           path: /home/circleci/nipype
@@ -112,10 +112,10 @@ jobs:
           working_directory: /home/circleci/nipype/docker
           command: |
             mkdir -p /tmp/docker
-            ash ./generate_dockerfiles.sh -b
+            bash ./generate_dockerfiles.sh -b
 
             # Use the sha256 sum of the pruned Dockerfile as the cache key.
-            ash prune_dockerfile.sh Dockerfile.base > /tmp/docker/Dockerfile.base-pruned
+            bash prune_dockerfile.sh Dockerfile.base > /tmp/docker/Dockerfile.base-pruned
       - restore_cache:
           key: dockerfile-cache-v1-master-{{ checksum "/tmp/docker/Dockerfile.base-pruned" }}
       - run:

.github/workflows/tests.yml

@@ -27,14 +27,14 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
         check: ['test']
         pip-flags: ['']
         depends: ['REQUIREMENTS']
         deb-depends: [false]
         nipype-extras: ['doc,tests,profiler']
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-latest
             python-version: 3.8
             check: test
             pip-flags: ''

doc/interfaces.rst

@@ -8,7 +8,7 @@ Interfaces and Workflows
 :Release: |version|
 :Date: |today|
 
-Previous versions: `1.7.0 <http://nipype.readthedocs.io/en/1.7.0/>`_ `1.6.1 <http://nipype.readthedocs.io/en/1.6.1/>`_
+Previous versions: `1.7.1 <http://nipype.readthedocs.io/en/1.7.1/>`_ `1.7.0 <http://nipype.readthedocs.io/en/1.7.0/>`_
 
 Workflows
 ---------

nipype/info.py

@@ -5,7 +5,7 @@
 
 # nipype version information
 # Remove -dev for release
-__version__ = "1.7.1"
+__version__ = "1.8.0.dev0"
 
 
 def get_nipype_gitversion():
@@ -54,14 +54,13 @@ def get_nipype_gitversion():
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: POSIX :: Linux",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Topic :: Scientific/Engineering",
 ]
-PYTHON_REQUIRES = ">= 3.6"
+PYTHON_REQUIRES = ">= 3.7"
 
 description = "Neuroimaging in Python: Pipelines and Interfaces"
 
@@ -102,15 +101,12 @@ def get_nipype_gitversion():
 # versions
 NIBABEL_MIN_VERSION = "2.1.0"
 NETWORKX_MIN_VERSION = "2.0"
-# Numpy bug in python 3.7:
-# https://www.opensourceanswers.com/blog/you-shouldnt-use-python-37-for-data-science-right-now.html
-NUMPY_MIN_VERSION = "1.15.3"
+NUMPY_MIN_VERSION = "1.17"
 SCIPY_MIN_VERSION = "0.14"
 TRAITS_MIN_VERSION = "4.6"
 DATEUTIL_MIN_VERSION = "2.2"
-FUTURE_MIN_VERSION = "0.16.0"
 SIMPLEJSON_MIN_VERSION = "3.8.0"
-PROV_VERSION = "1.5.2"
+PROV_MIN_VERSION = "1.5.2"
 RDFLIB_MIN_VERSION = "5.0.0"
 CLICK_MIN_VERSION = "6.6.0"
 PYDOT_MIN_VERSION = "1.2.3"
@@ -141,7 +137,7 @@ def get_nipype_gitversion():
     "nibabel>=%s" % NIBABEL_MIN_VERSION,
     "numpy>=%s" % NUMPY_MIN_VERSION,
     "packaging",
-    "prov>=%s" % PROV_VERSION,
+    "prov>=%s" % PROV_MIN_VERSION,
     "pydot>=%s" % PYDOT_MIN_VERSION,
     "python-dateutil>=%s" % DATEUTIL_MIN_VERSION,
     "rdflib>=%s" % RDFLIB_MIN_VERSION,