Try plumbing the platform name a different way.

junyer · junyer · commit b1e4fdad7585 · 2023-09-07T17:56:13.000Z
Change-Id: Ic13a6ff61ec445c73483d55241ff42d90f9470b1 Reviewed-on: https://code-review.googlesource.com/c/re2/+/61870 Reviewed-by: Alex Chernyakhovsky <achernya@google.com> Reviewed-by: Paul Wankadia <junyer@google.com>
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -71,6 +71,7 @@ jobs:
     env:
       BAZELISK_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BAZEL_CPU: darwin_${{ matrix.arch.bazel-name }}
+      PLAT_NAME: macosx-${{ matrix.os }}.0-${{ matrix.arch.python-name }}
       # Stop macOS from reporting the system version as 10.x.
       # Otherwise, Python refuses to install the built wheel!
       SYSTEM_VERSION_COMPAT: 0
@@ -89,11 +90,7 @@ jobs:
         shell: bash
       - name: Build wheel
         run: |
-          # TODO(junyer): Get rid of this hack whenever there's a better way
-          # to plumb the platform name all the way down to the wheel builder.
-          python -m build --wheel \
-            --config-setting=--build-option=--plat-name \
-            --config-setting=--build-option=macosx-${{ matrix.os }}.0-${{ matrix.arch.python-name }}
+          python -m build --wheel
           python -m delocate.cmd.delocate_wheel --wheel-dir=. dist/*
         shell: bash
         working-directory: python
@@ -122,6 +119,7 @@ jobs:
     env:
       BAZELISK_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BAZEL_CPU: ${{ matrix.arch.bazel-name }}_windows
+      PLAT_NAME: ${{ matrix.arch.python-name }}
     steps:
       - uses: actions/checkout@v3
       # Avoid the Chocolatey install of Bazel getting in the way;
@@ -147,11 +145,7 @@ jobs:
         shell: bash
       - name: Build wheel
         run: |
-          # TODO(junyer): Get rid of this hack whenever there's a better way
-          # to plumb the platform name all the way down to the wheel builder.
-          python -m build --wheel \
-            --config-setting=--build-option=--plat-name \
-            --config-setting=--build-option=${{ matrix.arch.python-name }}
+          python -m build --wheel
           python -m delvewheel repair --wheel-dir=. dist/*
         shell: bash
         working-directory: python
diff --git a/python/setup.py b/python/setup.py
@@ -52,8 +52,10 @@ def build_extension(self, ext):
     os.environ['PYTHON_BIN_PATH'] = sys.executable
 
     cmd = ['bazel', 'build']
-    if 'BAZEL_CPU' in os.environ:
+    try:
       cmd.append(f'--cpu={os.environ["BAZEL_CPU"].lower()}')
+    except KeyError:
+      pass
     cmd += ['--compilation_mode=opt', '--', ':all']
     self.spawn(cmd)
 
@@ -66,6 +68,15 @@ def build_extension(self, ext):
     self.spawn(cmd)
 
 
+def options():
+  bdist_wheel = {}
+  try:
+    bdist_wheel['plat_name'] = os.environ['PLAT_NAME']
+  except KeyError:
+    pass
+  return {'bdist_wheel': bdist_wheel}
+
+
 def include_dirs():
   try:
     import pybind11
@@ -100,6 +111,7 @@ def include_dirs():
         'Programming Language :: C++',
         'Programming Language :: Python :: 3.8',
     ],
+    options=options(),
     cmdclass={'build_ext': BuildExt},
     python_requires='~=3.8',
 )
