[tor-commits] [bridgedb/master] Update dependencies and install instructions in .travis.yml and README.

[isis at torproject.org]

commit 625549492522f08ebb0e185fa9fcc4b70808650e
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Oct 15 13:55:42 2013 +0000

    Update dependencies and install instructions in .travis.yml and README.
---
 .travis.yml |    9 ++-------
 README      |   30 +++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 735b214..48c8384 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,19 +11,14 @@ notifications:
     on_success: change
     on_failure: change
 before_install:
-  - echo "deb http://deb.torproject.org/torproject.org wheezy main" | sudo tee -a /etc/apt/sources.list
-  - gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89
-  - 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 openssl sqlite3
+  - sudo apt-get install tor-geoipdb build-essential python-dev python-setuptools openssl sqlite3 libgpgme11-dev
 python:
   - "2.6"
   - "2.7"
 install:
   - pip install -r requirements.txt --use-mirrors
-  - python setyp.py build
-  - python setup.py compile_catalog
-  - python setup.py install
+  - make install
 # command to run tests, e.g. python setup.py test
 script:
   - test -d run || mkdir run
diff --git a/README b/README
index 0ebb164..98f20c2 100644
--- a/README
+++ b/README
@@ -40,24 +40,28 @@ BridgeDB requires the following OS-level dependencies:
 
  - python>=2.7
  - python-dev
+ - build-essential
+ - libgpgme11-dev
  - OpenSSL>=1.0.1e
  - [SQLite3](http://www.maxmind.com/app/python)
- - [MaxMind GeoIP](https://www.maxmind.com/en/geolocation_landing)
+ - [MaxMind GeoIP](https://www.maxmind.com/en/geolocation_landing) (packaged
+   in Debian as tor-geoipdb)
  - [python-setuptools](https://pypi.python.org/pypi/setuptools)
 
 As well as any Python dependencies in requirements.txt.
 
 ### Deploying BridgeDB in a Python virtualenv
 
- - Install Python 2.6 or later, and other OS-level dependencies. On Debian,
+ - Install Python 2.7 or later, and other OS-level dependencies. On Debian,
    you can do:
 
-       sudo apt-get install python openssl sqlite3 tor-geoip
+       sudo apt-get install build-essential python python-dev \
+           python-setuptools openssl sqlite3 tor-geoip libgpgme11-dev
 
- - Install Pip 1.3.1 or later. Debian sid has this version, but if you're
-   tracking a different release, the easiest way to install a newer Pip is to
-   use the Pip development teams's
-   [getpip script](https://raw.github.com/pypa/pip/master/contrib/get-pip.py):
+ - Install Pip 1.3.1 or later. Debian has this version, but if for some reason
+   that or a newer version isn't available, the easiest way to install a newer
+   Pip is to use the Pip development teams's [getpip
+   script](https://raw.github.com/pypa/pip/master/contrib/get-pip.py):
 
        wget https://raw.github.com/pypa/pip/master/contrib/get-pip.py
        sudo python get-pip.py
@@ -207,12 +211,16 @@ Enter the following commands at the ```sqlite>``` prompt:
  
 
 ## Running BridgeDB
-To run BridgeDB, simply make any necessary changes to bridgedb.conf, and do:
+
+To run BridgeDB, simply make any necessary changes to bridgedb.conf, navigate
+to the runtime directory (the ```RUN_IN_DIR``` option in bridgedb.conf), and
+do:
 
     bridgedb -c bridgedb.conf
 
-When you have new lists of bridges, replace the old files and send the process
-a SIGHUP.
+When you have new lists of bridges, replace the old files and do:
+
+    bridgedb --reload
 
 Make sure that the files and directories referred to in bridgedb.conf
 exist. However, many of them, if not found, will be touched on disk so that
@@ -230,7 +238,7 @@ foobar-2010-07-17.brdgs. The first file would contain 10 bridges from
 BridgeDB's 'unallocated' pool. The second file would contain 15 bridges from
 the same pool and the third one similarly 3 bridges. These files can then be
 handed out to trusted parties via mail or fed to other distribution mechanisms
-such as twitter.
+such as Twitter.
 
 #### To use with HTTPS:
 Just connect to the appropriate port.