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

Merge branch 'python39' into 'master'

Remove Python < 3.9 requirement

See merge request ogs/ogs!3314
parents 676be0e3 a470aef9
No related branches found
No related tags found
No related merge requests found
......@@ -91,8 +91,8 @@ AddTest(
EXECUTABLE_ARGS 3bhes_1U.prj
WRAPPER time
TESTER vtkdiff
REQUIREMENTS OGS_USE_PYTHON AND NOT OGS_USE_MPI
PYTHON_PACKAGES TESPy=0.3.2
REQUIREMENTS OGS_USE_PYTHON AND NOT OGS_USE_MPI AND (${Python3_VERSION} VERSION_LESS 3.9)
PYTHON_PACKAGES "TESPy=0.3.2 --python \">=3.6,<3.9\""
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_BHE1 temperature_BHE1 1e-10 1e-13
......
......@@ -292,10 +292,15 @@ Use six arguments version of AddTest with absolute and relative tolerances")
if(AddTest_PYTHON_PACKAGES)
if(POETRY)
file(WRITE ${PROJECT_BINARY_DIR}/tmp_poetry_add.bat "poetry add ${AddTest_PYTHON_PACKAGES}")
if(WIN32)
set(EXEC_CMD tmp_poetry_add.bat)
else()
set(EXEC_CMD ${BASH_TOOL_PATH} tmp_poetry_add.bat)
endif()
execute_process(
COMMAND ${CMD_COMMAND} poetry add ${AddTest_PYTHON_PACKAGES}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
COMMAND ${EXEC_CMD}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
else()
message(STATUS "Warning: Benchmark ${AddTest_NAME} requires these "
"Python packages: ${AddTest_PYTHON_PACKAGES}!\n Make sure to "
......
......@@ -5,7 +5,7 @@ description = "CMake auto-generated"
authors = [""]
[tool.poetry.dependencies]
python = "^@ogs.minimum_version.python@, <3.9" # TODO: <3.9 is a tespy requirement
python = "^@ogs.minimum_version.python@"
[tool.poetry.dev-dependencies]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment