Drop python 3.5 and 3.6 (#67)

* Added pre-commit and testing against python 3.10

* Added pre-commit and testing against python 3.10

* Update tox isort command for v5

* Keep dependabot happy.

* Drop django 3.0 support due to security issues

* Add django 4 to tests

* Add django 4 to classifiers

* Simplified tests because there isn't a requirement on django-cms but it was being installed.

* Separated django 4 tests while python 3.7 is still included

Author: marksweb

.github/workflows/test.yml

@@ -8,15 +8,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.7, 3.8, 3.9, ]  # latest release minus two
-        requirements-file: [
-          dj22_cms37.txt,
-          dj22_cms38.txt,
-          dj30_cms37.txt,
-          dj30_cms38.txt,
-          dj31_cms38.txt,
-          dj32_cms39.txt,
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        django-version: ['2.2', '3.1', '3.2']
+        os: [
+          ubuntu-20.04,
         ]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install django==${{ matrix.django-version }} coverage
+        python setup.py install
+
+    - name: Run coverage
+      run: coverage run setup.py test
+
+    - name: Upload Coverage to Codecov
+      uses: codecov/codecov-action@v1
+
+  unit-tests-dj4:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.8', '3.9', '3.10']
         os: [
           ubuntu-20.04,
         ]
@@ -31,7 +53,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r tests/requirements/${{ matrix.requirements-file }}
+        pip install "django>=4.0,<4.1" coverage
         python setup.py install
 
     - name: Run coverage

.gitignore

@@ -4,7 +4,7 @@
 *.log
 *.pot
 .DS_Store
-.coverage/
+.coverage
 .eggs/
 .idea/
 .project/

.pre-commit-config.yaml

@@ -0,0 +1,33 @@
+repos:
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.31.0
+    hooks:
+      - id: pyupgrade
+        args: ["--py37-plus"]
+
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: '1.4.0'
+    hooks:
+      - id: django-upgrade
+        args: [--target-version, "2.2"]
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8
+
+  - repo: https://github.com/asottile/yesqa
+    rev: v1.3.0
+    hooks:
+      - id: yesqa
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: check-merge-conflict
+      - id: mixed-line-ending
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort

CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog
 =========
 
+unreleased
+==========
+
+* Added support for Django 3.2 and 4.0
+* Drop support for python 3.5 and 3.6
 
 2.0.0 (2020-08-26)
 ==================

classytags/arguments.py

@@ -3,10 +3,7 @@
 
 from classytags.exceptions import InvalidFlag
 from classytags.utils import NULL, TemplateConstant, mixin
-from classytags.values import (
-    ChoiceValue, DictValue, IntegerValue, ListValue, StrictStringValue,
-    StringValue,
-)
+from classytags.values import ChoiceValue, DictValue, IntegerValue, ListValue, StrictStringValue, StringValue
 
 
 class Argument:
@@ -22,7 +19,7 @@ def __init__(self, name, default=None, required=True, resolve=True):
         self.resolve = resolve
 
     def __repr__(self):  # pragma: no cover
-        return '<%s: %s>' % (self.__class__.__name__, self.name)
+        return f'<{self.__class__.__name__}: {self.name}>'
 
     def get_default(self):
         """
@@ -164,7 +161,7 @@ def __init__(self, name, default=None, required=True, resolve=True,
     def get_default(self):
         items = self.default.items()
         return self.wrapper_class(
-            dict([(key, TemplateConstant(value)) for key, value in items])
+            {key: TemplateConstant(value) for key, value in items}
         )
 
     def parse(self, parser, token, tagname, kwargs):

classytags/core.py

@@ -59,7 +59,7 @@ def __repr__(self):
             blocks = ';%s' % ','.join(map(attrgetter('alias'), self.blocks))
         else:  # pragma: no cover
             blocks = ''
-        return '<Options:%s%s>' % (options, blocks)
+        return f'<Options:{options}{blocks}>'
 
     def __add__(self, other):
         if not isinstance(other, Options):
@@ -146,7 +146,7 @@ def render(self, context):
         Usually you should not override this method, but rather use render_tag.
         """
         items = self.kwargs.items()
-        kwargs = dict([(key, value.resolve(context)) for key, value in items])
+        kwargs = {key: value.resolve(context) for key, value in items}
         kwargs.update(self.blocks)
         return str(self.render_tag(context, **kwargs))
 

classytags/parser.py

@@ -2,10 +2,7 @@
 
 from django import template
 
-from classytags.exceptions import (
-    ArgumentRequiredError, BreakpointExpected, TooManyArguments,
-    TrailingBreakpoint,
-)
+from classytags.exceptions import ArgumentRequiredError, BreakpointExpected, TooManyArguments, TrailingBreakpoint
 
 
 class Parser:

classytags/utils.py

@@ -39,9 +39,9 @@ def __init__(self, options, breakpoints, blocks, combind_breakpoints):
         self.breakpoints = copy(breakpoints)
         self.blocks = copy(blocks)
         self.combined_breakpoints = dict(combind_breakpoints.items())
-        self.reversed_combined_breakpoints = dict(
-            (v, k) for k, v in combind_breakpoints.items()
-        )
+        self.reversed_combined_breakpoints = {
+            v: k for k, v in combind_breakpoints.items()
+        }
         self.current_breakpoint = None
         if self.breakpoints:
             self.next_breakpoint = self.breakpoints.pop(0)
@@ -79,7 +79,7 @@ def get_default_name(name):
 def mixin(parent, child, attrs=None):
     attrs = attrs or {}
     return type(
-        '%sx%s' % (parent.__name__, child.__name__),
+        f'{parent.__name__}x{child.__name__}',
         (child, parent),
         attrs
     )

classytags/values.py

@@ -83,9 +83,9 @@ def __init__(self, value):
         dict.__init__(self, value)
 
     def resolve(self, context):
-        resolved = dict(
-            [(key, value.resolve(context)) for key, value in self.items()]
-        )
+        resolved = {
+            key: value.resolve(context) for key, value in self.items()
+        }
         return self.clean(resolved)
 
 

docs/conf.py

@@ -40,8 +40,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'django-classy-tags'
-copyright = u'2010, Jonas Obrist'
+project = 'django-classy-tags'
+copyright = '2010, Jonas Obrist'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -175,8 +175,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'django-classy-tags.tex', u'django-classy-tags Documentation',
-   u'Jonas Obrist', 'manual'),
+  ('index', 'django-classy-tags.tex', 'django-classy-tags Documentation',
+   'Jonas Obrist', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of