Merge branch '3.0.x'

diff --cc .github/workflows/tests.yaml
Simple merge

diff --cc .pre-commit-config.yaml
index 639441dd721851500170013c63fa1a7ec07f6a22,07f849204a2ce51d265d5f96075a6fa87714eabc..e855723d98fac9e36f18af3a9c5ebc95c2cb9479
--- 1/.pre-commit-config.yaml
--- 2/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@@ -6,9 -6,9 +6,9 @@@ repos
      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
+     rev: v2.7.1
      hooks:
        - id: reorder-python-imports
          args: ["--application-directories", "src"]

diff --cc src/jinja2/filters.py
Simple merge