summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-29 11:46:41 -0400
committerChris McDonough <chrism@plope.com>2011-08-29 11:46:41 -0400
commit21a4c9b232b2d5c9660f27904b92645b109eda15 (patch)
tree3eb77de62a1da8d219fa73916e310214ead3f211
parent0ff9d4fb7c23a505d11666dfd4410fb5d7a8d473 (diff)
downloadpyramid-21a4c9b232b2d5c9660f27904b92645b109eda15.tar.gz
pyramid-21a4c9b232b2d5c9660f27904b92645b109eda15.tar.bz2
pyramid-21a4c9b232b2d5c9660f27904b92645b109eda15.zip
prep for 1.2a3
-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 ce42e2136..9cf1df931 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2a3 (2011-08-29)
+==================
Bug Fixes
---------
diff --git a/docs/conf.py b/docs/conf.py
index 22ae65a44..d5c4301fb 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.2a2'
+version = '1.2a3'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index c854cf6c6..75f8d16c0 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.2a2',
+ version='1.2a3',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,