commit: d6528f72813cd8b6240fb5d94c154c51c1cc2d41 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Dec 3 16:38:21 2021 +0000 Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> CommitDate: Sat Dec 4 00:27:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6528f72
dev-python/werkzeug: remove unused patch(es) Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/23166 Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org> .../werkzeug/files/werkzeug-2.0.1-py310.patch | 103 --------------------- .../files/werkzeug-2.0.1-test-warning.patch | 75 --------------- 2 files changed, 178 deletions(-) diff --git a/dev-python/werkzeug/files/werkzeug-2.0.1-py310.patch b/dev-python/werkzeug/files/werkzeug-2.0.1-py310.patch deleted file mode 100644 index 56a0166d334d..000000000000 --- a/dev-python/werkzeug/files/werkzeug-2.0.1-py310.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 584f3cff7d5cb8a588189ae1137b814cf5c47e05 Mon Sep 17 00:00:00 2001 -From: David Lord <[email protected]> -Date: Wed, 19 May 2021 20:01:58 -0700 -Subject: [PATCH] address deprecation warnings from Python 3.10b1 - ---- - tests/conftest.py | 5 ++++- - tests/test_local.py | 34 +++++++++++++++++++++++++--------- - 2 files changed, 29 insertions(+), 10 deletions(-) - -diff --git a/tests/conftest.py b/tests/conftest.py -index 3b5cbd71c..4ad1ff23e 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -66,7 +66,10 @@ def connect(self, **kwargs): - - if protocol == "https": - if "context" not in kwargs: -- kwargs["context"] = ssl.SSLContext() -+ context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) -+ context.check_hostname = False -+ context.verify_mode = ssl.CERT_NONE -+ kwargs["context"] = context - - return http.client.HTTPSConnection(self.addr, **kwargs) - -diff --git a/tests/test_local.py b/tests/test_local.py -index 537fc32fb..b5c392890 100644 ---- a/tests/test_local.py -+++ b/tests/test_local.py -@@ -12,6 +12,18 @@ - from werkzeug import local - - -+if sys.version_info < (3, 7): -+ -+ def run_async(coro): -+ return asyncio.get_event_loop().run_until_complete(coro) -+ -+ -+else: -+ -+ def run_async(coro): -+ return asyncio.run(coro) -+ -+ - def test_basic_local(): - ns = local.Local() - ns.foo = 0 -@@ -55,9 +67,11 @@ async def value_setter(idx): - await asyncio.sleep(0.02) - values.append(ns.foo) - -- loop = asyncio.get_event_loop() -- futures = [asyncio.ensure_future(value_setter(idx)) for idx in [1, 2, 3]] -- loop.run_until_complete(asyncio.gather(*futures)) -+ async def main(): -+ futures = [asyncio.ensure_future(value_setter(i)) for i in [1, 2, 3]] -+ await asyncio.gather(*futures) -+ -+ run_async(main()) - assert sorted(values) == [1, 2, 3] - - def delfoo(): -@@ -118,9 +132,11 @@ async def task(): - ls.push(1) - assert len(ls._local.stack) == 2 - -- loop = asyncio.get_event_loop() -- futures = [asyncio.ensure_future(task()) for _ in range(3)] -- loop.run_until_complete(asyncio.gather(*futures)) -+ async def main(): -+ futures = [asyncio.ensure_future(task()) for _ in range(3)] -+ await asyncio.gather(*futures) -+ -+ run_async(main()) - - - @pytest.mark.skipif( -@@ -571,7 +587,7 @@ async def get(): - async def main(): - return await p - -- out = asyncio.get_event_loop().run_until_complete(main()) -+ out = run_async(main()) - assert out == 1 - - -@@ -599,7 +615,7 @@ async def main(): - - return out - -- out = asyncio.get_event_loop().run_until_complete(main()) -+ out = run_async(main()) - assert out == [2, 1, 0] - - -@@ -623,4 +639,4 @@ async def main(): - assert p.value == 2 - return True - -- assert asyncio.get_event_loop().run_until_complete(main()) -+ assert run_async(main()) diff --git a/dev-python/werkzeug/files/werkzeug-2.0.1-test-warning.patch b/dev-python/werkzeug/files/werkzeug-2.0.1-test-warning.patch deleted file mode 100644 index 3bb14ab6ba42..000000000000 --- a/dev-python/werkzeug/files/werkzeug-2.0.1-test-warning.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 4201d0f6d1b337a0e69900a79042215896eede4a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sat, 19 Jun 2021 09:51:43 +0200 -Subject: [PATCH] Fix warning tests to work correctly without -Werror - -Use pytest.warns() instead of pytest.raises() to test for warnings, -in order to make these tests work correctly without -Werror. This does -not change the behavior with -Werror. - -While -Werror is useful for package maintainers / CI, it is problematic -for testing on end user systems. For end users, it is important whether -the particular version of package is going to work on their setup, -not whether it does not use anything that's deprecated but still -working. ---- - CHANGES.rst | 2 ++ - tests/test_wrappers.py | 12 ++++++------ - 2 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/CHANGES.rst b/CHANGES.rst -index 8fa1e454..9a05145f 100644 ---- a/CHANGES.rst -+++ b/CHANGES.rst -@@ -5,6 +5,8 @@ Version 2.1.0 - - Unreleased - -+- Fix warning tests to work correctly without -Werror -+ - - Version 2.0.2 - ------------- -diff --git a/tests/test_wrappers.py b/tests/test_wrappers.py -index 3ac80003..fe8c01f3 100644 ---- a/tests/test_wrappers.py -+++ b/tests/test_wrappers.py -@@ -1633,29 +1633,29 @@ def test_response_mixins_deprecated(cls): - class CheckResponse(cls, wrappers.Response): - pass - -- with pytest.raises(DeprecationWarning, match=cls.__name__): -+ with pytest.warns(DeprecationWarning, match=cls.__name__): - CheckResponse() - - - def test_check_base_deprecated(): -- with pytest.raises(DeprecationWarning, match=r"issubclass\(cls, Request\)"): -+ with pytest.warns(DeprecationWarning, match=r"issubclass\(cls, Request\)"): - assert issubclass(wrappers.Request, wrappers.BaseRequest) - -- with pytest.raises(DeprecationWarning, match=r"isinstance\(obj, Request\)"): -+ with pytest.warns(DeprecationWarning, match=r"isinstance\(obj, Request\)"): - assert isinstance( - wrappers.Request({"SERVER_NAME": "example.org", "SERVER_PORT": "80"}), - wrappers.BaseRequest, - ) - -- with pytest.raises(DeprecationWarning, match=r"issubclass\(cls, Response\)"): -+ with pytest.warns(DeprecationWarning, match=r"issubclass\(cls, Response\)"): - assert issubclass(wrappers.Response, wrappers.BaseResponse) - -- with pytest.raises(DeprecationWarning, match=r"isinstance\(obj, Response\)"): -+ with pytest.warns(DeprecationWarning, match=r"isinstance\(obj, Response\)"): - assert isinstance(wrappers.Response(), wrappers.BaseResponse) - - - def test_response_freeze_no_etag_deprecated(): -- with pytest.raises(DeprecationWarning, match="no_etag"): -+ with pytest.warns(DeprecationWarning, match="no_etag"): - Response("Hello, World!").freeze(no_etag=True) - - --- -2.32.0 -
