Merge branch 'token-reissue' of https://github.com/wichert/pyramid into wichert-token-reissue

1 files changed, 31 insertions, 24 deletions

diff --git a/setup.py b/setup.py
index 82f447103..aa8045a9a 100644
--- a/setup.py
+++ b/setup.py
@@ -13,11 +13,15 @@
 ##############################################################################
 
 import os
-import platform
 import sys
 
 from setuptools import setup, find_packages
 
+if sys.version_info[:2] < (2, 6):
+    raise RuntimeError('Requires Python 2.6 or better')
+
+PY3 = sys.version_info[0] == 3
+
 here = os.path.abspath(os.path.dirname(__file__))
 try:
     README = open(os.path.join(here, 'README.rst')).read()
@@ -26,38 +30,37 @@ except IOError:
     README = CHANGES = ''
 
 install_requires=[
+    'setuptools',
     'Chameleon >= 1.2.3',
     'Mako >= 0.3.6', # strict_undefined
-    'Paste > 1.7', # temp version pin to prevent PyPi install failure :-(
-    'PasteDeploy',
-    'PasteScript >= 1.7.4', # "here" in logging fileConfig
-    'WebOb >= 1.0.2', # no "default_charset"; request.script_name doesnt error
-    'repoze.lru',
-    'setuptools',
-    'zope.component >= 3.6.0', # independent of zope.hookable
-    'zope.interface >= 3.5.1',   # 3.5.0 comment: "allow to bootstrap on jython"
-    'zope.deprecation',
+    'WebOb >= 1.2dev', # response.text / py3 compat
+    'repoze.lru >= 0.4', # py3 compat
+    'zope.interface >= 3.8.0',  # has zope.interface.registry
+    'zope.deprecation >= 3.5.0', # py3 compat
     'venusian >= 1.0a1', # ``onerror``
-    'translationstring',
+    'translationstring >= 0.4', # py3 compat
     ]
 
-if platform.system() == 'Java':
-    tests_require = install_requires + [
-        'WebTest',
-        'virtualenv',
-        ]
-else:
-    tests_require= install_requires + [
+if not PY3:
+    install_requires.extend([
+        'Paste > 1.7', # temp version pin to prevent PyPi install failure :-(
+        'PasteDeploy',
+        'PasteScript >= 1.7.4', # "here" in logging fileConfig
+        ])
+
+tests_require = install_requires + [
+    'WebTest >= 1.3.1', # py3 compat
+    'virtualenv',
+    ]
+
+if not PY3:
+    tests_require.extend([
         'Sphinx',
         'docutils',
         'repoze.sphinx.autointerface',
-        'WebTest', 
-        'virtualenv',
-        ]
+        'zope.component>=3.11.0',
+        ])
 
-if sys.version_info[:2] < (2, 6):
-    install_requires.append('simplejson')
-    
 setup(name='pyramid',
       version='1.2',
       description=('The Pyramid web application development framework, a '
@@ -66,6 +69,10 @@ setup(name='pyramid',
       classifiers=[
         "Intended Audience :: Developers",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.2",
         "Framework :: Pylons",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI",