craft-application 4.2.6__tar.gz → 4.2.7__tar.gz

{craft_application-4.2.6/craft_application.egg-info → craft_application-4.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: craft-application
-Version: 4.2.6
+Version: 4.2.7
 Summary: A framework for *craft applications.
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -26,7 +26,7 @@ Requires-Dist: pydantic~=2.0
 Requires-Dist: license-expression>=30.0.0
 Requires-Dist: pygit2<1.15.0,>=1.13.0
 Requires-Dist: PyYaml>=6.0
-Requires-Dist: requests~=2.32
+Requires-Dist: requests
 Requires-Dist: typing_extensions>=4.4.0
 Provides-Extra: remote
 Requires-Dist: launchpadlib>=1.10.16; extra == "remote"

{craft_application-4.2.6 → craft_application-4.2.7}/craft_application/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.2.6'
-__version_tuple__ = version_tuple = (4, 2, 6)
+__version__ = version = '4.2.7'
+__version_tuple__ = version_tuple = (4, 2, 7)

{craft_application-4.2.6 → craft_application-4.2.7}/craft_application/application.py

@@ -682,6 +682,7 @@ class Application:
             application_name=self.app.name,  # not used in environment expansion
             cache_dir=pathlib.Path(),  # not used in environment expansion
             arch=build_for_arch,
+            parallel_build_count=util.get_parallel_build_count(self.app.name),
             project_name=yaml_data.get("name", ""),
             project_dirs=project_dirs,
             project_vars=environment_vars,

{craft_application-4.2.6 → craft_application-4.2.7}/craft_application/services/lifecycle.py

@@ -17,7 +17,6 @@
 from __future__ import annotations
 
 import contextlib
-import os
 import types
 from typing import TYPE_CHECKING, Any
 
@@ -200,7 +199,7 @@ class LifecycleService(base.ProjectService):
                 cache_dir=self._cache_dir,
                 work_dir=self._work_dir,
                 ignore_local_sources=self._app.source_ignore_patterns,
-                parallel_build_count=self._get_parallel_build_count(),
+                parallel_build_count=util.get_parallel_build_count(self._app.name),
                 project_vars_part_name=self._project.adopt_info,
                 project_vars=self._project_vars,
                 track_stage_packages=True,
@@ -324,92 +323,6 @@ class LifecycleService(base.ProjectService):
             f"{work_dir=}, {cache_dir=}, {plan=}, **{self._manager_kwargs!r})"
         )
 
