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

Merge branch 'bump-snakemake' into 'master'

[python] Bump snakemake to 7.32.4 (latest <8 version)

See merge request ogs/ogs!4868
parents ce0931f5 971b7140
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ set(CMAKE_JOB_POOL_COMPILE light_tasks) ...@@ -25,7 +25,7 @@ set(CMAKE_JOB_POOL_COMPILE light_tasks)
set(CMAKE_JOB_POOL_LINK light_tasks) set(CMAKE_JOB_POOL_LINK light_tasks)
if(APPLE_ARM) if(APPLE_ARM)
setup_job_pool(heavy_tasks 2500) setup_job_pool(heavy_tasks 3000)
else() else()
setup_job_pool(heavy_tasks 6000) setup_job_pool(heavy_tasks 8000)
endif() endif()
...@@ -101,6 +101,7 @@ if(OGS_USE_PIP) ...@@ -101,6 +101,7 @@ if(OGS_USE_PIP)
list(APPEND OGS_PYTHON_PACKAGES list(APPEND OGS_PYTHON_PACKAGES
"snakemake==${ogs.minimum_version.snakemake}" "snakemake==${ogs.minimum_version.snakemake}"
"pulp==2.7.0" # https://github.com/snakemake/snakemake/issues/2607
) )
set(SNAKEMAKE ${LOCAL_VIRTUALENV_BIN_DIR}/snakemake CACHE FILEPATH "" set(SNAKEMAKE ${LOCAL_VIRTUALENV_BIN_DIR}/snakemake CACHE FILEPATH ""
FORCE FORCE
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"petsc": "3.18.6", "petsc": "3.18.6",
"qt": "5.14.2", "qt": "5.14.2",
"python": "3.6", "python": "3.6",
"snakemake": "7.20.0", "snakemake": "7.32.4",
"hdf5": "1.10.7", "hdf5": "1.10.7",
"libxml2": "2.9.12", "libxml2": "2.9.12",
"tfel-rliv": "4.0", "tfel-rliv": "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