diff --git a/doc/en/skipping.rst b/doc/en/skipping.rst index 57f565472e5..2b654560e10 100644 --- a/doc/en/skipping.rst +++ b/doc/en/skipping.rst @@ -180,7 +180,7 @@ Skipping on a missing import dependency ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You can skip tests on a missing import by using :ref:`pytest.importorskip ref` -at module level or within a test or test setup function. +at module level, within a test, or test setup function. .. code-block:: python diff --git a/src/_pytest/outcomes.py b/src/_pytest/outcomes.py index 13eb0a295e7..94713662571 100644 --- a/src/_pytest/outcomes.py +++ b/src/_pytest/outcomes.py @@ -161,7 +161,7 @@ def importorskip( current test if the module cannot be imported. :param str modname: the name of the module to import - :param str minversion: if given, the imported module ``__version__`` + :param str minversion: if given, the imported module's ``__version__`` attribute must be at least this minimal version, otherwise the test is still skipped. :param str reason: if given, this reason is shown as the message when the diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py index d9ceb0e7867..94058f70cba 100644 --- a/src/_pytest/pytester.py +++ b/src/_pytest/pytester.py @@ -632,7 +632,7 @@ def mkpydir(self, name): def copy_example(self, name=None): """Copy file from project's directory into the testdir. - :param str name: The name of the file for copy. + :param str name: The name of the file to copy. :return: path to the copied directory (inside ``self.tmpdir``). """