diff --git a/.github/workflows/windows.yml b/.github/workflows/macos-windows.yml similarity index 70% rename from .github/workflows/windows.yml rename to .github/workflows/macos-windows.yml index 6f267357554a3..560a421ec74ec 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/macos-windows.yml @@ -1,4 +1,4 @@ -name: Windows +name: Windows-MacOS on: push: @@ -21,18 +21,20 @@ env: jobs: pytest: - runs-on: windows-latest defaults: run: shell: bash -el {0} timeout-minutes: 90 strategy: matrix: + os: [macos-latest, windows-latest] env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml] fail-fast: false + runs-on: ${{ matrix.os }} + name: ${{ format('{0} {1}', matrix.os, matrix.env_file) }} concurrency: # https://github.community/t/concurrecy-not-work-for-push/183068/7 - group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-windows + group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.os }} cancel-in-progress: true steps: @@ -47,10 +49,17 @@ jobs: mamba-version: "*" channels: conda-forge activate-environment: pandas-dev - channel-priority: strict + channel-priority: ${{ matrix.os == 'macos-latest' && 'flexible' || 'strict' }} environment-file: ci/deps/${{ matrix.env_file }} use-only-tar-bz2: true + # 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 + - name: Upgrade pyarrow on MacOS + run: conda install -n pandas-dev -c conda-forge --no-update-deps pyarrow=6 + if: ${{ matrix.os == 'macos-latest' }} + - name: Build Pandas uses: ./.github/actions/build_pandas diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0b2a9f5b2b0cd..0c6195ff6924b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,11 +22,6 @@ variables: PANDAS_CI: 1 jobs: -- template: ci/azure/posix.yml - parameters: - name: macOS - vmImage: macOS-10.15 - - job: py38_32bit pool: vmImage: ubuntu-18.04 diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml deleted file mode 100644 index df1d5049be33d..0000000000000 --- a/ci/azure/posix.yml +++ /dev/null @@ -1,50 +0,0 @@ -parameters: - name: '' - vmImage: '' - -jobs: -- job: ${{ parameters.name }} - timeoutInMinutes: 90 - pool: - vmImage: ${{ parameters.vmImage }} - strategy: - matrix: - py38: - ENV_FILE: ci/deps/actions-38.yaml - CONDA_PY: "38" - - py39: - ENV_FILE: ci/deps/actions-39.yaml - CONDA_PY: "39" - - py310: - ENV_FILE: ci/deps/actions-310.yaml - CONDA_PY: "310" - - steps: - - script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin' - displayName: 'Set conda path' - - - script: rm /usr/local/miniconda/pkgs/cache/*.json - displayName: 'Workaround for mamba-org/mamba#488' - - - script: ci/setup_env.sh - displayName: 'Setup environment and build pandas' - - - script: | - conda run -n pandas-dev --no-capture-output ci/run_tests.sh - displayName: 'Test' - - - script: | - pushd /tmp - conda run -n pandas-dev python -c "import pandas; pandas.show_versions()" - popd - displayName: 'Build versions' - - - task: PublishTestResults@2 - condition: succeededOrFailed() - inputs: - failTaskOnFailedTests: true - testResultsFiles: 'test-data.xml' - testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }} - displayName: 'Publish test results' diff --git a/ci/setup_env.sh b/ci/setup_env.sh index a85767eb6f1b4..483353cfcb3cd 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -73,15 +73,6 @@ mamba install -n pandas-dev 'setuptools<60' echo "conda list -n pandas-dev" conda list -n pandas-dev -# 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 export CONDA_BUILD=1