commit d6e8b08ce07a0664c2bbf55a2b40d47ea02cc795 Author: Isis Lovecruft isis@torproject.org Date: Mon Mar 11 21:00:38 2013 +0000

Update .travis.yml to put the install commands under the install section.

* Separate commands for testing pip and setuptools installations. * TODO I believe there is a way to tell TravisCI to try both, we should check the docs.

travis-lint results: (ooni)∃!isisⒶwintermute:~/code/torproject/ooni-probe ∴ travis-lint Hooray, /home/isis/code/torproject/ooni-probe/.travis.yml seems to be solid! (ooni)∃!isisⒶwintermute:~/code/torproject/ooni-probe ∴ date Mon Mar 11 21:00:27 UTC 2013 --- .travis.yml | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml index e2b5e29..9c89f6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,13 @@ python: - "3.3" - "2.7" - "2.6" -# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors -install: pip install -r requirements.txt --use-mirrors && cp ooniprobe.conf.sample ooniprobe.conf +# command to install dependencies +# the first is for testing pip and the second for setuptools +install: + #- pip install -r requirements.txt --use-mirrors + - python setup.py install # command to run tests, e.g. python setup.py test script: - - python setup.py install # To be activated after merge of PR#64 # - trial ooni - cp ooniprobe.conf.sample ooniprobe.conf