FCKIT_VENV: upgrade pip before installing packages

ecmwf · Nov 6, 2024 · 7f6c3d8 · 7f6c3d8
1 parent 73e0e1b
commit 7f6c3d8
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/cmake/fckit_install_venv.cmake b/cmake/fckit_install_venv.cmake
@@ -9,10 +9,6 @@
 macro( fckit_install_venv )
 
     list( APPEND PIP_OPTIONS "--disable-pip-version-check" )
-    if( HAVE_FCKIT_VENV_EDITABLE )
-        # Use checked-out source instead of installing into venv
-        list( APPEND PIP_OPTIONS "-e" )
-    endif()
 
     # Create a virtualenv
     set( VENV_PATH ${CMAKE_CURRENT_BINARY_DIR}/fckit_venv )
@@ -45,6 +41,13 @@ macro( fckit_install_venv )
        set( _pkg_name "fckit_yaml_reader/[tests]")
     endif()
 
+    execute_process( COMMAND ${Python3_EXECUTABLE} -m pip install --upgrade ${PIP_OPTIONS} pip OUTPUT_QUIET )
+
+    if( HAVE_FCKIT_VENV_EDITABLE )
+        # Use checked-out source instead of installing into venv
+        list( APPEND PIP_OPTIONS "-e" )
+    endif()
+
     ecbuild_info( "Install fckit_yaml_reader in virtual environment ${VENV_PATH}" )
     execute_process( COMMAND ${Python3_EXECUTABLE} -m pip install ${PIP_OPTIONS} ${CMAKE_CURRENT_SOURCE_DIR}/src/fckit/${_pkg_name} OUTPUT_QUIET )