From a6f21e7182af1b8bb9d578f5f27664be91e85236 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 7 Oct 2019 16:39:59 -0400 Subject: [PATCH 1/5] DOC: Update changelog --- doc/changelog/1.X.X-changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/doc/changelog/1.X.X-changelog b/doc/changelog/1.X.X-changelog index 82747d9903..a487638f3c 100644 --- a/doc/changelog/1.X.X-changelog +++ b/doc/changelog/1.X.X-changelog @@ -1,3 +1,18 @@ +1.3.0 (To Be Determined) +======================== + +##### [Full changelog](https://github.com/nipy/nipype/milestone/34?closed=1) + + * FIX: Remove asynchronous chdir callback (https://github.com/nipy/nipype/pull/3060) + * FIX: Minimize scope for directory changes while loading results file (https://github.com/nipy/nipype/pull/3061) + * ENH: Delay etelemetry for non-interactive sessions, report bad versions (https://github.com/nipy/nipype/pull/3049) + * ENH: Run memoized check_version at REPL import, Node/Workflow/Interface init (https://github.com/nipy/nipype/pull/30) + * RF: Provide functions to augment old Path.mkdir, Path.resolve methods (https://github.com/nipy/nipype/pull/3050) + * TST: Skip dcm2niix test if data fails to download (https://github.com/nipy/nipype/pull/3059) + * TST: dcm2niix test fix (https://github.com/nipy/nipype/pull/3058) + * MNT: Drop Python 3.4 support (https://github.com/nipy/nipype/pull/3062) + + 1.2.3 (September 23, 2019) ========================== From 2a2b1341b1b5db7102907a97d7fc6a66aa623ba1 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 7 Oct 2019 16:40:18 -0400 Subject: [PATCH 2/5] DOC: Update .zenodo.json ordering --- .zenodo.json | 67 +++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index ac9972984b..7e511cc6cc 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -73,6 +73,10 @@ "affiliation": "Shattuck Lab, UCLA Brain Mapping Center", "name": "Wong, Jason" }, + { + "affiliation": "Concordia University", + "name": "Benderoff, Erin" + }, { "name": "Modat, Marc" }, @@ -141,10 +145,6 @@ { "name": "Berleant, Shoshana" }, - { - "affiliation": "Concordia University", - "name": "Benderoff, Erin" - }, { "affiliation": "Dartmouth College: Hanover, NH, United States", "name": "Halchenko, Yaroslav O.", @@ -379,6 +379,9 @@ { "name": "Millman, Jarrod" }, + { + "name": "Lai, Jeff" + }, { "name": "Zhou, Dale" }, @@ -401,9 +404,9 @@ "name": "Liu, Siqi" }, { - "affiliation": "University of Pennsylvania", - "name": "Kahn, Ari E.", - "orcid": "0000-0002-2127-0507" + "affiliation": "Korea Advanced Institute of Science and Technology", + "name": "Kim, Sin", + "orcid": "0000-0003-4652-3758" }, { "affiliation": "Leibniz Institute for Neurobiology", @@ -411,9 +414,14 @@ "orcid": "0000-0003-4313-129X" }, { - "affiliation": "Korea Advanced Institute of Science and Technology", - "name": "Kim, Sin", - "orcid": "0000-0003-4652-3758" + "affiliation": "University of Pennsylvania", + "name": "Kahn, Ari E.", + "orcid": "0000-0002-2127-0507" + }, + { + "affiliation": "Yale University; New Haven, CT, United States", + "name": "Sisk, Lucinda M.", + "orcid": "0000-0003-4900-9770" }, { "affiliation": "University College London", @@ -437,11 +445,6 @@ { "name": "Hallquist, Michael" }, - { - "affiliation": "Yale University; New Haven, CT, United States", - "name": "Sisk, Lucinda M.", - "orcid": "0000-0003-4900-9770" - }, { "affiliation": "TIB \u2013 Leibniz Information Centre for Science and Technology and University Library, Hannover, Germany", "name": "Leinweber, Katrin", @@ -499,6 +502,11 @@ "name": "Cooper, Gavin", "orcid": "0000-0002-7186-5293" }, + { + "affiliation": "National Institute on Aging, Baltimore, MD, USA", + "name": "Bilgel, Murat", + "orcid": "0000-0001-5042-7422" + }, { "name": "Inati, Souheil" }, @@ -506,15 +514,6 @@ "affiliation": "Boston University", "name": "Perkins, L. Nathan" }, - { - "name": "Marina, Ana" - }, - { - "name": "Mattfeld, Aaron" - }, - { - "name": "Noel, Maxime" - }, { "affiliation": "University of Amsterdam", "name": "Lukas Snoek", @@ -524,9 +523,18 @@ "affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany", "name": "Weninger, Leon" }, + { + "name": "Marina, Ana" + }, + { + "name": "Mattfeld, Aaron" + }, { "name": "Matsubara, K" }, + { + "name": "Noel, Maxime" + }, { "affiliation": "University of Pennsylvania", "name": "Junhao WEN", @@ -578,6 +586,9 @@ { "name": "Weinstein, Alejandro" }, + { + "name": "Tambini, Arielle" + }, { "affiliation": "Duke University", "name": "Broderick, William", @@ -600,11 +611,6 @@ { "name": "Khanuja, Ranjeet" }, - { - "affiliation": "National Institute on Aging, Baltimore, MD, USA", - "name": "Bilgel, Murat", - "orcid": "0000-0001-5042-7422" - }, { "name": "Schlamp, Kai" }, @@ -619,9 +625,6 @@ { "name": "Tarbert, Claire" }, - { - "name": "Tambini, Arielle" - }, { "name": "Nickson, Thomas" }, From 4c3ec313c4515ba14512772438215d7dab85e9c8 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 7 Oct 2019 16:41:11 -0400 Subject: [PATCH 3/5] MNT: Version 1.3.0-rc1 --- doc/conf.py | 2 +- nipype/info.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 10ac3c36db..c49f20e514 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 = "1.2.3" +release = "1.3.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 9ba12193ea..aa8f460688 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -9,7 +9,7 @@ # nipype version information # Remove -dev for release -__version__ = '1.3.0-dev' +__version__ = '1.3.0-rc1' def get_nipype_gitversion(): From 0c719f8e14fff7ecc0ac2b5c67c46ced06765311 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 7 Oct 2019 16:48:14 -0400 Subject: [PATCH 4/5] DOC: Add Olivia Stanley to Zenodo --- .zenodo.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.zenodo.json b/.zenodo.json index 7e511cc6cc..4973827ae7 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -546,6 +546,10 @@ { "name": "Urchs, Sebastian" }, + { + "affiliation": "Dept of Medical Biophysics, Univeristy of Western Ontario", + "name": "Stanley, Olivia" + }, { "affiliation": "Department of Psychology, Stanford University; Parietal, INRIA", "name": "Durnez, Joke", From 894e05e23f2346e1dcc2a330cb8d6e0b8feaac69 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 7 Oct 2019 16:59:41 -0400 Subject: [PATCH 5/5] CI: Use Python 3.6.5 environment for packaging --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a5d59eb75b..3fc27bf663 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -339,6 +339,7 @@ jobs: - run: name: Check pypi preconditions command: | + pyenv local 3.6.5 pip install --upgrade pip twine future wheel readme_renderer setuptools python setup.py sdist bdist_wheel twine check dist/* @@ -353,7 +354,7 @@ jobs: - run: name: Validate Python 3 installation command: | - pyenv local 3.5.2 + pyenv local 3.6.5 pip install --upgrade pip pip install dist/nipype-*-py2.py3-none-any.whl # Futures should not install in Python 3 @@ -388,6 +389,7 @@ jobs: - run: name: Deploy to PyPI command: | + pyenv local 3.6.5 pip install --upgrade twine future wheel readme_renderer setuptools python setup.py check -r -s python setup.py sdist bdist_wheel