experimental: use humanize for lists

craft_parts/packages/errors.py

@@ -18,6 +18,8 @@
 
 from collections.abc import Sequence
 
+import humanize
+
 from craft_parts.errors import PartsError
 from craft_parts.utils import formatting_utils
 
@@ -57,7 +59,7 @@ class PackagesNotFound(PackagesError):
 
     def __init__(self, packages: Sequence[str]) -> None:
         self.packages = packages
-        missing_pkgs = formatting_utils.humanize_list(packages, "and")
+        missing_pkgs = humanize.natural_list([repr(pkg) for pkg in sorted(packages)])
         brief = f"Failed to find installation candidate for packages: {missing_pkgs}."
         resolution = (
             "Make sure the repository configuration and package names are correct."

craft_parts/sources/errors.py

@@ -18,6 +18,8 @@
 
 from collections.abc import Sequence
 
+import humanize
+
 from craft_parts import errors
 from craft_parts.utils import formatting_utils
 
@@ -74,7 +76,7 @@ class InvalidSourceOptions(SourceError):
     def __init__(self, *, source_type: str, options: list[str]) -> None:
         self.source_type = source_type
         self.options = options
-        humanized_options = formatting_utils.humanize_list(options, "and")
+        humanized_options = humanize.natural_list([repr(opt) for opt in sorted(options)])
         brief = (
             f"Failed to pull source: {humanized_options} cannot be used "
             f"with a {source_type} source."
@@ -94,7 +96,7 @@ class IncompatibleSourceOptions(SourceError):
     def __init__(self, source_type: str, options: list[str]) -> None:
         self.source_type = source_type
         self.options = options
-        humanized_options = formatting_utils.humanize_list(options, "and")
+        humanized_options = humanize.natural_list([repr(opt) for opt in sorted(options)])
         brief = (
             f"Failed to pull source: cannot specify both {humanized_options} "
             f"for a {source_type} source."

pyproject.toml

@@ -17,6 +17,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
+    "humanize>=4.11.0",
     "overrides!=7.6.0",
     "pydantic>=2.0.0",
     "pyxdg",

tests/unit/sources/test_rpm_source.py

@@ -97,7 +97,7 @@ def test_valid_options(partitions):
             "branch",
             "submodule",
             "depth",
-            "'source-branch', 'source-commit', 'source-depth', 'source-submodules', and 'source-tag'",
+            "'source-branch', 'source-commit', 'source-depth', 'source-submodules' and 'source-tag'",
             id="all-values-bad",
         ),
     ],