Merge pull request #3638 from effigies/py312

Test Python 3.12 support
nipy · Mar 20, 2024 · edf7a4a · edf7a4a
2 parents 28973c5 + 9c8e3cc
commit edf7a4a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git 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
@@ -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,28 +90,28 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ['ubuntu-22.04']
-        python-version: ['3.8', '3.9', '3.10', '3.11']
-        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: ''
-          #   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/.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 }}

diff --git 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"

diff --git 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"