chore(merge): 8.4.2 into main (#5101)

docs/reference/changelog.rst

@@ -70,6 +70,58 @@ Changelog
 
   For a complete list of commits, check out the `X.Y.Z`_ release on GitHub.
 
+
+8.4.2 (2024-Oct-07)
+-------------------
+
+Core
+====
+
+* Fix a regression where Snapcraft would fail to run on some architectures due
+  to a ``cryptography`` dependency that attempted to load legacy algorithms
+  (`#5077`_).
+
+* Fix a regression where Snapcraft would fail to run in a container if it was
+  not running as a snap (`#5079`_).
+
+* Fix a bug where parallel installations of Snapcraft would not work if the
+  Snapcraft snap was installed from the store (`#4683`_, `#4927`_).
+
+Plugins
+#######
+
+Python
+""""""
+
+* Fix an issue where the ``python`` plugin would fail to build if the part
+  had no Python scripts.
+
+Remote build
+============
+
+* Fix a bug where the remote builder would ignore the user's response when a
+  build is interrupted and always clean the launchpad project (`#4929`_).
+
+Documentation
+=============
+
+* Update Rust plugin doc with recent changes to the Rust toolchain.
+
+For a complete list of commits, check out the `8.4.2`_ release on GitHub.
+
+
+7.5.7 (2024-Oct-03)
+-------------------
+
+Core
+====
+
+* Fix a bug where parallel installations of Snapcraft would not work if the
+  Snapcraft snap was installed from the store (`#4683`_, `#4927`_).
+
+For a complete list of commits, check out the `7.5.7`_ release on GitHub.
+
+
 8.4.1 (2024-Sep-20)
 -------------------
 
@@ -1189,6 +1241,7 @@ For a complete list of commits, check out the `8.0.0`_ release on GitHub.
 .. _#4517: https://github.com/canonical/snapcraft/issues/4517
 .. _#4520: https://github.com/canonical/snapcraft/issues/4520
 .. _#4547: https://github.com/canonical/snapcraft/issues/4547
+.. _#4683: https://github.com/canonical/snapcraft/issues/4683
 .. _#4685: https://github.com/canonical/snapcraft/issues/4685
 .. _#4735: https://github.com/canonical/snapcraft/issues/4735
 .. _#4744: https://github.com/canonical/snapcraft/issues/4744
@@ -1221,6 +1274,8 @@ For a complete list of commits, check out the `8.0.0`_ release on GitHub.
 .. _#4890: https://github.com/canonical/snapcraft/issues/4890
 .. _#4908: https://github.com/canonical/snapcraft/issues/4908
 .. _#4909: https://github.com/canonical/snapcraft/issues/4909
+.. _#4927: https://github.com/canonical/snapcraft/issues/4927
+.. _#4929: https://github.com/canonical/snapcraft/issues/4929
 .. _#4930: https://github.com/canonical/snapcraft/issues/4930
 .. _#4941: https://github.com/canonical/snapcraft/issues/4941
 .. _#4942: https://github.com/canonical/snapcraft/issues/4942
@@ -1230,8 +1285,11 @@ For a complete list of commits, check out the `8.0.0`_ release on GitHub.
 .. _#4995: https://github.com/canonical/snapcraft/issues/4995
 .. _#5008: https://github.com/canonical/snapcraft/issues/5008
 .. _#5048: https://github.com/canonical/snapcraft/issues/5048
+.. _#5077: https://github.com/canonical/snapcraft/issues/5077
+.. _#5079: https://github.com/canonical/snapcraft/issues/5079
 
 .. _7.5.6: https://github.com/canonical/snapcraft/releases/tag/7.5.6
+.. _7.5.7: https://github.com/canonical/snapcraft/releases/tag/7.5.7
 .. _8.0.0: https://github.com/canonical/snapcraft/releases/tag/8.0.0
 .. _8.0.1: https://github.com/canonical/snapcraft/releases/tag/8.0.1
 .. _8.0.2: https://github.com/canonical/snapcraft/releases/tag/8.0.2
@@ -1259,3 +1317,4 @@ For a complete list of commits, check out the `8.0.0`_ release on GitHub.
 .. _8.3.4: https://github.com/canonical/snapcraft/releases/tag/8.3.4
 .. _8.4.0: https://github.com/canonical/snapcraft/releases/tag/8.4.0
 .. _8.4.1: https://github.com/canonical/snapcraft/releases/tag/8.4.1
+.. _8.4.2: https://github.com/canonical/snapcraft/releases/tag/8.4.2

requirements-devel.txt

@@ -24,14 +24,14 @@ click==8.1.7
 codespell==2.3.0
 colorama==0.4.6
 coverage==7.6.1
-craft-application==4.2.4
+craft-application==4.2.6
 craft-archives==2.0.0
 craft-cli==2.7.0
 craft-grammar==2.0.1
-craft-parts==2.1.1
+craft-parts==2.1.2
 craft-platforms==0.1.1
-craft-providers==2.0.1
-craft-store==3.0.1
+craft-providers==2.0.4
+craft-store==3.0.2
 cryptography==43.0.1
 cssutils==2.11.1
 dict2css==0.3.0.post1
@@ -108,7 +108,7 @@ pyftpdlib==1.5.10
 pygit2==1.13.3
 Pygments==2.18.0
 pylint==3.2.7
-pylxd==2.3.4
+pylxd==2.3.5
 pymacaroons==0.13.0
 PyNaCl==1.5.0
 pyparsing==3.1.4
@@ -128,9 +128,9 @@ pyxdg==0.28
 PyYAML==6.0.2
 raven==6.10.0
 regex==2024.7.24
-requests==2.31.0
+requests==2.32.3
 requests-toolbelt==1.0.0
-requests-unixsocket==0.3.0
+requests-unixsocket2==0.4.2
 ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.8
 SecretStorage==3.3.3
@@ -182,7 +182,7 @@ types-toml==0.10.8.20240310
 types-urllib3==1.26.25.14
 typing_extensions==4.12.2
 uc-micro-py==1.0.3
-urllib3==1.26.20
+urllib3==2.2.3
 uvicorn==0.30.6
 validators==0.33.0
 venusian==3.1.0

requirements-docs.txt

@@ -19,14 +19,14 @@ chardet==5.2.0
 charset-normalizer==3.3.2
 click==8.1.7
 colorama==0.4.6
-craft-application==4.2.4
+craft-application==4.2.6
 craft-archives==2.0.0
 craft-cli==2.7.0
 craft-grammar==2.0.1
-craft-parts==2.1.1
+craft-parts==2.1.2
 craft-platforms==0.1.1
-craft-providers==2.0.1
-craft-store==3.0.1
+craft-providers==2.0.4
+craft-store==3.0.2
 cryptography==43.0.1
 cssutils==2.11.1
 dict2css==0.3.0.post1
@@ -81,7 +81,7 @@ pydantic_yaml==1.3.0
 pyelftools==0.31
 pygit2==1.13.3
 Pygments==2.18.0
-pylxd==2.3.4
+pylxd==2.3.5
 pymacaroons==0.13.0
 PyNaCl==1.5.0
 pyparsing==3.1.4
@@ -94,9 +94,9 @@ pyxdg==0.28
 PyYAML==6.0.2
 raven==6.10.0
 regex==2024.7.24
-requests==2.31.0
+requests==2.32.3
 requests-toolbelt==1.0.0
-requests-unixsocket==0.3.0
+requests-unixsocket2==0.4.2
 ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.8
 SecretStorage==3.3.3
@@ -136,7 +136,7 @@ tinydb==4.8.0
 toml==0.10.2
 typing_extensions==4.12.2
 uc-micro-py==1.0.3
-urllib3==1.26.20
+urllib3==2.2.3
 uvicorn==0.30.6
 validators==0.33.0
 wadllib==1.3.6

requirements.txt

@@ -7,14 +7,14 @@ cffi==1.17.1
 chardet==5.2.0
 charset-normalizer==3.3.2
 click==8.1.7
-craft-application==4.2.4
+craft-application==4.2.6
 craft-archives==2.0.0
 craft-cli==2.7.0
 craft-grammar==2.0.1
-craft-parts==2.1.1
+craft-parts==2.1.2
 craft-platforms==0.1.1
-craft-providers==2.0.1
-craft-store==3.0.1
+craft-providers==2.0.4
+craft-store==3.0.2
 cryptography==43.0.1
 distro==1.9.0
 docutils==0.19
@@ -47,7 +47,7 @@ pydantic_core==2.20.1
 pydantic_yaml==1.3.0
 pyelftools==0.31
 pygit2==1.13.3
-pylxd==2.3.4
+pylxd==2.3.5
 pymacaroons==0.13.0
 PyNaCl==1.5.0
 pyparsing==3.1.4
@@ -58,9 +58,9 @@ pytz==2024.1
 pyxdg==0.28
 PyYAML==6.0.2
 raven==6.10.0
-requests==2.31.0
+requests==2.32.3
 requests-toolbelt==1.0.0
-requests-unixsocket==0.3.0
+requests-unixsocket2==0.4.2
 ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.8
 SecretStorage==3.3.3
@@ -72,7 +72,7 @@ tabulate==0.9.0
 tinydb==4.8.0
 toml==0.10.2
 typing_extensions==4.12.2
-urllib3==1.26.20
+urllib3==2.2.3
 validators==0.33.0
 wadllib==1.3.6
 wheel==0.44.0

setup.py

@@ -98,14 +98,14 @@ def recursive_data_files(directory, install_directory):
     "attrs",
     "catkin-pkg; sys_platform == 'linux'",
     "click",
-    "craft-application>=4.2.4,<5.0.0",
+    "craft-application>=4.2.6,<5.0.0",
     "craft-archives~=2.0",
     "craft-cli~=2.6",
     "craft-grammar>=2.0.1,<3.0.0",
-    "craft-parts~=2.1",
+    "craft-parts>=2.1.2,<3.0.0",
     "craft-platforms~=0.1",
-    "craft-providers~=2.0",
-    "craft-store>=3.0.1,<4.0.0",
+    "craft-providers>=2.0.4,<3.0.0",
+    "craft-store>=3.0.2,<4.0.0",
     "docutils<0.20",  # Frozen until we can update sphinx dependencies.
     "gnupg",
     "jsonschema==2.5.1",
@@ -130,15 +130,14 @@ def recursive_data_files(directory, install_directory):
     "pyyaml",
     "raven",
     "requests-toolbelt",
-    "requests-unixsocket",
+    "requests-unixsocket2",
     "requests",
     "simplejson",
     "snap-helpers",
     "tabulate",
     "toml",
     "tinydb",
     "typing-extensions",
-    "urllib3<2",  # requests-unixsocket does not yet work with urllib3 v2.0+
     "validators>=0.28.3",
 ]
 

