docs: Pin jinja2 to < 3.1.0

Jinja2 3.1.0 removed deprecated code that is still used by sphinx
1.8.x, and it looks like our custom sphinx extensions are not working
with more recent versions of sphinx..

See:
- https://github.com/pallets/jinja/issues/1631
- https://github.com/readthedocs/readthedocs.org/issues/9037

and

- https://github.com/PowerDNS/pdns/pull/7712

The exact error is:
```
Extension error:
Could not import extension sphinx.builders.latex (exception: cannot import name 'contextfunction' from 'jinja2' (/dnsdist/pdns/dnsdistdist/.venv/lib/python3.7/site-packages/jinja2/__init__.py))
```

(cherry picked from commit 92ad29702011ac7cbd0d7d118ba612e7e07cedbe)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 9cf30e4daacf66ab1842398eef1c399e0f4d64e8..622263e53d84e30d0b858c734d2ba29640282384 100644 (file)
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -4,4 +4,5 @@ git+https://github.com/pieterlexis/sphinx-jsondomain@no-type-links
 git+https://github.com/pieterlexis/sphinx-changelog@render-tags
 sphinxcontrib-fulltoc
 guzzle_sphinx_theme
-docutils!=0.15
+docutils!=0.15,<0.18
+jinja2<3.1.0

diff --git a/pdns/dnsdistdist/docs/requirements.txt b/pdns/dnsdistdist/docs/requirements.txt
index 63606d88e69a40867877b960f7ac1af87cdb7925..5e3da903a2302ef10e7d5f12862eef8a1d6b1244 100644 (file)
--- a/pdns/dnsdistdist/docs/requirements.txt
+++ b/pdns/dnsdistdist/docs/requirements.txt
@@ -4,4 +4,5 @@ git+https://github.com/pieterlexis/sphinx-jsondomain@no-type-links
 git+https://github.com/pieterlexis/sphinx-changelog@render-tags
 sphinxcontrib-httpdomain
 sphinxcontrib-fulltoc
-docutils!=0.15
+docutils!=0.15,<0.18
+jinja2<3.1.0

diff --git a/pdns/recursordist/docs/requirements.txt b/pdns/recursordist/docs/requirements.txt
index cd61585a53251a0dee7ad39496165ee619d3070b..573799b8527de36b12ad484e26cdf393ba46b908 100644 (file)
--- a/pdns/recursordist/docs/requirements.txt
+++ b/pdns/recursordist/docs/requirements.txt
@@ -5,4 +5,5 @@ git+https://github.com/pieterlexis/sphinx-changelog@render-tags
 guzzle_sphinx_theme
 sphinxcontrib.httpdomain
 sphinxcontrib-fulltoc
-docutils!=0.15
+docutils!=0.15,<0.18
+jinja2<3.1.0