Merge pull request #7509 from bluetech/sphinx3

docs: support Sphinx>=3.1 and require it
2020-07-18 12:38:26 +03:00
parent 71ab6236a1 65b014a117
commit 8783e65f8d
3 changed files with 3 additions and 3 deletions
--- a/doc/en/goodpractices.rst
+++ b/doc/en/goodpractices.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: python
+.. highlight:: python
 .. _`goodpractices`:

 Good Integration Practices
--- a/doc/en/reference.rst
+++ b/doc/en/reference.rst
@@ -138,7 +138,7 @@ pytest.mark.parametrize

 **Tutorial**: :doc:`parametrize`.

-.. automethod:: _pytest.python.Metafunc.parametrize
+This mark has the same signature as :py:meth:`_pytest.python.Metafunc.parametrize`; see there.


 .. _`pytest.mark.skip ref`:
--- a/doc/en/requirements.txt
+++ b/doc/en/requirements.txt
@@ -1,5 +1,5 @@
 pallets-sphinx-themes
 pygments-pytest>=1.1.0
 sphinx-removed-in>=0.2.0
-sphinx>=1.8.2,<2.1
+sphinx>=3.1,<4
 sphinxcontrib-trio