summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-01 04:41:34 -0400
committerChris McDonough <chrism@plope.com>2011-07-01 04:41:34 -0400
commitb9c0e79be2764b8f6c59e5be9044675666154ea0 (patch)
treee43c54e9014274c9908b358220661c1b4d3145cc
parent8519c9a97dfdc4be7e4ba76e6e175ec9e7668b78 (diff)
downloadpyramid-b9c0e79be2764b8f6c59e5be9044675666154ea0.tar.gz
pyramid-b9c0e79be2764b8f6c59e5be9044675666154ea0.tar.bz2
pyramid-b9c0e79be2764b8f6c59e5be9044675666154ea0.zip
prep for 1.1a4
-rw-r--r--CHANGES.txt4
-rw-r--r--docs/conf.py6
-rw-r--r--setup.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 9a6107efc..4867c9e88 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.1a4 (2011-07-01)
+==================
Bug Fixes
---------
diff --git a/docs/conf.py b/docs/conf.py
index 86a92badd..f09cd63f5 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.1a3'
+version = '1.1a4'
# The full version, including alpha/beta/rc tags.
release = version
@@ -456,7 +456,7 @@ def resig(app, what, name, obj, options, signature, return_annotation):
# -- Options for Epub output ---------------------------------------------------
# Bibliographic Dublin Core info.
-epub_title = 'The Pyramid Web Application Development Framework, Version 1.0'
+epub_title = 'The Pyramid Web Application Development Framework, Version 1.1'
epub_author = 'Chris McDonough'
epub_publisher = 'Agendaless Consulting'
epub_copyright = '2008-2011'
@@ -473,7 +473,7 @@ epub_scheme = 'ISBN'
epub_identifier = '0615445675'
# A unique identification for the text.
-epub_uid = 'The Pyramid Web Application Development Framework, Version 1.0'
+epub_uid = 'The Pyramid Web Application Development Framework, Version 1.1'
# HTML files that should be inserted before the pages created by sphinx.
# The format is a list of tuples containing the path and title.
diff --git a/setup.py b/setup.py
index 91d456a89..3b57d6698 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.1a3',
+ version='1.1a4',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,