-    def _verify_parallel_build_count(
-        self, env_name: str, parallel_build_count: int | str
-    ) -> int:
-        """Verify the parallel build count is valid.
-
-        :param env_name: The name of the environment variable being checked.
-        :param parallel_build_count: The value of the variable.
-        :return: The parallel build count as an integer.
-        """
-        try:
-            parallel_build_count = int(parallel_build_count)
-        except ValueError as err:
-            raise errors.InvalidParameterError(
-                env_name, str(os.environ[env_name])
-            ) from err
-
-        # Ensure the value is valid positive integer
-        if parallel_build_count < 1:
-            raise errors.InvalidParameterError(env_name, str(parallel_build_count))
-
-        return parallel_build_count
-
-    def _get_parallel_build_count(self) -> int:
-        """Get the number of parallel builds to run.
-
-        The parallel build count is determined by the first available of the
-        following environment variables in the order:
-
-        - <APP_NAME>_PARALLEL_BUILD_COUNT
-        - CRAFT_PARALLEL_BUILD_COUNT
-        - <APP_NAME>_MAX_PARALLEL_BUILD_COUNT
-        - CRAFT_MAX_PARALLEL_BUILD_COUNT
-
-        where the MAX_PARALLEL_BUILD_COUNT variables are dynamically compared to
-        the number of CPUs, and the smaller of the two is used.
-
-        If no environment variable is set, the CPU count is used.
-        If the CPU count is not available for some reason, 1 is used as a fallback.
-        """
-        parallel_build_count = None
-
-        # fixed parallel build count environment variable
-        for env_name in [
-            (self._app.name + "_PARALLEL_BUILD_COUNT").upper(),
-            "CRAFT_PARALLEL_BUILD_COUNT",
-        ]:
-            if os.environ.get(env_name):
-                parallel_build_count = self._verify_parallel_build_count(
-                    env_name, os.environ[env_name]
-                )
-                emit.debug(
-                    f"Using parallel build count of {parallel_build_count} "
-                    f"from environment variable {env_name!r}"
-                )
-                break
-
-        # CPU count related max parallel build count environment variable
-        if parallel_build_count is None:
-            cpu_count = os.cpu_count() or 1
-            for env_name in [
-                (self._app.name + "_MAX_PARALLEL_BUILD_COUNT").upper(),
-                "CRAFT_MAX_PARALLEL_BUILD_COUNT",
-            ]:
-                if os.environ.get(env_name):
-                    parallel_build_count = min(
-                        cpu_count,
-                        self._verify_parallel_build_count(
-                            env_name, os.environ[env_name]
-                        ),
-                    )
-                    emit.debug(
-                        f"Using parallel build count of {parallel_build_count} "
-                        f"from environment variable {env_name!r}"
-                    )
-                    break
-
-            # Default to CPU count if no max environment variable is set
-            if parallel_build_count is None:
-                parallel_build_count = cpu_count
-                emit.debug(
-                    f"Using parallel build count of {parallel_build_count} "
-                    "from CPU count"
-                )
-
-        return parallel_build_count
-
     def _get_local_keys_path(self) -> Path | None:
         """Return a directory with public keys for package-repositories.
 

{craft_application-4.2.6 → craft_application-4.2.7}/craft_application/util/__init__.py

@@ -32,6 +32,7 @@ from craft_application.util.snap_config import (
     is_running_from_snap,
 )
 from craft_application.util.string import humanize_list, strtobool
+from craft_application.util.system import get_parallel_build_count
 from craft_application.util.yaml import dump_yaml, safe_yaml_load
 
 __all__ = [
@@ -52,4 +53,5 @@ __all__ = [
     "dump_yaml",
     "safe_yaml_load",
     "retry",
+    "get_parallel_build_count",
 ]

craft_application-4.2.7/craft_application/util/system.py

@@ -0,0 +1,105 @@
+# This file is part of craft-application.
+#
+# Copyright 2024 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+# SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""System-level util functions."""
+from __future__ import annotations
+
+import os
+
+from craft_cli import emit
+
+from craft_application.errors import InvalidParameterError
+
+
+def _verify_parallel_build_count(env_name: str, parallel_build_count: int | str) -> int:
+    """Verify the parallel build count is valid.
+
+    :param env_name: The name of the environment variable being checked.
+    :param parallel_build_count: The value of the variable.
+    :return: The parallel build count as an integer.
+    """
+    try:
+        parallel_build_count = int(parallel_build_count)
+    except ValueError as err:
+        raise InvalidParameterError(env_name, str(os.environ[env_name])) from err
+
+    # Ensure the value is valid positive integer
+    if parallel_build_count < 1:
+        raise InvalidParameterError(env_name, str(parallel_build_count))
+
+    return parallel_build_count
+
+
+def get_parallel_build_count(app_name: str) -> int:
+    """Get the number of parallel builds to run.
+
+    The parallel build count is determined by the first available of the
+    following environment variables in the order:
+
+    - <APP_NAME>_PARALLEL_BUILD_COUNT
+    - CRAFT_PARALLEL_BUILD_COUNT
+    - <APP_NAME>_MAX_PARALLEL_BUILD_COUNT
+    - CRAFT_MAX_PARALLEL_BUILD_COUNT
+
+    where the MAX_PARALLEL_BUILD_COUNT variables are dynamically compared to
+    the number of CPUs, and the smaller of the two is used.
+
+    If no environment variable is set, the CPU count is used.
+    If the CPU count is not available for some reason, 1 is used as a fallback.
+    """
+    parallel_build_count = None
+
+    # fixed parallel build count environment variable
+    for env_name in [
+        (app_name + "_PARALLEL_BUILD_COUNT").upper(),
+        "CRAFT_PARALLEL_BUILD_COUNT",
+    ]:
+        if os.environ.get(env_name):
+            parallel_build_count = _verify_parallel_build_count(
+                env_name, os.environ[env_name]
+            )
+            emit.debug(
+                f"Using parallel build count of {parallel_build_count} "
+                f"from environment variable {env_name!r}"
+            )
+            break
+
+    # CPU count related max parallel build count environment variable
+    if parallel_build_count is None:
+        cpu_count = os.cpu_count() or 1
+        for env_name in [
+            (app_name + "_MAX_PARALLEL_BUILD_COUNT").upper(),
+            "CRAFT_MAX_PARALLEL_BUILD_COUNT",
+        ]:
+            if os.environ.get(env_name):
+                parallel_build_count = min(
+                    cpu_count,
+                    _verify_parallel_build_count(env_name, os.environ[env_name]),
+                )
+                emit.debug(
+                    f"Using parallel build count of {parallel_build_count} "
+                    f"from environment variable {env_name!r}"
+                )
+                break
+
+        # Default to CPU count if no max environment variable is set
+        if parallel_build_count is None:
+            parallel_build_count = cpu_count
+            emit.debug(
+                f"Using parallel build count of {parallel_build_count} "
+                "from CPU count"
+            )
+
+    return parallel_build_count

