diff options
| -rw-r--r-- | CHANGES.rst | 5 | ||||
| -rw-r--r-- | contributing.md | 16 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 887c8ce95..16a724557 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +2.0 (2021-02-28) +================ + +- No changes from 2.0b1. + 2.0b1 (2021-02-20) ================== diff --git a/contributing.md b/contributing.md index 534b399c6..ffe050035 100644 --- a/contributing.md +++ b/contributing.md @@ -12,17 +12,11 @@ You can contribute to this project in several ways. Git branches and their purpose and status at the time of this writing are listed below. -* [master](https://github.com/Pylons/pyramid/) - The branch on which further - development takes place. The default branch on GitHub. -* [2.0-branch](https://github.com/Pylons/pyramid/tree/2.0-branch) - The branch - classified as "alpha". -* [1.10-branch](https://github.com/Pylons/pyramid/tree/1.10-branch) - The branch - classified as "stable" or "latest". -* [1.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The oldest - actively maintained and stable branch. - -Older branches are not actively maintained. In general, two stable branches and -one or two development branches are actively maintained. +* [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. +* [2.0-branch](https://github.com/Pylons/pyramid/tree/2.0-branch) - The branch classified as "stable" or "latest". +* [1.10-branch](https://github.com/Pylons/pyramid/tree/1.10-branch) - The oldest actively maintained and stable branch. + +Older branches are not actively maintained. In general, two stable branches and one or two development branches are actively maintained. ## Developing @@ -22,7 +22,7 @@ def readfile(name): README = readfile('README.rst') CHANGES = readfile('CHANGES.rst') -VERSION = '2.0b1' +VERSION = '2.0' install_requires = [ 'hupper >= 1.5', # ignore_files support |