diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-05 18:36:25 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-05 18:36:25 -0700 |
| commit | c9b7f342654d735ca4a18ff2825e4ac186cf4e74 (patch) | |
| tree | 3faf561ae7caf3e26681a6c5b8c7524fee86da1c | |
| parent | e84f5fcc7224d5cbbf3cf77eadfcd3aeb71fc7db (diff) | |
| parent | 882b8b5d80e308599bdb602a390edd8d2be065e4 (diff) | |
| download | mitmproxy-c9b7f342654d735ca4a18ff2825e4ac186cf4e74.tar.gz mitmproxy-c9b7f342654d735ca4a18ff2825e4ac186cf4e74.tar.bz2 mitmproxy-c9b7f342654d735ca4a18ff2825e4ac186cf4e74.zip | |
Merge branch 'dont-cache-tox'
| -rw-r--r-- | .appveyor.yml | 3 | ||||
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 8a83b478..61817a92 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,7 +25,7 @@ install: - "pip install -U tox" test_script: - - ps: "tox --recreate -- --cov netlib --cov mitmproxy --cov pathod | Select-String -NotMatch Cryptography_locking_cb" + - ps: "tox -- --cov netlib --cov mitmproxy --cov pathod | Select-String -NotMatch Cryptography_locking_cb" deploy_script: ps: | @@ -41,7 +41,6 @@ deploy_script: cache: - C:\Users\appveyor\AppData\Local\pip\cache - - C:\projects\mitmproxy\.tox notifications: - provider: Slack diff --git a/.travis.yml b/.travis.yml index 29d0897c..345d6a58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,8 +71,4 @@ notifications: on_failure: change on_start: never -cache: - directories: - - $HOME/build/mitmproxy/mitmproxy/.tox - - $HOME/.cache/pip - - $HOME/.pyenv +cache: pip @@ -3,7 +3,6 @@ envlist = py27, py35, docs, lint skipsdist = True [testenv] -usedevelop = True deps = {env:CI_DEPS:} -rrequirements.txt @@ -26,5 +25,4 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:lint] deps = flake8>=2.6.2, <3 -usedevelop = False commands = flake8 --jobs 8 --count mitmproxy netlib pathod examples test |