22285099215

Committed 22 Feb 2026 08:52PM UTC coverage: 75.854% (-17.1%) from 92.936%

Build # 22285099215

Build Type

Pull #23121

github

Committed by

web-flow

Commit Message

Merge c7299df9c into ba8359840

Pull Request Pull Request #23121: fix issue with optional fields in dependency validator

Run Details

28 of 29 new or added lines in 2 files covered. (96.55%)

11174 existing lines in 400 files now uncovered.

53694 of 70786 relevant lines covered (75.85%)

1.88 hits per line

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

60.71

/src/python/pants/init/import_util.py

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

from __future__ import annotations

import importlib.metadata
from collections.abc import Generator
from importlib.metadata import Distribution

from packaging.requirements import Requirement
from packaging.utils import NormalizedName, canonicalize_name
from packaging.version import InvalidVersion, Version


def distribution_matches_requirement(dist: Distribution, requirement: Requirement) -> bool:
    # Check whether the normalized names match.
    dist_name = canonicalize_name(dist.name)
    req_name = canonicalize_name(requirement.name)
    if dist_name != req_name:
        return False

    # If there is no version specifier, a name match is sufficient.
    if not requirement.specifier:
        return True

    # Otherwise, check version specifier and see if version is contained.
    try:
        dist_version = Version(dist.version)
        return requirement.specifier.contains(dist_version)
    except InvalidVersion:
        # If we can't parse the version, assume it doesn't match
        return False


def find_matching_distributions(
    requirement: Requirement | None,
) -> Generator[Distribution, None, None]:
    """Yield distributions matching the given requirement or all active distributions if
    `requirement` is `None`."""
    seen_dist_names: set[NormalizedName] = set()
    for dist in importlib.metadata.distributions():
        # Skip non-active distributions. Python prefers the first distribution on `sys.path`.
        normalized_dist_name = canonicalize_name(dist.name)
        if normalized_dist_name in seen_dist_names:
            continue
        seen_dist_names.add(normalized_dist_name)
        if requirement is None or distribution_matches_requirement(dist, requirement):
            yield dist

1	# Copyright 2025 Pants project contributors (see CONTRIBUTORS.md).
2	# Licensed under the Apache License, Version 2.0 (see LICENSE).
3
4	from __future__ import annotations	4✔
5
6	import importlib.metadata	4✔
7	from collections.abc import Generator	4✔
8	from importlib.metadata import Distribution	4✔
9
10	from packaging.requirements import Requirement	4✔
11	from packaging.utils import NormalizedName, canonicalize_name	4✔
12	from packaging.version import InvalidVersion, Version	4✔
13
14
15	def distribution_matches_requirement(dist: Distribution, requirement: Requirement) -> bool:	4✔
16	# Check whether the normalized names match.
UNCOV 17	dist_name = canonicalize_name(dist.name)	×
UNCOV 18	req_name = canonicalize_name(requirement.name)	×
UNCOV 19	if dist_name != req_name:	×
UNCOV 20	return False	×
21
22	# If there is no version specifier, a name match is sufficient.
UNCOV 23	if not requirement.specifier:	×
UNCOV 24	return True	×
25
26	# Otherwise, check version specifier and see if version is contained.
UNCOV 27	try:	×
UNCOV 28	dist_version = Version(dist.version)	×
UNCOV 29	return requirement.specifier.contains(dist_version)	×
30	except InvalidVersion:	×
31	# If we can't parse the version, assume it doesn't match
32	return False	×
33
34
35	def find_matching_distributions(	4✔
36	requirement: Requirement \| None,
37	) -> Generator[Distribution, None, None]:
38	"""Yield distributions matching the given requirement or all active distributions if
39	`requirement` is `None`."""
40	seen_dist_names: set[NormalizedName] = set()	1✔
41	for dist in importlib.metadata.distributions():	1✔
42	# Skip non-active distributions. Python prefers the first distribution on `sys.path`.
43	normalized_dist_name = canonicalize_name(dist.name)	1✔
44	if normalized_dist_name in seen_dist_names:	1✔
45	continue	1✔
46	seen_dist_names.add(normalized_dist_name)	1✔
47	if requirement is None or distribution_matches_requirement(dist, requirement):	1✔
48	yield dist	1✔

pantsbuild / pants / 22285099215

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