DNM: Fix sdist and retrigger release job

IvanIsCoding · mtreinish · commit 8aee60ed25ba · 2025-09-15T12:29:37.000-04:00
This commit updates the release artifact workflow to only run the sdist build and manually trigger the job on a throwaway branch. The 0.17.1 release was missing its sdist because of broken package metadata. This commit bundles the fix from #1494 and adjust the workflow to run from the branch so as to not polute the git history of a tracked branch.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -2,197 +2,37 @@
 name: Wheel Builds
 on:
   push:
-    tags:
-      - '*'
+    branches:
+      - 'dnm-retrigger-0.17.1'
 jobs:
-  rustworkx-core:
-    name: Publish rustworkx-core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - name: Run cargo publish
-        run: |
-          cd rustworkx-core
-          cargo publish
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
   sdist:
     name: Build sdist
     runs-on: ubuntu-latest
     environment: release
     permissions:
       id-token: write
-    needs: ["upload_shared_wheels"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: '3.10'
       - name: Install deps
-        run: pip install -U setuptools-rust
+        run: pip install -U setuptools-rust build
       - name: Build sdist
-        run: python setup.py sdist
+        run: python -m build --sdist
       - uses: actions/upload-artifact@v4
         with:
           path: ./dist/*
           name: sdist-rustworkx
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
-  build_wheels:
-    name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    environment: release
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14, ubuntu-24.04-arm]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        name: Install Python
-        with:
-          python-version: '3.10'
-      - uses: dtolnay/rust-toolchain@stable
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install -U --group releaseinfra
-      - name: Build wheels
-        run: |
-          python -m cibuildwheel --output-dir wheelhouse
-      - uses: actions/upload-artifact@v4
-        with:
-          path: ./wheelhouse/*.whl
-          name: shared-wheel-builds-${{ matrix.os }}
-  upload_shared_wheels:
-    name: Upload shared build wheels
-    runs-on: ubuntu-latest
-    environment: release
-    permissions:
-      id-token: write
-    needs: ["build_wheels", "build-win32-wheels"]
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: shared-wheel-builds-*
-          merge-multiple: true
-          path: deploy
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          packages-dir: deploy
-  build_wheels_ppc64le:
-    name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    environment: release
-    permissions:
-      id-token: write
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        name: Install Python
-        with:
-          python-version: '3.10'
-      - uses: dtolnay/rust-toolchain@stable
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: all
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install -U --group releaseinfra
-      - name: Build wheels
-        run: |
-          python -m cibuildwheel --output-dir wheelhouse
-        env:
-          CIBW_SKIP: cp36-* cp37-* pp* *win32 *musl*
-          CIBW_ARCHS_LINUX: ppc64le
-      - uses: actions/upload-artifact@v4
-        with:
-          path: ./wheelhouse/*.whl
-          name: wheel-builds-ppc64le
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          packages-dir: wheelhouse/
-  build_wheels_s390x:
-    name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    environment: release
-    permissions:
-      id-token: write
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        name: Install Python
-        with:
-          python-version: '3.10'
-      - uses: dtolnay/rust-toolchain@stable
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: all
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install -U --group releaseinfra
-      - name: Build wheels
-        run: |
-          python -m cibuildwheel --output-dir wheelhouse
-        env:
-          CIBW_SKIP: cp36-* cp37-* pp* *win32 *musl*
-          CIBW_ARCHS_LINUX: s390x
-      - uses: actions/upload-artifact@v4
-        with:
-          path: ./wheelhouse/*.whl
-          name: wheel-builds-s390x
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          packages-dir: wheelhouse/
-  build-win32-wheels:
-    name: Build wheels on win32
-    runs-on: windows-latest
-    environment: release
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        name: Install Python
-        with:
-          python-version: '3.10'
-          architecture: 'x86'
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: i686-pc-windows-msvc
-      - name: Force win32 rust
-        run: rustup default stable-i686-pc-windows-msvc
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install -U --group releaseinfra
-      - name: Build wheels
-        run: |
-          python -m cibuildwheel --output-dir wheelhouse
-        env:
-          CIBW_SKIP: cp36-* cp37-* pp* *amd64 *musl*
-      - uses: actions/upload-artifact@v4
-        with:
-          path: ./wheelhouse/*.whl
-          name: shared-wheel-builds-win32
   retworkx-compat-build:
     name: Build retworkx
     runs-on: ubuntu-latest
     environment: release
     permissions:
       id-token: write
-    needs: ["upload_shared_wheels"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -205,7 +45,7 @@ jobs:
         run: pushd retworkx && python setup.py bdist_wheel && popd
       - uses: actions/upload-artifact@v4
         with:
-          path: ./retworkx/dist/*
+          path: ./dist/*
           name: sdist-retworkx
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,6 @@ dependencies = [
 ]
 readme = {file = "README.md", content-type = "text/markdown"}
 license-files = ["LICENSE"]
-license = "Apache-2.0"
 classifiers=[
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
diff --git a/retworkx/setup.py b/retworkx/setup.py
@@ -42,7 +42,7 @@
     long_description_content_type="text/markdown",
     author=pyproject["project"]["authors"][0]["name"],
     author_email=pyproject["project"]["authors"][0]["email"],
-    license=pyproject["project"]["license"],
+    license="Apache-2.0",
     classifiers=pyproject["project"]["classifiers"],
     keywords=pyproject["project"]["keywords"],
     project_urls=pyproject["project"]["urls"],

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ dependencies = [`
`8`	`8`	`]`
`9`	`9`	`readme = {file = "README.md", content-type = "text/markdown"}`
`10`	`10`	`license-files = ["LICENSE"]`
`11`		`-license = "Apache-2.0"`
`12`	`11`	`classifiers=[`
`13`	`12`	`"Intended Audience :: Developers",`
`14`	`13`	`"Intended Audience :: Science/Research",`