Merge branch 'main' into patch-1

canonical · Jan 23, 2024 · d43cccf · d43cccf
2 parents 51cd922 + bbf8ae0
commit d43cccf
Show file tree

Hide file tree

Showing 21 changed files with 436 additions and 116 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 - [ ] Have you followed the [guidelines for contributing](https://github.com/snapcore/snapcraft/blob/master/CONTRIBUTING.md)?
 - [ ] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
-- [ ] Have you successfully run `make lint`?
-- [ ] Have you successfully run `pytest tests/unit`?
+- [ ] Have you successfully run `tox run -m lint`?
+- [ ] Have you successfully run `tox run -e test-py310`? (supported versions: `py39`, `py310`, `py311`, `py312`)
 
 -----
diff --git a/.github/workflows/cla-check.yaml b/.github/workflows/cla-check.yaml
@@ -3,7 +3,7 @@ on: [pull_request]
 
 jobs:
   cla-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check if CLA signed
         uses: canonical/has-signed-canonical-cla@v1
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -23,7 +23,7 @@ jobs:
 
       - if: steps.decisions.outputs.PUBLISH == 'true'
         name: Checkout Snapcraft
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Fetch all of history so Snapcraft can determine its own version from git.
           fetch-depth: 0

diff --git a/.github/workflows/spread-scheduled.yaml b/.github/workflows/spread-scheduled.yaml
@@ -10,14 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Build snap
         uses: snapcore/action-build@v1
         id: snapcraft
       - name: Upload snap artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: snap
           path: ${{ steps.snapcraft.outputs.snap }}
@@ -38,12 +38,12 @@ jobs:
           rm -rf "${{ github.workspace }}"
           mkdir "${{ github.workspace }}"
       - name: Checkout snapcraft
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true
       - name: Download snap artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: snap
           path: tests
@@ -56,23 +56,27 @@ jobs:
     needs: [snap-build]
     strategy:
       fail-fast: false
+      matrix:
+        system:
+          - ubuntu-20.04-64
+          - fedora-39-64
     steps:
       - name: Cleanup job workspace
         run: |
           rm -rf "${{ github.workspace }}"
           mkdir "${{ github.workspace }}"
       - name: Checkout snapcraft
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true
       - name: Download snap artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: snap
           path: tests
       - name: remote-build test
         env:
           LAUNCHPAD_TOKEN: "${{ secrets.LAUNCHPAD_TOKEN }}"
         run: |
-          spread google:ubuntu-20.04-64:tests/spread/general/remote-build
+          spread google:${{ matrix.system }}:tests/spread/general/remote-build
diff --git a/.github/workflows/spread.yml b/.github/workflows/spread.yml
@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Checkout snapcraft
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -17,7 +17,7 @@ jobs:
         uses: snapcore/action-build@v1
 
       - name: Upload snapcraft snap
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: snap
           path: ${{ steps.build-snapcraft.outputs.snap }}
@@ -43,13 +43,13 @@ jobs:
 
     steps:
       - name: Checkout snapcraft
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true
 
       - name: Download snapcraft snap
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: snap
           path: tests
@@ -93,14 +93,14 @@ jobs:
 
       - if: steps.decisions.outputs.RUN == 'true'
         name: Checkout snapcraft
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true
 
       - if: steps.decisions.outputs.RUN == 'true'
         name: Download snapcraft snap
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: snap
           path: tests

diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml
@@ -13,18 +13,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Install dependencies
         run: |
           echo "::group::Begin snap install"
           echo "Installing snaps in the background while running apt and pip..."
-          sudo snap install --no-wait --classic pyright
+          sudo snap install --no-wait --classic pyright --revision 735 # version 1.1.344
           sudo snap install --no-wait shellcheck
           echo "::endgroup::"
           echo "::group::apt-get update"
@@ -58,11 +58,11 @@ jobs:
             tox_python: py310
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python version ${{ matrix.python_version }} on ${{ matrix.platform }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python_version }}
       - name: Install dependencies
@@ -88,7 +88,7 @@ jobs:
           files: coverage*.xml
       - name: Upload test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results-${{ matrix.platform }}
           path: results/
diff --git a/docs/.sphinx/pinned-requirements.txt b/docs/.sphinx/pinned-requirements.txt
@@ -8,10 +8,10 @@ docutils==0.19
 furo==2022.9.29
 idna==3.4
 imagesize==1.4.1
-Jinja2==3.1.2
+Jinja2==3.1.3
 livereload==2.6.3
 MarkupSafe==2.1.3
-packaging==21.3
+packaging==23.2
 pyenchant==3.2.2
 Pygments==2.15.0
 pyparsing==3.0.9

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -2,10 +2,10 @@ attrs==23.1.0
 catkin-pkg==0.5.2
 click==8.1.7
 craft-archives==1.1.3