{craft_application-4.2.6 → craft_application-4.2.7/craft_application.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: craft-application
-Version: 4.2.6
+Version: 4.2.7
 Summary: A framework for *craft applications.
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -26,7 +26,7 @@ Requires-Dist: pydantic~=2.0
 Requires-Dist: license-expression>=30.0.0
 Requires-Dist: pygit2<1.15.0,>=1.13.0
 Requires-Dist: PyYaml>=6.0
-Requires-Dist: requests~=2.32
+Requires-Dist: requests
 Requires-Dist: typing_extensions>=4.4.0
 Provides-Extra: remote
 Requires-Dist: launchpadlib>=1.10.16; extra == "remote"

{craft_application-4.2.6 → craft_application-4.2.7}/craft_application.egg-info/SOURCES.txt

@@ -86,6 +86,7 @@ craft_application/util/repositories.py
 craft_application/util/retry.py
 craft_application/util/snap_config.py
 craft_application/util/string.py
+craft_application/util/system.py
 craft_application/util/yaml.py
 docs/conf.py
 docs/index.rst
@@ -182,6 +183,7 @@ tests/unit/util/test_platforms.py
 tests/unit/util/test_retry.py
 tests/unit/util/test_snap_config.py
 tests/unit/util/test_string.py
+tests/unit/util/test_system.py
 tests/unit/util/test_yaml.py
 tests/unit/util/invalid_yaml/_README
 tests/unit/util/invalid_yaml/duplicate_second_level.yaml-invalid

{craft_application-4.2.6 → craft_application-4.2.7}/craft_application.egg-info/requires.txt

@@ -9,7 +9,7 @@ pydantic~=2.0
 license-expression>=30.0.0
 pygit2<1.15.0,>=1.13.0
 PyYaml>=6.0
-requests~=2.32
+requests
 typing_extensions>=4.4.0
 
 [apt]

{craft_application-4.2.6 → craft_application-4.2.7}/docs/reference/changelog.rst

@@ -1,12 +1,24 @@
+:tocdepth: 2
+
 *********
 Changelog
 *********
 
+4.2.7 (2024-Oct-08)
+-------------------
+
+- Don't depend on requests >= 2.32.0.
+- Fix: set CRAFT_PARALLEL_BUILD_COUNT correctly in ``override-`` scripts.
+
+For a complete list of commits, check out the `4.2.7`_ release on GitHub.
+
 4.2.6 (2024-Oct-04)
 -------------------
 
 - Remove the ``requests<2.32.0`` constraint to resolve CVE-2024-35195.
 
+For a complete list of commits, check out the `4.2.6`_ release on GitHub.
+
 4.2.5 (2024-Oct-04)
 -------------------
 
@@ -305,3 +317,5 @@ For a complete list of commits, check out the `2.7.0`_ release on GitHub.
 .. _4.2.3: https://github.com/canonical/craft-application/releases/tag/4.2.3
 .. _4.2.4: https://github.com/canonical/craft-application/releases/tag/4.2.4
 .. _4.2.5: https://github.com/canonical/craft-application/releases/tag/4.2.5
+.. _4.2.6: https://github.com/canonical/craft-application/releases/tag/4.2.6
+.. _4.2.7: https://github.com/canonical/craft-application/releases/tag/4.2.7

{craft_application-4.2.6 → craft_application-4.2.7}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
     # Pygit2 changelog: https://github.com/libgit2/pygit2/blob/master/CHANGELOG.md
     "pygit2>=1.13.0,<1.15.0",
     "PyYaml>=6.0",
-    "requests~=2.32",
+    "requests",
     "typing_extensions>=4.4.0",
 ]
 classifiers = [
@@ -77,7 +77,7 @@ docs = [
     "sphinx-lint==0.9.1",
 ]
 apt = [
-    "python-apt>=2.4.0;sys_platform=='linux'"
+        "python-apt>=2.4.0;sys_platform=='linux'",
 ]
 
 [build-system]

{craft_application-4.2.6 → craft_application-4.2.7}/tests/integration/data/valid_projects/environment/testcraft.yaml

@@ -23,5 +23,6 @@ parts:
         echo "project_version:        \"${CRAFT_PROJECT_VERSION}\""        >> $target_file
         echo "arch_build_for:         \"${CRAFT_ARCH_BUILD_FOR}\""         >> $target_file
         echo "arch_triplet_build_for: \"${CRAFT_ARCH_TRIPLET_BUILD_FOR}\"" >> $target_file
-        echo "arch_build_on:          \"${CRAFT_ARCH_BUILD_ON}\""         >> $target_file
-        echo "arch_triplet_build_on:  \"${CRAFT_ARCH_TRIPLET_BUILD_ON}\"" >> $target_file
+        echo "arch_build_on:          \"${CRAFT_ARCH_BUILD_ON}\""          >> $target_file
+        echo "arch_triplet_build_on:  \"${CRAFT_ARCH_TRIPLET_BUILD_ON}\""  >> $target_file
+        echo "parallel_build_count:   \"${CRAFT_PARALLEL_BUILD_COUNT}\""   >> $target_file

{craft_application-4.2.6 → craft_application-4.2.7}/tests/integration/test_application.py

@@ -304,6 +304,10 @@ def test_global_environment(
         ],
     )
 
