aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-05 15:58:52 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-07-05 15:58:52 -0700
commit882b8b5d80e308599bdb602a390edd8d2be065e4 (patch)
treeb00eb8c8fd0901df1cd7de9d71b3ebd8113208f2
parent09d678272245dd12efe91ecadbe0b2731f4306b1 (diff)
downloadmitmproxy-882b8b5d80e308599bdb602a390edd8d2be065e4.tar.gz
mitmproxy-882b8b5d80e308599bdb602a390edd8d2be065e4.tar.bz2
mitmproxy-882b8b5d80e308599bdb602a390edd8d2be065e4.zip
don't cache tox on CI
-rw-r--r--.appveyor.yml3
-rw-r--r--.travis.yml6
-rw-r--r--tox.ini2
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
diff --git a/tox.ini b/tox.ini
index cab23b66..bbfa438f 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