Merge branch '3.0.x'

.github/workflows/tests.yaml

@@ -27,6 +27,7 @@ jobs:
           - {name: Linux, python: '3.10', os: ubuntu-latest, tox: py310}
           - {name: Windows, python: '3.10', os: windows-latest, tox: py310}
           - {name: Mac, python: '3.10', os: macos-latest, tox: py310}
+          - {name: '3.11-dev', python: '3.11-dev', os: ubuntu-latest, tox: py311}
           - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39}
           - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38}
           - {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37}

requirements/dev.txt

@@ -66,7 +66,7 @@ pluggy==1.0.0
     #   tox
 pre-commit==2.15.0
     # via -r requirements/dev.in
-py==1.10.0
+py==1.11.0
     # via
     #   pytest
     #   tox

requirements/tests.txt

@@ -12,7 +12,7 @@ packaging==21.2
     # via pytest
 pluggy==1.0.0
     # via pytest
-py==1.10.0
+py==1.11.0
     # via pytest
 pyparsing==2.4.7
     # via packaging

tests/test_debug.py

@@ -36,9 +36,11 @@ class TestDebug:
             test,
             r"""
   File ".*?broken.html", line 2, in (top-level template code|<module>)
-    \{\{ fail\(\) \}\}
+    \{\{ fail\(\) \}\}(
+    \^{12})?
   File ".*debug?.pyc?", line \d+, in <lambda>
-    tmpl\.render\(fail=lambda: 1 / 0\)
+    tmpl\.render\(fail=lambda: 1 / 0\)(
+                             ~~\^~~)?
 ZeroDivisionError: (int(eger)? )?division (or modulo )?by zero
 """,
         )
@@ -66,7 +68,8 @@ to be closed is 'for'.
             test,
             r"""
   File ".*debug.pyc?", line \d+, in test
-    raise TemplateSyntaxError\("wtf", 42\)
+    raise TemplateSyntaxError\("wtf", 42\)(
+    \^{36})?
 (jinja2\.exceptions\.)?TemplateSyntaxError: wtf
   line 42""",
         )

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{310,39,38,37,36,py37}
+    py{311,310,39,38,37,36,py37}
     style
     typing
     docs