Skip to content

Commit

Permalink
Support for macOS arm64.
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosperate committed Feb 17, 2025
1 parent 2420e0e commit 993778f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,17 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
# macos-13 is x86 and macos-14 is arm64
os: [ubuntu-20.04, ubuntu-latest, macos-13, windows-2019, windows-latest]
# macos-13 is the last release on x86, and macos-14 is arm64
os: [ubuntu-20.04, ubuntu-latest, macos-13, macos-14, windows-2019, windows-latest]
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
exclude:
# These Python versions are not available in macOS arm64
- os: macos-14
python-version: '3.7'
- os: macos-14
python-version: '3.8'
- os: macos-14
python-version: '3.9'
fail-fast: false
runs-on: ${{ matrix.os }}
name: Test Py ${{ matrix.python-version }} - ${{ matrix.os }}
Expand Down
9 changes: 6 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@
# "PyQt5-sip<=12.13.0"
# + ';"arm" not in platform_machine and "aarch" not in platform_machine',
"PyQt5==5.15.10"
+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
+ '; sys_platform != "linux" '
+ 'or ("arm" not in platform_machine and "aarch" not in platform_machine)',
"QScintilla==2.14.1"
+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
+ '; sys_platform != "linux" '
+ 'or ("arm" not in platform_machine and "aarch" not in platform_machine)',
"PyQtChart==5.15.6"
+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
+ '; sys_platform != "linux" '
+ 'or ("arm" not in platform_machine and "aarch" not in platform_machine)',
# FIXME: Needed for qtconsole, this is the latest wheel in armv7l for
# Python 3.7 (Buster), otherwise it tries to build from source and fails.
"pyzmq<=26.0.3",
Expand Down

0 comments on commit 993778f

Please sign in to comment.