mirror of
https://github.com/kevin1024/vcrpy.git
synced 2025-12-09 01:03:24 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
26
.travis.yml
26
.travis.yml
@@ -7,29 +7,14 @@ env:
|
|||||||
- secure: LBSEg/gMj4u4Hrpo3zs6Y/1mTpd2RtcN49mZIFgTdbJ9IhpiNPqcEt647Lz94F9Eses2x2WbNuKqZKZZReY7QLbEzU1m0nN5jlaKrjcG5NR5clNABfFFyhgc0jBikyS4abAG8jc2efeaTrFuQwdoF4sE8YiVrkiVj2X5Xoi6sBk=
|
- secure: LBSEg/gMj4u4Hrpo3zs6Y/1mTpd2RtcN49mZIFgTdbJ9IhpiNPqcEt647Lz94F9Eses2x2WbNuKqZKZZReY7QLbEzU1m0nN5jlaKrjcG5NR5clNABfFFyhgc0jBikyS4abAG8jc2efeaTrFuQwdoF4sE8YiVrkiVj2X5Xoi6sBk=
|
||||||
matrix:
|
matrix:
|
||||||
- TOX_SUFFIX="flakes"
|
- TOX_SUFFIX="flakes"
|
||||||
- TOX_SUFFIX="requests22"
|
|
||||||
- TOX_SUFFIX="requests23"
|
|
||||||
- TOX_SUFFIX="requests24"
|
|
||||||
- TOX_SUFFIX="requests25"
|
|
||||||
- TOX_SUFFIX="requests26"
|
|
||||||
- TOX_SUFFIX="requests27"
|
- TOX_SUFFIX="requests27"
|
||||||
- TOX_SUFFIX="requests211"
|
|
||||||
- TOX_SUFFIX="requests213"
|
|
||||||
- TOX_SUFFIX="requests216"
|
|
||||||
- TOX_SUFFIX="requests218"
|
|
||||||
- TOX_SUFFIX="requests1"
|
|
||||||
- TOX_SUFFIX="httplib2"
|
- TOX_SUFFIX="httplib2"
|
||||||
- TOX_SUFFIX="boto"
|
|
||||||
- TOX_SUFFIX="boto3"
|
- TOX_SUFFIX="boto3"
|
||||||
- TOX_SUFFIX="urllib319"
|
|
||||||
- TOX_SUFFIX="urllib3110"
|
|
||||||
- TOX_SUFFIX="urllib3121"
|
- TOX_SUFFIX="urllib3121"
|
||||||
- TOX_SUFFIX="tornado3"
|
|
||||||
- TOX_SUFFIX="tornado4"
|
- TOX_SUFFIX="tornado4"
|
||||||
- TOX_SUFFIX="aiohttp"
|
- TOX_SUFFIX="aiohttp"
|
||||||
matrix:
|
matrix:
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- env: TOX_SUFFIX="boto"
|
|
||||||
- env: TOX_SUFFIX="boto3"
|
- env: TOX_SUFFIX="boto3"
|
||||||
exclude:
|
exclude:
|
||||||
# Only run flakes on a single Python 2.x and a single 3.x
|
# Only run flakes on a single Python 2.x and a single 3.x
|
||||||
@@ -41,17 +26,6 @@ matrix:
|
|||||||
python: pypy
|
python: pypy
|
||||||
- env: TOX_SUFFIX="flakes"
|
- env: TOX_SUFFIX="flakes"
|
||||||
python: "pypy3.5-5.9.0"
|
python: "pypy3.5-5.9.0"
|
||||||
- env: TOX_SUFFIX="boto"
|
|
||||||
python: 3.6
|
|
||||||
# Requests 1.x only supports Python <= 3.3
|
|
||||||
- env: TOX_SUFFIX="requests1"
|
|
||||||
python: 3.4
|
|
||||||
- env: TOX_SUFFIX="requests1"
|
|
||||||
python: 3.5
|
|
||||||
- env: TOX_SUFFIX="requests1"
|
|
||||||
python: 3.6
|
|
||||||
- env: TOX_SUFFIX="requests1"
|
|
||||||
python: "pypy3.5-5.9.0"
|
|
||||||
- env: TOX_SUFFIX="aiohttp"
|
- env: TOX_SUFFIX="aiohttp"
|
||||||
python: 2.7
|
python: 2.7
|
||||||
- env: TOX_SUFFIX="aiohttp"
|
- env: TOX_SUFFIX="aiohttp"
|
||||||
|
|||||||
@@ -51,7 +51,6 @@ VCR.py works great with the following HTTP clients:
|
|||||||
- urllib3
|
- urllib3
|
||||||
- tornado
|
- tornado
|
||||||
- urllib2
|
- urllib2
|
||||||
- boto
|
|
||||||
- boto3
|
- boto3
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
22
tox.ini
22
tox.ini
@@ -1,5 +1,5 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = {py27,py35,py36,pypy}-{flakes,requests218,requests216,requests213,requests211,requests27,requests26,requests25,requests24,requests23,requests22,requests1,httplib2,urllib319,urllib3110,urllib3121,tornado3,tornado4,boto,boto3,aiohttp}
|
envlist = {py27,py35,py36,pypy}-{flakes,requests27,httplib2,urllib3121,tornado4,boto3,aiohttp}
|
||||||
|
|
||||||
[testenv:flakes]
|
[testenv:flakes]
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
@@ -13,35 +13,19 @@ deps = flake8
|
|||||||
commands =
|
commands =
|
||||||
./runtests.sh {posargs}
|
./runtests.sh {posargs}
|
||||||
deps =
|
deps =
|
||||||
Flask
|
Flask<1
|
||||||
mock
|
mock
|
||||||
pytest
|
pytest
|
||||||
pytest-httpbin
|
pytest-httpbin
|
||||||
PyYAML
|
PyYAML
|
||||||
requests1: requests==1.2.3
|
|
||||||
requests218: requests==2.18.4
|
|
||||||
requests216: requests==2.16.3
|
|
||||||
requests213: requests==2.13.0
|
|
||||||
requests211: requests==2.11.1
|
|
||||||
requests27: requests==2.7.0
|
requests27: requests==2.7.0
|
||||||
requests26: requests==2.6.0
|
|
||||||
requests25: requests==2.5.0
|
|
||||||
requests24: requests==2.4.0
|
|
||||||
requests23: requests==2.3.0
|
|
||||||
requests22: requests==2.2.1
|
|
||||||
httplib2: httplib2
|
httplib2: httplib2
|
||||||
urllib319: urllib3==1.9.1
|
|
||||||
urllib3110: urllib3==1.10.2
|
|
||||||
urllib3121: urllib3==1.21.1
|
urllib3121: urllib3==1.21.1
|
||||||
{py27,py35,py36,pypy}-tornado3: tornado>=3,<4
|
|
||||||
{py27,py35,py36,pypy}-tornado4: tornado>=4,<5
|
{py27,py35,py36,pypy}-tornado4: tornado>=4,<5
|
||||||
{py27,py35,py36,pypy}-tornado3: pytest-tornado
|
|
||||||
{py27,py35,py36,pypy}-tornado4: pytest-tornado
|
{py27,py35,py36,pypy}-tornado4: pytest-tornado
|
||||||
{py27,py35,py36}-tornado3: pycurl
|
|
||||||
{py27,py35,py36}-tornado4: pycurl
|
{py27,py35,py36}-tornado4: pycurl
|
||||||
boto: boto
|
|
||||||
boto3: boto3
|
boto3: boto3
|
||||||
aiohttp: aiohttp
|
aiohttp: aiohttp<3
|
||||||
aiohttp: pytest-asyncio
|
aiohttp: pytest-asyncio
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
|
|||||||
Reference in New Issue
Block a user