Skip to content

Commit

Permalink
Drop unsupported Python 3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk committed Oct 2, 2017
1 parent f8da707 commit ce0787f
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 10 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ env:
- TOX_ENV=docs
- TOX_ENV=flake8
- TOX_ENV=py27
- TOX_ENV=py33
- TOX_ENV=py34
- TOX_ENV=py35
matrix:
Expand Down
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions pelican/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
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

Expand Down
3 changes: 0 additions & 3 deletions pelican/tests/test_testsuite.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
# -*- coding: utf-8 -*-
from __future__ import print_function, unicode_literals

import sys
import warnings

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')
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
'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',
],
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit ce0787f

Please sign in to comment.