Skip to content
Snippets Groups Projects
Verified Commit 72c457b7 authored by Lars Bilke's avatar Lars Bilke
Browse files

[cmake] Refacotred python requirement of TESPy.

parent 07c7eba1
No related branches found
No related tags found
No related merge requests found
...@@ -229,8 +229,12 @@ include(UnityBuildSettings) ...@@ -229,8 +229,12 @@ include(UnityBuildSettings)
if(POETRY) if(POETRY)
file(STRINGS ${PROJECT_BINARY_DIR}/.python_packages OGS_PYTHON_PACKAGES) file(STRINGS ${PROJECT_BINARY_DIR}/.python_packages OGS_PYTHON_PACKAGES)
list(REMOVE_DUPLICATES OGS_PYTHON_PACKAGES) list(REMOVE_DUPLICATES OGS_PYTHON_PACKAGES)
# Hack for tespy requirement
if(${Python3_VERSION} VERSION_LESS 3.10)
set(_python_arg --python <3.9)
endif()
execute_process( execute_process(
COMMAND ${_CMD_COMMAND} poetry add ${OGS_PYTHON_PACKAGES} COMMAND ${_CMD_COMMAND} poetry add ${_python_arg} ${OGS_PYTHON_PACKAGES}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
) )
endif() endif()
......
...@@ -92,7 +92,7 @@ if("${Python3_VERSION}" VERSION_LESS 3.9) ...@@ -92,7 +92,7 @@ if("${Python3_VERSION}" VERSION_LESS 3.9)
WRAPPER time WRAPPER time
TESTER vtkdiff TESTER vtkdiff
REQUIREMENTS OGS_USE_PYTHON AND NOT OGS_USE_MPI REQUIREMENTS OGS_USE_PYTHON AND NOT OGS_USE_MPI
PYTHON_PACKAGES "TESPy=0.3.2 --python \">=3.6,<3.9\"" PYTHON_PACKAGES "TESPy=0.3.2"
DIFF_DATA DIFF_DATA
3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_soil temperature_soil 1e-12 1e-13 3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_soil temperature_soil 1e-12 1e-13
3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_BHE1 temperature_BHE1 1e-10 1e-13 3bhes_1U_ts_10_t_600.000000.vtu 3bhes_1U_ts_10_t_600.000000.vtu temperature_BHE1 temperature_BHE1 1e-10 1e-13
......
...@@ -5,7 +5,7 @@ description = "CMake auto-generated" ...@@ -5,7 +5,7 @@ description = "CMake auto-generated"
authors = [""] authors = [""]
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^@ogs.minimum_version.python@" python = ">=@ogs.minimum_version.python@"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment