patchcraft 0.2.1__tar.gz → 0.5.0__tar.gz

{patchcraft-0.2.1 → patchcraft-0.5.0}/.github/workflows/release.yml

@@ -1,128 +1,203 @@
-name: release
-
-# Triggered when a version tag is pushed (vX.Y.Z[.aN, .bN, .rcN]).
-# Steps:
-#   1. Re-run the test job that test.yml uses (sanity check on the
-#      exact ref being released).
-#   2. Build the wheel + sdist with `uv build`.
-#   3. Publish to PyPI via Trusted Publishing (OIDC) -- no token,
-#      no secret. The pypi.org side must have a configured publisher
-#      pointing at THIS repo + THIS workflow + the `pypi` environment.
-#   4. Create / update the GitHub Release page and attach the
-#      `dist/*.whl` and `dist/*.tar.gz` files.
-
-on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-      - "v[0-9]+.[0-9]+.[0-9]+.[ab][0-9]+"
-      - "v[0-9]+.[0-9]+.[0-9]+.rc[0-9]+"
-
-permissions:
-  contents: read
-
-jobs:
-  validate:
-    name: re-run tests at tag ref
-    runs-on: ubuntu-latest
-    env:
-      UV_PYTHON: "3.13"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: true
-      - run: uv python install
-      - run: uv sync --locked --extra cache --extra dev
-      - name: Tag must match __version__
-        run: |
-          tag="${GITHUB_REF_NAME#v}"
-          pkg="$(uv run python -c 'import patchcraft; print(patchcraft.__version__)')"
-          if [ "$tag" != "$pkg" ]; then
-            echo "::error::tag ${GITHUB_REF_NAME} implies version '${tag}' but patchcraft.__version__ is '${pkg}'"
-            exit 1
-          fi
-          echo "tag ${GITHUB_REF_NAME} matches __version__ ${pkg}"
-      - run: uv run ruff check src tests
-      - run: uv run mypy --strict src
-      - run: uv run pytest -m "not gpu"
-
-  build:
-    name: build wheel + sdist
-    runs-on: ubuntu-latest
-    needs: validate
-    steps:
-      - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
-      - run: uv build
-      - name: Inspect dist metadata
-        run: |
-          uv run --with twine twine check dist/*
-          ls -la dist/
-      - uses: actions/upload-artifact@v4
-        with:
-          name: dist
-          path: dist/
-
-  publish-pypi:
-    name: publish to PyPI (Trusted Publishing)
-    runs-on: ubuntu-latest
-    needs: build
-    environment:
-      name: pypi
-      url: https://pypi.org/project/patchcraft/
-    permissions:
-      id-token: write  # required for OIDC token exchange with PyPI
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: dist
-          path: dist/
-      - name: Publish via Trusted Publishing
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          # A version already on PyPI is a no-op instead of a hard failure.
-          # Without this, re-running the pipeline (or tagging a version that
-          # was uploaded by hand) fails here, and `github-release` never runs
-          # because it is `needs: publish-pypi`.
-          skip-existing: true
-        # No `password` field -- OIDC handles authentication.
-        # The pypi.org "Pending publisher" config must match:
-        #   PyPI project name: patchcraft
-        #   Owner:             LeoPR
-        #   Repository:        PatchCraft
-        #   Workflow:          release.yml
-        #   Environment:       pypi
-
-  github-release:
-    name: create GitHub Release with assets
-    runs-on: ubuntu-latest
-    needs: publish-pypi
-    permissions:
-      contents: write  # required to create a Release
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
-        with:
-          name: dist
-          path: dist/
-      - name: Extract version from tag
-        id: ver
-        run: echo "version=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
-      - name: Create Release + attach assets
-        uses: softprops/action-gh-release@v2
-        with:
-          name: "PatchCraft ${{ github.ref_name }}"
-          body: |
-            See [`CHANGELOG.md`](https://github.com/LeoPR/PatchCraft/blob/main/CHANGELOG.md) for the full notes.
-
-            Install:
-            ```
-            pip install patchcraft==${{ steps.ver.outputs.version }}
-            ```
-          files: |
-            dist/*.whl
-            dist/*.tar.gz
-          fail_on_unmatched_files: true
-          draft: false
-          prerelease: false
+name: release
+
+# Triggered when a version tag is pushed (vX.Y.Z[.aN, .bN, .rcN]).
+# Steps:
+#   1. Re-run the test job that test.yml uses (sanity check on the
+#      exact ref being released).
+#   2. Build the wheel + sdist with `uv build`.
+#   3. Publish to PyPI via Trusted Publishing (OIDC) -- no token,
+#      no secret. The pypi.org side must have a configured publisher
+#      pointing at THIS repo + THIS workflow + the `pypi` environment.
+#   4. Create / update the GitHub Release page and attach the
+#      `dist/*.whl` and `dist/*.tar.gz` files.
+
+on:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+.[ab][0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+.rc[0-9]+"
+
+permissions:
+  contents: read
+
+jobs:
+  validate:
+    name: re-run tests at tag ref
+    runs-on: ubuntu-latest
+    env:
+      UV_PYTHON: "3.13"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+      - run: uv python install
+      - run: uv sync --locked --extra cache --extra dev
+      - name: Tag must match __version__
+        run: |
+          tag="${GITHUB_REF_NAME#v}"
+          pkg="$(uv run python -c 'import patchcraft; print(patchcraft.__version__)')"
+          if [ "$tag" != "$pkg" ]; then
+            echo "::error::tag ${GITHUB_REF_NAME} implies version '${tag}' but patchcraft.__version__ is '${pkg}'"
+            exit 1
+          fi
+          echo "tag ${GITHUB_REF_NAME} matches __version__ ${pkg}"
+      - run: uv run ruff check src tests
+      - run: uv run mypy --strict src
+      - run: uv run pytest -m "not gpu"
+
+  build:
+    name: build wheel + sdist
+    runs-on: ubuntu-latest
+    needs: validate
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+      - run: uv build
+      - name: Inspect dist metadata
+        run: |
+          uv run --with twine twine check dist/*
+          ls -la dist/
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+  build-accel:
+    name: accel wheel (${{ matrix.target }})
+    runs-on: ${{ matrix.os }}
+    needs: validate
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # macos-13 is the Intel runner; macos-latest is arm64.
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+          - os: macos-latest
+            target: aarch64-apple-darwin
+          - os: macos-13
+            target: x86_64-apple-darwin
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build accel wheel
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          args: --release --out dist-accel --manifest-path accel/Cargo.toml
+
+      - name: Build accel sdist (linux only)
+        # The sdist is OS-independent; one is enough. Building it from source
+        # requires a Rust toolchain -- documented in accel/README.md.
+        if: matrix.target == 'x86_64-unknown-linux-gnu'
+        run: pipx run maturin sdist --manifest-path accel/Cargo.toml --out dist-accel
+
+      - name: Check accel artifacts
+        run: pipx run twine check dist-accel/*
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: accel-${{ matrix.target }}
+          path: dist-accel/
+
+  publish-pypi:
+    name: publish to PyPI (Trusted Publishing)
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: pypi
+      url: https://pypi.org/project/patchcraft/
+    permissions:
+      id-token: write  # required for OIDC token exchange with PyPI
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+      - name: Publish via Trusted Publishing
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          # A version already on PyPI is a no-op instead of a hard failure.
+          # Without this, re-running the pipeline (or tagging a version that
+          # was uploaded by hand) fails here, and `github-release` never runs
+          # because it is `needs: publish-pypi`.
+          skip-existing: true
+        # No `password` field -- OIDC handles authentication.
+        # The pypi.org "Pending publisher" config must match:
+        #   PyPI project name: patchcraft
+        #   Owner:             LeoPR
+        #   Repository:        PatchCraft
+        #   Workflow:          release.yml
+        #   Environment:       pypi
+
+  publish-accel:
+    name: publish patchcraft-accel to PyPI (Trusted Publishing)
+    runs-on: ubuntu-latest
+    needs: build-accel
+    environment:
+      name: pypi
+      url: https://pypi.org/project/patchcraft-accel/
+    permissions:
+      id-token: write  # required for OIDC token exchange with PyPI
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: accel-*
+          path: dist-accel
+          merge-multiple: true
+      - name: Publish via Trusted Publishing
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          skip-existing: true
+          packages-dir: dist-accel/
+        # FIRST RELEASE REQUIRES a one-time "pending publisher" config on
+        # pypi.org (user action, not this repo's):
+        #   PyPI project name: patchcraft-accel
+        #   Owner:             LeoPR
+        #   Repository:        PatchCraft
+        #   Workflow:          release.yml
+        #   Environment:       pypi
+
+  github-release:
+    name: create GitHub Release with assets
+    runs-on: ubuntu-latest
+    needs: [publish-pypi, build-accel]
+    permissions:
+      contents: write  # required to create a Release
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: accel-*
+          path: dist-accel
+          merge-multiple: true
+      - name: Extract version from tag
+        id: ver
+        run: echo "version=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
+      - name: Create Release + attach assets
+        uses: softprops/action-gh-release@v2
+        with:
+          name: "PatchCraft ${{ github.ref_name }}"
+          body: |
+            See [`CHANGELOG.md`](https://github.com/LeoPR/PatchCraft/blob/main/CHANGELOG.md) for the full notes.
+
+            Install:
+            ```
+            pip install patchcraft==${{ steps.ver.outputs.version }}
+            ```
+          files: |
+            dist/*.whl
+            dist/*.tar.gz
+            dist-accel/*.whl
+            dist-accel/*.tar.gz
+          fail_on_unmatched_files: true
+          draft: false
+          prerelease: false

{patchcraft-0.2.1 → patchcraft-0.5.0}/.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python: ["3.12", "3.13"]
+        python: ["3.12", "3.13", "3.14"]
     env:
       # Force uv to use the matrix Python in every uv* invocation
       # (otherwise `uv run` re-resolves to its default, which is the
@@ -49,3 +49,45 @@ jobs:
 
       - name: Pytest (skip GPU markers)
         run: uv run pytest -m "not gpu"
+
+  test-accel:
+    name: ${{ matrix.os }} / py3.12 / accel
+    runs-on: ${{ matrix.os }}
+    env:
+      UV_PYTHON: "3.12"
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Set up Python
+        run: uv python install
+
+      - name: Install project with dev + cache extras
+        run: uv sync --locked --extra cache --extra dev
+
+      - name: Rust unit tests
+        # The venv's interpreter on PATH lets the pyo3 build script resolve
+        # libpython (extension-module is off outside maturin builds).
+        run: uv run cargo test --manifest-path accel/Cargo.toml
+
+      - name: Build + install the accelerator
+        run: |
+          uv pip install maturin
+          uv run maturin develop --manifest-path accel/Cargo.toml --release
+
+      - name: Accelerator is detected
+        run: uv run python -c "import patchcraft; assert patchcraft.accel_available()"
+
+      - name: Pytest (accelerated mode)
+        run: uv run pytest -m "not gpu"

{patchcraft-0.2.1 → patchcraft-0.5.0}/.gitignore

@@ -53,3 +53,6 @@ runs/
 
 # Datasets and caches live on Z:
 data/
+
+# Rust accelerator build artifacts (accel/Cargo.lock IS committed)
+accel/target/