From 6ec79fe26cd377952c266ff6494aa4d53fb8d3cd266074c6fc8afc25ab6d43cf Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 17 May 2023 16:50:31 +0000 Subject: [PATCH] - drop pytest-twisted-pr148-pytest7.patch (upstream) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-twisted?expand=0&rev=12 --- pytest-twisted-pr148-pytest7.patch | 22 ---------------------- python-pytest-twisted.changes | 1 + 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pytest-twisted-pr148-pytest7.patch diff --git a/pytest-twisted-pr148-pytest7.patch b/pytest-twisted-pr148-pytest7.patch deleted file mode 100644 index f1969ad..0000000 --- a/pytest-twisted-pr148-pytest7.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 ac591c4..bfc326f 100644 --- a/python-pytest-twisted.changes +++ b/python-pytest-twisted.changes @@ -7,6 +7,7 @@ Wed May 17 16:45:17 UTC 2023 - Dirk Müller fixture * Fixed blockon lock #24 * Added ``qt5reactor`` support +- drop pytest-twisted-pr148-pytest7.patch (upstream) ------------------------------------------------------------------- Mon Mar 28 21:41:17 UTC 2022 - Ben Greiner