merge

Author: CalebBell

.coveragerc

@@ -17,23 +17,24 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - arch: armv6
-            distro: bookworm
+          # Disabled: Docker localhost registry connection refused error on armv6/trixie
+          # - arch: armv6
+          #   distro: trixie
           - arch: armv7
-            distro: bookworm
+            distro: trixie
           - arch: aarch64
-            distro: bookworm
+            distro: trixie
+          - arch: riscv64
+            distro: trixie
           - arch: s390x
-            distro: bookworm
+            distro: trixie
           - arch: ppc64le
-            distro: bookworm
+            distro: trixie
 
           - arch: armv7
             distro: ubuntu_latest
           - arch: aarch64
             distro: ubuntu_latest
-          - arch: riscv64
-            distro: ubuntu_devel
           - arch: s390x
             distro: ubuntu_latest
           - arch: ppc64le
@@ -51,38 +52,15 @@ jobs:
             distro: alpine_latest
           - arch: ppc64le
             distro: alpine_latest
-          # fedora-latest doesn't work not sure why
 
     steps:
       - uses: actions/checkout@v4
+      - name: Install Just
+        uses: extractions/setup-just@v2
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
-          platforms: all
-      - name: Run on ${{ matrix.arch }}
-        uses: uraimo/run-on-arch-action@v3
-        with:
-          arch: ${{ matrix.arch }}
-          distro: ${{ matrix.distro }}
-          githubToken: ${{ github.token }}
-          install: |
-            if [[ "${{ matrix.distro }}" == "alpine_latest" ]]; then
-              apk update
-              apk add python3 py3-pip py3-scipy py3-matplotlib py3-numpy py3-pandas
-            elif [[ "${{ matrix.distro }}" == "ubuntu_latest" || "${{ matrix.distro }}" == "ubuntu_rolling" || "${{ matrix.distro }}" == "ubuntu_devel" || "${{ matrix.distro }}" == "ubuntu20.04" ||  "${{ matrix.distro }}" == "ubuntu22.04" || "${{ matrix.distro }}" == "bookworm" ]]; then
-              apt-get update
-              # Install libatlas-base-dev if available (not available on some architectures like riscv64)
-              apt-get install -y liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas
-              apt-get install -y libatlas-base-dev || true
-            fi
-          run: |
-              if python3 -c "import subprocess; exit('no such option' not in subprocess.getoutput('pip3 install --break-system-packages'))"; then
-                # If the exit status is 0 (True), this means the option is not supported
-                python3 -m pip install wheel
-                pip3 install -r requirements_test_multiarch.txt
-              else
-                # If the exit status is 1 (False), this means the option is supported
-                python3 -m pip install wheel --break-system-packages
-                pip3 install -r requirements_test_multiarch.txt --break-system-packages
-              fi
-              python3 -m pytest . -v -m "not online and not thermo and not numba" 
+          image: tonistiigi/binfmt:qemu-v8.1.5
+      - name: Run tests on ${{ matrix.arch }}/${{ matrix.distro }}
+        run: just test-arch ${{ matrix.arch }} ${{ matrix.distro }} 
+

.github/workflows/build-multiarch.yml

@@ -17,17 +17,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.13t', 'pypy3.9']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.13t', 'pypy3.11']
         os: [windows-latest, ubuntu-latest, macos-15-intel, macos-latest]
         architecture: ['x86', 'x64']
         exclude:
           # Only test pypy on Linux
           - os: windows-latest
-            python-version: pypy3.9
+            python-version: pypy3.11
           - os: macos-latest
-            python-version: pypy3.9
+            python-version: pypy3.11
           - os: macos-15-intel
-            python-version: pypy3.9
+            python-version: pypy3.11
           # no python builds available on macos 32 bit, arm or x64
           - os: macos-latest
             architecture: x86
@@ -36,10 +36,7 @@ jobs:
           # no python builds available on linux 32 bit
           - os: ubuntu-latest
             architecture: x86
-          # scipy dropped 32 bit windows builds 
-          - os: windows-latest
-            architecture: x86
-            python-version: 3.8
+          # scipy dropped 32 bit windows builds
           - os: windows-latest
             architecture: x86
             python-version: 3.9
@@ -67,44 +64,24 @@ jobs:
             python-version: 3.13t
 
           # These are arm - old versions of Python are not supported
-          - os: macos-latest
-            python-version: 3.8
           - os: macos-latest
             python-version: 3.9
           - os: macos-latest
             python-version: 3.10
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }} ${{ matrix.architecture }}
-      uses: actions/setup-python@v5 
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.architecture }}
 
-    - name: cache Linux
-      uses: actions/cache@v4
-      if: startsWith(runner.os, 'Linux')
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_test.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ runner.architecture }}-${{ runner.python-version }}pip-
-    - name: cache MacOS
-      uses: actions/cache@v4
-      if: startsWith(runner.os, 'macOS')
-      with:
-        path: ~/Library/Caches/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_test.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ runner.architecture }}-${{ runner.python-version }}pip-
-    - name: cache Windows
-      uses: actions/cache@v4
-      if: startsWith(runner.os, 'Windows')
+    - name: Install uv
+      if: matrix.python-version != '3.13t'
+      uses: astral-sh/setup-uv@v4
       with:
-        path: ~\AppData\Local\pip\Cache
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_test.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ runner.architecture }}-${{ runner.python-version }}pip-
+        enable-cache: true
+        cache-dependency-glob: "pyproject.toml"
 
     - name: Install Ubuntu dependencies
       if: startsWith(runner.os, 'Linux')
@@ -116,13 +93,18 @@ jobs:
     - name: Install dependencies
       run: |
         python -c "import platform; print(platform.platform()); print(platform.architecture())"
-        python -m pip install --upgrade pip
-        python -m pip install wheel
-        pip install -r requirements_test.txt
+        if [[ "${{ matrix.python-version }}" == "3.13t" ]]; then
+          # Use pip for 3.13t (free-threading) as uv may not fully support it yet
+          python -m pip install --upgrade pip
+          pip install -e .[test]
+        else
+          uv pip install --system -e .[test]
+        fi
+      shell: bash
     - name: Add numba
-      if: ${{ !contains(fromJSON('["pypy3.9", "3.13t"]'), matrix.python-version) }}
+      if: ${{ !contains(fromJSON('["pypy3.11", "3.13t"]'), matrix.python-version) }}
       run: |
-        pip install numba
+        uv pip install --system -e .[numba]
     - name: Test with pytest
       run: |
         pytest . -v --cov-report html --cov=fluids --cov-report term-missing -m "not online and not thermo"