Skip to content

Commit 133dc0a

Browse files
Merge branch 'enh/cuda_support' of https://github.com/mauriliogenovese/nipype into enh/cuda_support
2 parents 2c2c066 + 7e57ab9 commit 133dc0a

File tree

249 files changed

+1868
-1900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+1868
-1900
lines changed

.circleci/config.yml

+1-40
Original file line numberDiff line numberDiff line change
@@ -266,43 +266,4 @@ jobs:
266266
workflows:
267267
version: 2
268268
build_test_deploy:
269-
jobs:
270-
- compare_base_dockerfiles:
271-
filters:
272-
branches:
273-
ignore:
274-
- /docs?\/.*/
275-
tags:
276-
only: /.*/
277-
- get_test_data:
278-
filters:
279-
branches:
280-
ignore:
281-
- /docs?\/.*/
282-
tags:
283-
only: /.*/
284-
- test_pytest:
285-
filters:
286-
branches:
287-
ignore:
288-
- /docs?\/.*/
289-
tags:
290-
only: /.*/
291-
requires:
292-
- compare_base_dockerfiles
293-
- get_test_data
294-
- deploy_dockerhub:
295-
filters:
296-
branches:
297-
only: master
298-
tags:
299-
only: /.*/
300-
requires:
301-
- test_pytest
302-
- update_feedstock:
303-
context: nipybot
304-
filters:
305-
branches:
306-
only: /rel\/\d.*/
307-
tags:
308-
only: /.*/
269+
jobs: []

.codespellrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ skip = .git,*.pdf,*.svg,external
1010
# ALS, FWE - neuroimaging specific abbrevs
1111
# Comision - foreign word used
1212
# expad - AFNI flag
13-
ignore-words-list = te,inport,objekt,jist,nd,hel,inout,fith,whos,fot,ue,shs,smal,nam,filetest,suh,noo,reson,als,fwe,crasher,comision,afile,expad
13+
ignore-words-list = te,inport,objekt,jist,nd,hel,inout,fith,whos,fot,ue,shs,smal,nam,filetest,suh,noo,reson,als,fwe,crasher,comision,afile,expad,burnin

.git-blame-ignore-revs

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# Thu Oct 31 10:01:38 2024 -0400 - [email protected] - STY: black [ignore-rev]
2+
bd0d5856d183ba3918eda31f80db3b1d4387c55c
3+
# Thu Mar 21 13:34:09 2024 -0400 - [email protected] - STY: black [ignore-rev]
4+
c52fece0cf154c1a93a55b202d088f08924a023e
5+
# Sun Mar 17 10:58:12 2024 -0400 - [email protected] - STY: black [ignore-rev]
6+
e447b92bcb3b9ed9e35394d6edef1d91b7c424e6
7+
# Sun Mar 17 10:44:57 2024 -0400 - [email protected] - STY: black
8+
f1a8909d233ed2a707b6ee8937504eea9ee7f154
19
# Tue Feb 27 14:28:18 2024 -0500 - [email protected] - STY: black 2024.2 [ignore-rev]
210
f1cbc1c941f8d02659f8ef245aac0862efb80ccf
311
# Mon Sep 11 13:36:40 2023 +0200 - [email protected] - run black for nipype/interfaces/spm/preprocess.py

.github/workflows/contrib.yml

-84
This file was deleted.

.github/workflows/tests.yml

+65-77
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
1-
name: Stable tests
2-
3-
# This file tests the claimed support range of nipype including
4-
#
5-
# * Operating systems: Linux, OSX
6-
# * Dependencies: minimum requirements, optional requirements
7-
# * Installation methods: setup.py, sdist, wheel, archive
1+
name: Tox
82

