diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-08 09:19:25 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-08 09:19:25 +1200 |
| commit | db11fe0087776c2bf5d95f5aeb751c6c35d67f4b (patch) | |
| tree | 1aab054770dee86506a1897093dde2d35489a0de /setup.py | |
| parent | ba466dbb358eba223c49fbe602a667aa1a3c7459 (diff) | |
| parent | eb680e7764ec902518bc66e4d5c7667326ed5811 (diff) | |
| download | mitmproxy-db11fe0087776c2bf5d95f5aeb751c6c35d67f4b.tar.gz mitmproxy-db11fe0087776c2bf5d95f5aeb751c6c35d67f4b.tar.bz2 mitmproxy-db11fe0087776c2bf5d95f5aeb751c6c35d67f4b.zip | |
Merge branch 'master' into beautiful-json
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -97,9 +97,8 @@ setup( "ipaddress>=1.0.15, <1.1", ], 'dev': [ - "coveralls>=1.1, <1.2", + "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", |