Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REL: 1.1.8 #2864

Merged
merged 9 commits into from
Jan 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Aimi Watanabe <[email protected]> stymy <[email protected]>
Alejandro Tabas <[email protected]> qTabs <[email protected]>
Alejandro Tabas <[email protected]> qtabs <[email protected]>
Alejandro de la Vega <[email protected]> adelavega <[email protected]>
Alejandro de la Vega <[email protected]> delavega4 <[email protected]>
Alexander Schaefer <[email protected]> Alexander Schaefer <[email protected]>
Alexander Schaefer <[email protected]> alexschaefer83 <[email protected]>
Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36SD.(none)>
Expand Down Expand Up @@ -40,6 +41,7 @@ Christopher J. Markiewicz <[email protected]> Chris Markiewicz <effigies@gmail.
Christopher J. Markiewicz <[email protected]> Christopher J. Johnson <[email protected]>
Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
Cindee Madison <[email protected]> cindeem
Cindee Madison <[email protected]> cindeem <>
Colin Buchanan <[email protected]> Colin Buchanan <cbuchanan@cray4.(none)>
Expand All @@ -62,6 +64,7 @@ Erik Ziegler <[email protected]> Erik Ziegler <[email protected]>
Erik Ziegler <[email protected]> erik <erik@erik-ubuntu.(none)>
Erik Ziegler <[email protected]> erikz <[email protected]>
Erik Ziegler <[email protected]> swederik <[email protected]>
Feilong Ma <[email protected]> Ma Feilong <[email protected]>
Fernando Pérez-García <[email protected]> Fernando <[email protected]>
Franz Liem <[email protected]> fliem <franz.liem>
Franz Liem <[email protected]> fliem <[email protected]>
Expand Down
56 changes: 33 additions & 23 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,16 @@
"affiliation": "National Institutes of Health",
"name": "Clark, Michael G. "
},
{
"affiliation": "Dartmouth College",
"name": "Visconti di Oleggio Castello, Matteo",
"orcid": "0000-0001-7931-5272"
},
{
"affiliation": "Mayo Clinic, Neurology, Rochester, MN, USA",
"name": "Dayan, Michael",
"orcid": "0000-0002-2666-0969"
},
{
"affiliation": "Dartmouth College",
"name": "Visconti di Oleggio Castello, Matteo",
"orcid": "0000-0001-7931-5272"
},
{
"affiliation": "UC Berkeley",
"name": "Clark, Dav",
Expand All @@ -142,15 +142,20 @@
"name": "Berleant, Shoshana"
},
{
"affiliation": "UC San Diego",
"name": "Cipollini, Ben",
"orcid": "0000-0002-7782-0790"
"affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
"name": "Horea, Christian",
"orcid": "0000-0001-7037-2449"
},
{
"affiliation": "Dartmouth College: Hanover, NH, United States",
"name": "Halchenko, Yaroslav O.",
"orcid": "0000-0003-3456-2493"
},
{
"affiliation": "UC San Diego",
"name": "Cipollini, Ben",
"orcid": "0000-0002-7782-0790"
},
{
"affiliation": "Montreal Neurological Institute and Hospital",
"name": "Markello, Ross",
Expand Down Expand Up @@ -179,11 +184,6 @@
"name": "Varoquaux, Gael",
"orcid": "0000-0003-1076-5122"
},
{
"affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
"name": "Horea, Christian",
"orcid": "0000-0001-7037-2449"
},
{
"affiliation": "Athena EPI, Inria Sophia-Antipolis",
"name": "Wassermann , Demian",
Expand Down Expand Up @@ -235,6 +235,11 @@
"name": "Iqbal, Shariq",
"orcid": "0000-0003-2766-8425"
},
{
"affiliation": "University of Washington",
"name": "Richie-Halford, Adam",
"orcid": "0000-0001-9276-9084"
},
{
"name": "Schwartz, Yannick"
},
Expand All @@ -257,6 +262,11 @@
{
"name": "Kent, James"
},
{
"affiliation": "University of Texas at Austin",
"name": "De La Vega, Alejandro",
"orcid": "0000-0001-9062-3778"
},
{
"name": "Watanabe, Aimi"
},
Expand Down Expand Up @@ -380,6 +390,16 @@
{
"name": "Hallquist, Michael"
},
{
"affiliation": "Dartmouth College",
"name": "Ma, Feilong",
"orcid": "0000-0002-6838-3971"
},
{
"affiliation": "TIB \u2013 Leibniz Information Centre for Science and Technology and University Library, Hannover, Germany",
"name": "Leinweber, Katrin",
"orcid": "0000-0001-5135-5758"
},
{
"affiliation": "Donders Institute for Brain, Cognition and Behavior, Center for Cognitive Neuroimaging",
"name": "Chetverikov, Andrey",
Expand Down Expand Up @@ -461,11 +481,6 @@
"name": "Geisler, Daniel",
"orcid": "0000-0003-2076-5329"
},
{
"affiliation": "University of Texas at Austin",
"name": "De La Vega, Alejandro",
"orcid": "0000-0001-9062-3778"
},
{
"affiliation": "University of illinois urbana champaign",
"name": "Sharp, Paul"
Expand Down Expand Up @@ -589,11 +604,6 @@
"affiliation": "MIT, HMS",
"name": "Ghosh, Satrajit",
"orcid": "0000-0002-5312-6729"
},
{
"affiliation": "University of Washington",
"name": "Richie-Halford, Adam",
"orcid": "0000-0001-9276-9084"
}
],
"keywords": [
Expand Down
24 changes: 24 additions & 0 deletions doc/changelog/1.X.X-changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
1.1.8 (January 28, 2019)
========================

##### [Full changelog](https://github.com/nipy/nipype/milestone/29?closed=1)

* FIX: ANTS LaplacianThickness cmdline opts fixed up (https://github.com/nipy/nipype/pull/2846)
* FIX: Resolve LinAlgError during SVD (https://github.com/nipy/nipype/pull/2838)
* ENH: Add interfaces wrapping DIPY worflows (https://github.com/nipy/nipype/pull/2830)
* ENH: Update BIDSDataGrabber for pybids 0.7 (https://github.com/nipy/nipype/pull/2737)
* ENH: Add FSL `eddy_quad` interface (https://github.com/nipy/nipype/pull/2825)
* ENH: Support tckgen -select in MRtrix3 v3+ (https://github.com/nipy/nipype/pull/2823)
* ENH: Support for BIDS event files (https://github.com/nipy/nipype/pull/2845)
* ENH: CompositeTransformUtil, new ANTs interface (https://github.com/nipy/nipype/pull/2785)
* RF: Move pytest and pytest-xdist from general requirement into tests_required (https://github.com/nipy/nipype/pull/2850)
* DOC: Add S3DataGrabber example (https://github.com/nipy/nipype/pull/2849)
* DOC: Skip conftest module in API generation (https://github.com/nipy/nipype/pull/2852)
* DOC: Hyperlink DOIs to preferred resolver (https://github.com/nipy/nipype/pull/2833)
* MAINT: Install numpy!=1.16.0 from conda in Docker (https://github.com/nipy/nipype/pull/2862)
* MAINT: Drop pytest-xdist requirement, minimum pytest version (https://github.com/nipy/nipype/pull/2856)
* MAINT: Disable numpy 1.16.0 for Py2.7 (https://github.com/nipy/nipype/pull/2855)


1.1.7 (December 17, 2018)
=========================

##### [Full changelog](https://github.com/nipy/nipype/milestone/28?closed=1)

* FIX: Copy node list before generating a flat graph (https://github.com/nipy/nipype/pull/2828)
* FIX: Update pytest req'd version to 3.6 (https://github.com/nipy/nipype/pull/2827)
* FIX: Set ResourceMonitor.fname to an absolute path (https://github.com/nipy/nipype/pull/2824)
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

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

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

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion nipype/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# full release. '.dev' as a version_extra string means this is a development
# version
# Remove -dev for release
__version__ = '1.1.8-dev'
__version__ = '1.1.8'


def get_nipype_gitversion():
Expand Down