aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-07-07 20:56:39 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-07-07 21:14:29 +0200
commitacca8e5253878d6a346a15a0f64154bdbde49a98 (patch)
treed2a274645a72ba182acb383e10e5fa3e9aeee1dd /.travis.yml
parent7baeac4d67c40a64106aa4633eecb42a588518a1 (diff)
downloadmitmproxy-acca8e5253878d6a346a15a0f64154bdbde49a98.tar.gz
mitmproxy-acca8e5253878d6a346a15a0f64154bdbde49a98.tar.bz2
mitmproxy-acca8e5253878d6a346a15a0f64154bdbde49a98.zip
reorder travis jobs
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 345d6a58..a0e3c370 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ addons:
packages:
- libssl-dev
-env:
+env:
global:
- CI_DEPS=codecov>=2.0.5
- CI_COMMANDS=codecov
@@ -18,14 +18,16 @@ env:
matrix:
fast_finish: true
include:
- - python: 2.7
- env: TOXENV=py27
- - python: 2.7
- env: TOXENV=py27 NO_ALPN=1
+ - python: 3.5
+ env: TOXENV=lint
- python: 3.5
env: TOXENV=py35
- python: 3.5
env: TOXENV=py35 NO_ALPN=1
+ - python: 2.7
+ env: TOXENV=py27
+ - python: 2.7
+ env: TOXENV=py27 NO_ALPN=1
- language: generic
os: osx
osx_image: xcode7.1
@@ -33,8 +35,6 @@ matrix:
depth: 9999999
env: TOXENV=py27
- python: 3.5
- env: TOXENV=lint
- - python: 3.5
env: TOXENV=docs
allow_failures:
- python: pypy