Rust Rewrite

.github/workflows/publish-to-pypi-and-test-pypi.yml

@@ -3,72 +3,204 @@ name: Publish Python distributions to PyPI and TestPyPI
 on: push
 
 jobs:
-    build:
-        name: Build Python distribution
-        runs-on: ubuntu-latest
+  linux:
+    name: wheels (linux ${{ matrix.platform.target }})
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - runner: ubuntu-22.04
+            target: x86_64
+          - runner: ubuntu-22.04
+            target: aarch64
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.10"
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter
+          sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
+          manylinux: auto
+      - name: Test wheel (native target only)
+        if: matrix.platform.target == 'x86_64'
+        run: |
+          pip install mal-toolbox --find-links dist --force-reinstall
+          python -c "import maltoolbox"
+      - name: Upload wheels
+        uses: actions/upload-artifact@v6
+        with:
+          name: wheels-linux-${{ matrix.platform.target }}
+          path: dist
+
+  musllinux:
+    name: wheels (musllinux ${{ matrix.platform.target }})
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - runner: ubuntu-22.04
+            target: x86_64
+          - runner: ubuntu-22.04
+            target: aarch64
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.10"
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter
+          sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
+          manylinux: musllinux_1_2
+      - name: Upload wheels
+        uses: actions/upload-artifact@v6
+        with:
+          name: wheels-musllinux-${{ matrix.platform.target }}
+          path: dist
 
-        steps:
-        - uses: actions/checkout@v4
-        - name: Set up Python
-          uses: actions/setup-python@v5
-          with:
-            python-version: "3.x"
+  windows:
+    name: wheels (windows ${{ matrix.platform.target }})
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - target: x64
+            python_arch: x64
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.10"
+          architecture: ${{ matrix.platform.python_arch }}
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter
+          sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
+      - name: Test wheel
+        run: |
+          pip install mal-toolbox --find-links dist --force-reinstall
+          python -c "import maltoolbox"
+      - name: Upload wheels
+        uses: actions/upload-artifact@v6
+        with:
+          name: wheels-windows-${{ matrix.platform.target }}
+          path: dist
 
-        - name: Install pypa/build
-          run: >-
-            python3 -m
-            pip install
-            build
-            --user
+  macos:
+    name: wheels (macos ${{ matrix.platform.target }})
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - runner: macos-15-intel
+            target: x86_64
+          - runner: macos-latest
+            target: aarch64
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.10"
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter
+          sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
+      - name: Test wheel
+        run: |
+          pip install mal-toolbox --find-links dist --force-reinstall
+          python -c "import maltoolbox"
+      - name: Upload wheels
+        uses: actions/upload-artifact@v6
+        with:
+          name: wheels-macos-${{ matrix.platform.target }}
+          path: dist
 
-        - 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/
+  sdist:
+    name: sdist
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Build sdist
+        uses: PyO3/maturin-action@v1
+        with:
+          command: sdist
+          args: --out dist
+      - name: Upload sdist
+        uses: actions/upload-artifact@v6
+        with:
+          name: wheels-sdist
+          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:
-      - build
-      runs-on: ubuntu-latest
-      environment:
-        name: pypi
-        url: https://pypi.org/p/mal-toolbox
-      permissions:
-        id-token: write  # IMPORTANT: mandatory for trusted publishing
+  publish-to-testpypi:
+    name: Publish Python distribution to TestPyPI
+    if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
+    needs:
+      - linux
+      - musllinux
+      - windows
+      - macos
+      - sdist
+    runs-on: ubuntu-latest
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/mal-toolbox
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
 
-      steps:
+    steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
-          name: python-package-distributions
+          pattern: wheels-*
           path: dist/
-      - name: Publish distribution to PyPI
+          merge-multiple: true
+      - name: Publish distribution to TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
 
-    publish-to-testpypi:
-      name: Publish Python distribution to TestPyPI
-      if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
-      needs:
-      - build
-      runs-on: ubuntu-latest
-      environment:
-        name: testpypi
-        url: https://test.pypi.org/p/mal-toolbox
-      permissions:
-        id-token: write  # IMPORTANT: mandatory for trusted publishing
+  publish-to-pypi:
+    name: Publish Python distribution to PyPI
+    if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
+    needs:
+      - linux
+      - musllinux
+      - windows
+      - macos
+      - sdist
+      - publish-to-testpypi  # TestPyPI is a gate: must succeed before the real publish
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/mal-toolbox
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
+      attestations: write  # for the GitHub-native build provenance attestation below
 
-      steps:
+    steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
-          name: python-package-distributions
+          pattern: wheels-*
           path: dist/
-      - name: Publish distribution to TestPyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+          merge-multiple: true
+      - name: Generate artifact attestation
+        uses: actions/attest@v4
         with:
-          repository-url: https://test.pypi.org/legacy/
+          subject-path: "dist/*"
+      - name: Publish distribution to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/run-mypy.yml

@@ -20,4 +20,4 @@ jobs:
       - name: Type checking with MyPy
         run: |
           pip install mypy types-PyYAML
-          mypy maltoolbox tests --ignore-missing-imports
+          mypy python/maltoolbox tests --ignore-missing-imports

.github/workflows/rust.yml

@@ -0,0 +1,51 @@
+name: Rust
+
+on:
+  push:
+    branches:
+      - main
+  pull_request: ~
+
+permissions:
+  contents: read
+
+jobs:
+  fmt:
+    name: fmt (${{ matrix.workspace }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        workspace:
+          - .
+          - py-bindings
+    steps:
+      - uses: actions/checkout@v7
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+      - name: cargo fmt --check
+        working-directory: ${{ matrix.workspace }}
+        run: cargo fmt --all --check
+
+  build:
+    name: build (${{ matrix.workspace }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        workspace:
+          - .
+          - py-bindings
+    steps:
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v7
+        with:
+          python-version: '3.x'
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: ${{ matrix.workspace }}
+      - name: cargo build
+        working-directory: ${{ matrix.workspace }}
+        run: cargo build --workspace --all-targets --locked

.github/workflows/test-pytest.yml

@@ -18,7 +18,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y graphviz
           python -m pip install --upgrade pip
-          pip install .
+          pip install -e .
       - name: Test with pytest
         run: |
           pip install pytest

.gitignore

@@ -65,6 +65,20 @@ nosetests.xml
 !.github/workflows/*.yml
 !examples/resources/*
 
+# Rust crate test fixtures/golden files (.json/.yml), not covered by the
+# blanket Python-oriented *.json/*.yaml/*.yml ignores above
+!core/**/*.json
+!core/**/*.yml
+!core/**/*.yaml
+
+# Rust
+/target
+# py-bindings/ is its own standalone Cargo workspace, so /target above
+# doesn't reach it
+/py-bindings/target
+**/*.rs.bk
+*.pdb
+
 # uv lock file
 uv.lock
 
@@ -73,3 +87,4 @@ uv.lock
 
 # Profiling Data
 prof/
+.langs/