diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-02-21 16:10:24 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-02-21 16:10:24 -0700 |
| commit | 1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad (patch) | |
| tree | 0db5dd6f25a9166c118c4a24d66f281f43b0aeba /setup.py | |
| parent | 30ae71b4a7ad97a649165374a75a70f4b64ae25c (diff) | |
| parent | aa6e5fe4f1190e6df123e3f6ccde9deb789eb344 (diff) | |
| download | pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.gz pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.bz2 pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.zip | |
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -18,12 +18,13 @@ import sys from setuptools import setup, find_packages py_version = sys.version_info[:2] +is_pypy = '__pypy__' in sys.builtin_module_names PY3 = py_version[0] == 3 if PY3: - if py_version < (3, 2): - raise RuntimeError('On Python 3, Pyramid requires Python 3.2 or better') + if py_version < (3, 3) and not is_pypy: # PyPy3 masquerades as Python 3.2... + raise RuntimeError('On Python 3, Pyramid requires Python 3.3 or better') else: if py_version < (2, 6): raise RuntimeError('On Python 2, Pyramid requires Python 2.6 or better') @@ -56,7 +57,7 @@ if not PY3: tests_require.append('zope.component>=3.11.0') docs_extras = [ - 'Sphinx >= 1.3.1', + 'Sphinx >= 1.3.5', 'docutils', 'repoze.sphinx.autointerface', 'pylons_sphinx_latesturl', @@ -81,7 +82,6 @@ setup(name='pyramid', "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", |