Python 3.7 -> 3.8 (#50)

* Bump to Python 3.8 * Add Ubuntu 20.04 to build tests * Update construct.yaml * Update README with correct python information * Update construct.yaml * Update test.sh * Update test.sh Co-authored-by: Isuru Fernando <[email protected]> Co-authored-by: Mark Harfouche <[email protected]>
conda-forge · Sep 15, 2020 · 471d5e9 · 471d5e9
1 parent c0fe19f
commit 471d5e9
Show file tree

Hide file tree

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

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ This repository holds a minimal installer for conda specific to conda-forge. It
 Miniforge installers are available here: https://github.com/conda-forge/miniforge/releases
 
 #### Miniforge3
-Latest installers with python 3.7 in the base environment
+Latest installers with python 3.8 in the base environment
 
 - [linux-aarch64](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh) (also called `arm64`)
 - [linux-ppc64le](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-ppc64le.sh) (also called `POWER8/9`)
@@ -46,6 +46,7 @@ After construction on Travis, the installer is tested against a range of distrib
 - Ubuntu 16.04
 - Ubuntu 18.04
 - Ubuntu 19.10
+- Ubuntu 20.04
 
 ## Usage
 

diff --git a/build_miniforge.sh b/build_miniforge.sh
@@ -21,7 +21,7 @@ echo "============= Download QEMU static binaries ============="
 bash scripts/get_qemu.sh
 
 echo "============= Test the installer ============="
-for TEST_IMAGE_NAME in "ubuntu:19.10" "ubuntu:16.04" "ubuntu:18.04" "centos:7" "debian:buster"
+for TEST_IMAGE_NAME in "ubuntu:20.04" "ubuntu:19.10" "ubuntu:16.04" "ubuntu:18.04" "centos:7" "debian:buster"
 do
   echo "============= Test installer on $TEST_IMAGE_NAME ============="
   docker run --rm -ti -v $(pwd):/construct -v $(pwd)/build/qemu/qemu-${ARCH}-static:/usr/bin/qemu-${ARCH}-static ${DOCKER_ARCH}/$TEST_IMAGE_NAME /construct/scripts/test.sh

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -23,8 +23,9 @@ source $CONDA_PATH/bin/activate
 echo "***** Print conda info *****"
 conda info
 
-echo "***** Run conda update *****"
-conda update --all -y
+# 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)"