summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-10 01:13:44 -0400
committerChris McDonough <chrism@plope.com>2011-07-10 01:13:44 -0400
commita36fdbd40967117d34a70f156d2865aa2b21991e (patch)
treeb612bec0408192a941d0cb3182e6cce5945c76bf
parent1cb0d740e6b11d2ad5e490c3a64b834640195879 (diff)
downloadpyramid-a36fdbd40967117d34a70f156d2865aa2b21991e.tar.gz
pyramid-a36fdbd40967117d34a70f156d2865aa2b21991e.tar.bz2
pyramid-a36fdbd40967117d34a70f156d2865aa2b21991e.zip
prep for 1.1b1
-rw-r--r--CHANGES.txt4
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index ae8395234..2dead04b4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.1b1 (2011-07-10)
+==================
Features
--------
diff --git a/docs/conf.py b/docs/conf.py
index f09cd63f5..31d816aff 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.1a4'
+version = '1.1b1'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 3b57d6698..54e45e14a 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6):
install_requires.append('simplejson')
setup(name='pyramid',
- version='1.1a4',
+ version='1.1b1',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,