Skip to content

Commit 970517e

Browse files
authored
BLD/CI fix arm64 build #36397 (#36403)
1 parent a607bd7 commit 970517e

20 files changed

+23
-7
lines changed

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ matrix:
4242

4343
- arch: arm64
4444
env:
45-
- JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"
45+
- JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
4646

4747
- env:
4848
- JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"
@@ -58,10 +58,6 @@ matrix:
5858
services:
5959
- mysql
6060
- postgresql
61-
allow_failures:
62-
- arch: arm64
63-
env:
64-
- JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"
6561

6662

6763
before_install:

ci/deps/travis-37-arm64.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: pandas-dev
22
channels:
3-
- defaults
43
- conda-forge
54
dependencies:
65
- python=3.7.*

ci/setup_env.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ else
4242
fi
4343

4444
if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
45+
sudo apt-get update
4546
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"
47+
CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.5-0/Miniforge3-4.8.5-0-Linux-aarch64.sh"
4748
else
4849
CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh"
4950
fi

pandas/conftest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ def pytest_configure(config):
5555
)
5656
config.addinivalue_line("markers", "high_memory: mark a test as a high-memory only")
5757
config.addinivalue_line("markers", "clipboard: mark a pd.read_clipboard test")
58+
config.addinivalue_line(
59+
"markers", "arm_slow: mark a test as slow for arm64 architecture"
60+
)
5861

5962

6063
def pytest_addoption(parser):

pandas/tests/arithmetic/test_datetime64.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,7 @@ class TestDatetime64Arithmetic:
749749
# -------------------------------------------------------------
750750
# Addition/Subtraction of timedelta-like
751751

752+
@pytest.mark.arm_slow
752753
def test_dt64arr_add_timedeltalike_scalar(
753754
self, tz_naive_fixture, two_hours, box_with_array
754755
):

pandas/tests/frame/test_constructors.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,6 +2588,7 @@ def test_to_frame_with_falsey_names(self):
25882588
result = DataFrame(Series(name=0, dtype=object)).dtypes
25892589
tm.assert_series_equal(result, expected)
25902590

2591+
@pytest.mark.arm_slow
25912592
@pytest.mark.parametrize("dtype", [None, "uint8", "category"])
25922593
def test_constructor_range_dtype(self, dtype):
25932594
expected = DataFrame({"A": [0, 1, 2, 3, 4]}, dtype=dtype or "int64")

pandas/tests/groupby/test_groupby_dropna.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ def test_groupby_dropna_multi_index_dataframe_agg(dropna, tuples, outputs):
238238
tm.assert_frame_equal(grouped, expected)
239239

240240

241+
@pytest.mark.arm_slow
241242
@pytest.mark.parametrize(
242243
"datetime1, datetime2",
243244
[

pandas/tests/groupby/transform/test_transform.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@ def test_groupby_cum_skipna(op, skipna, input, exp):
675675
tm.assert_series_equal(expected, result)
676676

677677

678+
@pytest.mark.arm_slow
678679
@pytest.mark.parametrize(
679680
"op, args, targop",
680681
[

pandas/tests/indexes/common.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -906,6 +906,7 @@ def test_is_unique(self):
906906
index_na_dup = index_na.insert(0, np.nan)
907907
assert index_na_dup.is_unique is False
908908

909+
@pytest.mark.arm_slow
909910
def test_engine_reference_cycle(self):
910911
# GH27585
911912
index = self.create_index()

pandas/tests/indexes/multi/test_duplicates.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ def test_duplicated(idx_dup, keep, expected):
241241
tm.assert_numpy_array_equal(result, expected)
242242

243243

244+
@pytest.mark.arm_slow
244245
def test_duplicated_large(keep):
245246
# GH 9125
246247
n, k = 200, 5000

0 commit comments

Comments
 (0)