Skip to content

REL: 1.2.2 #3015

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

Merged
merged 9 commits into from
Sep 7, 2019
Merged

REL: 1.2.2 #3015

merged 9 commits into from
Sep 7, 2019

Conversation

oesteban
Copy link
Contributor

@oesteban oesteban commented Sep 5, 2019

Summary

Prep for 1.2.2 release, targeting Friday, September 6.

Please add any issues you want to see included in the following release to the upcoming 1.2.3 milestone targetting September 23.

Release checklist

Uncredited authors

The following authors have contributed, but not added themselves to the .zenodo.json file. If you would like to be an author on Zenodo releases, please add yourself or comment with your preferred publication name, affiliation and ORCID. If you would like to stop being spammed whenever I'm the one doing releases, let me know, and I'll add you to a blacklist.

No entry to sort: Victor Férat (@vferat)
No entry to sort: Murat Bilgel (@bilgelm)

Acknowledgment

  • (Mandatory) I acknowledge that this contribution will be available under the Apache 2 license.

@codecov
Copy link

codecov bot commented Sep 5, 2019

Codecov Report

Merging #3015 into master will decrease coverage by 3.14%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3015      +/-   ##
==========================================
- Coverage    67.5%   64.36%   -3.15%     
==========================================
  Files         344      344              
  Lines       44029    44029              
  Branches     5551     5551              
==========================================
- Hits        29722    28338    -1384     
- Misses      13559    14535     +976     
- Partials      748     1156     +408
Flag Coverage Δ
#smoketests ?
#unittests 64.36% <100%> (-0.6%) ⬇️
Impacted Files Coverage Δ
nipype/info.py 80.28% <100%> (-14.09%) ⬇️
nipype/algorithms/rapidart.py 35% <0%> (-29.42%) ⬇️
nipype/utils/provenance.py 55.73% <0%> (-28.35%) ⬇️
nipype/interfaces/fsl/model.py 54.89% <0%> (-25.73%) ⬇️
nipype/pipeline/plugins/oar.py 30.68% <0%> (-23.87%) ⬇️
nipype/interfaces/spm/base.py 63.24% <0%> (-23.85%) ⬇️
nipype/interfaces/matlab.py 65.65% <0%> (-20.21%) ⬇️
nipype/interfaces/nipy/base.py 80% <0%> (-20%) ⬇️
nipype/testing/utils.py 72.41% <0%> (-17.25%) ⬇️
nipype/workflows/fmri/fsl/estimate.py 47.88% <0%> (-16.91%) ⬇️
... and 52 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 508df5e...d1aab47. Read the comment docs.

@codecov
Copy link

codecov bot commented Sep 5, 2019

Codecov Report

Merging #3015 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #3015      +/-   ##
=========================================
- Coverage    67.5%   67.5%   -0.01%     
=========================================
  Files         344     344              
  Lines       44045   44028      -17     
  Branches     5552    5551       -1     
