summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-12-25 19:48:28 -0600
committerMichael Merickel <michael@merickel.org>2016-12-25 20:05:55 -0600
commit73b851a2bac7cf32a1d1df594a04cdd631e3391a (patch)
treecf89b7b11b3ab9e5f9106efb843d7c56800ccfa8
parent8be808150a6df96b5815aa3885c0f62540d82e27 (diff)
downloadpyramid-73b851a2bac7cf32a1d1df594a04cdd631e3391a.tar.gz
pyramid-73b851a2bac7cf32a1d1df594a04cdd631e3391a.tar.bz2
pyramid-73b851a2bac7cf32a1d1df594a04cdd631e3391a.zip
prep 1.8a1
-rw-r--r--README.rst4
-rw-r--r--contributing.md4
-rw-r--r--setup.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/README.rst b/README.rst
index 6ef75e899..7179fa8db 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,9 @@
Pyramid
=======
-.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master
+.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=1.8-branch
:target: https://travis-ci.org/Pylons/pyramid
- :alt: Master Travis CI Status
+ :alt: 1.8-branch Travis CI Status
.. image:: https://readthedocs.org/projects/pyramid/badge/?version=master
:target: http://docs.pylonsproject.org/projects/pyramid/en/master/
diff --git a/contributing.md b/contributing.md
index b5f17ae06..9deeee035 100644
--- a/contributing.md
+++ b/contributing.md
@@ -26,9 +26,9 @@ 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
+* [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The branch
classified as "stable" or "latest".
-* [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The oldest
+* [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The oldest
actively maintained and stable branch.
Older branches are not actively maintained. In general, two stable branches and
diff --git a/setup.py b/setup.py
index 687ed5700..2439e59bc 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ testing_extras = tests_require + [
]
setup(name='pyramid',
- version='1.8.dev0',
+ version='1.8a1',
description='The Pyramid Web Framework, a Pylons project',
long_description=README + '\n\n' + CHANGES,
classifiers=[