summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-18 02:59:50 -0400
committerChris McDonough <chrism@plope.com>2011-07-18 02:59:50 -0400
commit40c643e07e1a5eeb48e86070cd0ffbd998899669 (patch)
treee9e9d1ef7a40a3be769ae4d5511ff06998768d75
parent1fac3ef6ac3d3062c719056a347778074946f3fb (diff)
downloadpyramid-40c643e07e1a5eeb48e86070cd0ffbd998899669.tar.gz
pyramid-40c643e07e1a5eeb48e86070cd0ffbd998899669.tar.bz2
pyramid-40c643e07e1a5eeb48e86070cd0ffbd998899669.zip
prep for 1.1b4
-rw-r--r--CHANGES.txt5
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 4 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 9edeb63c9..1b85d39be 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.1b4 (2011-07-18)
+==================
Documentation
-------------
@@ -24,7 +24,6 @@ Features
generally just run ``paster {pshell|proutes|pviews} development.ini`` and
it will do mostly the right thing.
-
Bug Fixes
---------
diff --git a/docs/conf.py b/docs/conf.py
index 5c77e083b..597090c42 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.1b3'
+version = '1.1b4'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 3ba985769..99bd761fc 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.1b3',
+ version='1.1b4',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,