Install pyocd and cysecuretools lazily

Author: multiplemonomials

targets/TARGET_Cypress/scripts/mbed_set_post_build_cypress.cmake

@@ -3,6 +3,12 @@
 
 include(mbed_target_functions)
 
+# Make sure we have the python packages we need
+mbed_check_or_install_python_package(HAVE_PYTHON_CYSECURETOOLS cysecuretools "cysecuretools~=6.0")
+if(NOT HAVE_PYTHON_CYSECURETOOLS)
+    message(FATAL_ERROR "Python package required for signing not found.")
+endif()
+
 #
 # Merge Cortex-M4 HEX and a Cortex-M0 HEX.
 #
@@ -63,8 +69,6 @@ macro(mbed_post_build_psoc6_sign_image
 )
     if("${cypress_psoc6_target}" STREQUAL "${MBED_TARGET}")
         function(mbed_post_build_function target)
-            find_package(Python3)
-
             set(post_build_command
                 ${Python3_EXECUTABLE} ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PSOC6.py
                 sign

targets/upload_method_cfg/SFE_ARTEMIS.cmake

@@ -6,7 +6,7 @@
 # 1. This board does not have an onboard debugger. You must use an external debugger, e.g. a PicoProbe
 #    or J-Link, if you wish to debug code.
 # 2. Support for this device exists in PyOCD main branch but has not been released yet (as of Jun 2025).
-#   To use PyOCD, you need to manually install it from the git repository by running (inside the Mbed OS venv):
+#   This version will be used automatically by Mbed if the python venv is enabled. If not, you need to install it via:
 #   pip install git+https://github.com/pyocd/pyOCD.git
 
 set(UPLOAD_METHOD_DEFAULT NONE)

tools/cmake/mbed_python_interpreter.cmake

@@ -4,6 +4,8 @@
 # CMake script to find the Python interpreter and either install or find
 # Mbed's dependencies.
 
+include(CheckPythonPackage)
+
 option(MBED_CREATE_PYTHON_VENV "If true, Mbed OS will create its own virtual environment (venv) and install its Python packages there.  This removes the need to manually install Python packages." TRUE)
 
 get_filename_component(MBED_CE_TOOLS_BASE_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
@@ -105,7 +107,6 @@ if(MBED_CREATE_PYTHON_VENV)
 else()
 
     find_package(Python3 REQUIRED COMPONENTS Interpreter)
-    include(CheckPythonPackage)
 
     # The cmsis_mcu_descr module was written from scratch by Mbed CE.
     # So, this check will ensure that the user has installed the Mbed CE version of mbed_tools
@@ -134,7 +135,34 @@ find_program(mbedhtrun
     REQUIRED)
 
 find_program(memap
-        NAMES memap
-        HINTS ${PYTHON_SCRIPT_LOC_HINTS}
-        DOC "Path to memap Python script."
-        REQUIRED)
+    NAMES memap
+    HINTS ${PYTHON_SCRIPT_LOC_HINTS}
+    DOC "Path to memap Python script."
+    REQUIRED)
+
+#
+# Utility function to check for a Python package with the given import name.
+# If the package is not found and the Mbed venv is in use,
+# then the package will be installed by passing PACKAGE_INSTALL_CONSTRAINT to Pip.
+# If the install fails or the venv is not being used, FOUND_VAR will be set to false.
+#
+function(mbed_check_or_install_python_package FOUND_VAR PACKAGE_IMPORT_NAME PACKAGE_INSTALL_CONSTRAINT)
+    check_python_package(${PACKAGE_IMPORT_NAME} ${FOUND_VAR})
+
+    if(NOT ${FOUND_VAR})
+        # If we are using the Mbed venv, we can install the package automatically.
+        if(MBED_CREATE_PYTHON_VENV)
+            message(STATUS "Mbed: Installing ${PACKAGE_INSTALL_CONSTRAINT} into Mbed's Python virtualenv")
+            execute_process(
+                    COMMAND ${Python3_EXECUTABLE} -m pip install ${PACKAGE_INSTALL_CONSTRAINT}
+                    RESULT_VARIABLE PIP_INSTALL_RESULT
+            )
+            if(NOT PIP_INSTALL_RESULT EQUAL 0)
+                message(WARNING "Installation of ${PACKAGE_INSTALL_CONSTRAINT} via pip failed.")
+            else()
+                # Redo the check to confirm it's installed
+                check_python_package(${PACKAGE_IMPORT_NAME} ${FOUND_VAR})
+            endif()
+        endif()
+    endif()
+endfunction(mbed_check_or_install_python_package)

tools/cmake/upload_methods/UploadMethodPYOCD.cmake

@@ -9,10 +9,13 @@
 
 set(UPLOAD_SUPPORTS_DEBUG TRUE)
 
-### Check if upload method can be enabled on this machine
-include(CheckPythonPackage)
-check_python_package(pyocd HAVE_PYOCD)
-set(UPLOAD_PYOCD_FOUND ${HAVE_PYOCD})
+### Find PyOCD package
+
+# Use the Git version so that we get Ambiq Apollo3 support (as that was not included in the latest release
+# before PyOCD development stopped, as of Jun 2025)
+mbed_check_or_install_python_package(HAVE_PYTHON_PYOCD pyocd git+https://github.com/pyocd/pyOCD.git)
+
+set(UPLOAD_PYOCD_FOUND ${HAVE_PYTHON_PYOCD})
 
 ### Function to generate upload target
 set(PYOCD_PROBE_ARGS "" CACHE INTERNAL "" FORCE)

tools/pyproject.toml

@@ -54,8 +54,7 @@ dependencies = [
 
     # needed for signing secure images --------------------------------------------------------
     "cryptography",
-    "cbor",
-    "cysecuretools~=6.0",
+    "cbor"
 ]
 
 [project.optional-dependencies]