Drop python 2.7 and 3.4 support

mv0 · Aug 29, 2018 · 9412bd7 · 9412bd7
1 parent 92bd804
commit 9412bd7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 26 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -5,8 +5,6 @@ environment:
     PYTHONWARNINGS: all
 
   matrix:
-    - PYTHON: 27
-      TEST_IGNORE: --ignore py35
     - PYTHON: 37
     - PYTHON: 37-x64
 

diff --git a/.travis.yml b/.travis.yml
@@ -11,16 +11,9 @@ env:
 
 matrix:
   include:
-    - python: 'pypy'
-      env: TOXENV=pypy
-    - python: '2.7'
+    - python: '3.5'
       env:
         - TOXENV=du13
-        - PYTEST_ADDOPTS="--cov ./ --cov-append --cov-config setup.cfg"
-    - python: '3.4'
-      env: TOXENV=py34
-    - python: '3.5'
-      env: TOXENV=py35
     - python: '3.6'
       env:
         - TOXENV=py36

diff --git a/CHANGES b/CHANGES
@@ -7,6 +7,8 @@ Dependencies
 Incompatible changes
 --------------------
 
+* Drop python 2.7 and 3.4 support
+
 Deprecated
 ----------
 

diff --git a/setup.py b/setup.py
@@ -11,8 +11,8 @@
 with open('README.rst') as f:
     long_desc = f.read()
 
-if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 4):
-    print('ERROR: Sphinx requires at least Python 2.7 or 3.4 to run.')
+if sys.version_info < (3, 5):
+    print('ERROR: Sphinx requires at least Python 3.5 to run.')
     sys.exit(1)
 
 install_requires = [
@@ -35,9 +35,6 @@
     ':sys_platform=="win32"': [
         'colorama>=0.3.5',
     ],
-    ':python_version<"3.5"': [
-        'typing'
-    ],
     'websupport': [
         'sqlalchemy>=0.9',
         'whoosh>=2.0',
@@ -49,11 +46,6 @@
         'html5lib',
         'flake8>=3.5.0',
         'flake8-import-order',
-    ],
-    'test:python_version<"3"': [
-        'enum34',
-    ],
-    'test:python_version>="3"': [
         'mypy',
         'typed_ast',
     ],
@@ -195,12 +187,11 @@ def _run_domain_js(self, domain):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         '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 :: Only',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Framework :: Setuptools Plugin',
@@ -235,7 +226,7 @@ def _run_domain_js(self, domain):
             'build_sphinx = sphinx.setup_command:BuildDoc',
         ],
     },
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    python_requires=">=3.5",
     install_requires=install_requires,
     extras_require=extras_require,
     cmdclass=cmdclass,

diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
 minversion = 2.0
-envlist = docs,flake8,mypy,coverage,py{27,34,35,36,37,38,py},du{11,12,13,14}
+envlist = docs,flake8,mypy,coverage,py{35,36,37,38,py},du{11,12,13,14}
 
 [testenv]
 usedevelop = True
 passenv =
     https_proxy http_proxy no_proxy PERL PERL5LIB PYTEST_ADDOPTS EPUBCHECK_PATH
 description =
-    py{27,34,35,36,37,38,py}: Run unit tests against {envname}.
+    py{35,36,37,38,py}: Run unit tests against {envname}.
     du{11,12,13,14}: Run unit tests with the given version of docutils.
 
 # TODO(stephenfin) Replace this with the 'extras' config option when tox 2.4 is
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,8 @@ Dependencies @@
     Incompatible changes
     --------------------
+    * Drop python 2.7 and 3.4 support
     Deprecated
     ----------
@@ Expand Down @@