From 6a91040f0047435ed61c69300aef8f746fb4c4c3 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Fri, 15 Nov 2024 11:07:20 +0100 Subject: [PATCH] python/coverage: update to 7.6.5 --- components/python/coverage/.gitignore | 2 +- components/python/coverage/Makefile | 4 ++-- components/python/coverage/patches/01-tox-dependencies.patch | 4 ++-- components/python/coverage/patches/02-test-no-eventlet.patch | 4 ++-- .../python/coverage/patches/03-tox-no-pip-install.patch | 4 ++-- .../python/coverage/patches/04-test-vendor-packages.patch | 12 ++++++------ components/python/coverage/patches/05-shell-Terminated.patch | 4 ++-- components/python/coverage/patches/06-PYTHONPATH.patch | 8 ++++---- components/python/coverage/patches/07-rmdir-busy-dir.patch | 4 ++-- .../python/coverage/patches/08-test-disable-failing.patch | 4 ++-- components/python/coverage/patches/09-self_collectors.patch | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/components/python/coverage/.gitignore b/components/python/coverage/.gitignore index 99526a92f7..dbc396f4dd 100644 --- a/components/python/coverage/.gitignore +++ b/components/python/coverage/.gitignore @@ -1 +1 @@ -/coverage-7.6.4/ +/coverage-7.6.5/ diff --git a/components/python/coverage/Makefile b/components/python/coverage/Makefile index 1f3570aeb9..b5a91228c9 100644 --- a/components/python/coverage/Makefile +++ b/components/python/coverage/Makefile @@ -19,11 +19,11 @@ BUILD_STYLE = pyproject include ../../../make-rules/shared-macros.mk COMPONENT_NAME = coverage -HUMAN_VERSION = 7.6.4 +HUMAN_VERSION = 7.6.5 COMPONENT_SUMMARY = Code coverage measurement for Python COMPONENT_PROJECT_URL = https://github.com/nedbat/coveragepy COMPONENT_ARCHIVE_HASH = \ - sha256:29fc0f17b1d3fea332f8001d4558f8214af7f1d87a345f3a133c901d60347c73 + sha256:6069188329fbe0a63876719099076261ce7a1adeea95bf236cff4353a8451b0d COMPONENT_LICENSE = Apache-2.0 COMPONENT_LICENSE_FILE = LICENSE.txt diff --git a/components/python/coverage/patches/01-tox-dependencies.patch b/components/python/coverage/patches/01-tox-dependencies.patch index fdc60b4b77..47aaddd58b 100644 --- a/components/python/coverage/patches/01-tox-dependencies.patch +++ b/components/python/coverage/patches/01-tox-dependencies.patch @@ -1,7 +1,7 @@ We need direct dependencies only. ---- coverage-7.6.4/tox.ini.orig -+++ coverage-7.6.4/tox.ini +--- coverage-7.6.5/tox.ini.orig ++++ coverage-7.6.5/tox.ini @@ -16,9 +16,9 @@ # PYVERSIONS diff --git a/components/python/coverage/patches/02-test-no-eventlet.patch b/components/python/coverage/patches/02-test-no-eventlet.patch index 971ba878b3..c851886ed6 100644 --- a/components/python/coverage/patches/02-test-no-eventlet.patch +++ b/components/python/coverage/patches/02-test-no-eventlet.patch @@ -1,7 +1,7 @@ We do not have this optional test dependency packaged yet. ---- coverage-7.6.4/requirements/light-threads.in.orig -+++ coverage-7.6.4/requirements/light-threads.in +--- coverage-7.6.5/requirements/light-threads.in.orig ++++ coverage-7.6.5/requirements/light-threads.in @@ -5,7 +5,6 @@ # The light-threads packages we test against. diff --git a/components/python/coverage/patches/03-tox-no-pip-install.patch b/components/python/coverage/patches/03-tox-no-pip-install.patch index 386bff16e3..5ec0ca4787 100644 --- a/components/python/coverage/patches/03-tox-no-pip-install.patch +++ b/components/python/coverage/patches/03-tox-no-pip-install.patch @@ -1,5 +1,5 @@ ---- coverage-7.6.4/tox.ini.orig -+++ coverage-7.6.4/tox.ini +--- coverage-7.6.5/tox.ini.orig ++++ coverage-7.6.5/tox.ini @@ -43,7 +43,6 @@ # Build the C extension and test with the CTracer diff --git a/components/python/coverage/patches/04-test-vendor-packages.patch b/components/python/coverage/patches/04-test-vendor-packages.patch index a72a3b9cf1..acdbd8934e 100644 --- a/components/python/coverage/patches/04-test-vendor-packages.patch +++ b/components/python/coverage/patches/04-test-vendor-packages.patch @@ -1,7 +1,7 @@ We have pytest and pluggy in vendor-packages. ---- coverage-7.6.4/tests/test_cmdline.py.orig -+++ coverage-7.6.4/tests/test_cmdline.py +--- coverage-7.6.5/tests/test_cmdline.py.orig ++++ coverage-7.6.5/tests/test_cmdline.py @@ -348,8 +348,8 @@ s = re.escape(os.sep) assert lines[0].startswith("-- premain ----") @@ -13,8 +13,8 @@ We have pytest and pluggy in vendor-packages. assert re.search(fr"(?m)^\s+test_debug_premain : .*{s}tests{s}test_cmdline.py:\d+$", out) assert re.search(fr"(?m)^\s+command_line : .*{s}coverage{s}cmdline.py:\d+$", out) assert re.search(fr"(?m)^\s+do_debug : .*{s}coverage{s}cmdline.py:\d+$", out) ---- coverage-7.6.4/tests/test_debug.py.orig -+++ coverage-7.6.4/tests/test_debug.py +--- coverage-7.6.5/tests/test_debug.py.orig ++++ coverage-7.6.5/tests/test_debug.py @@ -378,8 +378,8 @@ py = "pypy" if env.PYPY else "python" majv, minv = sys.version_info[:2] @@ -35,8 +35,8 @@ We have pytest and pluggy in vendor-packages. assert len(re_lines(fr"syspath:{s}_pytest", stack_text)) > 3 assert len(re_lines(fr"syspath:{s}pluggy", stack_text)) > 3 ---- coverage-7.6.4/coverage/debug.py.orig -+++ coverage-7.6.4/coverage/debug.py +--- coverage-7.6.5/coverage/debug.py.orig ++++ coverage-7.6.5/coverage/debug.py @@ -230,7 +230,7 @@ functions can call this and not be included in the result. diff --git a/components/python/coverage/patches/05-shell-Terminated.patch b/components/python/coverage/patches/05-shell-Terminated.patch index 0ac1bfcbcd..91283a8642 100644 --- a/components/python/coverage/patches/05-shell-Terminated.patch +++ b/components/python/coverage/patches/05-shell-Terminated.patch @@ -1,5 +1,5 @@ ---- coverage-7.6.4/tests/test_concurrency.py.orig -+++ coverage-7.6.4/tests/test_concurrency.py +--- coverage-7.6.5/tests/test_concurrency.py.orig ++++ coverage-7.6.5/tests/test_concurrency.py @@ -769,7 +769,7 @@ assert len(out_lines) in [2, 3] assert out_lines[:2] == ["START", "SIGTERM"] diff --git a/components/python/coverage/patches/06-PYTHONPATH.patch b/components/python/coverage/patches/06-PYTHONPATH.patch index e800a7813a..d0e70f6bf7 100644 --- a/components/python/coverage/patches/06-PYTHONPATH.patch +++ b/components/python/coverage/patches/06-PYTHONPATH.patch @@ -1,7 +1,7 @@ We set PYTHONPATH during testing. ---- coverage-7.6.4/tests/coveragetest.py.orig -+++ coverage-7.6.4/tests/coveragetest.py +--- coverage-7.6.5/tests/coveragetest.py.orig ++++ coverage-7.6.5/tests/coveragetest.py @@ -443,11 +443,9 @@ def add_test_modules_to_pythonpath(self) -> None: @@ -15,8 +15,8 @@ We set PYTHONPATH during testing. def working_root(self) -> str: """Where is the root of the coverage.py working tree?""" ---- coverage-7.6.4/tests/test_testing.py.orig -+++ coverage-7.6.4/tests/test_testing.py +--- coverage-7.6.5/tests/test_testing.py.orig ++++ coverage-7.6.5/tests/test_testing.py @@ -30,7 +30,6 @@ def test_xdist_sys_path_nuttiness_is_fixed() -> None: # See conftest.py:fix_xdist_sys_path diff --git a/components/python/coverage/patches/07-rmdir-busy-dir.patch b/components/python/coverage/patches/07-rmdir-busy-dir.patch index 8b46ef092e..cfb29b22ae 100644 --- a/components/python/coverage/patches/07-rmdir-busy-dir.patch +++ b/components/python/coverage/patches/07-rmdir-busy-dir.patch @@ -1,5 +1,5 @@ ---- coverage-7.6.4/tests/test_process.py.orig -+++ coverage-7.6.4/tests/test_process.py +--- coverage-7.6.5/tests/test_process.py.orig ++++ coverage-7.6.5/tests/test_process.py @@ -1163,6 +1163,7 @@ diff --git a/components/python/coverage/patches/08-test-disable-failing.patch b/components/python/coverage/patches/08-test-disable-failing.patch index c2f030e9a9..216a2be6d3 100644 --- a/components/python/coverage/patches/08-test-disable-failing.patch +++ b/components/python/coverage/patches/08-test-disable-failing.patch @@ -1,5 +1,5 @@ ---- coverage-7.6.4/tests/test_testing.py.orig -+++ coverage-7.6.4/tests/test_testing.py +--- coverage-7.6.5/tests/test_testing.py.orig ++++ coverage-7.6.5/tests/test_testing.py @@ -169,6 +169,7 @@ with self.assert_warnings(cov, []): cov._warn("Watch out!") diff --git a/components/python/coverage/patches/09-self_collectors.patch b/components/python/coverage/patches/09-self_collectors.patch index b89fe3229e..4537e49ebe 100644 --- a/components/python/coverage/patches/09-self_collectors.patch +++ b/components/python/coverage/patches/09-self_collectors.patch @@ -1,5 +1,5 @@ ---- coverage-7.6.4/tests/test_concurrency.py.orig -+++ coverage-7.6.4/tests/test_concurrency.py +--- coverage-7.6.5/tests/test_concurrency.py.orig ++++ coverage-7.6.5/tests/test_concurrency.py @@ -735,8 +735,8 @@ """ + ("sigterm = true" if sigterm else ""), ) -- 2.11.4.GIT