Skip to content

Commit 269b57b

Browse files
ossdev07odidev
authored andcommitted
Switched from Archiconda to Miniforge
1 parent 7784fbd commit 269b57b

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

.travis.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ cache:
1111
directories:
1212
- $HOME/.cache # cython cache
1313
- $HOME/.ccache # compiler cache
14+
1415
env:
1516
global:
17+
# Variable for test workers
18+
- PYTEST_WORKERS="auto"
1619
# create a github personal access token
1720
# cd pandas-dev/pandas
1821
# travis encrypt 'PANDAS_GH_TOKEN=personal_access_token' -r pandas-dev/pandas
@@ -34,7 +37,7 @@ matrix:
3437

3538
- arch: arm64
3639
env:
37-
- JOB="3.7" ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"
40+
- JOB="3.7" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"
3841

3942
- env:
4043
- JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"

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 $PYTEST_WORKERS --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

+4-3
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ else
3737
fi
3838

3939
if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
40-
CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.2-1/Miniforge3-4.8.2-1-Linux-aarch64.sh";
40+
sudo apt-get -y install xvfb
41+
CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.2-1/Miniforge3-4.8.2-1-Linux-aarch64.sh"
4142
else
42-
CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh";
43+
CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh"
4344
fi
44-
wget -q $CONDA_URL -O miniconda.sh;
45+
wget -q $CONDA_URL -O miniconda.sh
4546
chmod +x miniconda.sh
4647

4748
# Installation path is required for ARM64 platform as miniforge script installs in path $HOME/miniforge3.

pandas/_libs/src/ujson/lib/ultrajson.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ typedef uint32_t JSUINT32;
108108

109109
#define FASTCALL_MSVC
110110

111-
#if !defined __x86_64__
111+
#if !defined __x86_64__ && !defined __aarch64__
112112
#define FASTCALL_ATTR __attribute__((fastcall))
113113
#else
114114
#define FASTCALL_ATTR

0 commit comments

Comments
 (0)