SLFO-pool/python-aiohttp
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main python-aiohttp revision 3b76e4c3f61664f4bdf4f0a1cb08ea4b

Browse Source
This commit is contained in:
Adrian Schröter 2024-12-13 11:06:31 +01:00
parent afb5a4c020
commit 9a56d7353b
7 changed files with 201 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
aiohttp-3.10.11.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
aiohttp-3.9.5.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

142
python-aiohttp.changes
View File

@ -1,3 +1,145 @@
-------------------------------------------------------------------
Tue Nov 19 08:50:53 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
- update to 3.10.11:
(bsc#1233446, CVE-2024-52303, bsc#1233447, CVE-2024-52304)
- Authentication provided by a redirect now takes precedence over
provided auth when making requests with the client -- by
:user:`PLPeeters`.
- Fixed :py:meth:`WebSocketResponse.close()
<aiohttp.web.WebSocketResponse.close>` to discard non-close
messages within its timeout window after sending close -- by
:user:`lenard-mosys`.
- Fixed a deadlock that could occur while attempting to get a new
connection slot after a timeout -- by :user:`bdraco`.
- Fixed the WebSocket flow control calculation undercounting with
multi-byte data -- by :user:`bdraco`.
- Fixed incorrect parsing of chunk extensions with the pure Python
parser -- by :user:`bdraco`.
- Fixed system routes polluting the middleware cache -- by
:user:`bdraco`.
- Improved performance of the connector when a connection can be
reused -- by :user:`bdraco`.
- Improved performance of the client request lifecycle when there
are no cookies -- by :user:`bdraco`.
- Improved performance of sending client requests when the writer
can finish synchronously -- by :user:`bdraco`.
- Improved performance of serializing HTTP headers -- by
:user:`bdraco`.
- Passing enable_cleanup_closed to :py:class:`aiohttp.TCPConnector`
is now ignored on Python 3.12.7+ and 3.13.1+ since the underlying
bug that caused asyncio to leak SSL connections has been fixed
upstream -- by :user:`bdraco`.
-------------------------------------------------------------------
Tue Oct 22 13:14:05 UTC 2024 - Dirk Müller <dmueller@suse.com>
- update to 3.10.10:
* Fixed error messages from
:py:class:`~aiohttp.resolver.AsyncResolver` being swallowed
-- by :user:`bdraco`. Related issues and pull requests on
GitHub: :issue:`9451`, :issue:`9455`.
* Added :exc:`aiohttp.ClientConnectorDNSError` for
differentiating DNS resolution errors from other connector
errors -- by :user:`mstojcevich`. Related issues and pull
requests on GitHub: :issue:`8455`.
* Simplified DNS resolution throttling code to reduce chance of
race conditions -- by :user:`bdraco`. Related issues and pull
requests on GitHub: :issue:`9454`.
-------------------------------------------------------------------
Wed Oct 9 08:04:22 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 3.10.9
* Fixed proxy headers being used in the ``ConnectionKey`` hash
when a proxy was not being used
* Widened the type of the ``trace_request_ctx`` parameter of
:meth:`ClientSession.request() <aiohttp.ClientSession.request>`
and friends
* Fixed failure to try next host after single-host connection timeout
* Improved performance of resolving hosts with Python 3.12+
* Reduced memory required for timer objects
created during the client request lifecycle
- from version 3.10.8
* Fixed cancellation leaking upwards on timeout
- from version 3.10.7
* Fixed assembling the :class:`~yarl.URL` for web requests when
the host contains a non-default port or IPv6 address
* Improved performance of determining if a URL is absolute
* Replaced code that can now be handled by ``yarl``
- Add patch to increase timeout for import time test
* test_relax_import_time.patch
- Update BuildRequires and Requires from setup.py
-------------------------------------------------------------------
Wed Sep 25 11:57:08 UTC 2024 - Nico Krapp <nico.krapp@suse.com>
- Update to 3.10.6
* Increased minimum yarl version to 1.12.0
* Declared Python 3.13 supported
* Full changelog: https://github.com/aio-libs/aiohttp/releases/tag/v3.10.6
-------------------------------------------------------------------
Wed Sep 4 12:40:42 UTC 2024 - Fergal Mc Carthy <fmccarthy@suse.com>
- Add patch test_no_warnings_fix.patch
* Ignore UserWarning about importing aiohttp from a second sys.path
location under the abuild home directory when running tests under
the build service.
-------------------------------------------------------------------
Tue Aug 20 06:48:08 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
- Update to 3.10.5:
* Fixed aiohttp.ClientResponse.json() not setting status when
aiohttp.ContentTypeError is raised
* Improved performance of the WebSocket reader
* Fixed decoding base64 chunk in BodyPartReader
* Fixed a race closing the server-side WebSocket where the close code would
not reach the client
* Fixed unconsumed exceptions raised by the WebSocket heartbeat
* Fixed an edge case in the Python parser when chunk separators happen to
align with network chunks
* Fixed multipart reading when stream buffer splits the boundary over
several read() calls
* Fixed aiohttp.TCPConnector doing blocking I/O in the event loop to create
the SSLContext
* Improved performance of aiohttp.ClientWebSocketResponse.receive and
aiohttp.web.WebSocketResponse.receive when there is no timeout.
* Improved performance of starting request handlers with Python 3.12+
* Improved performance of HTTP keep-alive checks
* Fixed server checks for circular symbolic links to be compatible with
Python 3.13
* Fixed request body not being read when ignoring an Upgrade request
* Fixed an edge case where shutdown would wait for timeout when the handler
was already completed
* Fixed connecting to npipe://, tcp://, and unix:// urls
* Fixed WebSocket ping tasks being prematurely garbage collected
* Fixed incorrectly following symlinks for compressed file variants
(bsc#1229226, CVE-2024-42367)
* Fixed monkey patches for Path.stat() and Path.is_dir() for Python 3.13
compatibility
* Fixed url dispatcher index not matching when a variable is preceded by a
fixed string after a slash
* Fixed server response headers for Content-Type and Content-Encoding for
static compressed files
* Fixed duplicate cookie expiration calls in the CookieJar implementation
* Adjusted FileResponse to check file existence and access when preparing
the response
* Fixed AsyncResolver to match ThreadedResolver behavior
* Fixed ws_connect not respecting receive_timeout on WS(S) connection.
* Removed blocking I/O in the event loop for static resources and refactored
exception handling
* Added a Request.wait_for_disconnection() method, as means of allowing
request handlers to be notified of premature client disconnections.
* Separated connection and socket timeout errors, from ServerTimeoutError.
* The shutdown logic in 3.9 waited on all tasks, which caused issues with
some libraries.
* When using Python 3.12 or later, the writer is no longer scheduled on the
event loop if it can finish synchronously.
* Restored aiohttp.resolver.AsyncResolver to be the default resolver.
- Drop patch remove-re-assert.patch, add BuildRequires on it.
-------------------------------------------------------------------
Wed May 29 13:46:54 UTC 2024 - Markéta Machová <mmachova@suse.com>

25
python-aiohttp.spec
View File

@ -19,15 +19,15 @@
%bcond_with docs
%{?sle15_python_module_pythons}
Name: python-aiohttp
Version: 3.9.5
Version: 3.10.11
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 remove-re-assert.patch mcepl@suse.com
# We really don’t need beautifuly presented exceptions for our testing
Patch1: remove-re-assert.patch
Patch0: test_no_warnings_fix.patch
Patch1: test_relax_import_time.patch
Requires: python-aiohappyeyeballs >= 2.3.0
Requires: python-aiosignal >= 1.1.2
Requires: python-attrs >= 17.3.0
Requires: python-frozenlist >= 1.1.1
@ -36,7 +36,7 @@ Requires: (python-async_timeout >= 4.0 with python-async_timeout < 5)
%endif
Requires: (python-charset-normalizer >= 2.0 with python-charset-normalizer < 4)
Requires: (python-multidict >= 4.5 with python-multidict < 7)
Requires: (python-yarl >= 1.0 with python-yarl < 2)
Requires: (python-yarl >= 1.13.0 with python-yarl < 2)
Recommends: python-Brotli
Recommends: python-aiodns
Recommends: python-cChardet
@ -51,13 +51,14 @@ BuildRequires: fdupes
BuildRequires: python-rpm-macros
# /SECTION
# SECTION install requirements
BuildRequires: %{python_module aiohappyeyeballs >= 2.3.0}
BuildRequires: %{python_module aiosignal >= 1.1.2}
BuildRequires: %{python_module async_timeout >= 4.0 with %python-async_timeout < 5}
BuildRequires: %{python_module attrs >= 17.3.0}
BuildRequires: %{python_module charset-normalizer >= 2.0 with %python-charset-normalizer < 4}
BuildRequires: %{python_module frozenlist >= 1.1.1}
BuildRequires: %{python_module multidict >= 4.5 with %python-multidict < 7}
BuildRequires: %{python_module yarl >= 1.0 with %python-yarl < 2}
BuildRequires: %{python_module yarl >= 1.13.0 with %python-yarl < 2}
# /SECTION
# SECTION test requirements
BuildRequires: %{python_module aiodns}
@ -65,10 +66,13 @@ BuildRequires: %{python_module Brotli}
BuildRequires: %{python_module freezegun}
BuildRequires: %{python_module gunicorn}
BuildRequires: %{python_module pluggy}
BuildRequires: %{python_module propcache}
BuildRequires: %{python_module pytest >= 6.2.0}
BuildRequires: %{python_module pytest-cov}
BuildRequires: %{python_module pytest-mock}
BuildRequires: %{python_module pytest-timeout}
BuildRequires: %{python_module pytest-xdist}
BuildRequires: %{python_module re-assert}
BuildRequires: %{python_module time-machine}
BuildRequires: %{python_module trustme}
# /SECTION
@ -128,6 +132,7 @@ donttest="test_aiohttp_request_coroutine or test_mark_formdata_as_processed or t
donttest+=" or test_client_session_timeout_zero"
# flaky
donttest+=" or test_https_proxy_unsupported_tls_in_tls"
donttest+=" or test_shutdown_handler_cancellation_suppressed"
# raises not expected "ConnectionResetError" with openssl 3.2 and python < 3.11
donttest+=" or test_tcp_connector_raise_connector_ssl_error[pyloop]"
# fails with pytest 8 https://github.com/aio-libs/aiohttp/issues/8234
@ -137,8 +142,12 @@ donttest+=" or (test_pytest_plugin and test_aiohttp_plugin)"
rm -v tests/autobahn/test_autobahn.py
# uses proxy.py which is not maintained anymore
rm -v tests/test_proxy_functional.py
# Requires python-pytest-codspeed
rm -v tests/test_benchmarks_*
# randomly fails on xdist splits
single_runs="test_run_app or test_web_runner"
single_runs="(test_run_app or test_web_runner)"
# breaks without threading
single_runs+=" and not test_shutdown_handler_cancellation_suppressed"
test -d aiohttp && mv aiohttp aiohttp.bkp
%pytest_arch %{?jobs: -n %jobs} tests -k "not ($donttest or ${single_runs})"
%pytest_arch tests -k "${single_runs}"
@ -147,7 +156,7 @@ test -d aiohttp && mv aiohttp aiohttp.bkp
%license LICENSE.txt
%doc CHANGES.rst CONTRIBUTORS.txt README.rst
%{python_sitearch}/aiohttp
%{python_sitearch}/aiohttp-%{version}*-info
%{python_sitearch}/aiohttp-%{version}.dist-info
%if %{with docs}
%if 0%{?suse_version} > 1500

195
remove-re-assert.patch
View File

@ -1,195 +0,0 @@
diff -Nru aiohttp-3.9.3.orig/tests/test_client_session.py aiohttp-3.9.3/tests/test_client_session.py
--- aiohttp-3.9.3.orig/tests/test_client_session.py 2024-01-29 20:32:25.000000000 +0100
+++ aiohttp-3.9.3/tests/test_client_session.py 2024-01-30 11:20:09.652810999 +0100
@@ -2,6 +2,7 @@
import contextlib
import gc
import io
+import re
import json
from http.cookies import SimpleCookie
from typing import Any, List
@@ -9,7 +10,6 @@
import pytest
from multidict import CIMultiDict, MultiDict
-from re_assert import Matches
from yarl import URL
import aiohttp
@@ -320,8 +320,8 @@
loop.run_until_complete(make_sess())
assert (
- Matches("Session and connector has to use same event loop")
- == str(ctx.value).strip()
+ re.match("Session and connector has to use same event loop",
+ str(ctx.value).strip())
)
another_loop.run_until_complete(connector.close())
diff -Nru aiohttp-3.9.3.orig/tests/test_streams.py aiohttp-3.9.3/tests/test_streams.py
--- aiohttp-3.9.3.orig/tests/test_streams.py 2024-01-29 20:32:25.000000000 +0100
+++ aiohttp-3.9.3/tests/test_streams.py 2024-01-30 11:20:09.652810999 +0100
@@ -3,13 +3,13 @@
import abc
import asyncio
import gc
+import re
import types
from collections import defaultdict
from itertools import groupby
from unittest import mock
import pytest
-from re_assert import Matches
from aiohttp import streams
@@ -1102,7 +1102,7 @@
loop = asyncio.get_event_loop()
stream = self._make_one()
stream._waiter = loop.create_future()
- assert Matches(r"<StreamReader w=<Future pending[\S ]*>>") == repr(stream)
+ assert re.match(r"<StreamReader w=<Future pending[\S ]*>>", repr(stream))
stream._waiter.set_result(None)
await stream._waiter
stream._waiter = None
diff -Nru aiohttp-3.9.3.orig/tests/test_urldispatch.py aiohttp-3.9.3/tests/test_urldispatch.py
--- aiohttp-3.9.3.orig/tests/test_urldispatch.py 2024-01-29 20:32:25.000000000 +0100
+++ aiohttp-3.9.3/tests/test_urldispatch.py 2024-01-30 11:21:46.656743543 +0100
@@ -4,7 +4,6 @@
from urllib.parse import unquote
import pytest
-from re_assert import Matches
from yarl import URL
import aiohttp
@@ -312,7 +311,7 @@
regexp = "Duplicate 'name', already handled by"
with pytest.raises(ValueError) as ctx:
router.add_route("GET", "/get_other", handler2, name="name")
- assert Matches(regexp) == str(ctx.value)
+ assert re.match(regexp, str(ctx.value))
def test_route_plain(router) -> None:
@@ -502,7 +501,7 @@
def test_static_repr(router) -> None:
router.add_static("/get", pathlib.Path(aiohttp.__file__).parent, name="name")
- assert Matches(r"<StaticResource 'name' /get") == repr(router["name"])
+ assert re.match(r"<StaticResource 'name' /get", repr(router["name"]))
def test_static_adds_slash(router) -> None:
@@ -624,7 +623,7 @@
req = make_mocked_request("GET", "/get/john")
match_info = await router.resolve(req)
assert {"name": "john"} == match_info
- assert Matches("<MatchInfo {'name': 'john'}: .+<Dynamic.+>>") == repr(match_info)
+ assert re.match("<MatchInfo {'name': 'john'}: .+<Dynamic.+>>", repr(match_info))
async def test_match_info_with_plus(router) -> None:
diff -Nru aiohttp-3.9.3.orig/tests/test_web_response.py aiohttp-3.9.3/tests/test_web_response.py
--- aiohttp-3.9.3.orig/tests/test_web_response.py 2024-01-29 20:32:25.000000000 +0100
+++ aiohttp-3.9.3/tests/test_web_response.py 2024-01-30 11:20:09.656144352 +0100
@@ -2,13 +2,13 @@
import datetime
import gzip
import json
+import re
from concurrent.futures import ThreadPoolExecutor
from unittest import mock
import aiosignal
import pytest
from multidict import CIMultiDict, CIMultiDictProxy
-from re_assert import Matches
from aiohttp import HttpVersion, HttpVersion10, HttpVersion11, hdrs
from aiohttp.helpers import ETag
@@ -401,7 +401,9 @@
with pytest.raises(RuntimeError) as ctx:
await resp.prepare(req)
- assert Matches("Using chunked encoding is forbidden for HTTP/1.0") == str(ctx.value)
+ assert re.match(
+ "Using chunked encoding is forbidden for HTTP/1.0", str(ctx.value)
+ )
async def test_compression_no_accept() -> None:
@@ -843,7 +845,7 @@
'Set-Cookie: name=("")?; '
"expires=Thu, 01 Jan 1970 00:00:00 GMT; Max-Age=0; Path=/"
)
- assert Matches(expected) == str(resp.cookies)
+ assert re.match(expected, str(resp.cookies))
resp.set_cookie("name", "value", domain="local.host")
expected = "Set-Cookie: name=value; Domain=local.host; Path=/"
@@ -895,7 +897,7 @@
'Set-Cookie: name=("")?; '
"expires=Thu, 01 Jan 1970 00:00:00 GMT; Max-Age=0; Path=/"
)
- assert Matches(expected) == str(resp.cookies)
+ assert re.match(expected, str(resp.cookies))
def test_cookie_set_after_del() -> None:
@@ -1136,14 +1138,13 @@
await resp.write_eof()
txt = buf.decode("utf8")
assert (
- Matches(
+ re.match(
"HTTP/1.1 200 OK\r\n"
"Content-Length: 0\r\n"
"Content-Type: application/octet-stream\r\n"
"Date: .+\r\n"
"Server: .+\r\n\r\n"
- )
- == txt
+ , txt)
)
@@ -1156,15 +1157,13 @@
txt = buf.decode("utf8")
assert (
- Matches(
+ re.match(
"HTTP/1.1 200 OK\r\n"
"Content-Length: 4\r\n"
"Content-Type: application/octet-stream\r\n"
"Date: .+\r\n"
"Server: .+\r\n\r\n"
- "data"
- )
- == txt
+ "data", txt)
)
@@ -1178,15 +1177,13 @@
txt = buf.decode("utf8")
assert (
- Matches(
+ re.match(
"HTTP/1.1 200 OK\r\n"
"Content-Length: 0\r\n"
"Set-Cookie: name=value\r\n"
"Content-Type: application/octet-stream\r\n"
"Date: .+\r\n"
- "Server: .+\r\n\r\n"
- )
- == txt
+ "Server: .+\r\n\r\n", txt)
)

