Merge pull request #12506 from charris/prepare-for-1.17-development

MAINT: Prepare master for 1.17.0 development.

1 files changed, 6 insertions, 10 deletions

diff --git a/setup.py b/setup.py
index cc20fa61d..b9bbc08fb 100755
--- a/setup.py
+++ b/setup.py
@@ -27,15 +27,14 @@ import subprocess
 import textwrap
 
 
-if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[:2] < (3, 4):
-    raise RuntimeError("Python version 2.7 or >= 3.4 required.")
+if sys.version_info[:2] < (3, 5):
+    raise RuntimeError("Python version >= 3.5 required.")
 
-if sys.version_info[0] >= 3:
-    import builtins
-else:
-    import __builtin__ as builtins
+import builtins
 
 
+python_requires = '>=3.5'
+
 CLASSIFIERS = """\
 Development Status :: 5 - Production/Stable
 Intended Audience :: Science/Research
@@ -43,10 +42,7 @@ Intended Audience :: Developers
 License :: OSI Approved
 Programming Language :: C
 Programming Language :: Python
-Programming Language :: Python :: 2
-Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3
-Programming Language :: Python :: 3.4
 Programming Language :: Python :: 3.5
 Programming Language :: Python :: 3.6
 Programming Language :: Python :: 3.7
@@ -60,7 +56,7 @@ Operating System :: MacOS
 """
 
 MAJOR               = 1
-MINOR               = 16
+MINOR               = 17
 MICRO               = 0
 ISRELEASED          = False
 VERSION             = '%d.%d.%d' % (MAJOR, MINOR, MICRO)