Merge pull request #24922 from meeseeksmachine/auto-backport-of-pr-24921-on-v3.7.x

oscargus · web-flow · commit cef02fd57f82 · 2023-01-10T08:40:31.000+01:00
Backport PR #24921 on branch v3.7.x (Pin sphinx != 6.1.2)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -177,7 +177,7 @@ jobs:
 
           # Install optional dependencies from PyPI.
           # Sphinx is needed to run sphinxext tests
-          python -m pip install --upgrade sphinx
+          python -m pip install --upgrade sphinx!=6.1.2
 
           # GUI toolkits are pip-installable only for some versions of Python
           # so don't fail if we can't install them.  Make it easier to check
diff --git a/requirements/doc/doc-requirements.txt b/requirements/doc/doc-requirements.txt
@@ -7,7 +7,7 @@
 # Install the documentation requirements with:
 #     pip install -r requirements/doc/doc-requirements.txt
 #
-sphinx>=3.0.0
+sphinx>=3.0.0,!=6.1.2
 colorspacious
 ipython
 ipywidgets

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`# Install the documentation requirements with:`
`8`	`8`	`# pip install -r requirements/doc/doc-requirements.txt`
`9`	`9`	`#`
`10`		`-sphinx>=3.0.0`
	`10`	`+sphinx>=3.0.0,!=6.1.2`
`11`	`11`	`colorspacious`
`12`	`12`	`ipython`
`13`	`13`	`ipywidgets`