summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-02 12:52:53 -0400
committerChris McDonough <chrism@plope.com>2011-09-02 12:52:53 -0400
commitf1c6e093706f54c301655d9894c163afbb48ae1e (patch)
tree0d2a8d2742ed273f6b85072d3ad4a1ad779e9232
parent95eab98bc6f98edf3c263e806d2e5b6d58ac6f6f (diff)
downloadpyramid-f1c6e093706f54c301655d9894c163afbb48ae1e.tar.gz
pyramid-f1c6e093706f54c301655d9894c163afbb48ae1e.tar.bz2
pyramid-f1c6e093706f54c301655d9894c163afbb48ae1e.zip
prep for 1.2a4
-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 873c445e9..b1165cb37 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2a4 (2011-09-02)
+==================
Features
--------
diff --git a/docs/conf.py b/docs/conf.py
index d5c4301fb..e350ca21f 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.2a3'
+version = '1.2a4'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 4d32db715..9a19b8a5b 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.2a3',
+ version='1.2a4',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,