Restore MacOS x86 support (#2052)

Author: cqc-alec

.github/workflows/build_and_test.yml

@@ -105,7 +105,7 @@ jobs:
     if: needs.check_changes.outputs.tket_or_c_api_changed == 'true'
     strategy:
       matrix:
-        os: ['ubuntu-24.04', 'macos-26']
+        os: ['ubuntu-24.04', 'macos-15-intel', 'macos-26']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v5
@@ -355,7 +355,10 @@ jobs:
     name: Build and test pytket (macos)
     needs: check_changes
     if: needs.check_changes.outputs.tket_or_workflow_changed == 'true' || needs.check_changes.outputs.pytket_or_workflow_changed == 'true'
-    runs-on: macos-26
+    strategy:
+      matrix:
+        os: ['macos-15-intel', 'macos-26']
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v5
     - name: Select Python 3.12
@@ -368,7 +371,7 @@ jobs:
       run: |
         conan profile detect
         DEFAULT_PROFILE_PATH=`conan profile path default`
-        PROFILE_PATH=./conan-profiles/macos-26
+        PROFILE_PATH=./conan-profiles/${{ matrix.os }}
         diff ${DEFAULT_PROFILE_PATH} ${PROFILE_PATH} || true
         cp ${PROFILE_PATH} ${DEFAULT_PROFILE_PATH}
         conan remote add tket-libs https://quantinuumsw.jfrog.io/artifactory/api/conan/tket1-libs --index 0

.github/workflows/release.yml

@@ -61,6 +61,46 @@ jobs:
         name: Linux_aarch64_3.${{ matrix.python3-version }}_wheel
         path: wheelhouse/
 
+  build_macos_x86_wheels:
+    name: Build macos x86 wheels
+    runs-on: macos-15-intel
+    strategy:
+      matrix:
+        python-version: ['3.10', '3.11', '3.12']
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        fetch-depth: '0'
+    - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v6
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install conan
+      uses: turtlebrowser/[email protected]
+    - name: Set up conan
+      run: |
+        conan profile detect
+        DEFAULT_PROFILE_PATH=`conan profile path default`
+        PROFILE_PATH=./conan-profiles/macos-15-intel
+        diff ${DEFAULT_PROFILE_PATH} ${PROFILE_PATH} || true
+        cp ${PROFILE_PATH} ${DEFAULT_PROFILE_PATH}
+        conan remote add tket-libs https://quantinuumsw.jfrog.io/artifactory/api/conan/tket1-libs --index 0
+    - name: Build tket C++
+      run: conan create tket --user tket --channel stable --build=missing -o boost/*:header_only=True -o tklog/*:shared=True -o tket/*:shared=True -tf ""
+    - name: Build wheel
+      run: |
+        cd pytket
+        # Ensure wheels are compatible with MacOS 13.0 and later:
+        export WHEEL_PLAT_NAME=macosx_13_0_x86_64
+        pip install -U pip build delocate
+        TKET_VERSION=`cat ../TKET_VERSION` python -m build
+        delocate-wheel -v -w "$GITHUB_WORKSPACE/wheelhouse/" "dist/pytket-"*".whl"
+    - uses: actions/upload-artifact@v4
+      with:
+        name: MacOS_x86_${{ matrix.python-version }}_wheel
+        path: wheelhouse/
+
   build_macos_arm64_wheels:
     name: Build macos arm64 wheels
     runs-on: macos-26
@@ -217,6 +257,43 @@ jobs:
     - name: Run tests
       run: cd tket/pytket/tests && pytest --ignore=simulator/
 
+  test_macos_x86_wheels:
+    name: Test macos x86 wheels
+    needs: build_macos_x86_wheels
+    strategy:
+      matrix:
+        os: ['macos-15-intel']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v6
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Download wheel (non-stable-ABI)
+      if: matrix.python-version == '3.10' || matrix.python-version == '3.11'
+      uses: actions/download-artifact@v5
+      with:
+        name: MacOS_x86_${{ matrix.python-version }}_wheel
+        path: wheelhouse/
+    - name: Download wheel (stable-ABI)
+      if: matrix.python-version == '3.12' || matrix.python-version == '3.13' || matrix.python-version == '3.14'
+      uses: actions/download-artifact@v5
+      with:
+        name: MacOS_x86_3.12_wheel
+        path: wheelhouse/
+    - uses: actions/checkout@v5
+      with:
+        path: tket
+    - name: Install wheel
+      run: |
+        pip install $GITHUB_WORKSPACE/wheelhouse/pytket-*.whl
+    - name: Run tests
+      run: |
+        cd tket/pytket/tests
+        pip install -r requirements.txt
+        pytest --ignore=simulator/
+
   test_macos_arm64_wheels:
     name: Test macos arm64 wheels
     needs: build_macos_arm64_wheels
@@ -294,7 +371,7 @@ jobs:
   publish_to_pypi:
     name: Publish to pypi
     if: github.event_name == 'release'
-    needs: [test_linux_wheels, test_linux_aarch64_wheels, test_macos_arm64_wheels, test_Windows_wheels]
+    needs: [test_linux_wheels, test_linux_aarch64_wheels, test_macos_x86_wheels, test_macos_arm64_wheels, test_Windows_wheels]
     runs-on: ubuntu-latest
     environment:
       name: release

TKET_VERSION

@@ -1 +1 @@
-2.1.56
+2.1.57

pytket/docs/changelog.md

@@ -1,11 +1,15 @@
 # Changelog
 
-## Unreleased
+## 2.10.2 (October 2025)
 
 Fixes:
 
 - Fix `circuit_dict_from_pytket1_dict()` when circuit contains `CustomGate`.
 
+General:
+
+- Restore support for MacOS on x86 architecture.
+
 ## 2.10.1 (October 2025)
 
 Fixes:

pytket/pytket/circuit/decompose_classical.py

@@ -55,11 +55,11 @@ def __init__(self) -> None:
 
     def pop(self) -> T:
         """Pop from top of heap."""
-        return heappop(self._heap)
+        return heappop(self._heap)  # type: ignore
 
     def push(self, var: T) -> None:
         """Push var to heap."""
-        heappush(self._heap, var)
+        heappush(self._heap, var)  # type: ignore
         self._heap_vars.add(var)
 
     def is_heap_var(self, var: T) -> bool: