summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-25 00:44:55 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-25 00:59:49 +0100
commitfc33e813231a9a78012080193a4a2a96951515da (patch)
tree7f96060dddf3db6d0728994c7e9757fd354a7ba9
parentdisable coverage checking (diff)
downloadsynapse-fc33e813231a9a78012080193a4a2a96951515da.tar.xz
Combine the pep8 and check_isort builds into one
there's really no point spinning up two separate jobs for these.
Diffstat (limited to '')
-rw-r--r--.travis.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 56e10dbdc6..64079b56f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
     env: TOX_ENV=packaging
 
   - python: 3.6
-    env: TOX_ENV=pep8
+    env: TOX_ENV="pep8, check_isort"
 
   - python: 2.7
     env: TOX_ENV=py27
@@ -46,9 +46,6 @@ matrix:
     services:
       - postgresql
 
-  - python: 3.6
-    env: TOX_ENV=check_isort
-
   - # we only need to check for the newsfragment if it's a PR build
     if: type = pull_request
     python: 3.6