Permalink
Browse files

prep 1.10

  • Loading branch information...
mmerickel committed Oct 31, 2018
1 parent 4e3b445 commit 5fa8d88f610a56df10139f761004c702c6cadd28
Showing with 10 additions and 4 deletions.
  1. +5 −0 CHANGES.rst
  2. +2 −2 contributing.md
  3. +2 −1 docs/conf.py
  4. +1 −1 setup.py
@@ -1,3 +1,8 @@
1.10 (2018-10-31)
=================
- No major changes from 1.10b1.
1.10b1 (2018-10-28)
===================
@@ -14,9 +14,9 @@ Git branches and their purpose and status at the time of this writing are listed
* [master](https://github.com/Pylons/pyramid/) - The branch on which further
development takes place. The default branch on GitHub.
* [1.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The branch
* [1.10-branch](https://github.com/Pylons/pyramid/tree/1.10-branch) - The branch
classified as "stable" or "latest".
* [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The oldest
* [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
@@ -145,6 +145,7 @@ def nothing(*arg):
# 'whatsnew-1.7': 'index',
# 'whatsnew-1.8': 'index',
# 'whatsnew-1.9': 'index',
# 'whatsnew-1.10': 'index',
# 'tutorials/gae/index': 'index',
# 'api/chameleon_text': 'api',
# 'api/chameleon_zpt': 'api',
@@ -156,7 +157,7 @@ def nothing(*arg):
github_url='https://github.com/Pylons/pyramid',
# On master branch and new branch still in
# pre-release status: true; else: false.
in_progress='true',
in_progress='false',
# On branches previous to "latest": true; else: false.
outdated='false',
)
@@ -23,7 +23,7 @@ def readfile(name):
README = readfile('README.rst')
CHANGES = readfile('CHANGES.rst')
VERSION = '1.10b1'
VERSION = '1.10'
install_requires = [
'hupper',

0 comments on commit 5fa8d88

Please sign in to comment.