From: David Lord <davidism@gmail.com>
Date: Wed, 12 Jan 2022 19:47:49 +0000 (-0800)
Subject: Merge branch '3.0.x'
X-Git-Tag: 3.1.0~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27d0687ef7f4790c9c16f0d3664620233487fdd4;p=thirdparty%2Fjinja.git

Merge branch '3.0.x'
---

27d0687ef7f4790c9c16f0d3664620233487fdd4
diff --cc .pre-commit-config.yaml
index 39806ed6,85c0e28f..1c751490
--- 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.1
+     rev: v2.31.0
      hooks:
        - id: pyupgrade
 -        args: ["--py36-plus"]
 +        args: ["--py37-plus"]
    - repo: https://github.com/asottile/reorder_python_imports
      rev: v2.6.0
      hooks: