mirror of
https://github.com/nvbn/thefuck.git
synced 2025-01-18 12:06:04 +00:00
N/A: Remove deprecated python 3.4 support + fix tests in 2.7 (#1025)
* N/A: Remove deprecated python 3.4 support More details - https://www.python.org/downloads/release/python-3410/ * N/A: Remove Python 3.4 from appveyor config * N/A: Fix UnicodeDecodeError with Python 2.7 and newer versions of py.test
This commit is contained in:
parent
d10fc80fa5
commit
60073bea78
@ -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
|
||||
|
@ -3,7 +3,6 @@ build: false
|
||||
environment:
|
||||
matrix:
|
||||
- PYTHON: "C:/Python27"
|
||||
- PYTHON: "C:/Python34"
|
||||
- PYTHON: "C:/Python35"
|
||||
- PYTHON: "C:/Python36"
|
||||
- PYTHON: "C:/Python37"
|
||||
|
4
setup.py
4
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)
|
||||
|
||||
|
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user