Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CirrusCI fixes (#1786)

Browse Source 
* Fix executable name, that doesn't always exist on windows

* Use the `python3` executable on macOS Cirrus

* Homebrew changed where it puts the python binaries

* Update examples to match new config
This commit is contained in:
Joe Rickerby
2024-03-11 20:54:37 +00:00
committed by GitHub
parent 0d8e919dfc
commit f7e1922225
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.cirrus.yml
+5 -7
View File
@@ -1,4 +1,4 @@
only_if: changesInclude('.cirrus.yml') || ($BRANCH == "main" && !changesIncludeOnly('docs/*', '.pre-commit-config.yaml')) only_if: changesInclude('.cirrus.yml') || ($CIRRUS_BRANCH == "main" && !changesIncludeOnly('docs/*', '.pre-commit-config.yaml')) || $CIRRUS_BRANCH =~ 'cirrus.*'
run_tests: &RUN_TESTS run_tests: &RUN_TESTS
install_cibuildwheel_script: install_cibuildwheel_script:
@@ -50,25 +50,23 @@ windows_x86_task:
macos_arm64_task: macos_arm64_task:
macos_instance: macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode image: ghcr.io/cirruslabs/macos-sonoma-xcode
env: env:
PATH: /opt/homebrew/opt/python@3.10/bin:$PATH PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH
install_pre_requirements_script: install_pre_requirements_script:
- brew install python@3.10 - brew install python@3.10
- ln -s python3 /opt/homebrew/opt/python@3.10/bin/python
<<: *RUN_TESTS <<: *RUN_TESTS
macos_arm64_cp38_task: macos_arm64_cp38_task:
macos_instance: macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode image: ghcr.io/cirruslabs/macos-sonoma-xcode
env: env:
PATH: /opt/homebrew/opt/python@3.10/bin:$PATH PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH
PYTEST_ADDOPTS: --run-cp38-universal2 -k 'test_cp38_arm64_testing_universal2_installer or test_arch_auto' PYTEST_ADDOPTS: --run-cp38-universal2 -k 'test_cp38_arm64_testing_universal2_installer or test_arch_auto'
install_pre_requirements_script: install_pre_requirements_script:
- brew install python@3.10 - brew install python@3.10
- ln -s python3 /opt/homebrew/opt/python@3.10/bin/python
- curl -fsSLO https://www.python.org/ftp/python/3.8.10/python-3.8.10-macos11.pkg - curl -fsSLO https://www.python.org/ftp/python/3.8.10/python-3.8.10-macos11.pkg
- sudo installer -pkg python-3.8.10-macos11.pkg -target / - sudo installer -pkg python-3.8.10-macos11.pkg -target /
- rm python-3.8.10-macos11.pkg - rm python-3.8.10-macos11.pkg
examples/cirrus-ci-intel-mac.yml
+2 -3
View File
@@ -10,12 +10,11 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS
macos_task: macos_task:
name: Build macOS x86_64 and arm64 wheels. name: Build macOS x86_64 and arm64 wheels.
macos_instance: macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode image: ghcr.io/cirruslabs/macos-sonoma-xcode
env: env:
PATH: /opt/homebrew/opt/python@3.10/bin:$PATH PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH
CIBW_ARCHS_MACOS: x86_64 arm64 CIBW_ARCHS_MACOS: x86_64 arm64
install_pre_requirements_script: install_pre_requirements_script:
- brew install python@3.10 - brew install python@3.10
- ln -s python3 /opt/homebrew/opt/python@3.10/bin/python
<<: *BUILD_AND_STORE_WHEELS <<: *BUILD_AND_STORE_WHEELS
examples/cirrus-ci-minimal.yml
+2 -3
View File
@@ -50,11 +50,10 @@ windows_x86_task:
macos_arm64_task: macos_arm64_task:
name: Build macOS arm64 wheels. name: Build macOS arm64 wheels.
macos_instance: macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode image: ghcr.io/cirruslabs/macos-sonoma-xcode
env: env:
PATH: /opt/homebrew/opt/python@3.10/bin:$PATH PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH
install_pre_requirements_script: install_pre_requirements_script:
- brew install python@3.10 - brew install python@3.10
- ln -s python3 /opt/homebrew/opt/python@3.10/bin/python
<<: *BUILD_AND_STORE_WHEELS <<: *BUILD_AND_STORE_WHEELS
test/test_from_sdist.py
+1 -1
View File
@@ -69,7 +69,7 @@ def test_simple(tmp_path):
assert os.path.exists('{package}/setup.py') assert os.path.exists('{package}/setup.py')
""", """,
) )
setup_py_assertion_cmd = f'python3 -c "{setup_py_assertion_snippet !s}"' setup_py_assertion_cmd = f'python -c "{setup_py_assertion_snippet !s}"'
# build the wheels from sdist # build the wheels from sdist
actual_wheels = cibuildwheel_from_sdist_run( actual_wheels = cibuildwheel_from_sdist_run(