Skip to content

Commit 46b8c99

Browse files
effigieseffigies
authored
Merge pull request #3559 from effigies/fix/graceful-failure
CI: Drop nipy tests until a fixed nipy is released
2 parents cdfe679 + ec5b798 commit 46b8c99

Some content is hidden

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

50 files changed

+81
-145
lines changed

‎.git-blame-ignore-revs

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,80 @@
1-
# Commits with messages like "STY: black" or "run black"
1+
# Wed Apr 5 14:01:05 2023 -0400 - [email protected] - STY: black [ignore-rev]
2+
a9ce9b78a402ebacf7726ad6454bb75b1447f52f
3+
# Wed Sep 14 14:12:07 2022 -0400 - [email protected] - STY: Black
4+
f4a779223c6b0dffa47138d24ec9ef378c7164a9
5+
# Tue Apr 19 14:09:31 2022 -0400 - [email protected] - STY: black [ignore-rev]
6+
b9716ebd46541f7fb1b96a94cc35b5e2ea6c3bba
7+
# Fri Apr 15 06:59:48 2022 -0700 - [email protected] - STY: black [ignore-rev]
8+
d223fbccda6dee0ef39e00084296a3292f2ccf87
9+
# Fri Apr 8 21:34:43 2022 -0400 - [email protected] - STY: black [ignore-rev]
10+
e3f56da124fd58041018c2e70d16a130ef189a66
11+
# Sun Apr 3 10:27:07 2022 -0400 - [email protected] - STY: black [ignore-rev]
12+
988c382ebfc7df964874b6287b9d9e27e274a4a4
13+
# Sat Apr 2 21:32:56 2022 -0400 - [email protected] - STY: black [ignore-rev]
14+
230fac6149d4dfbd5da669a983332a1fe318ef57
15+
# Sat Apr 2 12:49:15 2022 -0400 - [email protected] - STY/TEST: Make specs and run black [ignore-rev]
16+
2ba8dacb8cc1f6f9c5b15b1cfb7b0395d45dcfb3
17+
# Sun Mar 20 21:19:39 2022 -0400 - [email protected] - STY: black [ignore-rev]
18+
87cc1b54981113024ec3fd594881f72cf67513fb
19+
# Wed Dec 8 17:02:09 2021 -0500 - [email protected] - STY: black [ignore-rev]
20+
5ac2f18ac116832d81a13f0c83e0a6aeda1457cf
21+
# Thu Dec 2 09:30:42 2021 -0500 - [email protected] - STY: black
22+
ee50279ebf061a70ff502e7d2e51385b285cfda4
23+
# Tue Oct 26 11:18:02 2021 +0200 - [email protected] - sty: run black
24+
5d9adbbb77b7047b9b47cd2fa079dee0094cfc91
25+
# Wed Oct 20 12:07:15 2021 +0200 - [email protected] - run black on the preprocess.py file to improve formatting
26+
674e9b0eeca082efb5322b61fea57ee89a3e4a24
27+
# Wed Oct 13 16:08:23 2021 -0400 - [email protected] - ENH: Add expected steps for FreeSurfer 7 recon-all (#3389)
28+
8f7c0bf2ec9c819844a2736a9ae2f6eef19a8e7f
29+
# Wed Oct 13 14:26:48 2021 -0400 - [email protected] - STY: black
30+
d8dbc6f7b6a5385535e2fa53b7c6af7aa1370f46
31+
# Wed Sep 29 16:53:54 2021 +0200 - [email protected] - sty: run black on affected files
32+
5f280da629bb7b5dce908633d2deea85b55dd67b
33+
# Thu Jun 24 17:43:22 2021 +0200 - [email protected] - sty: run black
34+
135ce497a18adbe0811441c2b720910ec549aa6f
35+
# Thu Sep 23 08:56:28 2021 -0400 - [email protected] - STY: black
36+
f69b3fb09560616822737764bb07272cd587e4a0
37+
# Fri Apr 30 17:19:55 2021 -0400 - [email protected] - STY: black
38+
04718ac71436b6f283af7575dda0f6998b64f893
39+
# Fri Apr 30 16:50:00 2021 -0400 - [email protected] - STY: black
240
12deb959cccc431fb8222cc5854f1c92a0080021
41+
# Thu Apr 1 12:26:08 2021 -0400 - [email protected] - STY: black
342
f64bf338f630a9ee5cbe7a3ec98c68292897e720
43+
# Thu Dec 3 09:24:05 2020 +1100 - [email protected] - run black over touched files
44+
c81259bc3b28baa1f18f95f6b056c228c6bfd115
45+
# Fri Aug 14 17:15:15 2020 -0400 - [email protected] - STY: Black
446
83358d7f17aac07cb90d0330f11ea2322e2974d8
47+
# Sat Mar 14 12:44:20 2020 -0400 - [email protected] - STY: black
548
faef7d0f93013a700c882f709e98fb3cd36ebb03
49+
# Sun Mar 8 15:05:28 2020 +0100 - [email protected] - FIX: get length of generator + STY: Black
50+
02991da67458b879d7c6360aa6457eb3c1bd5a07
51+
# Wed Mar 4 16:30:39 2020 -0500 - [email protected] - STY: black
652
d50c1858564c0b3073fb23c54886a0454cb66afa
53+
# Thu Feb 27 15:08:42 2020 -0800 - [email protected] - sty: black
754
417b8897a116fcded5000e21e2b6ccbe29452a52
55+
# Thu Jan 2 11:29:05 2020 -0800 - [email protected] - sty: black
856
aaf677a87f64c485f3e305799e4a5dc73b69e5fb
57+
# Sun Dec 29 17:47:51 2019 -0800 - [email protected] - sty: black
958
f763008442d88d8ce00ec266698268389415f8d6
59+
# Thu Jan 2 11:29:05 2020 -0800 - [email protected] - sty: black
1060
b1eccafd4edc8503b02d715f5b5f6f783520fdf9
61+
# Sun Dec 29 17:47:51 2019 -0800 - [email protected] - sty: black
1162
70db90349598cc7f26a4a513779529fba7d0a797
63+
# Thu Dec 19 09:22:22 2019 -0500 - [email protected] - STY: Black
1264
6c1d91d71f6f0db0e985bd2adc34206442b0653d
65+
# Thu Dec 19 15:51:11 2019 -0500 - [email protected] - STY: Black
1366
97bdbd5f48ab242de5288ba4715192a27619a803
67+
# Fri Nov 15 14:38:10 2019 -0500 - [email protected] - run black
1468
78fa360f5b785224349b8b85b07e510d2233bb63
69+
# Fri Nov 15 14:34:03 2019 -0500 - [email protected] - run black
1570
7f85f43a34de8bff8e634232c939b17cee8e8fc5
71+
# Thu Nov 14 11:14:51 2019 -0500 - [email protected] - Merge pull request #3096 from effigies/sty/black
72+
1a869991adc024577536689d557fc748c764f15d
73+
# Thu Nov 14 09:15:20 2019 -0500 - [email protected] - STY: Black setup.py
1674
9c50b5daa797def5672dd057155b0e2c658853e2
75+
# Thu Nov 14 09:14:38 2019 -0500 - [email protected] - STY: Black for tools/
1776
47194993ae14aceeec436cfb3769def667196668
77+
# Wed Nov 13 23:41:15 2019 -0500 - [email protected] - STY: Black
1878
75653feadc6667d5313d83e9c62a5d5819771a9c
79+
# Tue Nov 12 09:43:34 2019 -0500 - [email protected] - STY: Black files pre-merge
1980
497b44d680eee0892fa59c6aaaae22a17d70a536