15
test_no_warnings_fix.patch Normal file
View File

@ -0,0 +1,15 @@
diff -rup aiohttp-3.10.5.orig/tests/test_circular_imports.py aiohttp-3.10.5/tests/test_circular_imports.py
--- aiohttp-3.10.5.orig/tests/test_circular_imports.py 2024-08-19 15:18:15.000000000 -0400
+++ aiohttp-3.10.5/tests/test_circular_imports.py 2024-09-04 08:18:49.702469018 -0400
@@ -111,6 +111,11 @@ def test_no_warnings(import_path: str) -
# `gunicorn.util`.
"-W", "ignore:pkg_resources is deprecated as an API:"
"DeprecationWarning",
+ # UserWarning about importing aiohttp from a second sys.path
+ # location under the abuild home directory when running tests
+ # under the build service
+ "-W", "ignore:Module aiohttp was already imported from "
+ "/home/abuild/rpmbuild/BUILDROOT",
"-c", f"import {import_path!s}",
# fmt: on
)

24
test_relax_import_time.patch Normal file
View File

@ -0,0 +1,24 @@
Index: aiohttp-3.10.11/tests/test_imports.py
===================================================================
--- aiohttp-3.10.11.orig/tests/test_imports.py
+++ aiohttp-3.10.11/tests/test_imports.py
@@ -36,9 +36,9 @@ _TARGET_TIMINGS_BY_PYTHON_VERSION = {
"3.12": (
# 3.12+ is expected to be a bit slower due to performance trade-offs,
# and even slower under pytest-xdist, especially in CI
- _XDIST_WORKER_COUNT * 100 * (1 if _IS_CI_ENV else 1.53)
+ _XDIST_WORKER_COUNT * 250 * (1 if _IS_CI_ENV else 1.53)
if _IS_XDIST_RUN
- else 265
+ else 500
),
}
_TARGET_TIMINGS_BY_PYTHON_VERSION["3.13"] = _TARGET_TIMINGS_BY_PYTHON_VERSION["3.12"]
@@ -78,6 +78,6 @@ def test_import_time(pytester: pytest.Py
os.environ["PYTHONPATH"] = old_path
expected_time = _TARGET_TIMINGS_BY_PYTHON_VERSION.get(
- f"{sys.version_info.major}.{sys.version_info.minor}", 200
+ f"{sys.version_info.major}.{sys.version_info.minor}", 500
)
assert best_time_ms < expected_time