Merge pull request #56 from isuruf/micromamba

Use micromamba for osx-arm64
conda-forge · Oct 29, 2020 · 7eaff09 · 7eaff09
2 parents 44a4c42 + 61f6d3d
commit 7eaff09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml
@@ -1,4 +1,4 @@
-{% set version = os.environ.get("MINIFORGE_VERSION", "4.8.5-0") %}
+{% set version = os.environ.get("MINIFORGE_VERSION", "4.9.0-0") %}
 {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}
 
 name: {{ name }}
@@ -20,7 +20,8 @@ license_file: ../LICENSE
 
 specs:
 {% if name == "Miniforge3" %}
-  - python 3.8.*
+  - python 3.8.*    # [not (osx and arm64)]
+  - python 3.9.*    # [osx and arm64]
 {% elif name == "Miniforge-pypy3" %}
   - python 3.6.* *_pypy
 {% endif %}

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -12,7 +12,7 @@ cd $CONSTRUCT_ROOT
 # See https://github.com/conda/constructor
 echo "***** Install constructor *****"
 conda install -y "constructor>=3.1.0" jinja2
-pip install git+git://github.com/conda/constructor@926707a34def8cb51be640b98842180260e7fa0a#egg=constructor --force --no-deps
+pip install git+git://github.com/conda/constructor@8c0121d3b81846de42973b52f13135f0ffeaddda#egg=constructor --force --no-deps
 conda list
 
 echo "***** Make temp directory *****"
@@ -26,8 +26,8 @@ ls -al $TEMP_DIR
 
 if [[ $(uname -r) != "$ARCH" ]]; then
     if [[ "$ARCH" == "arm64" ]]; then
-        # Use a x86_64 binary here since we don't have a standalone conda for arm64 yet.
-        EXTRA_CONSTRUCTOR_ARGS="$EXTRA_CONSTRUCTOR_ARGS --conda-exe $CONDA_PREFIX/standalone_conda/conda.exe --platform osx-$ARCH"
+        CONDA_SUBDIR=osx-arm64 conda create -n micromamba micromamba=0.6.5 -c https://conda-web.anaconda.org/conda-forge --yes
+        EXTRA_CONSTRUCTOR_ARGS="$EXTRA_CONSTRUCTOR_ARGS --conda-exe $CONDA_PREFIX/envs/micromamba/bin/micromamba --platform osx-arm64"
     fi
 fi