1 files changed, 4 insertions, 19 deletions
diff --git a/tox.ini b/tox.ini
index e90455c1..2d0fd047 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,27 +32,12 @@ deps =
 commands =
   python test/individual_coverage.py
 
-[testenv:wheel]
-recreate = True
-deps =
-commands =
-  python setup.py -q bdist_wheel --dist-dir release/dist
-  pip install {posargs} release/dist/mitmproxy-{env:VERSION:}-py3-none-any.whl
-  # skip `mitmproxy --version` if SKIP_MITMPROXY is defined.
-  {env:SKIP_MITMPROXY:mitmproxy --version}
-  mitmdump --version
-  mitmweb --version
-  pathod --version
-  pathoc --version
-
-[testenv:rtool]
-passenv = SKIP_MITMPROXY SNAPSHOT_HOST SNAPSHOT_PORT SNAPSHOT_USER SNAPSHOT_PASS RTOOL_KEY
+[testenv:cibuild]
+passenv = TRAVIS_* AWS_* APPVEYOR_* RTOOL_KEY WHEEL
 deps =
   -rrequirements.txt
   pyinstaller==3.3.1
-  twine==1.9.1
-  pysftp==0.2.9
-
+  awscli
 commands =
   mitmdump --version
-  python ./release/rtool.py {posargs}
+  python ./release/ci.py {posargs}