Merge pull request #333 from isuruf/updates

Update to conda 4.14, cpython 3.10, pypy 3.9
conda-forge · Aug 23, 2022 · c565edd · c565edd
2 parents 256e408 + 09655cf
commit c565edd
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,6 +21,18 @@ jobs:
             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
@@ -184,6 +196,7 @@ jobs:
         fi
         if [[ "$OS_NAME" == "Windows" ]]; then
           export EXT=exe
+          echo "WINDIR:$WINDIR"
           source /c/Miniconda3/Scripts/activate;
           source build_miniforge_win.sh;
         fi
@@ -196,7 +209,7 @@ jobs:
       shell: bash
 
     - name: Upload miniforge to Github artifact
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+      if: always()
       uses: actions/upload-artifact@v3
       with:
         path: build/${{ matrix.MINIFORGE_NAME }}-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}*

diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml
@@ -1,4 +1,4 @@
-{% set version = os.environ.get("MINIFORGE_VERSION", "4.13.0-0") %}
+{% set version = os.environ.get("MINIFORGE_VERSION", "4.14.0-0") %}
 {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}
 
 name: {{ name }}
@@ -21,13 +21,13 @@ license_file: ../LICENSE
 
 specs:
 {% if name.endswith("pypy3") %}
-  - python 3.7.* *_pypy
+  - python 3.9.* *_pypy
 {% else %}
-  - python 3.9.*
+  - python 3.10.*
 {% endif %}
 
 {% if name.startswith("Mambaforge") %}
-  - mamba 0.24.0
+  - mamba 0.25.0
 {% endif %}
   - conda {{ version.split("-")[0] }}
 

diff --git a/README.md b/README.md
@@ -50,6 +50,7 @@ Latest installers with PyPy 3.7 in the base environment:
 | Linux   | aarch64 (arm64)       | [Miniforge-pypy3-Linux-aarch64](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge-pypy3-Linux-aarch64.sh) |
 | Linux   | ppc64le (POWER8/9)    | [Miniforge-pypy3-Linux-ppc64le](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge-pypy3-Linux-ppc64le.sh) |
 | OS X    | x86_64                | [Miniforge-pypy3-MacOSX-x86_64](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge-pypy3-MacOSX-x86_64.sh) |
+| Windows | x86_64                | [Miniforge-pypy3-Windows-x86_64](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge-pypy3-Windows-x86_64.exe) |
 
 #### Mambaforge
 
@@ -75,6 +76,7 @@ Latest installers with Mamba and PyPy 3.7 in the base environment:
 | Linux   | aarch64 (arm64)       | [Mambaforge-pypy3-Linux-aarch64](https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-pypy3-Linux-aarch64.sh) |
 | Linux   | ppc64le (POWER8/9)    | [Mambaforge-pypy3-Linux-ppc64le](https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-pypy3-Linux-ppc64le.sh) |
 | OS X    | x86_64                | [Mambaforge-pypy3-MacOSX-x86_64](https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-pypy3-MacOSX-x86_64.sh) |
+| Windows | x86_64                | [Mambaforge-pypy3-Windows-x86_64](https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-pypy3-Windows-x86_64.exe) |
 
 ## Install
 

diff --git a/build_miniforge.sh b/build_miniforge.sh
@@ -32,9 +32,6 @@ docker run --rm -v "$(pwd):/construct" \
   -e CONSTRUCT_ROOT -e MINIFORGE_VERSION -e MINIFORGE_NAME -e TARGET_PLATFORM \
   "${DOCKERIMAGE}" /construct/scripts/build.sh
 
-# copy the installer for latest
-cp "build/${MINIFORGE_NAME}-"*"-${OS_NAME}-${ARCH}.${EXT}" "build/${MINIFORGE_NAME}-${OS_NAME}-${ARCH}.${EXT}"
-
 echo "============= Test the installer ============="
 for TEST_IMAGE_NAME in "ubuntu:21.10" "ubuntu:20.04" "ubuntu:18.04" "ubuntu:16.04" "centos:7" "debian:bullseye" "debian:buster"; do
   echo "============= Test installer on ${TEST_IMAGE_NAME} ============="

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -78,3 +78,8 @@ mv "${HASH_PATH}" "${CONSTRUCT_ROOT}/build/"
 
 echo "***** Done: Building Miniforge installer *****"
 cd "${CONSTRUCT_ROOT}"
+
+# copy the installer for latest
+if [[ "${MINIFORGE_NAME:-}" != "" && "${OS_NAME:-}" != "" && "${ARCH:-}" != "" ]]; then
+  cp "${CONSTRUCT_ROOT}/build/${MINIFORGE_NAME}-"*"-${OS_NAME}-${ARCH}.${EXT}" "${CONSTRUCT_ROOT}/build/${MINIFORGE_NAME}-${OS_NAME}-${ARCH}.${EXT}"
+fi
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -26,6 +26,8 @@ if [[ "$(uname)" == MINGW* ]]; then
   cmd.exe /c install.bat
 
   echo "***** Setup conda *****"
+  # Workaround a conda bug where it uses Unix style separators, but MinGW doesn't understand them
+  export PATH=$CONDA_PATH/Library/bin:$PATH
   # shellcheck disable=SC1091
   source "${CONDA_PATH}/Scripts/activate"
   conda.exe config --set show_channel_urls true