diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-01-28 15:12:57 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-01-28 15:12:57 +1300 |
| commit | fcb569b7d7d6fef6c9470201bd88ecdf3d8c19f5 (patch) | |
| tree | 7764e1446d2c01c1028c5c0e76f18565c274b05e | |
| parent | 0b7a7ffcb1b4ec65d2f68507acae7e20ee35ddc2 (diff) | |
| parent | 125166020be01d160911f6d73d8bc4f5b7b3ced4 (diff) | |
| download | mitmproxy-fcb569b7d7d6fef6c9470201bd88ecdf3d8c19f5.tar.gz mitmproxy-fcb569b7d7d6fef6c9470201bd88ecdf3d8c19f5.tar.bz2 mitmproxy-fcb569b7d7d6fef6c9470201bd88ecdf3d8c19f5.zip | |
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | test/requirements.txt | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 82900952..d2c75523 100644 --- 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 new file mode 100644 index 00000000..89e4aa0a --- /dev/null +++ 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
\ No newline at end of file |