From f7e19222253830775777d4dc7e8cf56aa098d97f Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 11 Mar 2024 20:54:37 +0000 Subject: [PATCH] CirrusCI fixes (#1786) * 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 --- .cirrus.yml | 12 +++++------- examples/cirrus-ci-intel-mac.yml | 5 ++--- examples/cirrus-ci-minimal.yml | 5 ++--- test/test_from_sdist.py | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d3c764de8..8e19e50ff 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -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 install_cibuildwheel_script: @@ -50,25 +50,23 @@ windows_x86_task: macos_arm64_task: macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode + image: ghcr.io/cirruslabs/macos-sonoma-xcode env: - PATH: /opt/homebrew/opt/python@3.10/bin:$PATH + PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH install_pre_requirements_script: - brew install python@3.10 - - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python <<: *RUN_TESTS macos_arm64_cp38_task: macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode + image: ghcr.io/cirruslabs/macos-sonoma-xcode 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' install_pre_requirements_script: - 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 - sudo installer -pkg python-3.8.10-macos11.pkg -target / - rm python-3.8.10-macos11.pkg diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index c510808ea..9529c80e8 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -10,12 +10,11 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS macos_task: name: Build macOS x86_64 and arm64 wheels. macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode + image: ghcr.io/cirruslabs/macos-sonoma-xcode 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 install_pre_requirements_script: - brew install python@3.10 - - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python <<: *BUILD_AND_STORE_WHEELS diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index 53ef414b4..99562aab5 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -50,11 +50,10 @@ windows_x86_task: macos_arm64_task: name: Build macOS arm64 wheels. macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode + image: ghcr.io/cirruslabs/macos-sonoma-xcode env: - PATH: /opt/homebrew/opt/python@3.10/bin:$PATH + PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH install_pre_requirements_script: - brew install python@3.10 - - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python <<: *BUILD_AND_STORE_WHEELS diff --git a/test/test_from_sdist.py b/test/test_from_sdist.py index 0021a2acb..f999eaf44 100644 --- a/test/test_from_sdist.py +++ b/test/test_from_sdist.py @@ -69,7 +69,7 @@ def test_simple(tmp_path): 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 actual_wheels = cibuildwheel_from_sdist_run(