From f0a97780da02d21256fd342a013a336d1a6bfbc4 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Wed, 14 Aug 2024 17:25:27 +0200 Subject: [PATCH 01/11] Require glibc 2.17 and macOS 10.13, minimum --- Miniforge3/construct.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 100d893c..93f29066 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -51,3 +51,7 @@ specs: pre_install: mambaforge_deprecation.sh # [unix] pre_install: mambaforge_deprecation.bat # [win] + +virtual_specs: + - __glibc >=2.17 # [linux] + - __osx >=10.13 # [osx] From 10548024818b01c10ff7fbeb9ed46eed607ddd69 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Wed, 14 Aug 2024 17:26:20 +0200 Subject: [PATCH 02/11] Bump to conda-libmamba-solver 24.7.1, conda-libmamba-solver 24.7 --- Miniforge3/construct.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 93f29066..333e6e9d 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,6 +1,6 @@ {% 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 version = os.environ.get("MINIFORGE_VERSION", "24.7.1-0") %} +{% set conda_libmamba_solver_version = "24.7.0"%} {% set mamba_version = "1.5.8"%} name: {{ name }} From 2617fbb6bd3fed9df6ed1ce9612bb54723a2df68 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Wed, 14 Aug 2024 17:59:59 +0200 Subject: [PATCH 03/11] tmp: patch constructor --- scripts/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/build.sh b/scripts/build.sh index 9891a5d9..e9ba6d7d 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -22,6 +22,9 @@ if [[ "$(uname)" == "Darwin" ]]; then coreutils fi +# TEMPORARY; remove before merge once target PR is merged +python -mpip install https://github.com/jaimergp/constructor/archive/fix-virtual-specs-ok.tar.gz --no-deps + mamba list echo "***** Make temp directory *****" From 8f93f75bfdcaddf0d8d42842b19c2e4863cc8b58 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Wed, 14 Aug 2024 18:09:02 +0200 Subject: [PATCH 04/11] SETUPTOOLS_SCM_PRETEND_VERSION --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index e9ba6d7d..2196fe64 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -23,7 +23,7 @@ if [[ "$(uname)" == "Darwin" ]]; then fi # TEMPORARY; remove before merge once target PR is merged -python -mpip install https://github.com/jaimergp/constructor/archive/fix-virtual-specs-ok.tar.gz --no-deps +SETUPTOOLS_SCM_PRETEND_VERSION=3.9.3 python -mpip install https://github.com/jaimergp/constructor/archive/fix-virtual-specs-ok.tar.gz --no-deps mamba list From d6455ff9545143932c17482e80038845d933abb8 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Wed, 14 Aug 2024 18:22:42 +0200 Subject: [PATCH 05/11] retrigger From 8b6e1fbda9c4eae4c2aa3bb18ad0e7baff960773 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Wed, 14 Aug 2024 18:29:29 +0200 Subject: [PATCH 06/11] mambaforge deprecation warnings only for mambaforge --- Miniforge3/construct.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 333e6e9d..bbd94760 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -49,8 +49,10 @@ 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] From 829829ecc5f359cf4b7dc60dbb5ffcd27b28342a Mon Sep 17 00:00:00 2001 From: jaimergp Date: Tue, 20 Aug 2024 16:26:24 +0200 Subject: [PATCH 07/11] Require constructor 3.9.3 --- scripts/build.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 2196fe64..175f2bf9 100755 --- 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 \ @@ -22,9 +22,6 @@ if [[ "$(uname)" == "Darwin" ]]; then coreutils fi -# TEMPORARY; remove before merge once target PR is merged -SETUPTOOLS_SCM_PRETEND_VERSION=3.9.3 python -mpip install https://github.com/jaimergp/constructor/archive/fix-virtual-specs-ok.tar.gz --no-deps - mamba list echo "***** Make temp directory *****" From ff0f933916698f81ad3789bc6abb94263213df95 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 31 Aug 2024 08:45:04 -0400 Subject: [PATCH 08/11] Update mamba version --- Miniforge3/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index bbd94760..c8dbee07 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,7 +1,7 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} {% set version = os.environ.get("MINIFORGE_VERSION", "24.7.1-0") %} {% set conda_libmamba_solver_version = "24.7.0"%} -{% set mamba_version = "1.5.8"%} +{% set mamba_version = "1.5.9"%} name: {{ name }} version: {{ version }} From 0a3fb692b247e174fc6511a0f2dcd0c5b0ae6a93 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 31 Aug 2024 09:10:58 -0400 Subject: [PATCH 09/11] update micromamba version --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 175f2bf9..30f43a33 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -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" From eacad1ab30c77aa8ac6d5732479b6fe9a1fc4b78 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 31 Aug 2024 09:11:47 -0400 Subject: [PATCH 10/11] Update construct.yaml --- Miniforge3/construct.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index c8dbee07..5431e1bd 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,6 +1,8 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} {% 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 }} From e6c7e9015900b93b567e86328fdf66d24f820340 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Tue, 3 Sep 2024 10:09:37 +0200 Subject: [PATCH 11/11] Bump Docker image? --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb9f4f83..9627f170 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,7 +94,7 @@ 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" @@ -102,7 +102,7 @@ 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: "Mambaforge" OS_NAME: "Linux" @@ -152,7 +152,7 @@ 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" @@ -160,7 +160,7 @@ 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: "Mambaforge-pypy3" OS_NAME: "Linux"