From 0e84f4be10d9bf6c3bd833babba69303a93cb193 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 21 Apr 2022 11:22:59 -0400 Subject: [PATCH 1/8] MNT: Mark branch as 1.8.0.dev0 --- nipype/info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/info.py b/nipype/info.py index d3df0a3c6f..ff92fdcb6e 100644 --- a/nipype/info.py +++ b/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(): From e131a538bc18da57b7217f36c97c1b6c7da12385 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 21 Apr 2022 11:23:39 -0400 Subject: [PATCH 2/8] DOC: Update previous versions --- doc/interfaces.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/interfaces.rst b/doc/interfaces.rst index 2ee0bf5762..7f8bbf1e35 100644 --- a/doc/interfaces.rst +++ b/doc/interfaces.rst @@ -8,7 +8,7 @@ Interfaces and Workflows :Release: |version| :Date: |today| -Previous versions: `1.7.0 `_ `1.6.1 `_ +Previous versions: `1.7.1 `_ `1.7.0 `_ Workflows --------- From 5dbbd656cd8734c584770e5d488007d75696eb3e Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 21 Apr 2022 11:26:03 -0400 Subject: [PATCH 3/8] MNT: Set minimum Python to 3.7 --- nipype/info.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nipype/info.py b/nipype/info.py index ff92fdcb6e..0c5180c8fc 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -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" From d6b86d547901106ba43e058c28a82cec0130e31f Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 21 Apr 2022 11:26:17 -0400 Subject: [PATCH 4/8] MNT: Update minimum numpy, clean up min versions --- nipype/info.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nipype/info.py b/nipype/info.py index 0c5180c8fc..3309752d92 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -101,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" @@ -140,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, From b350d22e0eadc132b9830f781242d94e84f52935 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 21 Apr 2022 11:42:03 -0400 Subject: [PATCH 5/8] FIX: Use more recent Docker image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4f1558d6d7..512595d5df 100644 --- a/.circleci/config.yml +++ b/.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 From ec43ea9fd2e8dbe8d544a0829ea2b0fb364afade Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 21 Apr 2022 11:46:49 -0400 Subject: [PATCH 6/8] CI: Drop Python 3.6 tests --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 714244e94a..01cc39e169 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ 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'] From 1220f6ed9744c8219cbfaa06f277a8bfe13cd05b Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 21 Apr 2022 11:47:05 -0400 Subject: [PATCH 7/8] CI: Drop presumably unnecessary Ubuntu version spec --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 01cc39e169..8e60701109 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,7 +34,7 @@ jobs: deb-depends: [false] nipype-extras: ['doc,tests,profiler'] include: - - os: ubuntu-18.04 + - os: ubuntu-latest python-version: 3.8 check: test pip-flags: '' From e8bacb39ef1452f906afa4dbda66d1cb5f06ea0f Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 21 Apr 2022 11:49:21 -0400 Subject: [PATCH 8/8] CI: Use bash instead of ash --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 512595d5df..0a33b9df25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: