diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-04-17 01:31:55 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-04-17 01:31:55 -0700 |
| commit | 7c9eab4730efac736064ec35a312d3a7936674d2 (patch) | |
| tree | af4cad2d4d8c3e065ff390d1b9874c8038a623a4 /RELEASING.txt | |
| parent | 51cc630b6868a148aa153b751410ea9eb5ecc9d9 (diff) | |
| download | pyramid-7c9eab4730efac736064ec35a312d3a7936674d2.tar.gz pyramid-7c9eab4730efac736064ec35a312d3a7936674d2.tar.bz2 pyramid-7c9eab4730efac736064ec35a312d3a7936674d2.zip | |
update RELEASING.txt with version terms, extra step
update conf.py with clearer comments and prep for rolldown for 1.6
Diffstat (limited to 'RELEASING.txt')
| -rw-r--r-- | RELEASING.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/RELEASING.txt b/RELEASING.txt index 614d3257b..866fff305 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -1,7 +1,18 @@ Releasing Pyramid ================= -- Do any necessary branch merges (e.g. master to branch, branch to master). +- For clarity, we define releases as follows. + + - Alpha, beta, dev and similar statuses do not qualify whether a release is + major or minor. The term "pre-release" means alpha, beta, or dev. + + - A *major* release is where the first number either before or after the + first dot increases. Examples: 1.6 to 1.7a1, or 1.8 to 2.0. + + - A *minor* or *bug fix* release is where the number after the second dot + increases. Example: 1.6 to 1.6.1. + +- Do any necessary branch merges (e.g., master to branch, branch to master). - On release branch: @@ -41,7 +52,8 @@ Releasing Pyramid branch, and previously released branch. Also in the previously released branch only, uncomment the sections to enable pylons_sphinx_latesturl. -- Change setup.py version to the new version number. +- Change setup.py version to the new version number on both master and the new + branch. - Change CHANGES.txt heading to reflect the new version number. |