Merge branch 'main' into work/renovate-updates

.github/workflows/tics.yaml

@@ -29,13 +29,15 @@ jobs:
  echo "::endgroup::"
 
  - name: Setup Tox environment
- run: tox run-parallel --parallel auto --parallel-no-spinner --parallel-live --colored yes -e test-all-py310 --notest
+ run: tox --workdir /tmp/tox run-parallel --parallel auto --parallel-no-spinner --parallel-live --colored yes -e test-all-py310 --notest
 
  - name: Test with tox
- run: tox run --skip-pkg-install --result-json results/tox-py310.json --colored yes -e test-all-py310
+ run: tox --workdir /tmp/tox run --skip-pkg-install --result-json results/tox-py310.json --colored yes -e test-all-py310
 
  - name: Run TICS analysis
  uses: tiobe/tics-github-action@v3
+ env:
+ PATH: "/tmp/tox/test-all-py310/bin:/snap/bin:/home/runner/.local/bin:/home/runner/.cargo/bin:/bin:/usr/bin:/usr/local/bin:"
  with:
  mode: qserver
  project: snapcraft

requirements-devel.txt

@@ -4,7 +4,7 @@ PyNaCl==1.5.0
 PyYAML==6.0.1
 SecretStorage==3.3.3
 WebOb==1.8.7
-astroid==2.15.8
+astroid==3.2.4
 attrs==23.2.0
 black==24.3.0
 cachetools==5.3.3
@@ -26,6 +26,7 @@ craft-providers==1.23.1
 craft-store==2.6.2
 cryptography==42.0.5
 dill==0.3.8
+dill==0.3.8
 distlib==0.3.8
 distro==1.9.0
 docutils==0.19
@@ -38,6 +39,7 @@ hupper==1.12.1
 idna==3.7
 importlib-metadata==7.0.1
 iniconfig==2.0.0
+isort==5.13.2
 jaraco.classes==3.3.1
 jeepney==0.8.0
 jsonschema==2.5.1
@@ -60,7 +62,7 @@ pbr==6.0.0
 pexpect==4.9.0
 plaster-pastedeploy==1.0.1
 plaster==1.1.2
-platformdirs==4.1.0
+platformdirs==4.2.2
 pluggy==1.3.0
 progressbar==2.5
 protobuf==3.20.3
@@ -77,6 +79,7 @@ pyflakes==3.2.0
 pyftpdlib==1.5.9
 pygit2==1.13.3
 pyinstaller==5.13.2; sys.platform == "win32"
+pylint==3.2.6
 pylxd==2.3.2
 pymacaroons==0.13.0
 pyparsing==3.1.2
@@ -105,7 +108,8 @@ testscenarios==0.5.0
 testtools==2.7.1
 tinydb==4.8.0
 toml==0.10.2
-tomlkit==0.12.4
+tomli==2.0.1
+tomlkit==0.13.0
 tox==4.11.4
 translationstring==1.4
 types-Deprecated==1.2.9.20240311
@@ -116,7 +120,7 @@ types-simplejson==3.19.0.20240310
 types-tabulate==0.9.0.20240106
 types-toml==0.10.8.20240310
 types-urllib3==1.26.25.14
-typing_extensions==4.9.0
+typing-extensions==4.12.2
 urllib3==1.26.19
 validators==0.28.3
 venusian==3.1.0

setup.py

@@ -64,6 +64,8 @@ def recursive_data_files(directory, install_directory):
  "coverage[toml]",
  "pyflakes",
  "fixtures",
+ # For Tiobe TiCS
+ "flake8",
  "mccabe",
  "mypy",
  "testscenarios",
@@ -73,6 +75,8 @@ def recursive_data_files(directory, install_directory):
  "pydocstyle",
  "pyftpdlib",
  "pyinstaller; sys_platform == 'win32'",
+ # For Tiobe TiCS
+ "pylint",
  "pyramid",
  "pytest",
  "pytest-cov",