F3/docs/demos

.github/workflows/build_and_test.yaml

@@ -1,17 +1,16 @@
-name: Build and Test
+name: Build wheels and run tests
 
-on: [push]
+on: [push, workflow_call]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  build-and-test:
-    name: build py3.${{ matrix.python-version }} on ${{ matrix.platform || matrix.os.base }}-${{ matrix.os.version }}
+  build-and-test-wheels:
+    name: Build and test wheels on ${{ matrix.platform || matrix.os.base }}-${{ matrix.os.version }}
     strategy:
       fail-fast: false
-      # NOTE: In the matrix below, we call out macos 15 and latest (> 15) explicitly. This is to enable running on both Intel and Apple Silicon for Mac.
       matrix:
         os:
           - base: ubuntu
@@ -25,10 +24,6 @@ jobs:
           - base: windows
             version: latest
             arch: "amd64"
-        python-version:
-          - "10"
-          - "11"
-          - "12"
         include:
           - os:
               base: ubuntu
@@ -39,80 +34,78 @@ jobs:
               version: latest
             ls: dir
     runs-on: ${{ format('{0}-{1}', matrix.os.base, matrix.os.version) }}
+    defaults:
+      run:
+        shell: pixi run -e wheels bash -e {0}
     env:
       CARGO_HTTP_MULTIPLEXING: "false"
     steps:
       - uses: actions/checkout@v4
 
-      - name: set up rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: install rust target for MacOS 14+ (Apple Silicon)
-        run: rustup target add aarch64-apple-darwin x86_64-apple-darwin
-        if: matrix.os.base == 'macos' && matrix.os.version == 'latest'
-
-      - name: install rust target for MacOS 15-intel (Intel Mac)
-        run: rustup target add x86_64-apple-darwin aarch64-apple-darwin
-        if: matrix.os.base == 'macos' && matrix.os.version == '15-intel'
-
-      - name: Update minimum supported MacOS for Wheels for MacOS 15-intel (Intel Mac)
-        run: echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
-        if: matrix.os.base == 'macos' && matrix.os.version == '15-intel'
-
-      - name: set up python
-        uses: actions/setup-python@v4
-        # uses: actions/setup-python@v5
+      - name: Set up Pixi
+        uses: prefix-dev/setup-pixi@v0.8.14
         with:
-          python-version: "3.${{ matrix.python-version }}"
-
-      - name: run cargo tests
-        run: cargo test
-
-      - name: install python dependencies
-        run: python -m pip install --upgrade pip setuptools wheel twine cibuildwheel pytest
-
-      - name: build source distribution
-        if: matrix.os.base == 'ubuntu' && matrix.python-version == '10'
+          environments: wheels
+
+      - name: Check version consistency
+        if: matrix.os.base == 'ubuntu'
+        run: python python/fastsim/check_versions.py
+
+      # - name: Check Python formatting & linting
+      #   if: matrix.os.base == 'ubuntu'
+      #   run: ruff check .
+
+      - name: Check Rust formatting
+        if: matrix.os.base == 'ubuntu'
+        run: cargo fmt --check
+
+      # - name: Check Rust linting
+      #   if: matrix.os.base == 'ubuntu'
+      #   run: cargo clippy -- -D warnings
+
+      - name: Run Rust tests
+        if: matrix.os.base == 'ubuntu'
+        run: cargo test --release
+
+      - name: Build source distribution
+        if: matrix.os.base == 'ubuntu'
         run: |
-          python -m pip install -U setuptools-rust
-          python -c "import setuptools; setuptools.setup()" sdist
-
-      - name: install FASTSim python
-        run: python -m pip install -e .[dev]
+          python -m build --sdist --outdir dist
 
-      - name: run pytest
-        timeout-minutes: 20
-        run: pytest -v
+      # Widens wheel compatibility on the Intel Mac runner, which otherwise
+      # defaults to a higher minimum macOS version than we want to require.
+      - name: Update minimum supported MacOS for Wheels for MacOS 15-intel (Intel Mac)
+        if: matrix.os.base == 'macos' && matrix.os.version == '15-intel'
+        run: echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
 
-      - name: build ${{ matrix.platform || matrix.os.base }} binaries
+      # NOTE: parts inspired by https://cibuildwheel.pypa.io/en/stable/setup/
+      # One invocation per platform builds every target Python version --
+      # cibuildwheel manages fetching/using each target interpreter internally.
+      - name: Build ${{ matrix.platform || matrix.os.base }} binaries
         run: cibuildwheel --output-dir dist
         env:
-          CIBW_BUILD: "cp3${{ matrix.python-version }}-*"
+          # Python version targets
+          CIBW_BUILD: "cp310-* cp311-* cp312-* cp313-* cp314-*"
           CIBW_SKIP: "*-win32 *-musllinux* *i686 *ppc64le *s390x *aarch64"
           CIBW_PLATFORM: ${{ matrix.platform || matrix.os.base }}
-          CIBW_TEST_REQUIRES: pytest
-          CIBW_TEST_COMMAND: "pytest {project}/python/fastsim/tests"
+          CIBW_BEFORE_TEST: python -m pip install --group test
+          CIBW_TEST_COMMAND: "pytest -v {project}"
           CIBW_ARCHS_MACOS: "${{ matrix.os.arch }}"
-          # see https://cibuildwheel.readthedocs.io/en/stable/faq/#universal2
-          CIBW_TEST_SKIP: "*_universal2:arm64"
           CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH"'
           CIBW_ENVIRONMENT_WINDOWS: 'PATH="$UserProfile\.cargo\bin;$PATH"'
-          CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014"
-          CIBW_MANYLINUX_I686_IMAGE: "manylinux2014"
-          CIBW_BEFORE_BUILD: >
-            pip install -U setuptools-rust &&
-            rustup default stable &&
-            rustup show
+          CIBW_MANYLINUX_X86_64_IMAGE: "manylinux_2_28"
+          CIBW_BEFORE_BUILD: rustup show
+          # Linux builds run in an isolated container with no Rust preinstalled,
+          # so it needs its own toolchain install.
           CIBW_BEFORE_BUILD_LINUX: >
             yum -y install openssl openssl-devel &&
-            pip install -U setuptools-rust &&
-            curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=nightly --profile=minimal -y &&
+            curl https://sh.rustup.rs -sSf | sh -s -- --profile=minimal -y &&
             rustup show
 
-      - name: list dist files
+      - name: List dist files
         run: ${{ matrix.ls || 'ls -lh' }} dist/
 
       - uses: actions/upload-artifact@v4
         with:
