diff --git a/aiohttp-3.8.4.tar.gz b/aiohttp-3.8.4.tar.gz deleted file mode 100644 index e237e02..0000000 --- a/aiohttp-3.8.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf2e1a9162c1e441bf805a1fd166e249d574ca04e03b34f97e2928769e91ab5c -size 7338512 diff --git a/aiohttp-3.8.5.tar.gz b/aiohttp-3.8.5.tar.gz new file mode 100644 index 0000000..e3d1b9b --- /dev/null +++ b/aiohttp-3.8.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9552ec52cc147dbf1944ac7ac98af7602e51ea2dcd076ed194ca3c0d1c7d0bc +size 7358303 diff --git a/py3109-compat.patch b/py3109-compat.patch deleted file mode 100644 index 727491e..0000000 --- a/py3109-compat.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: aiohttp-3.8.4/tests/test_client_request.py -=================================================================== ---- aiohttp-3.8.4.orig/tests/test_client_request.py -+++ aiohttp-3.8.4/tests/test_client_request.py -@@ -2,6 +2,7 @@ import asyncio - import hashlib - import io - import os.path -+import sys - import urllib.parse - import zlib - from http.cookies import BaseCookie, Morsel, SimpleCookie -@@ -19,7 +20,6 @@ from aiohttp.client_reqrep import ( - Fingerprint, - _merge_ssl_params, - ) --from aiohttp.helpers import PY_311 - from aiohttp.test_utils import make_mocked_coro - - -@@ -276,7 +276,7 @@ def test_host_header_ipv6_with_port(make - - - @pytest.mark.xfail( -- PY_311, -+ sys.version_info >= (3, 10) and sys.version_info < (3, 10, 9), - reason="No idea why ClientRequest() is constructed out of loop but " - "it calls `asyncio.get_event_loop()`", - raises=DeprecationWarning, -Index: aiohttp-3.8.4/tests/test_streams.py -=================================================================== ---- aiohttp-3.8.4.orig/tests/test_streams.py -+++ aiohttp-3.8.4/tests/test_streams.py -@@ -4,6 +4,7 @@ import abc - import asyncio - import gc - import types -+import sys - from collections import defaultdict - from itertools import groupby - from unittest import mock -@@ -12,7 +13,6 @@ import pytest - from re_assert import Matches - - from aiohttp import streams --from aiohttp.helpers import PY_311 - - DATA = b"line1\nline2\nline3\n" - -@@ -84,7 +84,7 @@ class TestStreamReader: - await stream._wait("test") - - @pytest.mark.xfail( -- PY_311, -+ sys.version_info >= (3, 10) and sys.version_info < (3, 10, 9), - reason="No idea why ClientRequest() is constructed out of loop but " - "it calls `asyncio.get_event_loop()`", - raises=DeprecationWarning, -Index: aiohttp-3.8.4/tests/test_web_app.py -=================================================================== ---- aiohttp-3.8.4.orig/tests/test_web_app.py -+++ aiohttp-3.8.4/tests/test_web_app.py -@@ -1,12 +1,13 @@ - import asyncio - import gc -+import sys - from unittest import mock - - import pytest - - from aiohttp import log, web - from aiohttp.abc import AbstractAccessLogger, AbstractRouter --from aiohttp.helpers import DEBUG, PY_36, PY_311 -+from aiohttp.helpers import DEBUG, PY_36 - from aiohttp.test_utils import make_mocked_coro - from aiohttp.typedefs import Handler - -@@ -40,9 +41,9 @@ async def test_set_loop() -> None: - - - @pytest.mark.xfail( -- PY_311, -- reason="No idea why _set_loop() is constructed out of loop " -- "but it calls `asyncio.get_event_loop()`", -+ sys.version_info >= (3, 10) and sys.version_info < (3, 10, 9), -+ reason="No idea why ClientRequest() is constructed out of loop but " -+ "it calls `asyncio.get_event_loop()`", - raises=DeprecationWarning, - ) - def test_set_loop_default_loop() -> None: diff --git a/python-aiohttp.changes b/python-aiohttp.changes index 4d2adb8..809e43d 100644 --- a/python-aiohttp.changes +++ b/python-aiohttp.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Aug 18 15:42:27 UTC 2023 - Martin Schreiner + +- Remove py3109-compat.patch, no longer required. The current spec + builds successfully on Python 3.9, 3.10 and 3.11. +- Update to 3.8.5: + * Upgraded the vendored copy of llhttp to v8.1.1. + More information here: + https://github.com/aio-libs/aiohttp/security/advisories/GHSA-45c4-8wx5-qw6w + * Added information to C parser exceptions to show which character + caused the error. + * Fixed a transport is None error. + ------------------------------------------------------------------- Wed Apr 26 07:35:37 UTC 2023 - Daniel Garcia diff --git a/python-aiohttp.spec b/python-aiohttp.spec index 012ae96..fcff060 100644 --- a/python-aiohttp.spec +++ b/python-aiohttp.spec @@ -21,16 +21,28 @@ %bcond_with docs %{?sle15_python_module_pythons} Name: python-aiohttp -Version: 3.8.4 +Version: 3.8.5 Release: 0 Summary: Asynchronous HTTP client/server framework License: Apache-2.0 URL: https://github.com/aio-libs/aiohttp Source: https://files.pythonhosted.org/packages/source/a/aiohttp/aiohttp-%{version}.tar.gz -# PATCH-FIX-OPENSUSE py3109-compat.patch -Patch1: py3109-compat.patch # PATCH-FIX-UPSTREAM Update-update_query-calls-to-work-with-latest-yarl.patch gh#aio-libs/aiohttp#7260 -Patch2: Update-update_query-calls-to-work-with-latest-yarl.patch +Patch1: Update-update_query-calls-to-work-with-latest-yarl.patch +Requires: python-aiosignal >= 1.1.2 +Requires: python-attrs >= 17.3.0 +Requires: python-frozenlist >= 1.1.1 +Requires: (python-async_timeout >= 4.0 with python-async_timeout < 5) +Requires: (python-asynctest = 0.13.0 if python-base < 3.8) +Requires: (python-charset-normalizer >= 2.0 with python-charset-normalizer < 4) +Requires: (python-idna_ssl >= 1.0 if python-base < 3.7) +Requires: (python-multidict >= 4.5 with python-multidict < 7) +Requires: (python-typing_extensions >= 3.7.4 if python-base < 3.8) +Requires: (python-yarl >= 1.0 with python-yarl < 2) +Recommends: python-aiodns +Recommends: python-brotlipy +Recommends: python-cChardet +Suggests: %{name}-doc # SECTION build requirements BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel >= 3.6} @@ -53,20 +65,6 @@ BuildRequires: %{python_module multidict >= 4.5 with %python-multidict < 7} BuildRequires: %{python_module typing_extensions >= 3.7.4 if %python-base < 3.8} BuildRequires: %{python_module yarl >= 1.0 with %python-yarl < 2} # /SECTION -Requires: python-aiosignal >= 1.1.2 -Requires: python-attrs >= 17.3.0 -Requires: python-frozenlist >= 1.1.1 -Requires: (python-async_timeout >= 4.0 with python-async_timeout < 5) -Requires: (python-asynctest = 0.13.0 if python-base < 3.8) -Requires: (python-charset-normalizer >= 2.0 with python-charset-normalizer < 4) -Requires: (python-idna_ssl >= 1.0 if python-base < 3.7) -Requires: (python-multidict >= 4.5 with python-multidict < 7) -Requires: (python-typing_extensions >= 3.7.4 if python-base < 3.8) -Requires: (python-yarl >= 1.0 with python-yarl < 2) -Recommends: python-aiodns -Recommends: python-brotlipy -Recommends: python-cChardet -Suggests: %{name}-doc # SECTION test requirements BuildRequires: %{python_module aiodns} BuildRequires: %{python_module brotlipy}