Switched from Archiconda to Miniforge

pandas-dev · Mar 9, 2020 · 887591e · 887591e
1 parent 73c11a8
commit 887591e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,10 +11,6 @@ cache:
   directories:
     - $HOME/.cache # cython cache
     - $HOME/.ccache # compiler cache
-addons:
-  apt:
-    packages:
-    - xvfb
 env:
   global:
     # create a github personal access token

diff --git a/ci/deps/travis-37-aarch64.yaml b/ci/deps/travis-37-aarch64.yaml
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
@@ -21,7 +21,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then
 fi
 
 if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
-    PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" --durations=10 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas";
+    PYTEST_CMD="pytest -m \"$PATTERN\" --durations=10 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas";
 else
     PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n auto --dist=loadfile -s --strict --durations=10 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas"
 fi

diff --git a/ci/setup_env.sh b/ci/setup_env.sh
@@ -37,11 +37,14 @@ else
 fi
 
 if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
-  wget -q "https://github.com/conda-forge/miniforge/releases/download/4.8.2-1/Miniforge3-4.8.2-1-Linux-aarch64.sh" -O miniconda.sh;
+  CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.2-1/Miniforge3-4.8.2-1-Linux-aarch64.sh";
 else
-  wget -q "https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh" -O miniconda.sh;
+  CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh";
 fi
+wget -q $CONDA_URL -O miniconda.sh;
 chmod +x miniconda.sh
+
+# Installation path is required for ARM64 platform as miniforge script installs in path $HOME/miniforge3.
 ./miniconda.sh -b -p $MINICONDA_DIR
 
 export PATH=$MINICONDA_DIR/bin:$PATH