Merge pull request #35 from PamelaM/pm/remove_support_pre_dj18_and_support_dj111

Pm/remove support prior to Django 1.8 and support Django 1.11

Author: nedbat

README.rst

@@ -14,7 +14,7 @@ A `coverage.py`_ plugin to measure the coverage of Django templates.
 
 Supported Python versions are 2.7, 3.4, 3.5 and 3.6.
 
-Supported Django versions are 1.4 through 1.10.
+Supported Django versions are 1.8 through 1.11b1.
 
 Supported coverage.py versions are 4.0 and higher.
 
@@ -49,8 +49,6 @@ template files are included in the report.
 Caveats
 ~~~~~~~
 
-Support for Django versions 1.4 through 1.7 should be considered deprecated.
-
 Files included by the ``{% ssi %}`` tag are not included in the coverage
 measurements.
 
@@ -61,6 +59,12 @@ plural text, so both are marked as used if the tag is used.
 Changes
 ~~~~~~~
 
+
+v1.5.0 --- 2017-02-23
+---------------------
+
+Removes support for Django versions below 1.8.  Validates support for Django version 1.11b1
+
 v1.4.2 --- 2017-02-06
 ---------------------
 
@@ -179,7 +183,7 @@ To run the tests::
 .. |versions| image:: https://img.shields.io/pypi/pyversions/django_coverage_plugin.svg
     :target: https://pypi.python.org/pypi/django_coverage_plugin
     :alt: Python versions supported
-.. |djversions| image:: https://img.shields.io/badge/Django-1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 1.10-44b78b.svg
+.. |djversions| image:: https://img.shields.io/badge/Django-1.8, 1.9, 1.10, 1.11b1.svg
     :target: https://pypi.python.org/pypi/django_coverage_plugin
     :alt: Django versions supported
 .. |status| image:: https://img.shields.io/pypi/status/django_coverage_plugin.svg

django_coverage_plugin/plugin.py

@@ -49,39 +49,27 @@ def check_debug():
     if not settings.configured:
         return False
 
-    if django.VERSION >= (1, 8):
-        # Django 1.8+ handles both old and new-style settings and converts them
-        # into template engines, so we don't need to depend on settings values
-        # directly and can look at the resulting configured objects
-
-        # 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.")
-
-        for engine in django.template.engines.all():
-            if not isinstance(engine, django.template.backends.django.DjangoTemplates):
-                raise DjangoTemplatePluginException(
-                    "Can't use non-Django templates."
-                )
-            if not engine.engine.debug:
-                raise DjangoTemplatePluginException(
-                    "Template debugging must be enabled in settings."
-                )
-    else:
-        # Old-style settings.
-        if not settings.TEMPLATE_DEBUG:
+    # 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.")
+
+    for engine in django.template.engines.all():
+        if not isinstance(engine, django.template.backends.django.DjangoTemplates):
+            raise DjangoTemplatePluginException(
+                "Can't use non-Django templates."
+            )
+        if not engine.engine.debug:
             raise DjangoTemplatePluginException(
                 "Template debugging must be enabled in settings."
             )

setup.py

@@ -22,14 +22,14 @@
 
 setup(
     name='django_coverage_plugin',
-    version='1.4.2',
+    version='1.5.0',
     description='Django template coverage.py plugin',
     author='Ned Batchelder',
     author_email='[email protected]',
     url='https://github.com/nedbat/django_coverage_plugin',
     packages=['django_coverage_plugin'],
     install_requires=[
-        'Django >= 1.4',
+        'Django >= 1.8',
         'coverage >= 4.0',
         'six >= 1.4.0',
     ],

tests/plugin_test.py

@@ -35,29 +35,22 @@ def test_settings():
         'ROOT_URLCONF': 'tests',
     }
 
