From 0db24021a834536b4c54ed629255153d446cdb38 Mon Sep 17 00:00:00 2001
From: Agustin Borgna <agustin.borgna@quantinuum.com>
Date: Tue, 2 Apr 2024 15:18:10 +0100
Subject: [PATCH] setup py project path in workspace

---
 .github/workflows/python-wheels.yml | 27 ++++++++++++++++++++++-----
 pyproject.toml                      |  3 +--
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index 7a608dda2..8bca01c12 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -12,22 +12,39 @@ on:
 
 jobs:
   build_wheels:
-    name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: Build wheels on ${{ matrix.runner.os }}-${{ matrix.runner.arch }}
+    runs-on: ${{ matrix.runner.os }}
     strategy:
       matrix:
-        # macos-13 is an intel runner, macos-14 is apple silicon
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        runner:
+          - os: ubuntu-latest
+            arch: auto
+          - os: ubuntu-latest
+            arch: arm64
+          - os: windows-latest
+            arch: auto
+          # macos-13 is an intel runner, macos-14 is apple silicon
+          - os: macos-13
+            arch: auto
+          - os: macos-14
+            arch: auto
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.17.0
+        env:
+          CIBW_BEFORE_TEST: cd
+          CIBW_ARCHS_LINUX: ${{ matrix.runner.arch }}
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+          CIBW_MANYLINUX_I686_IMAGE: manylinux2014
+          CIBW_ARCHS_MACOS: 'x86_64 arm64'
+          CIBW_TEST_SKIP: '*-macosx_arm64'
 
       - uses: actions/upload-artifact@v4
         with:
-          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          name: cibw-wheels-${{ matrix.runner.os }}-${{ matrix.runner.arch }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
diff --git a/pyproject.toml b/pyproject.toml
index 02f5b32b2..7667f6108 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,8 +4,7 @@ name = "hugr-project"
 version = "0.0.0"
 authors = ["TKET development team <tket-support@cambridgequantum.com>"]
 readme = "README.md"
-packages = []
-
+packages = [{ include = "quantunuum_hugr", from = "quantunuum-hugr-py" }]
 package-mode = false
 
 [tool.poetry.group.main.dependencies]