Accepting request 1042420 from devel:languages:python
- Update py3109-compat.patch to work with python <= 3.10.8 too. - Add py3109-compat.patch to make tests compatible with python 3.10.9. These tests are not present anymore in upstream master version so this patch could be removed in future releases. OBS-URL: https://build.opensuse.org/request/show/1042420 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-aiohttp?expand=0&rev=30
This commit is contained in:
commit
4e5bf52a12
90
py3109-compat.patch
Normal file
90
py3109-compat.patch
Normal file
@ -0,0 +1,90 @@
|
||||
Index: aiohttp-3.8.3/tests/test_client_request.py
|
||||
===================================================================
|
||||
--- aiohttp-3.8.3.orig/tests/test_client_request.py
|
||||
+++ aiohttp-3.8.3/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_310
|
||||
from aiohttp.test_utils import make_mocked_coro
|
||||
|
||||
|
||||
@@ -276,7 +276,7 @@ def test_host_header_ipv6_with_port(make
|
||||
|
||||
|
||||
@pytest.mark.xfail(
|
||||
- PY_310,
|
||||
+ 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.3/tests/test_streams.py
|
||||
===================================================================
|
||||
--- aiohttp-3.8.3.orig/tests/test_streams.py
|
||||
+++ aiohttp-3.8.3/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_310
|
||||
|
||||
DATA = b"line1\nline2\nline3\n"
|
||||
|
||||
@@ -84,7 +84,7 @@ class TestStreamReader:
|
||||
await stream._wait("test")
|
||||
|
||||
@pytest.mark.xfail(
|
||||
- PY_310,
|
||||
+ 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.3/tests/test_web_app.py
|
||||
===================================================================
|
||||
--- aiohttp-3.8.3.orig/tests/test_web_app.py
|
||||
+++ aiohttp-3.8.3/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_310
|
||||
+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_310,
|
||||
- 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:
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 12 16:16:31 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
|
||||
|
||||
- Update py3109-compat.patch to work with python <= 3.10.8 too.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 12 11:26:26 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
|
||||
|
||||
- Add py3109-compat.patch to make tests compatible with python 3.10.9. These
|
||||
tests are not present anymore in upstream master version so this patch could
|
||||
be removed in future releases.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 7 17:49:50 UTC 2022 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
|
@ -28,6 +28,8 @@ URL: https://github.com/aio-libs/aiohttp
|
||||
Source: https://files.pythonhosted.org/packages/source/a/aiohttp/aiohttp-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM aiohttp-pr7057-bump-charset-normalizer.patch gh#aio-libs/aiohttp#7057
|
||||
Patch0: aiohttp-pr7057-bump-charset-normalizer.patch
|
||||
# PATCH-FIX-OPENSUSE py3109-compat.patch
|
||||
Patch1: py3109-compat.patch
|
||||
# SECTION build requirements
|
||||
BuildRequires: %{python_module Cython}
|
||||
BuildRequires: %{python_module devel >= 3.6}
|
||||
|
Loading…
x
Reference in New Issue
Block a user