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.

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

Use MacOS runner with M1. #558

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions tests/test_dag_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package = editable
[testenv:test]
extras = test
deps =
pygraphviz;platform_system != "Windows"
pygraphviz;platform_system == "Linux"
commands =
pytest --nbmake {posargs}

Expand Down
Loading