From 59bafd6f2f2a703d5ca7445bafb5c97fa6d588f6 Mon Sep 17 00:00:00 2001
From: Laurynas Tamulevicius <laurynast@google.com>
Date: Thu, 19 Aug 2021 22:15:35 +0100
Subject: [PATCH] enable delocate to fix the macos wheels

---
 .github/workflows/release_wheels.yml | 13 +++++--------
 .github/workflows/testing_wheels.yml | 13 +++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release_wheels.yml b/.github/workflows/release_wheels.yml
index c92a617d..4643ac1e 100644
--- a/.github/workflows/release_wheels.yml
+++ b/.github/workflows/release_wheels.yml
@@ -15,12 +15,7 @@ jobs:
           - os: macos-10.15
             name: mac
             cibw:
-              build: "cp36* cp37* cp38*"
-          - os: macos-10.15
-            name: mac-arm
-            cibw:
-              arch: universal2
-              build: "cp39*"
+              build: "cp36* cp37* cp38* cp39*"
           - os: ubuntu-20.04
             name: manylinux2014
             cibw:
@@ -36,8 +31,10 @@ jobs:
       CIBW_BUILD: "${{ matrix.cibw.build || '*' }}"
       CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"
       CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}"
-      CIBW_BEFORE_BUILD_MACOS: "brew install libomp"
-      CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
+      CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm"
+      CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-listdeps {wheel} && delocate-wheel --verbose --require-archs {delocate_archs} -w {dest_dir} {wheel}"
+      # to install latest delocate package
+      CIBW_DEPENDENCY_VERSIONS: "latest"
       # due to package and module name conflict have to temporarily move it away to run tests
       CIBW_BEFORE_TEST: "mv {package}/qsimcirq /tmp"
       CIBW_TEST_COMMAND: "pytest {package}/qsimcirq_tests/qsimcirq_test.py && mv /tmp/qsimcirq {package}"
diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml
index eeb4d741..21e6c41f 100644
--- a/.github/workflows/testing_wheels.yml
+++ b/.github/workflows/testing_wheels.yml
@@ -20,12 +20,7 @@ jobs:
           - os: macos-10.15
             name: mac
             cibw:
-              build: "cp36* cp37* cp38*"
-          - os: macos-10.15
-            name: mac-arm
-            cibw:
-              arch: universal2
-              build: "cp39*"
+              build: "cp36* cp37* cp38* cp39*"
           - os: ubuntu-20.04
             name: manylinux2014
             cibw:
@@ -41,8 +36,10 @@ jobs:
       CIBW_BUILD: "${{ matrix.cibw.build || '*' }}"
       CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"
       CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}"
-      CIBW_BEFORE_BUILD_MACOS: "brew install libomp"
-      CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
+      CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm"
+      CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-listdeps {wheel} && delocate-wheel --verbose --require-archs {delocate_archs} -w {dest_dir} {wheel}"
+      # to install latest delocate package
+      CIBW_DEPENDENCY_VERSIONS: "latest"
       # due to package and module name conflict have to temporarily move it away to run tests
       CIBW_BEFORE_TEST: "mv {package}/qsimcirq /tmp"
       CIBW_TEST_COMMAND: "pytest {package}/qsimcirq_tests/qsimcirq_test.py && mv /tmp/qsimcirq {package}"