| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
Sorry, something went wrong.
| If this is the last micro release anticipated (or otherwise are entering feature | ||
| freeze for the next minor release), create a release branch for the next minor | ||
| release :: | ||
|
|
||
| git switch main | ||
| git branch v2.1.x |
There was a problem hiding this comment.
This is not normally something we do. Everything goes to main until we decide to branch near-ish the release candidate. It's not related to the tagging of the last bugfix/micro.
Sorry, something went wrong.
Branching and tagging a final micro release are independent. I chose to tag 3.6.3 at the time of making v3.7.x, because there just seemed to be enough already backported to make a release. But there is no correlation between these two steps.
We have conditions in the reST to automatically enable/disable these sections. Those instructions are outdated and can be deleted.
It should occur for every release, though it's not always done. Ensuring that the version, as generated by git describe (and thus setuptools-scm), is as close as correct as can be is IMO the primary reason. The version switcher change could just as well have been cherry-picked. Conflicts are almost always resolved for the version on main, but it entirely depends on whether changes have been made directly to the release branch. It is up to the release manager to make the call there. |
Sorry, something went wrong.
|
RE sequencing and severing the idea of creating the release branch and doing the release:
RE Next what's new:
RE merge-up:
(for this cycle, there was one set of changes fixing grammar on a note added to each animation tutorial that was made only in the v3.7.x branch, but other than that and the link fixes during release used main for everything) |
Sorry, something went wrong.
I think we have historically had a final micro around the time we did the next minor/major release? That said, my impressions of this may be very clouded by the 2.0 and 3.0 processes which both had very long running (N-1).x.y series associated with them.... |
Sorry, something went wrong.
|
For example, 3.5.3 was tagged on Aug 10, but the first backport that got to v3.6.x was Aug 22 and 3.6.0rc1 was Aug 22. I don't recall exactly when that branching happened, but it wasn't at the same time as the 3.5.3 release. |
Sorry, something went wrong.
|
Updating pinned versions of mpl-sphinx-theme added via matplotlib/mpl-sphinx-theme#57 rather than here. |
Sorry, something went wrong.
Co-authored-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
There was a problem hiding this comment.
Just two minor tweaks.
Sorry, something went wrong.
Co-authored-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
| Back | FazBrowse Home | New Git URL |
PR Summary
TODOS
Discuss wording/sequencing of creating the release branches/milestones
- I have a relatively minimal change that puts "create the release branch" in the same part of the workflow, just instead of releasing from main and then creating the release branch during the .0 release, we create it for the last anticipated micro release of the previous minor version. This is closer, I think to what we actually do, but not sure if we want to reorganize that thought.
Add comment out of Next what's new to the appropriate section
- This is referred to later on to uncomment, but it doesn't actually say to comment it in the linked section.
- Alternatively, may be able to use rst to ignore it for releases and not have to edit this at all.
When and how does the "merge-up" process work? (See Merge v3.6.x branch to main #23918 for an example of such a pull request)
- Does this only happen for .0 releases, or every release
- If conflicts do arise, how are they resolved (can a standard answer be given?)?
- Is the only real need for this for the purposes of the version switcher? (which seems to be the primary stated reason)
- Document interactions with setuptools-scm (which is the other stated reason)
PR Checklist
Documentation and Tests
Release Notes