diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c1eb9ea..8028435c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + os: ['ubuntu-latest', 'macos-14', 'windows-latest'] python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: @@ -40,9 +40,6 @@ jobs: sudo apt-get update sudo apt-get install graphviz graphviz-dev - - if: matrix.os == 'macos-latest' - run: brew install graphviz - # Unit, integration, and end-to-end tests. - name: Run unit tests and doctests. diff --git a/tests/test_dag_command.py b/tests/test_dag_command.py index ef05c82b..b87f5f71 100644 --- a/tests/test_dag_command.py +++ b/tests/test_dag_command.py @@ -16,10 +16,10 @@ else: _IS_PYGRAPHVIZ_INSTALLED = True -# Test should run always on remote except on Windows and locally only with the package -# installed. +# Test should run always on remote except on Windows and MacOS with M1 and locally only +# with the package installed. _TEST_SHOULD_RUN = _IS_PYGRAPHVIZ_INSTALLED or ( - os.environ.get("CI") and sys.platform != "win32" + os.environ.get("CI") and sys.platform not in ("win32", "darwin") ) _GRAPH_LAYOUTS = ["neato", "dot", "fdp", "sfdp", "twopi", "circo"] _TEST_FORMATS = ["dot", "pdf", "png", "jpeg", "svg"] diff --git a/tox.ini b/tox.ini index b3e06a80..c92ba5f0 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ package = editable [testenv:test] extras = test deps = - pygraphviz;platform_system != "Windows" + pygraphviz;platform_system == "Linux" commands = pytest --nbmake {posargs}