ci: bump Python to 3.10 and pin actions to SHA

.github/actions/test-prep/action.yaml

@@ -4,7 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Setup Python
-      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: "3.10"
     - name: Install test dependencies
@@ -18,7 +18,7 @@ runs:
       shell: bash
       run: sudo iptables -I DOCKER-USER -j ACCEPT
     - name: Fetch snap
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
       with:
         name: microk8s.snap
         path: build

.github/workflows/build-installer.yml

@@ -17,10 +17,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      - name: Set up Python 3.8
+      - name: Set up Python 3.10
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version: 3.8
+          python-version: "3.10"
       - name: Install Python requirements
         run: python -m pip install -r ../requirements.txt
       - name: Build exe

installer/common/file_utils.py

@@ -27,7 +27,7 @@
 logger = logging.getLogger(__name__)
 
 
-def _file_reader_iter(path: str, block_size=2 ** 20):
+def _file_reader_iter(path: str, block_size=2**20):
     with open(path, "rb") as f:
         block = f.read(block_size)
         while len(block) > 0:

installer/requirements.txt

@@ -4,11 +4,10 @@ progressbar33==2.4
 psutil==5.9.0
 requests==2.32.2
 requests_unixsocket==0.1.5
-pysha3==1.0.2; python_version < '3.6'
 simplejson==3.8.2
 toml==0.10.0
 certifi==2024.7.4
 chardet==3.0.4
 idna==3.7
 pyinstaller
-https://pyyaml.org/download/pyyaml/PyYAML-5.3.1-cp38-cp38-win_amd64.whl; sys_platform == 'win32'
+PyYAML==6.0.2; sys_platform == 'win32'

installer/vm_providers/_multipass/_multipass_command.py

@@ -139,7 +139,7 @@ def launch(
         mem: str = None,
         disk: str = None,
         remote: str = None,
-        cloud_init: str = None
+        cloud_init: str = None,
     ) -> None:
         """Passthrough for running multipass launch.
 
@@ -259,7 +259,7 @@ def mount(
         source: str,
         target: str,
         uid_map: Dict[str, str] = None,
-        gid_map: Dict[str, str] = None
+        gid_map: Dict[str, str] = None,
     ) -> None:
         """Passthrough for running multipass mount.
 

installer/vm_providers/errors.py

@@ -80,7 +80,7 @@ def __init__(
         provider_name: str,
         action: str,
         error_message: Optional[str] = None,
-        exit_code: Optional[int] = None
+        exit_code: Optional[int] = None,
     ) -> None:
         if exit_code is not None and error_message is not None:
             fmt = self._FMT_ERROR_MESSAGE_AND_EXIT_CODE
@@ -118,7 +118,7 @@ def __init__(
         *,
         provider_name: str,
         error_message: Optional[str] = None,
-        exit_code: Optional[int] = None
+        exit_code: Optional[int] = None,
     ) -> None:
         super().__init__(
             action="launch",
@@ -134,7 +134,7 @@ def __init__(
         *,
         provider_name: str,
         error_message: Optional[str] = None,
-        exit_code: Optional[int] = None
+        exit_code: Optional[int] = None,
     ) -> None:
         super().__init__(
             action="start",
@@ -150,7 +150,7 @@ def __init__(
         *,
         provider_name: str,
         error_message: Optional[str] = None,
-        exit_code: Optional[int] = None
+        exit_code: Optional[int] = None,
     ) -> None:
         super().__init__(
             action="stop",
@@ -166,7 +166,7 @@ def __init__(
         *,
         provider_name: str,
         error_message: Optional[str] = None,
-        exit_code: Optional[int] = None
+        exit_code: Optional[int] = None,
     ) -> None:
         super().__init__(
             action="delete",
@@ -199,7 +199,7 @@ def __init__(
         *,
         provider_name: str,
         error_message: Optional[str] = None,
-        exit_code: Optional[int] = None
+        exit_code: Optional[int] = None,
     ) -> None:
         super().__init__(
             action="shell",
@@ -215,7 +215,7 @@ def __init__(
         *,
         provider_name: str,
         error_message: Optional[str] = None,
-        exit_code: Optional[int] = None
+        exit_code: Optional[int] = None,
     ) -> None:
         super().__init__(
             action="mount",
@@ -231,7 +231,7 @@ def __init__(
         *,
         provider_name: str,
         error_message: Optional[str] = None,
-        exit_code: Optional[int] = None
+        exit_code: Optional[int] = None,
     ) -> None:
         super().__init__(
             action="unmount",
@@ -247,7 +247,7 @@ def __init__(
         *,
         provider_name: str,
         error_message: Optional[str] = None,
-        exit_code: Optional[int] = None
+        exit_code: Optional[int] = None,
     ) -> None:
         super().__init__(
             action="copy files",

pyproject.toml

@@ -1,3 +1,3 @@
 [tool.black]
 line-length = 100
-target-version = ['py35']
+target-version = ['py310']

tox.ini

@@ -9,8 +9,7 @@ envdir = {toxinidir}/.tox_env
 passenv =
     MK8S_*
 deps =
-    black ==21.4b2
-    click==7.1.2
+    black ==24.10.0
     flake8
     flake8-colors
     pep8-naming
@@ -21,7 +20,7 @@ deps =
 commands =
     flake8 --max-line-length=120 --ignore=C901,N801,N802,N803,N806,N816,W503,E203
     codespell --ignore-words-list="aks,ccompiler,NotIn" --quiet-level=2 --skip="*.patch,*.spec,.tox_env,.git,*.nsi"
-    black --diff --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
+    black --diff --check --exclude "/(\.eggs|\.git|\.tox|\.tox_env|\.venv|\.build|dist|charmhelpers|mod)/" .
 
 [testenv:scripts]
 setenv = PYTHONPATH={toxinidir}/scripts