Merge pull request #9844 from pytest-dev/backport-9843-to-7.1.x

pytest-dev · Apr 9, 2022 · 7a501fb · 7a501fb
2 parents 6461e2e + 1769c66
commit 7a501fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
     -   id: black
         args: [--safe, --quiet]
@@ -37,7 +37,7 @@ repos:
           - flake8-typing-imports==1.12.0
           - flake8-docstrings==1.5.0
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.7.1
+    rev: v3.0.1
     hooks:
     -   id: reorder-python-imports
         args: ['--application-directories=.:src', --py37-plus]

diff --git a/doc/en/requirements.txt b/doc/en/requirements.txt
@@ -5,3 +5,6 @@ sphinx-removed-in>=0.2.0
 sphinx>=3.1,<4
 sphinxcontrib-trio
 sphinxcontrib-svg2pdfconverter
+
+# XXX: sphinx<4 is broken with latest jinja2
+jinja2<3.1