diff options
| author | Michael Merickel <michael@merickel.org> | 2018-10-31 00:32:36 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-10-31 00:32:36 -0500 |
| commit | 5fa8d88f610a56df10139f761004c702c6cadd28 (patch) | |
| tree | b4b2bd9b42882e209e8e9f1e49505bbd46aad934 | |
| parent | 4e3b445742f5132d27aebbbae5ff048f2115d831 (diff) | |
| download | pyramid-5fa8d88f610a56df10139f761004c702c6cadd28.tar.gz pyramid-5fa8d88f610a56df10139f761004c702c6cadd28.tar.bz2 pyramid-5fa8d88f610a56df10139f761004c702c6cadd28.zip | |
prep 1.10
| -rw-r--r-- | CHANGES.rst | 5 | ||||
| -rw-r--r-- | contributing.md | 4 | ||||
| -rw-r--r-- | docs/conf.py | 3 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 4d5311fe5..af09d2394 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +1.10 (2018-10-31) +================= + +- No major changes from 1.10b1. + 1.10b1 (2018-10-28) =================== diff --git a/contributing.md b/contributing.md index 734f014f5..3b096db5d 100644 --- a/contributing.md +++ b/contributing.md @@ -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 diff --git a/docs/conf.py b/docs/conf.py index 020880a13..a101aa503 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -145,6 +145,7 @@ if book: # '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 @@ html_theme_options = dict( 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', |