Package: release.debian.org Severity: normal X-Debbugs-Cc: python-click-option-gr...@packages.debian.org Control: affects -1 + src:python-click-option-group User: release.debian....@packages.debian.org Usertags: unblock
This is a fairly simple RC bug fix, backported from upstream. As discussed in https://bugs.debian.org/1091947, it seemed best to backport this rather than taking the new upstream version; and while I might not myself have gone for disabling the test as a response to the new python-click version, if upstream has done it I'm not going to argue. Since the package only has superficial autopkgtests (and I didn't really want to change that in an NMU), this fix won't migrate to testing on its own. However, the tests are at least run at build time. unblock python-click-option-group/0.5.6-1.1 Thanks, -- Colin Watson (he/him) [cjwat...@debian.org]
diff -Nru python-click-option-group-0.5.6/debian/changelog python-click-option-group-0.5.6/debian/changelog --- python-click-option-group-0.5.6/debian/changelog 2024-03-03 10:21:40.000000000 +0000 +++ python-click-option-group-0.5.6/debian/changelog 2025-05-15 20:31:01.000000000 +0100 @@ -1,3 +1,11 @@ +python-click-option-group (0.5.6-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * test: disable asserts for missing option group decorator when --help + (closes: #1091947). + + -- Colin Watson <cjwat...@debian.org> Thu, 15 May 2025 20:31:01 +0100 + python-click-option-group (0.5.6-1) unstable; urgency=medium * New upstream version 0.5.6 diff -Nru python-click-option-group-0.5.6/debian/patches/click-8.1.8.patch python-click-option-group-0.5.6/debian/patches/click-8.1.8.patch --- python-click-option-group-0.5.6/debian/patches/click-8.1.8.patch 1970-01-01 01:00:00.000000000 +0100 +++ python-click-option-group-0.5.6/debian/patches/click-8.1.8.patch 2025-05-15 20:26:06.000000000 +0100 @@ -0,0 +1,67 @@ +From: Evgeny Prilepin <esp.h...@gmail.com> +Date: Mon, 24 Mar 2025 12:54:14 +0000 +Subject: test: disable asserts for missing option group decorator when --help + +Origin: backport, https://github.com/click-contrib/click-option-group/commit/244f67a4099fa928c216195903ea41484c8adddc +Bug: https://github.com/click-contrib/click-option-group/issues/65 +Bug-Debian: https://bugs.debian.org/1091947 +Last-Update: 2025-05-15 +--- + tests/test_click_option_group.py | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +diff --git a/tests/test_click_option_group.py b/tests/test_click_option_group.py +index 88613c4..0e0278e 100644 +--- a/tests/test_click_option_group.py ++++ b/tests/test_click_option_group.py +@@ -106,7 +106,19 @@ def test_missing_group_decl_first_api(runner): + def cli(**params): + pass + +- result = runner.invoke(cli, ['--help']) ++ # FIXME: https://github.com/click-contrib/click-option-group/issues/65 ++ # Now we just do not check not attached options for --help ++ # because handle_parse_result is not called in click >=8.1.8 for --help ++ ++ # result = runner.invoke(cli, ['--help']) ++ # ++ # assert result.exception ++ # assert TypeError == result.exc_info[0] ++ # assert 'Missing option group decorator' in str(result.exc_info[1]) ++ # assert '--foo' in str(result.exc_info[1]) ++ # assert '--bar' in str(result.exc_info[1]) ++ ++ result = runner.invoke(cli, []) + + assert result.exception + assert TypeError == result.exc_info[0] +@@ -114,19 +126,11 @@ def test_missing_group_decl_first_api(runner): + assert '--foo' in str(result.exc_info[1]) + assert '--bar' in str(result.exc_info[1]) + +- result = runner.invoke(cli, []) +- +- assert result.exception +- assert TypeError == result.exc_info[0] +- assert 'Missing option group' in str(result.exc_info[1]) +- assert '--foo' in str(result.exc_info[1]) +- assert '--bar' in str(result.exc_info[1]) +- + result = runner.invoke(cli, ['--hello1', 'hello1']) + + assert result.exception + assert TypeError == result.exc_info[0] +- assert 'Missing option group' in str(result.exc_info[1]) ++ assert 'Missing option group decorator' in str(result.exc_info[1]) + assert '--foo' in str(result.exc_info[1]) + assert '--bar' in str(result.exc_info[1]) + +@@ -134,7 +138,7 @@ def test_missing_group_decl_first_api(runner): + + assert result.exception + assert TypeError == result.exc_info[0] +- assert 'Missing option group' in str(result.exc_info[1]) ++ assert 'Missing option group decorator' in str(result.exc_info[1]) + assert '--foo' in str(result.exc_info[1]) + assert '--bar' in str(result.exc_info[1]) + diff -Nru python-click-option-group-0.5.6/debian/patches/series python-click-option-group-0.5.6/debian/patches/series --- python-click-option-group-0.5.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ python-click-option-group-0.5.6/debian/patches/series 2025-05-15 20:26:06.000000000 +0100 @@ -0,0 +1 @@ +click-8.1.8.patch
