summaryrefslogtreecommitdiff
path: root/RELEASING.txt
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-05-20 14:37:25 -0700
committerSteve Piercy <web@stevepiercy.com>2018-05-20 14:37:25 -0700
commit583c347fafafd4653d5b46d88b25b50c0419dfc2 (patch)
tree5c1bdeccefdb8c75dc7d65035b8902465f478d2f /RELEASING.txt
parent184f604cc558fa977a041b0cae2591fe0f2b79f6 (diff)
downloadwaitress-583c347fafafd4653d5b46d88b25b50c0419dfc2.tar.gz
Remove branch mentions
Diffstat (limited to 'RELEASING.txt')
-rw-r--r--RELEASING.txt20
1 files changed, 3 insertions, 17 deletions
diff --git a/RELEASING.txt b/RELEASING.txt
index 63f9220..1306098 100644
--- a/RELEASING.txt
+++ b/RELEASING.txt
@@ -14,16 +14,8 @@ Releasing
- A *minor* or *bug fix* release is where the number after the second dot
increases. Example: 1.0 to 1.0.1.
-Prepare new release branch
---------------------------
-
-- Create a new release branch, incrementing the version number.
-
-- Do any necessary branch merges (e.g., master to branch, branch to master).
-
-- On release branch:
-
- $ git pull
+Prepare new release
+-------------------
- Do platform test via tox:
@@ -41,9 +33,6 @@ Prepare new release branch
- Minor releases should include a link under "Bug Fix Releases" to the minor
feature changes in CHANGES.txt.
-- Update README.rst to use correct versions of badges, URLs, and ALT option
- according to the new release branch name.
-
- Change setup.py version to the release version number.
- Make sure PyPI long description renders (requires ``readme_renderer``
@@ -63,13 +52,10 @@ Prepare new release branch
Prepare master for further development (major releases only)
------------------------------------------------------------
-- Checkout master.
-
- In CHANGES.txt, preserve headings but clear out content. Add heading
"unreleased" for the version number.
-- From the release branch, forward port the changes in CHANGES.txt to
- HISTORY.txt.
+- Forward port the changes in CHANGES.txt to HISTORY.txt.
- Change setup.py version to the next version number.