diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-12-23 20:30:04 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-12-27 16:28:12 +0100 |
| commit | 0bde932b78a46a2a69f1026c973c287b63d7d292 (patch) | |
| tree | e13cc6551bd121b9fbf27bdf44cedcc21b86bf9f | |
| parent | 38198769eb82465c4ee2af3c68d01bd0178875b8 (diff) | |
| download | mitmproxy-0bde932b78a46a2a69f1026c973c287b63d7d292.tar.gz mitmproxy-0bde932b78a46a2a69f1026c973c287b63d7d292.tar.bz2 mitmproxy-0bde932b78a46a2a69f1026c973c287b63d7d292.zip | |
run tests on Python 3.6
| -rw-r--r-- | .appveyor.yml | 3 | ||||
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rwxr-xr-x | dev.sh | 2 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | tox.ini | 3 |
5 files changed, 15 insertions, 3 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 3725ea3f..129a84c3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,6 +7,9 @@ environment: matrix: - PYTHON: "C:\\Python35" TOXENV: "py35" + # TODO: ENABLE WHEN AVAILABLE + # - PYTHON: "C:\\Python36" + # TOXENV: "py36" SNAPSHOT_HOST: secure: NeTo57s2rJhCd/mjKHetXVxCFd3uhr8txnjnAXD1tUI= diff --git a/.travis.yml b/.travis.yml index c078e30a..e4c8dd8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,15 @@ matrix: # change this with future releases! - debian-sid packages: + - python: 3.6 + env: TOXENV=py36 OPENSSL_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=docs @@ -2,7 +2,7 @@ set -e set -x -PYVERSION=3.5 +PYVERSION=${1:-3.5} VENV="venv$PYVERSION" echo "Creating dev environment in $VENV using Python $PYVERSION" @@ -35,6 +35,7 @@ setup( "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Security", @@ -1,10 +1,9 @@ [tox] -envlist = py35, docs, lint +envlist = py35, py36, docs, lint skipsdist = True toxworkdir={env:TOX_WORK_DIR:.tox} [testenv] -basepython = python3.5 deps = {env:CI_DEPS:} -rrequirements.txt |