Skip to content

Commit 48a952f

Browse files
authored
Merge pull request #1994 from poldracklab/rel/20.0.0rc3
REL: 20.0.0
2 parents d65cfdd + 85901a7 commit 48a952f

File tree

4 files changed

+68
-19
lines changed

4 files changed

+68
-19
lines changed

.mailmap

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Alejandro de la Vega <aleph4@gmail.com>
44
Alejandro de la Vega <aleph4@gmail.com> delavega4
55
Anibal Sólon Heinsfeld <anibalsolon@gmail.com>
66
Asier Erramuzpe <asier.erramuzpe@gmail.com>
7+
Basille Pinsard <basile.pinsard@umontreal.ca>
8+
Basille Pinsard <basile.pinsard@umontreal.ca> basile <basile.pinsard@gmail.com>
9+
Basille Pinsard <basile.pinsard@umontreal.ca> <bpinsard@imed.jussieu.fr>
710
Christopher J. Markiewicz <effigies@gmail.com>
811
Christopher J. Markiewicz <effigies@gmail.com> <effigies@bu.edu>
912
Christopher J. Markiewicz <effigies@gmail.com> <markiewicz@stanford.edu>
@@ -24,9 +27,9 @@ Kevin Sitek <sitek.kevin@gmail.com>
2427
Kevin Sitek <sitek.kevin@gmail.com> sitek <sitek.kevin@gmail.com>
2528
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com>
2629
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <chris.gorgolewski@gmail.com>
30+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-dtc-laptop>
2731
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-Precision-M6500.(none)>
2832
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-Precision-M6500>
29-
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-dtc-laptop>
3033
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filolaptop>
3134
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <krzysztof.gorgolewski+fake@gmail.com>
3235
Marc Bue <44844855+marcbue@users.noreply.github.com>
@@ -35,6 +38,8 @@ Mathias Goncalves <goncalves.mathias@gmail.com>
3538
Mathias Goncalves <goncalves.mathias@gmail.com> <mathiasg@mit.edu>
3639
Mathias Goncalves <goncalves.mathias@gmail.com> <mathiasg@stanford.edu>
3740
Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu>
41+
Marc Bue <44844855+marcbue@users.noreply.github.com>
42+
Marc Bue <44844855+marcbue@users.noreply.github.com> marcbue <44844855+marcbue@users.noreply.github.com>
3843
Mikael Naveau <naveau.mikael@gmail.com>
3944
Nir Jacoby <nj2319@columbia.edu>
4045
Nir Jacoby <nj2319@columbia.edu> <nirjacoby@dyn-128-59-231-222.dyn.columbia.edu>
@@ -44,12 +49,13 @@ Pablo Velasco <pablo.velasco@nyu.edu>
4449
Rastko Ciric <rc042010@mymail.pomona.edu>
4550
Rastko Ciric <rc042010@mymail.pomona.edu> <rastko@stanford.edu>
4651
Rastko Ciric <rc042010@mymail.pomona.edu> <rciric@users.noreply.github.com>
52+
Romain Valabregue <romain.valabregue@upmc.fr>
4753
Ross Blair <rblair2@stanford.edu>
4854
Ross Blair <rblair2@stanford.edu> <rosswilsonblair@gmail.com>
49-
Romain Valabregue <romain.valabregue@upmc.fr>
5055
Saren Seeley <31291534+sarenseeley@users.noreply.github.com>
5156
Sebastian Urchs <sebastian.urchs@gmail.com>
5257
Sebastien Naze <naze@us.ibm.com>
5358
Shoshana Berleant <berleant@stanford.edu> <shoshber@users.noreply.github.com>
59+
Soichi Hayashi <hayashis@iu.edu>
5460
William Hedley Thompson <william.thompson@ki.se>
5561
William Hedley Thompson <william.thompson@ki.se> <wiheto@users.noreply.github.com>

