diff options
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | contributing.md | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index d316594bc..6a3f2fa86 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,5 @@ -unreleased -========== +1.7a1 (2016-04-16) +================== Backward Incompatibilities -------------------------- diff --git a/README.rst b/README.rst index 2237d9950..028d37872 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ Pyramid ======= -.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master +.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=1.7-branch :target: https://travis-ci.org/Pylons/pyramid .. image:: https://readthedocs.org/projects/pyramid/badge/?version=master diff --git a/contributing.md b/contributing.md index af19ed093..1393a2507 100644 --- a/contributing.md +++ b/contributing.md @@ -26,6 +26,8 @@ listed below. * [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. +* [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The branch +classified as alpha. Actively maintained. * [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The branch classified as "stable" or "latest". Actively maintained. * [1.5-branch](https://github.com/Pylons/pyramid/tree/1.5-branch) - The oldest @@ -72,7 +72,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.7.dev0', + version='1.7a1', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ |