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

.travis.yml

@@ -3,10 +3,9 @@ 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 -r test/requirements.txt --use-mirrors"
 # command to run tests, e.g. python setup.py test
 script: 
   - "nosetests --with-cov --cov-report term-missing"

requirements.txt

@@ -3,7 +3,6 @@ Jinja2>=2.7.1
 MarkupSafe>=0.18
 Werkzeug>=0.9.4
 itsdangerous>=0.23
-nose>=1.3.0
 pyOpenSSL>=0.13.1
 pyasn1>=0.1.7
 requests>=2.1.0

test/requirements.txt

@@ -0,0 +1,4 @@
+mock>=1.0.1
+nose>=1.3.0
+nose-cov>=1.6
+coveralls>=0.4.1