diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-30 12:20:46 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-30 12:20:46 +1200 |
| commit | 6ecc6da486d6284bf85906c34f96eacc86c2f1b1 (patch) | |
| tree | 1b957059f053c9ba708260d8d69bb95faccfbe36 | |
| parent | be9438b01ce5d925c8aa8738cf0d3c74e990329e (diff) | |
| parent | 669976d5797168f02378565d62a27507ddd8f14e (diff) | |
| download | mitmproxy-6ecc6da486d6284bf85906c34f96eacc86c2f1b1.tar.gz mitmproxy-6ecc6da486d6284bf85906c34f96eacc86c2f1b1.tar.bz2 mitmproxy-6ecc6da486d6284bf85906c34f96eacc86c2f1b1.zip | |
Merge branch 'tox' of https://github.com/Kriechi/mitmproxy into Kriechi-tox
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .python-version | 2 | ||||
| -rw-r--r-- | tox.ini | 10 |
3 files changed, 13 insertions, 0 deletions
@@ -18,3 +18,4 @@ node_modules bower_components *.map sslkeylogfile.log +.tox/ diff --git a/.python-version b/.python-version new file mode 100644 index 00000000..2339c8bf --- /dev/null +++ b/.python-version @@ -0,0 +1,2 @@ +2.7.11 +3.5.1 diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..9984eb1b --- /dev/null +++ b/tox.ini @@ -0,0 +1,10 @@ +[tox] +envlist = py27, py35, lint + +[testenv] +deps = -rrequirements.txt +commands = py.test -n 8 --timeout 60 ./test/netlib ./test/mitmproxy/script ./test/pathod/test_utils.py ./test/pathod/test_log.py + +[testenv:lint] +deps = flake8 +commands = flake8 --exit-zero --count mitmproxy netlib pathod examples test |