From 66a466c73b761fa7f0f5a71a9652e8cffbc017a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Rodr=C3=ADguez-Guerra?= Date: Thu, 17 Dec 2020 01:35:49 +0100 Subject: [PATCH 1/2] Create mambaforge optimized for Colab --- .github/workflows/ci.yml | 243 ++++++++++++++++++++------------------ Miniforge3/construct.yaml | 6 +- 2 files changed, 128 insertions(+), 121 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 909ccbda..2eeb7082 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,128 +9,135 @@ jobs: fail-fast: false matrix: include: - - os: windows-latest - ARCH: x86_64 - MINIFORGE_NAME: "Miniforge3" - OS_NAME: "Windows" - - - os: windows-latest - ARCH: x86_64 - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "Windows" - - - os: macos-latest - ARCH: arm64 - MINIFORGE_NAME: "Miniforge3" - OS_NAME: "MacOSX" - - - os: macos-latest - ARCH: arm64 - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "MacOSX" - - - os: macos-latest - ARCH: x86_64 - MINIFORGE_NAME: "Miniforge-pypy3" - OS_NAME: "MacOSX" - - - os: macos-latest - ARCH: x86_64 - MINIFORGE_NAME: "Mambaforge-pypy3" - OS_NAME: "MacOSX" - - - os: macos-latest - ARCH: x86_64 - MINIFORGE_NAME: "Miniforge3" - OS_NAME: "MacOSX" - - - os: macos-latest - ARCH: x86_64 - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "MacOSX" - - - os: ubuntu-latest - ARCH: aarch64 - DOCKER_ARCH: arm64v8 - DOCKERIMAGE: condaforge/linux-anvil-aarch64 - MINIFORGE_NAME: "Miniforge3" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: aarch64 - DOCKER_ARCH: arm64v8 - DOCKERIMAGE: condaforge/linux-anvil-aarch64 - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: x86_64 - DOCKER_ARCH: amd64 - DOCKERIMAGE: condaforge/linux-anvil-comp7 - MINIFORGE_NAME: "Miniforge3" - OS_NAME: "Linux" + # - os: windows-latest + # ARCH: x86_64 + # MINIFORGE_NAME: "Miniforge3" + # OS_NAME: "Windows" + + # - os: windows-latest + # ARCH: x86_64 + # MINIFORGE_NAME: "Mambaforge" + # OS_NAME: "Windows" + + # - os: macos-latest + # ARCH: arm64 + # MINIFORGE_NAME: "Miniforge3" + # OS_NAME: "MacOSX" + + # - os: macos-latest + # ARCH: arm64 + # MINIFORGE_NAME: "Mambaforge" + # OS_NAME: "MacOSX" + + # - os: macos-latest + # ARCH: x86_64 + # MINIFORGE_NAME: "Miniforge-pypy3" + # OS_NAME: "MacOSX" + + # - os: macos-latest + # ARCH: x86_64 + # MINIFORGE_NAME: "Mambaforge-pypy3" + # OS_NAME: "MacOSX" + + # - os: macos-latest + # ARCH: x86_64 + # MINIFORGE_NAME: "Miniforge3" + # OS_NAME: "MacOSX" + + # - os: macos-latest + # ARCH: x86_64 + # MINIFORGE_NAME: "Mambaforge" + # OS_NAME: "MacOSX" + + # - os: ubuntu-latest + # ARCH: aarch64 + # DOCKER_ARCH: arm64v8 + # DOCKERIMAGE: condaforge/linux-anvil-aarch64 + # MINIFORGE_NAME: "Miniforge3" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: aarch64 + # DOCKER_ARCH: arm64v8 + # DOCKERIMAGE: condaforge/linux-anvil-aarch64 + # MINIFORGE_NAME: "Mambaforge" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: x86_64 + # DOCKER_ARCH: amd64 + # DOCKERIMAGE: condaforge/linux-anvil-comp7 + # MINIFORGE_NAME: "Miniforge3" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: x86_64 + # DOCKER_ARCH: amd64 + # DOCKERIMAGE: condaforge/linux-anvil-comp7 + # MINIFORGE_NAME: "Mambaforge" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: ppc64le + # DOCKER_ARCH: ppc64le + # DOCKERIMAGE: condaforge/linux-anvil-ppc64le + # MINIFORGE_NAME: "Miniforge3" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: ppc64le + # DOCKER_ARCH: ppc64le + # DOCKERIMAGE: condaforge/linux-anvil-ppc64le + # MINIFORGE_NAME: "Mambaforge" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: aarch64 + # DOCKER_ARCH: arm64v8 + # DOCKERIMAGE: condaforge/linux-anvil-aarch64 + # MINIFORGE_NAME: "Miniforge-pypy3" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: aarch64 + # DOCKER_ARCH: arm64v8 + # DOCKERIMAGE: condaforge/linux-anvil-aarch64 + # MINIFORGE_NAME: "Mambaforge-pypy3" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: x86_64 + # DOCKER_ARCH: amd64 + # DOCKERIMAGE: condaforge/linux-anvil-comp7 + # MINIFORGE_NAME: "Miniforge-pypy3" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: x86_64 + # DOCKER_ARCH: amd64 + # DOCKERIMAGE: condaforge/linux-anvil-comp7 + # MINIFORGE_NAME: "Mambaforge-pypy3" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: ppc64le + # DOCKER_ARCH: ppc64le + # DOCKERIMAGE: condaforge/linux-anvil-ppc64le + # MINIFORGE_NAME: "Miniforge-pypy3" + # OS_NAME: "Linux" + + # - os: ubuntu-latest + # ARCH: ppc64le + # DOCKER_ARCH: ppc64le + # DOCKERIMAGE: condaforge/linux-anvil-ppc64le + # MINIFORGE_NAME: "Mambaforge-pypy3" + # OS_NAME: "Linux" - os: ubuntu-latest ARCH: x86_64 DOCKER_ARCH: amd64 DOCKERIMAGE: condaforge/linux-anvil-comp7 - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: ppc64le - DOCKER_ARCH: ppc64le - DOCKERIMAGE: condaforge/linux-anvil-ppc64le - MINIFORGE_NAME: "Miniforge3" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: ppc64le - DOCKER_ARCH: ppc64le - DOCKERIMAGE: condaforge/linux-anvil-ppc64le - MINIFORGE_NAME: "Mambaforge" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: aarch64 - DOCKER_ARCH: arm64v8 - DOCKERIMAGE: condaforge/linux-anvil-aarch64 - MINIFORGE_NAME: "Miniforge-pypy3" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: aarch64 - DOCKER_ARCH: arm64v8 - DOCKERIMAGE: condaforge/linux-anvil-aarch64 - MINIFORGE_NAME: "Mambaforge-pypy3" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: x86_64 - DOCKER_ARCH: amd64 - DOCKERIMAGE: condaforge/linux-anvil-comp7 - MINIFORGE_NAME: "Miniforge-pypy3" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: x86_64 - DOCKER_ARCH: amd64 - DOCKERIMAGE: condaforge/linux-anvil-comp7 - MINIFORGE_NAME: "Mambaforge-pypy3" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: ppc64le - DOCKER_ARCH: ppc64le - DOCKERIMAGE: condaforge/linux-anvil-ppc64le - MINIFORGE_NAME: "Miniforge-pypy3" - OS_NAME: "Linux" - - - os: ubuntu-latest - ARCH: ppc64le - DOCKER_ARCH: ppc64le - DOCKERIMAGE: condaforge/linux-anvil-ppc64le - MINIFORGE_NAME: "Mambaforge-pypy3" + MINIFORGE_NAME: "Mambaforge-colab" OS_NAME: "Linux" steps: @@ -179,4 +186,4 @@ jobs: tag: ${{ github.ref }} overwrite: true file_glob: true - if: startsWith(github.ref, 'refs/tags/') + # if: startsWith(github.ref, 'refs/tags/') diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 2d920411..778cd0d4 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -3,7 +3,7 @@ name: {{ name }} version: {{ version }} -company: conda-forge +company: jaimergp channels: # specifying the channel with the full URL adds two channels @@ -21,15 +21,15 @@ license_file: ../LICENSE specs: {% if name.endswith("pypy3") %} - python 3.6.* *_pypy +{% elif name.endswith("colab") %} + - python 3.6.* {% else %} - python 3.8.* # [not (osx and arm64)] - python 3.9.* # [osx and arm64] {% endif %} - {% if name.startswith("Mambaforge") %} - mamba {% endif %} - conda {{ version.split("-")[0] }} - - pip - bzip2 From d451865d2ff491ad28088d40e860b00c6d7be2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Rodr=C3=ADguez-Guerra?= Date: Sun, 20 Dec 2020 15:09:14 +0100 Subject: [PATCH 2/2] Add Miniforge too --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2eeb7082..35b417d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,6 +140,13 @@ jobs: MINIFORGE_NAME: "Mambaforge-colab" OS_NAME: "Linux" + - os: ubuntu-latest + ARCH: x86_64 + DOCKER_ARCH: amd64 + DOCKERIMAGE: condaforge/linux-anvil-comp7 + MINIFORGE_NAME: "Miniforge-colab" + OS_NAME: "Linux" + steps: - name: Checkout code uses: actions/checkout@v2 @@ -186,4 +193,4 @@ jobs: tag: ${{ github.ref }} overwrite: true file_glob: true - # if: startsWith(github.ref, 'refs/tags/') + if: startsWith(github.ref, 'refs/tags/')