Merge pull request #626 from jaimergp/system-requirements-and-conda-2…

…4.7.1 Enforce system requirements, upgrade to conda 24.7.1, mamba 1.5.9, bump Docker image for linux-64
conda-forge · Sep 3, 2024 · 102debd · 102debd
2 parents 5e2467d + e6c7e90
commit 102debd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -94,15 +94,15 @@ jobs:
             ARCH: x86_64
             TARGET_PLATFORM: linux-64
             DOCKER_ARCH: amd64
-            DOCKERIMAGE: condaforge/linux-anvil-comp7
+            DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64
             MINIFORGE_NAME: "Miniforge3"
             OS_NAME: "Linux"
 
           - os: ubuntu-latest
             ARCH: x86_64
             TARGET_PLATFORM: linux-64
             DOCKER_ARCH: amd64
-            DOCKERIMAGE: condaforge/linux-anvil-comp7
+            DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64
             MINIFORGE_NAME: "Mambaforge"
             OS_NAME: "Linux"
 
@@ -152,15 +152,15 @@ jobs:
             ARCH: x86_64
             TARGET_PLATFORM: linux-64
             DOCKER_ARCH: amd64
-            DOCKERIMAGE: condaforge/linux-anvil-comp7
+            DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64
             MINIFORGE_NAME: "Miniforge-pypy3"
             OS_NAME: "Linux"
 
           - os: ubuntu-latest
             ARCH: x86_64
             TARGET_PLATFORM: linux-64
             DOCKER_ARCH: amd64
-            DOCKERIMAGE: condaforge/linux-anvil-comp7
+            DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64
             MINIFORGE_NAME: "Mambaforge-pypy3"
             OS_NAME: "Linux"
 

diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml
@@ -1,7 +1,9 @@
 {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}
-{% set version = os.environ.get("MINIFORGE_VERSION", "24.5.0-0") %}
-{% set conda_libmamba_solver_version = "24.1.0"%}
-{% set mamba_version = "1.5.8"%}
+{% set version = os.environ.get("MINIFORGE_VERSION", "24.7.1-0") %}
+{% set conda_libmamba_solver_version = "24.7.0"%}
+# when mamba_version is updated here, also update MICROMAMBA_VERSION
+# in scripts/build.sh
+{% set mamba_version = "1.5.9"%}
 
 name: {{ name }}
 version: {{ version }}
@@ -49,5 +51,11 @@ specs:
   - pip
   - miniforge_console_shortcut 1.*  # [win]
 
+{% if name.startswith("Mambaforge") %}
 pre_install: mambaforge_deprecation.sh  # [unix]
 pre_install: mambaforge_deprecation.bat  # [win]
+{% endif %}
+
+virtual_specs:
+  - __glibc >=2.17 # [linux]
+  - __osx >=10.13 # [osx]
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -14,7 +14,7 @@ echo "***** Install constructor *****"
 mamba install --yes \
     --channel conda-forge --override-channels \
     jinja2 curl libarchive \
-    "constructor>=3.4.5"
+    "constructor>=3.9.3"
 
 if [[ "$(uname)" == "Darwin" ]]; then
     mamba install --yes \
@@ -38,7 +38,7 @@ cp LICENSE "${TEMP_DIR}/"
 ls -al "${TEMP_DIR}"
 
 if [[ "${TARGET_PLATFORM}" != win-* ]]; then
-    MICROMAMBA_VERSION=1.5.8
+    MICROMAMBA_VERSION=1.5.9
     MICROMAMBA_BUILD=0
     mkdir "${TEMP_DIR}/micromamba"
     pushd "${TEMP_DIR}/micromamba"