Skip to content

Update release instructions for 4.6-maintenance #5363

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.

Sign up for GitHub

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 1 commit into from
Jun 2, 2019
Merged

Update release instructions for 4.6-maintenance #5363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions HOWTORELEASE.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ taking a lot of time to make a new one.

#. Create a branch ``release-X.Y.Z`` with the version for the release.

* **maintenance releases**: from ``4.6-maintenance``;

* **patch releases**: from the latest ``master``;

* **minor releases**: from the latest ``features``; then merge with the latest ``master``;
Expand All @@ -24,7 +26,8 @@ taking a lot of time to make a new one.

This will generate a commit with all the changes ready for pushing.

#. Open a PR for this branch targeting ``master``.
#. Open a PR for this branch targeting ``master`` (or ``4.6-maintenance`` for
maintenance releases).

#. After all tests pass and the PR has been approved, publish to PyPI by pushing the tag::

Expand All @@ -33,7 +36,16 @@ taking a lot of time to make a new one.

Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/pytest>`_.

#. Merge the PR into ``master``.
#. Merge the PR.

#. If this is a maintenance release, cherry-pick the CHANGELOG / announce
files to the ``master`` branch::

git fetch --all --prune
git checkout origin/master -b cherry-pick-maintenance-release
git cherry-pick --no-commit -m1 origin/4.6-maintenance
git checkout origin/master -- changelog
git commit # no arguments

#. Send an email announcement with the contents from::

Expand Down