Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions .github/workflows/build-native-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,15 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set up Python 3.10
- name: Patch /usr/local
run: |
sudo mkdir /tmp/local
sudo mv -f /usr/local/* /tmp/local/

- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'

- name: Show environment
run: |
Expand All @@ -121,6 +126,10 @@ jobs:
run: |
python3 -m relenv build --no-pretty --python=${{ matrix.version }}

- name: Unpatch /usr/local
run: |
sudo mv -f /tmp/local/* /usr/local/

- name: Verify Build
run: |
python3 -m nox -e tests -- tests/test_verify_build.py
Expand Down Expand Up @@ -162,10 +171,15 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set up Python 3.10
- name: Patch include
run: |
sudo mkdir /tmp/local
sudo mv -f /usr/local/* /tmp/local/

- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'

- name: Show environment
run: |
Expand Down
13 changes: 7 additions & 6 deletions tests/test_verify_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import json
import os
import pathlib
import platform
import shutil
import subprocess
import sys
Expand Down Expand Up @@ -440,11 +439,7 @@ def test_pip_install_pyzmq(pipexec, pyzmq_version, build_version, arch, build):
],
env=env,
)
if (
pyzmq_version == "26.2.0"
and sys.platform == "darwin"
and platform.processor() == "arm"
):
if pyzmq_version == "26.2.0" and sys.platform == "darwin":
pytest.xfail(f"{pyzmq_version} does not install on m1 mac")
if pyzmq_version == "26.2.0" and sys.platform == "darwin":
env[
Expand Down Expand Up @@ -1676,3 +1671,9 @@ def test_no_openssl_binary(rockycontainer, pipexec):

errors = proc.stderr.decode()
assert "legacy provider failed to load" not in errors


@pytest.mark.skip_unless_on_darwin
def test_darwin_python_linking(pipexec, pyexec, build, minor_version):
proc = subprocess.run(["otool", "-L", str(pyexec)], capture_output=True, check=True)
assert "/usr/local/opt" not in proc.stdout.decode()