more wheels, bump libunwind

Author: ndrewh

.github/workflows/build.yml

@@ -228,51 +228,64 @@ jobs:
         run: |
           docker buildx imagetools inspect ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.version }}
 
-  pip-build:
-    name: Build distribution 📦
-    runs-on: ubuntu-latest
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-14]
 
     steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.10"
-    - name: Install pypa/build
-      run: >-
-        python3 -m
-        pip install
-        build
-        --user
-    - name: Build a binary wheel and a source tarball
-      run: python3 -m build
-    - name: Store the distribution packages
-      uses: actions/upload-artifact@v4
-      with:
-        name: python-package-distributions
-        path: dist/
-
-  publish-to-pypi:
-    name: >-
-      Publish Python 🐍 distribution 📦 to PyPI
-    if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
-    needs:
-    - pip-build
+      - uses: actions/checkout@v4
+
+      # Used to host cibuildwheel
+      - uses: actions/setup-python@v5
+
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel==3.0.0b1
+
+      - name: Build wheels
+        run: python -m cibuildwheel --output-dir wheelhouse
+        env:
+          CIBW_BUILD: "cp310-*"
+          CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
+
+  build_sdist:
+    name: Build source distribution
     runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/pyda-dbi  # Replace <package-name> with your PyPI project name
-    permissions:
-      id-token: write  # IMPORTANT: mandatory for trusted publishing
     steps:
-    - name: Download all the dists
-      uses: actions/download-artifact@v4
-      with:
-        name: python-package-distributions
-        path: dist/
-    - name: Publish distribution 📦 to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        run: pipx run build --sdist
 
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: dist/*.tar.gz
 
+  upload_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    if: github.event_name == 'release' && github.event.action == 'published'
+    # or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
+    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/

pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-requires-python = "== 3.10"
+requires-python = ">=3.10,<3.11"
 dynamic = ["version"]
 name = "pyda-dbi"
 
@@ -8,6 +8,7 @@ requires = [
     "setuptools>=64",
     "cmake>=3.18",
     "setuptools-scm>=8",
+    "wget"
 ]
 build-backend = "setuptools.build_meta"
 

setup.py

@@ -12,6 +12,7 @@
 import multiprocessing
 import platform
 import site
+from urllib.request import urlretrieve
 
 def dynamorio_tag_and_patch():
     if "macOS" in platform.platform():
@@ -25,30 +26,17 @@ def run_command(command, cwd=None, env=None):
     subprocess.check_call(command, cwd=cwd, env=env)
 
 def download_and_extract(url, extract_dir):
-    import urllib.request
     import tarfile
 
     filename = url.split('/')[-1]
-    urllib.request.urlretrieve(url, filename)
+    urlretrieve(url, filename)
 
     with tarfile.open(filename) as tar:
         tar.extractall(path=extract_dir)
 
     os.remove(filename)
 
-class CustomBuildCommand(Command):
-    description = "Build Pyda"
-    user_options = []
-    
-    def initialize_options(self):
-        self.build_temp = None
-        self.build_lib = None
-    
-    def finalize_options(self):
-        self.set_undefined_options('build',
-                                  ('build_temp', 'build_temp'),
-                                  ('build_lib', 'build_lib'))
-    
+class CustomBuildCommand(build_ext):
     def run(self):
         # Create temporary build directory
         build_temp_dir = tempfile.TemporaryDirectory()
@@ -68,10 +56,10 @@ def run(self):
                 libunwind_dir = os.path.join(build_temp, 'libunwind')
                 os.makedirs(libunwind_dir, exist_ok=True)
                 download_and_extract(
-                    'https://github.com/libunwind/libunwind/releases/download/v1.6.2/libunwind-1.6.2.tar.gz',
+                    'https://github.com/libunwind/libunwind/releases/download/v1.8.1/libunwind-1.8.1.tar.gz',
                     libunwind_dir
                 )
-                libunwind_build_dir = os.path.join(libunwind_dir, 'libunwind-1.6.2')
+                libunwind_build_dir = os.path.join(libunwind_dir, 'libunwind-1.8.1')
                 run_command(['./configure', f'--prefix={os.path.abspath(libunwind_install_dir)}'], cwd=libunwind_build_dir)
                 run_command(['make', f'-j{multiprocessing.cpu_count()}'], cwd=libunwind_build_dir)
                 run_command(['make', 'install'], cwd=libunwind_build_dir)
@@ -92,8 +80,11 @@ def run(self):
             if os.path.exists(patch_path):
                 run_command(['git', 'apply', patch_path], cwd=dynamorio_dir)
 
-            run_command(["bash", "-c", "wget https://github.com/DynamoRIO/dynamorio/commit/f1b67a4b0cf0a13314d500dd3aaefe9869597021.patch && git apply f1b67a4b0cf0a13314d500dd3aaefe9869597021.patch && rm f1b67a4b0cf0a13314d500dd3aaefe9869597021.patch && git submodule update --init"], cwd=dynamorio_dir)
-            run_command(["bash", "-c", "wget https://github.com/DynamoRIO/dynamorio/commit/c46d736f308e6e734bd0477f7b8a2dcbefb155d3.patch && git apply c46d736f308e6e734bd0477f7b8a2dcbefb155d3.patch && rm c46d736f308e6e734bd0477f7b8a2dcbefb155d3.patch"], cwd=dynamorio_dir)
+            urlretrieve('https://github.com/DynamoRIO/dynamorio/commit/f1b67a4b0cf0a13314d500dd3aaefe9869597021.patch', os.path.join(dynamorio_dir, 'f1b67a4b0cf0a13314d500dd3aaefe9869597021.patch'))
+            urlretrieve('https://github.com/DynamoRIO/dynamorio/commit/c46d736f308e6e734bd0477f7b8a2dcbefb155d3.patch', os.path.join(dynamorio_dir, 'c46d736f308e6e734bd0477f7b8a2dcbefb155d3.patch'))
+
+            run_command(["bash", "-c", "git apply f1b67a4b0cf0a13314d500dd3aaefe9869597021.patch && rm f1b67a4b0cf0a13314d500dd3aaefe9869597021.patch && git submodule update --init"], cwd=dynamorio_dir)
+            run_command(["bash", "-c", "git apply c46d736f308e6e734bd0477f7b8a2dcbefb155d3.patch && rm c46d736f308e6e734bd0477f7b8a2dcbefb155d3.patch"], cwd=dynamorio_dir)
 
             # Build DynamoRIO
             dynamorio_build_dir = os.path.join(dynamorio_dir, 'build')
@@ -184,7 +175,6 @@ def run(self):
 # Custom install command that runs our build command first
 class CustomInstallCommand(install):
     def run(self):
-        self.run_command('build_pyda')
         install.run(self)
         prepend_env = f"""
 BASE=$(python3 -c "from importlib.resources import files; print(files('pyda'))" 2>/dev/null)
@@ -232,7 +222,6 @@ def run(self):
 # Custom develop command that runs our build command first
 class CustomDevelopCommand(develop):
     def run(self):
-        self.run_command('build_pyda')
         develop.run(self)
 
 setup(
@@ -241,7 +230,7 @@ def run(self):
     author='Andrew Haberlandt',
     author_email='[email protected]',
     cmdclass={
-        'build_pyda': CustomBuildCommand,
+        'build_ext': CustomBuildCommand,
         'install': CustomInstallCommand,
         'develop': CustomDevelopCommand,
     },
@@ -260,5 +249,6 @@ def run(self):
         # Add your Python package dependencies here
     ],
     scripts=[],
+    ext_modules=[Extension("dummy", sources=[])],
 )