1
0
mirror of https://github.com/kevin1024/vcrpy.git synced 2025-12-10 09:35:34 +00:00

Merge pull request #238 from jayvdb/tox-travis

Use tox-travis
This commit is contained in:
Kevin McCarthy
2015-12-12 10:51:07 -10:00
2 changed files with 5 additions and 12 deletions

View File

@@ -37,9 +37,7 @@ python:
- 3.4 - 3.4
- pypy - pypy
install: install:
- pip install tox - pip install tox-travis
- if [[ $TOX_SUFFIX != flakes ]]; then python setup.py install ; fi - if [[ $TOX_SUFFIX != flakes ]]; then python setup.py install ; fi
script: script:
- v=$TRAVIS_PYTHON_VERSION - tox -e "${TOX_SUFFIX}"
- if [[ ${v%py} != $v ]]; then TOXPY=$v; else TOXPY=py"${v/./}"; fi
- tox -e "${TOXPY}-${TOX_SUFFIX}"

11
tox.ini
View File

@@ -1,20 +1,15 @@
[tox] [tox]
envlist = py34-flakes,{py26,py27,py33,py34,pypy}-{requests27,requests26,requests25,requests24,requests23,requests22,requests1,httplib2,urllib317,urllib319,urllib3110,tornado,boto} envlist = {py26,py27,py33,py34,pypy}-{flakes,requests27,requests26,requests25,requests24,requests23,requests22,requests1,httplib2,urllib317,urllib319,urllib3110,tornado,boto}
[testenv:py34-flakes] [testenv:flakes]
skipsdist = True skipsdist = True
commands = commands =
flake8 --version
flake8 --exclude="./docs/conf.py" flake8 --exclude="./docs/conf.py"
pyflakes ./docs/conf.py pyflakes ./docs/conf.py
deps = flake8 deps = flake8
[testenv] [testenv]
basepython =
py26: python2.6
py27: python2.7
py33: python3.3
py34: python3.4
pypy: pypy
commands = commands =
py.test {posargs} py.test {posargs}
deps = deps =