From 000bff1e5f5a9a835016ed9cd565aa3c97104c30 Mon Sep 17 00:00:00 2001 From: Pablo Ricco Date: Wed, 22 Apr 2020 16:39:32 -0300 Subject: [PATCH] Fix for travis. --- .travis.yml | 33 +++++++++++++++++++++------------ tox.ini | 14 -------------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 375bbca..aec2898 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,32 @@ sudo: false language: python -python: - - "3.5" - - "3.6" - - "3.7" - - "3.8" - -env: - - DJANGO="2.0" - - DJANGO="2.1" - - DJANGO="2.2" - - DJANGO="3.0" +matrix: + include: + - python: 3.5 + env: TOXENV=flake8 + - python: 3.5 + env: TOXENV=py35-django20 + - python: 3.7 + env: TOXENV=py37-django20 + - python: 3.5 + env: TOXENV=py35-django21 + - python: 3.7 + env: TOXENV=py37-django21 + - python: 3.5 + env: TOXENV=py35-django22 + - python: 3.8 + env: TOXENV=py38-django22 + - python: 3.6 + env: TOXENV=py36-django30 + - python: 3.8 + env: TOXENV=py38-django30 before_install: - pip install codecov install: - - pip install -U tox-travis + - pip install tox script: tox diff --git a/tox.ini b/tox.ini index 1bcbcbe..c98d6e2 100644 --- a/tox.ini +++ b/tox.ini @@ -23,17 +23,3 @@ deps = [testenv:flake8] deps=flake8 commands=flake8 qurl_templatetag tests - -[travis] -python = - 3.5: py35, flake8 - 3.6: py36 - 3.7: py37 - 3.8: py38 - -[travis:env] -DJANGO = - 2.0: django20 - 2.1: django21 - 2.2: django22 - 3.0: django30