From 064f71d7800bb81ddfd8d57431694bf2585134cd733c051b62321a1d95050089 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 28 Jul 2025 10:39:53 +0000 Subject: [PATCH 1/2] Accepting request 1296060 from home:nkrapp:branches:devel:languages:python - Add remove-zlib-ng-test-dep.patch to remove python-zlib-ng test dependency OBS-URL: https://build.opensuse.org/request/show/1296060 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-aiohttp?expand=0&rev=153 --- python-aiohttp.changes | 6 ++++++ python-aiohttp.spec | 5 ++++- remove-zlib-ng-test-dep.patch | 30 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 remove-zlib-ng-test-dep.patch diff --git a/python-aiohttp.changes b/python-aiohttp.changes index 75e6ad2..b4b41ee 100644 --- a/python-aiohttp.changes +++ b/python-aiohttp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 28 08:16:17 UTC 2025 - Nico Krapp + +- Add remove-zlib-ng-test-dep.patch to remove python-zlib-ng test + dependency + ------------------------------------------------------------------- Mon Jul 14 15:17:06 UTC 2025 - Dirk Müller diff --git a/python-aiohttp.spec b/python-aiohttp.spec index 888d677..53729b4 100644 --- a/python-aiohttp.spec +++ b/python-aiohttp.spec @@ -29,6 +29,8 @@ Patch0: test_no_warnings_fix.patch # PATCH-FIX-OPENSUSE remove-isal-test-dep.patch -- daniel.garcia@suse.com # Remove python-isal dependency for testing. Patch1: remove-isal-test-dep.patch +# PATCH-FIX-OPENSUSE remove-zlib-ng-test-dep.patch +Patch2: remove-zlib-ng-test-dep.patch Requires: python-aiohappyeyeballs >= 2.5.0 Requires: python-aiosignal >= 1.4 Requires: python-attrs >= 17.3.0 @@ -73,7 +75,6 @@ BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module re-assert} BuildRequires: %{python_module time-machine} BuildRequires: %{python_module trustme} -BuildRequires: %{python_module zlib-ng} # /SECTION # SECTION docs %if %{with docs} @@ -134,6 +135,8 @@ donttest="test_aiohttp_request_coroutine or test_mark_formdata_as_processed or t donttest+=" or test_tcp_connector_ssl_shutdown_timeout" # most probably https://github.com/cbornet/blockbuster/issues/47 donttest+=" or (test_cookie_jar and (heap or expire)) or test_treat_as_secure_origin_init" +# hardlimit for open files too low +donttest+=" or test_handler_cancellation or test_no_handler_cancellation " # requires python-on-whales rm -v tests/autobahn/test_autobahn.py diff --git a/remove-zlib-ng-test-dep.patch b/remove-zlib-ng-test-dep.patch new file mode 100644 index 0000000..1a0e1a3 --- /dev/null +++ b/remove-zlib-ng-test-dep.patch @@ -0,0 +1,30 @@ +Index: aiohttp-3.12.14/requirements/test.in +=================================================================== +--- aiohttp-3.12.14.orig/requirements/test.in ++++ aiohttp-3.12.14/requirements/test.in +@@ -17,4 +17,3 @@ re-assert + setuptools-git + trustme; platform_machine != "i686" # no 32-bit wheels + wait-for-it +-zlib_ng +Index: aiohttp-3.12.14/tests/conftest.py +=================================================================== +--- aiohttp-3.12.14.orig/tests/conftest.py ++++ aiohttp-3.12.14/tests/conftest.py +@@ -13,7 +13,6 @@ from unittest import mock + from uuid import uuid4 + + import pytest +-import zlib_ng.zlib_ng + from blockbuster import blockbuster_ctx + + from aiohttp import payload +@@ -330,7 +329,7 @@ def unused_port_socket() -> Generator[so + s.close() + + +-@pytest.fixture(params=[zlib, zlib_ng.zlib_ng]) ++@pytest.fixture(params=[zlib]) + def parametrize_zlib_backend( + request: pytest.FixtureRequest, + ) -> Generator[None, None, None]: From 1b13e6894bb8ab463e5c401906960cce373a26d24d360fdb18e15839f9941975 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 28 Jul 2025 11:21:56 +0000 Subject: [PATCH 2/2] Accepting request 1296096 from home:nkrapp:branches:devel:languages:python - enable test_leaks again, works with limited threads OBS-URL: https://build.opensuse.org/request/show/1296096 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-aiohttp?expand=0&rev=154 --- python-aiohttp.changes | 1 + python-aiohttp.spec | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/python-aiohttp.changes b/python-aiohttp.changes index b4b41ee..dcf0885 100644 --- a/python-aiohttp.changes +++ b/python-aiohttp.changes @@ -3,6 +3,7 @@ Mon Jul 28 08:16:17 UTC 2025 - Nico Krapp - Add remove-zlib-ng-test-dep.patch to remove python-zlib-ng test dependency +- enable test_leaks again, works with limited threads ------------------------------------------------------------------- Mon Jul 14 15:17:06 UTC 2025 - Dirk Müller diff --git a/python-aiohttp.spec b/python-aiohttp.spec index 53729b4..f749eaf 100644 --- a/python-aiohttp.spec +++ b/python-aiohttp.spec @@ -135,8 +135,6 @@ donttest="test_aiohttp_request_coroutine or test_mark_formdata_as_processed or t donttest+=" or test_tcp_connector_ssl_shutdown_timeout" # most probably https://github.com/cbornet/blockbuster/issues/47 donttest+=" or (test_cookie_jar and (heap or expire)) or test_treat_as_secure_origin_init" -# hardlimit for open files too low -donttest+=" or test_handler_cancellation or test_no_handler_cancellation " # requires python-on-whales rm -v tests/autobahn/test_autobahn.py @@ -144,8 +142,6 @@ rm -v tests/autobahn/test_autobahn.py rm -v tests/test_proxy_functional.py # Requires python-pytest-codspeed rm -v tests/test_benchmarks_* -# some tests from here hang with pycares 4.9 https://github.com/aio-libs/aiohttp/issues/11244 -rm -v tests/test_leaks.py # randomly fails on xdist splits single_runs="(test_run_app or test_web_runner)"