summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2021-02-28 20:52:32 -0600
committerMichael Merickel <michael@merickel.org>2021-02-28 20:57:32 -0600
commita05fd8387b79a777192d0679ace659495b2eb8df (patch)
tree714898c288e765031c339997acfc1b0c21394fd5
parentea3050858e4542fc12a3208d9a142eec8b0706cf (diff)
downloadpyramid-a05fd8387b79a777192d0679ace659495b2eb8df.tar.gz
pyramid-a05fd8387b79a777192d0679ace659495b2eb8df.tar.bz2
pyramid-a05fd8387b79a777192d0679ace659495b2eb8df.zip
prep 2.0
-rw-r--r--CHANGES.rst5
-rw-r--r--contributing.md16
-rw-r--r--setup.py2
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
diff --git a/setup.py b/setup.py
index c3860e0e9..98e8a2b38 100644
--- a/setup.py
+++ b/setup.py
@@ -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