From c8aff5f1b7f4a15050cdddbe372a691cdfca4534 Mon Sep 17 00:00:00 2001 From: Anton Petrov Date: Sat, 9 Jan 2021 11:13:28 +0300 Subject: [PATCH 1/3] Added Miniforge3-4.9.2 Added Miniforge3-4.9.2 support for all platforms, including arm64 in macOS for Apple M1 SoC --- .../share/python-build/miniforge3-4.9.2 | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 plugins/python-build/share/python-build/miniforge3-4.9.2 diff --git a/plugins/python-build/share/python-build/miniforge3-4.9.2 b/plugins/python-build/share/python-build/miniforge3-4.9.2 new file mode 100644 index 00000000..9d63f531 --- /dev/null +++ b/plugins/python-build/share/python-build/miniforge3-4.9.2 @@ -0,0 +1,22 @@ +case "$(anaconda_architecture 2>/dev/null || true)" in +"Linux-ppc64le" ) + install_script "Miniforge3-4.9.2-4-Linux-ppc64le" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-4/Miniforge3-4.9.2-4-Linux-ppc64le.sh#d226016334a28fc99912c640fcb52074" "miniconda" verify_py38 + ;; +"Linux-x86_64" ) + install_script "Miniforge3-4.9.2-4-Linux-x86_64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-4/Miniforge3-4.9.2-4-Linux-x86_64.sh#cdfeb2264de9c77bd9dc4ce8f7dfbad4" "miniconda" verify_py38 + ;; +"MacOSX-arm64" ) + install_script "Miniforge3-4.9.2-4-MacOSX-arm64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-4/Miniforge3-4.9.2-4-MacOSX-arm64.sh#c5f52aa3bf6b5d56469138d4cdcd9079" "miniconda" verify_py38 + ;; +"MacOSX-x86_64" ) + install_script "Miniforge3-4.9.2-4-MacOSX-x86_64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-4/Miniforge3-4.9.2-4-MacOSX-x86_64.sh#23337bfd70a8099395b1a5c42ac725fd" "miniconda" verify_py39 + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": The binary distribution of Miniforge is not available for $(anaconda_architecture 2>/dev/null || true)." + echo + } >&2 + exit 1 + ;; +esac From ebd4d982277310569c2a8e7d12f373208464fdab Mon Sep 17 00:00:00 2001 From: Anton Petrov Date: Sat, 9 Jan 2021 20:07:03 +0300 Subject: [PATCH 2/3] Update miniforge3-4.9.2 Bump version to 4.9.2-5 --- plugins/python-build/share/python-build/miniforge3-4.9.2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/python-build/share/python-build/miniforge3-4.9.2 b/plugins/python-build/share/python-build/miniforge3-4.9.2 index 9d63f531..e8940d4f 100644 --- a/plugins/python-build/share/python-build/miniforge3-4.9.2 +++ b/plugins/python-build/share/python-build/miniforge3-4.9.2 @@ -1,15 +1,15 @@ case "$(anaconda_architecture 2>/dev/null || true)" in "Linux-ppc64le" ) - install_script "Miniforge3-4.9.2-4-Linux-ppc64le" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-4/Miniforge3-4.9.2-4-Linux-ppc64le.sh#d226016334a28fc99912c640fcb52074" "miniconda" verify_py38 + install_script "Miniforge3-4.9.2-5-Linux-ppc64le" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-5/Miniforge3-4.9.2-5-Linux-ppc64le.sh#825b3e5f39f0bdb825323ea23af24ba4" "miniconda" verify_py38 ;; "Linux-x86_64" ) - install_script "Miniforge3-4.9.2-4-Linux-x86_64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-4/Miniforge3-4.9.2-4-Linux-x86_64.sh#cdfeb2264de9c77bd9dc4ce8f7dfbad4" "miniconda" verify_py38 + install_script "Miniforge3-4.9.2-5-Linux-x86_64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-5/Miniforge3-4.9.2-5-Linux-x86_64.sh#73ea193f82d8f3b558b9c2186a147bcf" "miniconda" verify_py38 ;; "MacOSX-arm64" ) - install_script "Miniforge3-4.9.2-4-MacOSX-arm64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-4/Miniforge3-4.9.2-4-MacOSX-arm64.sh#c5f52aa3bf6b5d56469138d4cdcd9079" "miniconda" verify_py38 + install_script "Miniforge3-4.9.2-5-MacOSX-arm64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-5/Miniforge3-4.9.2-5-MacOSX-arm64.sh#cf309b725c8a0b4448e4ee922703bf00" "miniconda" verify_py38 ;; "MacOSX-x86_64" ) - install_script "Miniforge3-4.9.2-4-MacOSX-x86_64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-4/Miniforge3-4.9.2-4-MacOSX-x86_64.sh#23337bfd70a8099395b1a5c42ac725fd" "miniconda" verify_py39 + install_script "Miniforge3-4.9.2-5-MacOSX-x86_64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-5/Miniforge3-4.9.2-5-MacOSX-x86_64.sh#e66d62e8872bc1548af54063cab7b72e" "miniconda" verify_py39 ;; * ) { echo From c5d205025483c6e5605755330749e37f9c817540 Mon Sep 17 00:00:00 2001 From: Anton Petrov Date: Sun, 10 Jan 2021 09:37:42 +0300 Subject: [PATCH 3/3] Update miniforge3-4.9.2 OS X arm64 will be installed with Python 3.9 only. Other versions bundled with python 3.8. Miniforge does not have as wide a choice of python versions as miniconda. The Python version is specific only to the base environment. --- plugins/python-build/share/python-build/miniforge3-4.9.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/python-build/share/python-build/miniforge3-4.9.2 b/plugins/python-build/share/python-build/miniforge3-4.9.2 index e8940d4f..05ad0a9f 100644 --- a/plugins/python-build/share/python-build/miniforge3-4.9.2 +++ b/plugins/python-build/share/python-build/miniforge3-4.9.2 @@ -6,10 +6,10 @@ case "$(anaconda_architecture 2>/dev/null || true)" in install_script "Miniforge3-4.9.2-5-Linux-x86_64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-5/Miniforge3-4.9.2-5-Linux-x86_64.sh#73ea193f82d8f3b558b9c2186a147bcf" "miniconda" verify_py38 ;; "MacOSX-arm64" ) - install_script "Miniforge3-4.9.2-5-MacOSX-arm64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-5/Miniforge3-4.9.2-5-MacOSX-arm64.sh#cf309b725c8a0b4448e4ee922703bf00" "miniconda" verify_py38 + install_script "Miniforge3-4.9.2-5-MacOSX-arm64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-5/Miniforge3-4.9.2-5-MacOSX-arm64.sh#cf309b725c8a0b4448e4ee922703bf00" "miniconda" verify_py39 ;; "MacOSX-x86_64" ) - install_script "Miniforge3-4.9.2-5-MacOSX-x86_64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-5/Miniforge3-4.9.2-5-MacOSX-x86_64.sh#e66d62e8872bc1548af54063cab7b72e" "miniconda" verify_py39 + install_script "Miniforge3-4.9.2-5-MacOSX-x86_64" "https://github.com/conda-forge/miniforge/releases/download/4.9.2-5/Miniforge3-4.9.2-5-MacOSX-x86_64.sh#e66d62e8872bc1548af54063cab7b72e" "miniconda" verify_py38 ;; * ) { echo