Merge pull request #514 from dangra/mitmproxy-in-pip15

Mitmproxy in pip15

tests-requirements.txt

@@ -0,0 +1,9 @@
+# Remove PIL dependency once a new mitmproxy version is released
+# with bugfix: https://github.com/mitmproxy/mitmproxy/pull/197
+--allow-external PIL
+--allow-unverified PIL
+PIL>=1.1.7
+
+# Tests requirements
+mock
+mitmproxy

tox.ini

@@ -13,9 +13,7 @@ deps =
     boto
     Pillow
     django
-    # Only required to run tests
-    mock
-    mitmproxy
+    -rtests-requirements.txt
 commands =
     trial {posargs:scrapy}
 
@@ -29,8 +27,7 @@ deps =
     Pillow<2.0
     django==1.3.1
     cssselect==0.9.1
-    mock==1.0.1
-    mitmproxy==0.9.2
+    -rtests-requirements.txt
 
 [testenv:trunk]
 basepython = python2.7
@@ -48,9 +45,7 @@ deps =
     cssselect>=0.9
     queuelib>=1.1.1
     w3lib>=1.5
-    # Only required to run tests
-    mock>=1.0.1
-    mitmproxy>=0.9.2
+    -rtests-requirements.txt
 commands =
     trial {posargs:scrapy}