From e218b2a4b749d5e7105ffd28f2c02f09b151059b Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Mon, 2 Nov 2009 14:35:28 +0000
Subject: - Prevent PyPI installation failure due to ``easy_install`` trying
 way   too hard to guess the best version of Paste.  When ``easy_install``  
 pulls from PyPI it reads links off various pages to determine "more   up to
 date" versions. It incorrectly picks up a link for an ancient   version of a
 package named "Paste-Deploy-0.1" (note the dash) when   trying to find the
 "Paste" distribution and somehow believes it's   the latest version of
 "Paste".  It also somehow "helpfully" decides   to check out a version of
 this package from SVN.  We pin the Paste   dependency version to a version
 greater than 1.7 to work around   this ``easy_install`` bug.

- Prep for 1.1b2.
---
 CHANGES.txt  | 18 ++++++++++++++++--
 docs/conf.py |  2 +-
 setup.py     |  4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b1d84c4d1..e8e13496e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,19 @@
-Next release
-============
+1.1b2 (2009-11-02)
+==================
+
+Bug Fixes
+---------
+
+- Prevent PyPI installation failure due to ``easy_install`` trying way
+  too hard to guess the best version of Paste.  When ``easy_install``
+  pulls from PyPI it reads links off various pages to determine "more
+  up to date" versions. It incorrectly picks up a link for an ancient
+  version of a package named "Paste-Deploy-0.1" (note the dash) when
+  trying to find the "Paste" distribution and somehow believes it's
+  the latest version of "Paste".  It also somehow "helpfully" decides
+  to check out a version of this package from SVN.  We pin the Paste
+  dependency version to a version greater than 1.7 to work around
+  this ``easy_install`` bug.
 
 Documentation
 -------------
diff --git a/docs/conf.py b/docs/conf.py
index 59e7dad86..6a9d15364 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@ copyright = '2008-2009, Agendaless Consulting'
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.1b1'
+version = '1.1b2'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index 7c78677b3..70958c683 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-__version__ = '1.1b1'
+__version__ = '1.1b2'
 
 import os
 import sys
@@ -30,7 +30,7 @@ install_requires=[
     'setuptools',
     'Chameleon',
     'sourcecodegen>=0.6.11', # tests fail without this requirement?  (wtf)
-    'Paste',
+    'Paste > 1.7', # temp version pin to prevent PyPi install failure :-(
     'PasteDeploy',
     'PasteScript',
     'WebOb',
-- 
cgit v1.2.3