From 5b56d2f006f6da57684d060cdb872c53afe4d5c51dfab7b2c05544280a6cf29d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 31 Mar 2022 12:54:46 +0000 Subject: [PATCH] Accepting request 965497 from home:bnavigator:branches:devel:languages:python:pytest - Add add pytest-twisted-pr148-pytest7.patch * gh#pytest-dev/pytest-twisted#148 OBS-URL: https://build.opensuse.org/request/show/965497 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-twisted?expand=0&rev=9 --- pytest-twisted-pr148-pytest7.patch | 22 ++++++++++++++++++++++ python-pytest-twisted.changes | 6 ++++++ python-pytest-twisted.spec | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pytest-twisted-pr148-pytest7.patch diff --git a/pytest-twisted-pr148-pytest7.patch b/pytest-twisted-pr148-pytest7.patch new file mode 100644 index 0000000..f1969ad --- /dev/null +++ b/pytest-twisted-pr148-pytest7.patch @@ -0,0 +1,22 @@ +From 24dff9f710a02ceb5bb63049ab6dfd591321ca3a Mon Sep 17 00:00:00 2001 +From: Kyle Altendorf +Date: Tue, 15 Mar 2022 09:26:16 -0400 +Subject: [PATCH] specify just pytester as the plugin + +--- + testing/conftest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testing/conftest.py b/testing/conftest.py +index 72dffd2..c8ed3b7 100644 +--- a/testing/conftest.py ++++ b/testing/conftest.py +@@ -2,7 +2,7 @@ + import pytest_twisted + + +-pytest_plugins = "_pytest.pytester" ++pytest_plugins = "pytester" + + + @pytest.hookimpl(tryfirst=True) diff --git a/python-pytest-twisted.changes b/python-pytest-twisted.changes index 36237f1..4099cd5 100644 --- a/python-pytest-twisted.changes +++ b/python-pytest-twisted.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 28 21:41:17 UTC 2022 - Ben Greiner + +- Add add pytest-twisted-pr148-pytest7.patch + * gh#pytest-dev/pytest-twisted#148 + ------------------------------------------------------------------- Thu Jan 6 17:21:12 UTC 2022 - Ben Greiner diff --git a/python-pytest-twisted.spec b/python-pytest-twisted.spec index 9b6608c..a060eb9 100644 --- a/python-pytest-twisted.spec +++ b/python-pytest-twisted.spec @@ -27,6 +27,8 @@ URL: https://github.com/pytest-dev/pytest-twisted Source: https://github.com/pytest-dev/pytest-twisted/archive/v%{version}.tar.gz#/pytest-twisted-%{version}-gh.tar.gz # PATCH-FIX-OPENSUSE pytest-twisted-ignorepy310DeprecationWarnings.patch -- upstream wants this fixed in twisted itself -- gh#pytest-dev/pytest-twisted/146 Patch0: pytest-twisted-ignorepy310DeprecationWarnings.patch +# PATCH-FIX-UPSTREAM pytest-twisted-pr148-pytest7.patch -- gh#pytest-dev/pytest-twisted#148 +Patch1: https://github.com/pytest-dev/pytest-twisted/pull/148.patch#/pytest-twisted-pr148-pytest7.patch BuildRequires: %{python_module Twisted} BuildRequires: %{python_module decorator} BuildRequires: %{python_module greenlet}