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

Merge branch 'fix-poetry' into 'master'

[poetry] Error fixes

See merge request ogs/ogs!3954
parents 5829b67f 628fdaf9
No related branches found
No related tags found
No related merge requests found
...@@ -243,7 +243,10 @@ if(POETRY) ...@@ -243,7 +243,10 @@ if(POETRY)
list(REMOVE_DUPLICATES OGS_PYTHON_PACKAGES) list(REMOVE_DUPLICATES OGS_PYTHON_PACKAGES)
list(SORT OGS_PYTHON_PACKAGES) list(SORT OGS_PYTHON_PACKAGES)
string(SHA1 _ogs_python_packages_sha1 "${OGS_PYTHON_PACKAGES}") string(SHA1 _ogs_python_packages_sha1 "${OGS_PYTHON_PACKAGES}")
if(NOT ${_ogs_python_packages_sha1} STREQUAL "${_OGS_PYTHON_PACKAGES_SHA1}") list(LENGTH OGS_PYTHON_PACKAGES OGS_PYTHON_PACKAGES_LENGTH)
if(NOT ${_ogs_python_packages_sha1} STREQUAL "${_OGS_PYTHON_PACKAGES_SHA1}"
AND ${OGS_PYTHON_PACKAGES_LENGTH} GREATER 0
)
execute_process( execute_process(
COMMAND ${CMD_COMMAND} poetry add ${OGS_PYTHON_PACKAGES} COMMAND ${CMD_COMMAND} poetry add ${OGS_PYTHON_PACKAGES}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
......
[virtualenvs] [virtualenvs]
in-project = true in-project = true
# https://github.com/python-poetry/poetry/issues/4210
[experimental]
new-installer = false
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
"https://github.com/joergbuchwald/ogs6py/archive/0f9e738e2ee469c8bde4204b2151238973417694.zip", "https://github.com/joergbuchwald/ogs6py/archive/0f9e738e2ee469c8bde4204b2151238973417694.zip",
"https://github.com/joergbuchwald/VTUinterface/archive/refs/heads/master.zip", "https://github.com/joergbuchwald/VTUinterface/archive/refs/heads/master.zip",
"https://github.com/bilke/nb2hugo/archive/e27dc02df2be1ce19e4a6f52d197c2e2a6ca520c.zip", "https://github.com/bilke/nb2hugo/archive/e27dc02df2be1ce19e4a6f52d197c2e2a6ca520c.zip",
"ipykernel", "ipykernel==6.7.0",
"nbconvert" "nbconvert==6.4.0"
] ]
} }
} }
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