diff --git a/.appveyor.yml b/.appveyor.yml index 8a83b478a..61817a920 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 29d0897c9..345d6a588 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 diff --git a/tox.ini b/tox.ini index cab23b66c..bbfa438f9 100644 --- a/tox.ini +++ b/tox.ini @@ -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