From 7e1e981df60252756ee82a3601d131a61cc44796 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Sat, 27 Feb 2016 01:05:35 +0100 Subject: [PATCH 1/2] Test travis cache --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5d26756..2aadc52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,3 +89,8 @@ matrix: env: DJANGO='django17' CMS='cms31' - python: 3.5 env: DJANGO='django17' CMS='cms32' + + +cache: + directories: + $HOME/.tox From f03aa2d4a692d0981f07895260816a0f1b49a7e3 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Sat, 27 Feb 2016 07:42:48 +0100 Subject: [PATCH 2/2] Add travis cache --- .travis.yml | 8 +++++--- tox.ini | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2aadc52..25b70f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ env: # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - - pip install -U tox>=1.8 coveralls - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then export PYVER=py26; fi" - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi" - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi" @@ -40,7 +39,7 @@ install: script: COMMAND='coverage run' tox -e$TOXENV before_install: - - pip install codecov + - pip install -U tox>=1.8 coveralls codecov wheel pip after_success: - codecov - coveralls @@ -93,4 +92,7 @@ matrix: cache: directories: - $HOME/.tox + - $HOME/.pip-accel + - $HOME/.cache/pip + + diff --git a/tox.ini b/tox.ini index f5e33aa..880745f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,9 @@ [tox] -envlist = pep8,isort,py{35,34,33,27}-django{19,18}-cms{32,31},py{34,33,27}-django{17,16}-cms{32,31,30},py{26}-django16-cms{31,30} +envlist = pep8,isort,py{35,34,27}-django{19}-cms{32},py{35,34,33,27}-django{18}-cms{32,31},py{34,33,27}-django{17,16}-cms{32,31,30},py{26}-django16-cms{31,30} [testenv] commands = {env:COMMAND:python} cms_helper.py test djangocms_blog --no-migrate deps = - -r{toxinidir}/requirements-test.txt django16: Django>=1.6,<1.7 django16: django-taggit<0.18 django16: django-mptt<0.8 @@ -24,6 +23,7 @@ deps = py26: unittest2 https://github.com/aldryn/aldryn-apphooks-config/archive/master.zip https://github.com/nephila/djangocms-apphook-setup/archive/master.zip + -r{toxinidir}/requirements-test.txt [testenv:isort] deps = isort