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 5, 2024
1 parent 0819f62 commit 7a92b3e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,17 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-latest, macos-11, macos-latest, windows-2019, windows-latest]
# macos-13 is the latest release on x86, and macos-14 is arm64
os: [ubuntu-20.04, ubuntu-latest, macos-11, 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 @@ -26,11 +26,14 @@
# which are needed for the main editor to function.
#
"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)',
# ipykernel has to be < v6 for macOS 10.13 compatibility (v6 depends on
# debugpy package), v5.5.6 resolves issue ipython/ipykernel#759.
# Full line can be removed after Mu v1.3 release as PyQt6 drops old macOS.
Expand Down

0 comments on commit 7a92b3e

Please sign in to comment.