diff --git a/scripts/cmake/JobPools.cmake b/scripts/cmake/JobPools.cmake index 841bc75afb00b8c20ad1214610c7511b8438aab7..3e1e3c342f5497244d3159fc5a317fd4741c1640 100644 --- a/scripts/cmake/JobPools.cmake +++ b/scripts/cmake/JobPools.cmake @@ -25,7 +25,7 @@ set(CMAKE_JOB_POOL_COMPILE light_tasks) set(CMAKE_JOB_POOL_LINK light_tasks) if(APPLE_ARM) - setup_job_pool(heavy_tasks 2500) + setup_job_pool(heavy_tasks 3000) else() - setup_job_pool(heavy_tasks 6000) + setup_job_pool(heavy_tasks 8000) endif() diff --git a/scripts/cmake/PythonSetup.cmake b/scripts/cmake/PythonSetup.cmake index 2aae5acae2c1ceab9f2a76c697161a930116dfcb..ac16984cf94fb6d4c15e0bfed75a5f28544b7fa0 100644 --- a/scripts/cmake/PythonSetup.cmake +++ b/scripts/cmake/PythonSetup.cmake @@ -101,6 +101,7 @@ if(OGS_USE_PIP) list(APPEND OGS_PYTHON_PACKAGES "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 "" FORCE diff --git a/web/data/versions.json b/web/data/versions.json index c6c8c49fc1f840d214eb936cf673c6a8b7e8294a..43b09aaa234d3b145b9ee9d15c9d43cd5555f375 100644 --- a/web/data/versions.json +++ b/web/data/versions.json @@ -19,7 +19,7 @@ "petsc": "3.18.6", "qt": "5.14.2", "python": "3.6", - "snakemake": "7.20.0", + "snakemake": "7.32.4", "hdf5": "1.10.7", "libxml2": "2.9.12", "tfel-rliv": "4.0",