snap/snapcraft.yaml

@@ -140,11 +140,12 @@ parts:
         -e 's/^ENABLE_USER_SITE = None$/ENABLE_USER_SITE = False/'
 
   libgit2:
-    source: https://github.com/libgit2/libgit2/archive/refs/tags/v1.7.1.tar.gz
-    source-checksum: sha256/17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327
+    source: https://github.com/libgit2/libgit2/archive/refs/tags/v1.7.2.tar.gz
+    source-checksum: sha256/de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
     plugin: cmake
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
     build-attributes:
       - enable-patchelf
     prime:
@@ -171,7 +172,7 @@ parts:
     build-environment:
         # Build PyNaCl from source since the wheel files interact
         # strangely with classic snaps. Well, build it all from source.
-        - "PIP_NO_BINARY": ":all"
+        - "PIP_NO_BINARY": ":all:"
         # Use base image's libsodium for PyNaCl.
         - "SODIUM_INSTALL": "system"
         - "CFLAGS": "$(pkg-config python-3.10 yaml-0.1 --cflags)"

snapcraft/commands/remote.py

@@ -308,18 +308,21 @@ def _run(  # noqa: PLR0915 [too-many-statements]
                 emit.progress("Remote repository already exists.", permanent=True)
                 emit.progress("Cleaning up")
                 builder.cleanup()
-                return 75
+                return os.EX_TEMPFAIL
 
         try:
             returncode = self._monitor_and_complete(build_id, builds)
         except KeyboardInterrupt:
             if confirm_with_user("Cancel builds?", default=True):
                 emit.progress("Cancelling builds.")
                 builder.cancel_builds()
-            returncode = 0
+                emit.progress("Cleaning up.")
+                builder.cleanup()
+            return os.EX_OK
         except Exception:  # noqa: BLE001 [blind-except]
             returncode = 1  # General error on any other exception
-        if returncode != 75:  # TimeoutError
+
+        if returncode != os.EX_TEMPFAIL:
             emit.progress("Cleaning up")
             builder.cleanup()
         return returncode