aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-06-10 19:38:55 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-06-10 19:38:55 +1200
commit6da3ef48e09cf459b49bbf4201c42d6ee2d03935 (patch)
tree471d1be2e52112b5d1003c07ad099d7fc591f45a /tox.ini
parentbac3e87538d5398eb637fb26560705886c4fcfd1 (diff)
downloadmitmproxy-6da3ef48e09cf459b49bbf4201c42d6ee2d03935.tar.gz
mitmproxy-6da3ef48e09cf459b49bbf4201c42d6ee2d03935.tar.bz2
mitmproxy-6da3ef48e09cf459b49bbf4201c42d6ee2d03935.zip
Remove explicit versions in tox CI environments
Tox matches the environment prefix against its std environs, so we don't need to be explicit with versions here.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 0 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 2ae4a8a9..85b3429e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,14 +18,12 @@ commands =
bash -c 'set -o pipefail ; py.test -n 8 --color=yes --timeout 60 test/netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py test/pathod/test_language_base.py test/pathod/test_language_http.py test/pathod/test_language_websocket.py test/pathod/test_language_http2.py 2>&1 | grep -v Cryptography_locking_cb'
[testenv:py27-ci]
-basepython = python2.7
commands =
py.test --cov netlib --cov mitmproxy --cov pathod --color=yes --timeout 60 ./test
codecov -e TOXENV
[testenv:py35-ci]
# remove bash & pipe & grep hack after cryptography ships with openssl 1.1.0
-basepython = python3.5
whitelist_externals = bash
commands =
bash -c 'set -o pipefail ; py.test --cov netlib --cov mitmproxy --cov pathod --color=yes --timeout 60 test/netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py test/pathod/test_language_base.py test/pathod/test_language_http.py test/pathod/test_language_websocket.py test/pathod/test_language_http2.py 2>&1 | grep -v Cryptography_locking_cb'