metrust 0.4.2__tar.gz → 0.4.4__tar.gz

{metrust-0.4.2 → metrust-0.4.4}/.github/workflows/ci.yml

@@ -5,23 +5,31 @@ on:
     branches: [master, main]
   pull_request:
 
+env:
+  METPY_VERSION: "1.7.1"
+
 jobs:
-  test:
+  smoke:
+    name: Smoke (${{ matrix.os }}, py${{ matrix.python-version }})
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ["3.10", "3.12"]
+        os: [ubuntu-latest, windows-latest, macos-14]
+        python-version: ["3.12"]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
+      - name: Rust cache
+        uses: Swatinem/rust-cache@v2
+
       - name: Install package and test deps
         run: |
           python -m pip install --upgrade pip
@@ -33,11 +41,47 @@ jobs:
       - name: Run Python compatibility tests
         run: python -m pytest tests/test_python_compat.py -q
 
+  differential:
+    name: Differential (${{ matrix.mode }}, py${{ matrix.python-version }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        mode: ["metrust-only", "metpy", "metpy-xarray"]
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Rust cache
+        uses: Swatinem/rust-cache@v2
+
+      - name: Install test dependencies
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -e "." pytest numpy pint pandas
+          if [[ "${{ matrix.mode }}" != "metrust-only" ]]; then
+            python -m pip install "MetPy==${METPY_VERSION}"
+          fi
+          if [[ "${{ matrix.mode }}" == "metpy-xarray" ]]; then
+            python -m pip install xarray
+          fi
+
+      - name: Run differential test mode
+        run: python tests/run_ci_mode.py ${{ matrix.mode }}
+
   bench-rust:
     name: Rust Benchmarks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
@@ -49,7 +93,7 @@ jobs:
         run: cargo bench --package metrust --bench calc_bench
 
       - name: Upload criterion artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: criterion-report
@@ -60,9 +104,9 @@ jobs:
     name: Python Benchmarks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
 
@@ -75,13 +119,13 @@ jobs:
       - name: Install metrust and MetPy
         run: |
           python -m pip install --upgrade pip
-          python -m pip install -e "." numpy pint metpy
+          python -m pip install -e "." numpy pint "MetPy==${METPY_VERSION}"
 
       - name: Run three-tier benchmark
         run: python benches/bench_python.py --json
 
       - name: Upload benchmark results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: python-bench-results

{metrust-0.4.2 → metrust-0.4.4}/.github/workflows/docs.yml

@@ -18,13 +18,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
       - run: pip install mkdocs-material
       - run: mkdocs build
-      - uses: actions/upload-pages-artifact@v3
+      - uses: actions/upload-pages-artifact@v4
         with:
           path: site
 
@@ -36,4 +36,4 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
       - id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

{metrust-0.4.2 → metrust-0.4.4}/.github/workflows/release.yml

@@ -22,8 +22,8 @@ jobs:
           - runner: ubuntu-22.04
             target: aarch64
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
       - name: Build wheels
@@ -33,7 +33,7 @@ jobs:
           args: --release --out dist -i python3.10 python3.11 python3.12 python3.13
           manylinux: auto
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: wheels-linux-${{ matrix.platform.target }}
           path: dist
@@ -50,8 +50,8 @@ jobs:
           - runner: macos-14
             target: aarch64
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
       - name: Build wheels
@@ -60,7 +60,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           args: --release --out dist
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: wheels-macos-${{ matrix.platform.target }}
           path: dist
@@ -72,8 +72,8 @@ jobs:
       matrix:
         target: [x64]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
           architecture: ${{ matrix.target }}
@@ -82,7 +82,7 @@ jobs:
         with:
           args: --release --out dist
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: wheels-windows-${{ matrix.target }}
           path: dist
@@ -91,14 +91,14 @@ jobs:
   sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
           command: sdist
           args: --out dist
       - name: Upload sdist
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: wheels-sdist
           path: dist
@@ -115,7 +115,7 @@ jobs:
       id-token: write  # trusted publishing
     steps:
       - name: Download all wheels
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: wheels-*
           merge-multiple: true

{metrust-0.4.2 → metrust-0.4.4}/Cargo.lock

@@ -802,7 +802,7 @@ dependencies = [
 
 [[package]]
 name = "metrust-py"
-version = "0.4.2"
+version = "0.4.4"
 dependencies = [
  "metrust",
  "numpy",

{metrust-0.4.2 → metrust-0.4.4}/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT"
 
 [package]
 name = "metrust-py"
-version = "0.4.2"
+version = "0.4.4"
 edition.workspace = true
 description = "Python bindings for metrust, a Rust-powered MetPy-compatible calculation layer"
 readme = "README.md"

{metrust-0.4.2 → metrust-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metrust
-Version: 0.4.2
+Version: 0.4.4
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
@@ -15,7 +15,7 @@ Summary: Rust-powered MetPy-compatible calculation layer with optional GPU accel
 Keywords: meteorology,weather,rust,metpy,atmospheric-science,nwp,cape,sounding
 Author: Fahrenheit Research
 License: MIT
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Documentation, https://fahrenheitresearch.github.io/metrust-py/
 Project-URL: Homepage, https://github.com/FahrenheitResearch/metrust-py
@@ -125,6 +125,9 @@ Benchmarked on real-world workflows (v0.3.3, validated by Codex against MetPy):
 | MetPy isentropic example | **2.3x** | Isentropic interpolation + Montgomery |
 | Vorticity/divergence (global grid) | **2.3x** | Spherical corrections on 721x1440 |
 
+Current replay-harness snapshot from `benches/bench_workflows.py` on Windows 11 / Python `3.13.7`:
+sounding `2.16x`, grid diagnostics `8.53x`, xarray workflow `1.46x`.
+
 ### Three-Way Benchmark: MetPy vs Rust vs CUDA
 
 Real HRRR model output (40 isobaric levels, 1059 × 1799 grid, ~1.9 M points). RTX 5090, `python tests/benchmark_gpu.py`.
@@ -231,7 +234,9 @@ These forward to MetPy when installed:
 - `metrust.xarray` (xarray accessor)
 - `metrust.io.Level2File` (NEXRAD Level II)
 
-Core `metrust.calc` stays native Rust by default with no required MetPy dependency. A small parity-sensitive subset may delegate to MetPy when it is installed; otherwise those paths still fall back to local metrust implementations. The optional `met-cu` backend is an explicit accelerator, not a requirement.
+Core `metrust.calc` stays native Rust by default with no required MetPy dependency. The shared calc surface now stays on native metrust implementations even when MetPy is installed. The optional `met-cu` backend is an explicit accelerator, not a requirement.
+
+End-to-end replay benchmarks for sounding, grid, and xarray workflows live in `benches/bench_workflows.py` and the published docs page `workflow-benchmarks.md`.
 
 ## Examples
 

{metrust-0.4.2 → metrust-0.4.4}/README.md

@@ -101,6 +101,9 @@ Benchmarked on real-world workflows (v0.3.3, validated by Codex against MetPy):
 | MetPy isentropic example | **2.3x** | Isentropic interpolation + Montgomery |
 | Vorticity/divergence (global grid) | **2.3x** | Spherical corrections on 721x1440 |
 
+Current replay-harness snapshot from `benches/bench_workflows.py` on Windows 11 / Python `3.13.7`:
+sounding `2.16x`, grid diagnostics `8.53x`, xarray workflow `1.46x`.
+
 ### Three-Way Benchmark: MetPy vs Rust vs CUDA
 
 Real HRRR model output (40 isobaric levels, 1059 × 1799 grid, ~1.9 M points). RTX 5090, `python tests/benchmark_gpu.py`.
@@ -207,7 +210,9 @@ These forward to MetPy when installed:
 - `metrust.xarray` (xarray accessor)
 - `metrust.io.Level2File` (NEXRAD Level II)
 
-Core `metrust.calc` stays native Rust by default with no required MetPy dependency. A small parity-sensitive subset may delegate to MetPy when it is installed; otherwise those paths still fall back to local metrust implementations. The optional `met-cu` backend is an explicit accelerator, not a requirement.
+Core `metrust.calc` stays native Rust by default with no required MetPy dependency. The shared calc surface now stays on native metrust implementations even when MetPy is installed. The optional `met-cu` backend is an explicit accelerator, not a requirement.
+
+End-to-end replay benchmarks for sounding, grid, and xarray workflows live in `benches/bench_workflows.py` and the published docs page `workflow-benchmarks.md`.
 
 ## Examples
 

{metrust-0.4.2 → metrust-0.4.4}/benches/bench_python.py

@@ -127,6 +127,7 @@ _raw_calc = None   # metrust._metrust.calc  (T1)
 _mr_calc = None    # metrust.calc            (T2 -- Pint wrapper)
 _mp_calc = None    # metpy.calc              (T3)
 _mp_units = None   # metpy.units.units
+_mr_units = None   # metrust.units.units
 
 
 def _import_raw():
@@ -145,6 +146,14 @@ def _import_metrust():
     return _mr_calc
 
 
+def _import_metrust_units():
+    global _mr_units
+    if _mr_units is None:
+        from metrust.units import units as mu
+        _mr_units = mu
+    return _mr_units
+
+
 def _import_metpy():
     global _mp_calc, _mp_units
     if _mp_calc is None:
@@ -345,8 +354,16 @@ def _bench_wind(tiers):
             lambda: rc.storm_relative_helicity(u_p, v_p, z_p, 1000.0, 10.0, 5.0)))
     if 2 in tiers:
         mc = _import_metrust()
+        mu = _import_metrust_units()
         results.append(run_bench(name, 2, "T2 metrust+Pint",
-            lambda: mc.storm_relative_helicity(u_p, v_p, z_p, 1000.0, 10.0, 5.0)))
+            lambda: mc.storm_relative_helicity(
+                z_p * mu.meter,
+                u_p * mu("m/s"),
+                v_p * mu("m/s"),
+                1000 * mu.meter,
+                storm_u=10 * mu("m/s"),
+                storm_v=5 * mu("m/s"),
+            )))
     if 3 in tiers:
         try:
             mpc, mu = _import_metpy()