From 7fabb813deb9a302f21e65323057a7cc986cd331 Mon Sep 17 00:00:00 2001 From: Tyson Clugg Date: Mon, 21 Dec 2015 22:03:19 +1100 Subject: [PATCH] Fix Travis CI build matrix. --- .travis.yml | 21 +++++++++++---------- Makefile | 1 + 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77e030b..6f50af9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,11 @@ python: - "pypy3" env: - - DJANGO="1.8" - - DJANGO="1.9" - - PGDATABASE="django_ddp_test_project" - - PGUSER="postgres" + matrix: + - DJANGO="1.8" + - DJANGO="1.9" + - PGDATABASE="django_ddp_test_project" + - PGUSER="postgres" # Django 1.9 dropped support for Python 3.3 matrix: @@ -33,12 +34,12 @@ before_install: install: - pip install -U tox coveralls setuptools - - '[[ $TRAVIS_PYTHON_VERSION == "2.7" ]] && PYENV="py27"' - - '[[ $TRAVIS_PYTHON_VERSION == "3.3" ]] && PYENV="py33"' - - '[[ $TRAVIS_PYTHON_VERSION == "3.4" ]] && PYENV="py34"' - - '[[ $TRAVIS_PYTHON_VERSION == "3.5" ]] && PYENV="py35"' - - '[[ $TRAVIS_PYTHON_VERSION == "pypy" ]] && PYENV="pypy"' - - '[[ $TRAVIS_PYTHON_VERSION == "pypy3" ]] && PYENV="pypy3"' + - test "$TRAVIS_PYTHON_VERSION" == "2.7" && PYENV="py27"' + - test "$TRAVIS_PYTHON_VERSION" == "3.3" && PYENV="py33"' + - test "$TRAVIS_PYTHON_VERSION" == "3.4" && PYENV="py34"' + - test "$TRAVIS_PYTHON_VERSION" == "3.5" && PYENV="py35"' + - test "$TRAVIS_PYTHON_VERSION" == "pypy" && PYENV="pypy"' + - test "$TRAVIS_PYTHON_VERSION" == "pypy3" && PYENV="pypy3"' before_script: - env | sort diff --git a/Makefile b/Makefile index 22f9975..8deb08b 100644 --- a/Makefile +++ b/Makefile @@ -52,4 +52,5 @@ upload-docs: docs/_build/ .travis.yml.ok: .travis.yml @travis --version > "$@" || { echo 'Install travis command line client?'; exit 1; } + sha1sum "$<" >> "$@" travis lint --exit-code | tee -a "$@"