Skip to content

Commit c19708b

Browse files
authored
Merge pull request #2930 from nicoddemus/pin-pluggy-0.5
Update pluggy pin to 0.5.*
2 parents 1aeb58b + e2c59d3 commit c19708b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

doc/en/writing_plugins.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ hook wrappers and passes the same arguments as to the regular hooks.
452452

453453
At the yield point of the hook wrapper pytest will execute the next hook
454454
implementations and return their result to the yield point in the form of
455-
a :py:class:`CallOutcome <pluggy._CallOutcome>` instance which encapsulates a result or
455+
a :py:class:`Result <pluggy._Result>` instance which encapsulates a result or
456456
exception info. The yield point itself will thus typically not raise
457457
exceptions (unless there are bugs).
458458

@@ -517,7 +517,7 @@ Here is the order of execution:
517517
Plugin1).
518518

519519
4. Plugin3's pytest_collection_modifyitems then executing the code after the yield
520-
point. The yield receives a :py:class:`CallOutcome <pluggy._CallOutcome>` instance which encapsulates
520+
point. The yield receives a :py:class:`Result <pluggy._Result>` instance which encapsulates
521521
the result from calling the non-wrappers. Wrappers shall not modify the result.
522522

523523
It's possible to use ``tryfirst`` and ``trylast`` also in conjunction with
@@ -714,7 +714,7 @@ Reference of objects involved in hooks
714714
:members:
715715
:inherited-members:
716716

717-
.. autoclass:: pluggy._CallOutcome()
717+
.. autoclass:: pluggy._Result
718718
:members:
719719

720720
.. autofunction:: _pytest.config.get_plugin_manager()

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def main():
5353
# if _PYTEST_SETUP_SKIP_PLUGGY_DEP is set, skip installing pluggy;
5454
# used by tox.ini to test with pluggy master
5555
if '_PYTEST_SETUP_SKIP_PLUGGY_DEP' not in os.environ:
56-
install_requires.append('pluggy>=0.4.0,<0.5')
56+
install_requires.append('pluggy>=0.5,<0.6')
5757
if has_environment_marker_support():
5858
extras_require[':python_version<"3.0"'] = ['funcsigs']
5959
extras_require[':sys_platform=="win32"'] = ['colorama']

0 commit comments

Comments
 (0)