aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2018-05-18 10:37:56 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2018-05-19 12:38:44 +0200
commit46960fa080c63b912c76321f790573fe4995ed49 (patch)
tree64d4c3fd8dd4c7c8512ef4dc6539ff19be14a55d /tox.ini
parenteaca8fdaf7b1b3c81451a407593aa7ea7f9ffc31 (diff)
downloadmitmproxy-46960fa080c63b912c76321f790573fe4995ed49.tar.gz
mitmproxy-46960fa080c63b912c76321f790573fe4995ed49.tar.bz2
mitmproxy-46960fa080c63b912c76321f790573fe4995ed49.zip
add docker to the main repository
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 3 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index 3ec5a387..64dfa78e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,7 +33,7 @@ commands =
python ./test/individual_coverage.py
[testenv:cibuild]
-passenv = TRAVIS_* AWS_* APPVEYOR_* TWINE_* RTOOL_KEY WHEEL
+passenv = TRAVIS_* APPVEYOR_* AWS_* TWINE_* DOCKER_* RTOOL_KEY WHEEL DOCKER PYINSTALLER
deps =
-rrequirements.txt
pyinstaller==3.3.1
@@ -41,7 +41,7 @@ deps =
awscli
commands =
mitmdump --version
- python ./release/ci.py {posargs}
+ python ./release/cibuild.py {posargs}
[testenv:wheeltest]
recreate = True
@@ -55,7 +55,7 @@ commands =
pathoc --version
[testenv:docs]
-passenv = TRAVIS_* AWS_* APPVEYOR_* RTOOL_KEY WHEEL
+passenv = TRAVIS_* APPVEYOR_* AWS_*
deps =
-rrequirements.txt
awscli