93
on:
104
push:
11-
branches:
12-
- master
13-
- maint/*
14-
tags:
15-
- "*"
5+
branches: [ master, main, 'maint/*' ]
6+
tags: [ '*' ]
167
pull_request:
17-
branches:
18-
- master
19-
- maint/*
8+
branches: [ master, main, 'maint/*' ]
209
schedule:
2110
# 8am EST / 9am EDT Mondays
2211
- cron: "0 13 * * 1"
@@ -26,27 +15,28 @@ defaults:
2615
shell: bash
2716

2817
concurrency:
29-
group: tests-${{ github.ref }}
18+
group: ${{ github.workflow }}-${{ github.ref }}
3019
cancel-in-progress: true
3120

32-
permissions: {}
21+
permissions:
22+
contents: read
23+
24+
env:
25+
# Force tox and pytest to use color
26+
FORCE_COLOR: true
27+
28+
3329
jobs:
3430
build:
35-
permissions:
36-
contents: read # to fetch code (actions/checkout)
37-
3831
runs-on: ubuntu-latest
3932
steps:
4033
- uses: actions/checkout@v4
4134
with:
4235
fetch-depth: 0
43-
- uses: actions/setup-python@v5
44-
with:
45-
python-version: 3
46-
- run: pip install --upgrade build twine
47-
- name: Build sdist and wheel
48-
run: python -m build
49-
- run: twine check dist/*
36+
- name: Install the latest version of uv
37+
uses: astral-sh/setup-uv@v5
38+
- run: uv build
39+
- run: uvx twine check dist/*
5040
- uses: actions/upload-artifact@v4
5141
with:
5242
name: dist
@@ -82,72 +72,52 @@ jobs:
8272
- name: Run tests
8373
run: pytest --doctest-modules -v --pyargs nipype
8474

85-
stable:
75+
test:
8676
# Check each OS, all supported Python, minimum versions and latest releases
87-
permissions:
88-
contents: read # to fetch code (actions/checkout)
89-
9077
runs-on: ${{ matrix.os }}
9178
strategy:
9279
matrix:
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"]
98-
deb-depends: [false]
99-
nipype-extras: ["doc,tests,profiler"]
80+
os: ["ubuntu-latest"]
81+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
82+
dependencies: [none, full, pre]
10083
include:
101-
- os: ubuntu-22.04
102-
python-version: "3.8"
103-
check: test
104-
pip-flags: ""
105-
depends: REQUIREMENTS
106-
deb-depends: true
107-
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: REQUIREMENTS
113-
deb-depends: true
114-
nipype-extras: doc,tests,nipy,profiler,duecredit,ssh
84+
- os: ubuntu-latest
85+
python-version: "3.9"
86+
dependencies: min
87+
exclude:
88+
# Skip some intermediate versions for full tests
89+
- python-version: "3.10"
90+
dependencies: full
91+
- python-version: "3.11"
92+
dependencies: full
93+
# Do not test pre-releases for versions out of SPEC0
94+
- python-version: "3.9"
95+
dependencies: pre
96+
- python-version: "3.10"
97+
dependencies: pre
98+
11599
env:
116-
DEPENDS: ${{ matrix.depends }}
117-
CHECK_TYPE: ${{ matrix.check }}
118-
EXTRA_PIP_FLAGS: ${{ matrix.pip-flags }}
119-
INSTALL_DEB_DEPENDENCIES: ${{ matrix.deb-depends }}
120-
NIPYPE_EXTRAS: ${{ matrix.nipype-extras }}
121-
INSTALL_TYPE: pip
122-
CI_SKIP_TEST: 1
100+
DEPENDS: ${{ matrix.dependencies }}
123101

124102
steps:
125103
- uses: actions/checkout@v4
104+
- name: Install the latest version of uv
105+
uses: astral-sh/setup-uv@v5
126106
- name: Set up Python ${{ matrix.python-version }}
127107
uses: actions/setup-python@v5
128108
with:
129109
python-version: ${{ matrix.python-version }}
130110
- name: Display Python version
131111
run: python -c "import sys; print(sys.version)"
132-
- name: Create virtual environment
133-
run: tools/ci/create_venv.sh
134-
- name: Build archive
112+
- name: Install tox
135113
run: |
136-
source tools/ci/build_archive.sh
137-
echo "ARCHIVE=$ARCHIVE" >> $GITHUB_ENV
138-
- name: Install Debian dependencies
139-
run: tools/ci/install_deb_dependencies.sh
140-
if: ${{ matrix.os == 'ubuntu-latest' }}
141-
- name: Install dependencies
142-
run: tools/ci/install_dependencies.sh
143-
- name: Install Nipype
144-
run: tools/ci/install.sh
145-
- name: Run tests
146-
run: tools/ci/check.sh
147-
if: ${{ matrix.check != 'skiptests' }}
148-
- uses: codecov/codecov-action@v4
114+
uv tool install tox --with=tox-uv --with=tox-gh-actions
115+
- name: Show tox config
116+
run: tox c
117+
- name: Run tox
118+
run: tox -v --exit-and-dump-after 1200
119+
- uses: codecov/codecov-action@v5
149120
with:
150-
file: coverage.xml
151121
token: ${{ secrets.CODECOV_TOKEN }}
152122
if: ${{ always() }}
153123
- name: Upload pytest test results
@@ -160,7 +130,7 @@ jobs:
160130
publish:
161131
runs-on: ubuntu-latest
162132
environment: "Package deployment"
163-
needs: [stable, test-package]
133+
needs: [test, test-package]
164134
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
165135
steps:
166136
- uses: actions/download-artifact@v4
@@ -171,3 +141,21 @@ jobs:
171141
with:
172142
user: __token__
173143
password: ${{ secrets.PYPI_API_TOKEN }}
144+
145+
checks:
146+
runs-on: 'ubuntu-latest'
147+
continue-on-error: true
148+
strategy:
149+
matrix:
150+
check: ['specs', 'style']
151+
152+
steps:
153+
- uses: actions/checkout@v4
154+
- name: Install the latest version of uv
155+
uses: astral-sh/setup-uv@v5
156+
- name: Show tox config
157+
run: uvx tox c
158+
- name: Show tox config (this call)
159+
run: uvx tox c -e ${{ matrix.check }}
160+
- name: Run check
161+
run: uvx tox -e ${{ matrix.check }}

.github/workflows/tutorials.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- name: Start time
2020
id: start
21-
run: echo "::set-output name=start_time::$(date +'%Y-%m-%dT%H:%M:%S%z')"
21+
run: echo start_time=$(date +'%Y-%m-%dT%H:%M:%S%z') >> $GITHUB_OUTPUT
2222
- name: Trigger Nipype tutorial Github Action
2323
run: |
2424
set -x
@@ -38,7 +38,7 @@ jobs:
3838
3939
# fail if not extracted
4040
[[ -n $RUN_ID ]] || exit 1
41-
echo "::set-output name=run_id::$RUN_ID"
41+
echo run_id=$RUN_ID >> $GITHUB_OUTPUT
4242
- name: Check if action completed
4343
timeout-minutes: 120
4444
run: |

0 commit comments

Comments
 (0)