From 54bb9aa27a5a9006a9b0c2fce45429ba0f19088a Mon Sep 17 00:00:00 2001 From: John Vandenberg Date: Wed, 25 Nov 2015 15:30:23 +1100 Subject: [PATCH] Use tox for Travis-CI --- .travis.yml | 56 ++++++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ae3385..a3f5e73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,28 +6,28 @@ env: - secure: AifoKzwhjV94cmcQZrdQmqRu/9rkZZvWpwBv1daeAQpLOKFPGsOm3D+x2cSw9+iCfkgDZDfqQVv1kCaFVxTll8v8jTq5SJdqEY0NmGWbj/UkNtShh609oRDsuzLxAEwtVKYjf/h8K2BRea+bl1tGkwZ2vtmYS6dxNlAijjWOfds= - secure: LBSEg/gMj4u4Hrpo3zs6Y/1mTpd2RtcN49mZIFgTdbJ9IhpiNPqcEt647Lz94F9Eses2x2WbNuKqZKZZReY7QLbEzU1m0nN5jlaKrjcG5NR5clNABfFFyhgc0jBikyS4abAG8jc2efeaTrFuQwdoF4sE8YiVrkiVj2X5Xoi6sBk= matrix: - - WITH_LIB="requests2.2" - - WITH_LIB="requests2.3" - - WITH_LIB="requests2.4" - - WITH_LIB="requests2.5" - - WITH_LIB="requests2.6" - - WITH_LIB="requests2.7" - - WITH_LIB="requests1.x" - - WITH_LIB="httplib2" - - WITH_LIB="boto" - - WITH_LIB="urllib31.7" - - WITH_LIB="urllib31.9" - - WITH_LIB="urllib31.10" - - WITH_LIB="tornado" + - TOX_SUFFIX="requests22" + - TOX_SUFFIX="requests23" + - TOX_SUFFIX="requests24" + - TOX_SUFFIX="requests25" + - TOX_SUFFIX="requests26" + - TOX_SUFFIX="requests27" + - TOX_SUFFIX="requests1" + - TOX_SUFFIX="httplib2" + - TOX_SUFFIX="boto" + - TOX_SUFFIX="urllib317" + - TOX_SUFFIX="urllib319" + - TOX_SUFFIX="urllib3110" + - TOX_SUFFIX="tornado" matrix: allow_failures: - - env: WITH_LIB="boto" + - env: TOX_SUFFIX="boto" exclude: - - env: WITH_LIB="boto" + - env: TOX_SUFFIX="boto" python: 3.3 - - env: WITH_LIB="boto" + - env: TOX_SUFFIX="boto" python: 3.4 - - env: WITH_LIB="requests1.x" + - env: TOX_SUFFIX="requests1" python: 3.4 python: - 2.6 @@ -36,19 +36,9 @@ python: - 3.4 - pypy install: -- pip install . -- if [ $WITH_LIB = "requests1.x" ] ; then pip install requests==1.2.3; fi -- if [ $WITH_LIB = "requests2.2" ] ; then pip install requests==2.2.1; fi -- if [ $WITH_LIB = "requests2.3" ] ; then pip install requests==2.3.0; fi -- if [ $WITH_LIB = "requests2.4" ] ; then pip install requests==2.4.0; fi -- if [ $WITH_LIB = "requests2.5" ] ; then pip install requests==2.5.0; fi -- if [ $WITH_LIB = "requests2.6" ] ; then pip install requests==2.6.0; fi -- if [ $WITH_LIB = "requests2.7" ] ; then pip install requests==2.7.0; fi -- if [ $WITH_LIB = "httplib2" ] ; then pip install httplib2; fi -- if [ $WITH_LIB = "boto" ] ; then pip install boto; fi -- if [ $WITH_LIB = "urllib31.7" ] ; then pip install certifi urllib3==1.7.1; fi -- if [ $WITH_LIB = "urllib31.9" ] ; then pip install certifi urllib3==1.9.1; fi -- if [ $WITH_LIB = "urllib31.10" ] ; then pip install certifi urllib3==1.10.2; fi -- if [ $WITH_LIB = "tornado" ] ; then pip install tornado==4.2 pytest-tornado; fi -- if [ $WITH_LIB = "tornado" -a $TRAVIS_PYTHON_VERSION != "pypy" ] ; then pip install pycurl; fi -script: python setup.py test +- pip install tox +- python setup.py install +script: +- v=$TRAVIS_PYTHON_VERSION +- if [[ ${v%py} != $v ]]; then TOXPY=$v; else TOXPY=py"${v/./}"; fi +- tox -e "${TOXPY}-${TOX_SUFFIX}"