From 63a72fc6198e04c61aae36ea0456f54360d1076c Mon Sep 17 00:00:00 2001 From: John Franey Date: Wed, 6 Feb 2019 10:23:27 -0400 Subject: [PATCH] Remove Python 3.4 references This PR removes the Python 3.4 tox task and updates references in the code to Python 3.5+. tox complains about Python 3.4, which is EOL after next month: > py34 installed: DEPRECATION: Python 3.4 support has been deprecated. pip 19.1 will be the last one supporting it. Please upgrade your Python as Python 3.4 won't be maintained after March 2019 (cf PEP 429). --- .travis.yml | 1 - docs/install.rst | 2 +- pelican/readers.py | 2 +- pelican/tools/pelican_import.py | 2 +- setup.py | 1 - tox.ini | 3 +-- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23f267c1..31b3ac8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ env: - TOX_ENV=docs - TOX_ENV=flake8 - TOX_ENV=py27 - - TOX_ENV=py34 - TOX_ENV=py35 matrix: include: diff --git a/docs/install.rst b/docs/install.rst index 17f275af..571de95e 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -1,7 +1,7 @@ Installing Pelican ################## -Pelican currently runs best on Python 2.7.x and 3.4+; earlier versions of +Pelican currently runs best on Python 2.7.x and 3.5+; earlier versions of Python are not supported. You can install Pelican via several different methods. The simplest is via diff --git a/pelican/readers.py b/pelican/readers.py index bacb45f8..94c4481e 100644 --- a/pelican/readers.py +++ b/pelican/readers.py @@ -367,7 +367,7 @@ class HTMLReader(BaseReader): class _HTMLParser(HTMLParser): def __init__(self, settings, filename): try: - # Python 3.4+ + # Python 3.5+ HTMLParser.__init__(self, convert_charrefs=False) except TypeError: HTMLParser.__init__(self) diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py index e5686811..40a811a0 100755 --- a/pelican/tools/pelican_import.py +++ b/pelican/tools/pelican_import.py @@ -22,7 +22,7 @@ from pelican.settings import read_settings from pelican.utils import SafeDatetime, slugify try: - from html import unescape # py3.4+ + from html import unescape # py3.5+ except ImportError: from six.moves.html_parser import HTMLParser unescape = HTMLParser().unescape diff --git a/setup.py b/setup.py index 74d2d043..d1dc4c4d 100755 --- a/setup.py +++ b/setup.py @@ -62,7 +62,6 @@ setup( 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', diff --git a/tox.ini b/tox.ini index 4d941aac..fc95ff91 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,9 @@ [tox] -envlist = py{27,34,35,36,37},docs,flake8 +envlist = py{27,35,36,37},docs,flake8 [testenv] basepython = py27: python2.7 - py34: python3.4 py35: python3.5 py36: python3.6 py37: python3.7