Skip to content

pre-release changes for 2.0.0#3396

Closed
IAlibay wants to merge 2 commits intodevelopfrom
prerelease-2.0.0
Closed

pre-release changes for 2.0.0#3396
IAlibay wants to merge 2 commits intodevelopfrom
prerelease-2.0.0

Conversation

@IAlibay
Copy link
Member

@IAlibay IAlibay commented Aug 21, 2021

Towards the 2.0.0 release

Changes made in this Pull Request:

  • Updates the version to 2.0.0 and ties off the CHANGELOG for this version

Notes:

PR Checklist

  • Tests?
  • Docs?
  • CHANGELOG updated?
  • Issue raised/referenced?

@IAlibay
Copy link
Member Author

IAlibay commented Aug 21, 2021

So the plan for release is:

  1. Once we're happy with having completed 2.0.0, merge this into develop
  2. Merge develop into master (standard merge)
  3. Upload master to test-pypi
  4. test on all platforms we can
  5. release on pypi
  6. release on conda (assuming we can also do an aarch64 and Power9 release with that)

@codecov
Copy link

codecov bot commented Aug 21, 2021

Codecov Report

Merging #3396 (4564e34) into develop (b43f0bb) will decrease coverage by 0.09%.
The diff coverage is 100.00%.

❗ Current head 4564e34 differs from pull request most recent head 66d6a7d. Consider uploading reports for the commit 66d6a7d to get more accurate results
Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #3396      +/-   ##
===========================================
- Coverage    93.79%   93.70%   -0.10%     
===========================================
  Files          177      177              
  Lines        23233    22990     -243     
  Branches      3309     3247      -62     
===========================================
- Hits         21792    21542     -250     
- Misses        1390     1397       +7     
  Partials        51       51              
Impacted Files Coverage Δ
package/MDAnalysis/version.py 100.00% <100.00%> (ø)
package/MDAnalysis/coordinates/H5MD.py 94.21% <0.00%> (-3.33%) ⬇️
package/MDAnalysis/coordinates/base.py 95.35% <0.00%> (-0.72%) ⬇️
package/MDAnalysis/coordinates/LAMMPS.py 92.57% <0.00%> (-0.67%) ⬇️
package/MDAnalysis/topology/LAMMPSParser.py 96.20% <0.00%> (-0.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 b43f0bb...66d6a7d. Read the comment docs.

@richardjgowers
Copy link
Member

@IAlibay I think this commit can go onto master instead of develop, then this PR can be the commit which starts 2.x-dev0, which is probably the next commit after the head of master if that makes sense

@IAlibay
Copy link
Member Author

IAlibay commented Aug 21, 2021

@IAlibay I think this commit can go onto master instead of develop, then this PR can be the commit which starts 2.x-dev0, which is probably the next commit after the head of master if that makes sense

@richardjgowers I'm not sure this will work? If we do that wouldn't the master branch will always be 1 commit ahead of develop?

My thought was; 1) we merge this, 2) we merge develop into master so the two are equal, 3) once 2.0.0 passes the testpypi things, we then open a PR to quick off 2.1.0-dev0?

That was master and develop always stay the same?

@richardjgowers
Copy link
Member

@IAlibay yeah I just don't think this PR is necessary, you can merge this into master locally, do the release, then the next PR onto develop is a few commits after this one (but this commit is still in the timeline)

@IAlibay
Copy link
Member Author

IAlibay commented Aug 21, 2021

Ok here's what I'm proposing (and have already started doing):

  1. merge develop into master so they are both equal (done directly via CLI)
  2. add 2.0.0 release commit to master (will close this PR and reposition it to target master)
  3. do release
  4. PR of master feature branch into develop with the 2.1.0 stuff (that way we don't end up with an extra commit on master)

@IAlibay IAlibay closed this Aug 21, 2021
@IAlibay IAlibay deleted the prerelease-2.0.0 branch August 21, 2021 17:04
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.

2 participants