Merge branch 'uv-venv' into 'master'

[py] Reworked .venv setup to use uv

See merge request ogs/ogs!5399

Author: bilke

Applications/Python/CMakeLists.txt

@@ -45,8 +45,8 @@ if(OGS_USE_PIP)
         add_test(
             NAME pytest
             COMMAND
-                ${CMAKE_COMMAND} -DEXECUTABLE=pytest
-                "-DEXECUTABLE_ARGS=-ra;${OGS_PYTEST_ARGS};-c;${PROJECT_SOURCE_DIR}/pyproject.toml" # Quoted
+                ${CMAKE_COMMAND} -DEXECUTABLE=${UV_TOOL_PATH}
+                "-DEXECUTABLE_ARGS=run;pytest;-ra;${OGS_PYTEST_ARGS};-c;${PROJECT_SOURCE_DIR}/pyproject.toml" # Quoted
                                                                             # because
                 # passed as list see https://stackoverflow.com/a/33248574/80480
                 -DBINARY_PATH=${_binary_path}
@@ -58,6 +58,10 @@ if(OGS_USE_PIP)
                 -P
                 ${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestWrapper.cmake
         )
-        set_tests_properties(pytest PROPERTIES LABELS "default;python" COST 10)
+        set_tests_properties(pytest PROPERTIES
+            LABELS "default;python"
+            COST 10
+            ENVIRONMENT
+                "CI=1;PYDEVD_DISABLE_FILE_VALIDATION=1;UV_PYTHON=$ENV{UV_PYTHON};UV_PROJECT=$ENV{UV_PROJECT};UV_PROJECT_ENVIRONMENT=$ENV{UV_PROJECT_ENVIRONMENT}")
     endif()
 endif()

CMakeLists.txt

@@ -221,11 +221,6 @@ endif()
 
 include(UnityBuildSettings)
 
-if(OGS_USE_PIP)
-    setup_venv()
-    setup_venv_dependent_ctests()
-endif()
-
 message(STATUS "${_benchmark_run_commands}")
 
 if(OGS_WRITE_BENCHMARK_COMMANDS)
@@ -244,14 +239,28 @@ if(WIN32)
         "$Env:PATH += \";C:/Program Files (x86)/Intel/oneAPI/compiler/latest/windows/redist/intel64_win/compiler\""
         "$Env:OGS_USE_PATH = \"1\""
     )
+    if(OGS_USE_PIP)
+        list(APPEND _envrc_content
+            "$Env:UV_PROJECT = \"${PROJECT_SOURCE_DIR}/Tests/Data\""
+            "$Env:UV_PROJECT_ENVIRONMENT = \"${PROJECT_BINARY_DIR}/.venv\""
+            "$Env:UV_FROZEN = \"1\""
+        )
+    endif()
     string(REPLACE ";$" "\n$" _envrc_content "${_envrc_content}")
 else()
     set(_envrc_content
-        "[ -d \"${PROJECT_BINARY_DIR}/.venv\" ] && source ${PROJECT_BINARY_DIR}/.venv/bin/activate"
-        "export PATH=${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}:$PATH"
+        "[ -d \"${PROJECT_BINARY_DIR}/.venv\" ] && source \"${PROJECT_BINARY_DIR}/.venv/bin/activate\""
+        "export PATH=\"${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}:$PATH\""
         "export OGS_USE_PATH=1"
-        "export PYTHONPATH=${PROJECT_BINARY_DIR}/site-packages:$PYTHONPATH"
+        "export PYTHONPATH=\"${PROJECT_BINARY_DIR}/site-packages:$PYTHONPATH\""
     )
+    if(OGS_USE_PIP)
+        list(APPEND _envrc_content
+            "export UV_PROJECT=\"${PROJECT_SOURCE_DIR}/Tests/Data\""
+            "export UV_PROJECT_ENVIRONMENT=\"${PROJECT_BINARY_DIR}/.venv\""
+            "export UV_FROZEN=1"
+        )
+    endif()
     if(TFEL_WITH_PYTHON)
         set(_envrc_content "${_envrc_content}"
                            "export PYTHONPATH=${TFEL_WITH_PYTHON}:$PYTHONPATH"

Documentation/.vale/Vocab/ogs/accept.txt

@@ -197,6 +197,7 @@ Tymofiy
 Ucar
 Unlicense
 Unstrut
+uv
 Verruijt
 Vogel
 Vogels

ProcessLib/HeatTransportBHE/Tests.cmake

@@ -378,6 +378,7 @@ AddTest(
     BHE_GW_advection_ts_10_t_500.000000.vtu BHE_GW_advection_ts_10_t_500.000000.vtu temperature_soil temperature_soil 1e-12 1e-13
 )
 
+# TODO: update to newer Python or remove!
 if("${Python_VERSION}" VERSION_LESS 3.9)
     AddTest(
         NAME HeatTransportBHE_3D_3BHEs_array

Tests/Data/pyproject.toml

@@ -22,7 +22,6 @@ dependencies = [
   "seaborn>=0.12",
   "VTUinterface>=0.704",
   ### dev tools ###
-  "gcovr==6.0",
   "jupytext>=1.14.5",
   "nbconvert>=7.16.5",
   "nbformat>=5.7.3",

Tests/Data/requirements-dev.txt

@@ -29,9 +29,8 @@ endif()
 configure_file(scripts/cmake/gcovr.cfg.in gcovr.cfg @ONLY)
 
 find_program(GCOVR_EXECUTABLE NAMES gcovr)
-if(NOT GCOVR_EXECUTABLE)
-    list(APPEND OGS_PYTHON_PACKAGES "gcovr==6.0")
-    set(GCOVR_EXECUTABLE ${LOCAL_VIRTUALENV_BIN_DIR}/gcovr CACHE PATH "" FORCE)
+if(NOT GCOVR_EXECUTABLE AND OGS_USE_PIP)
+    set(GCOVR_EXECUTABLE uvx gcovr==6.0 CACHE PATH "" FORCE)
 endif()
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/coverage/html)