diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml index 0e0a8e849..f7b978fca 100644 --- a/.github/workflows/test-upstream.yml +++ b/.github/workflows/test-upstream.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest] python: ["3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v2 @@ -41,10 +41,10 @@ jobs: - name: Build the Rust DataFusion bindings run: | python setup.py build install - - name: Install hive testing dependencies for Linux + - name: Install hive testing dependencies if: matrix.os == 'ubuntu-latest' run: | - mamba install -c conda-forge sasl>=0.3.1 + mamba install -c conda-forge "sasl>=0.3.1" docker pull bde2020/hive:2.3.2-postgresql-metastore docker pull bde2020/hive-metastore-postgresql:2.3.0 - name: Install upstream dev Dask / dask-ml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1072478ba..a20ee2b14 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest] python: ["3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v2 @@ -58,10 +58,10 @@ jobs: - name: Build the Rust DataFusion bindings run: | python setup.py build install - - name: Install hive testing dependencies for Linux + - name: Install hive testing dependencies if: matrix.os == 'ubuntu-latest' run: | - mamba install -c conda-forge sasl>=0.3.1 + mamba install -c conda-forge "sasl>=0.3.1" docker pull bde2020/hive:2.3.2-postgresql-metastore docker pull bde2020/hive-metastore-postgresql:2.3.0 - name: Optionally install upstream dev Dask / dask-ml diff --git a/tests/integration/test_hive.py b/tests/integration/test_hive.py index 131150326..48be5df94 100644 --- a/tests/integration/test_hive.py +++ b/tests/integration/test_hive.py @@ -10,7 +10,8 @@ from tests.utils import assert_eq pytestmark = pytest.mark.skipif( - sys.platform == "win32", reason="hive testing not supported on Windows" + sys.platform in ("win32", "darwin"), + reason="hive testing not supported on Windows/macOS", ) docker = pytest.importorskip("docker") sqlalchemy = pytest.importorskip("sqlalchemy") diff --git a/tests/integration/test_postgres.py b/tests/integration/test_postgres.py index 67a639c73..05a249c77 100644 --- a/tests/integration/test_postgres.py +++ b/tests/integration/test_postgres.py @@ -3,7 +3,8 @@ import pytest pytestmark = pytest.mark.skipif( - sys.platform == "win32", reason="postgres testing not supported on Windows" + sys.platform in ("win32", "darwin"), + reason="hive testing not supported on Windows/macOS", ) docker = pytest.importorskip("docker") sqlalchemy = pytest.importorskip("sqlalchemy")