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

Merge branch 'update-snakemake-parsl' into 'master'

Update snakemake and fix parsl

See merge request ogs/ogs!3211
parents b0ee0337 57b15f24
No related branches found
No related tags found
No related merge requests found
...@@ -45,7 +45,9 @@ if(POETRY) ...@@ -45,7 +45,9 @@ if(POETRY)
if(NOT WIN32) if(NOT WIN32)
# Parsl is not supported on Windows yet # Parsl is not supported on Windows yet
# https://github.com/Parsl/parsl/issues/1878 # https://github.com/Parsl/parsl/issues/1878
list(APPEND PYTHON_PACKAGES parsl=${ogs.minimum_version.parsl}) list(APPEND PYTHON_PACKAGES parsl=${ogs.minimum_version.parsl}
asn1crypto # module dep of crypthography is missing on CI Linux
)
endif() endif()
endif() endif()
execute_process(COMMAND ${CMD_COMMAND} poetry add ${PYTHON_PACKAGES}) execute_process(COMMAND ${CMD_COMMAND} poetry add ${PYTHON_PACKAGES})
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"petsc": "3.11.2", "petsc": "3.11.2",
"qt": "5.12.4", "qt": "5.12.4",
"python": "3.6", "python": "3.6",
"snakemake": "5.19.3", "snakemake": "5.27.4",
"parsl": "1.0.0" "parsl": "1.0.0"
}, },
"tested_version": { "tested_version": {
......
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