Skip to content

Commit edf7a4a

Browse files
authored
Merge pull request #3638 from effigies/py312
Test Python 3.12 support
2 parents 28973c5 + 9c8e3cc commit edf7a4a

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

.github/workflows/contrib.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
runs-on: ${{ matrix.os }}
3232
strategy:
3333
matrix:
34-
os: ['ubuntu-latest']
34+
os: ["ubuntu-latest"]
3535
python-version: [3.8]
36-
nipype-extras: ['dev']
37-
check: ['specs', 'style']
36+
nipype-extras: ["dev"]
37+
check: ["specs", "style"]
3838
env:
3939
DEPENDS: ""
4040
CHECK_TYPE: ${{ matrix.check }}

.github/workflows/tests.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
- maint/*
2020
schedule:
2121
# 8am EST / 9am EDT Mondays
22-
- cron: '0 13 * * 1'
22+
- cron: "0 13 * * 1"
2323

2424
defaults:
2525
run:
@@ -57,7 +57,7 @@ jobs:
5757
needs: [build]
5858
strategy:
5959
matrix:
60-
package: ['wheel', 'sdist']
60+
package: ["wheel", "sdist"]
6161
steps:
6262
- uses: actions/download-artifact@v4
6363
with:
@@ -90,28 +90,28 @@ jobs:
9090
runs-on: ${{ matrix.os }}
9191
strategy:
9292
matrix:
93-
os: ['ubuntu-22.04']
94-
python-version: ['3.8', '3.9', '3.10', '3.11']
95-
check: ['test']
96-
pip-flags: ['']
97-
depends: ['REQUIREMENTS']
93+
os: ["ubuntu-22.04"]
94+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
95+
check: ["test"]
96+
pip-flags: [""]
97+
depends: ["REQUIREMENTS"]
9898
deb-depends: [false]
99-
nipype-extras: ['doc,tests,profiler']
99+
nipype-extras: ["doc,tests,profiler"]
100100
include:
101101
- os: ubuntu-22.04
102-
python-version: '3.8'
102+
python-version: "3.8"
103103
check: test
104-
pip-flags: ''
104+
pip-flags: ""
105105
depends: REQUIREMENTS
106106
deb-depends: true
107107
nipype-extras: doc,tests,profiler,duecredit,ssh
108-
# - os: ubuntu-20.04
109-
# python-version: 3.8
110-
# check: test
111-
# pip-flags: ''
112-
# depends: NUMPY123
113-
# deb-depends: true
114-
# nipype-extras: doc,tests,nipy,profiler,duecredit,ssh
108+
- os: ubuntu-20.04
109+
python-version: 3.8
110+
check: test
111+
pip-flags: ""
112+
depends: REQUIREMENTS
113+
deb-depends: true
114+
nipype-extras: doc,tests,nipy,profiler,duecredit,ssh
115115
env:
116116
DEPENDS: ${{ matrix.depends }}
117117
CHECK_TYPE: ${{ matrix.check }}

.github/workflows/tutorials.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Test tutorials
33
on:
44
push:
55
branches:
6-
- 'rel/*'
6+
- "rel/*"
77

88
concurrency:
99
group: tutorials-${{ github.ref }}

nipype/info.py

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ def get_nipype_gitversion():
5858
"Programming Language :: Python :: 3.9",
5959
"Programming Language :: Python :: 3.10",
6060
"Programming Language :: Python :: 3.11",
61+
"Programming Language :: Python :: 3.12",
6162
"Topic :: Scientific/Engineering",
6263
]
6364
PYTHON_REQUIRES = ">= 3.8"

tools/ci/env.sh

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ SETUP_REQUIRES="pip setuptools>=30.3.0 wheel"
44
REQUIREMENTS="-r requirements.txt"
55
# Minimum versions of minimum requirements
66
MIN_REQUIREMENTS="-r min-requirements.txt"
7-
NUMPY123="numpy<1.24 -r requirements.txt"
87

98
# Numpy and scipy upload nightly/weekly/intermittent wheels
109
NIGHTLY_WHEELS="https://pypi.anaconda.org/scipy-wheels-nightly/simple"

0 commit comments

Comments
 (0)