Merge branch 'master' of ssh.github.com:cortesi/mitmproxy

nderkach · Jan 28, 2014 · fcb569b · fcb569b
2 parents 0b7a7ff + 1251660
commit fcb569b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,10 @@ python:
   - "2.7"
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: 
-  - "pip install coveralls --use-mirrors"
-  - "pip install nose-cov --use-mirrors"
   - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git"
-  - "pip install -r requirements.txt --use-mirrors"
   - "pip install --upgrade git+https://github.com/mitmproxy/pathod.git"
+  - "pip install -r requirements.txt --use-mirrors"
+  - "pip install -r test/requirements.txt --use-mirrors"
 # command to run tests, e.g. python setup.py test
 script: 
   - "nosetests --with-cov --cov-report term-missing"

diff --git a/test/requirements.txt b/test/requirements.txt
@@ -0,0 +1,5 @@
+mock>=1.0.1
+nose>=1.3.0
+nose-cov>=1.6
+coveralls>=0.4.1
+pathod>=0.10