Merge branch 'dont-cache-tox'

This commit is contained in:
Maximilian Hils 2016-07-05 18:36:25 -07:00
commit c9b7f34265
3 changed files with 2 additions and 9 deletions

View File

@ -25,7 +25,7 @@ install:
- "pip install -U tox" - "pip install -U tox"
test_script: 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: deploy_script:
ps: | ps: |
@ -41,7 +41,6 @@ deploy_script:
cache: cache:
- C:\Users\appveyor\AppData\Local\pip\cache - C:\Users\appveyor\AppData\Local\pip\cache
- C:\projects\mitmproxy\.tox
notifications: notifications:
- provider: Slack - provider: Slack

View File

@ -71,8 +71,4 @@ notifications:
on_failure: change on_failure: change
on_start: never on_start: never
cache: cache: pip
directories:
- $HOME/build/mitmproxy/mitmproxy/.tox
- $HOME/.cache/pip
- $HOME/.pyenv

View File

@ -3,7 +3,6 @@ envlist = py27, py35, docs, lint
skipsdist = True skipsdist = True
[testenv] [testenv]
usedevelop = True
deps = deps =
{env:CI_DEPS:} {env:CI_DEPS:}
-rrequirements.txt -rrequirements.txt
@ -26,5 +25,4 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
[testenv:lint] [testenv:lint]
deps = flake8>=2.6.2, <3 deps = flake8>=2.6.2, <3
usedevelop = False
commands = flake8 --jobs 8 --count mitmproxy netlib pathod examples test commands = flake8 --jobs 8 --count mitmproxy netlib pathod examples test