From c765fa6d042babcbb8ba9baaea4fcebe8c978c25 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Fri, 12 May 2017 22:38:50 +0200 Subject: [PATCH] add regendoc normaliz for pytest --version --- doc/en/Makefile | 3 ++- doc/en/getting-started.rst | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/en/Makefile b/doc/en/Makefile index ffe344ffe..7cfb6f1f8 100644 --- a/doc/en/Makefile +++ b/doc/en/Makefile @@ -18,9 +18,10 @@ REGENDOC_ARGS := \ --normalize "/in \d+.\d+ seconds/in 0.12 seconds/" \ --normalize "@/tmp/pytest-of-.*/pytest-\d+@PYTEST_TMPDIR@" \ --normalize "@pytest-(\d+)\\.[^ ,]+@pytest-\1.x.y@" \ + --normalize "@(This is pytest version )(\d+)\\.[^ ,]+@\1\2.x.y@" \ --normalize "@py-(\d+)\\.[^ ,]+@py-\1.x.y@" \ --normalize "@pluggy-(\d+)\\.[.\d,]+@pluggy-\1.x.y@" \ - --normalize "@Python (\d+)\\.[^ ,]+@Python \1.x.y@" \ + --normalize "@Python (\d+)\\.[^ ,]+@Python \1.x.y@" .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest diff --git a/doc/en/getting-started.rst b/doc/en/getting-started.rst index 789db3176..59abd4c79 100644 --- a/doc/en/getting-started.rst +++ b/doc/en/getting-started.rst @@ -26,7 +26,7 @@ Installation:: To check your installation has installed the correct version:: $ pytest --version - This is pytest version 3.0.8.dev260+gb6125d9.d20170512, imported from $PYTHON_PREFIX/lib/python3.5/site-packages/pytest.py + This is pytest version 3.x.y, imported from $PYTHON_PREFIX/lib/python3.5/site-packages/pytest.py .. _`simpletest`: