Add setuptools to github action Build Wheel

Author: urban233

.github/workflows/build_wheel.yaml

@@ -12,53 +12,12 @@
 #-*
 #-*
 #Z* -------------------------------------------------------------------
-#name: Build Wheel
-#
-#on: [push]
-#
-#jobs:
-#  build:
-#
-#    runs-on: macos-latest
-#    strategy:
-#      matrix:
-#        python-version: ["3.10", "3.11", "3.12"]
-#
-#    steps:
-#      - uses: actions/checkout@v4
-#      - name: Set up Python ${{ matrix.python-version }}
-#        uses: actions/setup-python@v5
-#        with:
-#          python-version: ${{ matrix.python-version }}
-#      # You can test your matrix by printing the current Python version
-#      - name: Display Python version
-#        run: python -c "import sys; print(sys.version)"
-#
-#      - name: Install dependencies
-#        run: |
-#          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-#          brew install cmake
-#          python -m venv .venv
-#          ./.venv/bin/pip install wheel setuptools
-#          ./.venv/bin/pip install -r requirements.txt
-#          ./automator.sh setup dev-env
-#
-#      - name: Build wheel
-#        run: |
-#          ./automator.sh build so
-#          ./automator.sh build wheel
-#
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: wheel-${{ matrix.python-version }}
-#          path: dist/*.whl
 name: Build Wheel
 
 on: [push]
 
 env:
-  VCPKG_ROOT: ${{ github.workspace }}/vendor/vcpkg  # Match your project structure
+  VCPKG_ROOT: ${{ github.workspace }}/vendor/vcpkg
 
 jobs:
   build:
@@ -86,7 +45,7 @@ jobs:
         run: |
           python -m venv .venv
           source .venv/bin/activate
-          python -m pip install wheel  # Add other build deps if needed
+          python -m pip install wheel setuptools  # setuptools needed for Python >=3.12
           python -m pip install -r requirements.txt
 
       - name: Bootstrap vcpkg
@@ -102,26 +61,9 @@ jobs:
           python automations/my_automator.py setup dev-env
           python automations/my_automator.py build so
           python automations/my_automator.py build wheel
