Skip to content

Commit 854e1aa

Browse files
committed
Support for macOS arm64.
1 parent 55a1615 commit 854e1aa

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

.github/workflows/test.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,17 @@ jobs:
1111
timeout-minutes: 30
1212
strategy:
1313
matrix:
14-
os: [ubuntu-20.04, ubuntu-latest, macos-11, macos-latest, windows-2019, windows-latest]
14+
# macos-13 is the latest release on x86, and macos-14 is arm64
15+
os: [ubuntu-20.04, ubuntu-latest, macos-11, macos-13, macos-14, windows-2019, windows-latest]
1516
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
17+
exclude:
18+
# These Python versions are not available in macOS arm64
19+
- os: macos-14
20+
python-version: '3.7'
21+
- os: macos-14
22+
python-version: '3.8'
23+
- os: macos-14
24+
python-version: '3.9'
1625
fail-fast: false
1726
runs-on: ${{ matrix.os }}
1827
name: Test Py ${{ matrix.python-version }} - ${{ matrix.os }}

setup.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@
2626
# which are needed for the main editor to function.
2727
#
2828
"PyQt5==5.15.10"
29-
+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
29+
+ '; sys_platform != "linux" '
30+
+ 'or ("arm" not in platform_machine and "aarch" not in platform_machine)',
3031
"QScintilla==2.14.1"
31-
+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
32+
+ '; sys_platform != "linux" '
33+
+ 'or ("arm" not in platform_machine and "aarch" not in platform_machine)',
3234
"PyQtChart==5.15.6"
33-
+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
35+
+ '; sys_platform != "linux" '
36+
+ 'or ("arm" not in platform_machine and "aarch" not in platform_machine)',
3437
# ipykernel has to be < v6 for macOS 10.13 compatibility (v6 depends on
3538
# debugpy package), v5.5.6 resolves issue ipython/ipykernel#759.
3639
# Full line can be removed after Mu v1.3 release as PyQt6 drops old macOS.

0 commit comments

Comments
 (0)