Merge branch 'master' into dependabot/pip/matplotlib-3.10.0

Author: amilcarlucas

.github/workflows/markdown-lint.yml

@@ -17,6 +17,6 @@ jobs:
         uses: actions/checkout@v4
 
       - name: lint markdown
-        uses: DavidAnson/markdownlint-cli2-action@v18
+        uses: DavidAnson/markdownlint-cli2-action@v19
         with:
           globs: '**/*.md'

.github/workflows/pylint.yml

@@ -25,7 +25,7 @@ jobs:
 
     # https://docs.astral.sh/uv/guides/integration/github/
     - name: Install uv and set the python version
-      uses: astral-sh/setup-uv@v4
+      uses: astral-sh/setup-uv@v5
       with:
         python-version: ${{ matrix.python-version }}
 

.github/workflows/python-publish.yml

@@ -31,7 +31,7 @@ jobs:
 
     # https://docs.astral.sh/uv/guides/integration/github/
     - name: Install uv and set the python version
-      uses: astral-sh/setup-uv@v4
+      uses: astral-sh/setup-uv@v5
       with:
         python-version: '3.12'
 

.github/workflows/renovate_pre_commit_hooks.yml

@@ -0,0 +1,31 @@
+name: Renovate Pre-commit Hooks
+
+on:
+  schedule:
+    - cron: "0 0 * * *"  # Runs daily at midnight
+  workflow_dispatch:      # Allows manual trigger
+
+jobs:
+  renovate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Self-hosted Renovate
+        uses: renovatebot/github-action@v39.1.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          configurationFile: renovate-config.json
+        env:
+          LOG_LEVEL: debug
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: renovate/pre-commit-hooks
+          title: "chore(deps): update pre-commit hooks"
+          commit-message: "chore(deps): update pre-commit hooks"
+          body: |
+            Updates pre-commit hook versions in .pre-commit-config.yaml

.github/workflows/reuse.yml

@@ -17,7 +17,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install uv and set the python version
-      uses: astral-sh/setup-uv@v4
+      uses: astral-sh/setup-uv@v5
       with:
         python-version: '3.13'
 

REUSE.toml

@@ -26,7 +26,7 @@ SPDX-FileCopyrightText = "2024-2025 Amilcar Lucas"
 SPDX-License-Identifier = "GPL-3.0-or-later"
 
 [[annotations]]
-path = ["24_inflight_magnetometer_fit_setup.pdef.xml", "REUSE.toml", "SECURITY.md", "SetupDeveloperPC.bat", "SetupDeveloperPC.sh"]
+path = ["24_inflight_magnetometer_fit_setup.pdef.xml", "REUSE.toml", "SECURITY.md", "SetupDeveloperPC.bat", "SetupDeveloperPC.sh", "renovate-config.json"]
 SPDX-FileCopyrightText = "2024-2025 Amilcar Lucas"
 SPDX-License-Identifier = "GPL-3.0-or-later"
 

copilot_translate.py

@@ -55,7 +55,7 @@ class CopilotClient:  # pylint: disable=too-few-public-methods
     headers: dict[str, str]
 
     def __init__(self) -> None:
-        self.api_key = os.getenv("GITHUB_COPILOT_TOKEN")
+        self.api_key = os.getenv("GITHUB_COPILOT_TOKEN", "")
         if not self.api_key:
             msg = "GITHUB_COPILOT_TOKEN environment variable not set"
             raise ValueError(msg)

renovate-config.json

@@ -0,0 +1,10 @@
+{
+  "extends": ["config:base"],
+  "enabledManagers": ["pre-commit"],
+  "packageRules": [
+    {
+      "matchManagers": ["pre-commit"],
+      "automerge": true
+    }
+  ]
+}

update_flight_controller_ids.py

@@ -19,6 +19,8 @@
 # Define the base directory to crawl
 BASE_DIR = "../ardupilot/libraries/AP_HAL_ChibiOS/hwdef/"
 
+hwdef_dict = dict[str, tuple[int, int, int, str, str, str]]
+
 logging.basicConfig(level="INFO", format="%(asctime)s - %(levelname)s - %(message)s")
 
 # Add ../ardupilot/libraries/AP_HAL_ChibiOS/hwdef/scripts to the PYTHON path
@@ -50,8 +52,8 @@ def remove_suffixes(base_dirname: str, suffixes: list) -> str:
     return base_dirname
 
 
-def process_hwdef_files(base_directory: str) -> dict[str, tuple[int, int, int, str, str]]:
-    hwdef_data: dict[str, tuple[int, int, int, str, str, str]] = {}
+def process_hwdef_files(base_directory: str) -> hwdef_dict:
+    hwdef_data: hwdef_dict = {}
 
     # Walk through the directory
     for dirpath, _dirnames, filenames in os.walk(base_directory):
@@ -72,16 +74,18 @@ def process_hwdef_files(base_directory: str) -> dict[str, tuple[int, int, int, s
                 dirname = os.path.basename(dirpath)
                 numeric_board_id = int(c.get_numeric_board_id())
                 vid, pid = c.get_USB_IDs()
+                vid = int(vid)
+                pid = int(pid)
                 vid_name = str(c.get_config("USB_STRING_MANUFACTURER", default="ArduPilot")).strip('"').strip("'")
                 pid_name = str(c.get_config("USB_STRING_PRODUCT", default=dirname)).strip('"').strip("'")
-                mcu_series = c.mcu_series
+                mcu_series = str(c.mcu_series)
                 hwdef_data[dirname] = (numeric_board_id, vid, pid, vid_name, pid_name, mcu_series)
     # Sort the dictionary by the (dirname) key, so that python 3.13 produces similar results to python 3.12
     return dict(sorted(hwdef_data.items(), key=lambda x: x[0].lower()))
 
 
 def create_dicts(  # pylint: disable=too-many-locals
-    hwdef_data: dict[str, tuple[int, int, int, str, str, str]],
+    hwdef_data: hwdef_dict,
 ) -> tuple[dict[int, str], dict[tuple[int, int], str], dict[int, str], dict[int, str], dict[int, str]]:
     vid_vendor_dict: dict[int, str] = {}
     vid_pid_product_dict: dict[tuple[int, int], str] = {}
@@ -223,7 +227,7 @@ def main() -> None:
     apj_board_id_vendor_dict: dict[int, str] = {}
     mcu_series_dict: dict[int, str] = {}
 
-    hwdef_data: dict[str, tuple[int, int, int, str, str]] = process_hwdef_files(BASE_DIR)
+    hwdef_data: hwdef_dict = process_hwdef_files(BASE_DIR)
     vid_vendor_dict, vid_pid_product_dict, apj_board_id_name_dict, apj_board_id_vendor_dict, mcu_series_dict = create_dicts(
         hwdef_data
     )