From 60ca83746ba107473bbaee870fc8cdd98766961e Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sat, 23 Oct 2021 22:34:17 +0300 Subject: [PATCH] docs: change references to 6.3 -> 7.0 The plans have changed, next version will be 7.0 not 6.3. --- doc/en/deprecations.rst | 4 ++-- src/_pytest/cacheprovider.py | 2 +- src/_pytest/config/argparsing.py | 2 +- src/_pytest/main.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/en/deprecations.rst b/doc/en/deprecations.rst index ddddcfb0e..cfe7f489f 100644 --- a/doc/en/deprecations.rst +++ b/doc/en/deprecations.rst @@ -63,7 +63,7 @@ Implement the :func:`pytest_load_initial_conftests <_pytest.hookspec.pytest_load Diamond inheritance between :class:`pytest.File` and :class:`pytest.Item` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. deprecated:: 6.3 +.. deprecated:: 7.0 Inheriting from both Item and file at once has never been supported officially, however some plugins providing linting/code analysis have been using this as a hack. @@ -90,7 +90,7 @@ scheduled for removal in pytest 7 (deprecated since pytest 2.4.0): Raising ``unittest.SkipTest`` during collection ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. deprecated:: 6.3 +.. deprecated:: 7.0 Raising :class:`unittest.SkipTest` to skip collection of tests during the pytest collection phase is deprecated. Use :func:`pytest.skip` instead. diff --git a/src/_pytest/cacheprovider.py b/src/_pytest/cacheprovider.py index 78cec7093..78edf9ac5 100755 --- a/src/_pytest/cacheprovider.py +++ b/src/_pytest/cacheprovider.py @@ -128,7 +128,7 @@ class Cache: it to manage files to e.g. store/retrieve database dumps across test sessions. - .. versionadded:: 6.3 + .. versionadded:: 7.0 :param name: Must be a string not containing a ``/`` separator. diff --git a/src/_pytest/config/argparsing.py b/src/_pytest/config/argparsing.py index b3aff258a..b0bb3f168 100644 --- a/src/_pytest/config/argparsing.py +++ b/src/_pytest/config/argparsing.py @@ -185,7 +185,7 @@ class Parser: * ``paths``: a list of :class:`pathlib.Path`, separated as in a shell * ``pathlist``: a list of ``py.path``, separated as in a shell - .. versionadded:: 6.3 + .. versionadded:: 7.0 The ``paths`` variable type. Defaults to ``string`` if ``None`` or not passed. diff --git a/src/_pytest/main.py b/src/_pytest/main.py index cfdc091e1..c48222409 100644 --- a/src/_pytest/main.py +++ b/src/_pytest/main.py @@ -500,7 +500,7 @@ class Session(nodes.FSCollector): def startpath(self) -> Path: """The path from which pytest was invoked. - .. versionadded:: 6.3.0 + .. versionadded:: 7.0.0 """ return self.config.invocation_params.dir