From f3eeb1b166aabe3730ea91019888e1fce71eeec6 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 30 Jul 2024 13:11:49 -0700 Subject: [PATCH 1/5] CI: Use Miniforge over Mambaforge --- .circleci/config.yml | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 745b04a5159f7..caacca35b23f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,13 +17,13 @@ jobs: name: Install Environment and Run Tests shell: /bin/bash -exuo pipefail command: | - MAMBA_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Mambaforge-24.3.0-0-Linux-aarch64.sh" - wget -q $MAMBA_URL -O minimamba.sh - chmod +x minimamba.sh - MAMBA_DIR="$HOME/miniconda3" - rm -rf $MAMBA_DIR - ./minimamba.sh -b -p $MAMBA_DIR - export PATH=$MAMBA_DIR/bin:$PATH + MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" + wget -q $MINI_URL -O Miniforge3.sh + chmod +x Miniforge3.sh + MINI_DIR="$HOME/miniconda3" + rm -rf $MINI_DIR + ./Miniforge3.sh -b -p $MINI_DIR + export PATH=$MINI_DIR/bin:$PATH conda info -a conda env create -q -n pandas-dev -f $ENV_FILE conda list -n pandas-dev @@ -97,21 +97,16 @@ jobs: - run: name: Install Anaconda Client & Upload Wheels + shell: /bin/bash -exuo pipefail command: | - echo "Install Mambaforge" - MAMBA_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Mambaforge-24.3.0-0-Linux-aarch64.sh" - echo "Downloading $MAMBA_URL" - wget -q $MAMBA_URL -O minimamba.sh - chmod +x minimamba.sh - - MAMBA_DIR="$HOME/miniconda3" - rm -rf $MAMBA_DIR - ./minimamba.sh -b -p $MAMBA_DIR - - export PATH=$MAMBA_DIR/bin:$PATH - - mamba install -y -c conda-forge anaconda-client - + MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" + wget -q $MINI_URL -O Miniforge3.sh + chmod +x Miniforge3.sh + MINI_DIR="$HOME/miniconda3" + rm -rf $MINI_DIR + ./Miniforge3.sh -b -p $MINI_DIR + export PATH=$MINI_DIR/bin:$PATH + conda install -y -c conda-forge anaconda-client source ci/upload_wheels.sh set_upload_vars upload_wheels From c61a6d42f4f6e52f3e06b061c28c011945b2c093 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 30 Jul 2024 13:32:09 -0700 Subject: [PATCH 2/5] unbound variable --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index caacca35b23f4..205fe29441892 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,10 +17,10 @@ jobs: name: Install Environment and Run Tests shell: /bin/bash -exuo pipefail command: | - MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" + $MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" wget -q $MINI_URL -O Miniforge3.sh chmod +x Miniforge3.sh - MINI_DIR="$HOME/miniconda3" + $MINI_DIR="$HOME/miniconda3" rm -rf $MINI_DIR ./Miniforge3.sh -b -p $MINI_DIR export PATH=$MINI_DIR/bin:$PATH @@ -99,10 +99,10 @@ jobs: name: Install Anaconda Client & Upload Wheels shell: /bin/bash -exuo pipefail command: | - MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" + $MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" wget -q $MINI_URL -O Miniforge3.sh chmod +x Miniforge3.sh - MINI_DIR="$HOME/miniconda3" + $MINI_DIR="$HOME/miniconda3" rm -rf $MINI_DIR ./Miniforge3.sh -b -p $MINI_DIR export PATH=$MINI_DIR/bin:$PATH From 3a41e3e18df2b2b39ed1aa8cdb6c70c6fc6969c9 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:08:01 -0700 Subject: [PATCH 3/5] Unbound variable --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 205fe29441892..caacca35b23f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,10 +17,10 @@ jobs: name: Install Environment and Run Tests shell: /bin/bash -exuo pipefail command: | - $MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" + MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" wget -q $MINI_URL -O Miniforge3.sh chmod +x Miniforge3.sh - $MINI_DIR="$HOME/miniconda3" + MINI_DIR="$HOME/miniconda3" rm -rf $MINI_DIR ./Miniforge3.sh -b -p $MINI_DIR export PATH=$MINI_DIR/bin:$PATH @@ -99,10 +99,10 @@ jobs: name: Install Anaconda Client & Upload Wheels shell: /bin/bash -exuo pipefail command: | - $MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" + MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" wget -q $MINI_URL -O Miniforge3.sh chmod +x Miniforge3.sh - $MINI_DIR="$HOME/miniconda3" + MINI_DIR="$HOME/miniconda3" rm -rf $MINI_DIR ./Miniforge3.sh -b -p $MINI_DIR export PATH=$MINI_DIR/bin:$PATH From 36184ee9d97af4d51cd67bc2113a4067841d1eee Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:28:24 -0700 Subject: [PATCH 4/5] Remove unset flag --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index caacca35b23f4..ea0b0a5d63463 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: - checkout - run: name: Install Environment and Run Tests - shell: /bin/bash -exuo pipefail + shell: /bin/bash -exo pipefail command: | MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" wget -q $MINI_URL -O Miniforge3.sh @@ -97,7 +97,7 @@ jobs: - run: name: Install Anaconda Client & Upload Wheels - shell: /bin/bash -exuo pipefail + shell: /bin/bash -exo pipefail command: | MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" wget -q $MINI_URL -O Miniforge3.sh From 27ed69e5b0405477409328fe542f240a9a50fc75 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:21:16 -0700 Subject: [PATCH 5/5] Missing 3 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ea0b0a5d63463..7533899f90470 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ jobs: name: Install Environment and Run Tests shell: /bin/bash -exo pipefail command: | - MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" + MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge3-24.3.0-0-Linux-aarch64.sh" wget -q $MINI_URL -O Miniforge3.sh chmod +x Miniforge3.sh MINI_DIR="$HOME/miniconda3" @@ -99,7 +99,7 @@ jobs: name: Install Anaconda Client & Upload Wheels shell: /bin/bash -exo pipefail command: | - MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge-24.3.0-0-Linux-aarch64.sh" + MINI_URL="https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Miniforge3-24.3.0-0-Linux-aarch64.sh" wget -q $MINI_URL -O Miniforge3.sh chmod +x Miniforge3.sh MINI_DIR="$HOME/miniconda3"