refactor: drop support for py<3.7 and django<1.11

Author: nedbat

.github/workflows/tests.yml

@@ -31,17 +31,11 @@ jobs:
         python-version:
           # When changing this list, be sure to check the [gh-actions] list in
           # tox.ini so that tox will run properly.
-          - "2.7"
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
-        exclude:
-          # Windows 2.7 doesn't work because Microsoft removed stuff we needed.
-          - os: windows-latest
-            python-version: "2.7"
       fail-fast: false
 
     steps:
@@ -85,7 +79,7 @@ jobs:
       - name: "Set up Python"
         uses: "actions/setup-python@v2"
         with:
-          python-version: "3.8"
+          python-version: "3.7"
 
       - name: "Install dependencies"
         run: |

README.rst

@@ -31,9 +31,9 @@ A `coverage.py`_ plugin to measure test coverage of Django templates.
 
 Supported on:
 
-- Python: 2.7, and 3.6 through 3.11.
+- Python: 3.7 through 3.11.
 
-- Django: 1.8, 1.11, 2.x, 3.x and 4.x.
+- Django: 1.11, 2.x, 3.x and 4.x.
 
 - Coverage.py: 4.x or higher.
 
@@ -137,6 +137,12 @@ History
 
 .. scriv-insert-here
 
+Next
+----
+
+Dropped support for Python 2.7, Python 3.6, and Django 1.8.
+
+
 v2.0.4 — 2022-10-31
 -------------------
 

django_coverage_plugin/plugin.py

@@ -3,8 +3,6 @@
 
 """The Django template coverage plugin."""
 
-from __future__ import print_function
-
 import os.path
 import re
 
@@ -99,39 +97,28 @@ def check_debug():
     return True
 
 
-if django.VERSION < (1, 8):
-    raise RuntimeError("Django Coverage Plugin requires Django 1.8 or higher")
+if django.VERSION < (1, 11):
+    raise RuntimeError("Django Coverage Plugin requires Django 1.11 or higher")
 
 
-if django.VERSION >= (1, 9):
-    # Since we are grabbing at internal details, we have to adapt as they
-    # change over versions.
-    def filename_for_frame(frame):
-        try:
-            return frame.f_locals["self"].origin.name
-        except (KeyError, AttributeError):
-            return None
+# Since we are grabbing at internal details, we have to adapt as they
+# change over versions.
+def filename_for_frame(frame):
+    try:
+        return frame.f_locals["self"].origin.name
+    except (KeyError, AttributeError):
+        return None
 
-    def position_for_node(node):
-        try:
-            return node.token.position
-        except AttributeError:
-            return None
 
-    def position_for_token(token):
-        return token.position
-else:
-    def filename_for_frame(frame):
-        try:
-            return frame.f_locals["self"].source[0].name
-        except (KeyError, AttributeError, IndexError):
-            return None
+def position_for_node(node):
+    try:
+        return node.token.position
+    except AttributeError:
+        return None
 
-    def position_for_node(node):
-        return node.source[1]
 
-    def position_for_token(token):
-        return token.source[1]
+def position_for_token(token):
+    return token.position
 
 
 def read_template_source(filename):

setup.py

@@ -1,13 +1,11 @@
 #!/usr/bin/env python
-# -*- encoding: utf-8 -*-
 """Setup for Django Coverage Plugin
 
 Licensed under the Apache 2.0 License
 - http://www.apache.org/licenses/LICENSE-2.0
 - https://github.com/nedbat/django_coverage_plugin/blob/master/NOTICE.txt
 
 """
-from __future__ import absolute_import, print_function
 
 import io
 import re
@@ -32,8 +30,6 @@ def read(*names, **kwargs):
 Intended Audience :: Developers
 License :: OSI Approved :: Apache Software License
 Operating System :: OS Independent
-Programming Language :: Python :: 2.7
-Programming Language :: Python :: 3.6
 Programming Language :: Python :: 3.7
 Programming Language :: Python :: 3.8
 Programming Language :: Python :: 3.9
@@ -45,7 +41,6 @@ def read(*names, **kwargs):
 Topic :: Software Development :: Testing
 Development Status :: 5 - Production/Stable
 Framework :: Django
-Framework :: Django :: 1.8
 Framework :: Django :: 1.11
 Framework :: Django :: 2.2
 Framework :: Django :: 3.2

tests/banner.py

@@ -3,8 +3,6 @@
 
 """For printing the versions from tox.ini."""
 
-from __future__ import print_function
-
 import platform
 
 import django

tests/plugin_test.py

@@ -53,10 +53,6 @@ def test_settings():
         ],
     })
 
-    if django.VERSION < (1, 10):
-        # for {% ssi %}
-        the_settings['TEMPLATES'][0]['OPTIONS']['allowed_include_roots'] = [""]
-
     return the_settings
 
 

tests/test_extends.py

@@ -3,7 +3,7 @@
 
 """Tests of template inheritance for django_coverage_plugin."""
 
-from .plugin_test import DjangoPluginTestCase, django_stop_before
+from .plugin_test import DjangoPluginTestCase
 
 
 class BlockTest(DjangoPluginTestCase):
@@ -146,43 +146,3 @@ def test_include(self):
         self.assertEqual(text, "First\nInside\nJob\n\nLast\n")
         self.assert_analysis([1, 2, 3], name="outer.html")
         self.assert_analysis([1, 2], name="nested.html")
-
-
-# {% 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."""
-
-    def test_ssi_unparsed(self):
-        nested = self.make_template(name="nested.html", text="""\
-            Inside {{ a }}
-            Job
-            """)
-
-        self.make_template(name="outer.html", text="""\
-            First
-            {% ssi "NESTED" %}
-            Last
-            """.replace("NESTED", nested))
-
-        text = self.run_django_coverage(name="outer.html", context={'a': 17})
-        self.assertEqual(text, "First\nInside {{ a }}\nJob\n\nLast\n")
-        self.assert_analysis([1, 2, 3], name="outer.html")
-        self.assert_measured_files("outer.html", "nested.html")
-
-    def test_ssi_parsed(self):
-        nested = self.make_template(name="nested.html", text="""\
-            Inside {{ a }}
-            Job
-            """)
-
-        self.make_template(name="outer.html", text="""\
-            First
-            {% ssi "NESTED" parsed %}
-            Last
-            """.replace("NESTED", nested))
-
-        text = self.run_django_coverage(name="outer.html", context={'a': 17})
-        self.assertEqual(text, "First\nInside 17\nJob\n\nLast\n")
-        self.assert_analysis([1, 2, 3], name="outer.html")
-        self.assert_measured_files("outer.html", "nested.html")

tox.ini

@@ -14,20 +14,17 @@
 
 [tox]
 envlist =
-    py27-django{18,111},
-    py36-django{18,111,22,32},
-    py37-django{22,32},
+    py37-django{111,22,32},
     py38-django{22,32,40,41,tip},
     py39-django{22,32,40,41,tip},
     py310-django{32,40,41,tip},
-    py311-django{tip},
+    py311-django{41,tip},
     check,pkgcheck,doc
 
 [testenv]
 deps =
     pytest
     unittest-mixins==1.6
-    django18: Django>=1.8,<1.9
     django111: Django>=1.11,<2.0
     django22: Django>=2.2,<3.0
     django32: Django>=3.2,<4.0
@@ -75,8 +72,6 @@ commands =
 
 [gh-actions]
 python =
-    2.7: py27
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39