diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-04-30 01:12:58 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-04-30 01:12:58 +0100 |
| commit | 7b908aeec4c43683d07eb5cf5ab0a7352d2f1b5e (patch) | |
| tree | 65a2050e2d3dfe1edba53c5149f3cbfa74809da3 | |
| parent | Merge pull request #3150 from NotAFile/py3-listcomp-yield (diff) | |
| parent | add py36 to build matrix (diff) | |
| download | synapse-7b908aeec4c43683d07eb5cf5ab0a7352d2f1b5e.tar.xz | |
Merge branch 'rav/test_36' into develop
| -rw-r--r-- | .travis.yml | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 3ce93cb434..e6ba6f4752 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,22 @@ sudo: false language: python -python: 2.7 # tell travis to cache ~/.cache/pip cache: pip -env: - - TOX_ENV=packaging - - TOX_ENV=pep8 - - TOX_ENV=py27 +matrix: + include: + - python: 2.7 + env: TOX_ENV=packaging + + - python: 2.7 + env: TOX_ENV=pep8 + + - python: 2.7 + env: TOX_ENV=py27 + + - python: 3.6 + env: TOX_ENV=py36 install: - pip install tox |