summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-04-08 19:09:47 -0400
committerChris McDonough <chrism@plope.com>2014-04-08 19:09:47 -0400
commit0cb759758c97feba48c0bbba149a774f85f2606a (patch)
tree61fe5601b19a5c72aaf331034a898cfdd65cb729
parent2ecc60e1f55e42a99d8d5339e0724babb4c82a2e (diff)
downloadpyramid-0cb759758c97feba48c0bbba149a774f85f2606a.tar.gz
pyramid-0cb759758c97feba48c0bbba149a774f85f2606a.tar.bz2
pyramid-0cb759758c97feba48c0bbba149a774f85f2606a.zip
prep for 1.5 release
-rw-r--r--CHANGES.txt4
-rw-r--r--setup.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e3996b3e..900eb116d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Unreleased
-==========
+1.5 (2014-04-08)
+================
- Avoid crash in ``pserve --reload`` under Py3k, when iterating over possibly
mutated ``sys.modules``.
diff --git a/setup.py b/setup.py
index bb443330d..2214611b7 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
]
setup(name='pyramid',
- version='1.5b1',
+ version='1.5',
description='The Pyramid Web Framework, a Pylons project',
long_description=README + '\n\n' + CHANGES,
classifiers=[