diff options
| author | Jon Wayne Parrott <jonwayne@google.com> | 2016-06-21 16:51:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-21 16:51:46 -0700 |
| commit | 0019cc8ba4356a8359dff22a70492fc762081af8 (patch) | |
| tree | 388a99c42198ab517f480b607b05b1766407df71 /.travis.yml | |
| parent | 1cc08be3775820979684c20220b31abf752e101c (diff) | |
| download | google-compute-image-packages-0019cc8ba4356a8359dff22a70492fc762081af8.tar.gz | |
Updating travis to use tox (#282)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index dfd5f8e..95a76a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,23 @@ language: python sudo: true python: - - 2.6 - - 2.7 - - 3.2 - - 3.3 - - 3.4 - - 3.5 - - pypy - - pypy3 -# Global configs cause unit tests to break. -# Issue: travis-ci/travis-ci#5246 -env: - - BOTO_CONFIG=/tmp/fake +- 2.6 +- 2.7 +- 3.2 +- 3.3 +- 3.4 +- 3.5 +- pypy +- pypy3 os: - - linux -# Python 2.6 uses a backported version of unittest. -# Python 3.2 does not have mock installed by default. +- linux install: - - pip install boto - - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install unittest2; fi - - if [[ $TRAVIS_PYTHON_VERSION == 3.2 ]]; then pip3.2 install mock; fi -# nosetests will run all tests within the current directory. +# Python 3.2 is only supported by an older version of virtualenv/pip. +- if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install "virtualenv<14.0.0"; fi +- if [[ $TRAVIS_PYTHON_VERSION != '3.2' ]]; then pip install --upgrade virtualenv pip; fi +- pip install tox tox-travis script: - - nosetests +- tox deploy: provider: pypi |