summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-11 01:30:37 -0400
committerChris McDonough <chrism@plope.com>2011-09-11 01:30:37 -0400
commit2cf1d0efe6d281bc2a0d8316af8480765200eeea (patch)
tree39a940da70bebc101d56e078d2739a3e65ba888a
parent58bd32c7cdaff6d1b0e578e8a6887ea2f519866e (diff)
downloadpyramid-2cf1d0efe6d281bc2a0d8316af8480765200eeea.tar.gz
pyramid-2cf1d0efe6d281bc2a0d8316af8480765200eeea.tar.bz2
pyramid-2cf1d0efe6d281bc2a0d8316af8480765200eeea.zip
prep for 1.2b3
-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 a82d3b336..7488be4cb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2b3 (2011-09-11)
+==================
Bug Fixes
---------
diff --git a/docs/conf.py b/docs/conf.py
index 4dad10a8c..a35dfcfe8 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.2b2'
+version = '1.2b3'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 3254a8bda..86d3df9a5 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.2b2',
+ version='1.2b3',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,