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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: craft-application
-Version: 4.2.4
+Version: 4.2.6
 Summary: A framework for *craft applications.
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -18,15 +18,15 @@ License-File: LICENSE
 Requires-Dist: craft-archives>=2.0.0
 Requires-Dist: craft-cli>=2.6.0
 Requires-Dist: craft-grammar>=2.0.0
-Requires-Dist: craft-parts>=2.0.0
-Requires-Dist: craft-providers>=2.0.0
+Requires-Dist: craft-parts>=2.1.1
+Requires-Dist: craft-providers>=2.0.4
 Requires-Dist: snap-helpers>=0.4.2
 Requires-Dist: platformdirs>=3.10
 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~=2.32
 Requires-Dist: typing_extensions>=4.4.0
 Provides-Extra: remote
 Requires-Dist: launchpadlib>=1.10.16; extra == "remote"
@@ -41,7 +41,6 @@ Requires-Dist: pytest-mock==3.14.0; extra == "dev"
 Requires-Dist: pytest-rerunfailures==14.0; extra == "dev"
 Requires-Dist: pytest-subprocess~=1.5.2; extra == "dev"
 Requires-Dist: pytest-time>=0.3.1; extra == "dev"
-Requires-Dist: requests<2.32.0; extra == "dev"
 Requires-Dist: responses~=0.25.0; extra == "dev"
 Requires-Dist: craft-application[remote]; extra == "dev"
 Provides-Extra: lint
@@ -54,7 +53,7 @@ Requires-Dist: pyright==1.1.376; extra == "types"
 Requires-Dist: types-requests; extra == "types"
 Requires-Dist: types-urllib3; extra == "types"
 Provides-Extra: docs
-Requires-Dist: canonical-sphinx~=0.1; extra == "docs"
+Requires-Dist: canonical-sphinx~=0.1.0; extra == "docs"
 Requires-Dist: sphinx-autobuild==2024.9.3; extra == "docs"
 Requires-Dist: sphinx-lint==0.9.1; extra == "docs"
 Provides-Extra: apt

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

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

{craft_application-4.2.4 → craft_application-4.2.6}/craft_application/services/config.py

@@ -91,10 +91,21 @@ class SnapConfigHandler(ConfigHandler):
 
     def __init__(self, app: application.AppMetadata) -> None:
         super().__init__(app)
+        if not snaphelpers.is_snap():
+            raise OSError("Not running as a snap.")
         try:
             self._snap = snaphelpers.SnapConfig()
         except KeyError:
             raise OSError("Not running as a snap.")
+        except snaphelpers.SnapCtlError:
+            # Most likely to happen in a container that has the snap environment set.
+            # See: https://github.com/canonical/snapcraft/issues/5079
+            emit.progress(
+                "Snap environment is set, but cannot connect to snapd. "
+                "Snap configuration is unavailable.",
+                permanent=True,
+            )
+            raise OSError("Not running as a snap or with snapd disabled.")
 
     @override
     def get_raw(self, item: str) -> Any:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: craft-application
-Version: 4.2.4
+Version: 4.2.6
 Summary: A framework for *craft applications.
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -18,15 +18,15 @@ License-File: LICENSE
 Requires-Dist: craft-archives>=2.0.0
 Requires-Dist: craft-cli>=2.6.0
 Requires-Dist: craft-grammar>=2.0.0
-Requires-Dist: craft-parts>=2.0.0
-Requires-Dist: craft-providers>=2.0.0
+Requires-Dist: craft-parts>=2.1.1
+Requires-Dist: craft-providers>=2.0.4
 Requires-Dist: snap-helpers>=0.4.2
 Requires-Dist: platformdirs>=3.10
 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~=2.32
 Requires-Dist: typing_extensions>=4.4.0
 Provides-Extra: remote
 Requires-Dist: launchpadlib>=1.10.16; extra == "remote"
@@ -41,7 +41,6 @@ Requires-Dist: pytest-mock==3.14.0; extra == "dev"
 Requires-Dist: pytest-rerunfailures==14.0; extra == "dev"
 Requires-Dist: pytest-subprocess~=1.5.2; extra == "dev"
 Requires-Dist: pytest-time>=0.3.1; extra == "dev"
-Requires-Dist: requests<2.32.0; extra == "dev"
 Requires-Dist: responses~=0.25.0; extra == "dev"
 Requires-Dist: craft-application[remote]; extra == "dev"
 Provides-Extra: lint
@@ -54,7 +53,7 @@ Requires-Dist: pyright==1.1.376; extra == "types"
 Requires-Dist: types-requests; extra == "types"
 Requires-Dist: types-urllib3; extra == "types"
 Provides-Extra: docs
-Requires-Dist: canonical-sphinx~=0.1; extra == "docs"
+Requires-Dist: canonical-sphinx~=0.1.0; extra == "docs"
 Requires-Dist: sphinx-autobuild==2024.9.3; extra == "docs"
 Requires-Dist: sphinx-lint==0.9.1; extra == "docs"
 Provides-Extra: apt

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

@@ -1,15 +1,15 @@
 craft-archives>=2.0.0
 craft-cli>=2.6.0
 craft-grammar>=2.0.0
