[tor-commits] [oonib/master] Install tor keyring in .travis.yml and use deb.tpo for Tor install.

[isis at torproject.org]

commit 19d00c22aa4dbdcfef7add3a42847a5f0558fd7e
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Apr 19 23:36:24 2013 +0000

    Install tor keyring in .travis.yml and use deb.tpo for Tor install.
    
     * Change pip's package index command to be in the requirements.txt file.
---
 .travis.yml      |   11 ++++++-----
 requirements.txt |    2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1a2509f..ba72972 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,16 @@
 language: python
 before_install:
-  - sudo apt-get install build-essential python-dev python-setuptools tor
-  #- curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
-  #- sudo python ./get-pip.py
-  #- sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0
+  - echo "deb http://deb.torproject.org/torproject.org wheezy main" | sudo tee -a /etc/apt/sources.list
+  - gpg --keyserver keys.gnupg.net --recv 886DDD89
+  - gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+  - sudo apt-get update
+  - sudo apt-get install deb.torproject.org-keyring tor tor-geoipdb build-essential python-dev python-setuptools
 python:
   - "3.3"
   - "2.7"
   - "2.6"
 install:
-  - pip install -i "https://pypi.python.org/packages/" --use-mirrors -r requirements.txt
+  - pip install --use-mirrors -r requirements.txt
   - python setup.py install
 # command to run tests, e.g. python setup.py test
 script:
diff --git a/requirements.txt b/requirements.txt
index de420b0..32965fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
+-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://twistedmatrix.com/Releases/Names/13.0/TwistedNames-13.0.0.tar.bz2#md5=9264b6f9fc85e1f7ed31d5fd13eeb48a#egg=TwistedNames
 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