From fbba504cd5e1a74d528a41a11a7b82297cd7da74 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Thu, 26 Aug 2021 09:26:51 -0300 Subject: [PATCH 1/2] Allow pluggy >=1.0 Now that pluggy 1.0 has been released, we can allow pluggy 1.0 with new pytest versions. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ca1d2c2bdd1..4594dfd6c1d 100644 --- 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 tomli>=1.0.0 atomicwrites>=1.0;sys_platform=="win32" From 109bc2649d8f1573e91f281d1a62e95dee0c2cc5 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Thu, 26 Aug 2021 09:33:50 -0300 Subject: [PATCH 2/2] Adapt docs references to use pluggy 1.0 Also use the intersphinx reference instead of the class directly. --- doc/en/reference/reference.rst | 5 +---- doc/en/requirements.txt | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/en/reference/reference.rst b/doc/en/reference/reference.rst index db49b0f1d44..98b5a5064cf 100644 --- a/doc/en/reference/reference.rst +++ b/doc/en/reference/reference.rst @@ -956,11 +956,8 @@ TestReport _Result ~~~~~~~ -Result used within :ref:`hook wrappers `. +Result object used within :ref:`hook wrappers `, see :py:class:`_Result in the pluggy documentation ` for more information. -.. autoclass:: pluggy.callers._Result -.. automethod:: pluggy.callers._Result.get_result -.. automethod:: pluggy.callers._Result.force_result Stash ~~~~~ diff --git a/doc/en/requirements.txt b/doc/en/requirements.txt index 20246acb750..2cd1fc25eb3 100644 --- a/doc/en/requirements.txt +++ b/doc/en/requirements.txt @@ -1,4 +1,5 @@ pallets-sphinx-themes +pluggy>=1.0 pygments-pytest>=2.2.0 sphinx-removed-in>=0.2.0 sphinx>=3.1,<4