From 958d0dbf3987f4e473055640c3724e6b18522d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Fri, 3 Jan 2014 18:55:38 -0200
Subject: [PATCH 1/3] move tests requirements to a single place

---
 test-requirements.txt |  2 ++
 tox.ini               | 11 +++--------
 2 files changed, 5 insertions(+), 8 deletions(-)
 create mode 100644 test-requirements.txt

diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 000000000..c2024fc02
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,2 @@
+mock
+mitmproxy
diff --git a/tox.ini b/tox.ini
index 171feaa98..6b72ee8b4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,9 +13,7 @@ deps =
     boto
     Pillow
     django
-    # Only required to run tests
-    mock
-    mitmproxy
+    -rtest-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
+    -rtest-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
+    -rtest-requirements.txt
 commands =
     trial {posargs:scrapy}
 

From face0bf4b42214f544aeb23a88c22a35a33aaf65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Fri, 3 Jan 2014 19:00:47 -0200
Subject: [PATCH 2/3] Force PIL installation to comply with mitmproxy
 requirements. closes #513

---
 test-requirements.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test-requirements.txt b/test-requirements.txt
index c2024fc02..00fbc8085 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +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

From 02c80ca75bdd4015d77771fa522e4fe5134b5b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Fri, 3 Jan 2014 21:02:25 -0200
Subject: [PATCH 3/3] rename tests requirements to forward looking for /tests/

---
 test-requirements.txt => tests-requirements.txt | 0
 tox.ini                                         | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename test-requirements.txt => tests-requirements.txt (100%)

diff --git a/test-requirements.txt b/tests-requirements.txt
similarity index 100%
rename from test-requirements.txt
rename to tests-requirements.txt
diff --git a/tox.ini b/tox.ini
index 6b72ee8b4..ed436d933 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ deps =
     boto
     Pillow
     django
-    -rtest-requirements.txt
+    -rtests-requirements.txt
 commands =
     trial {posargs:scrapy}
 
@@ -27,7 +27,7 @@ deps =
     Pillow<2.0
     django==1.3.1
     cssselect==0.9.1
-    -rtest-requirements.txt
+    -rtests-requirements.txt
 
 [testenv:trunk]
 basepython = python2.7
@@ -45,7 +45,7 @@ deps =
     cssselect>=0.9
     queuelib>=1.1.1
     w3lib>=1.5
-    -rtest-requirements.txt
+    -rtests-requirements.txt
 commands =
     trial {posargs:scrapy}