From ba654d1a02cdb03575dc8811038f2e647a7389af Mon Sep 17 00:00:00 2001
From: Achal Shah <achals@gmail.com>
Date: Thu, 23 Mar 2023 22:19:33 -0700
Subject: [PATCH] ci: Use build --wheel instead of cibuildwheel

Since we've deleting all the go code, we do not need platform specific builds anymore. We should exploit this fact by building universal images. Anyway, cibuildwheel barfs when trying to build platform specific builds anyway.

Signed-off-by: Achal Shah <achals@gmail.com>
---
 .github/workflows/build_wheels.yml | 47 ++++++------------------------
 setup.cfg                          |  3 ++
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 49669aa5b1..db86e743bd 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -53,12 +53,14 @@ jobs:
 
   build-python-wheel:
     name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, macos-10.15 ]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.8"
+          architecture: x64
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
@@ -67,40 +69,9 @@ jobs:
       - name: Build UI
         run: make build-ui
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.7.0
-        env:
-          CIBW_BUILD: "cp3*_x86_64"
-          CIBW_SKIP: "cp36-* cp37-* *-musllinux_x86_64 cp310-macosx_x86_64"
-          CIBW_ARCHS: "native"
-          CIBW_BEFORE_ALL_MACOS: |
-            brew install apache-arrow
-            brew install pkg-config
-            curl -o python.pkg https://www.python.org/ftp/python/3.9.12/python-3.9.12-macosx10.9.pkg
-            sudo installer -pkg python.pkg -target /
-          # There's a `git restore` in here because `make install-go-ci-dependencies` is actually messing up go.mod & go.sum.
-          CIBW_BEFORE_BUILD: |
-            make install-protoc-dependencies
-            git status
-            git restore go.mod go.sum
-            git restore sdk/python/feast/ui/yarn.lock
-          CIBW_BEFORE_TEST: "cd {project} && git status"
-      # py3.10 on MacOS does not work with Go so we have to install separately. Issue is tracked here: https://github.com/feast-dev/feast/issues/2881.
-      - name: Build py310 specific wheels for macos
-        if: matrix.os == 'macos-10.15'
-        uses: pypa/cibuildwheel@v2.7.0
-        env:
-          CIBW_BUILD: "cp310-macosx_x86_64"
-          CIBW_ARCHS: "native"
-          # Need this environment variable because of this issue: https://github.com/pypa/cibuildwheel/issues/952.
-          CIBW_ENVIRONMENT: >
-            _PYTHON_HOST_PLATFORM=macosx-10.15-x86_64
-          # There's a `git restore` in here because remnant go.mod, go.sum changes from the build mess up the wheel naming.
-          CIBW_BEFORE_BUILD: |
-            git status
-            git restore go.mod go.sum
-            git restore sdk/python/feast/ui/yarn.lock
-            brew install apache-arrow
-            brew install pkg-config
+        run: |
+          python -m pip install build
+          python -m build --wheel --outdir wheelhouse/
       - uses: actions/upload-artifact@v2
         with:
           name: wheels
diff --git a/setup.cfg b/setup.cfg
index e2d707e272..2781169a71 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,3 +20,6 @@ exclude = .git,__pycache__,docs/conf.py,dist,feast/protos,feast/embedded_go/lib
 files=feast,tests
 ignore_missing_imports=true
 exclude=feast/embedded_go/lib
+
+[bdist_wheel]
+universal = 1