1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
Description: Fix the CLI test with click 8.2
In click 8.2, a program invoked without a subcommand specified will
still display the usage message, but then exit with code 2, not 0.
Forwarded: https://github.com/aklajnert/changelogd/pull/74
Author: Peter Pentchev <roam@ringlet.net>
Last-Update: 2025-02-20
--- a/tests/test_changelogd.py
+++ b/tests/test_changelogd.py
@@ -4,8 +4,10 @@
import datetime
import glob
import os
+import sys
from pathlib import Path
+import click
from click.testing import CliRunner
from ruamel.yaml import YAML
@@ -14,6 +16,14 @@
from changelogd import config
from tests.conftest import FakeDateTime
+if sys.version_info >= (3, 8):
+ from importlib import metadata as imp_metadata
+
+ _HAVE_IMPORTLIB_METADATA = True
+else:
+ _HAVE_IMPORTLIB_METADATA = False
+
+
yaml = YAML()
BASE = """# Changelog
@@ -56,11 +66,30 @@
"""
+def _click_version():
+ """Get the (major, minor) version of `click`."""
+ if _HAVE_IMPORTLIB_METADATA:
+ # If this fails, we have bigger problems...
+ version_str = imp_metadata.version("click")
+ else:
+ version_str = getattr(click, "__version__", "0.0")
+
+ try:
+ parts_int = [int(part) for part in version_str.split(".")[:2]]
+ except ValueError:
+ parts_int = (0, 0)
+
+ try:
+ return parts_int[0], parts_int[1]
+ except IndexError:
+ return 0, 0
+
+
def test_command_line_interface():
"""Test the CLI."""
runner = CliRunner()
result = runner.invoke(cli.cli)
- assert result.exit_code == 0
+ assert result.exit_code == (2 if _click_version() >= (8, 2) else 0)
assert "Changelogs without conflicts." in result.output
help_result = runner.invoke(cli.cli, ["--help"])
assert help_result.exit_code == 0
|
