Switched from Archiconda to Miniforge

pandas-dev · Mar 11, 2020 · 5f498d5 · 5f498d5
1 parent 9cf01fa
commit 5f498d5
Show file tree

Hide file tree

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

diff --git a/ci/deps/travis-37-aarch64.yaml → ci/deps/travis-37-arm64.yaml b/ci/deps/travis-37-aarch64.yaml → ci/deps/travis-37-arm64.yaml
@@ -2,7 +2,6 @@ name: pandas-dev
 channels:
   - defaults
   - conda-forge
-  - c3i_test
 dependencies:
   - python=3.7.*
 

diff --git a/ci/run_tests.sh b/ci/run_tests.sh
@@ -20,11 +20,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then
     XVFB="xvfb-run "
 fi
 
-if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
-    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
+PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n auto --dist=loadfile -s --strict --durations=10 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas"
 
 echo $PYTEST_CMD
 sh -c "$PYTEST_CMD"

diff --git a/ci/setup_env.sh b/ci/setup_env.sh
@@ -37,6 +37,7 @@ else
 fi
 
 if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
+  apt-get update && apt-get install xvfb;
   CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.2-1/Miniforge3-4.8.2-1-Linux-aarch64.sh";
 else
   CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh";