[tor-commits] [bridgedb/master] Move several test dependencies from .travis.yml to .travis.requirements.txt.

[isis at torproject.org]

commit 3c9b8732a5c9119837212056306deb4353d6e7bd
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Aug 7 06:06:31 2014 +0000

    Move several test dependencies from .travis.yml to .travis.requirements.txt.
---
 .travis.requirements.txt |   24 ++++++++++++++++++++++++
 .travis.yml              |    7 -------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index e018631..428438a 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -1,3 +1,27 @@
+#
+# This is a pip requirements.txt file for running BridgeDB's tests on Travis
+# See https://travis-ci.org/ and the .travis.yml file for more info. Please
+# note that there may be additional dependencies not listed here but specified
+# with their version numbers in .travis.yml in order to submit test runs which
+# use multiple different dependency versions.
+#
+#------------------------------------------------------------------------------
+#
+# To run install these dependencies and run the tests, do:
+#
+#     $ pip install -r .test.requirements.txt
+#     $ make coverage
+#
+#------------------------------------------------------------------------------
+coverage==3.7.1
+coveralls==0.4.2
+leekspin==0.1.4
+mechanize==0.2.5
+pep8==1.5.7
+# pylint must be pinned until pylint bug #203 is fixed. See
+# https://bitbucket.org/logilab/pylint/issue/203/importing-namespace-packages-crashes#comment-11013783
+pylint==1.1.0
+sure==1.2.2
 Babel==0.9.6
 BeautifulSoup==3.2.1
 Mako==0.8.1
diff --git a/.travis.yml b/.travis.yml
index 7374fa7..9066fc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,11 +26,6 @@ addons:
     - bridges.torproject.org
 
 env:
-  global:
-    - LEEKSPIN_VERSION=0.1.4
-    - COVERAGE_VERSION=3.7.1
-    - COVERALLS_VERSION=0.4.2
-    - SURE_VERSION=1.2.2
   matrix:
     - TWISTED_VERSION=13.2.0 PYOPENSSL_VERSION=0.13.1
 
@@ -48,8 +43,6 @@ before_install:
 install:
   - sudo apt-get install -qq --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools
   - pip install -q -r .travis.requirements.txt
-  - pip install -q --no-use-wheel leekspin==$LEEKSPIN_VERSION sure==$SURE_VERSION
-  - pip install -q --no-use-wheel coverage==$COVERAGE_VERSION coveralls==$COVERALLS_VERSION
   - pip install -q --no-use-wheel Twisted==$TWISTED_VERSION pyOpenSSL==$PYOPENSSL_VERSION
   - make install