-#      - name: Create universal binary
-#        if: matrix.arch == 'x86_64'  # Run once after both arch builds
-#        run: |
-#          lipo -create \
-#            -output dist/_cmd_universal.so \
-#            build/lib*/_cmd*.so
-#          rm build/lib*/_cmd*.so  # Clean individual arch builds
-#          mv dist/_cmd_universal.so build/lib/
-#
-#      - name: Package wheel
-#        if: matrix.arch == 'x86_64'
-#        run: |
-#          source .venv/bin/activate
-#          python setup.py bdist_wheel
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: macpymol-wheel-${{ matrix.os }}
           path: dist/*.whl
-
-# VCPKG_TRIPLET: x64-osx  # Use arm64-osx for Apple Silicon
-# TRIPLET=$([ "${{ matrix.arch }}" = "arm64" ] && echo "arm64-osx" || echo "x64-osx")
-# arch: [x86_64, arm64]

scripts/python/build_exe.py

@@ -18,9 +18,24 @@
 import pathlib
 import shutil
 import zipfile
+import platform
+import subprocess
 
 from cx_Freeze import Freezer, Executable
 
+
+def get_mac_architecture():
+  try:
+    # Get the hardware architecture using sysctl
+    arch = subprocess.check_output(
+      ['sysctl', '-n', 'hw.machine'],
+      stderr=subprocess.DEVNULL
+    ).decode().strip()
+    return arch
+  except subprocess.CalledProcessError:
+    # Fallback to platform.machine() if sysctl isn't available (unlikely on macOS)
+    return platform.machine()
+
 FILE_ROOT_PATH = pathlib.Path(__file__).parent
 
 
@@ -59,29 +74,33 @@ def remove_dist_info_folders(directory: pathlib.Path):
 
 
 if __name__ == '__main__':
+  tmp_python_version = f"{sys.version_info.major}.{sys.version_info.minor}"
+  tmp_shared_suffix = f".cpython-{tmp_python_version.replace('.', '')}-darwin.so"
+  tmp_arch = get_mac_architecture()
+  tmp_build_dir_name = f"exe.macosx-{tmp_arch}-{tmp_python_version}"
   freezer.freeze()
-  with zipfile.ZipFile(pathlib.Path(f"{FILE_ROOT_PATH}/build/exe.linux-x86_64-3.11/lib/library.zip"), 'r') as zip_ref:
-    zip_ref.extractall(pathlib.Path(f"{FILE_ROOT_PATH}/build/exe.linux-x86_64-3.11/lib"))
-  _CMD_FROM_BUILD_DIR = pathlib.Path(FILE_ROOT_PATH.parent / "cmake-build-release" / "_cmd.cpython-311-x86_64-linux-gnu.so")
-  _CMD_FROM_PRE_BUILT_DIR = pathlib.Path(FILE_ROOT_PATH.parent / "pre-built" / "_cmd.cpython-311-x86_64-linux-gnu.so")
-  if _CMD_FROM_BUILD_DIR.exists():
-    shutil.copy(
-      _CMD_FROM_BUILD_DIR,
-      pathlib.Path(FILE_ROOT_PATH / "build/exe.linux-x86_64-3.11/lib/pymol" / "_cmd.cpython-311-x86_64-linux-gnu.so")
-    )
+  with zipfile.ZipFile(pathlib.Path(f"{FILE_ROOT_PATH}/build/{tmp_build_dir_name}/lib/library.zip"), 'r') as zip_ref:
+    zip_ref.extractall(pathlib.Path(f"{FILE_ROOT_PATH}/build/{tmp_build_dir_name}/lib"))
+  if not pathlib.Path(const.PROJECT_ROOT_DIR / "src/python/pymol").exists():
+    utils.copy_pymol_sources()
+    _CMD_FROM_BUILD_DIR = pathlib.Path(const.PROJECT_ROOT_DIR / "cmake-build-release" / f"_cmd{tmp_shared_suffix}")
+    if _CMD_FROM_BUILD_DIR.exists():
+      shutil.copy(
+        _CMD_FROM_BUILD_DIR,
+        pathlib.Path(const.PROJECT_ROOT_DIR / "src/python/pymol" / f"_cmd{tmp_shared_suffix}")
+      )
+    else:
+      print(f"Could not find _cmd{tmp_shared_suffix} for building the EXE file.")
   else:
-    shutil.copy(
-      _CMD_FROM_PRE_BUILT_DIR,
-      pathlib.Path(FILE_ROOT_PATH / "build/exe.linux-x86_64-3.11/lib/pymol" / "_cmd.cpython-311-x86_64-linux-gnu.so")
-    )
-  remove_dist_info_folders(pathlib.Path(FILE_ROOT_PATH / "build/exe.linux-x86_64-3.11/lib"))
+    print("The src/python/pymol directory already exists, that might mean a self compiled _cmd module was built.")
+  remove_dist_info_folders(pathlib.Path(FILE_ROOT_PATH / f"build/{tmp_build_dir_name}/lib"))
   shutil.copytree(
     str(pathlib.Path(FILE_ROOT_PATH / "pymol/wizard")),
-    str(pathlib.Path(FILE_ROOT_PATH / "build/exe.linux-x86_64-3.11/lib/pymol/wizard")),
+    str(pathlib.Path(FILE_ROOT_PATH / f"build/{tmp_build_dir_name}/lib/pymol/wizard")),
     dirs_exist_ok=True
   )
   shutil.copytree(
     str(pathlib.Path(FILE_ROOT_PATH / "pymol/data/startup")),
-    str(pathlib.Path(FILE_ROOT_PATH / "build/exe.linux-x86_64-3.11/lib/pymol/data/startup")),
+    str(pathlib.Path(FILE_ROOT_PATH / f"build/{tmp_build_dir_name}/lib/pymol/data/startup")),
     dirs_exist_ok=True
   )