diff --git a/.travis.yml b/.travis.yml index 4f7194cf..f4b3b60a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ matrix: - python: "3.6-dev" - python: "3.6" - python: "3.5" - - python: "3.4" - python: "2.7" - os: osx language: generic diff --git a/appveyor.yml b/appveyor.yml index a688243e..0de834f2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,6 @@ build: false environment: matrix: - PYTHON: "C:/Python27" - - PYTHON: "C:/Python34" - PYTHON: "C:/Python35" - PYTHON: "C:/Python36" - PYTHON: "C:/Python37" diff --git a/setup.py b/setup.py index 7beb16f7..904f31a4 100755 --- a/setup.py +++ b/setup.py @@ -26,8 +26,8 @@ if version < (2, 7): print('thefuck requires Python version 2.7 or later' + ' ({}.{} detected).'.format(*version)) sys.exit(-1) -elif (3, 0) < version < (3, 4): - print('thefuck requires Python version 3.4 or later' + +elif (3, 0) < version < (3, 5): + print('thefuck requires Python version 3.5 or later' + ' ({}.{} detected).'.format(*version)) sys.exit(-1) diff --git a/tests/test_utils.py b/tests/test_utils.py index 3e73c3d7..5c3542a7 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -225,9 +225,12 @@ class TestGetValidHistoryWithoutCurrent(object): @pytest.fixture(autouse=True) def history(self, mocker): - return mocker.patch('thefuck.shells.shell.get_history', - return_value=['le cat', 'fuck', 'ls cat', - 'diff x', 'nocommand x', u'café ô']) + mock = mocker.patch('thefuck.shells.shell.get_history') + # Passing as an argument causes `UnicodeDecodeError` + # with newer py.test and python 2.7 + mock.return_value = ['le cat', 'fuck', 'ls cat', + 'diff x', 'nocommand x', u'café ô'] + return mock @pytest.fixture(autouse=True) def alias(self, mocker): diff --git a/tox.ini b/tox.ini index 541daf10..6e0646dd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py34,py35,py36,py37,py38 +envlist = py27,py35,py36,py37,py38 [testenv] deps = -rrequirements.txt