diff options
| author | Michael Merickel <michael@merickel.org> | 2016-09-28 20:38:15 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-09-28 20:38:15 -0500 |
| commit | 8ce5736478f035cc14cfd247e7d936dc4db1f7b5 (patch) | |
| tree | 48d48dc3433e915df60d2549cebab64762fdd4fd /setup.py | |
| parent | e8c66a339e9f7d83bd2408952de53ef30dba0794 (diff) | |
| parent | 7391d365ce68677c588cf60c1431d29a786c6e82 (diff) | |
| download | pyramid-8ce5736478f035cc14cfd247e7d936dc4db1f7b5.tar.gz pyramid-8ce5736478f035cc14cfd247e7d936dc4db1f7b5.tar.bz2 pyramid-8ce5736478f035cc14cfd247e7d936dc4db1f7b5.zip | |
Merge branch 'master' into exception_only
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -18,16 +18,15 @@ 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, 3) and not is_pypy: # PyPy3 masquerades as Python 3.2... - raise RuntimeError('On Python 3, Pyramid requires Python 3.3 or better') + if py_version < (3, 4): + raise RuntimeError('On Python 3, Pyramid requires Python 3.4 or better') else: - if py_version < (2, 6): - raise RuntimeError('On Python 2, Pyramid requires Python 2.6 or better') + if 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: @@ -81,7 +80,6 @@ setup(name='pyramid', "Programming Language :: Python", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: Implementation :: CPython", |