diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2018-09-07 18:14:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 18:14:01 +0200 |
| commit | 6c0849aa464397ef3a118a7233edbf1955b89c1b (patch) | |
| tree | 4e2fd2a1ad7d3b917e043bc2a517ef070218623e | |
| parent | 6c2e15fce36f5d4a1329dc70fa6bdf9d01028e99 (diff) | |
| parent | a2e6c47a2b796e0222ed068c1c06aa0839b41253 (diff) | |
| download | mitmproxy-6c0849aa464397ef3a118a7233edbf1955b89c1b.tar.gz mitmproxy-6c0849aa464397ef3a118a7233edbf1955b89c1b.tar.bz2 mitmproxy-6c0849aa464397ef3a118a7233edbf1955b89c1b.zip | |
Merge pull request #3229 from Kriechi/py37
Python 3.7 is here
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | setup.py | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 21176b96..e9c62ba1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,6 +13,8 @@ environment: TOXENV: "py36" PYINSTALLER: "1" WININSTALLER: "1" + - PYTHON: "C:\\Python37" + TOXENV: "py37" install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" diff --git a/.travis.yml b/.travis.yml index 97a26f4e..dca567bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,10 @@ matrix: - docker - python: 3.6 env: TOXENV=individual_coverage - - python: "3.7-dev" + - python: 3.7 env: TOXENV=py37 + dist: xenial + sudo: true # required workaround for https://github.com/travis-ci/travis-ci/issues/9815 - language: node_js node_js: "node" before_install: @@ -36,6 +36,7 @@ setup( "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Security", "Topic :: Internet", |