+    # Check that this odd value makes its way through to the yaml build script
+    build_count = "5"
+    mocker.patch.dict("os.environ", {"TESTCRAFT_PARALLEL_BUILD_COUNT": build_count})
+
     # Run in destructive mode
     monkeypatch.setattr(
         "sys.argv", ["testcraft", "prime", "--destructive-mode", *arguments]
@@ -328,6 +332,7 @@ def test_global_environment(
     assert variables["arch_triplet_build_on"].startswith(
         util.convert_architecture_deb_to_platform(util.get_host_architecture())
     )
+    assert variables["parallel_build_count"] == build_count
 
 
 @pytest.fixture

{craft_application-4.2.6 → craft_application-4.2.7}/tests/unit/services/test_lifecycle.py

@@ -26,7 +26,7 @@ import craft_parts.callbacks
 import pytest
 import pytest_check
 from craft_application import errors, models, util
-from craft_application.errors import InvalidParameterError, PartsLifecycleError
+from craft_application.errors import PartsLifecycleError
 from craft_application.models.project import BuildInfo
 from craft_application.services import lifecycle
 from craft_application.util import repositories
@@ -611,160 +611,6 @@ def test_lifecycle_package_repositories(
     mock_callback.assert_called_once_with(repositories.install_overlay_repositories)
 
 
-# endregion
-
-# region parallel build count tests
-
-
-@pytest.mark.parametrize(
-    ("env_dict", "cpu_count", "expected"),
-    [
-        (
-            {},
-            None,
-            1,
-        ),
-        (
-            {},
-            100,
-            100,
-        ),
-        (
-            {"TESTCRAFT_PARALLEL_BUILD_COUNT": "100"},
-            1,
-            100,
-        ),
-        (
-            {"CRAFT_PARALLEL_BUILD_COUNT": "200"},
-            1,
-            200,
-        ),
-        (
-            {
-                "TESTCRAFT_MAX_PARALLEL_BUILD_COUNT": "100",
-            },
-            50,
-            50,
-        ),
-        (
-            {
-                "CRAFT_MAX_PARALLEL_BUILD_COUNT": "100",
-            },
-            80,
-            80,
-        ),
-        (
-            {
-                "TESTCRAFT_PARALLEL_BUILD_COUNT": "100",
-                "CRAFT_PARALLEL_BUILD_COUNT": "200",
-            },
-            1,
-            100,
-        ),
-        (
-            {
-                "TESTCRAFT_MAX_PARALLEL_BUILD_COUNT": "100",
-                "CRAFT_MAX_PARALLEL_BUILD_COUNT": "200",
-            },
-            150,
-            100,
-        ),
-        (
-            {
-                "TESTCRAFT_MAX_PARALLEL_BUILD_COUNT": "100",
-                "CRAFT_MAX_PARALLEL_BUILD_COUNT": "200",
-            },
-            None,
-            1,
-        ),
-        (
-            {
-                "TESTCRAFT_PARALLEL_BUILD_COUNT": "100",
-                "CRAFT_PARALLEL_BUILD_COUNT": "200",
-                "TESTCRAFT_MAX_PARALLEL_BUILD_COUNT": "300",
-                "CRAFT_MAX_PARALLEL_BUILD_COUNT": "400",
-            },
-            150,
-            100,
-        ),
-    ],
-)
-def test_get_parallel_build_count(
-    monkeypatch, mocker, fake_parts_lifecycle, env_dict, cpu_count, expected
-):
-    mocker.patch("os.cpu_count", return_value=cpu_count)
-    for env_dict_key, env_dict_value in env_dict.items():
-        monkeypatch.setenv(env_dict_key, env_dict_value)
-
-    assert fake_parts_lifecycle._get_parallel_build_count() == expected
-
-
-@pytest.mark.parametrize(
-    ("env_dict", "cpu_count"),
-    [
-        (
-            {
-                "TESTCRAFT_PARALLEL_BUILD_COUNT": "abc",
-            },
-            1,
-        ),
-        (
-            {
-                "CRAFT_PARALLEL_BUILD_COUNT": "-",
-            },
-            1,
-        ),
-        (
-            {
-                "TESTCRAFT_MAX_PARALLEL_BUILD_COUNT": "*",
-            },
-            1,
-        ),
-        (
-            {
-                "CRAFT_MAX_PARALLEL_BUILD_COUNT": "$COUNT",
-            },
-            1,
-        ),
-        (
-            {
-                "TESTCRAFT_PARALLEL_BUILD_COUNT": "0",
-            },
-            1,
-        ),
-        (
-            {
-                "CRAFT_PARALLEL_BUILD_COUNT": "-1",
-            },
-            1,
-        ),
-        (
-            {
-                "TESTCRAFT_MAX_PARALLEL_BUILD_COUNT": "5.6",
-            },
-            1,
-        ),
-        (
-            {
-                "CRAFT_MAX_PARALLEL_BUILD_COUNT": "inf",
-            },
-            1,
-        ),
-    ],
-)
-def test_get_parallel_build_count_error(
-    monkeypatch, mocker, fake_parts_lifecycle, env_dict, cpu_count
-):
-    mocker.patch("os.cpu_count", return_value=cpu_count)
-    for env_dict_key, env_dict_value in env_dict.items():
-        monkeypatch.setenv(env_dict_key, env_dict_value)
-
-    with pytest.raises(
-        InvalidParameterError, match=r"^Value '.*' is invalid for parameter '.*'.$"
-    ):
-        fake_parts_lifecycle._get_parallel_build_count()
-
-
 # endregion
 
 # region project variables