fix: update to craft-application latest

docs/requirements.txt

@@ -1,6 +1,7 @@
 attrs==23.1.0
 catkin-pkg==0.5.2
 click==8.1.7
+craft-application @ git+https://github.com/canonical/craft-application@main
 craft-archives==1.1.3
 craft-cli==2.5.1
 craft-grammar==1.1.1

snapcraft/application.py

@@ -82,15 +82,14 @@ def __init__(self, *args, **kwargs):
                 os.environ[craft_var] = env_val
 
     @override
-    def _configure_services(self, platform: str | None, build_for: str | None) -> None:
+    def _configure_services(self, provider_name: str | None) -> None:
         self.services.set_kwargs(
             "package",
-            platform=platform,
             build_plan=self._build_plan,
             snapcraft_yaml_path=self._snapcraft_yaml_path,
         )
 
-        super()._configure_services(platform, build_for)
+        super()._configure_services(provider_name)
 
     @property
     def command_groups(self):

snapcraft/commands/unimplemented.py

@@ -51,6 +51,17 @@
         """Overridden to always return False, for now."""
         return False
 
+    def provider_name(
+        self,
+        parsed_args: argparse.Namespace,  # noqa: ARG002 (the unused argument is for subclasses)
+    ) -> str | None:
+        """Name of the provider where the command should be run inside of.
+
+        By default returns None. Subclasses can override this method to change this,
+        including by inspecting the arguments in `parsed_args`.
+        """
+        return None
+
     always_load_project: bool = False
 
 

snapcraft/services/package.py

@@ -1,6 +1,6 @@
 # -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
 #
-# Copyright 2023 Canonical Ltd.
+# Copyright 2023-2024 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -50,13 +50,13 @@ def __init__(  # noqa: PLR0913 (Too many arguments)
         *,
         project: models.Project,
         snapcraft_yaml_path: pathlib.Path,
-        platform: str | None,
         build_plan: list[BuildInfo],
     ) -> None:
         super().__init__(app, services, project=project)
-        self._platform = platform
-        self._build_for = build_plan[0].build_for
         self._snapcraft_yaml_path = snapcraft_yaml_path
+        self._build_plan = build_plan
+        self._platform = build_plan[0].platform
+        self._build_for = build_plan[0].build_for
 
     @override
     def pack(self, prime_dir: pathlib.Path, dest: pathlib.Path) -> list[pathlib.Path]:
@@ -81,7 +81,7 @@ def pack(self, prime_dir: pathlib.Path, dest: pathlib.Path) -> list[pathlib.Path
                     compression=self._project.compression,
                     name=self._project.name,
                     version=process_version(self._project.version),
-                    target_arch=self._build_for,
+                    target_arch=self._build_plan[0].build_for,
                 )
             )
         ]
@@ -137,7 +137,9 @@ def write_metadata(self, path: pathlib.Path) -> None:
     def metadata(self) -> snap_yaml.SnapMetadata:
         """Get the metadata model for this project."""
         return snap_yaml.get_metadata_from_project(
-            self._project, self._services.lifecycle.prime_dir, arch=self._build_for
+            self._project,
+            self._services.lifecycle.prime_dir,
+            arch=self._build_plan[0].build_for,
         )
 
 

tests/spread/core24-suites/manifest/manifest-info-envvars/task.yaml

@@ -13,8 +13,7 @@ execute: |
   export SNAPCRAFT_IMAGE_INFO='{"test-var": "value"}'
 
   # If this next line fails, delete it and replace it with the one following it
-  snapcraft --use-lxd 2>&1 | MATCH 'unrecognized arguments: --use-lxd'; exit 0
-  # snapcraft --use-lxd
+  snapcraft --use-lxd
 
   unsquashfs manifest_0.1_*.snap
   grep '^  test-var: value' squashfs-root/snap/manifest.yaml

tests/spread/core24/remove-hook/task.yaml

@@ -14,9 +14,7 @@ execute: |
   unset SNAPCRAFT_BUILD_ENVIRONMENT
 
   # create a base instance by running snapcraft
-  # If this next line fails, delete it and replace it with the one following it
-  snapcraft pull --use-lxd --verbosity=trace 2>&1 | MATCH 'Error: unrecognized arguments: --use-lxd'; exit 0
-  # snapcraft pull --use-lxd --verbosity=trace
+   snapcraft pull --use-lxd --verbosity=trace
 
   # verify base instance was created
   instances="$(lxc list --project=snapcraft --format=csv --columns="n")"

tests/unit/conftest.py

@@ -415,15 +415,20 @@ def default_factory(default_project):
 
 @pytest.fixture()
 def default_build_plan():
+    from craft_application import util
     from craft_application.models import BuildInfo
-    from craft_providers import bases
+
+    # Set the build info base to match the host's, so we can test in destructive
+    # mode with no issues.
+    arch = util.get_host_architecture()
+    base = util.get_host_base()
 
     return [
         BuildInfo(
             platform="generic-x86-64",
-            build_on="amd64",
-            build_for="amd64",
-            base=bases.BaseName("ubuntu", "24.04"),
+            build_on=arch,
+            build_for=arch,
+            base=base,
         )
     ]
 
@@ -475,7 +480,6 @@ def package_service(
         project=default_project,
         services=default_factory,
         snapcraft_yaml_path=file_path,
-        platform="amd64",
         build_plan=default_build_plan,
     )
 

tests/unit/services/test_package.py

@@ -59,7 +59,6 @@ def test_pack_target_arch(
         app=APP_METADATA,
         project=default_project,
         services=default_factory,
-        platform="amd64",
         build_plan=default_build_plan,
         snapcraft_yaml_path=tmp_path / "snapcraft.yaml",
     )