24457923341

Committed 15 Apr 2026 01:42PM UTC coverage: 75.08% (-5.2%) from 80.27%

Build # 24457923341

Build Type

push

github

Committed by

web-flow

Commit Message

upgrade to Trivy v0.69.2 (Cherry-pick of #23155) (#23258)

Update to Trivy v0.69.2. Prior releases were deleted as part of [an
attack they
suffered](https://github.com/aquasecurity/trivy/discussions/10265), so
our CI is broken while it is still references the prior version.

Co-authored-by: Tom Dyas <tom.dyas@gmail.com>

Coverage Stats

1 of 1 new or added line in 1 file covered. (100.0%)

2174 existing lines in 88 files now uncovered.

6128 of 8162 relevant lines covered (75.08%)

33.63 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

69.23

/src/python/pants/help/maybe_color.py

# Copyright 2020 Pants project contributors (see CONTRIBUTORS.md).
# Licensed under the Apache License, Version 2.0 (see LICENSE).


from colors import color as ansicolor
from colors import cyan, green, magenta, red, yellow


def _orange(s: str, **kwargs):
    return ansicolor(s, "orange", **kwargs)


class MaybeColor:
    """A mixin to allow classes to optionally colorize their output."""

    def __init__(self, color: bool) -> None:
        self._color = color

        def noop(x, **_):
            return x

        self.maybe_color = ansicolor if color else noop
        self.maybe_cyan = cyan if color else noop
        self.maybe_green = green if color else noop
        self.maybe_orange = _orange if color else noop
        self.maybe_red = red if color else noop
        self.maybe_magenta = magenta if color else noop
        self.maybe_yellow = yellow if color else noop

    def _format_did_you_mean_matches(self, did_you_mean: list[str]) -> str:
        if len(did_you_mean) == 1:
            formatted_candidates = self.maybe_cyan(did_you_mean[0])
        elif len(did_you_mean) == 2:
            formatted_candidates = " or ".join(self.maybe_cyan(g) for g in did_you_mean)
        else:
            formatted_candidates = (
                f"{', '.join(self.maybe_cyan(g) for g in did_you_mean[:-1])}, or {did_you_mean[-1]}"
            )
        return str(formatted_candidates)

    @property
    def color(self) -> bool:
        return self._color

1	# Copyright 2020 Pants project contributors (see CONTRIBUTORS.md).
2	# Licensed under the Apache License, Version 2.0 (see LICENSE).
3
4
5	from colors import color as ansicolor	10✔
6	from colors import cyan, green, magenta, red, yellow	10✔
7
8
9	def _orange(s: str, **kwargs):	10✔
10	return ansicolor(s, "orange", **kwargs)	×
11
12
13	class MaybeColor:	10✔
14	"""A mixin to allow classes to optionally colorize their output."""
15
16	def __init__(self, color: bool) -> None:	10✔
17	self._color = color	3✔
18
19	def noop(x, **_):	3✔
20	return x	3✔
21
22	self.maybe_color = ansicolor if color else noop	3✔
23	self.maybe_cyan = cyan if color else noop	3✔
24	self.maybe_green = green if color else noop	3✔
25	self.maybe_orange = _orange if color else noop	3✔
26	self.maybe_red = red if color else noop	3✔
27	self.maybe_magenta = magenta if color else noop	3✔
28	self.maybe_yellow = yellow if color else noop	3✔
29
30	def _format_did_you_mean_matches(self, did_you_mean: list[str]) -> str:	10✔
UNCOV 31	if len(did_you_mean) == 1:	×
UNCOV 32	formatted_candidates = self.maybe_cyan(did_you_mean[0])	×
UNCOV 33	elif len(did_you_mean) == 2:	×
UNCOV 34	formatted_candidates = " or ".join(self.maybe_cyan(g) for g in did_you_mean)	×
35	else:
UNCOV 36	formatted_candidates = (	×
37	f"{', '.join(self.maybe_cyan(g) for g in did_you_mean[:-1])}, or {did_you_mean[-1]}"
38	)
UNCOV 39	return str(formatted_candidates)	×
40
41	@property	10✔
42	def color(self) -> bool:	10✔
43	return self._color	×

pantsbuild / pants / 24457923341

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous