Merge pull request pytest-dev#9040 from nicoddemus/bump-pluggy

nicoddemus · Aug 26, 2021 · 44d3282 · 44d3282
1 parent fafe00a
commit 44d3282
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/doc/en/reference.rst b/doc/en/reference.rst
@@ -920,11 +920,8 @@ TestReport
 _Result
 ~~~~~~~
 
-Result used within :ref:`hook wrappers <hookwrapper>`.
+Result object used within :ref:`hook wrappers <hookwrapper>`, see :py:class:`_Result in the pluggy documentation <pluggy._callers._Result>` for more information.
 
-.. autoclass:: pluggy.callers._Result
-.. automethod:: pluggy.callers._Result.get_result
-.. automethod:: pluggy.callers._Result.force_result
 
 Global Variables
 ----------------

diff --git a/doc/en/requirements.txt b/doc/en/requirements.txt
@@ -1,4 +1,5 @@
 pallets-sphinx-themes
+pluggy>=1.0
 pygments-pytest>=1.1.0
 sphinx-removed-in>=0.2.0
 sphinx>=3.1,<4

diff --git a/setup.cfg b/setup.cfg
@@ -45,7 +45,7 @@ install_requires =
     attrs>=19.2.0
     iniconfig
     packaging
-    pluggy>=0.12,<1.0.0a1
+    pluggy>=0.12,<2.0
     py>=1.8.2
     toml
     atomicwrites>=1.0;sys_platform=="win32"