Merge pull request #25 from isuruf/pypy

Miniforge with PyPy

.travis.yml

@@ -7,23 +7,49 @@ matrix:
         - ARCH=aarch64
         - DOCKER_ARCH=arm64v8
         - DOCKERIMAGE=condaforge/linux-anvil-aarch64
+        - MINIFORGE_NAME="Miniforge3"
 
     - os: linux
       env:
         - ARCH=x86_64
         - DOCKER_ARCH=amd64
         - DOCKERIMAGE=condaforge/linux-anvil-comp7
+        - MINIFORGE_NAME="Miniforge3"
 
     - os: linux
       env:
         - ARCH=ppc64le
         - DOCKER_ARCH=ppc64le
         - DOCKERIMAGE=condaforge/linux-anvil-ppc64le
+        - MINIFORGE_NAME="Miniforge3"
+
+    - os: linux
+      env:
+        - ARCH=aarch64
+        - DOCKER_ARCH=arm64v8
+        - DOCKERIMAGE=condaforge/linux-anvil-aarch64
+        - MINIFORGE_NAME="Miniforge-pypy3"
+
+    - os: linux
+      env:
+        - ARCH=x86_64
+        - DOCKER_ARCH=amd64
+        - DOCKERIMAGE=condaforge/linux-anvil-comp7
+        - MINIFORGE_NAME="Miniforge-pypy3"
+
+    - os: linux
+      env:
+        - ARCH=ppc64le
+        - DOCKER_ARCH=ppc64le
+        - DOCKERIMAGE=condaforge/linux-anvil-ppc64le
+        - MINIFORGE_NAME="Miniforge-pypy3"
 
 script:
+  - if [[ "$TRAVIS_TAG" != "" ]]; then export MINIFORGE_VERSION=$TRAVIS_TAG; fi
   - bash build_miniforge.sh
   # Copy for latest release
-  - cp build/Miniforge3-*-Linux-$ARCH.sh build/Miniforge3-Linux-$ARCH.sh
+  - cp build/$MINIFORGE_NAME-*-Linux-$ARCH.sh build/$MINIFORGE_NAME-Linux-$ARCH.sh
+  - ls -alh build
 
 deploy:
   provider: releases

Miniforge3/construct.yaml

@@ -1,5 +1,8 @@
-name: Miniforge3
-version: 4.8.2-1
+{% set version = os.environ.get("MINIFORGE_VERSION", "4.8.3-0") %}
+{% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}
+
+name: {{ name }}
+version: {{ version }}
 
 channels:
   - https://conda.anaconda.org/conda-forge
@@ -8,7 +11,11 @@ write_condarc: True
 license_file: ../LICENSE
 
 specs:
+{% if name == "Miniforge3" %}
   - python 3.7.*
-  - conda 4.8.2
+{% elif name == "Miniforge-pypy3" %}
+  - python 3.6.* *_pypy
+{% endif %}
+  - conda {{ version.split("-")[0] }}
   - pip
   - bzip2

build_miniforge.sh

@@ -15,7 +15,7 @@ echo "============= Enable QEMU ============="
 docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
 
 echo "============= Build the installer ============="
-docker run --rm -ti -v $(pwd):/construct $DOCKERIMAGE /construct/scripts/build.sh
+docker run --rm -ti -v $(pwd):/construct -e MINIFORGE_VERSION -e MINIFORGE_NAME $DOCKERIMAGE /construct/scripts/build.sh
 
 echo "============= Download QEMU static binaries ============="
 bash scripts/get_qemu.sh

scripts/build.sh

@@ -12,6 +12,7 @@ cd $CONSTRUCT_ROOT
 # See https://github.com/conda-forge/miniforge/pull/2#issuecomment-554394343
 echo "***** Install constructor *****"
 conda install -y "constructor>=3.0.1"
+pip install git+git://github.com/isuruf/constructor@801191768821#egg=constructor --force --no-deps
 conda list
 
 echo "***** Make temp directory *****"