diff options
| author | Chris McDonough <chrism@plope.com> | 2017-02-17 20:38:40 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2017-02-17 20:38:40 -0500 |
| commit | b2e8884a94d9e869bf29ea55298ad308f16ed420 (patch) | |
| tree | e46bf79d1a8811ad273a40ce194d05836fcc7409 /setup.py | |
| parent | 7bb06f28ee296ecf43ba63279fc4c2439b4571d3 (diff) | |
| parent | 40d71e805bfcf8522c6af71995c05c496f1c4b4f (diff) | |
| download | pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.gz pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.bz2 pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 27 |
1 files changed, 14 insertions, 13 deletions
@@ -14,19 +14,19 @@ import os import sys +import warnings from setuptools import setup, find_packages py_version = sys.version_info[:2] -PY3 = py_version[0] == 3 - -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,21 +39,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 + 'zope.component >= 4.0', # py3 compat ] -if not PY3: - tests_require.append('zope.component>=3.11.0') docs_extras = [ 'Sphinx >= 1.3.5', @@ -61,7 +61,7 @@ docs_extras = [ 'repoze.sphinx.autointerface', 'pylons_sphinx_latesturl', 'pylons-sphinx-themes', - 'sphinxcontrib-programoutput', + 'sphinxcontrib-autoprogram', ] testing_extras = tests_require + [ @@ -71,7 +71,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.8.dev0', + version='1.9.dev0', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ @@ -82,6 +82,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", |