From 54f8fb7a7fc0f13ad661773c3a384f58cc2d064c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
Date: Thu, 16 Apr 2020 04:21:42 +0200
Subject: [PATCH] Drop python2 support. (#613)

---
 .travis.yml | 2 --
 Makefile    | 2 +-
 setup.py    | 8 ++------
 tox.ini     | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f02ece2..c43d4c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 language: python
 matrix:
   include:
-    - python: 2.7
-      env: TOX_ENV=py27
     - python: 3.5
       env: TOX_ENV=py35
     - python: 3.6
diff --git a/Makefile b/Makefile
index d4c15dc..7c9a866 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ coverage: $(ISSO_PY_SRC)
 	nosetests --with-doctest --with-coverage --cover-package=isso --cover-html isso/
 
 test: $($ISSO_PY_SRC)
-	python setup.py nosetests
+	python3 setup.py nosetests
 
 clean:
 	rm -f $(DOCS_MAN_DST) $(DOCS_CSS_DST) $(ISSO_JS_DST)
diff --git a/setup.py b/setup.py
index d660780..eb8fdb5 100644
--- a/setup.py
+++ b/setup.py
@@ -8,8 +8,8 @@ from setuptools import setup, find_packages
 requires = ['itsdangerous', 'Jinja2', 'misaka>=2.0,<3.0', 'html5lib',
             'werkzeug>=1.0', 'bleach', 'flask-caching']
 
-if sys.version_info < (2, 7):
-    raise SystemExit("Python 2 versions < 2.7 are not supported.")
+if sys.version_info < (3, ):
+    raise SystemExit("Python 2 is not supported.")
 elif (3, 0) <= sys.version_info < (3, 4):
     raise SystemExit("Python 3 versions < 3.4 are not supported.")
 
@@ -30,16 +30,12 @@ setup(
         "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6"
         "Programming Language :: Python :: 3.7"
         "Programming Language :: Python :: 3.8"
     ],
     install_requires=requires,
-    extras_require={
-        ':python_version=="2.7"': ['ipaddr>=2.1', 'configparser']
-    },
     setup_requires=["cffi>=1.3.0"],
     entry_points={
         'console_scripts':
diff --git a/tox.ini b/tox.ini
index eb58a4d..0480168 100755
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,py36,py37,py38
+envlist = py35,py36,py37,py38
 
 [testenv]
 deps =