Skip to content

Implement pip bootstrap in Python virtual environment #14767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bytesByHarsh wants to merge 1 commit into from
+27 −0
Closed

Implement pip bootstrap in Python virtual environment #14767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions cmake/modules/PythonVenv.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,31 @@ else()
set(_qgc_venv_python "${CMAKE_SOURCE_DIR}/.venv/bin/python")
endif()


function(_qgc_ensure_pip _py)
execute_process(
COMMAND "${_py}" -m pip -V
RESULT_VARIABLE _pip_result
OUTPUT_QUIET
ERROR_QUIET
)
if(_pip_result EQUAL 0)
return()
endif()
message(STATUS "QGC: .venv has no pip (required by mavlink) — bootstrapping via ensurepip")
execute_process(
COMMAND "${_py}" -m ensurepip --upgrade
RESULT_VARIABLE _ensurepip_result
OUTPUT_VARIABLE _ensurepip_output
ERROR_VARIABLE _ensurepip_output
)
if(NOT _ensurepip_result EQUAL 0)
message(FATAL_ERROR "QGC: failed to bootstrap pip into .venv (exit ${_ensurepip_result}):\n"
"${_ensurepip_output}\n"
"Run manually: ${_py} -m ensurepip --upgrade")
endif()
endfunction()

function(_qgc_sync_venv_if_stale _py)
if(NOT QGC_AUTO_PYTHON_VENV)
return()
Expand Down Expand Up @@ -43,6 +68,7 @@ endmacro()
if(DEFINED CACHE{Python3_EXECUTABLE})
if(EXISTS "${_qgc_venv_python}" AND "${Python3_EXECUTABLE}" STREQUAL "${_qgc_venv_python}")
_qgc_sync_venv_if_stale("${_qgc_venv_python}")
_qgc_ensure_pip("${_qgc_venv_python}")
Comment on lines 70 to +71
_qgc_pin_python("${_qgc_venv_python}")
endif()
return()
Expand Down Expand Up @@ -85,6 +111,7 @@ endif()

if(EXISTS "${_qgc_venv_python}")
_qgc_sync_venv_if_stale("${_qgc_venv_python}")
_qgc_ensure_pip("${_qgc_venv_python}")
_qgc_pin_python("${_qgc_venv_python}")
message(STATUS "QGC: using Python venv interpreter ${Python3_EXECUTABLE}")
else()
Expand Down
Loading