-          name: fastsim-${{ matrix.platform || matrix.os.base }}-${{ matrix.os.version }}-py3.${{ matrix.python }}-${{ strategy.job-index }}
+          name: fastsim-${{ matrix.platform || matrix.os.base }}-${{ matrix.os.version }}-${{ strategy.job-index }}
           path: ./dist/*

.github/workflows/deploy_docs.yaml

@@ -27,33 +27,19 @@ jobs:
   # Build job
   build:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: pixi run -e docs bash -e {0}
     env:
-      # Disable HTTP/2 multiplexing to avoid intermittent crates.io download
-      # failures
+      # Disable HTTP/2 multiplexing to avoid intermittent crates.io download failures
       CARGO_HTTP_MULTIPLEXING: "false"
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      # Cache the cargo registry and compiled Rust artifacts so docs deploys
-      # don't recompile the core from scratch every run.
-      - name: Cache Rust build
-        uses: Swatinem/rust-cache@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
+      - name: Set up Pixi
+        uses: prefix-dev/setup-pixi@v0.8.14
         with:
-          python-version: "3.11"
-
-      # FASTSim must be importable so the demo notebooks can be executed during
-      # the build. This compiles the Rust core, so it is the slow step.
-      - name: Install FASTSim and doc dependencies
-        run: |
-          pip install -U pip
-          pip install .
-          pip install -r docs/requirements.txt
+          environments: docs
 
       # Register the python3 kernel that the generated notebooks request.
       - name: Register Jupyter kernel

.github/workflows/release.yaml

@@ -1,160 +1,65 @@
-name: release
+name: Release
 
 on:
   release:
     types: [published]
   workflow_dispatch:
 
-# NOTE: parts inspired by https://cibuildwheel.pypa.io/en/stable/setup/
-
 jobs:
   build:
-    name: build py3.${{ matrix.python-version }} on ${{ matrix.platform || matrix.os }}
-    strategy:
-      fail-fast: true
-      matrix:
-        os:
-          - ubuntu-latest
-          - macos-15-intel # Intel runner
-          - macos-latest # Apple Silicon runner
-          - windows-latest
-        python-version:
-          - "10"
-          - "11"
-          - "12"
-        include:
-          - os: ubuntu-latest
-            platform: linux
-          - os: windows-latest
-            ls: dir
-
-    env:
-      FASTSIM_DISABLE_NETWORK_TESTS: 1
-
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: set up rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: install rust target for MacOS 14+ (Apple Silicon)
-        run: rustup target add aarch64-apple-darwin
-        if: matrix.os == 'macos-latest'
-
-      - name: install rust target for MacOS 15-intel (Intl Mac)
-        run: rustup target add x86_64-apple-darwin aarch64-apple-darwin
-        if: matrix.os == 'macos-15-intel'
-
-      - name: set up Python
-        uses: actions/setup-python@v4
-        # uses: actions/setup-python@v5
-        with:
-          python-version: "3.${{ matrix.python-version }}"
-
-      - name: run cargo tests
-        run: cargo test
-
-      - name: Upgrade to latest pip
-        run: python -m pip install --upgrade pip
-
-      - name: install Python dependencies
-        run: python -m pip install --upgrade setuptools wheel twine cibuildwheel pytest
-
-      - name: build source distribution
-        if: matrix.os == 'ubuntu-latest' && matrix.python-version == '10'
-        run: |
-          pip install -U setuptools-rust
-          python -c "import setuptools; setuptools.setup()" sdist
-
-      - name: Update minimum supported MacOS for Wheels for MacOS 15-intel (Intel Mac)
-        run: echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
-        if: matrix.os == 'macos-15-intel'
-
-      - name: build ${{ matrix.platform || matrix.os }} binaries
-        uses: pypa/cibuildwheel@v2.22.0
-        env:
-          CIBW_BUILD: "cp3${{ matrix.python-version }}-*"
-          CIBW_SKIP: "*-win32 *-musllinux* *i686 *ppc64le *s390x *aarch64"
-          # CIBW_PLATFORM: ${{ matrix.platform || matrix.os }}
-          # TODO: why doesn't pytest work with cibuildwheel?
-          # CIBW_TEST_COMMAND: "pytest -v {project}/python/fastsim/tests"
-          CIBW_TEST_COMMAND: "python -m unittest discover {project}/python/fastsim/tests"
-          # CIBW_ARCHS_MACOS: "universal2"
-          # see https://cibuildwheel.readthedocs.io/en/stable/faq/#universal2
-          CIBW_TEST_SKIP: "*_universal2:arm64"
-          CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH"'
-          CIBW_ENVIRONMENT_WINDOWS: 'PATH="$UserProfile\.cargo\bin;$PATH"'
-          CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014"
-          CIBW_MANYLINUX_I686_IMAGE: "manylinux2014"
-          CIBW_BEFORE_BUILD: >
-            pip install -U setuptools-rust &&
-            rustup default stable &&
-            rustup show
-          CIBW_BEFORE_BUILD_LINUX: >
-            yum -y install openssl openssl-devel &&
-            pip install -U setuptools-rust &&
-            curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=nightly --profile=minimal -y &&
-            rustup show
-          CIBW_BEFORE_BUILD_MACOS: >
-            rustup target add x86_64-apple-darwin
-          # - name: build windows 32bit binaries
-          #   if: matrix.os == 'windows'
-          #   run: cibuildwheel --output-dir dist
-          #   env:
-          #     CIBW_BUILD: 'cp3${{ matrix.python-version }}-win32'
-          #     CIBW_PLATFORM: windows
-          #     CIBW_TEST_REQUIRES: 'pytest'
-          #     CIBW_TEST_COMMAND: 'pytest {project}/tests -s'
-          #     CIBW_ENVIRONMENT: 'PATH="$UserProfile\.cargo\bin;$PATH"'
-          #     CIBW_BEFORE_BUILD: >
-          #       pip install -U setuptools-rust &&
-          #       rustup toolchain install nightly-i686-pc-windows-msvc &&
-          #       rustup default nightly-i686-pc-windows-msvc &&
-          #       rustup override set nightly-i686-pc-windows-msvc &&
-          #       rustup show
-
-      - name: list wheelhouse files
-        run: ${{ matrix.ls || 'ls -lh' }} ./wheelhouse/
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: artifact-py3.${{ matrix.python-version }}-${{ matrix.os }}-${{ strategy.job-index }}
-          path: ./wheelhouse/*.whl
+    uses: ./.github/workflows/build_and_test.yaml
 
   release:
     needs: build
-    name: release files to PyPI
+    name: Publish release artifacts
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: pixi run -e release bash -e {0}
     # Protection Strategies -- use ONE of the following two lines:
     # publish on via explicit publish
     if: github.event_name == 'release' && github.event.action == 'published'
     # publish on tag starting w/ 'v'
     # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     steps:
-      - name: download files
+      - uses: actions/checkout@v4
+
+      - name: Download files
         uses: actions/download-artifact@v4
         with:
           merge-multiple: true
           path: artifact
 
-      - name: set up Python 3.11
-        uses: actions/setup-python@v4
+      - name: Set up Pixi
+        uses: prefix-dev/setup-pixi@v0.8.14
         with:
-          python-version: "3.11"
+          environments: release
 
-      - run: pip install twine
+      - name: Check distribution with Twine
+        run: python -m twine check ./artifact/*
 
-      - run: twine check ./artifact/*
+      - name: Dry-run Rust crate publish
+        run: |
+          cargo publish --manifest-path fastsim-core/fastsim-proc-macros/Cargo.toml --locked --dry-run
+          cargo publish --manifest-path fastsim-core/Cargo.toml --locked --dry-run
+        # cargo publish --manifest-path fastsim-cli/Cargo.toml --locked --dry-run
 
       - name: Publish distribution to Test PyPI
-        run: twine upload -r testpypi ./artifact/*
+        run: python -m twine upload -r testpypi ./artifact/*
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.FASTSIM_TEST_PYPI_TOKEN }}
 
+      - name: Publish Rust crates to crates.io
+        run: |
+          cargo publish --manifest-path fastsim-core/fastsim-proc-macros/Cargo.toml --locked
+          cargo publish --manifest-path fastsim-core/Cargo.toml --locked
+        # cargo publish --manifest-path fastsim-cli/Cargo.toml --locked
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+
       - name: Upload files to PyPI
-        run: twine upload ./artifact/*
+        run: python -m twine upload ./artifact/*
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.fastsim_pypi_token }}