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

Author: joerick

.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

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

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

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(