craft-application 2.2.0__tar.gz → 2.3.0__tar.gz

{craft-application-2.2.0 → craft-application-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: craft-application
-Version: 2.2.0
+Version: 2.3.0
 Summary: A framework for *craft applications.
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -30,13 +30,13 @@ Requires-Dist: typing_extensions>=4.4.0
 Provides-Extra: remote
 Requires-Dist: launchpadlib>=1.10.16; extra == "remote"
 Provides-Extra: dev
-Requires-Dist: coverage[toml]==7.4.3; extra == "dev"
+Requires-Dist: coverage[toml]==7.4.4; extra == "dev"
 Requires-Dist: hypothesis>=6.0; extra == "dev"
 Requires-Dist: pyfakefs~=5.3; extra == "dev"
 Requires-Dist: pytest==8.1.1; extra == "dev"
 Requires-Dist: pytest-check==2.3.1; extra == "dev"
 Requires-Dist: pytest-cov==5.0.0; extra == "dev"
-Requires-Dist: pytest-mock==3.12.0; extra == "dev"
+Requires-Dist: pytest-mock==3.14.0; extra == "dev"
 Requires-Dist: pytest-rerunfailures==13.0; extra == "dev"
 Requires-Dist: pytest-time>=0.3.1; extra == "dev"
 Requires-Dist: responses~=0.25.0; extra == "dev"
@@ -47,7 +47,7 @@ Requires-Dist: codespell[toml]==2.2.6; extra == "lint"
 Requires-Dist: yamllint==1.35.1; extra == "lint"
 Provides-Extra: types
 Requires-Dist: mypy[reports]==1.9.0; extra == "types"
-Requires-Dist: pyright==1.1.353; extra == "types"
+Requires-Dist: pyright==1.1.356; extra == "types"
 Requires-Dist: types-requests; extra == "types"
 Requires-Dist: types-urllib3; extra == "types"
 Provides-Extra: docs

{craft-application-2.2.0 → craft-application-2.3.0}/craft_application/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.2.0'
-__version_tuple__ = version_tuple = (2, 2, 0)
+__version__ = version = '2.3.0'
+__version_tuple__ = version_tuple = (2, 3, 0)

{craft-application-2.2.0 → craft-application-2.3.0}/craft_application/application.py

@@ -130,6 +130,7 @@ class Application:
         # When build_secrets are enabled, this contains the secret info to pass to
         # managed instances.
         self._secrets: secrets.BuildSecrets | None = None
+        self._partitions: list[str] | None = None
         # Cached project object, allows only the first time we load the project
         # to specify things like the project directory.
         # This is set as a private attribute in order to discourage real application
@@ -219,6 +220,7 @@ class Application:
             cache_dir=self.cache_dir,
             work_dir=self._work_dir,
             build_plan=self._build_plan,
+            partitions=self._partitions,
         )
         self.services.set_kwargs(
             "provider",
@@ -288,6 +290,9 @@ class Application:
         GrammarAwareProject.validate_grammar(yaml_data)
 
         build_on = host_arch
+
+        # Setup partitions, some projects require the yaml data, most will not
+        self._partitions = self._setup_partitions(yaml_data)
         yaml_data = self._transform_project_yaml(yaml_data, build_on, build_for)
         self.__project = self.app.ProjectClass.from_yaml_data(yaml_data, project_path)
 
@@ -344,14 +349,19 @@ class Application:
             with self.services.provider.instance(
                 build_info, work_dir=self._work_dir
             ) as instance:
+                cmd = [self.app.name, *sys.argv[1:]]
+                craft_cli.emit.debug(
+                    f"Executing {cmd} in instance location {instance_path} with {extra_args}."
+                )
                 try:
-                    # Pyright doesn't fully understand craft_providers's CompletedProcess.
-                    instance.execute_run(  # pyright: ignore[reportUnknownMemberType,reportUnknownVariableType]
-                        [self.app.name, *sys.argv[1:]],
-                        cwd=instance_path,
-                        check=True,
-                        **extra_args,
-                    )
+                    with craft_cli.emit.pause():
+                        # Pyright doesn't fully understand craft_providers's CompletedProcess.
+                        instance.execute_run(  # pyright: ignore[reportUnknownMemberType,reportUnknownVariableType]
+                            cmd,
+                            cwd=instance_path,
+                            check=True,
+                            **extra_args,
+                        )
                 except subprocess.CalledProcessError as exc:
                     raise craft_providers.ProviderError(
                         f"Failed to execute {self.app.name} in instance."
@@ -603,18 +613,32 @@ class Application:
     def _expand_environment(self, yaml_data: dict[str, Any]) -> None:
         """Perform expansion of project environment variables."""
         environment_vars = self._get_project_vars(yaml_data)
+        project_dirs = craft_parts.ProjectDirs(
+            work_dir=self._work_dir, partitions=self._partitions
+        )
+
         info = craft_parts.ProjectInfo(
             application_name=self.app.name,  # not used in environment expansion
             cache_dir=pathlib.Path(),  # not used in environment expansion
             project_name=yaml_data.get("name", ""),
-            project_dirs=craft_parts.ProjectDirs(work_dir=self._work_dir),
+            project_dirs=project_dirs,
             project_vars=environment_vars,
+            partitions=self._partitions,
         )
 
         self._set_global_environment(info)
 
         craft_parts.expand_environment(yaml_data, info=info)
 
+    def _setup_partitions(self, yaml_data: dict[str, Any]) -> list[str] | None:
+        """Return partitions to be used.
+
+        When returning you will also need to ensure that the feature is enabled
+        on Application instantiation craft_parts.Features(partitions_enabled=True)
+        """
+        _ = yaml_data
+        return None
+
     def _get_project_vars(self, yaml_data: dict[str, Any]) -> dict[str, str]:
         """Return a dict with project variables to be expanded."""
         pvars: dict[str, str] = {}

{craft-application-2.2.0 → craft-application-2.3.0}/craft_application/services/lifecycle.py

@@ -134,12 +134,14 @@ class LifecycleService(base.ProjectService):
         work_dir: Path | str,
         cache_dir: Path | str,
         build_plan: list[models.BuildInfo],
+        partitions: list[str] | None = None,
         **lifecycle_kwargs: Any,  # noqa: ANN401 - eventually used in an Any
     ) -> None:
         super().__init__(app, services, project=project)
         self._work_dir = work_dir
         self._cache_dir = cache_dir
         self._build_plan = build_plan
+        self._partitions = partitions
         self._manager_kwargs = lifecycle_kwargs
         self._lcm: LifecycleManager = None  # type: ignore[assignment]
 
@@ -190,6 +192,7 @@ class LifecycleService(base.ProjectService):
                 project_vars_part_name=self._project.adopt_info,
                 project_vars=self._project_vars,
                 track_stage_packages=True,
+                partitions=self._partitions,
                 **self._manager_kwargs,
             )
         except PartsError as err:

{craft-application-2.2.0 → craft-application-2.3.0}/craft_application/services/provider.py

@@ -133,8 +133,7 @@ class ProviderService(base.ProjectService):
             emit.debug("Instance launched and working directory mounted")
             self._setup_instance_bashrc(instance)
             try:
-                with emit.pause():
-                    yield instance
+                yield instance
             finally:
                 self._capture_logs_from_instance(instance)
 

{craft-application-2.2.0 → craft-application-2.3.0}/craft_application.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: craft-application
-Version: 2.2.0
+Version: 2.3.0
 Summary: A framework for *craft applications.
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -30,13 +30,13 @@ Requires-Dist: typing_extensions>=4.4.0
 Provides-Extra: remote
 Requires-Dist: launchpadlib>=1.10.16; extra == "remote"
 Provides-Extra: dev
-Requires-Dist: coverage[toml]==7.4.3; extra == "dev"
+Requires-Dist: coverage[toml]==7.4.4; extra == "dev"
 Requires-Dist: hypothesis>=6.0; extra == "dev"
 Requires-Dist: pyfakefs~=5.3; extra == "dev"
 Requires-Dist: pytest==8.1.1; extra == "dev"
 Requires-Dist: pytest-check==2.3.1; extra == "dev"
 Requires-Dist: pytest-cov==5.0.0; extra == "dev"
-Requires-Dist: pytest-mock==3.12.0; extra == "dev"
+Requires-Dist: pytest-mock==3.14.0; extra == "dev"
 Requires-Dist: pytest-rerunfailures==13.0; extra == "dev"
 Requires-Dist: pytest-time>=0.3.1; extra == "dev"
 Requires-Dist: responses~=0.25.0; extra == "dev"
@@ -47,7 +47,7 @@ Requires-Dist: codespell[toml]==2.2.6; extra == "lint"
 Requires-Dist: yamllint==1.35.1; extra == "lint"
 Provides-Extra: types
 Requires-Dist: mypy[reports]==1.9.0; extra == "types"
-Requires-Dist: pyright==1.1.353; extra == "types"
+Requires-Dist: pyright==1.1.356; extra == "types"
 Requires-Dist: types-requests; extra == "types"
 Requires-Dist: types-urllib3; extra == "types"
 Provides-Extra: docs

{craft-application-2.2.0 → craft-application-2.3.0}/craft_application.egg-info/requires.txt

@@ -17,13 +17,13 @@ typing_extensions>=4.4.0
 python-apt>=2.4.0
 
 [dev]
-coverage[toml]==7.4.3
+coverage[toml]==7.4.4
 hypothesis>=6.0
 pyfakefs~=5.3
 pytest==8.1.1
 pytest-check==2.3.1
 pytest-cov==5.0.0
-pytest-mock==3.12.0
+pytest-mock==3.14.0
 pytest-rerunfailures==13.0
 pytest-time>=0.3.1
 responses~=0.25.0
@@ -49,6 +49,6 @@ launchpadlib>=1.10.16
 
 [types]
 mypy[reports]==1.9.0
-pyright==1.1.353
+pyright==1.1.356
 types-requests
 types-urllib3

{craft-application-2.2.0 → craft-application-2.3.0}/pyproject.toml

@@ -45,13 +45,13 @@ remote = [
     "launchpadlib>=1.10.16",
 ]
 dev = [
-    "coverage[toml]==7.4.3",
+    "coverage[toml]==7.4.4",
     "hypothesis>=6.0",
     "pyfakefs~=5.3",
     "pytest==8.1.1",
     "pytest-check==2.3.1",
     "pytest-cov==5.0.0",
-    "pytest-mock==3.12.0",
+    "pytest-mock==3.14.0",
     "pytest-rerunfailures==13.0",
     "pytest-time>=0.3.1",
     "responses~=0.25.0",
@@ -64,7 +64,7 @@ lint = [
 ]
 types = [
     "mypy[reports]==1.9.0",
-    "pyright==1.1.353",
+    "pyright==1.1.356",
     "types-requests",
     "types-urllib3",
 ]

{craft-application-2.2.0 → craft-application-2.3.0}/tests/conftest.py

@@ -132,13 +132,25 @@ def full_build_plan(mocker) -> list[models.BuildInfo]:
     return build_plan
 
 
+@pytest.fixture()
+def enable_partitions() -> Iterator[craft_parts.Features]:
+    """Enable the partitions feature in craft_parts for the relevant test."""
+    enable_overlay = craft_parts.Features().enable_overlay
+
+    craft_parts.Features.reset()
+    yield craft_parts.Features(enable_overlay=enable_overlay, enable_partitions=True)
+    craft_parts.Features.reset()
+
+
 @pytest.fixture()
 def enable_overlay() -> Iterator[craft_parts.Features]:
     """Enable the overlay feature in craft_parts for the relevant test."""
     if not os.getenv("CI") and not shutil.which("fuse-overlayfs"):
         pytest.skip("fuse-overlayfs not installed, skipping overlay tests.")
+
+    enable_partitions = craft_parts.Features().enable_partitions
     craft_parts.Features.reset()
-    yield craft_parts.Features(enable_overlay=True)
+    yield craft_parts.Features(enable_overlay=True, enable_partitions=enable_partitions)
     craft_parts.Features.reset()
 
 

{craft-application-2.2.0 → craft-application-2.3.0}/tests/unit/services/test_lifecycle.py

@@ -306,6 +306,26 @@ def test_init_with_feature_package_repositories(
     assert service._lcm._project_info.package_repositories == package_repositories
 
 
+@pytest.mark.usefixtures("enable_partitions")
+def test_init_with_partitions(
+    app_metadata, fake_project, fake_services, tmp_path, fake_build_plan
+):
+    service = lifecycle.LifecycleService(
+        app_metadata,
+        fake_services,
+        project=fake_project,
+        work_dir=tmp_path,
+        cache_dir=tmp_path,
+        platform=None,
+        build_plan=fake_build_plan,
+        partitions=["default", "mypartition"],
+    )
+    assert service._lcm is None
+    service.setup()
+    assert service._lcm is not None
+    assert service._lcm._project_info.partitions == ["default", "mypartition"]
+
+
 def test_prime_dir(lifecycle_service, tmp_path):
     prime_dir = lifecycle_service.prime_dir
 

{craft-application-2.2.0 → craft-application-2.3.0}/tests/unit/services/test_provider.py

@@ -290,7 +290,6 @@ def test_instance(
     provider_service,
     base_name,
     allow_unstable,
-    mocker,
 ):
     mock_provider = mock.MagicMock(spec=craft_providers.Provider)
     monkeypatch.setattr(
@@ -298,7 +297,6 @@ def test_instance(
         "get_provider",
         lambda name: mock_provider,  # noqa: ARG005 (unused argument)
     )
-    spy_pause = mocker.spy(provider.emit, "pause")
     arch = util.get_host_architecture()
     build_info = models.BuildInfo("foo", arch, arch, base_name)
 
@@ -326,8 +324,6 @@ def test_instance(
         )
     with check:
         emitter.assert_progress("Launching managed .+ instance...", regex=True)
-    with check:
-        assert spy_pause.call_count == 1
 
 
 def test_load_bashrc(emitter):

{craft-application-2.2.0 → craft-application-2.3.0}/tests/unit/test_application.py

@@ -237,11 +237,12 @@ def test_log_path(monkeypatch, app, provider_managed, expected):
     assert actual == expected
 
 
-def test_run_managed_success(app, fake_project, fake_build_plan):
+def test_run_managed_success(mocker, app, fake_project, fake_build_plan):
     mock_provider = mock.MagicMock(spec_set=services.ProviderService)
     app.services.provider = mock_provider
     app.project = fake_project
     app._build_plan = fake_build_plan
+    mock_pause = mocker.spy(craft_cli.emit, "pause")
     arch = get_host_architecture()
 
     app.run_managed(None, arch)
@@ -253,6 +254,7 @@ def test_run_managed_success(app, fake_project, fake_build_plan):
         )
         in mock_provider.instance.mock_calls
     )
+    mock_pause.assert_called_once()
 
 
 def test_run_managed_failure(app, fake_project, fake_build_plan):
@@ -1176,3 +1178,64 @@ def test_process_grammar_no_match(grammar_app, mocker):
     project = grammar_app.get_project()
     # "source" is empty because "i386" doesn't match any of the grammar statements.
     assert project.parts["mypart"]["source"] is None
+
+
+class FakePartitionsApplication(FakeApplication):
+    """A partition using FakeApplication."""
+
+    @override
+    def _setup_partitions(self, yaml_data) -> list[str]:
+        _ = yaml_data
+        return ["default", "mypartition"]
+
+
+@pytest.fixture()
+def environment_partitions_project(monkeypatch, tmp_path):
+    project_dir = tmp_path / "project"
+    project_dir.mkdir()
+    project_path = project_dir / "testcraft.yaml"
+    project_path.write_text(
+        dedent(
+            """
+        name: myproject
+        version: 1.2.3
+        parts:
+          mypart:
+            plugin: nil
+            source-tag: v$CRAFT_PROJECT_VERSION
+            override-stage: |
+              touch $CRAFT_STAGE/default
+              touch $CRAFT_MYPARTITION_STAGE/partition
+            override-prime: |
+              touch $CRAFT_PRIME/default
+              touch $CRAFT_MYPARTITION_PRIME/partition
+        """
+        )
+    )
+    monkeypatch.chdir(project_dir)
+
+    return project_path
+
+
+@pytest.mark.usefixtures("enable_partitions")
+@pytest.mark.usefixtures("environment_partitions_project")
+def test_partition_application_expand_environment(app_metadata, fake_services):
+    app = FakePartitionsApplication(app_metadata, fake_services)
+    project = app.get_project(build_for=get_host_architecture())
+
+    assert craft_parts.Features().enable_partitions is True
+    # Make sure the project is loaded correctly (from the cwd)
+    assert project is not None
+    assert project.parts["mypart"]["source-tag"] == "v1.2.3"
+    assert project.parts["mypart"]["override-stage"] == dedent(
+        f"""\
+        touch {app.project_dir}/stage/default
+        touch {app.project_dir}/partitions/mypartition/stage/partition
+    """
+    )
+    assert project.parts["mypart"]["override-prime"] == dedent(
+        f"""\
+        touch {app.project_dir}/prime/default
+        touch {app.project_dir}/partitions/mypartition/prime/partition
+    """
+    )