summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-04-16 15:54:49 -0500
committerMichael Merickel <michael@merickel.org>2016-04-16 15:54:49 -0500
commit1eea18ab7f1428ba8ac01a238f03ddbf8483593b (patch)
treeee86f80c92a596041ce1f6afd46ebb3ea8947b63
parent3d5dbd2c599fc724ebf105708f75d8768530e855 (diff)
downloadpyramid-1eea18ab7f1428ba8ac01a238f03ddbf8483593b.tar.gz
pyramid-1eea18ab7f1428ba8ac01a238f03ddbf8483593b.tar.bz2
pyramid-1eea18ab7f1428ba8ac01a238f03ddbf8483593b.zip
prep 1.7a1
-rw-r--r--CHANGES.txt4
-rw-r--r--README.rst2
-rw-r--r--contributing.md2
-rw-r--r--setup.py2
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
diff --git a/setup.py b/setup.py
index e5ea4c5dc..2774b773f 100644
--- a/setup.py
+++ b/setup.py
@@ -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=[