Merge branch 'master' into pm/remove_support_pre_dj18_and_support_dj111

# Conflicts:
#	django_coverage_plugin/plugin.py

Author: Pamela McA'Nulty

Makefile

@@ -29,7 +29,4 @@ kit:
 	$(SDIST_CMD)
 
 kit_upload:
-	$(SDIST_CMD) upload
-
-pypi:
-	python setup.py register
+	twine upload dist/*

README.rst

@@ -59,6 +59,21 @@ plural text, so both are marked as used if the tag is used.
 Changes
 ~~~~~~~
 
+v1.4.2 --- 2017-02-06
+---------------------
+
+Fixes another instance of `issue 32`_, which was the result of an initialization order problem.
+
+.. _issue 32: https://github.com/nedbat/django_coverage_plugin/issues/32
+
+
+v1.4.1 --- 2017-01-25
+---------------------
+
+Fixes `issue 32`_, which was the result of an initialization order problem.
+
+.. _issue 32: https://github.com/nedbat/django_coverage_plugin/issues/32
+
 
 v1.4 --- 2017-01-16
 -------------------

django_coverage_plugin/plugin.py

@@ -49,13 +49,18 @@ def check_debug():
     if not settings.configured:
         return False
 
+    # I _think_ this check is all that's needed and the 3 "hasattr" checks
+    # below can be removed, but it's not clear how to verify that
+    from django.apps import apps
+    if not apps.ready:
+        return False
+
     # django.template.backends.django gets loaded lazily, so return false
     # until they've been loaded
     if not hasattr(django.template, "backends"):
         return False
     if not hasattr(django.template.backends, "django"):
         return False
-
     if not hasattr(django.template.backends.django, "DjangoTemplates"):
         raise DjangoTemplatePluginException("Can't use non-Django templates.")
 

howto.txt

@@ -6,5 +6,4 @@
 - Update README.rst with latest changes
 - Kits:
     $ make kit
-    $ make pypi
     $ make kit_upload

requirements.txt

@@ -1,2 +1,3 @@
 # To run tests, we just need tox.
 tox >= 1.8
+twine

setup.py

@@ -22,7 +22,7 @@
 
 setup(
     name='django_coverage_plugin',
-    version='1.4',
+    version='1.4.2',
     description='Django template coverage.py plugin',
     author='Ned Batchelder',
     author_email='[email protected]',