CI: Align MacOS dependencies with other builds (pandas-dev#46118)

me-kbs · Feb 26, 2022 · d4f48a9 · d4f48a9
1 parent 0aa9614
commit d4f48a9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 112 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -22,7 +22,6 @@ variables:
   PANDAS_CI: 1
 
 jobs:
-# Mac and Linux use the same template
 - template: ci/azure/posix.yml
   parameters:
     name: macOS

diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml
@@ -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:

diff --git a/ci/deps/azure-macos-310.yaml b/ci/deps/azure-macos-310.yaml
diff --git a/ci/deps/azure-macos-38.yaml b/ci/deps/azure-macos-38.yaml
diff --git a/ci/deps/azure-macos-39.yaml b/ci/deps/azure-macos-39.yaml
diff --git a/ci/setup_env.sh b/ci/setup_env.sh
@@ -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