summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorcguardia <carlos.delaguardia@gmail.com>2011-04-25 00:37:33 -0500
committercguardia <carlos.delaguardia@gmail.com>2011-04-25 00:37:33 -0500
commitb61680ad87abcb524ae3fe846cd591c6ec1d54ef (patch)
treee2fcd960d9119efde4a1b7eecec3880f98397d2f /setup.py
parent1b395e6d43b9450ea652d9addb675936b507ea52 (diff)
parentbb825910b3b68b4b167572fd5252cc99be88e17e (diff)
downloadpyramid-b61680ad87abcb524ae3fe846cd591c6ec1d54ef.tar.gz
pyramid-b61680ad87abcb524ae3fe846cd591c6ec1d54ef.tar.bz2
pyramid-b61680ad87abcb524ae3fe846cd591c6ec1d54ef.zip
Merge branch 'master' of https://github.com/Pylons/pyramid
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 4ab4cca82..f965353ed 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@ install_requires=[
'Paste > 1.7', # temp version pin to prevent PyPi install failure :-(
'PasteDeploy',
'PasteScript',
- 'WebOb >= 1.0', # no "default_charset"
+ 'WebOb >= 1.0.2', # no "default_charset"; request.script_name doesnt error
'repoze.lru',
'setuptools',
'zope.component >= 3.6.0', # independent of zope.hookable
@@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6):
install_requires.append('simplejson')
setup(name='pyramid',
- version='1.0',
+ version='1.1a0',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,