From 3a4245201d2c87f9ae5522c4dad5e9ec59f2a88a Mon Sep 17 00:00:00 2001 From: Roy Willy Haug Date: Tue, 3 Oct 2023 13:00:30 +0200 Subject: [PATCH 1/3] Also run github actions tests on macos --- .github/workflows/run_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index 77ac1649..00972fa7 100644 --- a/.github/workflows/run_tests.yaml +++ b/.github/workflows/run_tests.yaml @@ -13,7 +13,7 @@ jobs: strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest] permissions: contents: read id-token: write From bdb1b1a9cb24d841308e8357bd3d41f54b9963cb Mon Sep 17 00:00:00 2001 From: Roy Willy Haug Date: Tue, 3 Oct 2023 13:07:17 +0200 Subject: [PATCH 2/3] Do not import openvds on macos --- tests/test_explorer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_explorer.py b/tests/test_explorer.py index 6dafc429..da45f39a 100644 --- a/tests/test_explorer.py +++ b/tests/test_explorer.py @@ -1,5 +1,7 @@ """Tests explorer""" -import openvds +import sys +if not sys.platform.startswith('darwin'): + import openvds import logging import json from pathlib import Path From 5ab0298787d03d31f3676e993a9d0a60b6a5c0f1 Mon Sep 17 00:00:00 2001 From: Roy Willy Haug Date: Tue, 3 Oct 2023 13:12:57 +0200 Subject: [PATCH 3/3] Do not test seismic cubes on macos --- tests/test_explorer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_explorer.py b/tests/test_explorer.py index da45f39a..0450781e 100644 --- a/tests/test_explorer.py +++ b/tests/test_explorer.py @@ -269,6 +269,7 @@ def test_get_case_by_uuid(explorer: Explorer, case_uuid: str, case_name: str): assert case.uuid == case_uuid assert case.name == case_name +@pytest.mark.skipif(sys.platform.startswith('darwin'), reason="do not run OpenVDS SEGYImport on mac os") def test_seismic_case_by_uuid(explorer: Explorer, seismic_case_uuid: str): """Test that explorer returns openvds compatible cubes for seismic case""" case = explorer.get_case_by_uuid(seismic_case_uuid)