Skip to content

Travis: upgrade tox to 2.9.1, improve cache handling #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ matrix:

cache:
directories:
- "${TRAVIS_BUILD_DIR}/.tox"
- "${TRAVIS_BUILD_DIR}/.tox/${TOXENV}"

install:
# Create pip wrapper script, using travis_retry (a function) and
Expand All @@ -72,7 +72,7 @@ install:
- if diff tox.ini tox.ini.bak; then exit 1; fi
- printf '\nwhitelist_externals = travis_retry_pip' >> tox.ini

- pip install tox==2.7.0
- pip install tox==2.9.1
- |
if [[ "${TOXENV%-checkqa}" == "$TOXENV" ]]; then
export PYTEST_ADDOPTS='--cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered'
Expand All @@ -81,7 +81,6 @@ install:

script:
- tox
- "find ${TRAVIS_BUILD_DIR}/.tox -name 'log' -o -name '__pycache__' -type d | xargs -I {} rm -rf {}"

after_success:
- |
Expand All @@ -97,3 +96,6 @@ after_success:
codecov --required -X search gcov pycov -f coverage.xml --flags $codecov_flags
fi
set +x

before_cache:
- "find ${TRAVIS_BUILD_DIR}/.tox/${TOXENV} -name 'log' -o -name '__pycache__' -type d | xargs -I {} rm -rf {}"