diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2a911fd5b5a0c..a37ea3eb89167 100644 --- 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 index 6d33cd7e5f5d9..be76e1366f5ca 100644 --- 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 deleted file mode 100644 index 312fac8091db6..0000000000000 --- a/ci/deps/azure-macos-310.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: pandas-dev -channels: - - defaults - - conda-forge -dependencies: - - python=3.10 - - # tools - - cython>=0.29.24 - - pytest>=6.0 - - pytest-xdist>=1.31 - - hypothesis>=5.5.3 - - pytest-azurepipelines - - # pandas dependencies - - beautifulsoup4 - - bottleneck - - html5lib - - jinja2 - - lxml - - matplotlib - - nomkl - - numexpr - - numpy - - openpyxl - - pyarrow - - pyreadstat - - pytables - - python-dateutil==2.8.1 - - pytz - - pyxlsb - - xarray - - xlrd - - xlsxwriter - - xlwt - - zstandard diff --git a/ci/deps/azure-macos-38.yaml b/ci/deps/azure-macos-38.yaml deleted file mode 100644 index 422aa86c57fc7..0000000000000 --- a/ci/deps/azure-macos-38.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: pandas-dev -channels: - - defaults - - conda-forge -dependencies: - - python=3.8 - - # tools - - cython>=0.29.24 - - pytest>=6.0 - - pytest-xdist>=1.31 - - hypothesis>=5.5.3 - - pytest-azurepipelines - - # pandas dependencies - - beautifulsoup4 - - bottleneck - - html5lib - - jinja2 - - lxml - - matplotlib=3.3.2 - - nomkl - - numexpr - - numpy=1.18.5 - - openpyxl - - pyarrow=1.0.1 - - pyreadstat - - pytables - - python-dateutil==2.8.1 - - pytz - - pyxlsb - - xarray - - xlrd - - xlsxwriter - - xlwt - - zstandard diff --git a/ci/deps/azure-macos-39.yaml b/ci/deps/azure-macos-39.yaml deleted file mode 100644 index 140d67796452c..0000000000000 --- a/ci/deps/azure-macos-39.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: pandas-dev -channels: - - defaults - - conda-forge -dependencies: - - python=3.9 - - # tools - - cython>=0.29.24 - - pytest>=6.0 - - pytest-xdist>=1.31 - - hypothesis>=5.5.3 - - pytest-azurepipelines - - # pandas dependencies - - beautifulsoup4 - - bottleneck - - html5lib - - jinja2 - - lxml - - matplotlib=3.3.2 - - nomkl - - numexpr - - numpy=1.21.3 - - openpyxl - - pyarrow=4 - - pyreadstat - - pytables - - python-dateutil==2.8.1 - - pytz - - pyxlsb - - xarray - - xlrd - - xlsxwriter - - xlwt - - zstandard diff --git a/ci/setup_env.sh b/ci/setup_env.sh index d51ff98b241a6..bb9656063db3f 100755 --- 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