Drop deprecated python support (2.6, 2.7 and 3.4)

Author: tk0miya

.travis.yml

@@ -1,24 +1,18 @@
 language: python
 sudo: false
-dist: trusty
+dist: xenial
 cache: pip
 
 matrix:
   include:
-    - python: 2.6
-      env: TOXENV=py26
-    - python: 2.7
-      env: TOXENV=py27
-    - python: 3.4
-      env: TOXENV=py34
     - python: 3.5
       env: TOXENV=py35
     - python: 3.6
       env: TOXENV=py36
-    - python: 2.7
-      env: TOXENV=sphinx06
-    - python: 2.7
-      env: TOXENV=sphinx10
+    - python: 3.7
+      env: TOXENV=py37
+    - python: 3.8
+      env: TOXENV=py38
     - python: 3.6
       env: TOXENV=sphinx11
     - python: 3.6
@@ -38,5 +32,5 @@ matrix:
     - python: 3.6
       env: TOXENV=sphinx-dev
 
-install: pip install docutils==0.12 tox
+install: pip install docutils tox
 script: tox

setup.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import sys
-
 from setuptools import setup, find_packages
 
 
@@ -14,11 +12,10 @@
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 2.6",
-    "Programming Language :: Python :: 2.7",
-    "Programming Language :: Python :: 3.4",
     "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
     "Topic :: Documentation",
     "Topic :: Documentation :: Sphinx",
     "Topic :: Software Development",
@@ -28,12 +25,6 @@
     "Topic :: Utilities",
 ]
 
-test_require = []
-if sys.version_info < (2, 7):
-    test_require.append('unittest2')
-if sys.version_info < (3, 3):
-    test_require.append('mock')
-
 with open('README.rst') as readme:
     long_description = readme.read()
 long_description += '\n\n'
@@ -56,8 +47,6 @@
     include_package_data=True,
     install_requires=[
         'Sphinx',
-        'six',
     ],
-    tests_require=test_require,
-    python_requires='>=2.6,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
+    python_requires='>=3.5',
 )

src/sphinx_testing/path.py

@@ -12,22 +12,14 @@
 import shutil
 from codecs import open
 
-from six import PY2, text_type
-
 
 FILESYSTEMENCODING = sys.getfilesystemencoding() or sys.getdefaultencoding()
 
 
-class path(text_type):
+class path(str):
     """
     Represents a path which behaves like a string.
     """
-    if PY2:
-        def __new__(cls, s, encoding=FILESYSTEMENCODING, errors='strict'):
-            if isinstance(s, str):
-                s = s.decode(encoding, errors)
-                return text_type.__new__(cls, s)
-            return text_type.__new__(cls, s)
 
     @property
     def parent(self):
@@ -217,4 +209,4 @@ def joinpath(self, *args):
     __div__ = __truediv__ = joinpath
 
     def __repr__(self):
-        return '%s(%s)' % (self.__class__.__name__, text_type.__repr__(self))
+        return '%s(%s)' % (self.__class__.__name__, str.__repr__(self))

src/sphinx_testing/util.py

@@ -9,7 +9,7 @@
 
 import os.path
 import shutil
-from six import StringIO
+from io import StringIO
 from functools import wraps
 from textwrap import dedent
 

tests/test_path.py

@@ -1,20 +1,12 @@
 # -*- coding: utf-8 -*-
 
 import os
-import sys
 import shutil
+import unittest
 from tempfile import mkdtemp
 from sphinx_testing import with_tmpdir
 from sphinx_testing.path import path
 
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
-
-if sys.version_info < (3,):
-    unittest.TestCase.assertCountEqual = unittest.TestCase.assertItemsEqual
-
 
 class TestPath(unittest.TestCase):
     def test_instantiate(self):

tests/test_tmpdir.py

@@ -1,15 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import sys
 import shutil
+import unittest
 from sphinx_testing.path import path
 from sphinx_testing.tmpdir import mkdtemp, with_tmpdir
 
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
-
 
 class TestTmpdir(unittest.TestCase):
     def test_mkdtemp(self):

tests/test_util.py

@@ -1,26 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import os
-import sys
 import sphinx
-from six import StringIO
+import unittest
+from io import StringIO
+from unittest.mock import patch
 from sphinx_testing.path import path
 from sphinx_testing.tmpdir import mkdtemp
 from sphinx_testing.util import TestApp, with_app
 
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
-
-if sys.version_info < (3,):
-    unittest.TestCase.assertCountEqual = unittest.TestCase.assertItemsEqual
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
-
 
 class TestSphinxTesting(unittest.TestCase):
     def test_TestApp(self):

tox.ini

@@ -1,36 +1,16 @@
 [tox]
-envlist=py26,py27,py34,sphinx06,sphinx10,sphinx11,sphinx12,sphinx13,sphinx14,sphinx15,sphinx16,sphinx17,sphinx18,sphinx-dev
+envlist=sphinx11,sphinx12,sphinx13,sphinx14,sphinx15,sphinx16,sphinx17,sphinx18,sphinx-dev
 
 [testenv]
 deps=
     nose
-    mock
     flake8
 passenv=
     TRAVIS*
 commands=
     nosetests
     flake8 setup.py src/ tests/
 
-[testenv:py26]
-deps=
-    {[testenv]deps}
-    unittest2
-    Sphinx <= 1.4.9999
-commands=
-    nosetests
-
-[testenv:sphinx06]
-deps=
-    {[testenv]deps}
-    Sphinx <= 0.6.9999
-
-[testenv:sphinx10]
-deps=
-    {[testenv]deps}
-    Sphinx <= 1.0.9999
-    docutils < 0.16
-
 [testenv:sphinx11]
 deps=
     {[testenv]deps}