From 5aec0ef30b63be679f12bcb202ba953ea0e43c45 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 16 Sep 2021 15:37:50 -0700 Subject: [PATCH 1/4] Backport PR #43613: CI: Add back CircleCI for ARM64 --- .circleci/config.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000000000..dc357101e79fd --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,21 @@ +version: 2.1 + +jobs: + test-arm: + machine: + image: ubuntu-2004:202101-01 + resource_class: arm.medium + environment: + ENV_FILE: ci/deps/circle-38-arm64.yaml + PYTEST_WORKERS: auto + PATTERN: "not slow and not network and not clipboard and not arm_slow" + PYTEST_TARGET: "pandas" + steps: + - checkout + - run: ci/setup_env.sh + - run: PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH ci/run_tests.sh + +workflows: + test: + jobs: + - test-arm From bd2cec37c90eb56e0ba4755a84ce8fa1ab112ba6 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 16 Sep 2021 17:06:53 -0700 Subject: [PATCH 2/4] Adjust file names for 1.3.x --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dc357101e79fd..777c2548ab589 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: image: ubuntu-2004:202101-01 resource_class: arm.medium environment: - ENV_FILE: ci/deps/circle-38-arm64.yaml + ENV_FILE: ci/deps/circle-37-arm64.yaml PYTEST_WORKERS: auto PATTERN: "not slow and not network and not clipboard and not arm_slow" PYTEST_TARGET: "pandas" From 0b9b328c38481f62c674e2f1c62f99f3350f6591 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 16 Sep 2021 19:42:35 -0700 Subject: [PATCH 3/4] Update test_numeric.py --- pandas/tests/indexes/numeric/test_numeric.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandas/tests/indexes/numeric/test_numeric.py b/pandas/tests/indexes/numeric/test_numeric.py index 9747167296be7..5811b34bbe2e9 100644 --- a/pandas/tests/indexes/numeric/test_numeric.py +++ b/pandas/tests/indexes/numeric/test_numeric.py @@ -4,7 +4,6 @@ from pandas._libs.tslibs import Timestamp from pandas.compat import ( is_platform_arm, - is_platform_mac, ) import pandas as pd @@ -536,7 +535,7 @@ def test_constructor(self, dtype): tm.assert_index_equal(res, idx) @pytest.mark.xfail( - not (is_platform_arm() and is_platform_mac()), + not is_platform_arm(), reason="https://github.com/numpy/numpy/issues/19146", ) def test_constructor_does_not_cast_to_float(self): From d30661cc586fbb8dd9ea0100d9f333f9e598b40f Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 16 Sep 2021 20:24:51 -0700 Subject: [PATCH 4/4] Update test_numeric.py --- pandas/tests/indexes/numeric/test_numeric.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandas/tests/indexes/numeric/test_numeric.py b/pandas/tests/indexes/numeric/test_numeric.py index 5811b34bbe2e9..456c199d05ee2 100644 --- a/pandas/tests/indexes/numeric/test_numeric.py +++ b/pandas/tests/indexes/numeric/test_numeric.py @@ -2,9 +2,7 @@ import pytest from pandas._libs.tslibs import Timestamp -from pandas.compat import ( - is_platform_arm, -) +from pandas.compat import is_platform_arm import pandas as pd from pandas import (