summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-24 22:23:06 -0500
committerChris McDonough <chrism@plope.com>2011-01-24 22:23:06 -0500
commit237bf1a37bb36d0ef37aa068a2d35b7f69ce92f1 (patch)
tree184614f4649b634d2aa43fa8ca596a270675e6c6
parent142f9aa3f4b07945e734ea12ce85c9232080eb2e (diff)
downloadpyramid-237bf1a37bb36d0ef37aa068a2d35b7f69ce92f1.tar.gz
pyramid-237bf1a37bb36d0ef37aa068a2d35b7f69ce92f1.tar.bz2
pyramid-237bf1a37bb36d0ef37aa068a2d35b7f69ce92f1.zip
prep for 1.0b2
-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 dc8405be8..a43e19648 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.0b2 (2011-01-24)
+==================
Bug Fixes
---------
diff --git a/docs/conf.py b/docs/conf.py
index 19ba5546b..fe28bacdf 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.0b1'
+version = '1.0b2'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 5d3b12989..93ea9193c 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6):
install_requires.append('simplejson')
setup(name='pyramid',
- version='1.0b1',
+ version='1.0b2',
description='The Pyramid web application framework, a Pylons project',
long_description=README + '\n\n' + CHANGES,
classifiers=[