summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-24 00:29:42 -0400
committerChris McDonough <chrism@plope.com>2011-08-24 00:29:42 -0400
commitc1a179fbc713a8c8c5be19f8d327b8ced567d957 (patch)
tree8e64b274e091c6ee629377ee8a525acdd7767b96
parentb69699f89176b273139eb73e464e21d0121d5540 (diff)
downloadpyramid-c1a179fbc713a8c8c5be19f8d327b8ced567d957.tar.gz
pyramid-c1a179fbc713a8c8c5be19f8d327b8ced567d957.tar.bz2
pyramid-c1a179fbc713a8c8c5be19f8d327b8ced567d957.zip
prep for 1.2a1
-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 86ae8c49d..5e4c63df1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2a1 (2011-08-24)
+==================
Features
--------
diff --git a/docs/conf.py b/docs/conf.py
index f021f01a2..23b88b949 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.2dev'
+version = '1.2a1'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 4c556dbc3..40823384a 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.2dev',
+ version='1.2a1',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,