rock-physics-open 0.1.3__tar.gz → 0.2.1__tar.gz

rock_physics_open-0.2.1/.github/release-please-manifest.json

@@ -0,0 +1 @@
+{".":"0.2.1"}

{rock_physics_open-0.1.3 → rock_physics_open-0.2.1}/.github/workflows/on-push-main.yaml

@@ -1,7 +1,6 @@
 name: push to main branch
 
 on:
-  pull_request:
   push:
     branches:
       - main
@@ -19,7 +18,7 @@ jobs:
 
   build:
     name: Build for publishing
-    if: true
+    if: ${{ needs.release-please.outputs.release_created }}
     needs: release-please
     runs-on: ubuntu-latest
     steps:

{rock_physics_open-0.1.3 → rock_physics_open-0.2.1}/.github/workflows/test.yaml

@@ -9,6 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        python-version: ["3.11", "3.12"]
         config:
           - {
             artifact: "Windows-MSVC",
@@ -32,7 +33,7 @@ jobs:
           }
 
     runs-on: ${{ matrix.config.os }}
-    name: ${{ matrix.config.artifact }} (${{ matrix.config.os }}, ${{ matrix.config.cc }}/${{ matrix.config.cxx }})
+    name: ${{ matrix.config.artifact }} (${{ matrix.config.os }}, ${{ matrix.config.cc }}/${{ matrix.config.cxx }}) - ${{ matrix.python-version }}
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -40,7 +41,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
-        python-version: 3.11
+        python-version: ${{ matrix.python-version }}
 
     - name: Upgrade Pip
       run: pip install --upgrade pip

