diff options
| author | Erik Johnston <erik@matrix.org> | 2018-09-19 15:08:36 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-09-19 15:08:36 +0100 |
| commit | ce846bb620e9866531f4a49f183fdd3cbb3f1eeb (patch) | |
| tree | ed38561118af50948598967e17ad6a7f1fee8a8c /.travis.yml | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #3910 from matrix-org/erikj/update_timeout (diff) | |
| download | synapse-ce846bb620e9866531f4a49f183fdd3cbb3f1eeb.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 11c76db2e5..b3ee66da8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,6 @@ before_script: - git remote set-branches --add origin develop - git fetch origin develop -services: - - postgresql - matrix: fast_finish: true include: @@ -25,6 +22,11 @@ matrix: - python: 2.7 env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4" + services: + - postgresql + + - python: 3.5 + env: TOX_ENV=py35 - python: 3.6 env: TOX_ENV=py36 |