From 06461270fb70678f44dee0ea6e29b04410325d88 Mon Sep 17 00:00:00 2001 From: Mark Callow Date: Wed, 9 Oct 2024 14:52:33 +0900 Subject: [PATCH] Add explanatory comments. --- .github/workflows/windows.yml | 7 ++++++- interface/python_binding/CMakeLists.txt | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1c83d43dbf..a30337e12d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -231,7 +231,12 @@ jobs: with: python-version: '3.11.4' - # Without this, venv stopped working in 20240929.1 runner. + # virtualenv is no longer included as of 20240929.1 runner so + # install it ourselves. See + # https://github.com/actions/runner-images/issues/10749. + # + # Note that it is the builds of sdist and wheel that require virtualenv + # not the explicit dependencies of pyktx. - name: Install Python virtualenv if: matrix.options.py == 'ON' && matrix.check_mkvk != 'ONLY' run: pip install virtualenv diff --git a/interface/python_binding/CMakeLists.txt b/interface/python_binding/CMakeLists.txt index b2c4051434..1f26c8a198 100644 --- a/interface/python_binding/CMakeLists.txt +++ b/interface/python_binding/CMakeLists.txt @@ -88,6 +88,8 @@ add_custom_command( LIBKTX_INCLUDE_DIR=${CMAKE_SOURCE_DIR}/include LIBKTX_LIB_DIR=${LIBKTX_LIB_DIR} LIBKTX_VERSION=${KTX_VERSION_NORMALIZED} + # Bulding sdist requires a virtual env. I have not found a + # a way via find_package to ensure venv support is installed. ${PYTHON_EXECUTABLE} -m build --sdist --outdir ${DIST_DIR} WORKING_DIRECTORY ${SOURCE_DIR} @@ -103,6 +105,7 @@ add_custom_command( LIBKTX_INCLUDE_DIR=${CMAKE_SOURCE_DIR}/include LIBKTX_LIB_DIR=${LIBKTX_LIB_DIR} LIBKTX_VERSION=${KTX_VERSION_NORMALIZED} + # Ditto with sdist venv comment. ${PYTHON_EXECUTABLE} -m build --wheel --outdir ${DIST_DIR} WORKING_DIRECTORY ${SOURCE_DIR}