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

[poetry] Fix install command on Windows.

parent 6aafb97a
No related branches found
No related tags found
No related merge requests found
...@@ -225,12 +225,8 @@ include(UnityBuildSettings) ...@@ -225,12 +225,8 @@ 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 ${_python_arg} ${OGS_PYTHON_PACKAGES} COMMAND ${_CMD_COMMAND} poetry add ${OGS_PYTHON_PACKAGES}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
) )
endif() endif()
......
...@@ -27,7 +27,8 @@ linux ctest large: ...@@ -27,7 +27,8 @@ linux ctest large:
allow_failure: true allow_failure: true
timeout: 2h timeout: 2h
variables: variables:
TARGETS: ctest-large BUILD_TESTS: "false"
BUILD_CTEST_LARGE: "true"
CMAKE_PRESET: release-all CMAKE_PRESET: release-all
CMAKE_ARGS: >- CMAKE_ARGS: >-
-DOGS_USE_PYTHON=ON -DOGS_USE_PYTHON=ON
......
# cmake-lint: disable=C0103 # cmake-lint: disable=C0103
# prefer unix location over frameworks (Apple-only)
set(Python3_FIND_FRAMEWORK LAST)
if(OGS_USE_POETRY) if(OGS_USE_POETRY)
find_program(POETRY poetry) find_program(POETRY poetry)
if(POETRY) if(POETRY)
find_package(
Python3 ${ogs.minimum_version.python} COMPONENTS Interpreter
REQUIRED
)
configure_file( configure_file(
${PROJECT_SOURCE_DIR}/scripts/python/poetry.in.toml ${PROJECT_SOURCE_DIR}/scripts/python/poetry.in.toml
${PROJECT_BINARY_DIR}/poetry.toml COPYONLY ${PROJECT_BINARY_DIR}/poetry.toml COPYONLY
......
[tool.poetry] [tool.poetry]
name = "ogs-build" name = "ogs-build"
version = "@OGS_VERSION@" # is written just once, maybe outdated version = "@OGS_VERSION@" # is written just once, maybe outdated
description = "CMake auto-generated" description = "CMake auto-generated"
authors = [""] authors = [""]
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = ">=@ogs.minimum_version.python@" python = "@Python3_VERSION@"
[tool.poetry.dev-dependencies] [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