From dc174c325037bb968bf3f7d541507d1be50fcd89 Mon Sep 17 00:00:00 2001 From: Hugo Date: Wed, 22 May 2019 17:30:45 +0300 Subject: [PATCH] Drop support for EOL Python 3.4 --- .travis.yml | 12 ------------ docs/installation.rst | 2 +- setup.py | 7 ++----- tox.ini | 2 +- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17a2546..180b1dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: python -sudo: false before_install: openssl version env: global: @@ -18,37 +17,27 @@ matrix: - env: TOX_SUFFIX="flakes" python: 3.7 dist: xenial - sudo: true - env: TOX_SUFFIX="requests27" python: 3.7 dist: xenial - sudo: true - env: TOX_SUFFIX="httplib2" python: 3.7 dist: xenial - sudo: true - env: TOX_SUFFIX="urllib3121" python: 3.7 dist: xenial - sudo: true - env: TOX_SUFFIX="tornado4" python: 3.7 dist: xenial - sudo: true - env: TOX_SUFFIX="aiohttp" python: 3.7 dist: xenial - sudo: true allow_failures: - env: TOX_SUFFIX="boto3" - env: TOX_SUFFIX="aiohttp" python: "pypy3.5-5.9.0" - - env: TOX_SUFFIX="aiohttp" - python: 3.4 exclude: # Only run flakes on a single Python 2.x and a single 3.x - - env: TOX_SUFFIX="flakes" - python: 3.4 - env: TOX_SUFFIX="flakes" python: 3.5 - env: TOX_SUFFIX="flakes" @@ -61,7 +50,6 @@ matrix: python: pypy python: - 2.7 -- 3.4 - 3.5 - 3.6 - pypy diff --git a/docs/installation.rst b/docs/installation.rst index afec93b..8e475e0 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -9,7 +9,7 @@ with pip:: Compatibility ------------- -VCR.py supports Python 2.7 and 3.4+, and +VCR.py supports Python 2.7 and 3.5+, and `pypy `__. The following HTTP libraries are supported: diff --git a/setup.py b/setup.py index 3c84091..ad54f83 100644 --- a/setup.py +++ b/setup.py @@ -28,9 +28,7 @@ install_requires = [ 'six>=1.5', 'contextlib2; python_version=="2.7"', 'mock; python_version=="2.7"', - 'yarl; python_version>"3.4"', - 'yarl<1.0.0; python_version=="3.4"', - 'multidict<4.0.0,>=2.0; python_version=="3.4"' + 'yarl; python_version>"3.5"', ] excluded_packages = ["tests*"] @@ -49,7 +47,7 @@ setup( author_email='me@kevinmccarthy.org', url='https://github.com/kevin1024/vcrpy', packages=find_packages(exclude=excluded_packages), - python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', install_requires=install_requires, license='MIT', tests_require=['pytest', 'mock', 'pytest-httpbin'], @@ -61,7 +59,6 @@ setup( 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', diff --git a/tox.ini b/tox.ini index bd99f42..865cd62 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {py27,py34,py35,py36,py37,pypy}-{flakes,requests27,httplib2,urllib3121,tornado4,boto3,aiohttp} +envlist = {py27,py35,py36,py37,pypy}-{flakes,requests27,httplib2,urllib3121,tornado4,boto3,aiohttp} [testenv:flakes] skipsdist = True