summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-02-07 16:34:46 -0500
committerChris McDonough <chrism@plope.com>2016-02-07 16:34:46 -0500
commitdf7a123a847e2243f38688c033f06200382ba139 (patch)
treecc8e032c2a85d9fee45e68f7f3501046c8bec8ed /setup.py
parent5cd91621668807f9b66811fe57a04fba96e7458a (diff)
parented04017d5a8e82db2e46412f841c55d83ef062b0 (diff)
downloadpyramid-df7a123a847e2243f38688c033f06200382ba139.tar.gz
pyramid-df7a123a847e2243f38688c033f06200382ba139.tar.bz2
pyramid-df7a123a847e2243f38688c033f06200382ba139.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/setup.py b/setup.py
index c81956e7f..e878b9932 100644
--- a/setup.py
+++ b/setup.py
@@ -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,11 +57,12 @@ 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',
'pylons-sphinx-themes',
+ 'sphinxcontrib-programoutput',
]
testing_extras = tests_require + [
@@ -80,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",