From bba7a7ccd6770d7c7e189601c1d1cf221b2fc996 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Wed, 15 Nov 2017 11:20:58 -0500 Subject: [PATCH 1/7] sty: whitespaces --- doc/users/config_file.rst | 8 ++++---- nipype/algorithms/tests/test_mesh_ops.py | 2 +- nipype/interfaces/ants/tests/test_resampling.py | 4 ++-- nipype/interfaces/cmtk/tests/test_nbs.py | 4 ++-- nipype/interfaces/niftyfit/asl.py | 2 +- nipype/pipeline/engine/tests/test_utils.py | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/users/config_file.rst b/doc/users/config_file.rst index b196047e97..7c10a381c8 100644 --- a/doc/users/config_file.rst +++ b/doc/users/config_file.rst @@ -74,11 +74,11 @@ Execution *display_variable* Override the ``$DISPLAY`` environment variable for interfaces that require - an X server. This option is useful if there is a running X server, but - ``$DISPLAY`` was not defined in nipype's environment. For example, if an X + an X server. This option is useful if there is a running X server, but + ``$DISPLAY`` was not defined in nipype's environment. For example, if an X server is listening on the default port of 6000, set ``display_variable = :0`` - to enable nipype interfaces to use it. It may also point to displays provided - by VNC, `xnest `_ + to enable nipype interfaces to use it. It may also point to displays provided + by VNC, `xnest `_ or `Xvfb `_. If neither ``display_variable`` nor the ``$DISPLAY`` environment variable are set, nipype will try to configure a new virtual server using Xvfb. diff --git a/nipype/algorithms/tests/test_mesh_ops.py b/nipype/algorithms/tests/test_mesh_ops.py index 9d510dee2b..d5fbc56825 100644 --- a/nipype/algorithms/tests/test_mesh_ops.py +++ b/nipype/algorithms/tests/test_mesh_ops.py @@ -15,7 +15,7 @@ @pytest.mark.skipif(VTKInfo.no_tvtk(), reason="tvtk is not installed") def test_ident_distances(tmpdir): - tmpdir.chdir() + tmpdir.chdir() in_surf = example_data('surf01.vtk') dist_ident = m.ComputeMeshWarp() diff --git a/nipype/interfaces/ants/tests/test_resampling.py b/nipype/interfaces/ants/tests/test_resampling.py index 22dc4446e9..509ebfe844 100644 --- a/nipype/interfaces/ants/tests/test_resampling.py +++ b/nipype/interfaces/ants/tests/test_resampling.py @@ -1,5 +1,5 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- -# vi: set ft=python sts=4 ts=4 sw=4 et: +# vi: set ft=python sts=4 ts=4 sw=4 et: from nipype.interfaces.ants import WarpImageMultiTransform, WarpTimeSeriesImageMultiTransform import os @@ -66,7 +66,7 @@ def create_wtsimt(): def test_WarpTimeSeriesImageMultiTransform(change_dir, create_wtsimt): wtsimt = create_wtsimt assert wtsimt.cmdline == 'WarpTimeSeriesImageMultiTransform 4 resting.nii resting_wtsimt.nii \ --R ants_deformed.nii.gz ants_Warp.nii.gz ants_Affine.txt' +-R ants_deformed.nii.gz ants_Warp.nii.gz ants_Affine.txt' def test_WarpTimeSeriesImageMultiTransform_invaffine(change_dir, create_wtsimt): diff --git a/nipype/interfaces/cmtk/tests/test_nbs.py b/nipype/interfaces/cmtk/tests/test_nbs.py index 0516390b02..03a7aa8619 100644 --- a/nipype/interfaces/cmtk/tests/test_nbs.py +++ b/nipype/interfaces/cmtk/tests/test_nbs.py @@ -31,12 +31,12 @@ def test_importerror(creating_graphs, tmpdir): graphlist = creating_graphs group1 = graphlist[:3] group2 = graphlist[3:] - + nbs = NetworkBasedStatistic() nbs.inputs.in_group1 = group1 nbs.inputs.in_group2 = group2 nbs.inputs.edge_key = "weight" - + with pytest.raises(ImportError) as e: nbs.run() assert "cviewer library is not available" == str(e.value) diff --git a/nipype/interfaces/niftyfit/asl.py b/nipype/interfaces/niftyfit/asl.py index 366f9a6eca..8f95a48192 100644 --- a/nipype/interfaces/niftyfit/asl.py +++ b/nipype/interfaces/niftyfit/asl.py @@ -147,7 +147,7 @@ class FitAsl(NiftyFitCommand): >>> from nipype.interfaces import niftyfit >>> node = niftyfit.FitAsl() >>> node.inputs.source_file = 'asl.nii.gz' - >>> node.cmdline + >>> node.cmdline 'fit_asl -source asl.nii.gz -cbf asl_cbf.nii.gz -error asl_error.nii.gz \ -syn asl_syn.nii.gz' diff --git a/nipype/pipeline/engine/tests/test_utils.py b/nipype/pipeline/engine/tests/test_utils.py index 34ec45cfa8..23c7a16fc6 100644 --- a/nipype/pipeline/engine/tests/test_utils.py +++ b/nipype/pipeline/engine/tests/test_utils.py @@ -23,7 +23,7 @@ def test_identitynode_removal(tmpdir): def test_function(arg1, arg2, arg3): import numpy as np return (np.array(arg1) + arg2 + arg3).tolist() - + wf = pe.Workflow(name="testidentity", base_dir=tmpdir.strpath) From 13e454f360356a067c4d333d3c0a7b60a005908c Mon Sep 17 00:00:00 2001 From: mathiasg Date: Thu, 16 Nov 2017 18:12:10 -0500 Subject: [PATCH 2/7] add: missing autotests and updated mailmap --- .mailmap | 376 +++++++++++++----- .../afni/tests/test_auto_TCatSubBrick.py | 48 +++ .../tests/test_auto_SimpleInterface.py | 16 + 3 files changed, 334 insertions(+), 106 deletions(-) create mode 100644 nipype/interfaces/afni/tests/test_auto_TCatSubBrick.py create mode 100644 nipype/interfaces/tests/test_auto_SimpleInterface.py diff --git a/.mailmap b/.mailmap index f7d32274fb..8624dfc3f7 100644 --- a/.mailmap +++ b/.mailmap @@ -1,106 +1,270 @@ -Aimi Watanabe stymy -Aimi Watanabe stymy -Alexander Schaefer Alexander Schaefer -Alexander Schaefer alexschaefer83 -Alexander Schaefer aschaefer -Alexandre M. Savio Alexandre M. S -Alexandre M. Savio Alexandre M. S -Alexandre M. Savio Alexandre Manhaes Savio -Anisha Keshavan Anisha Keshavan -Anisha Keshavan akeshavan -Ariel Rokem arokem -Ariel Rokem arokem -Arman Eshaghi armaneshaghi -Ashely Gillman Ashley Gillman -Ashely Gillman ashgillman -Basille Pinsard bpinsard -Basille Pinsard bpinsard -Ben Cipollini Ben Cipollini -Benjamin Yvernault Benjamin Yvernault -Benjamin Yvernault byvernault -Blake Dewey Blake Dewey -Blake Dewey blakedewey -Blake Dewey blakedewey -Brendan Moloney moloney -Chris Filo Gorgolewski Chris Filo Gorgolewski -Chris Filo Gorgolewski Chris Filo Gorgolewski -Chris Filo Gorgolewski Chris Filo Gorgolewski -Chris Filo Gorgolewski Chris Gorgolewski -Chris Filo Gorgolewski Krzysztof Gorgolewski -Chris Filo Gorgolewski filo -Chris Filo Gorgolewski filo -Chris Filo Gorgolewski filo -Christopher J. Markiewicz Chris Markiewicz -Christopher J. Markiewicz Christopher J. Johnson -Christopher J. Markiewicz Christopher J. Markiewicz -Christopher J. Markiewicz Christopher J. Markiewicz -Cindee Madison cindeem -Cindee Madison cindeem <> -Colin Buchanan Colin Buchanan -Colin Buchanan colinbuchanan -Daniel Clark dclark87 -Daniel Ginsburg danginsburg -Daniel McNamee danmc -David Ellis David Ellis -David Ellis David Ellis -David Welch David Welch -Dmytro belevtsoff -Erik Ziegler Erik -Erik Ziegler Erik Ziegler -Erik Ziegler erik -Erik Ziegler erikz -Erik Ziegler swederik -Fernando Pérez-García Fernando -Franz Liem fliem -Franz Liem fliem -Gael Varoquaux GaelVaroquaux -Gael Varoquaux GaelVaroquaux -Gavin Cooper gjcooper -Hans Johnson Hans Johnson -Hans Johnson hjmjohnson -Horea Christian Horea Christian -Isaac Schwabacher ischwabacher -James Kent jdkent -Jason Wong Jason -Jason Wong jason -Jason Wong Jason W -Jason Wong Jason W -Jason Wong jason-wg -Jens Kleesiek JensNRAD -Joerg Stadler Joerg Stadler -Joerg Stadler Jörg Stadler -Joke Durnez jokedurnez -Josh Warner Josh Warner (Mac) -Kai Schlamp medihack Jessica Forbes jessicaforbes -Leonie Lampe Leonie Lmape -Mathias Goncalves mathiasg -Michael Dayan Michael -Michael Dayan Michael -Michael Dayan mick-d -Michael Clark Clark -Michael Notter miykael -Michael Waskom Michael Waskom -Michael Waskom Michael Waskom -Michael Waskom mwaskom -Michael Waskom mwaskom -Michael Waskom mwaskom -Oscar Esteban Oscar Esteban -Oscar Esteban oesteban -Russell Poldrack Russ Poldrack -Russell Poldrack poldrack -Satrajit Ghosh Satrajit Ghosh -Shariq Iqbal shariqiqbal2810 -Shariq Iqbal shariqiqbal2810 -Shoshana Berleant Shoshana Berleant -Shoshana Berleant Shoshana Berleant -Simon R Simon Rothmeier -Siqi Liu siqi liu -Siqi Liu sql -Steven Giavasis Steven Giavasis -Steven Giavasis sgiavasis -Steven Giavasis sgiavasis -Tristan Glatard Tristan Glatard -Victor Saase vsaase -William Triplett William Triplett -Yaroslav Halchenko Yaroslav Halchenko -pipolose pipolose +62442katieb 62442katieb +Aaron Mattfeld Aaron Mattfeld +adelavega adelavega +afloren afloren +Aimi Watanabe Aimi Watanabe +akeshavan akeshavan +Alejandro de la Vega Alejandro de la Vega +Alejandro Weinstein Alejandro Weinstein +Alexander Schaefer Alexander Schaefer +Alexandre Gramfort Alexandre Gramfort +Alexandre Manhaes Savio Alexandre Manhaes Savio +Alexandre M. S Alexandre M. S +Alexandre M. S Alexandre M. S +Alexandre M. Savio Alexandre M. Savio +alexschaefer83 alexschaefer83 +Ali Ghayoor Ali Ghayoor +Ana Marina Ana Marina +Andrew Davison Andrew Davison +Anisha Keshavan Anisha Keshavan +Anne Park Anne Park +arielletambini arielletambini +Ari Kahn Ari Kahn +armaneshaghi armaneshaghi +Arman Eshaghi Arman Eshaghi +arokem arokem +arokem arokem +aschaefer aschaefer +Ashely Gillman Ashely Gillman +ashgillman ashgillman +Ashley Gillman Ashley Gillman +belevtsoff belevtsoff +Ben Acland Ben Acland +Ben Cipollini Ben Cipollini +Ben Cipollini Ben Cipollini +Benjamin Yvernault Benjamin Yvernault +Benjamin Yvernault Benjamin Yvernault +Blake Dewey Blake Dewey +Blake Dewey Blake Dewey +blakedewey blakedewey +blakedewey blakedewey +bnucon bnucon +bpinsard bpinsard +bpinsard bpinsard +Brendan Moloney Brendan Moloney +Brian Cheung Brian Cheung +byvernault byvernault +Cameron Craddock Cameron Craddock +Carlo Hamalainen Carlo Hamalainen +Carlos Correa Carlos Correa +carolFrohlich carolFrohlich +Caroline Froehlich Caroline Froehlich +cdla cdla +Chad Cumba Chad Cumba +Charl Linssen Charl Linssen +Chris Filo Gorgolewski Chris Filo Gorgolewski +Chris Filo Gorgolewski Chris Filo Gorgolewski +Chris Filo Gorgolewski Chris Filo Gorgolewski +Chris Filo Gorgolewski Chris Filo Gorgolewski +Chris Gorgolewski Chris Gorgolewski +Chris Markiewicz Chris Markiewicz +Chris Steele Chris Steele +Christian Haselgrove Christian Haselgrove +Christopher Burns Christopher Burns +Christopher J. Johnson Christopher J. Johnson +Christopher J. Markiewicz Christopher J. Markiewicz +Christopher J. Markiewicz Christopher J. Markiewicz +Christopher J. Markiewicz Christopher J. Markiewicz +Cindee Madison Cindee Madison +cindeem cindeem +CindeeM CindeeM +Claire Tarbert Claire Tarbert +Clark Clark +Colin Buchanan Colin Buchanan +colinbuchanan colinbuchanan +Colin Buchanan Colin Buchanan +Conor McDermottroe Conor McDermottroe +Dale Zhou Dale Zhou +danginsburg danginsburg +Daniel Clark Daniel Clark +daniel-ge daniel-ge +Daniel Ginsburg Daniel Ginsburg +Daniel Haehn Daniel Haehn +Daniel Margulies Daniel Margulies +danmc danmc +Dav Clark Dav Clark +David Ellis David Ellis +David Ellis David Ellis +David Ellis David Ellis +David Welch David Welch +David Welch David Welch +dclark87 dclark87 +Demian Wassermann Demian Wassermann +Dimitri Papadopoulos Dimitri Papadopoulos +Dimitri Papadopoulos Orfanos Dimitri Papadopoulos Orfanos +Dmitry Shachnev Dmitry Shachnev +dmordom dmordom +Dmytro Dmytro +Dorota Jarecka Dorota Jarecka +Drew Erickson Drew Erickson +Dylan Dylan +Dylan Nielson Dylan Nielson +Elizabeth DuPre Elizabeth DuPre +emdupre emdupre +erik erik +Erik Erik +Erik Kastman Erik Kastman +erikz erikz +Erik Ziegler Erik Ziegler +Félix C. Morency Félix C. Morency +Fernando Fernando +filo filo +filo filo +filo filo +fliem fliem +fliem fliem +FredLoney FredLoney +Fred Mertz Fred Mertz +Gael varoquaux Gael varoquaux +GaelVaroquaux GaelVaroquaux +Gavin Cooper Gavin Cooper +Gilles de Hollander Gilles de Hollander +gjcooper gjcooper +Guillaume Guillaume +Hans Johnson Hans Johnson +Hans Johnson Hans Johnson +hjmjohnson hjmjohnson +Horea Christian Horea Christian +Horea Christian Horea Christian +Ian Malone Ian Malone +ischwabacher ischwabacher +Ivan Gonzalez Ivan Gonzalez +Jaime Arias Jaime Arias +jakubk jakubk +James Kent James Kent +Janosch Linkersdörfer Janosch Linkersdörfer +Januzz Januzz +Jan Varada Jan Varada +Jarrod Millman Jarrod Millman +jason jason +Jason Jason +jason-wg jason-wg +Jason W Jason W +Jason W Jason W +jdkent jdkent +JDWarner JDWarner +Jeff Lai Jeff Lai +JensNRAD JensNRAD +jessicaforbes jessicaforbes +Jessica Forbes Jessica Forbes +Joerg Stadler Joerg Stadler +Joerg Stadler Joerg Stadler +john anthony lee john anthony lee +John Pellman John Pellman +John Salvatore John Salvatore +jokedurnez jokedurnez +Joke Durnez Joke Durnez +Jörg Stadler Jörg Stadler +Josh Warner (Mac) Josh Warner (Mac) +Josh Warner Josh Warner +Julia Huntenburg Julia Huntenburg +Katie Bottenhorn Katie Bottenhorn +kesshijordan kesshijordan +Kesshi Jordan Kesshi Jordan +Kesshi jordan Kesshi jordan +k.matsubara91 k.matsubara91 +Kornelius Kornelius +Krzysztof Gorgolewski Krzysztof Gorgolewski +Leonie Lampe Leonie Lampe +Leonie Lmape Leonie Lmape +Lijie Huang Lijie Huang +Lukas Snoek Lukas Snoek +maedoc maedoc +MANDY RENFRO MANDY RENFRO +mankind mankind +Marcel Falkiewicz Marcel Falkiewicz +Marc Modat Marc Modat +Martin Luessi Martin Luessi +Martin Martin +mathiasg mathiasg +Mathias Goncalves Mathias Goncalves +Mathieu Dubois Mathieu Dubois +Mathieu Saboye Mathieu Saboye +Matteo Visconti dOC Matteo Visconti dOC +Matthew Brett Matthew Brett +Maxime Noel Maxime Noel +medihack medihack +Michael Clark Michael Clark +Michael Hallquist Michael Hallquist +Michael Hanke Michael Hanke +michael michael +Michael Michael +Michael Michael +Michael Notter Michael Notter +Michael Waskom Michael Waskom +Michael Waskom Michael Waskom +Michael Waskom Michael Waskom +Michael Waskom Michael Waskom +Michiel Cottaar Michiel Cottaar +mick-d mick-d +miykael miykael +moloney moloney +mwaskom mwaskom +mwaskom mwaskom +Nathan Perkins Nathan Perkins +Nicolas Pannetier Nicolas Pannetier +Nolan Nichols Nolan Nichols +oesteban oesteban +Oliver Contier Oliver Contier +oliver-contier oliver-contier +Oliver Hinds Oliver Hinds +Oscar Esteban Oscar Esteban +Oscar Esteban Oscar Esteban +pipolose pipolose +pipolose pipolose +poldrack poldrack +psharp1289 psharp1289 +RanjitK RanjitK +Regina Kim Regina Kim +Rene Kuettner Rene Kuettner +Robbert Harms Robbert Harms +Rosalia Tungaraza Rosalia Tungaraza +Ross Blair Ross Blair +Ross Markello Ross Markello +Ross Markello Ross Markello +Russell Poldrack Russell Poldrack +Russ Poldrack Russ Poldrack +salma1601 salma1601 +Salma BOUGACHA Salma BOUGACHA +salma salma +Sami Andberg Sami Andberg +Satrajit Ghosh Satrajit Ghosh +Satrajit Ghosh Satrajit Ghosh +sebastian sebastian +sgiavasis sgiavasis +sgiavasis sgiavasis +shariqiqbal2810 shariqiqbal2810 +shariqiqbal2810 shariqiqbal2810 +Shoshana Berleant Shoshana Berleant +Shoshana Berleant Shoshana Berleant +Shoshana Berleant Shoshana Berleant +Simon Rothmeier Simon Rothmeier +Simon R Simon R +siqi liu siqi liu +Siqi Liu Siqi Liu +sitek sitek +Souheil Inati Souheil Inati +sql sql +ssikka ssikka +Stephan Gerhard Stephan Gerhard +Steven Giavasis Steven Giavasis +stymy stymy +stymy stymy +swederik swederik +Taylor Salo Taylor Salo +Thomas Nickson Thomas Nickson +Tristan Glatard Tristan Glatard +Tristan Glatard Tristan Glatard +Ubuntu Ubuntu +Valentin Haenel Valentin Haenel +Victor Saase Victor Saase +vsaase vsaase +William F. Broderick William F. Broderick +William Triplett William Triplett +William Triplett William Triplett +Wolfgang Pauli Wolfgang Pauli +Xiangzhen Kong Xiangzhen Kong +Xu Wang Xu Wang +Yannick Schwartz Yannick Schwartz +Yaroslav Halchenko Yaroslav Halchenko +Yaroslav Halchenko Yaroslav Halchenko diff --git a/nipype/interfaces/afni/tests/test_auto_TCatSubBrick.py b/nipype/interfaces/afni/tests/test_auto_TCatSubBrick.py new file mode 100644 index 0000000000..da3b0fb383 --- /dev/null +++ b/nipype/interfaces/afni/tests/test_auto_TCatSubBrick.py @@ -0,0 +1,48 @@ +# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT +from __future__ import unicode_literals +from ..utils import TCatSubBrick + + +def test_TCatSubBrick_inputs(): + input_map = dict(args=dict(argstr='%s', + ), + environ=dict(nohash=True, + usedefault=True, + ), + ignore_exception=dict(nohash=True, + usedefault=True, + ), + in_files=dict(argstr='%s%s ...', + copyfile=False, + mandatory=True, + position=-1, + ), + num_threads=dict(nohash=True, + usedefault=True, + ), + out_file=dict(argstr='-prefix %s', + genfile=True, + ), + outputtype=dict(), + rlt=dict(argstr='-rlt%s', + position=1, + ), + terminal_output=dict(deprecated='1.0.0', + nohash=True, + ), + ) + inputs = TCatSubBrick.input_spec() + + for key, metadata in list(input_map.items()): + for metakey, value in list(metadata.items()): + assert getattr(inputs.traits()[key], metakey) == value + + +def test_TCatSubBrick_outputs(): + output_map = dict(out_file=dict(), + ) + outputs = TCatSubBrick.output_spec() + + for key, metadata in list(output_map.items()): + for metakey, value in list(metadata.items()): + assert getattr(outputs.traits()[key], metakey) == value diff --git a/nipype/interfaces/tests/test_auto_SimpleInterface.py b/nipype/interfaces/tests/test_auto_SimpleInterface.py new file mode 100644 index 0000000000..b00d1f9a3c --- /dev/null +++ b/nipype/interfaces/tests/test_auto_SimpleInterface.py @@ -0,0 +1,16 @@ +# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT +from __future__ import unicode_literals +from ..base import SimpleInterface + + +def test_SimpleInterface_inputs(): + input_map = dict(ignore_exception=dict(nohash=True, + usedefault=True, + ), + ) + inputs = SimpleInterface.input_spec() + + for key, metadata in list(input_map.items()): + for metakey, value in list(metadata.items()): + assert getattr(inputs.traits()[key], metakey) == value + From 3e9ebcc486034b1ef650a30d22a4f08d15ba4ec2 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Mon, 20 Nov 2017 11:57:19 -0500 Subject: [PATCH 3/7] rel: 0.14.0 (rc1) --- .zenodo.json | 10 +++++----- CHANGES | 12 +++++++++--- doc/conf.py | 2 +- nipype/info.py | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 41497da6d8..2985b7e107 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -514,11 +514,6 @@ { "name": "Shachnev, Dmitry" }, - { - "affiliation": "MIT, HMS", - "name": "Ghosh, Satrajit", - "orcid": "0000-0002-5312-6729" - }, { "affiliation": "University of Amsterdam", "name": "Lukas Snoek", @@ -538,6 +533,11 @@ "affiliation": "MIT", "name": "Kaczmarzyk, Jakub", "orcid": "0000-0002-5544-7577" + }, + { + "affiliation": "MIT, HMS", + "name": "Ghosh, Satrajit", + "orcid": "0000-0002-5312-6729" } ], "keywords": [ diff --git a/CHANGES b/CHANGES index f7761f7b91..81441e140b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,12 @@ -Upcoming release (0.14.0) -================ +Upcoming release (0.14.1) +========================= +0.14.0 (November 20, 2017) +========================== + +* ENH: Generate Dockerfiles with neurodocker (https://github.com/nipy/nipype/pull/2202) +* ENH: FLAIR options for recon-all (https://github.com/nipy/nipype/pull/2279) +* ENH: Config option for setting maxtasksperchild when multiprocessing (https://github.com/nipy/nipype/pull/2284) * FIX: Testing maintainance and improvements (https://github.com/nipy/nipype/pull/2252) * ENH: Add elapsed_time and final metric_value to ants.Registration (https://github.com/nipy/nipype/pull/1985) * ENH: Improve terminal_output feature (https://github.com/nipy/nipype/pull/2209) @@ -17,7 +23,7 @@ Upcoming release (0.14.0) * MAINT: Additional Windows support (https://github.com/nipy/nipype/pull/2085) * ENH: Output realignment matrices from TOPUP (https://github.com/nipy/nipype/pull/2084) * ENH: Additional AFNI interfaces: 3dZcat, 3dZeropad, 3dedge3, 3dDeconvolve, 3dQwarp, 1dCat, 3dNwarpApply, 3daxialize, - 3dREMLfit, 3dUndump, 3dCM, 3dSynthesize + more (https://github.com/nipy/nipype/pull/2087, https://github.com/nipy/nipype/pull/2090, + 3dREMLfit, 3dUndump, 3dCM, 3dSynthesize + more (https://github.com/nipy/nipype/pull/2087, https://github.com/nipy/nipype/pull/2090, https://github.com/nipy/nipype/pull/2095, https://github.com/nipy/nipype/pull/2099, https://github.com/nipy/nipype/pull/2103, https://github.com/nipy/nipype/pull/2114, https://github.com/nipy/nipype/pull/2135, https://github.com/nipy/nipype/pull/2186, https://github.com/nipy/nipype/pull/2201, https://github.com/nipy/nipype/pull/2210) diff --git a/doc/conf.py b/doc/conf.py index 65ee4c1e6a..094a8250aa 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -82,7 +82,7 @@ # The short X.Y version. version = nipype.__version__ # The full version, including alpha/beta/rc tags. -release = "0.13.1" +release = "0.14.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/nipype/info.py b/nipype/info.py index d7b1b106d1..cd1571c6a4 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -10,7 +10,7 @@ # full release. '.dev' as a version_extra string means this is a development # version # Remove -dev for release -__version__ = '1.0.0-dev' +__version__ = '0.14.0' def get_nipype_gitversion(): From 54e1c2a87d8156e7dae4e3ef13087ae0f95260f4 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Mon, 20 Nov 2017 17:43:02 -0500 Subject: [PATCH 4/7] fix: revert mailmap and add link to 0.14 milestone --- .mailmap | 378 ++++++++++++++++--------------------------------------- CHANGES | 5 +- 2 files changed, 113 insertions(+), 270 deletions(-) diff --git a/.mailmap b/.mailmap index 8624dfc3f7..0a982fb8a9 100644 --- a/.mailmap +++ b/.mailmap @@ -1,270 +1,112 @@ -62442katieb 62442katieb -Aaron Mattfeld Aaron Mattfeld -adelavega adelavega -afloren afloren -Aimi Watanabe Aimi Watanabe -akeshavan akeshavan -Alejandro de la Vega Alejandro de la Vega -Alejandro Weinstein Alejandro Weinstein -Alexander Schaefer Alexander Schaefer -Alexandre Gramfort Alexandre Gramfort -Alexandre Manhaes Savio Alexandre Manhaes Savio -Alexandre M. S Alexandre M. S -Alexandre M. S Alexandre M. S -Alexandre M. Savio Alexandre M. Savio -alexschaefer83 alexschaefer83 -Ali Ghayoor Ali Ghayoor -Ana Marina Ana Marina -Andrew Davison Andrew Davison -Anisha Keshavan Anisha Keshavan -Anne Park Anne Park -arielletambini arielletambini -Ari Kahn Ari Kahn -armaneshaghi armaneshaghi -Arman Eshaghi Arman Eshaghi -arokem arokem -arokem arokem -aschaefer aschaefer -Ashely Gillman Ashely Gillman -ashgillman ashgillman -Ashley Gillman Ashley Gillman -belevtsoff belevtsoff -Ben Acland Ben Acland -Ben Cipollini Ben Cipollini -Ben Cipollini Ben Cipollini -Benjamin Yvernault Benjamin Yvernault -Benjamin Yvernault Benjamin Yvernault -Blake Dewey Blake Dewey -Blake Dewey Blake Dewey -blakedewey blakedewey -blakedewey blakedewey -bnucon bnucon -bpinsard bpinsard -bpinsard bpinsard -Brendan Moloney Brendan Moloney -Brian Cheung Brian Cheung -byvernault byvernault -Cameron Craddock Cameron Craddock -Carlo Hamalainen Carlo Hamalainen -Carlos Correa Carlos Correa -carolFrohlich carolFrohlich -Caroline Froehlich Caroline Froehlich -cdla cdla -Chad Cumba Chad Cumba -Charl Linssen Charl Linssen -Chris Filo Gorgolewski Chris Filo Gorgolewski -Chris Filo Gorgolewski Chris Filo Gorgolewski -Chris Filo Gorgolewski Chris Filo Gorgolewski -Chris Filo Gorgolewski Chris Filo Gorgolewski -Chris Gorgolewski Chris Gorgolewski -Chris Markiewicz Chris Markiewicz -Chris Steele Chris Steele -Christian Haselgrove Christian Haselgrove -Christopher Burns Christopher Burns -Christopher J. Johnson Christopher J. Johnson -Christopher J. Markiewicz Christopher J. Markiewicz -Christopher J. Markiewicz Christopher J. Markiewicz -Christopher J. Markiewicz Christopher J. Markiewicz -Cindee Madison Cindee Madison -cindeem cindeem -CindeeM CindeeM -Claire Tarbert Claire Tarbert -Clark Clark -Colin Buchanan Colin Buchanan -colinbuchanan colinbuchanan -Colin Buchanan Colin Buchanan -Conor McDermottroe Conor McDermottroe -Dale Zhou Dale Zhou -danginsburg danginsburg -Daniel Clark Daniel Clark -daniel-ge daniel-ge -Daniel Ginsburg Daniel Ginsburg -Daniel Haehn Daniel Haehn -Daniel Margulies Daniel Margulies -danmc danmc -Dav Clark Dav Clark -David Ellis David Ellis -David Ellis David Ellis -David Ellis David Ellis -David Welch David Welch -David Welch David Welch -dclark87 dclark87 -Demian Wassermann Demian Wassermann -Dimitri Papadopoulos Dimitri Papadopoulos -Dimitri Papadopoulos Orfanos Dimitri Papadopoulos Orfanos -Dmitry Shachnev Dmitry Shachnev -dmordom dmordom -Dmytro Dmytro -Dorota Jarecka Dorota Jarecka -Drew Erickson Drew Erickson -Dylan Dylan -Dylan Nielson Dylan Nielson -Elizabeth DuPre Elizabeth DuPre -emdupre emdupre -erik erik -Erik Erik -Erik Kastman Erik Kastman -erikz erikz -Erik Ziegler Erik Ziegler -Félix C. Morency Félix C. Morency -Fernando Fernando -filo filo -filo filo -filo filo -fliem fliem -fliem fliem -FredLoney FredLoney -Fred Mertz Fred Mertz -Gael varoquaux Gael varoquaux -GaelVaroquaux GaelVaroquaux -Gavin Cooper Gavin Cooper -Gilles de Hollander Gilles de Hollander -gjcooper gjcooper -Guillaume Guillaume -Hans Johnson Hans Johnson -Hans Johnson Hans Johnson -hjmjohnson hjmjohnson -Horea Christian Horea Christian -Horea Christian Horea Christian -Ian Malone Ian Malone -ischwabacher ischwabacher -Ivan Gonzalez Ivan Gonzalez -Jaime Arias Jaime Arias -jakubk jakubk -James Kent James Kent -Janosch Linkersdörfer Janosch Linkersdörfer -Januzz Januzz -Jan Varada Jan Varada -Jarrod Millman Jarrod Millman -jason jason -Jason Jason -jason-wg jason-wg -Jason W Jason W -Jason W Jason W -jdkent jdkent -JDWarner JDWarner -Jeff Lai Jeff Lai -JensNRAD JensNRAD -jessicaforbes jessicaforbes -Jessica Forbes Jessica Forbes -Joerg Stadler Joerg Stadler -Joerg Stadler Joerg Stadler -john anthony lee john anthony lee -John Pellman John Pellman -John Salvatore John Salvatore -jokedurnez jokedurnez -Joke Durnez Joke Durnez -Jörg Stadler Jörg Stadler -Josh Warner (Mac) Josh Warner (Mac) -Josh Warner Josh Warner -Julia Huntenburg Julia Huntenburg -Katie Bottenhorn Katie Bottenhorn -kesshijordan kesshijordan -Kesshi Jordan Kesshi Jordan -Kesshi jordan Kesshi jordan -k.matsubara91 k.matsubara91 -Kornelius Kornelius -Krzysztof Gorgolewski Krzysztof Gorgolewski -Leonie Lampe Leonie Lampe -Leonie Lmape Leonie Lmape -Lijie Huang Lijie Huang +Aimi Watanabe stymy +Aimi Watanabe stymy +Alejandro de la Vega adelavega +Alexander Schaefer Alexander Schaefer +Alexander Schaefer alexschaefer83 +Alexander Schaefer aschaefer +Alexandre M. Savio Alexandre M. S +Alexandre M. Savio Alexandre M. S +Alexandre M. Savio Alexandre Manhaes Savio +Anisha Keshavan Anisha Keshavan +Anisha Keshavan akeshavan +Ariel Rokem arokem +Ariel Rokem arokem +Arman Eshaghi armaneshaghi +Ashely Gillman Ashley Gillman +Ashely Gillman ashgillman +Basille Pinsard bpinsard +Basille Pinsard bpinsard +Ben Cipollini Ben Cipollini +Benjamin Yvernault Benjamin Yvernault +Benjamin Yvernault byvernault +Blake Dewey Blake Dewey +Blake Dewey blakedewey +Blake Dewey blakedewey +Brendan Moloney moloney +Chris Filo Gorgolewski Chris Filo Gorgolewski +Chris Filo Gorgolewski Chris Filo Gorgolewski +Chris Filo Gorgolewski Chris Filo Gorgolewski +Chris Filo Gorgolewski Chris Gorgolewski +Chris Filo Gorgolewski Krzysztof Gorgolewski +Chris Filo Gorgolewski filo +Chris Filo Gorgolewski filo +Chris Filo Gorgolewski filo +Christopher J. Markiewicz Chris Markiewicz +Christopher J. Markiewicz Christopher J. Johnson +Christopher J. Markiewicz Christopher J. Markiewicz +Christopher J. Markiewicz Christopher J. Markiewicz +Cindee Madison cindeem +Cindee Madison cindeem <> +Colin Buchanan Colin Buchanan +Colin Buchanan colinbuchanan +Daniel Clark dclark87 +Daniel Ginsburg danginsburg +Daniel McNamee danmc +David Ellis David Ellis +David Ellis David Ellis +David Welch David Welch +Dmytro belevtsoff +Erik Ziegler Erik +Erik Ziegler Erik Ziegler +Erik Ziegler erik +Erik Ziegler erikz +Erik Ziegler swederik +Fernando Pérez-García Fernando +Franz Liem fliem +Franz Liem fliem +Gael Varoquaux GaelVaroquaux +Gael Varoquaux GaelVaroquaux +Gavin Cooper gjcooper +Gilles de Hollander Gilles86 +Hans Johnson Hans Johnson +Hans Johnson hjmjohnson +Horea Christian Horea Christian +Isaac Schwabacher ischwabacher +James Kent jdkent +Jakub Kaczmarzyk kaczmarj +Jason Wong Jason +Jason Wong jason +Jason Wong Jason W +Jason Wong Jason W +Jason Wong jason-wg +Jens Kleesiek JensNRAD +Joerg Stadler Joerg Stadler +Joerg Stadler Jörg Stadler +Joke Durnez jokedurnez +Josh Warner Josh Warner (Mac) +Kai Schlamp medihack Jessica Forbes jessicaforbes +Kevin Sitek sitek +Leonie Lampe Leonie Lmape Lukas Snoek Lukas Snoek -maedoc maedoc -MANDY RENFRO MANDY RENFRO -mankind mankind -Marcel Falkiewicz Marcel Falkiewicz -Marc Modat Marc Modat -Martin Luessi Martin Luessi -Martin Martin -mathiasg mathiasg -Mathias Goncalves Mathias Goncalves -Mathieu Dubois Mathieu Dubois -Mathieu Saboye Mathieu Saboye -Matteo Visconti dOC Matteo Visconti dOC -Matthew Brett Matthew Brett -Maxime Noel Maxime Noel -medihack medihack -Michael Clark Michael Clark -Michael Hallquist Michael Hallquist -Michael Hanke Michael Hanke -michael michael -Michael Michael -Michael Michael -Michael Notter Michael Notter -Michael Waskom Michael Waskom -Michael Waskom Michael Waskom -Michael Waskom Michael Waskom -Michael Waskom Michael Waskom -Michiel Cottaar Michiel Cottaar -mick-d mick-d -miykael miykael -moloney moloney -mwaskom mwaskom -mwaskom mwaskom -Nathan Perkins Nathan Perkins -Nicolas Pannetier Nicolas Pannetier -Nolan Nichols Nolan Nichols -oesteban oesteban -Oliver Contier Oliver Contier -oliver-contier oliver-contier -Oliver Hinds Oliver Hinds -Oscar Esteban Oscar Esteban -Oscar Esteban Oscar Esteban -pipolose pipolose -pipolose pipolose -poldrack poldrack -psharp1289 psharp1289 -RanjitK RanjitK -Regina Kim Regina Kim -Rene Kuettner Rene Kuettner -Robbert Harms Robbert Harms -Rosalia Tungaraza Rosalia Tungaraza -Ross Blair Ross Blair -Ross Markello Ross Markello -Ross Markello Ross Markello -Russell Poldrack Russell Poldrack -Russ Poldrack Russ Poldrack -salma1601 salma1601 -Salma BOUGACHA Salma BOUGACHA -salma salma -Sami Andberg Sami Andberg -Satrajit Ghosh Satrajit Ghosh -Satrajit Ghosh Satrajit Ghosh -sebastian sebastian -sgiavasis sgiavasis -sgiavasis sgiavasis -shariqiqbal2810 shariqiqbal2810 -shariqiqbal2810 shariqiqbal2810 -Shoshana Berleant Shoshana Berleant -Shoshana Berleant Shoshana Berleant -Shoshana Berleant Shoshana Berleant -Simon Rothmeier Simon Rothmeier -Simon R Simon R -siqi liu siqi liu -Siqi Liu Siqi Liu -sitek sitek -Souheil Inati Souheil Inati -sql sql -ssikka ssikka -Stephan Gerhard Stephan Gerhard -Steven Giavasis Steven Giavasis -stymy stymy -stymy stymy -swederik swederik -Taylor Salo Taylor Salo -Thomas Nickson Thomas Nickson -Tristan Glatard Tristan Glatard -Tristan Glatard Tristan Glatard -Ubuntu Ubuntu -Valentin Haenel Valentin Haenel -Victor Saase Victor Saase -vsaase vsaase -William F. Broderick William F. Broderick -William Triplett William Triplett -William Triplett William Triplett +Mathias Goncalves mathiasg +Michael Dayan Michael +Michael Dayan Michael +Michael Dayan mick-d +Michael Clark Clark +Michael Notter miykael +Michael Waskom Michael Waskom +Michael Waskom Michael Waskom +Michael Waskom mwaskom +Michael Waskom mwaskom +Michael Waskom mwaskom +Oscar Esteban Oscar Esteban +Oscar Esteban oesteban +Russell Poldrack Russ Poldrack +Russell Poldrack poldrack +Satrajit Ghosh Satrajit Ghosh +Shariq Iqbal shariqiqbal2810 +Shariq Iqbal shariqiqbal2810 +Shoshana Berleant Shoshana Berleant +Shoshana Berleant Shoshana Berleant +Simon R Simon Rothmeier +Siqi Liu siqi liu +Siqi Liu sql +Steven Giavasis Steven Giavasis +Steven Giavasis sgiavasis +Steven Giavasis sgiavasis +Tristan Glatard Tristan Glatard +Victor Saase vsaase +William Triplett William Triplett Wolfgang Pauli Wolfgang Pauli -Xiangzhen Kong Xiangzhen Kong -Xu Wang Xu Wang -Yannick Schwartz Yannick Schwartz -Yaroslav Halchenko Yaroslav Halchenko -Yaroslav Halchenko Yaroslav Halchenko +Yaroslav Halchenko Yaroslav Halchenko +pipolose pipolose diff --git a/CHANGES b/CHANGES index 81441e140b..1091ec73db 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,8 @@ -Upcoming release (0.14.1) -========================= +Upcoming release +================ 0.14.0 (November 20, 2017) +[Full information](https://github.com/nipy/nipype/milestone/13) ========================== * ENH: Generate Dockerfiles with neurodocker (https://github.com/nipy/nipype/pull/2202) From 3b95ad99619cf0c846599fa8462e118246f2a737 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Mon, 20 Nov 2017 17:47:01 -0500 Subject: [PATCH 5/7] fix: md formatting --- CHANGES | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 1091ec73db..e8669461ed 100644 --- a/CHANGES +++ b/CHANGES @@ -2,9 +2,10 @@ Upcoming release ================ 0.14.0 (November 20, 2017) -[Full information](https://github.com/nipy/nipype/milestone/13) ========================== +###### [Full changelog](https://github.com/nipy/nipype/milestone/13) + * ENH: Generate Dockerfiles with neurodocker (https://github.com/nipy/nipype/pull/2202) * ENH: FLAIR options for recon-all (https://github.com/nipy/nipype/pull/2279) * ENH: Config option for setting maxtasksperchild when multiprocessing (https://github.com/nipy/nipype/pull/2284) From c5bc410f43cecb3620b1abe520dfb7d4b1dcd7c9 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Tue, 21 Nov 2017 11:49:18 -0500 Subject: [PATCH 6/7] ENH: make release candidate to test travis deployment first --- CHANGES | 2 +- doc/conf.py | 2 +- nipype/info.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index e8669461ed..c4ff9ea953 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,7 @@ Upcoming release ================ -0.14.0 (November 20, 2017) +0.14.0 (November 21, 2017) ========================== ###### [Full changelog](https://github.com/nipy/nipype/milestone/13) diff --git a/doc/conf.py b/doc/conf.py index 094a8250aa..17ba33cbee 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -82,7 +82,7 @@ # The short X.Y version. version = nipype.__version__ # The full version, including alpha/beta/rc tags. -release = "0.14.0" +release = "0.14.0-rc1" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/nipype/info.py b/nipype/info.py index cd1571c6a4..fad9912012 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -10,7 +10,7 @@ # full release. '.dev' as a version_extra string means this is a development # version # Remove -dev for release -__version__ = '0.14.0' +__version__ = '0.14.0-rc1' def get_nipype_gitversion(): From ac1412ff103d516eb43fe6e1c893f4ee4aef9ff5 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Wed, 22 Nov 2017 11:33:19 -0500 Subject: [PATCH 7/7] enh: test travis wheel deployment --- .travis.yml | 2 +- setup.cfg | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 setup.cfg diff --git a/.travis.yml b/.travis.yml index 681d3dd765..08d9234675 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,4 +59,4 @@ deploy: tags: true repo: nipy/nipype branch: master - distributions: "sdist" + distributions: "sdist bdist_wheel" diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000000..3c6e79cf31 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=1