summary refs log tree commit diff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2077f6af72..197dec2bc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,13 @@ language: python
 # tell travis to cache ~/.cache/pip
 cache: pip
 
+# only build branches we care about (PRs are built seperately)
+branches:
+  only:
+    - master
+    - develop
+    - /^release-v/
+
 before_script:
   - git remote set-branches --add origin develop
   - git fetch origin develop
@@ -14,7 +21,7 @@ matrix:
   - python: 2.7
     env: TOX_ENV=packaging
 
-  - python: 2.7
+  - python: 3.6
     env: TOX_ENV=pep8
 
   - python: 2.7