[tor-commits] [oonib/master] Testing pip1.3.1 without explicit https per-package PI URIs.

[isis at torproject.org]

commit 06611c7a6ff7c2a9ff00f7f4676f8f8213374308
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Apr 20 00:05:37 2013 +0000

    Testing pip1.3.1 without explicit https per-package PI URIs.
---
 requirements.txt |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 32965fa..00aac7b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,23 @@
 -i https://pypi.python.org/packages
-https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz#md5=74c94a383886519e9e7b3dd1ee540247#egg=PyYAML
-https://pypi.python.org/packages/source/T/Twisted/Twisted-13.0.0.tar.bz2#md5=68afff4e1efd3757d934e39f70c99f57#egg=Twisted
-https://pypi.python.org/packages/source/c/cyclone/cyclone-1.1.tar.gz#md5=477c5ef9cf8902e37105fe450c4d8c5d#egg=cyclone
-https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr
-https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.2.6.zip#md5=b3ac1bfcd535782bc59af78e722cf5c1#egg=pygeoip
+PyYAML>=3.10
+#https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz#md5=74c94a383886519e9e7b3dd1ee540247#egg=PyYAML
+Twisted>=12.2.0
+#https://pypi.python.org/packages/source/T/Twisted/Twisted-13.0.0.tar.bz2#md5=68afff4e1efd3757d934e39f70c99f57#egg=Twisted
+cyclone>=1.1
+#https://pypi.python.org/packages/source/c/cyclone/cyclone-1.1.tar.gz#md5=477c5ef9cf8902e37105fe450c4d8c5d#egg=cyclone
+ipaddr>=2.1.10
+#https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr
+pygeoip>=0.2.6
+#https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.2.6.zip#md5=b3ac1bfcd535782bc59af78e722cf5c1#egg=pygeoip
 # Originally fetched from the hg repo on secdev.org:
 #   https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy
 # This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast:
 https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-2013-tip.zip#egg=scapy
-https://pypi.python.org/packages/source/t/transaction/transaction-1.4.1.zip#md5=8db2680bc0f999219861a67b8f335a88#egg=transaction
-https://pypi.python.org/packages/source/s/storm/storm-0.19.tar.gz#md5=61d1ee4cd2a08639ab917e43fa2c9265#egg=storm
-# If any of the above failed, try the normal way:
-#PyYAML>=3.10
-#Twisted>=12.2.0
-#cyclone>=1.0-rc13
-#ipaddr>=2.1.10
-#pygeoip>=0.2.5
-#storm>=0.19
-#txtorcon>=0.7
+transaction>=1.4.1
+#https://pypi.python.org/packages/source/t/transaction/transaction-1.4.1.zip#md5=8db2680bc0f999219861a67b8f335a88#egg=transaction
+storm>=0.19
+#https://pypi.python.org/packages/source/s/storm/storm-0.19.tar.gz#md5=61d1ee4cd2a08639ab917e43fa2c9265#egg=storm
+txtorcon>=0.7
+zope.component>=4.0.0
+zope.event>=4.0.0
+zope.interface>=4.0.1