From 06d4dd873877b7e6b453c30f4041b3c872781656 Mon Sep 17 00:00:00 2001 From: Daniel Izquierdo Date: Wed, 19 Jun 2019 13:48:33 +0900 Subject: [PATCH 1/3] Fix tags missing when imported during collection --- django_coverage_plugin/plugin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/django_coverage_plugin/plugin.py b/django_coverage_plugin/plugin.py index 60c61df..e8da051 100644 --- a/django_coverage_plugin/plugin.py +++ b/django_coverage_plugin/plugin.py @@ -75,6 +75,8 @@ def check_debug(): return False if not hasattr(django.template.backends.django, "DjangoTemplates"): raise DjangoTemplatePluginException("Can't use non-Django templates.") + if not django.template.engines._engines: + return False for engine in django.template.engines.all(): if not isinstance(engine, django.template.backends.django.DjangoTemplates): From 5a6d145c3aca3c999d8cc85631be2119a291c911 Mon Sep 17 00:00:00 2001 From: Daniel Izquierdo Date: Wed, 19 Jun 2019 16:19:30 +0900 Subject: [PATCH 2/3] Update test environments for Django 2.2 --- tox.ini | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 58250ca..71e2ed9 100644 --- a/tox.ini +++ b/tox.ini @@ -16,9 +16,9 @@ envlist = py27-django{18,19,110,111,111tip}, py34-django{18,19,110,111,111tip,20}, - py35-django{18,19,110,111,111tip,20,21,tip}, - py36-django{18,19,110,111,111tip,20,21,tip}, - py37-django{20,21,tip}, + py35-django{18,19,110,111,111tip,20,21,22}, + py36-django{18,19,110,111,111tip,20,21,22,tip}, + py37-django{20,21,22,tip}, check,pkgcheck,doc [testenv] @@ -31,6 +31,7 @@ deps = django111tip: https://github.com/django/django/archive/stable/1.11.x.tar.gz django20: Django>=2.0,<2.1 django21: Django>=2.1,<2.2 + django22: Django>=2.2,<3.0 djangotip: https://github.com/django/django/archive/master.tar.gz commands = From a652e5b9b8e2d25150ed00040dbb04ec3f50a5a5 Mon Sep 17 00:00:00 2001 From: Daniel Izquierdo Date: Wed, 19 Jun 2019 16:50:07 +0900 Subject: [PATCH 3/3] Upgrade to Xenial for Travis builds Django 2.2 requires SQLite 3.8.3 which is not available in Trusty. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6df6b36..e188086 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ sudo: false language: python +dist: xenial python: - "2.7" - "3.4"