Merge remote-tracking branch 'origin/2.0.x'

Author: davidism

requirements/dev.txt

@@ -44,12 +44,10 @@ imagesize==1.2.0
     # via sphinx
 iniconfig==1.1.1
     # via pytest
-jinja2==2.11.3
+jinja2==3.0.0
     # via sphinx
-markupsafe==1.1.1
-    # via
-    #   jinja2
-    #   sphinx
+markupsafe==2.0.0
+    # via jinja2
 mypy-extensions==0.4.3
     # via mypy
 mypy==0.812
@@ -104,7 +102,7 @@ sphinx-issues==1.2.0
     # via -r requirements/docs.in
 sphinx-tabs==3.0.0
     # via -r requirements/docs.in
-sphinx==4.0.1
+git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3
     # via
     #   -r requirements/docs.in
     #   pallets-sphinx-themes

requirements/docs.in

@@ -1,5 +1,5 @@
 Pallets-Sphinx-Themes
-Sphinx
+git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3  # https://github.com/sphinx-doc/sphinx/issues/921
 sphinx-issues
 sphinxcontrib-log-cabinet
 sphinx-tabs

requirements/docs.txt

@@ -20,12 +20,10 @@ idna==2.10
     # via requests
 imagesize==1.2.0
     # via sphinx
-jinja2==2.11.3
+jinja2==3.0.0
     # via sphinx
-markupsafe==1.1.1
-    # via
-    #   jinja2
-    #   sphinx
+markupsafe==2.0.0
+    # via jinja2
 packaging==20.9
     # via
     #   pallets-sphinx-themes
@@ -48,7 +46,7 @@ sphinx-issues==1.2.0
     # via -r requirements/docs.in
 sphinx-tabs==3.0.0
     # via -r requirements/docs.in
-sphinx==4.0.1
+git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3
     # via
     #   -r requirements/docs.in
     #   pallets-sphinx-themes