Rewrite

.github/workflows/ci.yml

@@ -2,11 +2,10 @@ name: CI
 
 on:
   push:
-    branches:
-      - main
+    branches: [main, rewrite]
   pull_request:
-    branches:
-      - main
+    branches: [main, rewrite]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,162 +14,65 @@ concurrency:
 jobs:
   format:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
-
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-          cache: 'pip'
-
+          cache: "pip"
       - name: Install validation dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install -e '.[validation]'
-
       - name: Check source formatting and imports
         run: |
-          python -m isort --check-only src test
-          python -m black --check src test
-          python -m ruff check src test
-
+          python -m isort --check-only src test examples/*.py
+          python -m black --check src test examples/*.py
+          python -m ruff check src test examples/*.py
       - name: Check notebook formatting and imports
         run: |
-          python -m nbqa isort --check examples/*.ipynb
-          python -m black --check --ipynb examples/*.ipynb
-          python -m ruff check examples/*.ipynb
+          if [ -d examples ] && ls examples/*.ipynb >/dev/null 2>&1; then
+            python -m nbqa isort --check examples/*.ipynb
+            python -m black --check --ipynb examples/*.ipynb
+            python -m ruff check examples/*.ipynb
+          else
+            echo "no notebooks yet"
+          fi
 
   tests:
+    # the fast tier: unit tests and the sampler-free / short-chain recipe assertions
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.12"]
-
     steps:
       - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: 'pip'
-
-      - name: Install validation dependencies
-        run: |
-          python -m pip install --upgrade pip setuptools wheel
-          python -m pip install -e '.[validation]'
-
-      - name: Locate x4i3 database directory
-        run: echo "X4I3_DATA_DIR=$(python -c 'import importlib.util, pathlib; print(pathlib.Path(importlib.util.find_spec("x4i3").origin).parent / "data")')" >> "$GITHUB_ENV"
-
-      - name: Restore EXFOR database cache
-        uses: actions/cache@v4
         with:
-          path: ${{ env.X4I3_DATA_DIR }}
-          key: exfor-db-${{ runner.os }}-${{ hashFiles('requirements.txt') }}
-
-      - name: Warm EXFOR database
-        run: python -c "import x4i3"
-
-      - name: Run unit tests
-        run: python -m pytest test
-
-  notebooks:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-
-    steps:
-      - uses: actions/checkout@v4
-
+          fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-          cache: 'pip'
-
+          cache: "pip"
       - name: Install validation dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install -e '.[validation]' pytest-xdist
-
-      - name: Locate x4i3 database directory
-        run: echo "X4I3_DATA_DIR=$(python -c 'import importlib.util, pathlib; print(pathlib.Path(importlib.util.find_spec("x4i3").origin).parent / "data")')" >> "$GITHUB_ENV"
-
-      - name: Restore EXFOR database cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.X4I3_DATA_DIR }}
-          key: exfor-db-${{ runner.os }}-${{ hashFiles('requirements.txt') }}
-
-      # single serial download; the concurrent notebook kernels spawned by
-      # xdist must find the database already in place (x4i3 downloads at
-      # import time outside pytest, so parallel kernels would race it)
-      - name: Warm EXFOR database
-        run: python -c "import x4i3"
-
-      - name: Run notebooks with pytest
-        run: python -m pytest -n 4 --nbmake --nbmake-timeout=1200 examples
+          python -m pip install -e '.[validation]'
+      - name: Run the fast tier
+        # the ten slowest tests are listed so the few-minute budget stays visible
+        run: python -m pytest --durations=10
 
   docs:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
-
+        with:
+          fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-          cache: 'pip'
-
+          cache: "pip"
       - name: Install docs dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install -e '.[docs]'
-
-      - name: Locate x4i3 database directory
-        run: echo "X4I3_DATA_DIR=$(python -c 'import importlib.util, pathlib; print(pathlib.Path(importlib.util.find_spec("x4i3").origin).parent / "data")')" >> "$GITHUB_ENV"
-
-      - name: Restore EXFOR database cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.X4I3_DATA_DIR }}
-          key: exfor-db-${{ runner.os }}-${{ hashFiles('requirements.txt') }}
-
-      - name: Warm EXFOR database
-        run: python -c "import x4i3"
-
       - name: Build HTML docs
         run: |
-          test -L docs/examples || ln -sf ../examples docs/examples
-          sphinx-build docs docs/_build/html -W --keep-going
-
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: 'pip'
-
-      - name: Build distributions
-        run: |
-          python -m pip install --upgrade pip build
-          python -m build
-
-      - name: Install wheel
-        run: python -m pip install "$(ls -t dist/*.whl | head -n 1)"
-
-      - name: Locate x4i3 database directory
-        run: echo "X4I3_DATA_DIR=$(python -c 'import importlib.util, pathlib; print(pathlib.Path(importlib.util.find_spec("x4i3").origin).parent / "data")')" >> "$GITHUB_ENV"
-
-      - name: Restore EXFOR database cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.X4I3_DATA_DIR }}
-          key: exfor-db-${{ runner.os }}-${{ hashFiles('requirements.txt') }}
-
-      - name: Wheel smoke test
-        run: python -c "import rxmc; import rxmc.config; import rxmc.walker"
+          if [ -d examples ]; then test -L docs/examples || ln -sf ../examples docs/examples; fi
+          sphinx-build -W --keep-going docs docs/_build/html

.github/workflows/converged.yml

@@ -0,0 +1,42 @@
+name: Converged tier
+
+# The numeric claims that need a converged sampler, and the example notebooks.
+# Required for pushes and pull requests into main; run by hand on any branch
+# with workflow_dispatch.  There is deliberately no schedule.
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  converged:
+    runs-on: ubuntu-latest
+    timeout-minutes: 180
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+          cache: "pip"
+      - name: Install validation dependencies
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          python -m pip install -e '.[validation]' pytest-xdist
+      - name: Run the converged tier
+        run: python -m pytest -m slow --durations=10
+      - name: Run the notebooks
+        run: |
+          if [ -d examples ] && ls examples/*.ipynb >/dev/null 2>&1; then
+            python -m pytest -n 4 --nbmake --nbmake-timeout=3600 examples
+          else
+            echo "no notebooks yet"
+          fi

.github/workflows/docs.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Build HTML docs
         run: |
-          test -L docs/examples || ln -sf ../examples docs/examples
+          if [ -d examples ]; then test -L docs/examples || ln -sf ../examples docs/examples; fi
           sphinx-build docs docs/_build/html -W --keep-going
 
       - name: Upload pages artifact

.github/workflows/publish.yml

@@ -0,0 +1,53 @@
+name: Publish to PyPI
+
+# Trusted publishing: no token in the repository.  Register the pending
+# publisher on pypi.org (project rxmc, owner beykyle, repository rxmc,
+# workflow publish.yml, environment pypi) before the first tag.  Only 1.x and
+# later tags publish (0.x lives on tag v0.1.0 and branch legacy/0.x), and the
+# build refuses a tag that does not name the version setuptools_scm builds.
+on:
+  push:
+    tags: ["v[1-9]*"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - name: Build sdist and wheel
+        run: |
+          python -m pip install --upgrade pip build
+          python -m build
+      - name: Check the tag names the built version
+        run: |
+          python - <<'EOF'
+          import glob, os
+          from packaging.version import Version
+          tag = os.environ["GITHUB_REF_NAME"].removeprefix("v")
+          built = os.path.basename(glob.glob("dist/*.whl")[0]).split("-")[1]
+          if Version(tag) != Version(built):
+              raise SystemExit(f"tag v{tag} builds version {built}: not publishing")
+          print(f"publishing {built}")
+          EOF
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+  publish:
+    needs: build
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+      - uses: pypa/gh-action-pypi-publish@release/v1