Skip to content

Commit 70add29

Browse files
effigieseffigies
authored
Merge pull request #2864 from nipy/rel/1.1.8
REL: 1.1.8
2 parents 81670e4 + dabb674 commit 70add29

File tree

5 files changed

+63
-26
lines changed

5 files changed

+63
-26
lines changed

‎.mailmap

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Aimi Watanabe <[email protected]> stymy <[email protected]>
33
Alejandro Tabas <[email protected]> qTabs <[email protected]>
44
Alejandro Tabas <[email protected]> qtabs <[email protected]>
55
Alejandro de la Vega <[email protected]> adelavega <[email protected]>
6+
Alejandro de la Vega <[email protected]> delavega4 <[email protected]>
67
Alexander Schaefer <[email protected]> Alexander Schaefer <[email protected]>
78
Alexander Schaefer <[email protected]> alexschaefer83 <[email protected]>
89
Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36SD.(none)>
@@ -40,6 +41,7 @@ Christopher J. Markiewicz <[email protected]> Chris Markiewicz <effigies@gmail.
4041
Christopher J. Markiewicz <[email protected]> Christopher J. Johnson <[email protected]>
4142
Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
4243
Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
44+
Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
4345
Cindee Madison <[email protected]> cindeem
4446
Cindee Madison <[email protected]> cindeem <>
4547
Colin Buchanan <[email protected]> Colin Buchanan <cbuchanan@cray4.(none)>
@@ -62,6 +64,7 @@ Erik Ziegler <[email protected]> Erik Ziegler <[email protected]>
6264
Erik Ziegler <[email protected]> erik <erik@erik-ubuntu.(none)>
6365
Erik Ziegler <[email protected]> erikz <[email protected]>
6466
Erik Ziegler <[email protected]> swederik <[email protected]>
67+
Feilong Ma <[email protected]> Ma Feilong <[email protected]>
6568
Fernando Pérez-García <[email protected]> Fernando <[email protected]>
6669
Franz Liem <[email protected]> fliem <franz.liem>
6770
Franz Liem <[email protected]> fliem <[email protected]>

‎.zenodo.json

