Allow packages to customize their name in resolve()

edgedb · Oct 13, 2024 · 9f33cd5 · 9f33cd5
1 parent 59711f4
commit 9f33cd5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/metapkg/packages/base.py b/metapkg/packages/base.py
@@ -87,7 +87,7 @@ def slot_suffix(self) -> str:
     @classmethod
     def get_dep_pkg_name(cls) -> str:
         """Name used by pkg-config or CMake to refer to this package."""
-        return str(cls.name).upper()
+        return str(cls.ident).upper()
 
     def get_dep_pkg_config_script(self) -> str | None:
         return None
@@ -435,7 +435,7 @@ class PkgConfigMeta:
 
 
 class BundledPackage(BasePackage):
-    name: ClassVar[packaging.utils.NormalizedName]
+    ident: ClassVar[str]
     title: ClassVar[str | None] = None
     aliases: ClassVar[list[str] | None] = None
     description: str = ""
@@ -683,6 +683,7 @@ def resolve(
         cls: Type[BundledPackage_T],
         io: cleo_io.IO,
         *,
+        name: NormalizedName | None = None,
         version: str | None = None,
         revision: str | None = None,
         is_release: bool = False,
@@ -757,6 +758,7 @@ def resolve(
             source_version=source_version,
             resolved_sources=sources,
             requires=requires,
+            name=name,
         )
 
     @classmethod
@@ -810,14 +812,18 @@ def __init__(
         requires: list[poetry_dep.Dependency] | None = None,
         options: Mapping[str, Any] | None = None,
         resolved_sources: list[af_sources.BaseSource] | None = None,
+        name: NormalizedName | None = None,
     ) -> None:
         if self.title is None:
             raise RuntimeError(
                 f"{type(self)!r} does not define the required "
                 f"title attribute"
             )
 
-        super().__init__(self.name, version, pretty_version=pretty_version)
+        if name is None:
+            name = self.__class__.ident
+
+        super().__init__(name, version, pretty_version=pretty_version)
 
         if requires is not None:
             reqs = list(requires)

diff --git a/metapkg/packages/python.py b/metapkg/packages/python.py
@@ -164,7 +164,7 @@ def package(
         return package
 
     def get_package_info(
-        self, name: packaging.utils.NormalizedName
+        self, name: base.NormalizedName
     ) -> dict[str, Any]:
         if name.startswith("pypkg-"):
             name = packaging.utils.canonicalize_name(name[len("pypkg-") :])
@@ -604,6 +604,7 @@ def resolve(
         cls: Type[BundledPythonPackage_T],
         io: cleo_io.IO,
         *,
+        name: base.NormalizedName | None = None,
         version: str | None = None,
         revision: str | None = None,
         is_release: bool = False,
@@ -633,6 +634,7 @@ def resolve(
 
         package = cls(
             ver,
+            name=name,
             pretty_version=pretty_version,
             requires=requires,
             source_version=cls.resolve_vcs_version(io, repo),

diff --git a/metapkg/packages/rust.py b/metapkg/packages/rust.py
@@ -109,6 +109,7 @@ def resolve(
         cls,
         io: cleo_io.IO,
         *,
+        name: base.NormalizedName | None = None,
         version: str | None = None,
         revision: str | None = None,
         is_release: bool = False,
@@ -136,6 +137,7 @@ def resolve(
         version, pretty_version = cls.format_version(ver)
 
         return cls(
+            name=name,
             version=version,
             pretty_version=pretty_version,
             source_version=version,