Skip to content

CI: Align MacOS dependencies with other builds #46118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 26, 2022
Merged

CI: Align MacOS dependencies with other builds #46118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e829ef
CI: Align MacOS dependencies with other builds
mroeschke Feb 22, 2022
8f3c0d4
fix file names
mroeschke Feb 22, 2022
4d9bd70
Try installing libthrift
mroeschke Feb 23, 2022
9a6be6e
Do it in setup_env.sh
mroeschke Feb 23, 2022
d729caf
Merge remote-tracking branch 'upstream/main' into ci/mac_deps_align
mroeschke Feb 23, 2022
5a3ac81
Upgrade pyarrow
mroeschke Feb 23, 2022
0a18080
Merge remote-tracking branch 'upstream/main' into ci/mac_deps_align
mroeschke Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ variables:
PANDAS_CI: 1

jobs:
# Mac and Linux use the same template
- template: ci/azure/posix.yml
parameters:
name: macOS
Expand Down
6 changes: 3 additions & 3 deletions ci/azure/posix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
strategy:
matrix:
py38:
ENV_FILE: ci/deps/azure-macos-38.yaml
ENV_FILE: ci/deps/actions-38.yaml
CONDA_PY: "38"

py39:
ENV_FILE: ci/deps/azure-macos-39.yaml
ENV_FILE: ci/deps/actions-39.yaml
CONDA_PY: "39"

py310:
ENV_FILE: ci/deps/azure-macos-310.yaml
ENV_FILE: ci/deps/actions-310.yaml
CONDA_PY: "310"

steps:
Expand Down
36 changes: 0 additions & 36 deletions ci/deps/azure-macos-310.yaml
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions ci/deps/azure-macos-38.yaml
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions ci/deps/azure-macos-39.yaml
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions ci/setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ echo
echo "mamba env create -q --file=${ENV_FILE}"
time mamba env create -q --file="${ENV_FILE}"

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

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