diff options
| author | Gerhard Weis <g.weis@griffith.edu.au> | 2017-07-05 20:54:03 +1000 |
|---|---|---|
| committer | Gerhard Weis <g.weis@griffith.edu.au> | 2017-07-05 20:54:03 +1000 |
| commit | 0d0abd79a975ed132a8eb43783f87cd84eea9267 (patch) | |
| tree | 733231867f0ff1ba3679e1d4564a1b2506353cb2 /.travis.yml | |
| parent | 1dc3c2481ba32e9dbcad9e55d2c20281f5aa5756 (diff) | |
| parent | 6e5802bf7b410551f1dfcaf6ede8638f0f233cad (diff) | |
| download | isodate-0d0abd79a975ed132a8eb43783f87cd84eea9267.tar.gz | |
Merge branch 'master' of https://github.com/lmazuel/isodate
# Conflicts:
# .travis.yml
# setup.cfg
# src/isodate/tzinfo.py
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 4cf6c8a..fe73aed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,24 @@ - language: python - -python: - - 3.4 - -env: - - TOX_ENV=py26 - - TOX_ENV=py27 - - TOX_ENV=py33 - - TOX_ENV=py34 - - TOX_ENV=pypy - - TOX_ENV=pypy3 - - TOX_ENV=flake - - TOX_ENV=cover - +matrix: + include: + - python: 2.7 + env: TOXENV=py27 + - python: 3.3 + env: TOXENV=py33 + - python: 3.4 + env: TOXENV=py34 + - python: 3.5 + env: TOXENV=py35 + - python: 3.6 + env: TOXENV=py36 + - python: 3.4 + env: TOXENV=flake + - python: 3.4 + env: TOXENV=cover install: - pip install tox - script: - - tox -e $TOX_ENV - + - tox after_script: - if [ $TOX_ENV == "cover" ]; then pip install --quiet coveralls; |