From d1a7d3c92eae85034079315beb3a4454bd784691 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 15 Oct 2021 11:23:45 -0400 Subject: [PATCH 1/7] MNT: Update update_changes to handle squashed merges --- tools/update_changes.sh | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tools/update_changes.sh b/tools/update_changes.sh index 387ec3442f..b5f5f8c0a4 100755 --- a/tools/update_changes.sh +++ b/tools/update_changes.sh @@ -23,15 +23,30 @@ UPCOMING=$? HEADER="$1 ($(date '+%B %d, %Y'))" echo $HEADER >> newchanges echo $( printf "%${#HEADER}s" | tr " " "=" ) >> newchanges +echo >> newchanges if [[ "x$2" != "x" ]]; then - echo "(\`Full changelog \`__)" >> newchanges + echo "(\`Full changelog \`__)" >> newchanges + echo >> newchanges fi # Search for PRs since previous release -git log --grep="Merge pull request" `git describe --tags --abbrev=0`..HEAD --pretty='format: * %b %s' | sed 's+Merge pull request \#\([^\d]*\)\ from\ .*+(https://github.com/nipy/nipype/pull/\1)+' >> newchanges -echo "" >> newchanges -echo "" >> newchanges +MERGE_COMMITS=$( git log --grep="Merge pull request\|(#.*)$" `git describe --tags --abbrev=0`..HEAD --pretty='format:%h' ) +for COMMIT in ${MERGE_COMMITS//\n}; do + SUB=$( git log -n 1 --pretty="format:%s" $COMMIT ) + if ( echo $SUB | grep "^Merge pull request" ); then + # Merge commit + PR=$( echo $SUB | sed -e "s/Merge pull request \#\([0-9]*\).*/\1/" ) + TITLE=$( git log -n 1 --pretty="format:%b" $COMMIT ) + else + # Squashed merge + PR=$( echo $SUB | sed -e "s/.*(\#\([0-9]*\))$/\1/" ) + TITLE=$( echo $SUB | sed -e "s/\(.*\)(\#[0-9]*)$/\1/" ) + fi + echo " * $TITLE (https://github.com/nipy/nipype/pull/$PR)" >> newchanges +done +echo >> newchanges +echo >> newchanges # Append old CHANGES if [[ "$UPCOMING" == "0" ]]; then @@ -43,4 +58,3 @@ fi # Replace old CHANGES with new file mv newchanges $CHANGES - From ece23f1ad59f1360155cfb006630efc09ac7a599 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 15 Oct 2021 13:16:45 -0400 Subject: [PATCH 2/7] DOC: Update previous versions --- doc/interfaces.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/interfaces.rst b/doc/interfaces.rst index 107eb6519b..a7523a9cc9 100644 --- a/doc/interfaces.rst +++ b/doc/interfaces.rst @@ -8,7 +8,7 @@ Interfaces and Workflows :Release: |version| :Date: |today| -Previous versions: `1.6.0 `_ `1.5.1 `_ +Previous versions: `1.6.1 `_ `1.6.0 `_ Workflows --------- From 107dfa965c8078c44d1f04a384c1a654ad26bdad Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 15 Oct 2021 13:16:57 -0400 Subject: [PATCH 3/7] MNT: Bump version to 1.7.0 --- nipype/info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/info.py b/nipype/info.py index 4f065939ed..c92f48df5d 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -5,7 +5,7 @@ # nipype version information # Remove -dev for release -__version__ = "1.6.1" +__version__ = "1.7.0" def get_nipype_gitversion(): From a309d90bc96219016c5c73610bea96394a1c667d Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 18 Oct 2021 15:18:32 -0400 Subject: [PATCH 4/7] DOC: Update changelog --- doc/changelog/1.X.X-changelog.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/doc/changelog/1.X.X-changelog.rst b/doc/changelog/1.X.X-changelog.rst index 6d8cd64652..10011c6830 100644 --- a/doc/changelog/1.X.X-changelog.rst +++ b/doc/changelog/1.X.X-changelog.rst @@ -1,3 +1,26 @@ +1.7.0 (October 18, 2021) +======================== + +(`Full changelog `__) + + * FIX: Make ants.LaplacianThickness output_image a string, not file (https://github.com/nipy/nipype/pull/3393) + * FIX: coord for mrconvert (https://github.com/nipy/nipype/pull/3369) + * FIX: ``antsRegistration`` allows the ``restrict_deformation`` to be float (https://github.com/nipy/nipype/pull/3387) + * FIX: Also allow `errno.EBUSY` during `emptydirs` on NFS (https://github.com/nipy/nipype/pull/3357) + * FIX: Removed exists=True from MathsOutput (https://github.com/nipy/nipype/pull/3385) + * FIX: Extension not extensions, after pybids v0.9 (https://github.com/nipy/nipype/pull/3380) + * ENH: Add CAT12 SANLM denoising filter (https://github.com/nipy/nipype/pull/3374) + * ENH: Add expected steps for FreeSurfer 7 recon-all (https://github.com/nipy/nipype/pull/3389) + * ENH: Stop printing false positive differences when logging cached nodes (https://github.com/nipy/nipype/pull/3376) + * ENH: Add new flags to MRtrix/preprocess.py (DWI2Tensor, MRtransform) (https://github.com/nipy/nipype/pull/3365) + * ENH: ``verbose`` input should not be hashed in ``ants.Registration`` (https://github.com/nipy/nipype/pull/3377) + * REF: Clean-up the BaseInterface ``run()`` function using context (https://github.com/nipy/nipype/pull/3347) + * DOC: Fix typo in README (https://github.com/nipy/nipype/pull/3386) + * STY: Make private member name consistent with the rest of them (https://github.com/nipy/nipype/pull/3346) + * MNT: Simplify interface execution and better error handling of ``Node`` (https://github.com/nipy/nipype/pull/3349) + * MNT: Add user name and email to Docker to appease git/annex/datalad (https://github.com/nipy/nipype/pull/3378) + * CI: Update CircleCI machine image (https://github.com/nipy/nipype/pull/3391) + 1.6.1 (June 16, 2021) ===================== From 7d85071ee17565894ce12ff2bff1aa6e592a3757 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 18 Oct 2021 15:21:10 -0400 Subject: [PATCH 5/7] MNT: Update mailmap --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index a233bff1e0..0509365e65 100644 --- a/.mailmap +++ b/.mailmap @@ -10,6 +10,7 @@ Alexander Schaefer Alexander Schaefer Alexandre M. Savio Alexandre M. Savio +Andrea Dell'Orco Andrew Floren Andrey Chetverikov Andrey Chetverikov @@ -144,6 +145,7 @@ Michael Waskom Miguel Molina-Romero Murat Bilgel Nat Lee +Ole Numssen Oliver Contier Olivia Stanley Oscar Esteban From dbe25eb0d23cffa5141bc1b3c4909c7888526b7a Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 18 Oct 2021 15:23:29 -0400 Subject: [PATCH 6/7] MNT: Add Zenodo authors, update ordering --- .zenodo.json | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 0b2d0f65fb..99cba0602a 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -148,15 +148,15 @@ "name": "Visconti di Oleggio Castello, Matteo", "orcid": "0000-0001-7931-5272" }, - { - "affiliation": "Shattuck Lab, UCLA Brain Mapping Center", - "name": "Wong, Jason" - }, { "affiliation": "University of Texas at Austin", "name": "De La Vega, Alejandro", "orcid": "0000-0001-9062-3778" }, + { + "affiliation": "Shattuck Lab, UCLA Brain Mapping Center", + "name": "Wong, Jason" + }, { "affiliation": "MIT", "name": "Kaczmarzyk, Jakub", @@ -217,6 +217,11 @@ "name": "de Hollander, Gilles", "orcid": "0000-0003-1988-5091" }, + { + "affiliation": "Charit\u00e8 Universit\u00e4tsmedizin Berlin, Germany", + "name": "Dell'Orco, Andrea", + "orcid": "0000-0002-3964-8360" + }, { "affiliation": "University College London", "name": "Eshaghi, Arman", @@ -251,6 +256,11 @@ { "name": "Mordom, David" }, + { + "affiliation": "Charite Universitatsmedizin Berlin, Germany", + "name": "Waller, Lea", + "orcid": "0000-0002-3239-6957" + }, { "affiliation": "CIBIT, UC", "name": "Machado, F\u00e1tima", @@ -261,11 +271,6 @@ "name": "Guillon, Je\u0301re\u0301my", "orcid": "0000-0002-2672-7510" }, - { - "affiliation": "Charite Universitatsmedizin Berlin, Germany", - "name": "Waller, Lea", - "orcid": "0000-0002-3239-6957" - }, { "affiliation": "Indiana University, IN, USA", "name": "Koudoro, Serge" @@ -726,6 +731,11 @@ "affiliation": "Universidad de Guadalajara", "name": "Gonz\u00e1lez Orozco, Abel A." }, + { + "affiliation": "ARAMIS Lab", + "name": "Routier, Alexandre", + "orcid": "0000-0003-1603-8049" + }, { "name": "Marina, Ana" }, @@ -794,9 +804,19 @@ "name": "Pannetier, Nicolas", "orcid": "0000-0002-0744-5155" }, + { + "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences", + "name": "Numssen, Ole", + "orcid": "0000-0001-7164-2682" + }, { "name": "Khanuja, Ranjeet" }, + { + "affiliation": "University of Waterloo", + "name": "Mukhometzianov, Rinat", + "orcid": "0000-0003-1274-4827" + }, { "name": "Urchs, Sebastian" }, @@ -835,11 +855,6 @@ "affiliation": "MIT, HMS", "name": "Ghosh, Satrajit", "orcid": "0000-0002-5312-6729" - }, - { - "affiliation": "Charitè Universitätsmedizin Berlin, Germany", - "name": "Dell\'Orco, Andrea", - "orcid": "0000-0002-3964-8360" } ], "keywords": [ From 550f1fa70f5480c0b5e69b35b3497e1525a3c706 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 20 Oct 2021 10:12:11 -0400 Subject: [PATCH 7/7] DOC: Update release date --- doc/changelog/1.X.X-changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog/1.X.X-changelog.rst b/doc/changelog/1.X.X-changelog.rst index 10011c6830..1bf81b42ab 100644 --- a/doc/changelog/1.X.X-changelog.rst +++ b/doc/changelog/1.X.X-changelog.rst @@ -1,4 +1,4 @@ -1.7.0 (October 18, 2021) +1.7.0 (October 20, 2021) ======================== (`Full changelog `__)