Drop support for EOL Python 2.7 and 3.5

hugovk · hugovk · commit 637e90b430f2 · 2021-05-20T13:17:41.000+03:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -3,10 +3,6 @@ environment:
   global:
     PATH: "C:\\Python27\\Scripts\\;%PATH%"
   matrix:
-    - TOXENV: py27-base
-    - TOXENV: py27-optional
-    - TOXENV: py35-base
-    - TOXENV: py35-optional
     - TOXENV: py36-base
     - TOXENV: py36-optional
     - TOXENV: py37-base
diff --git a/.github/workflows/python-tox.yml b/.github/workflows/python-tox.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [2.7, 3.5, 3.6, 3.7, 3.8, pypy-2.7, pypy3]
+        python: [3.6, 3.7, 3.8, pypy3]
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,10 @@
 language: python
 python:
   - "pypy3"
-  - "pypy"
+  - "3.9"
   - "3.8"
   - "3.7"
   - "3.6"
-  - "3.5"
-  - "2.7"
-  - "3.9-dev"
 
 cache: pip
 
diff --git a/README.rst b/README.rst
@@ -91,7 +91,7 @@ More documentation is available at https://html5lib.readthedocs.io/.
 Installation
 ------------
 
-html5lib works on CPython 2.7+, CPython 3.5+ and PyPy. To install:
+html5lib works on CPython 3.6+ and PyPy3. To install:
 
 .. code-block:: bash
 
diff --git a/html5lib/_trie/_base.py b/html5lib/_trie/_base.py
@@ -1,9 +1,6 @@
 from __future__ import absolute_import, division, unicode_literals
 
-try:
-    from collections.abc import Mapping
-except ImportError:  # Python 2.7
-    from collections import Mapping
+from collections.abc import Mapping
 
 
 class Trie(Mapping):
diff --git a/html5lib/_utils.py b/html5lib/_utils.py
@@ -2,10 +2,7 @@
 
 from types import ModuleType
 
-try:
-    from collections.abc import Mapping
-except ImportError:
-    from collections import Mapping
+from collections.abc import Mapping
 
 from six import text_type, PY3
 
diff --git a/html5lib/tests/support.py b/html5lib/tests/support.py
@@ -150,8 +150,6 @@ def convertData(data):
 def errorMessage(input, expected, actual):
     msg = ("Input:\n%s\nExpected:\n%s\nReceived\n%s\n" %
            (repr(input), repr(expected), repr(actual)))
-    if sys.version_info[0] == 2:
-        msg = msg.encode("ascii", "backslashreplace")
     return msg
 
 
diff --git a/html5lib/treebuilders/dom.py b/html5lib/treebuilders/dom.py
@@ -1,10 +1,7 @@
 from __future__ import absolute_import, division, unicode_literals
 
 
-try:
-    from collections.abc import MutableMapping
-except ImportError:  # Python 2.7
-    from collections import MutableMapping
+from collections.abc import MutableMapping
 from xml.dom import minidom, Node
 import weakref
 
diff --git a/html5lib/treebuilders/etree_lxml.py b/html5lib/treebuilders/etree_lxml.py
@@ -14,12 +14,8 @@
 
 import warnings
 import re
-import sys
 
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    from collections import MutableMapping
+from collections.abc import MutableMapping
 
 from . import base
 from ..constants import DataLossWarning
@@ -89,7 +85,7 @@ def serializeElement(element, indent=0):
                     next_element = next_element.getnext()
             elif isinstance(element, str) or isinstance(element, bytes):
                 # Text in a fragment
-                assert isinstance(element, str) or sys.version_info[0] == 2
+                assert isinstance(element, str)
                 rv.append("|%s\"%s\"" % (' ' * indent, element))
             else:
                 # Fragment case
diff --git a/parse.py b/parse.py
@@ -36,8 +36,7 @@ def parse():
                 pass
         elif f == '-':
             f = sys.stdin
-            if sys.version_info[0] >= 3:
-                encoding = None
+            encoding = None
         else:
             try:
                 # Try opening from file system
@@ -135,11 +134,7 @@ def printOutput(parser, document, opts):
                 kwargs["sanitize"] = True
 
             tokens = treewalkers.getTreeWalker(opts.treebuilder)(document)
-            if sys.version_info[0] >= 3:
-                encoding = None
-            else:
-                encoding = "utf-8"
-            for text in serializer.HTMLSerializer(**kwargs).serialize(tokens, encoding=encoding):
+            for text in serializer.HTMLSerializer(**kwargs).serialize(tokens, encoding=None):
                 sys.stdout.write(text)
             if not text.endswith('\n'):
                 sys.stdout.write('\n')
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -2,9 +2,7 @@
 
 tox>=3.15.1,<4
 flake8>=3.8.1,<3.9
-pytest>=4.6.10,<5 ; python_version < '3'
-pytest>=5.4.2,<7 ; python_version >= '3'
+pytest>=5.4.2,<7
 coverage>=5.1,<6
 pytest-expect>=1.1.0,<2
-mock>=3.0.5,<4 ; python_version < '3.6'
-mock>=4.0.2,<5 ; python_version >= '3.6'
+mock>=4.0.2,<5
diff --git a/setup.py b/setup.py
@@ -2,7 +2,6 @@
 
 import ast
 import codecs
-import sys
 
 from os.path import join, dirname
 from setuptools import setup, find_packages, __version__ as setuptools_version
@@ -18,8 +17,7 @@
 
 # _markerlib.default_environment() obtains its data from _VARS
 # and wraps it in another dict, but _markerlib_evaluate writes
-# to the dict while it is iterating the keys, causing an error
-# on Python 3 only.
+# to the dict while it is iterating the keys, causing an error.
 # Replace _markerlib.default_environment to return a custom dict
 # that has all the necessary markers, and ignores any writes.
 
@@ -32,7 +30,7 @@ def pop(self, i=-1):
         return self[i]
 
 
-if _markerlib and sys.version_info[0] == 3:
+if _markerlib:
     env = _markerlib.markers._VARS
     for key in list(env.keys()):
         new_key = key.replace('.', '_')
@@ -63,13 +61,11 @@ def default_environment():
     'License :: OSI Approved :: MIT 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.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3 :: Only',
     'Programming Language :: Python :: Implementation :: CPython',
     'Programming Language :: Python :: Implementation :: PyPy',
     'Topic :: Software Development :: Libraries :: Python Modules',
@@ -107,7 +103,7 @@ def default_environment():
           'six>=1.9',
           'webencodings',
       ],
-      python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
+      python_requires=">=3.6",
       extras_require={
           # A conditional extra will only install these items when the extra is
           # requested and the condition matches.
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,35,36,37,38,py,py3}-{base,six19,optional}
+envlist = py{36,37,38,py3}-{base,six19,optional}
 
 [testenv]
 deps =
