https://github.com/python/cpython/commit/060d846f436027c0169fc8e2d3a0a7b9bc9afee8
commit: 060d846f436027c0169fc8e2d3a0a7b9bc9afee8
branch: 3.13
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: ambv <luk...@langa.pl>
date: 2024-06-03T18:15:37+02:00
summary:
[3.13] Use Cirrus M1 macOS runners for CI (GH-119979) (GH-119986)
(cherry picked from commit 6acb32fac3511c1d5500cac66f1d6397dcdab835)
Co-authored-by: Łukasz Langa <luk...@langa.pl>
Co-authored-by: Ee Durbin <e...@python.org>
files:
M .github/workflows/build.yml
M Lib/test/test_pyrepl/test_unix_console.py
M Lib/test/test_pyrepl/test_windows_console.py
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d14d17a5e088b6..57c58d7ff1d6d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -199,8 +199,8 @@ jobs:
uses: ./.github/workflows/reusable-macos.yml
with:
config_hash: ${{ needs.check_source.outputs.config_hash }}
- # macos-14 is M1, macos-13 is Intel
- os-matrix: '["macos-14", "macos-13"]'
+ # Cirrus is M1, macos-13 is default GHA Intel
+ os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-13"]'
build_macos_free_threading:
name: 'macOS (free-threading)'
@@ -210,8 +210,8 @@ jobs:
with:
config_hash: ${{ needs.check_source.outputs.config_hash }}
free-threading: true
- # macos-14-large is Intel with 12 cores (most parallelism)
- os-matrix: '["macos-14"]'
+ # Cirrus is M1
+ os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma"]'
build_ubuntu:
name: 'Ubuntu'
diff --git a/Lib/test/test_pyrepl/test_unix_console.py
b/Lib/test/test_pyrepl/test_unix_console.py
index d0b98f17ade094..e3bbabcb0089fb 100644
--- a/Lib/test/test_pyrepl/test_unix_console.py
+++ b/Lib/test/test_pyrepl/test_unix_console.py
@@ -6,12 +6,14 @@
from unittest.mock import MagicMock, call, patch, ANY
from .support import handle_all_events, code_to_events
+
try:
from _pyrepl.console import Event
from _pyrepl.unix_console import UnixConsole
except ImportError:
pass
+
def unix_console(events, **kwargs):
console = UnixConsole()
console.get_event = MagicMock(side_effect=events)
@@ -138,7 +140,6 @@ def test_wrap(self, _os_write):
_os_write.assert_any_call(ANY, b"4")
con.restore()
-
def test_cursor_left(self, _os_write):
code = "1"
events = itertools.chain(
diff --git a/Lib/test/test_pyrepl/test_windows_console.py
b/Lib/test/test_pyrepl/test_windows_console.py
index e52a54d31fb5d8..4a3b2baf64a944 100644
--- a/Lib/test/test_pyrepl/test_windows_console.py
+++ b/Lib/test/test_pyrepl/test_windows_console.py
@@ -1,7 +1,7 @@
import sys
import unittest
-if sys.platform != 'win32':
+if sys.platform != "win32":
raise unittest.SkipTest("test only relevant on win32")
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