+33-23
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,16 @@
110110
"affiliation": "National Institutes of Health",
111111
"name": "Clark, Michael G. "
112112
},
113-
{
114-
"affiliation": "Dartmouth College",
115-
"name": "Visconti di Oleggio Castello, Matteo",
116-
"orcid": "0000-0001-7931-5272"
117-
},
118113
{
119114
"affiliation": "Mayo Clinic, Neurology, Rochester, MN, USA",
120115
"name": "Dayan, Michael",
121116
"orcid": "0000-0002-2666-0969"
122117
},
118+
{
119+
"affiliation": "Dartmouth College",
120+
"name": "Visconti di Oleggio Castello, Matteo",
121+
"orcid": "0000-0001-7931-5272"
122+
},
123123
{
124124
"affiliation": "UC Berkeley",
125125
"name": "Clark, Dav",
@@ -142,15 +142,20 @@
142142
"name": "Berleant, Shoshana"
143143
},
144144
{
145-
"affiliation": "UC San Diego",
146-
"name": "Cipollini, Ben",
147-
"orcid": "0000-0002-7782-0790"
145+
"affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
146+
"name": "Horea, Christian",
147+
"orcid": "0000-0001-7037-2449"
148148
},
149149
{
150150
"affiliation": "Dartmouth College: Hanover, NH, United States",
151151
"name": "Halchenko, Yaroslav O.",
152152
"orcid": "0000-0003-3456-2493"
153153
},
154+
{
155+
"affiliation": "UC San Diego",
156+
"name": "Cipollini, Ben",
157+
"orcid": "0000-0002-7782-0790"
158+
},
154159
{
155160
"affiliation": "Montreal Neurological Institute and Hospital",
156161
"name": "Markello, Ross",
@@ -179,11 +184,6 @@
179184
"name": "Varoquaux, Gael",
180185
"orcid": "0000-0003-1076-5122"
181186
},
182-
{
183-
"affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
184-
"name": "Horea, Christian",
185-
"orcid": "0000-0001-7037-2449"
186-
},
187187
{
188188
"affiliation": "Athena EPI, Inria Sophia-Antipolis",
189189
"name": "Wassermann , Demian",
@@ -235,6 +235,11 @@
235235
"name": "Iqbal, Shariq",
236236
"orcid": "0000-0003-2766-8425"
237237
},
238+
{
239+
"affiliation": "University of Washington",
240+
"name": "Richie-Halford, Adam",
241+
"orcid": "0000-0001-9276-9084"
242+
},
238243
{
239244
"name": "Schwartz, Yannick"
240245
},
@@ -257,6 +262,11 @@
257262
{
258263
"name": "Kent, James"
259264
},
265+
{
266+
"affiliation": "University of Texas at Austin",
267+
"name": "De La Vega, Alejandro",
268+
"orcid": "0000-0001-9062-3778"
269+
},
260270
{
261271
"name": "Watanabe, Aimi"
262272
},
@@ -380,6 +390,16 @@
380390
{
381391
"name": "Hallquist, Michael"
382392
},
393+
{
394+
"affiliation": "Dartmouth College",
395+
"name": "Ma, Feilong",
396+
"orcid": "0000-0002-6838-3971"
397+
},
398+
{
399+
"affiliation": "TIB \u2013 Leibniz Information Centre for Science and Technology and University Library, Hannover, Germany",
400+
"name": "Leinweber, Katrin",
401+
"orcid": "0000-0001-5135-5758"
402+
},
383403
{
384404
"affiliation": "Donders Institute for Brain, Cognition and Behavior, Center for Cognitive Neuroimaging",
385405
"name": "Chetverikov, Andrey",
@@ -461,11 +481,6 @@
461481
"name": "Geisler, Daniel",
462482
"orcid": "0000-0003-2076-5329"
463483
},
464-
{
465-
"affiliation": "University of Texas at Austin",
466-
"name": "De La Vega, Alejandro",
467-
"orcid": "0000-0001-9062-3778"
468-
},
469484
{
470485
"affiliation": "University of illinois urbana champaign",
471486
"name": "Sharp, Paul"
@@ -589,11 +604,6 @@
589604
"affiliation": "MIT, HMS",
590605
"name": "Ghosh, Satrajit",
591606
"orcid": "0000-0002-5312-6729"
592-
},
593-
{
594-
"affiliation": "University of Washington",
595-
"name": "Richie-Halford, Adam",
596-
"orcid": "0000-0001-9276-9084"
597607
}
598608
],
599609
"keywords": [

‎doc/changelog/1.X.X-changelog

+24
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,30 @@
1+
1.1.8 (January 28, 2019)
2+
========================
3+
4+
##### [Full changelog](https://github.com/nipy/nipype/milestone/29?closed=1)
5+
6+
* FIX: ANTS LaplacianThickness cmdline opts fixed up (https://github.com/nipy/nipype/pull/2846)
7+
* FIX: Resolve LinAlgError during SVD (https://github.com/nipy/nipype/pull/2838)
8+
* ENH: Add interfaces wrapping DIPY worflows (https://github.com/nipy/nipype/pull/2830)
9+
* ENH: Update BIDSDataGrabber for pybids 0.7 (https://github.com/nipy/nipype/pull/2737)
10+
* ENH: Add FSL `eddy_quad` interface (https://github.com/nipy/nipype/pull/2825)
11+
* ENH: Support tckgen -select in MRtrix3 v3+ (https://github.com/nipy/nipype/pull/2823)
12+
* ENH: Support for BIDS event files (https://github.com/nipy/nipype/pull/2845)
13+
* ENH: CompositeTransformUtil, new ANTs interface (https://github.com/nipy/nipype/pull/2785)
14+
* RF: Move pytest and pytest-xdist from general requirement into tests_required (https://github.com/nipy/nipype/pull/2850)
15+
* DOC: Add S3DataGrabber example (https://github.com/nipy/nipype/pull/2849)
16+
* DOC: Skip conftest module in API generation (https://github.com/nipy/nipype/pull/2852)
17+
* DOC: Hyperlink DOIs to preferred resolver (https://github.com/nipy/nipype/pull/2833)
18+
* MAINT: Install numpy!=1.16.0 from conda in Docker (https://github.com/nipy/nipype/pull/2862)
19+
* MAINT: Drop pytest-xdist requirement, minimum pytest version (https://github.com/nipy/nipype/pull/2856)
20+
* MAINT: Disable numpy 1.16.0 for Py2.7 (https://github.com/nipy/nipype/pull/2855)
21+
22+
123
1.1.7 (December 17, 2018)
224
=========================
325

26+
##### [Full changelog](https://github.com/nipy/nipype/milestone/28?closed=1)
27+
428
* FIX: Copy node list before generating a flat graph (https://github.com/nipy/nipype/pull/2828)
529
* FIX: Update pytest req'd version to 3.6 (https://github.com/nipy/nipype/pull/2827)
630
* FIX: Set ResourceMonitor.fname to an absolute path (https://github.com/nipy/nipype/pull/2824)

‎doc/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
# General information about the project.
7575
project = u'nipype'
76-
copyright = u'2009-18, Neuroimaging in Python team'
76+
copyright = u'2009-19, Neuroimaging in Python team'
7777

7878
# The version info for the project you're documenting, acts as replacement for
7979
# |version| and |release|, also used in various other places throughout the
@@ -82,7 +82,7 @@
8282
# The short X.Y version.
8383
version = nipype.__version__
8484
# The full version, including alpha/beta/rc tags.
85-
release = "1.1.7"
85+
release = "1.1.8"
8686

8787
# The language for content autogenerated by Sphinx. Refer to documentation
8888
# for a list of supported languages.

‎nipype/info.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# full release. '.dev' as a version_extra string means this is a development
1212
# version
1313
# Remove -dev for release
14-
__version__ = '1.1.8-dev'
14+
__version__ = '1.1.8'
1515

1616

1717
def get_nipype_gitversion():

0 commit comments

Comments
 (0)