.zenodo.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@
3838
"orcid": "0000-0002-9402-2184",
3939
"type": "Researcher"
4040
},
41-
{
42-
"affiliation": "Department of Psychology, University of California, Berkeley",
43-
"name": "Lurie, Daniel J.",
44-
"orcid": "0000-0001-8012-6399",
45-
"type": "Researcher"
46-
},
4741
{
4842
"affiliation": "CENIR, INSERM U1127, CNRS UMR 7225, UPMC Univ Paris 06 UMR S 1127, Institut du Cerveau et de la Moelle \u00e9pini\u00e8re, ICM, F-75013, Paris, France",
4943
"name": "Valabregue, Romain",
@@ -56,6 +50,12 @@
5650
"orcid": "0000-0001-7936-9991",
5751
"type": "Researcher"
5852
},
53+
{
54+
"affiliation": "Department of Psychology, University of California, Berkeley",
55+
"name": "Lurie, Daniel J.",
56+
"orcid": "0000-0001-8012-6399",
57+
"type": "Researcher"
58+
},
5959
{
6060
"affiliation": "Child Mind Institute",
6161
"name": "Heinsfeld, Anibal S.",
@@ -217,16 +217,16 @@
217217
"name": "DuPre, Elizabeth",
218218
"orcid": "0000-0003-1358-196X"
219219
},
220-
{
221-
"affiliation": "Neuroscience Program, University of Iowa",
222-
"name": "Kent, James D.",
223-
"orcid": "0000-0002-4892-2659"
224-
},
225220
{
226221
"affiliation": "Department of Psychology, Stanford University",
227222
"name": "Goncalves, Mathias",
228223
"orcid": "0000-0002-7252-7771"
229224
},
225+
{
226+
"affiliation": "Neuroscience Program, University of Iowa",
227+
"name": "Kent, James D.",
228+
"orcid": "0000-0002-4892-2659"
229+
},
230230
{
231231
"affiliation": "Department of Psychology, Stanford University",
232232
"name": "Ciric, Rastko",

CHANGES.rst

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,54 @@ This release includes contributions from Azeez Adebimpe and Basile Pinsard - ver
2929
* ENH: Add ``--bids-filter-file`` argument for more controlled data querying (#1770)
3030
* FIX: Ensure subject ID is used when selecting BIDS data (#1982)
3131
* FIX: Display a log message when processing completes successfully (#1977)
32+
* DOC: Clean up surface outputs (#1993)
33+
* DOC: Integrate intersphinx, drop external module wrapping (#1989)
3234
* DOC: Improve custom template usage description (#1969)
35+
* MAINT: Use local docker registry (#1990)
3336
* MAINT: Pin connectome-workbench 1.3.2, add to documented dependencies (#1958)
3437
* MAINT: Pin NiBabel, NiWorkflows, sMRIPrep (#1971)
3538
* MAINT: CI build error fixes (#1976)
3639

40+
.. admonition:: Author list for papers based on *fMRIPrep* v20.0.0
41+
42+
As described in the `Contributor Guidelines
43+
<https://github.com/poldracklab/fmriprep/blob/d65cfdd80443c5ca779680b1087d14f189e8ceb5/CONTRIBUTING.md#publications>`__, anyone
44+
listed as developer or contributor may write and submit manuscripts regarding
45+
*fMRIPrep*.
46+
To do so, please move the author(s) name(s) to the front of the following list.
47+
48+
Markiewicz, Christopher J. (1); DuPre, Elizabeth (2); Goncalves, Mathias (1); Kent, James D. (3); Ciric, Rastko (1); Salo, Taylor (4); de la Vega, Alejandro (5); Finc, Karolina (6); Feingold, Franklin (1); Urchs, Sebastian (2); Blair, Ross W. (1); Erramuzpe, Asier (7); Valabregue, Romain (8); Jacoby, Nir (9); Lurie, Daniel J. (10); Heinsfeld, Anibal S. (11); Halchenko, Yaroslav O. (12); Sneve, Markus H. (13); Devenyi, Grabriel A. (14); Liem, Franz (15); Gomez, Daniel E. P. (16); Adebimpe, Azeez (17); Velasco, Pablo (18); Groen, Iris I. A. (19); Ma, Feilong (12); Rivera-Dompenciel, Adriana (3); Amlien, Inge K. (13); Cieslak, Matthew (17); Ghosh, Satrajit S. (20, 21); Isik, Ayse Ilkay (22); Moodie, Craig A. (1); Naveau, Mikaël (23); Satterthwaite, Theodore D. (17); Sitek, Kevin R. (24); Stojić, Hrvoje (25); Thompson, William H (1); Tooley, Ursula A. (26); Wright, Jessey (1); Ye, Zhifang (27); Gorgolewski, Krzysztof J. (1); Poldrack, Russell A. (1); Esteban, Oscar (1)
49+
50+
Affiliations:
51+
52+
1. Department of Psychology, Stanford University
53+
2. Montreal Neurological Institute, McGill University
54+
3. Neuroscience Program, University of Iowa
55+
4. Department of Psychology, Florida International University
56+
5. University of Texas at Austin
57+
6. Centre for Modern Interdisciplinary Technologies, Nicolaus Copernicus University in Toruń
58+
7. Computational Neuroimaging Lab, BioCruces Health Research Institute
59+
8. CENIR, INSERM U1127, CNRS UMR 7225, UPMC Univ Paris 06 UMR S 1127, Institut du Cerveau et de la Moelle épinière, ICM, F-75013, Paris, France
60+
9. Department of Psychology, Columbia University
61+
10. Department of Psychology, University of California, Berkeley
62+
11. Child Mind Institute
63+
12. Dartmouth College: Hanover, NH, United States
64+
13. Center for Lifespan Changes in Brain and Cognition, University of Oslo
65+
14. Department of Psychiatry, McGill University
66+
15. URPP Dynamics of Healthy Aging, University of Zurich
67+
16. Donders Institute for Brain, Cognition and Behaviour, Radboud University Nijmegen
68+
17. Perelman School of Medicine, University of Pennsylvania, PA, USA
69+
18. Center for Brain Imaging, New York University
70+
19. Department of Psychology, New York University, NY, USA
71+
20. McGovern Institute for Brain Research, MIT, MA, USA
72+
21. Department of Otolaryngology, Harvard Medical School, MA, USA
73+
22. Max Planck Institute for Empirical Aesthetics
74+
23. Cyceron, UMS 3408 (CNRS - UCBN), France
75+
24. Speech & Hearing Bioscience & Technology Program, Harvard University
76+
25. Max Planck UCL Centre for Computational Psychiatry and Ageing Research, University College London
77+
26. Department of Neuroscience, University of Pennsylvania, PA, USA
78+
27. State Key Laboratory of Cognitive Neuroscience and Learning, Beijing Normal University
79+
3780
1.5.9 (February 14, 2020)
3881
=========================
3982
Bug-fix release in the 1.5.x series.

setup.cfg

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ classifiers =
2020
[options]
2121
python_requires = >=3.5
2222
install_requires =
23-
indexed_gzip >=0.8.8
23+
indexed_gzip >= 0.8.8
2424
nibabel >= 3.0.1
25-
nipype >=1.3.1
25+
nipype >= 1.3.1
2626
nitime
2727
niworkflows ~= 1.1.7
2828
numpy
2929
pandas
30-
psutil >=5.4
31-
pybids ~= 0.9.4
30+
psutil >= 5.4
31+
pybids >= 0.9.4
3232
pyyaml
3333
sdcflows ~= 1.2.0
3434
smriprep ~= 0.5.2
35-
tedana >=0.0.5
36-
templateflow ~= 0.4.2rc1
35+
tedana >= 0.0.5
36+
templateflow >= 0.4.2
3737
test_requires =
3838
coverage
3939
codecov

0 commit comments

Comments
 (0)