pyrestoolbox 3.5.0__tar.gz → 3.7.0__tar.gz

{pyrestoolbox-3.5.0 → pyrestoolbox-3.7.0}/.github/workflows/build-wheels.yml

@@ -20,9 +20,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-14, windows-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"
 
@@ -74,11 +74,17 @@ jobs:
           CIBW_TEST_COMMAND: >
             python -c "from pyrestoolbox._accelerator import get_status; s = get_status(); print(s); assert s['rust_available'], f'Rust not loaded: {s}'"
           CIBW_TEST_REQUIRES: "numpy"
-          # Skip tests on Linux (scipy needs OpenBLAS absent in manylinux), macOS (MPFR symbol issue),
-          # and cp38/cp39 (dependency ilt-inversion may not have matching wheels on PyPI yet)
+          # Skip tests on Linux: installing the wheel in the manylinux test
+          # container pulls scipy, whose binary wheels need a newer glibc than
+          # the container has, so pip builds scipy from source and fails on
+          # missing OpenBLAS (this broke the v3.6.0 first build attempt - the
+          # skip is load-bearing, do not remove it). Linux import + full-suite
+          # coverage lives in .github/workflows/tests.yml instead.
+          # Also skip macOS (MPFR symbol issue) and cp38/cp39 (dependency
+          # ilt-inversion may not have matching wheels on PyPI yet).
           CIBW_TEST_SKIP: "*-manylinux* *-macosx* cp38-* cp39-*"
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: wheels-${{ matrix.os }}
           path: ./wheelhouse/*.whl
@@ -89,9 +95,9 @@ jobs:
     runs-on: macos-13
     if: false  # Enable when macos-13 runners are available, or use cross-compilation
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
 
@@ -108,7 +114,7 @@ jobs:
             python -c "from pyrestoolbox._accelerator import get_status; s = get_status(); print(s); assert s['rust_available'], f'Rust not loaded: {s}'"
           CIBW_TEST_REQUIRES: "numpy"
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: wheels-macos-x86
           path: ./wheelhouse/*.whl
@@ -118,9 +124,9 @@ jobs:
     name: Build pure-Python wheel
     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"
 
@@ -130,7 +136,7 @@ jobs:
       - name: Build pure-Python wheel
         run: python build_pure_python.py
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: wheels-pure-python
           path: ./dist/*.whl
@@ -140,9 +146,9 @@ jobs:
     name: Build source distribution
     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"
 
@@ -155,7 +161,7 @@ jobs:
       - name: Build sdist
         run: maturin sdist --out dist
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: sdist
           path: ./dist/*.tar.gz
@@ -170,9 +176,10 @@ jobs:
       name: pypi
       url: https://pypi.org/project/pyrestoolbox/
     permissions:
-      id-token: write  # trusted publishing
+      id-token: write   # trusted publishing
+      contents: write   # create the GitHub Release
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v7
         with:
           path: dist
           merge-multiple: true
@@ -181,3 +188,37 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: dist/
+
+      # ── Create a notes-only GitHub Release (no binaries; PyPI is canonical) ──
+      - uses: actions/checkout@v5
+
+      - name: Extract release notes from changelist
+        run: |
+          VERSION="${GITHUB_REF_NAME#v}"
+          python3 - "$VERSION" > release_notes.md <<'PY'
+          import sys, re
+          ver = sys.argv[1]
+          out, capture = [], False
+          for ln in open('pyrestoolbox/docs/changelist.rst', encoding='utf-8').read().splitlines():
+              if ln.startswith('Changelist in '):
+                  if capture:
+                      break
+                  capture = (ln.strip() == f'Changelist in {ver}:')
+                  continue
+              if capture:
+                  out.append(ln)
+          body = '\n'.join(out).strip()
+          # Light RST -> Markdown cleanup so it renders on the Releases page
+          body = re.sub(r'\\?\s?:sub:`([^`]*)`(?:\\ )?', r'\1', body)  # S\ :sub:`hvf`\  -> Shvf
+          body = re.sub(r'``([^`]+)``', r'`\1`', body)                # ``x`` -> `x`
+          body = body.replace('\\ ', ' ')
+          if not body:
+              body = f'Release {ver}. See docs/changelist.rst for details.'
+          print(body)
+          PY
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v3
+        with:
+          name: ${{ github.ref_name }}
+          body_path: release_notes.md

pyrestoolbox-3.7.0/.github/workflows/tests.yml

@@ -0,0 +1,64 @@
+name: Tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+permissions:
+  contents: read
+
+jobs:
+  # ── Pure-Python test suite (no Rust extension) ───────────────────────
+  test-pure-python:
+    name: Pure Python (PYRESTOOLBOX_NO_RUST=1)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: pip install numpy scipy pandas tabulate openpyxl mpmath ilt-inversion pytest
+
+      - name: Run test suite (pure Python)
+        env:
+          PYRESTOOLBOX_NO_RUST: "1"
+        run: python3 -m pytest pyrestoolbox/tests/ -q
+
+  # ── Full test suite with Rust extension (includes parity tests) ──────
+  test-with-rust:
+    name: Rust-accelerated (parity tests)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.10"
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install m4 (needed by gmp-mpfr-sys for the rug crate)
+        run: sudo apt-get update -qq && sudo apt-get install -y -qq m4
+
+      - name: Install dependencies
+        run: pip install numpy scipy pandas tabulate openpyxl mpmath ilt-inversion pytest maturin
+
+      - name: Build Rust extension wheel
+        run: maturin build --release --out dist
+
+      # Tests import the repo source tree, so the compiled extension must
+      # live inside it for the Rust paths to load.
+      - name: Copy extension into source tree
+        run: unzip -o dist/*.whl "pyrestoolbox/_native*" -d .
+
+      - name: Verify Rust extension loads
+        run: python3 -c "from pyrestoolbox._accelerator import get_status; s = get_status(); print(s); assert s['rust_available'], s"
+
+      - name: Run full test suite (Rust + parity)
+        run: python3 -m pytest pyrestoolbox/tests/ -q

{pyrestoolbox-3.5.0 → pyrestoolbox-3.7.0}/.gitignore

@@ -18,6 +18,7 @@ __pycache__/
 # Claude Code
 .claude/
 CLAUDE.md
+HANDOFF.md
 
 # Jupyter checkpoints
 .ipynb_checkpoints/
@@ -36,9 +37,9 @@ target/
 *.rtf
 *.VFP
 *.png
-
-# Standalone ILT development (lives in ilt-inversion repo)
-ilt/
-benchmark_ilt.py
-benchmark_rust.py
-BUILD_INSTRUCTIONS.txt
+
+# Standalone ILT development (lives in ilt-inversion repo)
+ilt/
+benchmark_ilt.py
+benchmark_rust.py
+BUILD_INSTRUCTIONS.txt

{pyrestoolbox-3.5.0 → pyrestoolbox-3.7.0}/Cargo.lock

@@ -152,7 +152,7 @@ dependencies = [
 
 [[package]]
 name = "pyrestoolbox-native"
-version = "0.1.0"
+version = "3.7.0"
 dependencies = [
  "pyo3",
  "rug",

{pyrestoolbox-3.5.0 → pyrestoolbox-3.7.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyrestoolbox-native"
-version = "0.1.0"
+version = "3.7.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
 description = "Rust acceleration extensions for pyResToolbox"

{pyrestoolbox-3.5.0 → pyrestoolbox-3.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrestoolbox
-Version: 3.5.0
+Version: 3.7.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

{pyrestoolbox-3.5.0 → pyrestoolbox-3.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "pyrestoolbox"
-version = "3.5.0"
+version = "3.7.0"
 description = "pyResToolbox - A collection of Reservoir Engineering Utilities"
 license = {text = "GPL-3.0-or-later"}
 authors = [{name = "Mark W. Burgoyne", email = "mark.w.burgoyne@gmail.com"}]

{pyrestoolbox-3.5.0 → pyrestoolbox-3.7.0}/pyrestoolbox/__init__.py

@@ -67,13 +67,45 @@ def __dir__():
     return __all__
 
 
+def _get_version():
+    """Resolve the package version lazily.
+
+    A repo checkout has pyproject.toml next to the package directory; read it
+    so the version matches the imported code even when a different release is
+    installed in site-packages. Installed packages have no adjacent
+    pyproject.toml and use distribution metadata instead.
+    """
+    import os
+    import re
+    pyproject = os.path.join(
+        os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+        'pyproject.toml',
+    )
+    try:
+        with open(pyproject, encoding='utf-8') as f:
+            text = f.read()
+        if re.search(r'^name\s*=\s*"pyrestoolbox"', text, re.M):
+            match = re.search(r'^version\s*=\s*"([^"]+)"', text, re.M)
+            if match:
+                return match.group(1)
+    except OSError:
+        pass
+    try:
+        from importlib.metadata import version, PackageNotFoundError
+        try:
+            return version('pyrestoolbox')
+        except PackageNotFoundError:
+            pass
+    except ImportError:  # Python < 3.8 has no importlib.metadata
+        pass
+    return 'unknown'
+
+
 def __getattr__(name):
     if name in submodules:
         return importlib.import_module(f'pyrestoolbox.{name}')
-    else:
-        try:
-            return globals()[name]
-        except KeyError:
-            raise AttributeError(
-                f"Module 'pyrestoolbox' has no attribute '{name}'"
-            )
+    if name == '__version__':
+        return _get_version()
+    raise AttributeError(
+        f"Module 'pyrestoolbox' has no attribute '{name}'"
+    )