{rock_physics_open-0.1.3 → rock_physics_open-0.2.1}/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.2.1](https://github.com/equinor/rock-physics-open/compare/v0.2.0...v0.2.1) (2025-08-14)
+
+
+### Bug Fixes
+
+* Test/robust snapshot ([#35](https://github.com/equinor/rock-physics-open/issues/35)) ([4d169d7](https://github.com/equinor/rock-physics-open/commit/4d169d7b0e2e464a6e50e8583213bc029f20bc2a))
+
+## [0.2.0](https://github.com/equinor/rock-physics-open/compare/v0.1.3...v0.2.0) (2025-06-02)
+
+
+### Features
+
+* add support for Python 3.12 ([1de7cb3](https://github.com/equinor/rock-physics-open/commit/1de7cb318cbd0b8e01e54de1f8e9842ae32a4e17))
+
+
+### Bug Fixes
+
+* make get_snapshot_name more robust in search for calling function ([#31](https://github.com/equinor/rock-physics-open/issues/31)) ([e9e9ebd](https://github.com/equinor/rock-physics-open/commit/e9e9ebd8d9d101fa2a2bdd924f6f12be73476de7))
+
 ## [0.1.3](https://github.com/equinor/rock-physics-open/compare/v0.1.2...v0.1.3) (2025-05-13)
 
 

{rock_physics_open-0.1.3/src/rock_physics_open.egg-info → rock_physics_open-0.2.1}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: rock_physics_open
-Version: 0.1.3
+Version: 0.2.1
 Summary: Equinor Rock Physics Module
 Author-email: Harald Flesche <hfle@equinor.com>, Eivind Jahren <ejah@equinor.com>, Jimmy Zurcher <jiz@equinor.com>
 Maintainer-email: Harald Flesche <hfle@equinor.com>, Eirik Ola Aksnes <eoaksnes@equinor.com>, Christopher Collin Løkken <chcl@equinor.com>, Sivert Utne <sutn@equinor.com>
 Project-URL: Repository, https://github.com/equinor/rock-physics-open
 Project-URL: Homepage, https://github.com/equinor/rock-physics-open
+Project-URL: Changelog, https://github.com/equinor/rock-physics-open/blob/main/CHANGELOG.md
 Keywords: energy,subsurface,seismic,rock physics,scientific,engineering
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering
@@ -14,6 +15,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Natural Language :: English
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -78,7 +80,7 @@ Alternatively, you can update the dependencies in your `pyproject.toml` file:
 <!-- x-release-please-start-version -->
 ```toml
 dependencies = [
-    "rock-physics-open == 0.1.3",
+    "rock-physics-open == 0.2.1",
 ]
 ```
 <!-- x-release-please-end-version -->

{rock_physics_open-0.1.3 → rock_physics_open-0.2.1}/README.md

@@ -44,7 +44,7 @@ Alternatively, you can update the dependencies in your `pyproject.toml` file:
 <!-- x-release-please-start-version -->
 ```toml
 dependencies = [
-    "rock-physics-open == 0.1.3",
+    "rock-physics-open == 0.2.1",
 ]
 ```
 <!-- x-release-please-end-version -->

{rock_physics_open-0.1.3 → rock_physics_open-0.2.1}/pyproject.toml

@@ -45,6 +45,7 @@ classifiers = [
     "Topic :: Utilities",
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Natural Language :: English",
 ]
 dynamic = ["version"]
@@ -69,6 +70,7 @@ tests = [
 [project.urls]
 Repository = "https://github.com/equinor/rock-physics-open"
 Homepage = "https://github.com/equinor/rock-physics-open"
+Changelog = "https://github.com/equinor/rock-physics-open/blob/main/CHANGELOG.md"
 
 [tool.ruff]
 lint.select = [

{rock_physics_open-0.1.3 → rock_physics_open-0.2.1}/src/rock_physics_open/equinor_utilities/snapshot_test_utilities/compare_snapshots.py

@@ -11,18 +11,19 @@ from rock_physics_open.equinor_utilities.various_utilities import disp_result_st
 
 from .snapshots import get_snapshot_name
 
-DISPLAY_RESULTS = False
-
 
 def compare_snapshots(
     test_results: Union[np.ndarray, tuple, DataFrame],
     saved_results: tuple,
+    name_arr=None,
+    display_results: bool = False,
 ) -> bool:
     test_results = _validate_input(test_results, saved_results)
 
-    if DISPLAY_RESULTS:
+    if display_results:
         title = str(inspect.stack()[1].function)
-        name_arr = [f"arr_{i}" for i in range(len(test_results))]
+        if not name_arr:
+            name_arr = [f"arr_{i}" for i in range(len(test_results))]
         disp_result_stats(title, test_results, name_arr)
 
     r_tol = 0.01

{rock_physics_open-0.1.3 → rock_physics_open-0.2.1}/src/rock_physics_open/equinor_utilities/snapshot_test_utilities/snapshots.py

@@ -1,5 +1,4 @@
 import inspect
-import os
 from pathlib import Path
 
 import numpy as np
@@ -7,9 +6,14 @@ import numpy as np
 INITIATE = False
 
 
-def get_snapshot_name(step: int = 1, include_snapshot_dir=True) -> str:
+def get_snapshot_name(
+    step: int = 1,
+    include_filename: bool = True,
+    include_function_name: bool = True,
+    include_extension: bool = True,
+    include_snapshot_dir=True,
+) -> str:
     """
-
     Parameters
     ----------
     step: number of steps in the trace to collect information from
@@ -18,15 +22,29 @@ def get_snapshot_name(step: int = 1, include_snapshot_dir=True) -> str:
     Returns
     -------
     name of snapshot file
-
     """
-    # Get filename and function name of calling function
     trace = inspect.stack()
-    dir_name = Path(trace[step].filename).parent.joinpath("snapshots")
-    file_name = "_".join(
-        (Path(trace[step].filename).stem, trace[step].function + ".npz")
-    )
-    return os.path.join(dir_name, file_name) if include_snapshot_dir else file_name
+    for frame in trace[step:]:
+        if not any(
+            keyword in frame.function
+            for keyword in [
+                "pydev",
+                "ipython-input",
+                "interactiveshell",
+                "async_helpers",
+            ]
+        ):
+            break
+    else:
+        frame = trace[step]
+
+    dir_name = Path(frame.filename).parent / "snapshots"
+    file_name = Path(frame.filename).stem if include_filename else ""
+    function_name = frame.function if include_function_name else ""
+    extension = ".npz" if include_extension else ""
+    parts = [part for part in [file_name, function_name] if part]
+    base_name = "_".join(parts) + extension
+    return str(dir_name / base_name) if include_snapshot_dir else base_name
 
 
 def store_snapshot(snapshot_name: str, *args: np.ndarray) -> bool:

{rock_physics_open-0.1.3 → rock_physics_open-0.2.1}/src/rock_physics_open/span_wagner/co2_properties.py

@@ -1,5 +1,6 @@
+import importlib
+
 import numpy as np
-import pkg_resources
 import scipy.optimize
 from scipy.interpolate import RegularGridInterpolator
 
@@ -420,11 +421,16 @@ def carbon_dioxide_density(absolute_temperature, pressure, interpolate=False, **
             absolute_temperature, pressure, **kwargs
         )
     assert interpolate is True
-    fp = pkg_resources.resource_filename(
-        "rock_physics.fluid_models.gas_model.span_wagner.tables",
-        "carbon_dioxide_density.npz",
+
+    ref = (
+        importlib.resources.files(
+            "rock_physics.fluid_models.gas_model.span_wagner.tables"
+        )
+        / "carbon_dioxide_density.npz"
     )
-    interpolator = load_lookup_table_interpolator(fp)
+    with importlib.resources.as_file(ref) as fp:
+        interpolator = load_lookup_table_interpolator(fp)
+
     return interpolator(absolute_temperature, pressure)
 
 

{rock_physics_open-0.1.3 → rock_physics_open-0.2.1}/src/rock_physics_open/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.3'
-__version_tuple__ = version_tuple = (0, 1, 3)
+__version__ = version = '0.2.1'
+__version_tuple__ = version_tuple = (0, 2, 1)

{rock_physics_open-0.1.3 → rock_physics_open-0.2.1/src/rock_physics_open.egg-info}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: rock_physics_open
-Version: 0.1.3
+Version: 0.2.1
 Summary: Equinor Rock Physics Module
 Author-email: Harald Flesche <hfle@equinor.com>, Eivind Jahren <ejah@equinor.com>, Jimmy Zurcher <jiz@equinor.com>
 Maintainer-email: Harald Flesche <hfle@equinor.com>, Eirik Ola Aksnes <eoaksnes@equinor.com>, Christopher Collin Løkken <chcl@equinor.com>, Sivert Utne <sutn@equinor.com>
 Project-URL: Repository, https://github.com/equinor/rock-physics-open
 Project-URL: Homepage, https://github.com/equinor/rock-physics-open
+Project-URL: Changelog, https://github.com/equinor/rock-physics-open/blob/main/CHANGELOG.md
 Keywords: energy,subsurface,seismic,rock physics,scientific,engineering
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering
@@ -14,6 +15,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Natural Language :: English
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -78,7 +80,7 @@ Alternatively, you can update the dependencies in your `pyproject.toml` file:
 <!-- x-release-please-start-version -->
 ```toml
 dependencies = [
-    "rock-physics-open == 0.1.3",
+    "rock-physics-open == 0.2.1",
 ]
 ```
 <!-- x-release-please-end-version -->

rock_physics_open-0.1.3/.github/release-please-manifest.json

@@ -1 +0,0 @@
-{".":"0.1.3"}