Jinja2 3.1 support (#104)

Author: moggers87

exhibition/filters/jinja2.py

@@ -31,7 +31,7 @@
 
 from datetime import datetime, timezone
 
-from jinja2 import Environment, FileSystemLoader, contextfilter
+from jinja2 import Environment, FileSystemLoader, pass_context
 from jinja2.exceptions import TemplateRuntimeError
 from jinja2.ext import Extension
 from jinja2.nodes import CallBlock, Const, ContextReference
@@ -78,7 +78,7 @@ def metareject(nodes, key):
             yield n
 
 
-@contextfilter
+@pass_context
 def markdown(ctx, text):
     kwargs = DEFAULT_MD_KWARGS.copy()
     node = ctx[NODE_TMPL_VAR]
@@ -88,7 +88,7 @@ def markdown(ctx, text):
     return md_func(text, **kwargs)
 
 
-@contextfilter
+@pass_context
 def pandoc(ctx, text, fmt=None):
     """Use Pandoc to convert from one format to another. Takes source format as
     an optional argument.

exhibition/tests/test_filters.py

@@ -24,8 +24,8 @@
 import base64
 import pathlib
 
-from jinja2 import Markup
 from jinja2.exceptions import TemplateRuntimeError
+from markupsafe import Markup
 
 from exhibition.filters.base import content_filter as base_filter
 from exhibition.filters.external import content_filter as external_filter

setup.py

@@ -37,7 +37,7 @@
     python_requires=">=3.8",
     install_requires=[
         "click",
-        "jinja2<3.1",
+        "jinja2>=3.0,<3.1",
         "markdown",
         "ruamel.yaml",
         "typogrify",

tox.ini

@@ -4,7 +4,7 @@ envlist =
     flake8
     isort
     docs
-    py{38,39,310,311,312}-jinja{211,210,300}
+    py{38,39,310,311,312}-jinja{300,310}
     coverage
 
 [flake8]
@@ -32,16 +32,13 @@ python =
     3.8: clean,py38,coverage
     3.9: clean,py39,coverage
     3.10: clean,py310,coverage
-    3.11: clean,py310,coverage
-    3.12: clean,py310,coverage
+    3.11: clean,py311,coverage
+    3.12: clean,py312,coverage
 
 [testenv]
 deps =
+    jinja310: jinja2>=3.1,<3.2
     jinja300: jinja2>=3.0,<3.1
-    jinja211: jinja2>=2.11,<2.12
-              MarkupSafe<2.1
-    jinja210: jinja2>=2.10,<2.11
-              MarkupSafe<2.1
     coverage
 commands = coverage run -a --branch -m unittest {posargs}