‎.github/workflows/tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ jobs:
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: NUMPY123
113+
# deb-depends: true
114+
# nipype-extras: doc,tests,nipy,profiler,duecredit,ssh
115115
env:
116116
DEPENDS: ${{ matrix.depends }}
117117
CHECK_TYPE: ${{ matrix.check }}

‎Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ PYTHON ?= python
99
zipdoc: html
1010
zip documentation.zip doc/_build/html
1111

12+
.git-blame-ignore-revs: .git/HEAD
13+
git log --grep "\[ignore-rev\]\|STY: black\|run black" -i --pretty=format:"# %ad - %ae - %s%n%H" > .git-blame-ignore-revs
14+
echo >> .git-blame-ignore-revs
15+
1216
sdist: zipdoc
1317
@echo "Building source distribution..."
1418
$(PYTHON) setup.py sdist

‎nipype/algorithms/misc.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,6 @@ class CalculateNormalizedMoments(BaseInterface):
968968
output_spec = CalculateNormalizedMomentsOutputSpec
969969

970970
def _run_interface(self, runtime):
971-
972971
self._moments = calc_moments(self.inputs.timeseries_file, self.inputs.moment)
973972
return runtime
974973

‎nipype/algorithms/tests/test_ErrorMap.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111

1212
def test_errormap(tmpdir):
13-
1413
# Single-Spectual
1514
# Make two fake 2*2*2 voxel volumes
1615
# John von Neumann's birthday

‎nipype/algorithms/tests/test_misc.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414

1515
def test_CreateNifti(create_analyze_pair_file_in_directory):
16-
1716
filelist, outdir = create_analyze_pair_file_in_directory
1817

1918
create_nifti = misc.CreateNifti()
@@ -35,7 +34,6 @@ def test_CreateNifti(create_analyze_pair_file_in_directory):
3534

3635

3736
def test_CalculateMedian(create_analyze_pair_file_in_directory):
38-
3937
mean = misc.CalculateMedian()
4038

4139
with pytest.raises(TypeError):

‎nipype/algorithms/tests/test_normalize_tpms.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717

1818
def test_normalize_tpms(tmpdir):
19-
2019
in_mask = example_data("tpms_msk.nii.gz")
2120
mskdata = np.asanyarray(nb.load(in_mask).dataobj)
2221
mskdata[mskdata > 0.0] = 1.0

‎nipype/conftest.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def _docdir(request):
2727
# Trigger ONLY for the doctests.
2828
doctest_plugin = request.config.pluginmanager.getplugin("doctest")
2929
if isinstance(request.node, doctest_plugin.DoctestItem):
30-
3130
# Get the fixture dynamically by its name.
3231
tmpdir = pp.local(data_dir)
3332

‎nipype/external/cloghandler.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@ def __init__(
151151
)
152152
try:
153153
BaseRotatingHandler.__init__(self, filename, mode, encoding)
154-
except TypeError: # Due to a different logging release without encoding support (Python 2.4.1 and earlier?)
154+
except (
155+
TypeError
156+
): # Due to a different logging release without encoding support (Python 2.4.1 and earlier?)
155157
BaseRotatingHandler.__init__(self, filename, mode)
156158
self.encoding = encoding
157159

‎nipype/interfaces/afni/preprocess.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,6 @@ class ClipLevel(AFNICommandBase):
11331133
output_spec = ClipLevelOutputSpec
11341134

11351135
def aggregate_outputs(self, runtime=None, needed_outputs=None):
1136-
11371136
outputs = self._outputs()
11381137

11391138
outfile = os.path.join(os.getcwd(), "stat_result.json")
@@ -2295,7 +2294,6 @@ class Seg(AFNICommandBase):
22952294
output_spec = AFNICommandOutputSpec
22962295

22972296
def aggregate_outputs(self, runtime=None, needed_outputs=None):
2298-
22992297
import glob
23002298

23012299
outputs = self._outputs()

0 commit comments

Comments
 (0)