From 5fa45ea6cb81337958290e6fcda969df2bddec23 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Wed, 16 Mar 2022 21:13:36 -0700 Subject: [PATCH 1/4] CI: Use shared dependency file for ARM --- .circleci/config.yml | 4 ++-- ci/deps/circle-38-arm64.yaml | 22 ---------------------- 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 ci/deps/circle-38-arm64.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index a16492b022264..6d35e19e04826 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,9 +6,9 @@ jobs: image: ubuntu-2004:202101-01 resource_class: arm.medium environment: - ENV_FILE: ci/deps/circle-38-arm64.yaml + ENV_FILE: ci/deps/actions-38.yaml PYTEST_WORKERS: auto - PATTERN: "not slow and not network and not clipboard and not arm_slow" + PATTERN: "not single_cpu and not slow and not network and not clipboard and not arm_slow" PYTEST_TARGET: "pandas" PANDAS_CI: "1" steps: diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml deleted file mode 100644 index 7e5b56ebe081f..0000000000000 --- a/ci/deps/circle-38-arm64.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: pandas-dev -channels: - - conda-forge -dependencies: - - python=3.8 - - # tools - - cython>=0.29.24 - - pytest>=6.0 - - pytest-xdist>=1.31 - - hypothesis>=5.5.3 - - pytest-asyncio - - # pandas dependencies - - botocore>=1.11 - - flask - - moto - - numpy - - python-dateutil - - pytz - - zstandard - - pip From 871249717e5efbf1a7bb0f0f58f32b08c6735aa1 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Wed, 16 Mar 2022 21:20:28 -0700 Subject: [PATCH 2/4] Just match deps, no pyreadstats --- ci/deps/circle-38-arm64.yaml | 55 ++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 ci/deps/circle-38-arm64.yaml diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml new file mode 100644 index 0000000000000..f38c401ca49f8 --- /dev/null +++ b/ci/deps/circle-38-arm64.yaml @@ -0,0 +1,55 @@ +name: pandas-dev +channels: + - conda-forge +dependencies: + - python=3.8 + + # test dependencies + - cython=0.29.24 + - pytest>=6.0 + - pytest-cov + - pytest-xdist>=1.31 + - hypothesis>=5.5.3 + - psutil + - pytest-asyncio + - boto3 + + # required dependencies + - python-dateutil + - numpy + - pytz + + # optional dependencies + - beautifulsoup4 + - blosc + - bottleneck + - brotlipy + - fastparquet + - fsspec + - html5lib + - gcsfs + - jinja2 + - lxml + - matplotlib + - numba + - numexpr + - openpyxl + - odfpy + - pandas-gbq + - psycopg2 + - pyarrow + - pymysql + # Not provided on ARM + #- pyreadstat + - pytables + - python-snappy + - pyxlsb + - s3fs + - scipy + - sqlalchemy + - tabulate + - xarray + - xlrd + - xlsxwriter + - xlwt + - zstandard From a080c5d83ed2b89ea473a2bc33f3fd4ff145ee24 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Wed, 16 Mar 2022 21:21:17 -0700 Subject: [PATCH 3/4] Fix dep file --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d35e19e04826..5f4af50ba2f78 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/actions-38.yaml + ENV_FILE: ci/deps/circle-38-arm64.yaml PYTEST_WORKERS: auto PATTERN: "not single_cpu and not slow and not network and not clipboard and not arm_slow" PYTEST_TARGET: "pandas" From 43210d5d5133a17c99f9458602972af877abb5e9 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 17 Mar 2022 11:12:40 -0700 Subject: [PATCH 4/4] No db on circleci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f4af50ba2f78..612552f4eac59 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: environment: ENV_FILE: ci/deps/circle-38-arm64.yaml PYTEST_WORKERS: auto - PATTERN: "not single_cpu and not slow and not network and not clipboard and not arm_slow" + PATTERN: "not single_cpu and not slow and not network and not clipboard and not arm_slow and not db" PYTEST_TARGET: "pandas" PANDAS_CI: "1" steps: