craft-application 4.2.0__tar.gz → 4.2.2__tar.gz

{craft_application-4.2.0/craft_application.egg-info → craft_application-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: craft-application
-Version: 4.2.0
+Version: 4.2.2
 Summary: A framework for *craft applications.
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console

{craft_application-4.2.0 → craft_application-4.2.2}/craft_application/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.2.0'
-__version_tuple__ = version_tuple = (4, 2, 0)
+__version__ = version = '4.2.2'
+__version_tuple__ = version_tuple = (4, 2, 2)

{craft_application-4.2.0 → craft_application-4.2.2}/craft_application/application.py

@@ -392,8 +392,9 @@ class Application:
         """Configure the application using any global arguments."""
 
     def _get_dispatcher(self) -> craft_cli.Dispatcher:
-        """Configure this application. Should be called by the run method.
+        """Configure this application.
 
+        Should be called by the _run_inner method.
         Side-effect: This method may exit the process.
 
         :returns: A ready-to-run Dispatcher object
@@ -506,59 +507,62 @@ class Application:
         """
         return getattr(parsed_args, item, self.services.config.get(item))
 
-    def run(  # noqa: PLR0912,PLR0915  (too many branches, too many statements)
-        self,
-    ) -> int:
-        """Bootstrap and run the application."""
-        self._setup_logging()
-        self._initialize_craft_parts()
+    def _run_inner(self) -> int:
+        """Actual run implementation."""
         dispatcher = self._get_dispatcher()
-        craft_cli.emit.debug("Preparing application...")
-
-        return_code = 1  # General error
-        try:
-            command = cast(
-                commands.AppCommand,
-                dispatcher.load_command(self.app_config),
+        command = cast(
+            commands.AppCommand,
+            dispatcher.load_command(self.app_config),
+        )
+        parsed_args = dispatcher.parsed_args()
+        platform = self.get_arg_or_config(parsed_args, "platform")
+        build_for = self.get_arg_or_config(parsed_args, "build_for")
+
+        # Some commands (e.g. remote build) can allow multiple platforms
+        # or build-fors, comma-separated. In these cases, we create the
+        # project using the first defined platform.
+        if platform and "," in platform:
+            platform = platform.split(",", maxsplit=1)[0]
+        if build_for and "," in build_for:
+            build_for = build_for.split(",", maxsplit=1)[0]
+
+        provider_name = command.provider_name(dispatcher.parsed_args())
+
+        craft_cli.emit.debug(f"Build plan: platform={platform}, build_for={build_for}")
+        self._pre_run(dispatcher)
+
+        managed_mode = command.run_managed(dispatcher.parsed_args())
+        if managed_mode or command.needs_project(dispatcher.parsed_args()):
+            self.services.project = self.get_project(
+                platform=platform, build_for=build_for
             )
-            parsed_args = dispatcher.parsed_args()
-            platform = self.get_arg_or_config(parsed_args, "platform")
-            build_for = self.get_arg_or_config(parsed_args, "build_for")
 
-            # Some commands (e.g. remote build) can allow multiple platforms
-            # or build-fors, comma-separated. In these cases, we create the
-            # project using the first defined platform.
-            if platform and "," in platform:
-                platform = platform.split(",", maxsplit=1)[0]
-            if build_for and "," in build_for:
-                build_for = build_for.split(",", maxsplit=1)[0]
+        self._configure_services(provider_name)
 
-            provider_name = command.provider_name(dispatcher.parsed_args())
+        return_code = 1  # General error
+        if not managed_mode:
+            # command runs in the outer instance
+            craft_cli.emit.debug(f"Running {self.app.name} {command.name} on host")
+            return_code = dispatcher.run() or os.EX_OK
+        elif not self.is_managed():
+            # command runs in inner instance, but this is the outer instance
+            self.run_managed(platform, build_for)
+            return_code = os.EX_OK
+        else:
+            # command runs in inner instance
+            return_code = dispatcher.run() or 0
 
-            craft_cli.emit.debug(
-                f"Build plan: platform={platform}, build_for={build_for}"
-            )
-            self._pre_run(dispatcher)
+        return return_code
 
-            managed_mode = command.run_managed(dispatcher.parsed_args())
-            if managed_mode or command.needs_project(dispatcher.parsed_args()):
-                self.services.project = self.get_project(
-                    platform=platform, build_for=build_for
-                )
+    def run(self) -> int:
+        """Bootstrap and run the application."""
+        self._setup_logging()
+        self._initialize_craft_parts()
 
-            self._configure_services(provider_name)
+        craft_cli.emit.debug("Preparing application...")
 
-            if not managed_mode:
-                # command runs in the outer instance
-                craft_cli.emit.debug(f"Running {self.app.name} {command.name} on host")
-                return_code = dispatcher.run() or os.EX_OK
-            elif not self.is_managed():
-                # command runs in inner instance, but this is the outer instance
-                self.run_managed(platform, build_for)
-                return_code = os.EX_OK
-            else:
-                # command runs in inner instance
-                return_code = dispatcher.run() or 0
+        try:
+            return_code = self._run_inner()
         except craft_cli.ArgumentParsingError as err:
             print(err, file=sys.stderr)  # to stderr, as argparse normally does
             craft_cli.emit.ended_ok()

{craft_application-4.2.0 → craft_application-4.2.2}/craft_application/models/base.py

@@ -38,6 +38,7 @@ class CraftBaseModel(pydantic.BaseModel):
         extra="forbid",
         populate_by_name=True,
         alias_generator=alias_generator,
+        coerce_numbers_to_str=True,
     )
 
     def marshal(self) -> dict[str, str | list[str] | dict[str, Any]]:

{craft_application-4.2.0 → craft_application-4.2.2/craft_application.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: craft-application
-Version: 4.2.0
+Version: 4.2.2
 Summary: A framework for *craft applications.
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console

{craft_application-4.2.0 → craft_application-4.2.2}/docs/reference/changelog.rst

@@ -2,6 +2,26 @@
 Changelog
 *********
 
+4.2.2 (2024-Sep-13)
+-------------------
+
+Application
+===========
+
+- Add a ``_run_inner`` method to override or wrap the core run logic.
+
+For a complete list of commits, check out the `4.2.2`_ release on GitHub.
+
+4.2.1 (2024-Sep-13)
+-------------------
+
+Models
+======
+
+- Fix a regression where numeric part properties could not be parsed.
+
+For a complete list of commits, check out the `4.2.1`_ release on GitHub.
+
 4.2.0 (2024-Sep-12)
 -------------------
 
@@ -244,3 +264,5 @@ For a complete list of commits, check out the `2.7.0`_ release on GitHub.
 .. _4.1.1: https://github.com/canonical/craft-application/releases/tag/4.1.1
 .. _4.1.2: https://github.com/canonical/craft-application/releases/tag/4.1.2
 .. _4.2.0: https://github.com/canonical/craft-application/releases/tag/4.2.0
+.. _4.2.1: https://github.com/canonical/craft-application/releases/tag/4.2.1
+.. _4.2.2: https://github.com/canonical/craft-application/releases/tag/4.2.2

{craft_application-4.2.0 → craft_application-4.2.2}/tests/unit/models/test_base.py

@@ -19,6 +19,7 @@ from pathlib import Path
 import pydantic
 import pytest
 from craft_application import errors, models
+from hypothesis import given, strategies
 from overrides import override
 
 
@@ -58,3 +59,22 @@ def test_model_reference_slug_errors():
     )
     assert str(err.value) == expected
     assert err.value.doc_slug == "/mymodel.html"
+
+
+class CoerceModel(models.CraftBaseModel):
+
+    stringy: str
+
+
+@given(
+    strategies.one_of(
+        strategies.integers(),
+        strategies.floats(),
+        strategies.decimals(),
+        strategies.text(),
+    )
+)
+def test_model_coerces_to_strings(value):
+    result = CoerceModel.model_validate({"stringy": value})
+
+    assert result.stringy == str(value)