-    if django.VERSION >= (1, 8):
-        the_settings.update({
-            'TEMPLATES': [
-                {
-                    'BACKEND': 'django.template.backends.django.DjangoTemplates',
-                    'DIRS': ['templates'],      # where the tests put things.
-                    'OPTIONS': {
-                        'debug': True,
-                    },
+    the_settings.update({
+        'TEMPLATES': [
+            {
+                'BACKEND': 'django.template.backends.django.DjangoTemplates',
+                'DIRS': ['templates'],      # where the tests put things.
+                'OPTIONS': {
+                    'debug': True,
                 },
-            ],
-        })
+            },
+        ],
+    })
 
-        if django.VERSION < (1, 10):
-            # for {% ssi %}
-            the_settings['TEMPLATES'][0]['OPTIONS']['allowed_include_roots'] = ['/']
+    if django.VERSION < (1, 10):
+        # for {% ssi %}
+        the_settings['TEMPLATES'][0]['OPTIONS']['allowed_include_roots'] = ['/']
 
-    else:
-        the_settings.update({
-            'ALLOWED_INCLUDE_ROOTS': ['/'],     # for {% ssi %}
-            'TEMPLATE_DEBUG': True,
-            'TEMPLATE_DIRS': ['templates'],     # where the tests put things.
-        })
 
     return the_settings
 
@@ -68,12 +61,10 @@ def test_settings():
     django.setup()
 
 from django.template import Context, Template  # noqa
+from django.template.backends.django import DjangoTemplates  # noqa
 from django.template.loader import get_template  # noqa
 from django.test import TestCase  # noqa
 
-if django.VERSION >= (1, 8):
-    from django.template.backends.django import DjangoTemplates  # noqa
-
 
 class DjangoPluginTestCase(StdStreamCapturingMixin, TempDirMixin, TestCase):
     """A base class for all our tests."""
@@ -116,7 +107,7 @@ def run_django_coverage(
             str: the text produced by the template.
 
         """
-        use_real_context = (django.VERSION < (1, 8))
+        use_real_context = False
 
         if options is None:
             options = {'source': ["."]}
@@ -256,7 +247,7 @@ def squashed(s):
 def django_start_at(*needed_version):
     """A decorator for tests to require a minimum version of Django.
 
-    @django_start_at(1, 8)      # Don't run the test on 1.7 or lower.
+    @django_start_at(1, 10)      # Don't run the test on 1.10 or lower.
     def test_thing(self):
         ...
 
@@ -267,10 +258,10 @@ def test_thing(self):
         return unittest.skip("Django version must be newer")
 
 
-def django_stop_at(*needed_version):
+def django_stop_before(*needed_version):
     """A decorator for tests to require a maximum version of Django.
 
-    @django_stop_at(1, 8)       # Don't run the test on 1.8 or higher.
+    @django_stop_before(1, 10)       # Don't run the test on 1.10 or higher.
     def test_thing(self):
         ...
 

tests/test_engines.py

@@ -3,16 +3,14 @@
 
 """Tests of multiple engines for django_coverage_plugin."""
 
-from .plugin_test import DjangoPluginTestCase, django_start_at
+from .plugin_test import DjangoPluginTestCase
+from django.test import modify_settings
 
 
-@django_start_at(1, 8)
 class MultipleEngineTests(DjangoPluginTestCase):
     def setUp(self):
         super(MultipleEngineTests, self).setUp()
 
-        # Move to module imports once we drop support for Django < 1.7
-        from django.test import modify_settings
         engine = {
             'NAME': 'other',
             'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -38,7 +36,6 @@ def test_string_template(self):
         self.assertEqual(text, 'Hello')
 
     def test_third_engine_not_debug(self):
-        from django.test import modify_settings
         engine3 = {
             'NAME': 'notdebug',
             'BACKEND': 'django.template.backends.django.DjangoTemplates',

tests/test_extends.py

@@ -3,7 +3,7 @@
 
 """Tests of template inheritance for django_coverage_plugin."""
 
-from .plugin_test import DjangoPluginTestCase, django_start_at, django_stop_at
+from .plugin_test import DjangoPluginTestCase, django_stop_before
 
 
 class BlockTest(DjangoPluginTestCase):
@@ -148,9 +148,8 @@ def test_include(self):
         self.assert_analysis([1, 2], name="nested.html")
 
 
-# {% ssi %} is in earlier Djangos than 1.5, but doesn't trace properly.
-@django_start_at(1, 5)
-@django_stop_at(1, 10)
+# {% ssi %} is in earlier Djangos than 1.9, but doesn't trace properly.
+@django_stop_before(1, 10)
 class SsiTest(DjangoPluginTestCase):
     """Test {% ssi %}, which does not trace the included file."""
 

tests/test_settings.py

@@ -3,28 +3,23 @@
 
 """Settings tests for django_coverage_plugin."""
 
-import django
 from django.test.utils import override_settings
 
-from .plugin_test import DjangoPluginTestCase, test_settings, django_start_at
+from .plugin_test import DjangoPluginTestCase, test_settings
 
 
 # Make settings overrides for tests below.
-if django.VERSION >= (1, 8):
-    NON_DJANGO_BACKEND = 'django.template.backends.dummy.TemplateStrings'
+NON_DJANGO_BACKEND = 'django.template.backends.dummy.TemplateStrings'
 
-    DEBUG_FALSE_OVERRIDES = test_settings()
-    DEBUG_FALSE_OVERRIDES['TEMPLATES'][0]['OPTIONS']['debug'] = False
+DEBUG_FALSE_OVERRIDES = test_settings()
+DEBUG_FALSE_OVERRIDES['TEMPLATES'][0]['OPTIONS']['debug'] = False
 
-    NO_OPTIONS_OVERRIDES = test_settings()
-    del NO_OPTIONS_OVERRIDES['TEMPLATES'][0]['OPTIONS']
+NO_OPTIONS_OVERRIDES = test_settings()
+del NO_OPTIONS_OVERRIDES['TEMPLATES'][0]['OPTIONS']
 
-    OTHER_ENGINE_OVERRIDES = test_settings()
-    OTHER_ENGINE_OVERRIDES['TEMPLATES'][0]['BACKEND'] = NON_DJANGO_BACKEND
-    OTHER_ENGINE_OVERRIDES['TEMPLATES'][0]['OPTIONS'] = {}
-else:
-    DEBUG_FALSE_OVERRIDES = {'TEMPLATE_DEBUG': False}
-    NO_OPTIONS_OVERRIDES = OTHER_ENGINE_OVERRIDES = {}
+OTHER_ENGINE_OVERRIDES = test_settings()
+OTHER_ENGINE_OVERRIDES['TEMPLATES'][0]['BACKEND'] = NON_DJANGO_BACKEND
+OTHER_ENGINE_OVERRIDES['TEMPLATES'][0]['OPTIONS'] = {}
 
 
 class SettingsTest(DjangoPluginTestCase):
@@ -36,14 +31,12 @@ def test_debug_false(self):
         with self.assert_plugin_disabled("Template debugging must be enabled in settings."):
             self.run_django_coverage()
 
-    @django_start_at(1, 8)
     @override_settings(**NO_OPTIONS_OVERRIDES)
     def test_no_options(self):
         self.make_template('Hello')
         with self.assert_plugin_disabled("Template debugging must be enabled in settings."):
             self.run_django_coverage()
 
-    @django_start_at(1, 8)
     @override_settings(**OTHER_ENGINE_OVERRIDES)
     def test_other_engine(self):
         self.make_template('Hello')

tests/test_simple.py

@@ -4,7 +4,7 @@
 
 """Simple tests for django_coverage_plugin."""
 
-from .plugin_test import DjangoPluginTestCase, django_start_at
+from .plugin_test import DjangoPluginTestCase
 
 
 # 200 Unicode chars: snowman + poo.
@@ -155,7 +155,6 @@ def test_firstof(self):
         self.assertEqual(text, "B\nB\nquux\n")
         self.assert_analysis([1, 2, 3])
 
-    @django_start_at(1, 8)
     def test_lorem(self):
         self.make_template("""\
             First
@@ -176,7 +175,6 @@ def test_now(self):
         self.assertEqual(text, "Now:\nnow\n.\n")
         self.assert_analysis([1, 2, 3])
 
-    @django_start_at(1, 8)
     def test_now_as(self):
         self.make_template("""\
             {% now "\\n\\o\\w" as right_now %}
@@ -196,7 +194,6 @@ def test_templatetag(self):
         self.assertEqual(text, "{%\nurl 'entry_list'\n%}\n")
         self.assert_analysis([1, 2, 3])
 
-    @django_start_at(1, 5)          # 1.4 had different syntax for {% url %}
     def test_url(self):
         self.make_template("""\
             {% url 'index' %}
@@ -206,7 +203,6 @@ def test_url(self):
         self.assertEqual(text, "/home\nnice.\n")
         self.assert_analysis([1, 2])
 
-    @django_start_at(1, 5)          # {% verbatim %} is new in 1.5
     def test_verbatim(self):
         self.make_template("""\
             1

tox.ini

@@ -14,23 +14,20 @@
 
 [tox]
 envlist =
-    py27-django{14,15,16,17,18,19,110,110tip,tip},
-    py34-django{15,16,17,18,19,110,110tip,tip},
-    py35-django{18,19,110,110tip,tip},
-    py36-django{18,19,110,110tip,tip},
+    py27-django{18,19,110,110tip,111tip},
+    py34-django{18,19,110,110tip,111tip,tip},
+    py35-django{18,19,110,110tip,111tip,tip},
+    py36-django{18,19,110,110tip,111tip,tip},
     check,doc
 
 [testenv]
 deps =
     unittest-mixins==1.1
-    django14: Django >=1.4, <1.5
-    django15: Django >=1.5, <1.6
-    django16: Django >=1.6, <1.7
-    django17: Django >=1.7, <1.8
     django18: Django >=1.8, <1.9
     django19: Django >=1.9, <1.10
     django110: Django >=1.10, <1.11
     django110tip: https://github.com/django/django/archive/stable/1.10.x.tar.gz
+    django111tip: https://github.com/django/django/archive/stable/1.11.x.tar.gz
     djangotip: https://github.com/django/django/archive/master.tar.gz
 
 commands =