Update-update_query-calls-to-work-with-latest-yarl.patch

@@ -1,33 +0,0 @@
-From 8afa163fba77b38de1c2356668f08a7c3b9d0b58 Mon Sep 17 00:00:00 2001
-From: danigm <daniel.garcia@suse.com>
-Date: Mon, 15 May 2023 15:20:35 +0200
-Subject: [PATCH] Update update_query calls to work with latest yarl
-
----
- aiohttp/client.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/aiohttp/client.py b/aiohttp/client.py
-index 0d0f4c1..56ec740 100644
---- a/aiohttp/client.py
-+++ b/aiohttp/client.py
-@@ -414,6 +414,7 @@ class ClientSession:
-         redirects = 0
-         history = []
-         version = self._version
-+        params = params or {}
- 
-         # Merge with default headers and transform to CIMultiDict
-         headers = self._prepare_headers(headers)
-@@ -630,7 +631,7 @@ class ClientSession:
-                             headers.pop(hdrs.AUTHORIZATION, None)
- 
-                         url = parsed_url
--                        params = None
-+                        params = {}
-                         resp.release()
-                         continue
- 
--- 
-2.40.1
-

ignore-DeprecationWarning-set_child_watcher-is-depre.patch

@@ -1,26 +0,0 @@
-From 58cc2a62cac52e742d19326f4c67331cc0634f67 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
-Date: Mon, 15 May 2023 16:22:25 +0200
-Subject: [PATCH] ignore DeprecationWarning 'set_child_watcher' is deprecated
- as of Python 3.12
-
----
- setup.cfg | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/setup.cfg b/setup.cfg
-index 48fbf70..0336cf8 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -144,6 +144,8 @@ filterwarnings =
-     # can be dropped with the next release of `certify`, specifically
-     # `certify > 2022.06.15`.
-     ignore:path is deprecated. Use files.. instead. Refer to https.//importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy for migration advice.:DeprecationWarning:certifi.core
-+    ignore:'set_child_watcher' is deprecated as of Python 3.12 and will be removed in Python 3.14.:DeprecationWarning::
-+
- junit_suite_name = aiohttp_test_suite
- norecursedirs = dist docs build .tox .eggs
- minversion = 3.8.2
--- 
-2.40.1
-

python-aiohttp.spec

@@ -2,7 +2,7 @@
 
 Name:           python-aiohttp
 Version:        3.8.4
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Python HTTP client/server for asyncio
 
 License:        Apache-2.0
@@ -20,16 +20,6 @@ Patch:          0001-Unbundle-llhttp.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2158175
 Patch:          %{url}/pull/7178.patch
 
-# Update update_query calls to work with latest yarl (1.9.2)
-# Patch was inspired by this upstream commit:
-# https://github.com/aio-libs/aiohttp/commit/2be9318
-Patch:          Update-update_query-calls-to-work-with-latest-yarl.patch
-
-# [3.12] Ignore DeprecationWarning: 'set_child_watcher' is deprecated as of Python 3.12
-# and will be removed in Python 3.14. 
-# Upstream report: https://github.com/aio-libs/aiohttp/issues/7291
-Patch:          ignore-DeprecationWarning-set_child_watcher-is-depre.patch
-
 BuildRequires:  gcc
 
 BuildRequires:  llhttp-devel
@@ -150,9 +140,6 @@ k="${k-}${k+ and }not test_tcp_connector_fingerprint_fail[pyloop]"
 %doc README.rst
 
 %changelog
-* Mon May 15 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.8.4-2
-- Backport upstream patch to fix a test failing with python-yarl 1.9.2
-
 * Mon Feb 13 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 3.8.4-1
 - Update to 3.8.4 (close RHBZ#2169212)