=========================================
- Hits        29733   29721      -12     
+ Misses      13568   13567       -1     
+ Partials      744     740       -4
Flag Coverage Δ
#smoketests 50.39% <100%> (+0.25%) ⬆️
#unittests 64.98% <100%> (+0.01%) ⬆️
Impacted Files Coverage Δ
nipype/info.py 90.14% <100%> (-4.23%) ⬇️
nipype/interfaces/afni/preprocess.py 82.01% <0%> (-0.33%) ⬇️
nipype/utils/filemanip.py 79.67% <0%> (-0.25%) ⬇️
nipype/pipeline/engine/nodes.py 84.1% <0%> (+0.33%) ⬆️
nipype/pipeline/plugins/legacymultiproc.py 68% <0%> (+0.5%) ⬆️
nipype/utils/provenance.py 84.07% <0%> (+1.27%) ⬆️
nipype/workflows/fmri/spm/preprocess.py 72.44% <0%> (+2.04%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 13a7556...5f8be53. Read the comment docs.

@bilgelm bilgelm mentioned this pull request Sep 5, 2019
1 task
@effigies
Copy link
Member

effigies commented Sep 5, 2019

@djarecka Oscar didn't ping you, but if you get a chance to verify that we're not breaking the tutorials, could you do that? Or show one of us how you do that?

@satra
Copy link
Member

satra commented Sep 5, 2019

@djarecka and @effigies - we should add a test to nipype that clones the tutorial repo and runs the tests automatically using nbconvert, we are doing a version of this in pydra. i just don't know how long that test will run, so perhaps it can be a test that's only run prior to release.

oesteban and others added 9 commits September 6, 2019 14:39
Output of ``python tools/update_zenodo.py``:

```
No entry to sort: Victor Férat
No entry to sort: Martin
No entry to sort: Isaiah Norton
No entry to sort: Niklas Förster
No entry to sort: daniel glen
No entry to sort: rciric
No entry to sort: Kirstie Whitaker
No entry to sort: hstojic
No entry to sort: Gio Piantoni
No entry to sort: Jonathan R. Williford
No entry to sort: Hao
No entry to sort: Fred Mertz
No entry to sort: Murat Bilgel
No entry to sort: Kevin Sitek
No entry to sort: Ami Tsuchida
No entry to sort: Abel González
No entry to sort: Michiel Cottaar
No entry to sort: Daniel Brenner
```
@oesteban
Copy link
Contributor Author

oesteban commented Sep 6, 2019

@djarecka just in case coming back from INCF allows you, please let us know how we can check we are not breaking the tutorials.

@effigies not sure what is next w.r.t. conda-forge

@satra @mgxd et al. thumbs up?

@effigies
Copy link
Member

effigies commented Sep 6, 2019

Nothing to do at conda forge except check that it passes. Once you release, it'll update with the new hash and we can merge.

Also, don't know if I mentioned it, but you should push an annotated tag before making the GitHub release.

@effigies
Copy link
Member

effigies commented Sep 6, 2019

@oesteban I've started a job here: https://circleci.com/workflow-run/37f1cebd-69f8-40eb-80a5-76e001e55b3b. It should run on the latest master, so if it passes, we're set.

@oesteban
Copy link
Contributor Author

oesteban commented Sep 7, 2019

Should I push the annotated tag before merging this PR?

@effigies
Copy link
Member

effigies commented Sep 7, 2019

No. Merge, then:

git fetch upstream
git checkout upstream/master
git tag -a 1.2.2 # -s if you want to sign with a GPG key
git push upstream 1.2.2

For the tag message, I just copy the changelog, minus any Markdown stuff.

e.g.

$ git show 1.2.1 | cat
tag 1.2.1
Tagger: Christopher J. Markiewicz <[email protected]>
Date:   Mon Aug 19 08:35:50 2019 -0400

1.2.1 (August 19, 2019)

Full changelog: https://github.com/nipy/nipype/milestone/32?closed=1

  * FIX: Resolve/rebase paths from/to results files (https://github.com/nipy/nipype/pull/2971)
  * FIX: Use ``load_resultfile`` when loading a results pickle (https://github.com/nipy/nipype/pull/2985)
  * FIX: Incorrect extension identified when checking ``File`` traits (https://github.com/nipy/nipype/pull/2987)
  * FIX: Correctly pickle ``OuputMultiObject`` traits (https://github.com/nipy/nipype/pull/2983)
  * FIX: Improve output handling in DWIDenoise and DWIBiasCorrect (https://github.com/nipy/nipype/pull/2978)
  * FIX: Docker build (https://github.com/nipy/nipype/pull/2963)
  * FIX: Remove '=' signs from EddyQuad argument specifications (https://github.com/nipy/nipype/pull/2941)
  * FIX: Set input model to bedpostx for camino.TrackBedpostxProba (https://github.com/nipy/nipype/pull/2947)
  * FIX: Allow ``max_sh``not to be set (auto mode) (https://github.com/nipy/nipype/pull/2940)
  * ENH: Update mrtrix reconst.py EstimateFOD max_sh to be able to accept list (https://github.com/nipy/nipype/pull/2990)
  * ENH: Let ``indirectory`` handle ``nipype.utils.filemanip.Path`` (https://github.com/nipy/nipype/pull/2989)
  * ENH: Add resolve/rebase ``BasePath`` traits methods & tests (https://github.com/nipy/nipype/pull/2970)
  * ENH: Modify ``Directory`` and ``File`` traits to get along with pathlib (https://github.com/nipy/nipype/pull/2962)
  * REF: Update nipype2boutiques script (https://github.com/nipy/nipype/pull/2894)
  * TST: Parametrize JoinNode expansion tests over config ``needed_outputs`` (https://github.com/nipy/nipype/pull/2981)
  * MAINT: Pin lxml<4.4.0 for Python 3.4 (https://github.com/nipy/nipype/pull/2980)
  * MAINT: Refactor ``aggregate_outputs`` for readability (https://github.com/nipy/nipype/pull/2969)
  * MAINT: Bump neurodocker version (https://github.com/nipy/nipype/pull/2965)
  * MAINT: Various minor improvements to complement previous PR (https://github.com/nipy/nipype/pull/2964)
  * MAINT: Sort dependencies alphabetically (https://github.com/nipy/nipype/pull/2961)
-----BEGIN PGP SIGNATURE-----

iI4EABYIADYWIQR8q78A2LscOhhE3OS5m8FQiGeN7gUCXVqXvxgcbWFya2lld2lj
ekBzdGFuZm9yZC5lZHUACgkQuZvBUIhnje5ycQEAw/nJruct3f6baCgginX2tzq4
SqcoPMj7IXi2dJvG0sMBAPrzraRmJQh+SRkugRrU0f8FsLhgsEFH7LKIKth5JscL
=jjn7
-----END PGP SIGNATURE-----

commit 3e794d414c0bd79d077fc5ba36f2112e7b95878b
Merge: ea2243cef 17019b417
Author: Chris Markiewicz <[email protected]>
Date:   Mon Aug 19 05:33:58 2019 -0700

    Merge pull request #2999 from nipy/rel/1.2.1
    
    REL: 1.2.1

@effigies
Copy link
Member

effigies commented Sep 7, 2019

If you mess up the tag, you can always just git tag --delete 1.2.2, so feel free to play around until you get it how you want.

@oesteban oesteban merged commit c54c744 into master Sep 7, 2019
@oesteban
Copy link
Contributor Author

oesteban commented Sep 7, 2019

Bummer, I missed #2948 and #3006. I'll fix that before releasing (so I'll need to delete the tag, etc.)

@effigies
Copy link
Member

effigies commented Sep 7, 2019

I cancelled the Circle and Travis builds for the tag. You can delete the tag on the repo with:

git push upstream :1.2.2

@@ -1,3 +1,17 @@
1.2.2 (September 05, 2019)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oesteban If you're pushing a new tag, you might want to update the date before tagging.

@oesteban oesteban mentioned this pull request Sep 7, 2019
8 tasks
@effigies effigies deleted the rel/1.2.2 branch October 8, 2019 15:13
@effigies effigies added this to the 1.2.2 milestone Apr 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants