summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-12-10 00:01:05 -0600
committerMichael Merickel <michael@merickel.org>2016-12-10 00:01:05 -0600
commit1fde5f47b8b6208a25e951c6d3887cc73cc3696e (patch)
tree1975f4d89d0422aaabd09b9bf94ac0da93534f8d /setup.py
parentff0da73a8922b5e82c676715078c7b9e60a6a1da (diff)
parent2d45def603f038a8533eb9790640982012c0be30 (diff)
downloadpyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.gz
pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.bz2
pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.zip
Merge branch 'master' into pserve-watch-files
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/setup.py b/setup.py
index 36615f36b..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,7 +41,7 @@ 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
@@ -53,7 +55,7 @@ tests_require = [
'WebTest >= 1.3.1', # py3 compat
]
-if not PY3:
+if PY2:
tests_require.append('zope.component>=3.11.0')
docs_extras = [
@@ -83,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",