Skip to content

Commit 5f498d5

Browse files
committed
Switched from Archiconda to Miniforge
1 parent 9cf01fa commit 5f498d5

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ cache:
1111
directories:
1212
- $HOME/.cache # cython cache
1313
- $HOME/.ccache # compiler cache
14+
1415
env:
1516
global:
1617
# create a github personal access token

ci/deps/travis-37-aarch64.yaml renamed to ci/deps/travis-37-arm64.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge
5-
- c3i_test
65
dependencies:
76
- python=3.7.*
87

ci/run_tests.sh

+1-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then
2020
XVFB="xvfb-run "
2121
fi
2222

23-
if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
24-
PYTEST_CMD="pytest -m \"$PATTERN\" --durations=10 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas";
25-
else
26-
PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n auto --dist=loadfile -s --strict --durations=10 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas"
27-
fi
23+
PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n auto --dist=loadfile -s --strict --durations=10 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas"
2824

2925
echo $PYTEST_CMD
3026
sh -c "$PYTEST_CMD"

ci/setup_env.sh

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ else
3737
fi
3838

3939
if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
40+
apt-get update && apt-get install xvfb;
4041
CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.2-1/Miniforge3-4.8.2-1-Linux-aarch64.sh";
4142
else
4243
CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh";

0 commit comments

Comments
 (0)