aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-01-23 10:19:43 +0100
committerGitHub <noreply@github.com>2017-01-23 10:19:43 +0100
commit86174eb6adfb83de6ba4dfbcff73ee9cb18ac4aa (patch)
treed7efcffe29ad4ddc500b968edbdedc110f7dbb64 /setup.py
parent0022c810e53eb0165abcdff2963100c78bcd4d7f (diff)
parent127c69c3ac901b48549afcfa802994394b7241e6 (diff)
downloadmitmproxy-86174eb6adfb83de6ba4dfbcff73ee9cb18ac4aa.tar.gz
mitmproxy-86174eb6adfb83de6ba4dfbcff73ee9cb18ac4aa.tar.bz2
mitmproxy-86174eb6adfb83de6ba4dfbcff73ee9cb18ac4aa.zip
Merge pull request #1950 from Kriechi/nuke-mock
nuke mock dependency
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 2fb55941..85eece95 100644
--- a/setup.py
+++ b/setup.py
@@ -100,7 +100,6 @@ setup(
"mypy-lang>=0.4.6, <0.5",
"rstcheck>=2.2, <4.0",
"tox>=2.3, <3",
- "mock>=2.0, <2.1",
"pytest>=3, <3.1",
"pytest-cov>=2.2.1, <3",
"pytest-timeout>=1.0.0, <2",