From 0fe7a78cc7f1dc7fe1130d3bd5616abaf03e27b7 Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Wed, 20 Mar 2024 16:23:27 -0400 Subject: [PATCH 1/3] Test Python 3.12 support --- .github/workflows/tests.yml | 2 +- nipype/info.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1e99938ca6..97de293446 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -91,7 +91,7 @@ jobs: strategy: matrix: os: ['ubuntu-22.04'] - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] check: ['test'] pip-flags: [''] depends: ['REQUIREMENTS'] diff --git a/nipype/info.py b/nipype/info.py index 22290d1bc0..a550e4b389 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -58,6 +58,7 @@ def get_nipype_gitversion(): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering", ] PYTHON_REQUIRES = ">= 3.8" From 7512d7c218651dd57a2b195b2c985e79fab5ee5b Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Wed, 20 Mar 2024 16:27:01 -0400 Subject: [PATCH 2/3] CI: Restore nipy tests --- .github/workflows/tests.yml | 14 +++++++------- tools/ci/env.sh | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 97de293446..22786ebb5f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -105,13 +105,13 @@ jobs: depends: REQUIREMENTS deb-depends: true nipype-extras: doc,tests,profiler,duecredit,ssh - # - os: ubuntu-20.04 - # python-version: 3.8 - # check: test - # pip-flags: '' - # depends: NUMPY123 - # deb-depends: true - # nipype-extras: doc,tests,nipy,profiler,duecredit,ssh + - os: ubuntu-20.04 + python-version: 3.8 + check: test + pip-flags: '' + depends: REQUIREMENTS + deb-depends: true + nipype-extras: doc,tests,nipy,profiler,duecredit,ssh env: DEPENDS: ${{ matrix.depends }} CHECK_TYPE: ${{ matrix.check }} diff --git a/tools/ci/env.sh b/tools/ci/env.sh index 84d76bfe8a..15e12275b6 100644 --- a/tools/ci/env.sh +++ b/tools/ci/env.sh @@ -4,7 +4,6 @@ SETUP_REQUIRES="pip setuptools>=30.3.0 wheel" REQUIREMENTS="-r requirements.txt" # Minimum versions of minimum requirements MIN_REQUIREMENTS="-r min-requirements.txt" -NUMPY123="numpy<1.24 -r requirements.txt" # Numpy and scipy upload nightly/weekly/intermittent wheels NIGHTLY_WHEELS="https://pypi.anaconda.org/scipy-wheels-nightly/simple" From 9c8e3cc45f36bbad8f1baa011574251746f98000 Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Wed, 20 Mar 2024 16:29:22 -0400 Subject: [PATCH 3/3] [DATALAD RUNCMD] npx prettier -w '.github/**/*.yml' === Do not change lines below === { "chain": [], "cmd": "npx prettier -w '.github/**/*.yml'", "exit": 0, "extra_inputs": [], "inputs": [], "outputs": [], "pwd": "." } ^^^ Do not change lines above ^^^ --- .github/workflows/contrib.yml | 6 +++--- .github/workflows/tests.yml | 22 +++++++++++----------- .github/workflows/tutorials.yml | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml index a0578d8a46..28f76cf3a0 100644 --- a/.github/workflows/contrib.yml +++ b/.github/workflows/contrib.yml @@ -31,10 +31,10 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: ['ubuntu-latest'] + os: ["ubuntu-latest"] python-version: [3.8] - nipype-extras: ['dev'] - check: ['specs', 'style'] + nipype-extras: ["dev"] + check: ["specs", "style"] env: DEPENDS: "" CHECK_TYPE: ${{ matrix.check }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 22786ebb5f..7f7859fae7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ on: - maint/* schedule: # 8am EST / 9am EDT Mondays - - cron: '0 13 * * 1' + - cron: "0 13 * * 1" defaults: run: @@ -57,7 +57,7 @@ jobs: needs: [build] strategy: matrix: - package: ['wheel', 'sdist'] + package: ["wheel", "sdist"] steps: - uses: actions/download-artifact@v4 with: @@ -90,25 +90,25 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: ['ubuntu-22.04'] - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - check: ['test'] - pip-flags: [''] - depends: ['REQUIREMENTS'] + os: ["ubuntu-22.04"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + check: ["test"] + pip-flags: [""] + depends: ["REQUIREMENTS"] deb-depends: [false] - nipype-extras: ['doc,tests,profiler'] + nipype-extras: ["doc,tests,profiler"] include: - os: ubuntu-22.04 - python-version: '3.8' + python-version: "3.8" check: test - pip-flags: '' + pip-flags: "" depends: REQUIREMENTS deb-depends: true nipype-extras: doc,tests,profiler,duecredit,ssh - os: ubuntu-20.04 python-version: 3.8 check: test - pip-flags: '' + pip-flags: "" depends: REQUIREMENTS deb-depends: true nipype-extras: doc,tests,nipy,profiler,duecredit,ssh diff --git a/.github/workflows/tutorials.yml b/.github/workflows/tutorials.yml index 2e6093fde5..46aa42d25c 100644 --- a/.github/workflows/tutorials.yml +++ b/.github/workflows/tutorials.yml @@ -3,7 +3,7 @@ name: Test tutorials on: push: branches: - - 'rel/*' + - "rel/*" concurrency: group: tutorials-${{ github.ref }}