summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-08 04:00:12 -0400
committerChris McDonough <chrism@plope.com>2011-09-08 04:00:12 -0400
commit9de21ff234ac7995a77d74f7da63b78a29ca1a56 (patch)
tree88e05b395035cf89fd61efd8d14a6616567f5a3c
parent00128a1bc824c7d79ce5595bf233669a00b57f36 (diff)
downloadpyramid-9de21ff234ac7995a77d74f7da63b78a29ca1a56.tar.gz
pyramid-9de21ff234ac7995a77d74f7da63b78a29ca1a56.tar.bz2
pyramid-9de21ff234ac7995a77d74f7da63b78a29ca1a56.zip
prep for 1.2b1
-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 4c927fa80..f7650f273 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2b1 (2011-09-08)
+==================
Bug Fixes
---------
diff --git a/docs/conf.py b/docs/conf.py
index a6e4f2239..cfbf6339f 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.2a6'
+version = '1.2b1'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 48cfdac23..83e0a8c6b 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6):
install_requires.append('simplejson')
setup(name='pyramid',
- version='1.2a6',
+ version='1.2b1',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,