summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2020-12-22 20:36:29 -0300
committerGitHub <noreply@github.com>2020-12-22 20:36:29 -0300
commitda01ee0a4bb0af780167ecd228ab3ad249511302 (patch)
tree6c7dbb671c7da31b8aa4a97911daae4e9380add1
parentaf5da977e3af71db240b6a0fa072ba8166e2b00c (diff)
parent5e323becb7df4ecafc7fba16b31a5a8f83d5e28d (diff)
downloadpytest-da01ee0a4bb0af780167ecd228ab3ad249511302.tar.gz
Merge pull request #8185 from bluetech/revert-docs-pygments-workaround
Revert "doc: temporary workaround for pytest-pygments lexing error"
-rw-r--r--doc/en/fixture.rst2
-rw-r--r--doc/en/requirements.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/en/fixture.rst b/doc/en/fixture.rst
index c74984563..752385adc 100644
--- a/doc/en/fixture.rst
+++ b/doc/en/fixture.rst
@@ -1975,7 +1975,7 @@ Example:
Running this test will *skip* the invocation of ``data_set`` with value ``2``:
-.. code-block::
+.. code-block:: pytest
$ pytest test_fixture_marks.py -v
=========================== test session starts ============================
diff --git a/doc/en/requirements.txt b/doc/en/requirements.txt
index fa37acfb4..20246acb7 100644
--- a/doc/en/requirements.txt
+++ b/doc/en/requirements.txt
@@ -1,5 +1,5 @@
pallets-sphinx-themes
-pygments-pytest>=1.1.0
+pygments-pytest>=2.2.0
sphinx-removed-in>=0.2.0
sphinx>=3.1,<4
sphinxcontrib-trio