summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-06-26 04:00:52 -0400
committerChris McDonough <chrism@plope.com>2011-06-26 04:00:52 -0400
commit1ba6fe34b9f37594d926cc63b6219ad61dbeebb6 (patch)
treefb2b669b434e221397b22a91db3bb389a515b342
parent8bd6cf291b91977f22d8e153328cc13d38d00ff2 (diff)
downloadpyramid-1ba6fe34b9f37594d926cc63b6219ad61dbeebb6.tar.gz
pyramid-1ba6fe34b9f37594d926cc63b6219ad61dbeebb6.tar.bz2
pyramid-1ba6fe34b9f37594d926cc63b6219ad61dbeebb6.zip
prep for 1.1a3
-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 81004b00e..d25b1be66 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.1a3 (2011-06-26)
+==================
Features
--------
diff --git a/docs/conf.py b/docs/conf.py
index 34262191f..02f0339b5 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.1a2'
+version = '1.1a3'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 5c3232fca..91d456a89 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.1a2',
+ version='1.1a3',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,