drop branches from travis ci

klen · Oct 2, 2018 · 5052521 · 5052521
1 parent 2a30110
commit 5052521
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,21 +19,12 @@ matrix:
       after_script:
         - pip install coveralls;
         - coveralls;
-||||||| merged common ancestors
-python:
-    - "2.7"
-
-env:
-    - TOXENV=py27
-    - TOXENV=py33
-    - TOXENV=py35
-    - TOXENV=cov
 
 branches:
     only:
         - master
         - develop
 
-install: pip install tox-travis
+install: pip install tox
 
 script: tox