aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2017-07-24 21:01:25 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2017-07-24 21:03:38 +0200
commit5916178d60120ffce9744b26655fcad57dbfb96c (patch)
tree9e1c13350f045004c83003e9b2c2eba9312c9ca8 /.travis.yml
parent28c326031ae49ac988d32fee95abd1c390a0a993 (diff)
downloadmitmproxy-5916178d60120ffce9744b26655fcad57dbfb96c.tar.gz
mitmproxy-5916178d60120ffce9744b26655fcad57dbfb96c.tar.bz2
mitmproxy-5916178d60120ffce9744b26655fcad57dbfb96c.zip
update travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml34
1 files changed, 6 insertions, 28 deletions
diff --git a/.travis.yml b/.travis.yml
index 0ff0fb59..51c16aa5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,32 +23,10 @@ matrix:
language: generic
env: TOXENV=py35 BDIST=1
- python: 3.5
- env: TOXENV=py35 OPENSSL=old
- addons:
- apt:
- packages:
- - libssl-dev
- - python: 3.5
- env: TOXENV=py35 BDIST=1 OPENSSL=with-alpn
- addons:
- apt:
- sources:
- # Debian sid currently holds OpenSSL 1.1.0
- # change this with future releases!
- - debian-sid
- packages:
- - libssl-dev
+ env: TOXENV=py35 BDIST=1
+ - python: 3.6
+ env: TOXENV=py36
- python: 3.6
- env: TOXENV=py36 OPENSSL=with-alpn
- addons:
- apt:
- sources:
- # Debian sid currently holds OpenSSL 1.1.0
- # change this with future releases!
- - debian-sid
- packages:
- - libssl-dev
- - python: 3.5
env: TOXENV=individual_coverage
- python: 3.5
env: TOXENV=docs
@@ -73,9 +51,9 @@ install:
brew update || brew update
brew outdated pyenv || brew upgrade pyenv
eval "$(pyenv init -)"
- env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install --skip-existing 3.5.2
- pyenv global 3.5.2
- pyenv shell 3.5.2
+ env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install --skip-existing 3.5.3
+ pyenv global 3.5.3
+ pyenv shell 3.5.3
pip install -U pip setuptools wheel virtualenv
fi
- pip install tox