From 064050989501179ff6c4bff059aa7db4d384a567 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Mon, 1 Jan 2018 20:18:05 -0500 Subject: [PATCH] Drop Python 3.3 Support (#747) * Drop Python 3.3 Support It's reached end-of-life, and our dependencies have started to drop it. See https://github.com/nvbn/thefuck/pull/744#issuecomment-353244371 * Revert "Use pytest<3.3 to fix Python 3.3 tests (#746)" This reverts commit f966ecd4f5b8221ee15e843f5ec287e1f7cca940. --- .travis.yml | 3 --- README.md | 2 +- appveyor.yml | 1 - requirements.txt | 2 +- setup.py | 4 ++-- tox.ini | 2 +- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 990a7f00..3bc2c4a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,6 @@ matrix: - os: linux dist: trusty python: "3.4" - - os: linux - dist: trusty - python: "3.3" - os: linux dist: trusty python: "2.7" diff --git a/README.md b/README.md index 94fff461..a389f697 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ Reading package lists... Done ## Requirements -- python (3.3+) +- python (3.4+) - pip - python-dev diff --git a/appveyor.yml b/appveyor.yml index da1711de..541a69ea 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,6 @@ build: false environment: matrix: - PYTHON: "C:/Python27" - - PYTHON: "C:/Python33" - PYTHON: "C:/Python34" - PYTHON: "C:/Python35" - PYTHON: "C:/Python36" diff --git a/requirements.txt b/requirements.txt index e3d6b263..c450e437 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pip flake8 -pytest<3.3 +pytest mock pytest-mock wheel diff --git a/setup.py b/setup.py index 69d4aac1..6ace6ef0 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, 3): - print('thefuck requires Python version 3.3 or later' + +elif (3, 0) < version < (3, 4): + print('thefuck requires Python version 3.4 or later' + ' ({}.{} detected).'.format(*version)) sys.exit(-1) diff --git a/tox.ini b/tox.ini index 8fc38205..f2994752 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py33,py34,py35,py36 +envlist = py27,py34,py35,py36 [testenv] deps = -rrequirements.txt