-craft-parts>=2.0.0
-craft-providers>=2.0.0
+craft-parts>=2.1.1
+craft-providers>=2.0.4
 snap-helpers>=0.4.2
 platformdirs>=3.10
 pydantic~=2.0
 license-expression>=30.0.0
 pygit2<1.15.0,>=1.13.0
 PyYaml>=6.0
-requests<2.32
+requests~=2.32
 typing_extensions>=4.4.0
 
 [apt]
@@ -28,12 +28,11 @@ pytest-mock==3.14.0
 pytest-rerunfailures==14.0
 pytest-subprocess~=1.5.2
 pytest-time>=0.3.1
-requests<2.32.0
 responses~=0.25.0
 craft-application[remote]
 
 [docs]
-canonical-sphinx~=0.1
+canonical-sphinx~=0.1.0
 sphinx-autobuild==2024.9.3
 sphinx-lint==0.9.1
 

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

@@ -2,6 +2,21 @@
 Changelog
 *********
 
+4.2.6 (2024-Oct-04)
+-------------------
+
+- Remove the ``requests<2.32.0`` constraint to resolve CVE-2024-35195.
+
+4.2.5 (2024-Oct-04)
+-------------------
+
+Services
+========
+
+- The config service handles snap issues better.
+
+For a complete list of commits, check out the `4.2.5`_ release on GitHub.
+
 4.2.4 (2024-Sep-19)
 -------------------
 
@@ -289,3 +304,4 @@ For a complete list of commits, check out the `2.7.0`_ release on GitHub.
 .. _4.2.2: https://github.com/canonical/craft-application/releases/tag/4.2.2
 .. _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

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

@@ -6,8 +6,8 @@ dependencies = [
     "craft-archives>=2.0.0",
     "craft-cli>=2.6.0",
     "craft-grammar>=2.0.0",
-    "craft-parts>=2.0.0",
-    "craft-providers>=2.0.0",
+    "craft-parts>=2.1.1",
+    "craft-providers>=2.0.4",
     "snap-helpers>=0.4.2",
     "platformdirs>=3.10",
     "pydantic~=2.0",
@@ -22,8 +22,7 @@ dependencies = [
     # Pygit2 changelog: https://github.com/libgit2/pygit2/blob/master/CHANGELOG.md
     "pygit2>=1.13.0,<1.15.0",
     "PyYaml>=6.0",
-    # see https://github.com/psf/requests/issues/6707
-    "requests<2.32",
+    "requests~=2.32",
     "typing_extensions>=4.4.0",
 ]
 classifiers = [
@@ -58,8 +57,6 @@ dev = [
     "pytest-rerunfailures==14.0",
     "pytest-subprocess~=1.5.2",
     "pytest-time>=0.3.1",
-    # Pin requests because of https://github.com/msabramo/requests-unixsocket/issues/73
-    "requests<2.32.0",
     "responses~=0.25.0",
     "craft-application[remote]"
 ]
@@ -75,7 +72,7 @@ types = [
     "types-urllib3",
 ]
 docs = [
-    "canonical-sphinx~=0.1",
+    "canonical-sphinx~=0.1.0",
     "sphinx-autobuild==2024.9.3",
     "sphinx-lint==0.9.1",
 ]

{craft_application-4.2.4 → craft_application-4.2.6}/tests/unit/services/test_config.py

@@ -15,16 +15,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Unit tests for the configuration service."""
 
+import io
 import itertools
 import json
 import string
 import subprocess
 from collections.abc import Iterator
+from unittest import mock
 
 import craft_application
 import craft_cli
 import pytest
 import pytest_subprocess
+import snaphelpers
 from craft_application import launchpad
 from craft_application.services import config
 from hypothesis import given, strategies
@@ -136,6 +139,36 @@ def test_craft_environment_handler_error(
         assert craft_environment_handler.get_raw(item) == content
 
 
+@pytest.mark.parametrize(
+    "error",
+    [
+        KeyError("SNAP_INSTANCE_NAME something or other"),
+        snaphelpers.SnapCtlError(
+            mock.Mock(returncode=1, stderr=io.BytesIO(b"snapd socket asplode"))
+        ),
+    ],
+)
+def test_snap_config_handler_create_error(mocker, default_app_metadata, error):
+    mocker.patch("snaphelpers.is_snap", return_value=True)
+    mock_snap_config = mocker.patch(
+        "snaphelpers.SnapConfig",
+        side_effect=error,
+    )
+    with pytest.raises(OSError, match="Not running as a snap."):
+        config.SnapConfigHandler(default_app_metadata)
+
+    mock_snap_config.assert_called_once_with()
+
+
+def test_snap_config_handler_not_snap(mocker, default_app_metadata):
+    mock_is_snap = mocker.patch("snaphelpers.is_snap", return_value=False)
+
+    with pytest.raises(OSError, match="Not running as a snap."):
+        config.SnapConfigHandler(default_app_metadata)
+
+    mock_is_snap.asssert_called_once_with()
+
+
 @given(
     item=strategies.text(alphabet=string.ascii_letters + "_", min_size=1),
     content=strategies.text(