From ee95e4976cc5e1eae510b5ee2d9aa46b881a07e4 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 13 Aug 2011 02:16:40 -0400
Subject: [PATCH] prep for 1.0.1

---
 .gitignore   |  1 +
 CHANGES.txt  | 12 ++++++------
 docs/conf.py |  2 +-
 setup.py     |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e2bab5ed7..844fcb890a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ env26/
 env26-debug/
 bookenv/
 env24/
+env25/
 env27/
 jyenv/
 pypyenv/
diff --git a/CHANGES.txt b/CHANGES.txt
index 601a06a9db..89c49d53da 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,12 @@
-1.0.x (unreleased)
+1.0.1 (2011-08-13)
 ==================
 
-Additions
----------
+Backported Features
+-------------------
 
-- Backport from 1.1.x: A new attribute is available on request objects:
-  ``exc_info``.  Its value will be ``None`` until an exception is caught
-  by the Pyramid router, after which it will be the result of
+- Backport from 1.2dev: A new attribute is available on request objects:
+  ``exc_info``.  Its value will be ``None`` until an exception is caught by
+  the Pyramid router, after which it will be the result of
   ``sys.exc_info()``.
 
 1.0 (2011-01-30)
diff --git a/docs/conf.py b/docs/conf.py
index a987106d43..1eaf79c7f1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,7 +93,7 @@ def nothing(*arg):
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '1.0.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index 323b59741f..e934385931 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@
     install_requires.append('simplejson')
     
 setup(name='pyramid',
-      version='1.0',
+      version='1.0.1',
       description='The Pyramid web application framework, a Pylons project',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[