From bf55e4a87ef0ce66836b0e2445072c8c18343d3b Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Fri, 27 Dec 2024 19:47:04 -0500 Subject: [PATCH] Bye bye Mambaforge and PyPy Merge on new year's day, 2025!!! --- .github/workflows/ci.yml | 155 -------------------------- Miniforge3/construct.yaml | 23 +--- Miniforge3/mambaforge_deprecation.bat | 27 ----- Miniforge3/mambaforge_deprecation.sh | 29 ----- Miniforge3/pypy_deprecation.bat | 27 ----- Miniforge3/pypy_deprecation.sh | 27 ----- scripts/test.sh | 5 - 7 files changed, 1 insertion(+), 292 deletions(-) delete mode 100644 Miniforge3/mambaforge_deprecation.bat delete mode 100644 Miniforge3/mambaforge_deprecation.sh delete mode 100644 Miniforge3/pypy_deprecation.bat delete mode 100644 Miniforge3/pypy_deprecation.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9e7c650..d735777a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,60 +15,18 @@ jobs: MINIFORGE_NAME: "Miniforge3" OS_NAME: "Windows" - - os: windows-latest - ARCH: x86_64 - TARGET_PLATFORM: win-64 - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "Windows" - - - os: windows-latest - ARCH: x86_64 - TARGET_PLATFORM: win-64 - MINIFORGE_NAME: "Miniforge-pypy3" - OS_NAME: "Windows" - - - os: windows-latest - ARCH: x86_64 - TARGET_PLATFORM: win-64 - MINIFORGE_NAME: "Mambaforge-pypy3" - OS_NAME: "Windows" - - os: macos-latest ARCH: arm64 TARGET_PLATFORM: osx-arm64 MINIFORGE_NAME: "Miniforge3" OS_NAME: "MacOSX" - - os: macos-latest - ARCH: arm64 - TARGET_PLATFORM: osx-arm64 - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "MacOSX" - - - os: macos-latest - ARCH: x86_64 - TARGET_PLATFORM: osx-64 - MINIFORGE_NAME: "Miniforge-pypy3" - OS_NAME: "MacOSX" - - - os: macos-latest - ARCH: x86_64 - TARGET_PLATFORM: osx-64 - MINIFORGE_NAME: "Mambaforge-pypy3" - OS_NAME: "MacOSX" - - os: macos-latest ARCH: x86_64 TARGET_PLATFORM: osx-64 MINIFORGE_NAME: "Miniforge3" OS_NAME: "MacOSX" - - os: macos-latest - ARCH: x86_64 - TARGET_PLATFORM: osx-64 - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "MacOSX" - - os: ubuntu-latest ARCH: aarch64 TARGET_PLATFORM: linux-aarch64 @@ -82,19 +40,6 @@ jobs: # xref https://github.com/conda-forge/miniforge/pull/361 TEST_IMAGE_NAMES: "ubuntu:24.04" - - os: ubuntu-latest - ARCH: aarch64 - TARGET_PLATFORM: linux-aarch64 - DOCKER_ARCH: arm64/v8 - DOCKERIMAGE: condaforge/linux-anvil-aarch64 - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "Linux" - # Reduce the test matrix because the builds timeouts on emulated architectures - # The time consuming operation is an attempt a full solve of conda/mamba/boa - # for as a compatibility - # xref https://github.com/conda-forge/miniforge/pull/361 - TEST_IMAGE_NAMES: "ubuntu:24.04" - - os: ubuntu-latest ARCH: x86_64 TARGET_PLATFORM: linux-64 @@ -103,14 +48,6 @@ jobs: MINIFORGE_NAME: "Miniforge3" OS_NAME: "Linux" - - os: ubuntu-latest - ARCH: x86_64 - TARGET_PLATFORM: linux-64 - DOCKER_ARCH: amd64 - DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64 - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "Linux" - - os: ubuntu-latest ARCH: ppc64le TARGET_PLATFORM: linux-ppc64le @@ -124,87 +61,6 @@ jobs: # xref https://github.com/conda-forge/miniforge/pull/361 TEST_IMAGE_NAMES: "ubuntu:24.04" - - os: ubuntu-latest - ARCH: ppc64le - TARGET_PLATFORM: linux-ppc64le - DOCKER_ARCH: ppc64le - DOCKERIMAGE: condaforge/linux-anvil-ppc64le - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "Linux" - # Reduce the test matrix because the builds timeouts on emulated architectures - # The time consuming operation is an attempt a full solve of conda/mamba/boa - # for as a compatibility - # xref https://github.com/conda-forge/miniforge/pull/361 - TEST_IMAGE_NAMES: "ubuntu:24.04" - - - os: ubuntu-latest - ARCH: aarch64 - TARGET_PLATFORM: linux-aarch64 - DOCKER_ARCH: arm64/v8 - DOCKERIMAGE: condaforge/linux-anvil-aarch64 - MINIFORGE_NAME: "Miniforge-pypy3" - OS_NAME: "Linux" - # Reduce the test matrix because the builds timeouts on emulated architectures - # The time consuming operation is an attempt a full solve of conda/mamba/boa - # for as a compatibility - # xref https://github.com/conda-forge/miniforge/pull/361 - TEST_IMAGE_NAMES: "ubuntu:24.04" - - - os: ubuntu-latest - ARCH: aarch64 - TARGET_PLATFORM: linux-aarch64 - DOCKER_ARCH: arm64/v8 - DOCKERIMAGE: condaforge/linux-anvil-aarch64 - MINIFORGE_NAME: "Mambaforge-pypy3" - OS_NAME: "Linux" - # Reduce the test matrix because the builds timeouts on emulated architectures - # The time consuming operation is an attempt a full solve of conda/mamba/boa - # for as a compatibility - # xref https://github.com/conda-forge/miniforge/pull/361 - TEST_IMAGE_NAMES: "ubuntu:24.04" - - - os: ubuntu-latest - ARCH: x86_64 - TARGET_PLATFORM: linux-64 - DOCKER_ARCH: amd64 - 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-cos7-x86_64 - MINIFORGE_NAME: "Mambaforge-pypy3" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: ppc64le - TARGET_PLATFORM: linux-ppc64le - DOCKER_ARCH: ppc64le - DOCKERIMAGE: condaforge/linux-anvil-ppc64le - MINIFORGE_NAME: "Miniforge-pypy3" - OS_NAME: "Linux" - # Reduce the test matrix because the builds timeouts on emulated architectures - # The time consuming operation is an attempt a full solve of conda/mamba/boa - # for as a compatibility - # xref https://github.com/conda-forge/miniforge/pull/361 - TEST_IMAGE_NAMES: "ubuntu:24.04" - - - os: ubuntu-latest - ARCH: ppc64le - TARGET_PLATFORM: linux-ppc64le - DOCKER_ARCH: ppc64le - DOCKERIMAGE: condaforge/linux-anvil-ppc64le - MINIFORGE_NAME: "Mambaforge-pypy3" - OS_NAME: "Linux" - # Reduce the test matrix because the builds timeouts on emulated architectures - # The time consuming operation is an attempt a full solve of conda/mamba/boa - # for as a compatibility - # xref https://github.com/conda-forge/miniforge/pull/361 - TEST_IMAGE_NAMES: "centos:7" - steps: - name: Checkout code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -214,17 +70,6 @@ jobs: miniforge-version: "latest" use-mamba: true if: ${{ ! contains(matrix.OS_NAME, 'Linux') }} - - - name: Patch license for Mambaforge deprecation - if: matrix.MINIFORGE_NAME == 'Mambaforge' || matrix.MINIFORGE_NAME == 'Mambaforge-pypy3' - run: | - echo "!!!!!! Mambaforge is now deprecated !!!!!" > Miniforge3/MAMBAFORGE_LICENSE.txt - echo "Future Miniforge releases will NOT build Mambaforge installers." >> Miniforge3/MAMBAFORGE_LICENSE.txt - echo "We advise you switch to Miniforge at your earliest convenience." >> Miniforge3/MAMBAFORGE_LICENSE.txt - echo "More details at https://conda-forge.org/news/2024/07/29/sunsetting-mambaforge/." >> Miniforge3/MAMBAFORGE_LICENSE.txt - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> Miniforge3/MAMBAFORGE_LICENSE.txt - cat LICENSE >> Miniforge3/MAMBAFORGE_LICENSE.txt - echo "MINIFORGE_LICENSE_OVERRIDE=MAMBAFORGE_LICENSE.txt" >> $GITHUB_ENV - name: Build and test miniforge env: diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 61909ff7..e7f624e2 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,5 +1,5 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} -{% set version = os.environ.get("MINIFORGE_VERSION", "24.11.0-1") %} +{% set version = os.environ.get("MINIFORGE_VERSION", "24.11.0-2") %} {% set conda_libmamba_solver_version = "24.11.1"%} # when mamba_version is updated here, also update MICROMAMBA_VERSION in scripts/build.sh {% set mamba_version = "2.0.5"%} @@ -26,42 +26,21 @@ initialize_conda: True initialize_by_default: False user_requested_specs: -{% if name.endswith("pypy3") %} - - python 3.9.* *_pypy - - conda >=24.7.1 - - mamba >=1.5.9 -{% else %} - python 3.12.* - conda >={{ version.split("-")[0] }} - mamba >={{ mamba_version }} -{% endif %} - pip # Omit conda-libmamba-solver so that conda is free to remove it later - miniforge_console_shortcut 1.* # [win] specs: -{% if name.endswith("pypy3") %} - - python 3.9.* *_pypy - - conda 24.7.1 - - mamba 1.5.9 - - conda-libmamba-solver 24.7.0 -{% else %} - python 3.12.* - conda {{ version.split("-")[0] }} - mamba {{ mamba_version }} - conda-libmamba-solver {{ conda_libmamba_solver_version }} -{% endif %} - pip - miniforge_console_shortcut 1.* # [win] -{% if name.startswith("Mambaforge") %} -pre_install: mambaforge_deprecation.sh # [unix] -pre_install: mambaforge_deprecation.bat # [win] -{% elif name.endswith("pypy3") %} -pre_install: pypy_deprecation.sh # [unix] -pre_install: pypy_deprecation.bat # [win] -{% endif %} - virtual_specs: - __glibc >=2.17 # [linux] - __osx >=10.13 # [osx] diff --git a/Miniforge3/mambaforge_deprecation.bat b/Miniforge3/mambaforge_deprecation.bat deleted file mode 100644 index 316ad217..00000000 --- a/Miniforge3/mambaforge_deprecation.bat +++ /dev/null @@ -1,27 +0,0 @@ -@ECHO OFF -set "title=Mambaforge is now deprecated!" -set "message=Mambaforge is now deprecated! Future Miniforge releases will NOT build Mambaforge installers. We advise you switch to Miniforge at your earliest convenience. More details at https://conda-forge.org/news/2024/07/29/sunsetting-mambaforge/. If you require Mambaforge, you may pin your installer to one found in https://github.com/conda-forge/miniforge/releases/tag/24.7.1-0" -if "%GITHUB_ACTIONS%"=="true" ( - echo ::warning title=%title%::%message% -) else ( - powershell "(New-Object -ComObject Wscript.Shell).Popup('%message%',0,'%title%',0x30)" >NUL -) - -for /f "delims=" %%# in ('powershell get-date -format "{yyyy-MM-dd}"') do @set _date=%%# -if "%_date%"=="2024-10-01" exit 1 -if "%_date%"=="2024-10-15" exit 1 -if "%_date%"=="2024-11-01" exit 1 -if "%_date%"=="2024-11-10" exit 1 -if "%_date%"=="2024-11-20" exit 1 -if "%_date%"=="2024-11-30" exit 1 -if "%_date%"=="2024-12-05" exit 1 -if "%_date%"=="2024-12-10" exit 1 -if "%_date%"=="2024-12-15" exit 1 -if "%_date%"=="2024-12-20" exit 1 -if "%_date%"=="2024-12-25" exit 1 -if "%_date%"=="2024-12-30" exit 1 -if "%_date%"=="2024-12-31" exit 1 -if "%_date:~0,4%"=="2025" exit 1 - -echo Sleeping for 30s... -powershell -c "& {sleep 30}" diff --git a/Miniforge3/mambaforge_deprecation.sh b/Miniforge3/mambaforge_deprecation.sh deleted file mode 100644 index b46d52cf..00000000 --- a/Miniforge3/mambaforge_deprecation.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -if [[ "$GITHUB_ACTIONS" == "true" ]]; then - echo "::warning title=Mambaforge is now deprecated!::Future Miniforge releases will NOT build Mambaforge installers. We advise you switch to Miniforge at your earliest convenience. More details at https://conda-forge.org/news/2024/07/29/sunsetting-mambaforge/." -else - echo "!!!!!! Mambaforge is now deprecated !!!!!" - echo "Future Miniforge releases will NOT build Mambaforge installers." - echo "We advise you switch to Miniforge at your earliest convenience." - echo "More details at https://conda-forge.org/news/2024/07/29/sunsetting-mambaforge/." - echo "If you are unable to switch to Miniforge, you may pin your installer version to one found in " - echo "https://github.com/conda-forge/miniforge/releases/tag/24.3.0-1" - echo "or if you lack the system requirements (Linux glibc >= 2.17, or macOS + x86-64bit >= 10.13)" - echo "you may pin your installer to one older version found in " - echo "https://github.com/conda-forge/miniforge/releases/tag/24.3.0-0" - echo "This Miniforge installer will ceese to work in 2025." - echo "If you require this Mambaforge installer you may pin to " - echo "https://github.com/conda-forge/miniforge/releases/tag/24.7.1-0" -fi - -case $(date +%F) in - # Brownouts - 2024-10-01|2024-10-15|2024-11-01|2024-11-10|2024-11-20|2024-11-30|2024-12-05|2024-12-10|2024-12-15|2024-12-20|2024-12-25|2024-12-30|2024-12-31|2025-*) - exit 1 - ;; - *) - echo "Sleeping for 30s..." - sleep 30 - ;; -esac diff --git a/Miniforge3/pypy_deprecation.bat b/Miniforge3/pypy_deprecation.bat deleted file mode 100644 index 0c43b7dc..00000000 --- a/Miniforge3/pypy_deprecation.bat +++ /dev/null @@ -1,27 +0,0 @@ -@ECHO OFF -set "title=PyPy support is now deprecated!" -set "message=PyPy support is now deprecated! Future Miniforge releases will NOT build installers with PyPy in their base environment. We advise you switch to Miniforge at your earliest convenience. More details at https://conda-forge.org/news/2024/08/14/sunsetting-pypy/. If you require PyPy, you may pin your installer to one found in https://github.com/conda-forge/miniforge/releases/tag/24.7.1-0" -if "%GITHUB_ACTIONS%"=="true" ( - echo ::warning title=%title%::%message% -) else ( - powershell "(New-Object -ComObject Wscript.Shell).Popup('%message%',0,'%title%',0x30)" >NUL -) - -for /f "delims=" %%# in ('powershell get-date -format "{yyyy-MM-dd}"') do @set _date=%%# -if "%_date%"=="2024-10-01" exit 1 -if "%_date%"=="2024-10-15" exit 1 -if "%_date%"=="2024-11-01" exit 1 -if "%_date%"=="2024-11-10" exit 1 -if "%_date%"=="2024-11-20" exit 1 -if "%_date%"=="2024-11-30" exit 1 -if "%_date%"=="2024-12-05" exit 1 -if "%_date%"=="2024-12-10" exit 1 -if "%_date%"=="2024-12-15" exit 1 -if "%_date%"=="2024-12-20" exit 1 -if "%_date%"=="2024-12-25" exit 1 -if "%_date%"=="2024-12-30" exit 1 -if "%_date%"=="2024-12-31" exit 1 -if "%_date:~0,4%"=="2025" exit 1 - -echo Sleeping for 30s... -powershell -c "& {sleep 30}" diff --git a/Miniforge3/pypy_deprecation.sh b/Miniforge3/pypy_deprecation.sh deleted file mode 100644 index 9d25b99f..00000000 --- a/Miniforge3/pypy_deprecation.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -if [[ "$GITHUB_ACTIONS" == "true" ]]; then - echo "::warning title=Mambaforge is now deprecated!::Future Miniforge releases will NOT build Mambaforge installers. We advise you switch to Miniforge at your earliest convenience. More details at https://conda-forge.org/news/2024/07/29/sunsetting-mambaforge/." -else - echo "!!!!!! Conda-Forge PyPy is now deprecated !!!!!" - echo "Future Miniforge releases will NOT build with PyPy in the base environment installers." - echo "We advise you switch to Miniforge3 at your earliest convenience." - echo "More details at https://conda-forge.org/news/2024/08/14/sunsetting-pypy/" - echo "If you are unable to switch to Miniforge, you may pin your installer version to one found in " - echo "https://github.com/conda-forge/miniforge/releases/tag/24.3.0-1" - echo "or if you lack the system requirements (Linux glibc >= 2.17, or macOS + x86-64bit >= 10.13)" - echo "you may pin your installer to one older version found in " - echo "https://github.com/conda-forge/miniforge/releases/tag/24.3.0-0" - echo "This Miniforge installer will ceese to work in 2025." -fi - -case $(date +%F) in - # Brownouts - 2024-10-01|2024-10-15|2024-11-01|2024-11-10|2024-11-20|2024-11-30|2024-12-05|2024-12-10|2024-12-15|2024-12-20|2024-12-25|2024-12-30|2024-12-31|2025-*) - exit 1 - ;; - *) - echo "Sleeping for 30s..." - sleep 30 - ;; -esac diff --git a/scripts/test.sh b/scripts/test.sh index 6a5c998e..cd593b1a 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -72,11 +72,6 @@ EOF conda list fi - -# 2020/09/15: Running conda update switches from pypy to cpython. Not sure why -# echo "***** Run conda update *****" -# conda update --all -y - echo "***** Python path *****" python -c "import sys; print(sys.executable)" python -c "import sys; assert 'miniforge' in sys.executable"