1
0
mirror of https://github.com/kevin1024/vcrpy.git synced 2025-12-09 01:03:24 +00:00

Merge pull request #564 from jairhenrique/drop-35

Drop support to deprecated Python (<3.6)
This commit is contained in:
Ivan Malison
2021-08-15 20:16:21 +00:00
committed by GitHub
4 changed files with 9 additions and 15 deletions

View File

@@ -7,7 +7,6 @@ matrix:
python: "3.7" python: "3.7"
python: python:
- "3.5"
- "3.6" - "3.6"
- "3.7" - "3.7"
- "3.8" - "3.8"

View File

@@ -130,10 +130,10 @@ in this example::
pip install tox tox-pyenv pip install tox tox-pyenv
# Install supported versions (at time of writing), this does not activate them # Install supported versions (at time of writing), this does not activate them
pyenv install 3.5.9 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0 pyenv install 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0
# This activates them # This activates them
pyenv local 3.5.9 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0 pyenv local 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0
# Run the whole test suite # Run the whole test suite
tox tox

View File

@@ -46,8 +46,7 @@ install_requires = [
"PyYAML", "PyYAML",
"wrapt", "wrapt",
"six>=1.5", "six>=1.5",
'yarl; python_version>="3.6"', "yarl",
'yarl<1.4; python_version=="3.5"',
] ]
setup( setup(
@@ -70,7 +69,6 @@ setup(
"Intended Audience :: Developers", "Intended Audience :: Developers",
"Programming Language :: Python", "Programming Language :: Python",
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.8",

15
tox.ini
View File

@@ -3,12 +3,10 @@ skip_missing_interpreters=true
envlist = envlist =
cov-clean, cov-clean,
lint, lint,
{py35,py36,py37,py38}-{requests,httplib2,urllib3,tornado4,boto3,aiohttp}, {py36,py37,py38}-{requests,httplib2,urllib3,tornado4,boto3,aiohttp,httpx},
{py36,py37,py38}-{httpx}
{pypy3}-{requests,httplib2,urllib3,tornado4,boto3}, {pypy3}-{requests,httplib2,urllib3,tornado4,boto3},
cov-report cov-report
# Coverage environment tasks: cov-clean and cov-report # Coverage environment tasks: cov-clean and cov-report
# https://pytest-cov.readthedocs.io/en/latest/tox.html # https://pytest-cov.readthedocs.io/en/latest/tox.html
[testenv:cov-clean] [testenv:cov-clean]
@@ -63,7 +61,6 @@ usedevelop=true
commands = commands =
./runtests.sh --cov=./vcr --cov-branch --cov-report=xml --cov-append {posargs} ./runtests.sh --cov=./vcr --cov-branch --cov-report=xml --cov-append {posargs}
deps = deps =
Flask
pytest pytest
pytest-httpbin pytest-httpbin
pytest-cov pytest-cov
@@ -72,9 +69,9 @@ deps =
requests: requests>=2.22.0 requests: requests>=2.22.0
httplib2: httplib2 httplib2: httplib2
urllib3: urllib3 urllib3: urllib3
{py35,py36}-tornado4: tornado>=4,<5 {py36}-tornado4: tornado>=4,<5
{py35,py36}-tornado4: pytest-tornado {py36}-tornado4: pytest-tornado
{py35,py36}-tornado4: pycurl {py36}-tornado4: pycurl
boto3: boto3 boto3: boto3
boto3: urllib3 boto3: urllib3
aiohttp: aiohttp aiohttp: aiohttp
@@ -84,8 +81,8 @@ deps =
{py36,py37,py38}-{httpx}: httpx {py36,py37,py38}-{httpx}: httpx
{py36,py37,py38}-{httpx}: pytest-asyncio {py36,py37,py38}-{httpx}: pytest-asyncio
depends = depends =
lint,{py35,py36,py37,py38,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py35,py36,py37,py38}-{aiohttp},{py36,py37,py38}-{httpx}: cov-clean lint,{py36,py37,py38,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py36,py37,py38}-{aiohttp},{py36,py37,py38}-{httpx}: cov-clean
cov-report: lint,{py35,py36,py37,py38,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py35,py36,py37,py38}-{aiohttp} cov-report: lint,{py36,py37,py38,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py36,py37,py38}-{aiohttp}
passenv = passenv =
AWS_ACCESS_KEY_ID AWS_ACCESS_KEY_ID
AWS_DEFAULT_REGION AWS_DEFAULT_REGION