-craft-cli==2.5.0
+craft-cli==2.5.1
 craft-grammar==1.1.1
 craft-parts==1.26.0
-craft-providers==1.20.1
+craft-providers==1.21.0
 craft-store==2.5.0
 Deprecated==1.2.14
 distro==1.8.0

diff --git a/requirements-devel.txt b/requirements-devel.txt
@@ -1,6 +1,6 @@
 astroid==2.15.8
-attrs==23.1.0
-black==23.11.0
+attrs==23.2.0
+black==23.12.1
 cachetools==5.3.2
 catkin-pkg==1.0.0
 certifi==2023.11.17
@@ -10,56 +10,56 @@ charset-normalizer==3.3.2
 click==8.1.7
 codespell==2.2.6
 colorama==0.4.6
-coverage==7.3.2
+coverage==7.4.0
 craft-archives==1.1.3
-craft-cli==2.5.0
-craft-grammar==1.1.1
-craft-parts==1.26.0
-craft-providers==1.20.1
-craft-store==2.5.0
+craft-cli==2.5.1
+craft-grammar==1.1.2
+craft-parts==1.26.1
+craft-providers==1.21.0
+craft-store==2.6.0
 cryptography==41.0.7
 Deprecated==1.2.14
 dill==0.3.7
-distlib==0.3.7
-distro==1.8.0
+distlib==0.3.8
+distro==1.9.0
 docutils==0.19
 filelock==3.13.1
 fixtures==4.1.0
 gnupg==2.3.1
 httplib2==0.22.0
 hupper==1.12
 idna==3.6
-importlib-metadata==7.0.0
+importlib-metadata==7.0.1
 iniconfig==2.0.0
-isort==5.12.0
+isort==5.13.2
 jaraco.classes==3.3.0
 jeepney==0.8.0
 jsonschema==2.5.1
 keyring==24.3.0
 launchpadlib==1.11.0
 lazr.restfulclient==0.14.5
 lazr.uri==1.0.6
-lazy-object-proxy==1.9.0
-lxml==4.9.3
-macaroonbakery==1.3.1
+lazy-object-proxy==1.10.0
+lxml==5.0.0
+macaroonbakery==1.3.4
 mccabe==0.7.0
 more-itertools==10.1.0
-mypy==1.7.1
+mypy==1.8.0
 mypy-extensions==1.0.0
 oauthlib==3.2.2
 overrides==7.4.0
 packaging==23.2
 PasteDeploy==3.1.0
-pathspec==0.11.2
+pathspec==0.12.1
 pbr==6.0.0
 pexpect==4.9.0
 plaster==1.1.2
 plaster-pastedeploy==1.0.1
-platformdirs==4.0.0
+platformdirs==4.1.0
 pluggy==1.3.0
 progressbar==2.5
 protobuf==3.20.3
-psutil==5.9.6
+psutil==5.9.7
 ptyprocess==0.7.0
 pycodestyle==2.11.1
 pycparser==2.21
@@ -72,15 +72,15 @@ pyftpdlib==1.5.9
 pygit2==1.13.3
 pylint==2.17.7
 pylint-fixme-info==1.0.3
-pylint-pytest==1.1.6
+pylint-pytest==1.1.7
 pylxd==2.3.1
 pymacaroons==0.13.0
 PyNaCl==1.5.0
 pyparsing==3.1.1
 pyproject-api==1.6.1
 pyramid==2.0.2
 pyRFC3339==1.1
-pytest==7.4.3
+pytest==7.4.4
 pytest-cov==4.1.0
 pytest-mock==3.12.0
 pytest-subprocess==1.5.0
@@ -93,7 +93,7 @@ raven==6.10.0
 requests==2.31.0
 requests-toolbelt==1.0.0
 requests-unixsocket==0.3.0
-ruff==0.1.6
+ruff==0.1.11
 SecretStorage==3.3.3
 simplejson==3.19.2
 six==1.16.0
@@ -115,10 +115,10 @@ types-simplejson==3.19.0.2
 types-tabulate==0.9.0.3
 types-toml==0.10.8.7
 types-urllib3==1.26.25.14
-typing_extensions==4.8.0
+typing_extensions==4.9.0
 urllib3==1.26.18
 venusian==3.1.0
-virtualenv==20.24.7
+virtualenv==20.25.0
 wadllib==1.3.6
 WebOb==1.8.7
 wrapt==1.16.0
@@ -128,5 +128,4 @@ zipp==3.17.0
 zope.deprecation==5.0
 zope.interface==6.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"
-setuptools<66
 pyinstaller==5.13.1; sys.platform == "win32"