chore(merge): 8.4.0 into main (#5030)

docs/.sphinx/pinned-requirements.txt

@@ -31,4 +31,4 @@ sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==1.0.8
 sphinxcontrib-serializinghtml==1.1.10
 tornado==6.4.1
-urllib3==1.26.19
+urllib3==1.26.20

docs/conf.py

@@ -72,6 +72,7 @@
     "common/craft-parts/reference/parts_steps.rst",
     "common/craft-parts/reference/step_execution_environment.rst",
     "common/craft-parts/reference/step_output_directories.rst",
+    "common/craft-parts/reference/plugins/poetry_plugin.rst",
     "common/craft-parts/reference/plugins/python_plugin.rst",
     "common/craft-parts/reference/plugins/maven_plugin.rst",
     # Extra non-craft-parts exclusions can be added after this comment

docs/reference/changelog.rst

@@ -25,21 +25,12 @@ Changelog
   <plugin>
   """"""""
 
-  List plugins
-  """"""""""""
-
   Extensions
   ##########
 
   <extension>
   """""""""""
 
-  Expand extensions
-  """""""""""""""""
-
-  List extensions
-  """""""""""""""
-
   Metadata
   ########
 
@@ -78,6 +69,107 @@ Changelog
   For a complete list of commits, check out the `X.Y.Z`_ release on GitHub.
 
 
+8.4.0 (2024-Sep-10)
+-------------------
+
+.. note::
+
+   8.4.0 includes changes from the :ref:`7.5.6<7.5.6_changelog>` release.
+
+Core
+====
+
+* Fix a bug where Snapcraft would fail to inject itself into the build
+  environment when not running as a snap (`canonical/charmcraft#406`_). If an
+  app isn't running from snap, the installed app will now install the snap in
+  the build environment using the channel in the ``CRAFT_SNAP_CHANNEL``
+  environment variable, defaulting to ``latest/stable`` if none is set.
+
+* Fix a regression where icons wouldn't be configured and installed for snaps
+  with no ``apps`` defined in their ``snapcraft.yaml``.
+
+Bases
+#####
+
+core24
+""""""
+
+* Raise an error if the build plan is empty and no snaps will be built
+  (`canonical/craft-application#225`_).
+
+* Fix a regression where ``https_proxy``, ``https_proxy``, and ``no_proxy``
+  were not forwarded into the build environment.
+
+Plugins
+#######
+
+* Fix a bug where ``snapcraft list-plugins --base core20`` would fail in a
+  ``core24`` project directory (`#5008`_).
+
+Components
+##########
+
+* Allow numbers and hyphens in component names (`LP#2069783`_).
+
+* Fix a bug where ``stage-packages`` can't be used when components are defined
+  (`canonical/craft-parts#804`_).
+
+Command line
+============
+
+* Improve error messages when parsing a ``snapcraft.yaml`` file (`#4941`_).
+
+* Improve error messages when using an `ESM base`_.
+
+* Improve error messages for missing files (`canonical/craft-parts#802`_).
+
+* Improve error messages when a build fails because it matches multiple
+  platforms (`canonical/craft-application#382`_).
+
+* Fix a bug where multi-line error messages would overwrite the previous line
+  (`canonical/craft-cli#270`_).
+
+Remote build
+============
+
+* Add "Pending" status for queued remote builds.
+
+* Add documentation links to remote-build errors.
+
+* Improve error messages when multiple snaps can be built on a single
+  ``build-on`` architecture (`#4995`_).
+
+* Improve error messages when using the wrong remote builder.
+
+* Fix a regression where ``--platform`` or ``--build-for`` could be used when
+  ``platforms`` or ``architectures`` were defined in the ``snapcraft.yaml``
+  file (`#4881`_).
+
+* Fix a regression where ``--platform`` could be used for ``core22`` snaps
+  (`#4881`_).
+
+* Fix a bug where ``SNAPCRAFT_REMOTE_BUILD_STRATEGY`` would be validated when
+  running commands other than ``remote-build``.
+
+* Fix a bug where ``SNAPCRAFT_REMOTE_BUILD_STRATEGY`` was ignored for
+  ``core24`` snaps.
+
+Documentation
+=============
+
+* Add changelog notes for all Snapcraft 8.x releases
+
+* Add :doc:`reference</reference/components>`,
+  :doc:`explanation</explanation/components>`, and
+  :doc:`how-to</howto/components>` for components.
+
+* Add :doc:`reference</reference/bases>`,
+  :doc:`explanation</explanation/bases>`, and
+  :doc:`how-to</howto/bases>` for bases.
+
+For a complete list of commits, check out the `8.4.0`_ release on GitHub.
+
+
 8.3.3 (2024-Aug-28)
 -------------------
 
@@ -99,6 +191,8 @@ core24
 For a complete list of commits, check out the `8.3.3`_ release on GitHub.
 
 
+.. _7.5.6_changelog:
+
 7.5.6 (2024-Aug-15)
 -------------------
 
@@ -981,6 +1075,7 @@ https://snapcraft.io/docs/snapcraft-authentication.
 For a complete list of commits, check out the `8.0.0`_ release on GitHub.
 
 .. _advanced grammar: https://snapcraft.io/docs/snapcraft-advanced-grammar
+.. _ESM base: https://snapcraft.io/docs/snapcraft-esm
 .. _canonical-sphinx: https://github.com/canonical/canonical-sphinx
 .. _core24 migration guide: https://snapcraft.io/docs/migrate-core24
 .. _Craft Application: https://github.com/canonical/craft-application
@@ -992,11 +1087,18 @@ For a complete list of commits, check out the `8.0.0`_ release on GitHub.
 .. _PEP 518: https://peps.python.org/pep-0518/
 .. _ROS architectures with snaps: https://ubuntu.com/robotics/docs/ros-architectures-with-snaps.
 
+.. _canonical/charmcraft#406: https://github.com/canonical/charmcraft/issues/406
+.. _canonical/craft-application#225: https://github.com/canonical/craft-application/pull/225
 .. _canonical/craft-application#355: https://github.com/canonical/craft-application/pull/355
+.. _canonical/craft-application#382: https://github.com/canonical/craft-application/pull/382
+.. _canonical/craft-cli#270: https://github.com/canonical/craft-parts/issues/270
 .. _canonical/craft-parts#717: https://github.com/canonical/craft-parts/issues/717
+.. _canonical/craft-parts#802: https://github.com/canonical/craft-parts/issues/802
+.. _canonical/craft-parts#804: https://github.com/canonical/craft-parts/issues/804
 
 .. _LP#2061603: https://bugs.launchpad.net/snapcraft/+bug/2061603
 .. _LP#2064639: https://bugs.launchpad.net/snapcraft/+bug/2064639
+.. _LP#2069783: https://bugs.launchpad.net/snapcraft/+bug/2069783
 
 .. _#4142: https://github.com/canonical/snapcraft/issues/4142
 .. _#4356: https://github.com/canonical/snapcraft/issues/4356
@@ -1034,11 +1136,15 @@ For a complete list of commits, check out the `8.0.0`_ release on GitHub.
 .. _#4842: https://github.com/canonical/snapcraft/issues/4842
 .. _#4854: https://github.com/canonical/snapcraft/issues/4854
 .. _#4865: https://github.com/canonical/snapcraft/issues/4865
+.. _#4881: https://github.com/canonical/snapcraft/issues/4881
 .. _#4886: https://github.com/canonical/snapcraft/issues/4886
 .. _#4889: https://github.com/canonical/snapcraft/issues/4889
 .. _#4890: https://github.com/canonical/snapcraft/issues/4890
 .. _#4909: https://github.com/canonical/snapcraft/issues/4909
+.. _#4941: https://github.com/canonical/snapcraft/issues/4941
 .. _#4942: https://github.com/canonical/snapcraft/issues/4942
+.. _#4995: https://github.com/canonical/snapcraft/issues/4995
+.. _#5008: https://github.com/canonical/snapcraft/issues/5008
 
 .. _7.5.6: https://github.com/canonical/snapcraft/releases/tag/7.5.6
 .. _8.0.0: https://github.com/canonical/snapcraft/releases/tag/8.0.0
@@ -1065,3 +1171,4 @@ For a complete list of commits, check out the `8.0.0`_ release on GitHub.
 .. _8.3.1: https://github.com/canonical/snapcraft/releases/tag/8.3.1
 .. _8.3.2: https://github.com/canonical/snapcraft/releases/tag/8.3.2
 .. _8.3.3: https://github.com/canonical/snapcraft/releases/tag/8.3.3
+.. _8.4.0: https://github.com/canonical/snapcraft/releases/tag/8.4.0

docs/reference/commands.rst

@@ -59,3 +59,8 @@ Store validation sets
 ---------------------
 
 .. include:: commands/store-validation-sets-commands.rst
+
+Store registries
+----------------
+
+.. include:: commands/store-registries-commands.rst

requirements-devel.txt

@@ -17,20 +17,20 @@ canonical-sphinx==0.1.0
 canonical-sphinx-extensions==0.0.23
 catkin-pkg==1.0.0
 certifi==2024.7.4
-cffi==1.17.0
+cffi==1.17.1
 chardet==5.2.0
 charset-normalizer==3.3.2
 click==8.1.7
 codespell==2.3.0
 colorama==0.4.6
 coverage==7.6.1
-craft-application==4.1.0
+craft-application==4.1.2
 craft-archives==2.0.0
 craft-cli==2.7.0
 craft-grammar==2.0.0
-craft-parts==2.0.0
+craft-parts==2.1.0
 craft-platforms==0.1.1
-craft-providers==2.0.0
+craft-providers==2.0.1
 craft-store==3.0.0
 cryptography==43.0.1
 cssutils==2.11.1
@@ -76,7 +76,7 @@ mdit-py-plugins==0.4.1
 mdurl==0.1.2
 more-itertools==10.4.0
 msgpack==1.0.8
-mypy==1.11.1
+mypy==1.11.2
 mypy-extensions==1.0.0
 myst-parser==4.0.0
 natsort==8.4.0
@@ -107,11 +107,11 @@ pyflakes==3.2.0
 pyftpdlib==1.5.10
 pygit2==1.13.3
 Pygments==2.18.0
-pylint==3.2.6
+pylint==3.2.7
 pylxd==2.3.4
 pymacaroons==0.13.0
 PyNaCl==1.5.0
-pyparsing==3.1.2
+pyparsing==3.1.4
 pyproject-api==1.7.1
 pyramid==2.0.2
 pyRFC3339==1.1
@@ -164,7 +164,7 @@ sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==2.0.0
 sphinxcontrib-serializinghtml==2.0.0
 sphinxext-opengraph==0.9.1
-starlette==0.38.2
+starlette==0.38.4
 tabulate==0.9.0
 testscenarios==0.5.0
 testtools==2.7.2
@@ -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.19
+urllib3==1.26.20
 uvicorn==0.30.6
 validators==0.33.0
 venusian==3.1.0
@@ -196,8 +196,8 @@ websockets==12.0
 wheel==0.44.0
 ws4py==0.5.1
 yamllint==1.35.1
-zipp==3.20.0
+zipp==3.20.1
 zope.deprecation==5.0
-zope.interface==7.0.1
+zope.interface==7.0.3
 python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz; sys.platform == "linux"
-pyinstaller==5.13.1; sys.platform == "win32"
+pyinstaller==5.13.2; sys.platform == "win32"

requirements-docs.txt

@@ -14,18 +14,18 @@ canonical-sphinx==0.1.0
 canonical-sphinx-extensions==0.0.23
 catkin-pkg==1.0.0
 certifi==2024.7.4
-cffi==1.17.0
+cffi==1.17.1
 chardet==5.2.0
 charset-normalizer==3.3.2
 click==8.1.7
 colorama==0.4.6
-craft-application==4.1.0
+craft-application==4.1.2
 craft-archives==2.0.0
 craft-cli==2.7.0
 craft-grammar==2.0.0
-craft-parts==2.0.0
+craft-parts==2.1.0
 craft-platforms==0.1.1
-craft-providers==2.0.0
+craft-providers==2.0.1
 craft-store==3.0.0
 cryptography==43.0.1
 cssutils==2.11.1
@@ -84,7 +84,7 @@ Pygments==2.18.0
 pylxd==2.3.4
 pymacaroons==0.13.0
 PyNaCl==1.5.0
-pyparsing==3.1.2
+pyparsing==3.1.4
 pyRFC3339==1.1
 pyspelling==2.10
 python-dateutil==2.9.0.post0
@@ -130,13 +130,13 @@ sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==2.0.0
 sphinxcontrib-serializinghtml==2.0.0
 sphinxext-opengraph==0.9.1
-starlette==0.38.2
+starlette==0.38.4
 tabulate==0.9.0
 tinydb==4.8.0
 toml==0.10.2
 typing_extensions==4.12.2
 uc-micro-py==1.0.3
-urllib3==1.26.19
+urllib3==1.26.20
 uvicorn==0.30.6
 validators==0.33.0
 wadllib==1.3.6
@@ -146,5 +146,5 @@ webencodings==0.5.1
 websockets==12.0
 wheel==0.44.0
 ws4py==0.5.1
-zipp==3.20.0
+zipp==3.20.1
 python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz; sys.platform == "linux"

requirements.txt

@@ -3,17 +3,17 @@ attrs==24.2.0
 boolean.py==4.0
 catkin-pkg==1.0.0
 certifi==2024.7.4
-cffi==1.17.0
+cffi==1.17.1
 chardet==5.2.0
 charset-normalizer==3.3.2
 click==8.1.7
-craft-application==4.1.0
+craft-application==4.1.2
 craft-archives==2.0.0
 craft-cli==2.7.0
 craft-grammar==2.0.0
-craft-parts==2.0.0
+craft-parts==2.1.0
 craft-platforms==0.1.1
-craft-providers==2.0.0
+craft-providers==2.0.1
 craft-store==3.0.0
 cryptography==43.0.1
 distro==1.9.0
@@ -50,7 +50,7 @@ pygit2==1.13.3
 pylxd==2.3.4
 pymacaroons==0.13.0
 PyNaCl==1.5.0
-pyparsing==3.1.2
+pyparsing==3.1.4
 pyRFC3339==1.1
 python-dateutil==2.9.0.post0
 python-debian==0.1.49
@@ -72,10 +72,10 @@ tabulate==0.9.0
 tinydb==4.8.0
 toml==0.10.2
 typing_extensions==4.12.2
-urllib3==1.26.19
+urllib3==1.26.20
 validators==0.33.0
 wadllib==1.3.6
 wheel==0.44.0
 ws4py==0.5.1
-zipp==3.20.0
+zipp==3.20.1
 python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz; sys.platform == "linux"

setup.py

@@ -102,7 +102,7 @@ def recursive_data_files(directory, install_directory):
     "craft-archives~=2.0",
     "craft-cli~=2.6",
     "craft-grammar~=2.0",
-    "craft-parts~=2.0",
+    "craft-parts~=2.1",
     "craft-platforms~=0.1",
     "craft-providers~=2.0",
     "craft-store~=3.0",