From ce0787f0d383ce99e439ef3c338cbb5ea964f292 Mon Sep 17 00:00:00 2001 From: Hugo Date: Mon, 2 Oct 2017 18:33:21 +0300 Subject: [PATCH] Drop unsupported Python 3.3 --- .travis.yml | 1 - docs/install.rst | 2 +- pelican/settings.py | 4 ++-- pelican/tests/test_testsuite.py | 3 --- setup.py | 2 +- tox.ini | 3 +-- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7a8732d..889010b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ env: - TOX_ENV=docs - TOX_ENV=flake8 - TOX_ENV=py27 - - TOX_ENV=py33 - TOX_ENV=py34 - TOX_ENV=py35 matrix: diff --git a/docs/install.rst b/docs/install.rst index f05f3941..02470f62 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.3+; earlier versions of +Pelican currently runs best on Python 2.7.x and 3.4+; earlier versions of Python are not supported. You can install Pelican via several different methods. The simplest is via diff --git a/pelican/settings.py b/pelican/settings.py index d1249a24..417de79a 100644 --- a/pelican/settings.py +++ b/pelican/settings.py @@ -14,13 +14,13 @@ import six from pelican.log import LimitFilter try: - # SourceFileLoader is the recommended way in 3.3+ + # SourceFileLoader is the recommended way in Python 3.3+ from importlib.machinery import SourceFileLoader def load_source(name, path): return SourceFileLoader(name, path).load_module() except ImportError: - # but it does not exist in 3.2-, so fall back to imp + # but it does not exist in Python 2.7, so fall back to imp import imp load_source = imp.load_source diff --git a/pelican/tests/test_testsuite.py b/pelican/tests/test_testsuite.py index 5dc92bb1..66c992bd 100644 --- a/pelican/tests/test_testsuite.py +++ b/pelican/tests/test_testsuite.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import print_function, unicode_literals -import sys import warnings from pelican.tests.support import unittest @@ -9,8 +8,6 @@ from pelican.tests.support import unittest class TestSuiteTest(unittest.TestCase): - @unittest.skipIf(sys.version_info[:2] == (3, 3), - "does not throw an exception on python 3.3") def test_error_on_warning(self): with self.assertRaises(UserWarning): warnings.warn('test warning') diff --git a/setup.py b/setup.py index be038971..0f839bdc 100755 --- a/setup.py +++ b/setup.py @@ -61,10 +61,10 @@ setup( 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: Implementation :: CPython', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Software Development :: Libraries :: Python Modules', ], diff --git a/tox.ini b/tox.ini index 95cd5273..b0dd4fd2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,9 @@ [tox] -envlist = py{27,33,34,35,36},docs,flake8 +envlist = py{27,34,35,36},docs,flake8 [testenv] basepython = py27: python2.7 - py33: python3.3 py34: python3.4 py35: python3.5 py36: python3.6