From 18ac096873e52562ea35d6968ac8d8bffd8d8e516583bdaccb87b8f296470d2d Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 24 Nov 2021 00:41:45 +0000 Subject: [PATCH] - Drop python39-failures.patch, no longer required. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-aiohttp?expand=0&rev=72 --- python-aiohttp.changes | 5 +++ python-aiohttp.spec | 3 -- python39-failures.patch | 77 ----------------------------------------- 3 files changed, 5 insertions(+), 80 deletions(-) delete mode 100644 python39-failures.patch diff --git a/python-aiohttp.changes b/python-aiohttp.changes index 87b8196..1785c48 100644 --- a/python-aiohttp.changes +++ b/python-aiohttp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 24 00:38:26 UTC 2021 - Steve Kowalik + +- Drop python39-failures.patch, no longer required. + ------------------------------------------------------------------- Wed Nov 17 09:52:49 UTC 2021 - Steve Kowalik diff --git a/python-aiohttp.spec b/python-aiohttp.spec index aba9a02..b62859c 100644 --- a/python-aiohttp.spec +++ b/python-aiohttp.spec @@ -29,9 +29,6 @@ Patch0: unbundle-http-parser.patch # PATCH-FIX-UPSTREAM stdlib-typing_extensions.patch gh#aio-libs/aiohttp#5374 mcepl@suse.com # Fix typing_extensions imports. Patch1: stdlib-typing_extensions.patch -# PATCH-FIX-UPSTREAM python39-failures.patch gh#aio-libs/aiohttp#5991 mcepl@suse.com -# Bridge over Python 3.9.6 v 3.9.7 incompatibilities -Patch2: python39-failures.patch # PATCH-FIX-UPSTREAM remove_deprecated_loop_argument.patch gh#aio-libs/aiohttp#5991 mcepl@suse.com # remove deprecated loop argument Patch3: remove_deprecated_loop_argument.patch diff --git a/python39-failures.patch b/python39-failures.patch deleted file mode 100644 index 1179002..0000000 --- a/python39-failures.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- - tests/test_web_middleware.py | 27 ++++++++++++++++++++++----- - 1 file changed, 22 insertions(+), 5 deletions(-) - ---- a/tests/test_web_middleware.py -+++ b/tests/test_web_middleware.py -@@ -1,4 +1,5 @@ - import re -+import sys - from typing import Any - - import pytest -@@ -6,6 +7,7 @@ from yarl import URL - - from aiohttp import web - -+py39 = sys.version_info[:3] == (3, 9, 7) - - async def test_middleware_modifies_response(loop, aiohttp_client) -> None: - async def handler(request): -@@ -410,7 +412,10 @@ async def test_old_style_middleware(loop - txt = await resp.text() - assert "OK[old style middleware]" == txt - -- assert len(warning_checker) == 1 -+ if py39: -+ assert len(warning_checker) == 2 -+ else: -+ assert len(warning_checker) == 1 - msg = str(warning_checker.list[0].message) - assert re.match( - "^old-style middleware " -@@ -464,7 +469,10 @@ async def test_mixed_middleware(loop, ai - txt = await resp.text() - assert "OK[new style 2][old style 2][new style 1][old style 1]" == txt - -- assert len(w) == 2 -+ if py39: -+ assert len(w) == 3 -+ else: -+ assert len(w) == 2 - tmpl = ( - "^old-style middleware " - '".' -@@ -503,7 +511,10 @@ async def test_old_style_middleware_clas - txt = await resp.text() - assert "OK[old style middleware]" == txt - -- assert len(warning_checker) == 1 -+ if py39: -+ assert len(warning_checker) == 2 -+ else: -+ assert len(warning_checker) == 1 - msg = str(warning_checker.list[0].message) - assert re.match( - "^old-style middleware " -@@ -537,7 +548,10 @@ async def test_new_style_middleware_clas - txt = await resp.text() - assert "OK[new style middleware]" == txt - -- assert len(warning_checker) == 0 -+ if py39: -+ assert len(warning_checker) == 1 -+ else: -+ assert len(warning_checker) == 0 - - - async def test_new_style_middleware_method(loop, aiohttp_client) -> None: -@@ -563,4 +577,7 @@ async def test_new_style_middleware_meth - txt = await resp.text() - assert "OK[new style middleware]" == txt - -- assert len(warning_checker) == 0 -+ if py39: -+ assert len(warning_checker) == 1 -+ else: -+ assert len(warning_checker) == 0