Remove support for py27 and py35

.github/workflows/tox.yml

@@ -23,7 +23,6 @@ jobs:
       matrix:
         name: [
           "docs",
-          "py27",
           "py36",
           "py37",
           "py38",
@@ -40,10 +39,6 @@ jobs:
             python: "3.6"
             os: ubuntu-latest
             tox_env: docs
-          - name: py27
-            python: "2.7"
-            os: ubuntu-latest
-            tox_env: py27
           - name: py36
             python: "3.6"
             os: ubuntu-latest

doc8/checks.py

@@ -17,13 +17,11 @@
 import re
 
 from docutils import nodes as docutils_nodes
-import six
 
 from doc8 import utils
 
 
-@six.add_metaclass(abc.ABCMeta)
-class ContentCheck(object):
+class ContentCheck(metaclass=abc.ABCMeta):
     def __init__(self, cfg):
         self._cfg = cfg
 
@@ -32,8 +30,7 @@ def report_iter(self, parsed_file):
         pass
 
 
-@six.add_metaclass(abc.ABCMeta)
-class LineCheck(object):
+class LineCheck(metaclass=abc.ABCMeta):
     def __init__(self, cfg):
         self._cfg = cfg
 

doc8/main.py

@@ -30,12 +30,12 @@
 
 import argparse
 import collections
+import configparser
 import logging
 import os
 import sys
 
-import six
-from six.moves import configparser
+
 from stevedore import extension
 
 from doc8 import checks
@@ -320,7 +320,7 @@ def report(self):
 
         if self.error_counts:
             lines.append("Detailed error counts:")
-            for check_name in sorted(six.iterkeys(self.error_counts)):
+            for check_name in sorted(self.error_counts.keys()):
                 check_errors = self.error_counts[check_name]
                 lines.append("    - %s = %s" % (check_name, check_errors))
 
@@ -347,7 +347,7 @@ def doc8(args=None, **kwargs):
 
     cfg.setdefault("ignore_path_errors", {})
     tmp_ignores = parse_ignore_path_errors(args.pop("ignore_path_errors", []))
-    for path, ignores in six.iteritems(tmp_ignores):
+    for path, ignores in tmp_ignores.items():
         if path in cfg["ignore_path_errors"]:
             cfg["ignore_path_errors"][path].update(ignores)
         else:

doc8/parser.py

@@ -21,7 +21,6 @@
 from docutils import parsers as docutils_parser
 from docutils import utils
 import restructuredtext_lint as rl
-import six
 
 
 class ParsedFile(object):
@@ -90,7 +89,7 @@ def _read(self):
     def lines_iter(self, remove_trailing_newline=True):
         self._read()
         for line in self._lines:
-            line = six.text_type(line, encoding=self.encoding)
+            line = str(line, encoding=self.encoding)
             if remove_trailing_newline and line.endswith("\n"):
                 line = line[0:-1]
             yield line
@@ -125,7 +124,7 @@ def raw_contents(self):
     @property
     def contents(self):
         if self._content is None:
-            self._content = six.text_type(self.raw_contents, encoding=self.encoding)
+            self._content = str(self.raw_contents, encoding=self.encoding)
         return self._content
 
     def __str__(self):

doc8/tests/test_main.py

@@ -2,7 +2,7 @@
 
 from mock import patch, MagicMock
 import os
-import six
+from io import StringIO
 import shutil
 import sys
 import testtools
@@ -87,8 +87,8 @@ class Capture(object):
     def __enter__(self):
         self.old_out = sys.stdout
         self.old_err = sys.stderr
-        self.out = six.StringIO()
-        self.err = six.StringIO()
+        self.out = StringIO()
+        self.err = StringIO()
 
         sys.stdout = self.out
         sys.stderr = self.err

requirements.txt

@@ -5,6 +5,5 @@
 chardet
 docutils
 restructuredtext-lint>=0.7
-six
 stevedore
 Pygments

setup.cfg

@@ -18,10 +18,7 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
@@ -30,9 +27,6 @@ classifier =
 console_scripts =
     doc8 = doc8.main:main
 
-[wheel]
-universal = 1
-
 [flake8]
 builtins = _
 show-source = True
@@ -41,3 +35,6 @@ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 max-line-length=160
 # See https://github.com/PyCQA/pycodestyle/issues/373
 extend-ignore = E203
+
+[options]
+python_requires = >=3.6

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.8
-envlist = lint,py{27,35,36,37,38},docs,packaging
+envlist = lint,py{36,37,38},docs,packaging
 
 [testenv]
 deps =