[tor-commits] [ooni-probe/master] Fetch dnspython and scapy from pypi instead of the tpo mirror

[art@xxxxxxxxxxxxxx]

commit d4d8b0bb5d44b464b9553bda49be7b86362bfa82
Author: Arturo Filastò <art@xxxxxxxxx>
Date:   Wed Jul 10 16:53:09 2013 +0200

    Fetch dnspython and scapy from pypi instead of the tpo mirror
---
 requirements.txt |   17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b335716..691c0ce 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,6 +11,7 @@ txsocksx>=0.0.2
 Pyrex>=0.9.8.6
 parsley>=1.1
 cyclone
+dnspython>=1.10.0
 
 # Taken from the versions required by twisted 13.0.0 (latest)
 transaction>=1.1.1
@@ -18,16 +19,6 @@ zope.component>=3.5
 zope.event>=3.5
 zope.interface>=3.6
 
-# This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast
-# Originally fetched from the hg repo on secdev.org:
-#   https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy
-# Mirrored on Tor's webserver:
-# This should be scapy>=2.2.0, but pip does not like it
-https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-2013-tip.zip
-# This was 'dnspython>=1.10.0' above until it failed to download many times.
-# Originally fetched from dnspython but it timed out often:
-#   http://www.dnspython.org/kits/1.10.0/dnspython-1.10.0.zip
-# Mirrored on Tor's webserver:
-# This should be the below, but pip does not like it.
-dnspython>=1.10.0
-https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/dnspython-1.10.0.zip
+# Get scapy 2.2 from pypi
+# https://pypi.python.org/pypi/scapy-real/2.2.0-dev
+scapy-real



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits