From a3f51b5e5c37e815210b68b5804555d61cef2c39c9d6b3b4cd9abd0d01e83ec1 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 28 Mar 2022 06:41:48 +0000 Subject: [PATCH] Accepting request 965236 from home:bnavigator:branches:devel:languages:python - Add anyio-pytest7.patch -- gh#agronholm/anyio#420 OBS-URL: https://build.opensuse.org/request/show/965236 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-anyio?expand=0&rev=14 --- anyio-pytest7.patch | 88 ++++++++++++++++++++++++++++++++++++++++++++ python-anyio.changes | 5 +++ python-anyio.spec | 6 ++- 3 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 anyio-pytest7.patch diff --git a/anyio-pytest7.patch b/anyio-pytest7.patch new file mode 100644 index 0000000..39e3346 --- /dev/null +++ b/anyio-pytest7.patch @@ -0,0 +1,88 @@ +From 58fcb0c495a847e2f6627ec07fe07f4dd6ae9cd9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= +Date: Mon, 7 Feb 2022 00:16:18 +0200 +Subject: [PATCH] Upgraded pytest to 7.0 + +--- + setup.cfg | 2 +- + tests/test_pytest_plugin.py | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) + +Index: anyio-3.5.0/setup.cfg +=================================================================== +--- anyio-3.5.0.orig/setup.cfg ++++ anyio-3.5.0/setup.cfg +@@ -47,7 +47,7 @@ test = + contextlib2; python_version < '3.7' + coverage[toml] >= 4.5 + hypothesis >= 4.0 +- pytest >= 6.0 ++ pytest >= 7.0 + pytest-mock >= 3.6.1 + trustme + uvloop < 0.15; python_version < '3.7' and (platform_python_implementation == 'CPython' and platform_system != 'Windows') +Index: anyio-3.5.0/tests/test_pytest_plugin.py +=================================================================== +--- anyio-3.5.0.orig/tests/test_pytest_plugin.py ++++ anyio-3.5.0/tests/test_pytest_plugin.py +@@ -1,5 +1,5 @@ + import pytest +-from _pytest.pytester import Testdir ++from _pytest.pytester import Pytester + + from anyio import get_all_backends + +@@ -9,7 +9,7 @@ pytestmark = pytest.mark.filterwarnings( + pytest_args = '-v', '-p', 'anyio', '-p', 'no:asyncio' + + +-def test_plugin(testdir: Testdir) -> None: ++def test_plugin(testdir: Pytester) -> None: + testdir.makeconftest( + """ + import sniffio +@@ -67,7 +67,7 @@ def test_plugin(testdir: Testdir) -> Non + result.assert_outcomes(passed=3 * len(get_all_backends()), skipped=len(get_all_backends())) + + +-def test_asyncio(testdir: Testdir) -> None: ++def test_asyncio(testdir: Pytester) -> None: + testdir.makeconftest( + """ + import asyncio +@@ -140,7 +140,7 @@ def test_asyncio(testdir: Testdir) -> No + result.assert_outcomes(passed=2, failed=1, errors=2) + + +-def test_autouse_async_fixture(testdir: Testdir) -> None: ++def test_autouse_async_fixture(testdir: Pytester) -> None: + testdir.makeconftest( + """ + import pytest +@@ -177,7 +177,7 @@ def test_autouse_async_fixture(testdir: + result.assert_outcomes(passed=len(get_all_backends())) + + +-def test_cancel_scope_in_asyncgen_fixture(testdir: Testdir) -> None: ++def test_cancel_scope_in_asyncgen_fixture(testdir: Pytester) -> None: + testdir.makepyfile( + """ + import pytest +@@ -204,7 +204,7 @@ def test_cancel_scope_in_asyncgen_fixtur + result.assert_outcomes(passed=len(get_all_backends())) + + +-def test_hypothesis_module_mark(testdir: Testdir) -> None: ++def test_hypothesis_module_mark(testdir: Pytester) -> None: + testdir.makepyfile( + """ + import pytest +@@ -235,7 +235,7 @@ def test_hypothesis_module_mark(testdir: + result.assert_outcomes(passed=len(get_all_backends()) + 1, xfailed=len(get_all_backends())) + + +-def test_hypothesis_function_mark(testdir: Testdir) -> None: ++def test_hypothesis_function_mark(testdir: Pytester) -> None: + testdir.makepyfile( + """ + import pytest diff --git a/python-anyio.changes b/python-anyio.changes index 8606fb2..e8fff69 100644 --- a/python-anyio.changes +++ b/python-anyio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 27 18:32:27 UTC 2022 - Ben Greiner + +- Add anyio-pytest7.patch -- gh#agronholm/anyio#420 + ------------------------------------------------------------------- Tue Feb 15 16:06:39 UTC 2022 - Dirk Müller diff --git a/python-anyio.spec b/python-anyio.spec index b152d86..9794c15 100644 --- a/python-anyio.spec +++ b/python-anyio.spec @@ -25,6 +25,8 @@ Summary: High level compatibility layer for asynchronous event loop imple License: MIT URL: https://github.com/agronholm/anyio Source: https://files.pythonhosted.org/packages/source/a/anyio/anyio-%{version}.tar.gz +# PATCH-FIX-UPSTREAM anyio-pytest7.patch -- gh#agronholm/anyio#420 +Patch1: anyio-pytest7.patch BuildRequires: %{python_module contextlib2 if %python-base < 3.7} BuildRequires: %{python_module dataclasses if %python-base < 3.7} BuildRequires: %{python_module idna >= 2.8} @@ -37,7 +39,7 @@ BuildRequires: python-rpm-macros >= 20210127.3a18043 # SECTION test requirements BuildRequires: %{python_module hypothesis >= 4.0} BuildRequires: %{python_module mock >= 4.0 if %python-base < 3.8} -BuildRequires: %{python_module pytest >= 6.0} +BuildRequires: %{python_module pytest >= 7.0} BuildRequires: %{python_module pytest-mock >= 3.6.1} BuildRequires: %{python_module trio >= 0.16} BuildRequires: %{python_module trustme} @@ -62,7 +64,7 @@ Asynchronous compatibility API that allows applications and libraries written against it to run unmodified on asyncio, curio and trio. %prep -%setup -q -n anyio-%{version} +%autosetup -p1 -n anyio-%{version} %build %python_build