diff options
author | Aldo Cortesi <aldo@corte.si> | 2016-06-08 09:06:47 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@corte.si> | 2016-06-08 09:06:47 +1200 |
commit | eb680e7764ec902518bc66e4d5c7667326ed5811 (patch) | |
tree | a1b093e0d72382516fd55cc1de8b61bf39ab4dee /setup.py | |
parent | c98c83190baa078539b79136c2de348985cc61cc (diff) | |
parent | 14ac916bceac2aa10e55b8ea69973d5159cb6823 (diff) | |
download | mitmproxy-eb680e7764ec902518bc66e4d5c7667326ed5811.tar.gz mitmproxy-eb680e7764ec902518bc66e4d5c7667326ed5811.tar.bz2 mitmproxy-eb680e7764ec902518bc66e4d5c7667326ed5811.zip |
Merge pull request #1226 from Kriechi/travis-tox
use tox in Travis
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -97,8 +97,8 @@ setup( "ipaddress>=1.0.15, <1.1", ], 'dev': [ + "tox>=2.3, <3", "mock>=2.0, <2.1", - "flake8>=2.5.4, <3", "pytest>=2.8.7, <2.10", "pytest-cov>=2.2.1, <2.3", "pytest-timeout>=1.0.0, <1.1", |