Merge branch 'master' into pcreate-to-cookiecutter

1 files changed, 13 insertions, 9 deletions

diff --git a/setup.py b/setup.py
index f738ee623..383991d73 100644
--- a/setup.py
+++ b/setup.py
@@ -14,19 +14,21 @@
 
 import os
 import sys
+import warnings
 
 from setuptools import setup, find_packages
 
 py_version = sys.version_info[:2]
 
-PY3 = py_version[0] == 3
+PY2 = py_version[0] == 2
 
-if PY3:
-    if py_version < (3, 4):
-        raise RuntimeError('On Python 3, Pyramid requires Python 3.4 or better')
-else:
-    if py_version < (2, 7):
-        raise RuntimeError('On Python 2, Pyramid requires Python 2.7 or better')
+if (3, 0) <= py_version < (3, 4):
+    warnings.warn(
+        'On Python 3, Pyramid only supports Python 3.4 or better',
+        UserWarning,
+    )
+elif py_version < (2, 7):
+    raise RuntimeError('On Python 2, Pyramid requires Python 2.7 or better')
 
 here = os.path.abspath(os.path.dirname(__file__))
 try:
@@ -39,20 +41,21 @@ except IOError:
 
 install_requires = [
     'setuptools',
-    'WebOb >= 1.3.1', # request.domain and CookieProfile
+    'WebOb >= 1.7.0rc2', # Response.has_body
     'repoze.lru >= 0.4', # py3 compat
     'zope.interface >= 3.8.0',  # has zope.interface.registry
     'zope.deprecation >= 3.5.0', # py3 compat
     'venusian >= 1.0a3', # ``ignore``
     'translationstring >= 0.4', # py3 compat
     'PasteDeploy >= 1.5.0', # py3 compat
+    'hupper',
     ]
 
 tests_require = [
     'WebTest >= 1.3.1', # py3 compat
     ]
 
-if not PY3:
+if PY2:
     tests_require.append('zope.component>=3.11.0')
 
 docs_extras = [
@@ -82,6 +85,7 @@ setup(name='pyramid',
           "Programming Language :: Python :: 3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
+          "Programming Language :: Python :: 3.6",
           "Programming Language :: Python :: Implementation :: CPython",
           "Programming Language :: Python :: Implementation :: PyPy",
           "Framework :: Pyramid",