From 433b2d5b806718b59c60effb24acbab2d31bbccd Mon Sep 17 00:00:00 2001 From: Fabre Florian Date: Tue, 7 Jan 2020 12:44:04 +0100 Subject: [PATCH] Fix travis matrix --- .travis.yml | 30 +++++++++++++++--------------- tox.ini | 3 +++ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 277568f..f36f2cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,29 +7,29 @@ python: - 3.5 - 3.6 env: - - DJANGO="1.8" - - DJANGO="1.9" - - DJANGO="1.10" - - DJANGO="1.11" - - DJANGO="2.0" - - DJANGO="2.1" - - DJANGO="2.2" -matrix: + - DJANGO=1.8 + - DJANGO=1.9 + - DJANGO=1.10 + - DJANGO=1.11 + - DJANGO=2.0 + - DJANGO=2.1 + - DJANGO=2.2 +jobs: - exclude: - python: 2.7 - env: DJANGO="2.0" + env: DJANGO=2.0 - python: 2.7 - env: DJANGO="2.1" - - - python: 3.4 - env: DJANGO="2.1" + env: DJANGO=2.1 - python: 2.7 - env: DJANGO="2.2" + env: DJANGO=2.2 - python: 3.4 - env: DJANGO="2.2" + env: DJANGO=2.1 + + - python: 3.4 + env: DJANGO=2.2 install: - pip install tox - pip install -q tox-travis diff --git a/tox.ini b/tox.ini index fcf97dc..0400eca 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,9 @@ envlist = py{27}-django{18,19,110,111}, [travis:env] DJANGO = + 1.8: django18 + 1.9: django19 + 1.10: django10 1.11: django111 2.0: django20 2.1: django21