From: David Lord <davidism@gmail.com>
Date: Sun, 26 Dec 2021 14:48:45 +0000 (-0700)
Subject: Merge branch '3.0.x'
X-Git-Tag: 3.1.0~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=896a62135bcc151f2997e028c5125bec2cb2431f;p=thirdparty%2Fjinja.git

Merge branch '3.0.x'
---

896a62135bcc151f2997e028c5125bec2cb2431f
diff --cc .pre-commit-config.yaml
index 356b49c8,0778c54e..39806ed6
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@@ -2,10 -2,10 +2,10 @@@ ci
    autoupdate_schedule: monthly
  repos:
    - repo: https://github.com/asottile/pyupgrade
-     rev: v2.29.0
+     rev: v2.29.1
      hooks:
        - id: pyupgrade
 -        args: ["--py36-plus"]
 +        args: ["--py37-plus"]
    - repo: https://github.com/asottile/reorder_python_imports
      rev: v2.6.0
      hooks:
diff --cc setup.cfg
index 803e8c6c,9dd6c512..c23d9390
--- a/setup.cfg
+++ b/setup.cfg
@@@ -86,7 -86,8 +86,8 @@@ per-file-ignores 
  
  [mypy]
  files = src/jinja2
 -python_version = 3.6
 +python_version = 3.7
+ show_error_codes = True
  disallow_subclassing_any = True
  disallow_untyped_calls = True
  disallow_untyped_defs = True