Skip to content
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

Add testing for OSX #859

Merged
merged 6 commits into from
Oct 18, 2022
Merged

Add testing for OSX #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3c3d4d
Add testing for OSX
charlesbluca Oct 12, 2022
acf512f
Install hive testing dependencies
charlesbluca Oct 12, 2022
6344265
Try using colima instead of docker for macOS testing
charlesbluca Oct 13, 2022
0bf8234
Disable tests requiring docker for macOS
charlesbluca Oct 13, 2022
82829dc
Style fix
charlesbluca Oct 13, 2022
885ddd0
Remove breakpoint
charlesbluca Oct 13, 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
6 changes: 3 additions & 3 deletions .github/workflows/test-upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/test_hive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/test_postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down