diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2017-07-24 22:07:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 22:07:52 +0200 |
| commit | 960262e4ed30514259a40efc412f6a966771909c (patch) | |
| tree | c75943a40af8dd4b5366cd08ac7abe5e3993ece8 /.travis.yml | |
| parent | 4b7fa6b3bff2d92c174fbc710ab62e88c0de82a5 (diff) | |
| parent | 5916178d60120ffce9744b26655fcad57dbfb96c (diff) | |
| download | mitmproxy-960262e4ed30514259a40efc412f6a966771909c.tar.gz mitmproxy-960262e4ed30514259a40efc412f6a966771909c.tar.bz2 mitmproxy-960262e4ed30514259a40efc412f6a966771909c.zip | |
Merge pull request #2466 from Kriechi/update-travis
update travis
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 34 |
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 |