File tree 6 files changed +13
-11
lines changed
pandas/_libs/src/ujson/lib
6 files changed +13
-11
lines changed Original file line number Diff line number Diff line change @@ -11,8 +11,11 @@ cache:
11
11
directories :
12
12
- $HOME/.cache # cython cache
13
13
- $HOME/.ccache # compiler cache
14
+
14
15
env :
15
16
global :
17
+ # Variable for test workers
18
+ - PYTEST_WORKERS="auto"
16
19
# create a github personal access token
17
20
# cd pandas-dev/pandas
18
21
# travis encrypt 'PANDAS_GH_TOKEN=personal_access_token' -r pandas-dev/pandas
@@ -39,7 +42,7 @@ matrix:
39
42
40
43
- arch : arm64
41
44
env :
42
- - JOB="3.7" ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"
45
+ - JOB="3.7" PYTEST_WORKERS=4 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"
43
46
44
47
- env :
45
48
- 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"
Original file line number Diff line number Diff line change 5
5
pr :
6
6
- master
7
7
8
+ variables :
9
+ PYTEST_WORKERS : auto
10
+
8
11
jobs :
9
12
# Mac and Linux use the same template
10
13
- template : ci/azure/posix.yml
Original file line number Diff line number Diff line change @@ -2,7 +2,6 @@ name: pandas-dev
2
2
channels :
3
3
- defaults
4
4
- conda-forge
5
- - c3i_test
6
5
dependencies :
7
6
- python=3.7.*
8
7
Original file line number Diff line number Diff line change @@ -20,11 +20,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then
20
20
XVFB=" xvfb-run "
21
21
fi
22
22
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"
28
24
29
25
echo $PYTEST_CMD
30
26
sh -c " $PYTEST_CMD "
Original file line number Diff line number Diff line change 42
42
fi
43
43
44
44
if [ " ${TRAVIS_CPU_ARCH} " == " arm64" ]; then
45
- CONDA_URL=" https://github.com/conda-forge/miniforge/releases/download/4.8.2-1/Miniforge3-4.8.2-1-Linux-aarch64.sh" ;
45
+ sudo apt-get -y install xvfb
46
+ CONDA_URL=" https://github.com/conda-forge/miniforge/releases/download/4.8.2-1/Miniforge3-4.8.2-1-Linux-aarch64.sh"
46
47
else
47
- CONDA_URL=" https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS .sh" ;
48
+ CONDA_URL=" https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS .sh"
48
49
fi
49
- wget -q $CONDA_URL -O miniconda.sh;
50
+ wget -q $CONDA_URL -O miniconda.sh
50
51
chmod +x miniconda.sh
51
52
52
53
# Installation path is required for ARM64 platform as miniforge script installs in path $HOME/miniforge3.
Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ typedef uint32_t JSUINT32;
108
108
109
109
#define FASTCALL_MSVC
110
110
111
- #if !defined __x86_64__
111
+ #if !defined __x86_64__ && !defined __aarch64__
112
112
#define FASTCALL_ATTR __attribute__((fastcall))
113
113
#else
114
114
#define FASTCALL_ATTR
You can’t perform that action at this time.
0 commit comments