Skip to content

Commit d48c583

Browse files
Backport PR #46118: CI: Align MacOS dependencies with other builds (#46158)
Co-authored-by: Matthew Roeschke <emailformattr@gmail.com>
1 parent 4bd3cb4 commit d48c583

File tree

6 files changed

+11
-112
lines changed

6 files changed

+11
-112
lines changed

azure-pipelines.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ variables:
2222
PANDAS_CI: 1
2323

2424
jobs:
25-
# Mac and Linux use the same template
2625
- template: ci/azure/posix.yml
2726
parameters:
2827
name: macOS

ci/azure/posix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ jobs:
1010
strategy:
1111
matrix:
1212
py38:
13-
ENV_FILE: ci/deps/azure-macos-38.yaml
13+
ENV_FILE: ci/deps/actions-38.yaml
1414
CONDA_PY: "38"
1515

1616
py39:
17-
ENV_FILE: ci/deps/azure-macos-39.yaml
17+
ENV_FILE: ci/deps/actions-39.yaml
1818
CONDA_PY: "39"
1919

2020
py310:
21-
ENV_FILE: ci/deps/azure-macos-310.yaml
21+
ENV_FILE: ci/deps/actions-310.yaml
2222
CONDA_PY: "310"
2323

2424
steps:

ci/deps/azure-macos-310.yaml

Lines changed: 0 additions & 36 deletions
This file was deleted.

ci/deps/azure-macos-38.yaml

Lines changed: 0 additions & 36 deletions
This file was deleted.

ci/deps/azure-macos-39.yaml

Lines changed: 0 additions & 36 deletions
This file was deleted.

ci/setup_env.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,14 @@ mamba install -n pandas-dev 'setuptools<60'
7373
echo "conda list -n pandas-dev"
7474
conda list -n pandas-dev
7575

76+
# From pyarrow on MacOS
77+
# ImportError: 2): Library not loaded: @rpath/libssl.1.1.dylib
78+
# Referenced from: /Users/runner/miniconda3/envs/pandas-dev/lib/libthrift.0.13.0.dylib
79+
# Reason: image not found
80+
if [[ "$(uname)" == 'Darwin' ]]; then
81+
echo "Update pyarrow for pyarrow on MacOS"
82+
conda install -n pandas-dev -c conda-forge --no-update-deps pyarrow=6
83+
fi
7684

7785
if [[ "$BITS32" == "yes" ]]; then
7886
# activate 32-bit compiler

0 commit comments

Comments
 (0)