Skip to content

Commit 5fb7ae1

Browse files
jdkentjdkent
authored
[MAINT] update workflow and fix example (#905)
update workflow and fix example
1 parent 2c9b52a commit 5fb7ae1

2 files changed

Lines changed: 68 additions & 60 deletions

File tree

‎.github/workflows/testing.yml‎

Lines changed: 67 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- "main"
77
pull_request:
88
branches:
9-
- '*'
9+
- "*"
1010

1111
concurrency:
1212
group: testing-${{ github.ref }}
@@ -26,37 +26,37 @@ jobs:
2626
- id: result_step
2727
uses: mstachniuk/ci-skip@master
2828
with:
29-
commit-filter: '[skip ci];[ci skip];[skip github]'
30-
commit-filter-separator: ';'
29+
commit-filter: "[skip ci];[ci skip];[skip github]"
30+
commit-filter-separator: ";"
3131

3232
run_unit_tests:
3333
name: Unit tests
3434
needs: check_skip
3535
if: ${{ needs.check_skip.outputs.skip == 'false' }}
3636
runs-on: ${{ matrix.os }}
3737
strategy:
38-
fail-fast: false
39-
matrix:
40-
os: ["ubuntu-latest", "macos-latest"]
41-
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
38+
fail-fast: false
39+
matrix:
40+
os: ["ubuntu-latest", "macos-latest"]
41+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
4242

4343
defaults:
4444
run:
4545
shell: bash
4646
steps:
4747
- uses: actions/checkout@v2
48-
- name: 'Set up python'
48+
- name: "Set up python"
4949
uses: actions/setup-python@v2
5050
with:
51-
python-version: ${{ matrix.python-version }}
52-
- name: 'Install NiMARE'
51+
python-version: ${{ matrix.python-version }}
52+
- name: "Install NiMARE"
5353
shell: bash {0}
5454
run: pip install -e .[tests,cbmr]
55-
- name: 'Run tests'
55+
- name: "Run tests"
5656
shell: bash {0}
5757
run: make unittest
5858
- name: Upload artifacts
59-
uses: actions/upload-artifact@v2
59+
uses: actions/upload-artifact@v4
6060
with:
6161
name: unit_${{ matrix.os }}_${{ matrix.python-version }}
6262
path: coverage.xml
@@ -68,27 +68,27 @@ jobs:
6868
if: ${{ needs.check_skip.outputs.skip == 'false' }}
6969
runs-on: ${{ matrix.os }}
7070
strategy:
71-
fail-fast: false
72-
matrix:
73-
os: ["ubuntu-latest"]
74-
python-version: ["3.8"]
71+
fail-fast: false
72+
matrix:
73+
os: ["ubuntu-latest"]
74+
python-version: ["3.8"]
7575
defaults:
7676
run:
7777
shell: bash
7878
steps:
7979
- uses: actions/checkout@v2
80-
- name: 'Set up python'
80+
- name: "Set up python"
8181
uses: actions/setup-python@v2
8282
with:
83-
python-version: 3.8
84-
- name: 'Install NiMARE'
83+
python-version: 3.8
84+
- name: "Install NiMARE"
8585
shell: bash {0}
8686
run: pip install -e .[minimum,tests,cbmr]
87-
- name: 'Run tests'
87+
- name: "Run tests"
8888
shell: bash {0}
8989
run: make unittest
9090
- name: Upload artifacts
91-
uses: actions/upload-artifact@v2
91+
uses: actions/upload-artifact@v4
9292
with:
9393
name: unit_minimum
9494
path: coverage.xml
@@ -100,27 +100,27 @@ jobs:
100100
if: ${{ needs.check_skip.outputs.skip == 'false' }}
101101
runs-on: ${{ matrix.os }}
102102
strategy:
103-
fail-fast: false
104-
matrix:
105-
os: ["ubuntu-latest"]
106-
python-version: ["3.8"]
103+
fail-fast: false
104+
matrix:
105+
os: ["ubuntu-latest"]
106+
python-version: ["3.8"]
107107
defaults:
108108
run:
109109
shell: bash
110110
steps:
111111
- uses: actions/checkout@v2
112-
- name: 'Set up python'
112+
- name: "Set up python"
113113
uses: actions/setup-python@v2
114114
with:
115-
python-version: ${{ matrix.python-version }}
116-
- name: 'Install NiMARE'
115+
python-version: ${{ matrix.python-version }}
116+
- name: "Install NiMARE"
117117
shell: bash {0}
118118
run: pip install -e .[tests,cbmr]
119-
- name: 'Run tests'
119+
- name: "Run tests"
120120
shell: bash {0}
121121
run: make test_performance_estimators
122122
- name: Upload artifacts
123-
uses: actions/upload-artifact@v2
123+
uses: actions/upload-artifact@v4
124124
with:
125125
name: performance_estimator
126126
path: coverage.xml
@@ -132,27 +132,27 @@ jobs:
132132
if: ${{ needs.check_skip.outputs.skip == 'false' }}
133133
runs-on: ${{ matrix.os }}
134134
strategy:
135-
fail-fast: false
136-
matrix:
137-
os: ["ubuntu-latest"]
138-
python-version: ["3.8"]
135+
fail-fast: false
136+
matrix:
137+
os: ["ubuntu-latest"]
138+
python-version: ["3.8"]
139139
defaults:
140140
run:
141141
shell: bash
142142
steps:
143143
- uses: actions/checkout@v2
144-
- name: 'Set up python'
144+
- name: "Set up python"
145145
uses: actions/setup-python@v2
146146
with:
147-
python-version: ${{ matrix.python-version }}
148-
- name: 'Install NiMARE'
147+
python-version: ${{ matrix.python-version }}
148+
- name: "Install NiMARE"
149149
shell: bash {0}
150150
run: pip install -e .[tests,cbmr]
151-
- name: 'Run tests'
151+
- name: "Run tests"
152152
shell: bash {0}
153153
run: make test_performance_correctors
154154
- name: Upload artifacts
155-
uses: actions/upload-artifact@v2
155+
uses: actions/upload-artifact@v4
156156
with:
157157
name: performance_corrector
158158
path: coverage.xml
@@ -164,27 +164,27 @@ jobs:
164164
if: ${{ needs.check_skip.outputs.skip == 'false' }}
165165
runs-on: ${{ matrix.os }}
166166
strategy:
167-
fail-fast: false
168-
matrix:
169-
os: ["ubuntu-latest"]
170-
python-version: ["3.8"]
167+
fail-fast: false
168+
matrix:
169+
os: ["ubuntu-latest"]
170+
python-version: ["3.8"]
171171
defaults:
172172
run:
173173
shell: bash
174174
steps:
175175
- uses: actions/checkout@v2
176-
- name: 'Set up python'
176+
- name: "Set up python"
177177
uses: actions/setup-python@v2
178178
with:
179-
python-version: ${{ matrix.python-version }}
180-
- name: 'Install NiMARE'
179+
python-version: ${{ matrix.python-version }}
180+
- name: "Install NiMARE"
181181
shell: bash {0}
182182
run: pip install -e .[tests,cbmr]
183-
- name: 'Run tests'
183+
- name: "Run tests"
184184
shell: bash {0}
185185
run: make test_performance_smoke
186186
- name: Upload artifacts
187-
uses: actions/upload-artifact@v2
187+
uses: actions/upload-artifact@v4
188188
with:
189189
name: performance_smoke
190190
path: coverage.xml
@@ -196,41 +196,49 @@ jobs:
196196
if: ${{ needs.check_skip.outputs.skip == 'false' }}
197197
runs-on: ${{ matrix.os }}
198198
strategy:
199-
fail-fast: false
200-
matrix:
201-
os: ["ubuntu-latest"]
202-
python-version: ["3.8"]
199+
fail-fast: false
200+
matrix:
201+
os: ["ubuntu-latest"]
202+
python-version: ["3.8"]
203203
defaults:
204204
run:
205205
shell: bash
206206
steps:
207207
- uses: actions/checkout@v2
208-
- name: 'Set up python'
208+
- name: "Set up python"
209209
uses: actions/setup-python@v2
210210
with:
211-
python-version: ${{ matrix.python-version }}
212-
- name: 'Install NiMARE'
211+
python-version: ${{ matrix.python-version }}
212+
- name: "Install NiMARE"
213213
shell: bash {0}
214214
run: pip install -e .[tests]
215-
- name: 'Run tests'
215+
- name: "Run tests"
216216
shell: bash {0}
217217
run: make test_cbmr_importerror
218218
- name: Upload artifacts
219-
uses: actions/upload-artifact@v2
219+
uses: actions/upload-artifact@v4
220220
with:
221221
name: cbmr_importerror
222222
path: coverage.xml
223223
if: success()
224224

225225
upload_to_codecov:
226226
name: Upload coverage
227-
needs: [run_unit_tests,run_unit_tests_with_minimum_dependencies,test_performance_estimators,test_performance_correctors,test_performance_smoke,test_cbmr_importerror]
227+
needs:
228+
[
229+
run_unit_tests,
230+
run_unit_tests_with_minimum_dependencies,
231+
test_performance_estimators,
232+
test_performance_correctors,
233+
test_performance_smoke,
234+
test_cbmr_importerror,
235+
]
228236
runs-on: "ubuntu-latest"
229237
steps:
230238
- name: Checkout
231239
uses: actions/checkout@v2
232240
- name: Download artifacts
233-
uses: actions/download-artifact@v2
241+
uses: actions/download-artifact@v4
234242
- name: Upload to CodeCov
235243
uses: codecov/codecov-action@v4
236244
with:

‎examples/02_meta-analyses/12_plot_ibma_workflow.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
###############################################################################
7979
# Contribution table
8080
# ``````````````````````````````````````````````````````````````````````````````
81-
result.tables["z_corr-FDR_method-indep_diag-Jackknife_tab-counts_tail-positive"]
81+
result.tables["z_corr-FDR_method-indep_diag-Jackknife_tab-counts"]
8282

8383
###############################################################################
8484
# Report

0 commit comments

Comments
 (0)