Disable thinkprogress and zillow.

jsha · jsha · commit b01e850b92fd · 2015-04-03T17:17:31.000-07:00
Fixes EFForg#1353 Also update requirements.txt and ruleset-testing.md per contributor feedback.
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,5 @@
 lxml>=3.3.3
+pycurl
+regex
+bsdiff4
+python-Levenshtein
diff --git a/ruleset-testing.md b/ruleset-testing.md
@@ -57,18 +57,10 @@ will break the build. This means that even fixes of existing rules may require
 additional work to bring them up to snuff.
 
 To run the tests locally, you'll need the https-everywhere-checker, which is now
-a submodule of https-everywhere. Run these commands to set it up:
+a submodule of https-everywhere. To set it up, run:
 
-    git submodule init
-    git submodule update
-    cd https-everywhere-checker
-    pip install --user -r requirements.txt
-    cd -
-    ./test-ruleset-coverage.sh
-
-Note you may also need to apt-get install libcurl4-openssl-dev so that one of
-the requirements in https-everywhere-checker can be satisfied.
+    ./install-dev-dependencies.sh
 
 To test a specific ruleset:
 
-     python2.7 https-everywhere-checker/src/https_everywhere_checker/check_rules.py https-everywhere-checker/checker.config.sample rules/Example.xml
+     ./fetch-test.sh rules/Example.xml
diff --git a/src/chrome/content/rules/Center-for-American-Progress.xml b/src/chrome/content/rules/Center-for-American-Progress.xml
@@ -14,7 +14,7 @@
 	¹ Secured by us
 
 -->
-<ruleset name="Center for American Progress (partial)">
+<ruleset name="Center for American Progress (partial)" default_off="breaks site">
 
 	<target host="thinkprogress.org"/>
 	<target host="www.thinkprogress.org"/>
diff --git a/src/chrome/content/rules/Zillow.xml b/src/chrome/content/rules/Zillow.xml
@@ -1,4 +1,7 @@
 <!--
+	Disbaled because it breaks overlay on pages like http://www.zillow.com/homes/for_sale/San-Francisco-CA/San-Francisco-CA_rb/
+	See https://github.com/EFForg/https-everywhere/issues/1353
+
 	For problematic rules, see Zillow-problematic.xml
 
 
@@ -63,7 +66,7 @@
 	* Secured by us, doesn't trip MCB anyway
 
 -->
-<ruleset name="Zillow (partial)">
+<ruleset name="Zillow (partial)" default_off="Breaks overlays">
 
 	<target host="zillow.com" />
 	<target host="*.zillow.com" />

-Original file line number
+Diff line change
@@ @@ -1 +1,5 @@ @@
 lxml>=3.3.3
 +pycurl
 +regex
 +bsdiff4
 +python-Levenshtein