Skip to content

Commit 7130418

Browse files
committed
change: Switched MacOS Intel architecture to new tag
1 parent 7f66ce4 commit 7130418

File tree

5 files changed

+30
-14
lines changed

5 files changed

+30
-14
lines changed

.github/workflows/build-wheels-platforms.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
os: # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
2525
- windows-latest
2626
- ubuntu-latest
27-
- macos-13 # MacOS x86_64
27+
- macos-15-intel # MacOS x86_64
2828
- macos-latest # MacOS arm64 (M1)
2929
- ubuntu-24.04-arm
3030
- linux-armv7-self-hosted
@@ -66,23 +66,24 @@ jobs:
6666
python-version: ${{ matrix.python-version }}
6767

6868

69-
- name: Get Python version
69+
- name: Install build dependencies
7070
run: |
71-
python --version
7271
python -m pip install --upgrade pip
73-
pip show pip setuptools setuptools-scm
72+
python -m pip install -r build_requirements.txt
7473
7574
76-
- name: Install build dependencies
77-
run: python -m pip install -r build_requirements.txt
75+
- name: Get Tools versions
76+
run: |
77+
python --version
78+
pip show pip setuptools
7879
7980
8081
- name: Install additional OS dependencies - Ubuntu
8182
if: matrix.os == 'ubuntu-latest'
8283
run: os_dependencies/ubuntu.sh
8384

8485
- name: Install additional OS dependencies - MacOS
85-
if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
86+
if: matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel'
8687
run: os_dependencies/macos.sh
8788

8889
- name: Install additional OS dependencies - Linux ARM
@@ -97,7 +98,7 @@ jobs:
9798
- name: Build wheels for IDF
9899
if: matrix.os != 'windows-latest'
99100
run: |
100-
# Rust directory needs to be included for Linux ARM7
101+
# Source Rust environment for self-hosted ARMv7 runner
101102
if [ "${{ matrix.os }}" = "linux-armv7-self-hosted" ]; then
102103
. $HOME/.cargo/env
103104
fi
@@ -106,8 +107,7 @@ jobs:
106107
107108
- name: Build wheels for IDF - Windows
108109
if: matrix.os == 'windows-latest'
109-
run: |
110-
python build_wheels.py
110+
run: python build_wheels.py
111111

112112
- name: Upload artifacts of downloaded_wheels directory
113113
uses: actions/upload-artifact@v4

.github/workflows/build-wheels-python-dependent.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
os:
2323
- windows-latest
2424
- ubuntu-latest
25-
- macos-13 # MacOS x86_64
25+
- macos-15-intel # MacOS x86_64
2626
- macos-latest # MacOS arm64 (M1)
2727
- ubuntu-24.04-arm
2828
- linux-armv7-self-hosted
@@ -34,7 +34,7 @@ jobs:
3434
- python-version: ${{ inputs.oldest_supported_python }}
3535
os: ubuntu-latest
3636
- python-version: ${{ inputs.oldest_supported_python }}
37-
os: macos-13
37+
os: macos-15-intel
3838
- python-version: ${{ inputs.oldest_supported_python }}
3939
os: macos-latest
4040
- python-version: ${{ inputs.oldest_supported_python }}
@@ -71,7 +71,7 @@ jobs:
7171
run: os_dependencies/ubuntu.sh
7272

7373
- name: Install additional OS dependencies - MacOS
74-
if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
74+
if: matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel'
7575
run: os_dependencies/macos.sh
7676

7777

@@ -96,7 +96,7 @@ jobs:
9696
- name: Build Python dependent wheels for ${{ matrix.python-version }}
9797
if: matrix.os != 'windows-latest'
9898
run: |
99-
# Rust directory needs to be included for Linux ARM7
99+
# Source Rust environment for self-hosted ARMv7 runner
100100
if [ "${{ matrix.os }}" = "linux-armv7-self-hosted" ]; then
101101
export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
102102
. $HOME/.cargo/env

build_requirements.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,10 @@ boto3~=1.34.4
1111
# https://github.com/espressif/esp-idf/commit/3bad4348d0597597e4079878aa5de1871403e0b2
1212
setuptools<75.8.1; python_version < "3.10"
1313
wheel<0.45.0; python_version < "3.10"
14+
15+
# Common build dependencies for packages built with --no-build-isolation
16+
cffi>=1.15.0 # Required by packages with C extensions (e.g., xcffib, cryptography)
17+
setuptools-scm>=6.2,<9 # Required by packages using git-based versioning
18+
setuptools-rust>=1.5.0,<2 # Required by packages with Rust extensions (e.g., cryptography, bleak, rpds-py)
19+
cython>=0.29.0 # Required by packages using Cython (e.g., coverage, pyyaml speedups)
20+
poetry-core>=1.0.0 # Required as build backend for packages using Poetry

build_wheels.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ def build_wheels(requirements: set, local_links: bool = True) -> dict:
288288
"https://pypi.org/simple/",
289289
"--wheel-dir",
290290
f"{dir}",
291+
"--no-cache-dir",
292+
"--no-build-isolation",
291293
f"{argument}",
292294
f"{arg_param}",
293295
],
@@ -314,6 +316,8 @@ def build_wheels(requirements: set, local_links: bool = True) -> dict:
314316
"https://pypi.org/simple/",
315317
"--wheel-dir",
316318
f"{dir}",
319+
"--no-cache-dir",
320+
"--no-build-isolation",
317321
],
318322
stdout=subprocess.PIPE,
319323
stderr=subprocess.PIPE,

exclude_list.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,8 @@
108108
platform: ['darwin']
109109
version: '==10.3.2'
110110
python: '>=3.14'
111+
112+
# mcp is not supported by Python older than 3.10
113+
# https://pypi.org/project/mcp/
114+
- package_name: 'mcp'
115+
python: ['==3.8', '==3.9']

0 commit comments

Comments
 (0)