diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-01-29 08:19:25 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-01-29 08:19:25 +1300 |
| commit | 1572d14cc336215a7cf8d6e20b4ad4a25bfd60ef (patch) | |
| tree | c3fcc8b916855b386c4f1635d3eb13ecbb264bc9 | |
| parent | dc6d573d3910a6f79b8aef44986137ce0ce5aa20 (diff) | |
| parent | ea894282f3a659cbb9466ce235c21f53f002ac3a (diff) | |
| download | mitmproxy-1572d14cc336215a7cf8d6e20b4ad4a25bfd60ef.tar.gz mitmproxy-1572d14cc336215a7cf8d6e20b4ad4a25bfd60ef.tar.bz2 mitmproxy-1572d14cc336215a7cf8d6e20b4ad4a25bfd60ef.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | requirements.txt | 3 | ||||
| -rw-r--r-- | test/requirements.txt | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f13d5cff..2cc19030 100644 --- a/.travis.yml +++ b/.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" diff --git a/requirements.txt b/requirements.txt index 8821e295..c8faa9e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,7 @@ 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 -netlib>=0.10 +netlib>=0.10
\ No newline at end of file diff --git a/test/requirements.txt b/test/requirements.txt new file mode 100644 index 00000000..1bfe2b7b --- /dev/null +++ b/test/requirements.txt @@ -0,0 +1,4 @@ +mock>=1.0.1 +nose>=1.3.0 +nose-cov>=1.6 +coveralls>=0.4.1
\ No newline at end of file |