Add support for Django 4.1 and drop support for < 3.2 (#86)

* Stop supporting older deprecated Django versions (2.2 and 3.1)
* Fix `Tag` name breaking in Django 4.1
    Django underwent some refactoring with regards to how it's
    tag names are generated and registered in the template library
* Officially support Django 4.1

Author: kevinmarsh

.github/workflows/test.yml

@@ -10,17 +10,15 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.7', '3.8', '3.9', '3.10']
-        django-version: ['2.2', '3.1', '3.2', '4.0']
+        django-version: ['3.2', '4.0', '4.1']
         os: [
           ubuntu-20.04,
         ]
         exclude:
           - python-version: '3.7'
             django-version: '4.0'
-          - python-version: '3.10'
-            django-version: '2.2'
-          - python-version: '3.10'
-            django-version: '3.1'
+          - python-version: '3.7'
+            django-version: '4.1'
 
     steps:
     - uses: actions/checkout@v1
@@ -50,7 +48,6 @@ jobs:
       matrix:
         python-version: ['3.8', '3.9', '3.10']
         django-version: [
-          'Django==4.1',
           'https://github.com/django/django/archive/main.tar.gz'
         ]
         os: [

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
     rev: '1.6.1'
     hooks:
       - id: django-upgrade
-        args: [--target-version, "2.2"]
+        args: [--target-version, "3.2"]
 
   - repo: https://github.com/PyCQA/flake8
     rev: 4.0.1

CHANGELOG.rst

@@ -5,7 +5,9 @@ Changelog
 unreleased
 ==========
 
-* Start testing Django 4.1 and Django's `main` branch
+* Dropped support for Django < 3.2
+* Added support for Django 4.1
+* Start testing against Django's `main` branch
 
 3.0.1 2022-02-01
 ================

README.rst

@@ -107,7 +107,7 @@ You can run tests by executing::
 .. |coverage| image:: https://codecov.io/gh/divio/django-classy-tags/branch/master/graph/badge.svg
     :target: https://codecov.io/gh/divio/django-classy-tags
 
-.. |python| image:: https://img.shields.io/badge/python-3.5+-blue.svg
+.. |python| image:: https://img.shields.io/badge/python-3.7+-blue.svg
     :target: https://pypi.org/project/django-classy-tags/
-.. |django| image:: https://img.shields.io/badge/django-2.2,%203.0,%203.1-blue.svg
+.. |django| image:: https://img.shields.io/badge/django-3.2,%204.0,%204.0-blue.svg
     :target: https://www.djangoproject.com/

classytags/core.py

@@ -108,22 +108,13 @@ def parse(self, parser, tokens):
 class TagMeta(type):
     """
     Metaclass for the Tag class that set's the name attribute onto the class
-    and a _decorated_function pseudo-function which is used by Django's
-    template system to get the tag name.
     """
     def __new__(cls, name, bases, attrs):
-        parents = [base for base in bases if isinstance(base, TagMeta)]
-        if not parents:
+        if not any(base for base in bases if isinstance(base, TagMeta)):
             return super().__new__(cls, name, bases, attrs)
         tag_name = str(attrs.get('name', get_default_name(name)))
-
-        def fake_func():
-            pass  # pragma: no cover
-
-        fake_func.__name__ = tag_name
-        attrs['_decorated_function'] = fake_func
-        attrs['name'] = str(tag_name)
-        return super().__new__(cls, name, bases, attrs)
+        attrs['name'] = tag_name
+        return super().__new__(cls, tag_name, bases, attrs)
 
 
 class Tag(TagMeta('TagMeta', (Node,), {})):

requirements.in

@@ -1,5 +1,5 @@
 bump2version
-Django>2.2
+Django>3.2
 pip-tools
 pre-commit
 wheel

requirements.txt

@@ -4,43 +4,49 @@
 #
 #    pip-compile
 #
-asgiref==3.4.1
+asgiref==3.5.2
     # via django
+build==0.8.0
+    # via pip-tools
 bump2version==1.0.1
     # via -r requirements.in
 cfgv==3.3.1
     # via pre-commit
-click==8.0.3
+click==8.1.3
     # via pip-tools
-distlib==0.3.4
+distlib==0.3.6
     # via virtualenv
-django==4.0.7
+django==4.1.1
     # via -r requirements.in
-filelock==3.4.2
+filelock==3.8.0
     # via virtualenv
-identify==2.4.4
+identify==2.5.5
     # via pre-commit
-nodeenv==1.6.0
+nodeenv==1.7.0
     # via pre-commit
-pep517==0.12.0
-    # via pip-tools
-pip-tools==6.4.0
+packaging==21.3
+    # via build
+pep517==0.13.0
+    # via build
+pip-tools==6.8.0
     # via -r requirements.in
-platformdirs==2.4.1
+platformdirs==2.5.2
     # via virtualenv
-pre-commit==2.17.0
+pre-commit==2.20.0
     # via -r requirements.in
+pyparsing==3.0.9
+    # via packaging
 pyyaml==6.0
     # via pre-commit
-six==1.16.0
-    # via virtualenv
-sqlparse==0.4.2
+sqlparse==0.4.3
     # via django
 toml==0.10.2
     # via pre-commit
-tomli==2.0.0
-    # via pep517
-virtualenv==20.13.0
+tomli==2.0.1
+    # via
+    #   build
+    #   pep517
+virtualenv==20.16.5
     # via pre-commit
 wheel==0.37.1
     # via

setup.py

@@ -5,7 +5,7 @@
 
 
 REQUIREMENTS = [
-    'django>=2.2',
+    'django>=3.2',
 ]
 
 
@@ -21,10 +21,9 @@
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Framework :: Django',
-    'Framework :: Django :: 2.2',
-    'Framework :: Django :: 3.1',
     'Framework :: Django :: 3.2',
     'Framework :: Django :: 4.0',
+    'Framework :: Django :: 4.1',
     'Topic :: Internet :: WWW/HTTP',
     'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     'Topic :: Software Development',

tests/test_core.py

@@ -591,6 +591,22 @@ class MyTag2(core.Tag):
         msg = "'my_tag2' in %s" % lib.tags.keys()
         self.assertTrue('my_tag2' not in lib.tags, msg)
 
+        # test decorated naming
+        lib = template.Library()
+
+        @lib.tag(name="my_decorated_tag_5")
+        class MyTag5(core.Tag):
+            pass
+        msg = "'my_decorated_tag_5' not in %s" % lib.tags.keys()
+        self.assertTrue('my_decorated_tag_5' in lib.tags, msg)
+
+        # test decorated and explicit naming
+        # the tag registration takes precedence over the name attribute
+        lib = template.Library()
+        lib.tag('my_decorated_tag_6', MyTag2)
+        msg = "'my_decorated_tag_6' not in %s" % lib.tags.keys()
+        self.assertTrue('my_decorated_tag_6' in lib.tags, msg)
+
     def test_hello_world(self):
         class Hello(core.Tag):
             options = core.Options(
@@ -971,6 +987,12 @@ class MyTag(core.Tag):
         tag = MyTag(dummy_parser, DummyTokens())
         self.assertEqual('<Tag: mytag>', repr(tag))
 
+    def test_repr_without_explicit_name(self):
+        class MyTag(core.Tag):
+            pass
+        tag = MyTag(dummy_parser, DummyTokens())
+        self.assertEqual('<Tag: my_tag>', repr(tag))
+
     def test_non_required_multikwarg(self):
         options = core.Options(
             arguments.MultiKeywordArgument('multi', required=False),

tox.ini

@@ -2,16 +2,14 @@
 envlist =
     flake8
     isort
-    py{37,38,39}-dj{22,31,32}
-    py{38,39,310}-dj{31,32,40,41,main}
+    py{37}-dj32
+    py{38,39,310}-dj{32,40,41,main}
 
 skip_missing_interpreters=True
 
 [testenv]
 deps =
     -r{toxinidir}/tests/requirements/base.txt
-    dj22: Django>=2.2,<3.0
-    dj31: Django>=3.1,<3.2
     dj32: Django>=3.2,<3.3
     dj40: Django>=4.0,<4.1
     dj41: Django>=4.1,<4.2
@@ -22,10 +20,8 @@ commands =
     {env:COMMAND:coverage} run setup.py test
     {env:COMMAND:coverage} report
 ignore_outcome =
-    dj41: True
     djmain: True
 ignore_errors =
-    dj41: True
     djmain: True
 
 [testenv:flake8]