From 2657e68bb8ce4bdcad4a1a381ad4e26d7d6c9230 Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Sun, 1 Mar 2020 09:31:39 -0500 Subject: [PATCH 1/2] restore commented-out tests --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 66a59d5d6..9c476eab8 100644 --- a/tox.ini +++ b/tox.ini @@ -6,10 +6,9 @@ envlist = py37-django{30,22,21}, py36-django{22,21}, py35-django{22,21}, -# FIXME: something is broken in DRF integration, enable once fixed -# py38-djangomaster, -# py37-djangomaster, -# py36-djangomaster, + py38-djangomaster, + py37-djangomaster, + py36-djangomaster, [pytest] django_find_project = false @@ -51,6 +50,7 @@ commands = deps = flake8 flake8-isort +# TODO: restore this: # flake8-quotes [coverage:run] From 52b450b5aee2ca34ae2b886c2850978e949da85a Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Sun, 1 Mar 2020 09:49:32 -0500 Subject: [PATCH 2/2] explicit tox matrix to enable allowed failures --- .travis.yml | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1cf0c8852..2aef56d6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,17 +3,52 @@ dist: bionic language: python -python: - - "3.8" - - "3.7" - - "3.6" - - "3.5" - cache: directories: - $HOME/.cache/pip - $TRAVIS_BUILD_DIR/.tox +# Make sure to coordinate changes to envlist in tox.ini. +matrix: + allow_failures: + - env: TOXENV=py36-djangomaster + - env: TOXENV=py37-djangomaster + - env: TOXENV=py38-djangomaster + + include: + - python: 3.7 + env: TOXENV=py37-flake8 + - python: 3.7 + env: TOXENV=py37-docs + + - python: 3.8 + env: TOXENV=py38-django30 + - python: 3.8 + env: TOXENV=py38-django22 + - python: 3.8 + env: TOXENV=py38-django21 + - python: 3.8 + env: TOXENV=py38-djangomaster + + - python: 3.7 + env: TOXENV=py37-django30 + - python: 3.7 + env: TOXENV=py37-django22 + - python: 3.7 + env: TOXENV=py37-django21 + - python: 3.7 + env: TOXENV=py37-djangomaster + + - python: 3.6 + env: TOXENV=py36-django22 + - python: 3.6 + env: TOXENV=py36-django21 + + - python: 3.5 + env: TOXENV=py35-django22 + - python: 3.5 + env: TOXENV=py35-django21 + install: - pip install coveralls tox tox-travis