rock-physics-open 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

rock_physics_open/equinor_utilities/snapshot_test_utilities/compare_snapshots.py

@@ -32,12 +32,16 @@ def compare_snapshots(
 
     for i, (test_item, saved_item) in enumerate(zip(test_results, saved_results)):
         try:
+            if name_arr:
+                err_msg = f"saved and generated result for {name_arr[i]} differ"
+            else:
+                err_msg = f"saved result for variable {i} differ"
             np.testing.assert_allclose(
                 test_item,
                 saved_item,
                 rtol=r_tol,
                 equal_nan=equal_nan,
-                err_msg=f"saved and generated result for variable {i} differ",
+                err_msg=err_msg,
             )
         except AssertionError as error:
             open_mode = "w" if no_difference_found else "a"
@@ -46,9 +50,14 @@ def compare_snapshots(
             log_file = re.sub("npz", "log", get_snapshot_name(step=2))
 
             with open(log_file, open_mode) as file:
-                file.write(f"Test filepath: {str(inspect.stack()[1].filename)} \n")
-                file.write(f"Test function: {str(inspect.stack()[1].function)} \n")
-                file.write(f"Test variable number: {i} \n")
+                file.write(
+                    f"Test function: "
+                    f"{get_snapshot_name(include_extension=False, include_snapshot_dir=False, include_filename=False)} \n"
+                )
+                if name_arr:
+                    file.write(f"Test variable: {name_arr[i]} \n")
+                else:
+                    file.write(f"Test variable number: {i} \n")
 
                 for line in str(error).splitlines():
                     mismatched_elements_index = (
@@ -72,7 +81,7 @@ def compare_snapshots(
                         file.write(line + "\n")
                         continue
 
-                    reg_index = re.search(r"\d+ differ", line)
+                    reg_index = re.search(r"differ", line)
 
                     if reg_index:
                         if isinstance(test_item, np.ndarray):
@@ -91,7 +100,7 @@ def compare_snapshots(
                             tab = "\t"
                             for difference in differences:
                                 file.write(
-                                    f"{tab}[{difference[0]:4}]=> {difference[1]:.4g} != {difference[2]:.4g}\n"
+                                    f"{tab}[{difference[0]:4}]=> {difference[1]:.8g} != {difference[2]:.8g}\n"
                                 )
                             file.write(f"{'_' * 40}\n")
     return no_difference_found

rock_physics_open/equinor_utilities/snapshot_test_utilities/snapshots.py

@@ -5,6 +5,34 @@ import numpy as np
 
 INITIATE = False
 
+SYSTEM_AND_DEBUG_FCN = [
+    "pydev",
+    "ipython-input",
+    "interactiveshell",
+    "async_helpers",
+    "handle_snapshots",
+    "run_code",
+    "run_ast_nodes",
+    "run_cell_async",
+    "_pseudo_sync_runner",
+    "_run_cell",
+    "run_cell",
+    "add_exec",
+    "do_add_exec",
+    "add_exec",
+    "ipython_exec_code",
+    "console_exec",
+    "do_it",
+    "process_internal_commands",
+    "_do_wait_suspend",
+    "do_wait_suspend",
+    "compare_snapshots",
+    "handle_snapshots",
+    "wrapper",
+    "run_tests",
+    "<module>",
+]
+
 
 def get_snapshot_name(
     step: int = 1,
@@ -18,6 +46,9 @@ def get_snapshot_name(
     ----------
     step: number of steps in the trace to collect information from
     include_snapshot_dir: absolute directory name included in snapshot name
+    include_filename: whether to include filename in snapshot name
+    include_function_name: whether to include function name in snapshot name
+    include_extension: whether to include extension in snapshot name
 
     Returns
     -------
@@ -25,20 +56,12 @@ def get_snapshot_name(
     """
     trace = inspect.stack()
     for frame in trace[step:]:
-        if not any(
-            keyword in frame.function
-            for keyword in [
-                "pydev",
-                "ipython-input",
-                "interactiveshell",
-                "async_helpers",
-            ]
-        ):
+        if not any(keyword in frame.function for keyword in SYSTEM_AND_DEBUG_FCN):
             break
     else:
         frame = trace[step]
 
-    dir_name = Path(frame.filename).parent / "snapshots"
+    dir_name = Path(frame.filename).parents[1] / "data" / "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 ""

rock_physics_open/version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.1'
-__version_tuple__ = version_tuple = (0, 2, 1)
+__version__ = version = '0.2.3'
+__version_tuple__ = version_tuple = (0, 2, 3)
+
+__commit_id__ = commit_id = None

{rock_physics_open-0.2.1.dist-info → rock_physics_open-0.2.3.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: rock_physics_open
-Version: 0.2.1
+Version: 0.2.3
 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>
+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>, Einar Wigum Arbo <earb@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
@@ -80,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.2.1",
+    "rock-physics-open == 0.2.3",
 ]
 ```
 <!-- x-release-please-end-version -->

{rock_physics_open-0.2.1.dist-info → rock_physics_open-0.2.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rock_physics_open/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rock_physics_open/version.py,sha256=UoNvMtd4wCG76RwoSpNCUtaFyTwakGcZolfjXzNVSMY,511
+rock_physics_open/version.py,sha256=kBRz0P2plw1eVdIpt70W6m1LMbEIhLY3RyOfVGdubaI,704
 rock_physics_open/equinor_utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rock_physics_open/equinor_utilities/anisotropy.py,sha256=toEsuIW_gHr34gZQpam3sQTl0ap6nAq1pW5hcX9GOHI,4469
 rock_physics_open/equinor_utilities/conversions.py,sha256=d6SGPbzYsmYBvhDqnohg1lPjAeYGOc0z_vdsuFeNlb4,194
@@ -23,8 +23,8 @@ rock_physics_open/equinor_utilities/machine_learning_utilities/import_ml_models.
 rock_physics_open/equinor_utilities/machine_learning_utilities/run_regression.py,sha256=L0bCEsMCvcOn6Ji9oDLztY-TaEEYvp1b7bYZQSJ_-II,4799
 rock_physics_open/equinor_utilities/machine_learning_utilities/sigmoidal_model.py,sha256=XczrkhwSF1bAO0XcYMirbj0ilLyZG6RgT7cX2owPufw,6001
 rock_physics_open/equinor_utilities/snapshot_test_utilities/__init__.py,sha256=lcbI80ZH6JQS0jI-eUITFBafHVRdhQ5VwttPolHnJyI,255
-rock_physics_open/equinor_utilities/snapshot_test_utilities/compare_snapshots.py,sha256=DBF9SNrC7H2V_zTNjmWK-Nz5b0uqNdx5Nktt858VJak,5457
-rock_physics_open/equinor_utilities/snapshot_test_utilities/snapshots.py,sha256=CXLttELG2krN41WYph-zUFnhE3852g3HZlkp7yTTlIE,2085
+rock_physics_open/equinor_utilities/snapshot_test_utilities/compare_snapshots.py,sha256=l2F9C1NQOwHJG6_HPOO0daWSaUg5N5-PFx45-j90N7g,5759
+rock_physics_open/equinor_utilities/snapshot_test_utilities/snapshots.py,sha256=_UvX78IoPDPTCAbblHD9fH_Yn-LwkDOA9MuU69bPdbM,2691
 rock_physics_open/equinor_utilities/std_functions/__init__.py,sha256=MLOfMxRazS9tGOVvuLkUp-E4b6jRWOP4YCLf8si624c,1121
 rock_physics_open/equinor_utilities/std_functions/backus_ave.py,sha256=sYaXSfqjR69U_UFaMmrD5aEbR_0FrL7ZIWGg-Yi8QNo,1607
 rock_physics_open/equinor_utilities/std_functions/dvorkin_nur.py,sha256=TerlLcuP92ihf5vHaJES5KLyleG3CR7NWSExDI1jLIY,2138
@@ -135,8 +135,8 @@ rock_physics_open/ternary_plots/shale_prop_ternary.py,sha256=5-NB4LoXRP7JPQYaJBZ
 rock_physics_open/ternary_plots/ternary_patches.py,sha256=oYaIkCbzC4L19VWBz5iphVdQnpHX9kdy0p2NK65aIIM,7256
 rock_physics_open/ternary_plots/ternary_plot_utilities.py,sha256=weFDWyzd7wgr3xB63Q-xtT-KoJA6FNIDWuTkA7jr94Q,5669
 rock_physics_open/ternary_plots/unconventionals_ternary.py,sha256=KWjcBrjI8Tgr2FYpz1ey-DPuhUeSC7b5mpN8OzwNa4I,1823
-rock_physics_open-0.2.1.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-rock_physics_open-0.2.1.dist-info/METADATA,sha256=AmuCWkHVmurlmByxtjArsXpe_OEm1ZvfbMDunRy1yLA,4077
-rock_physics_open-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rock_physics_open-0.2.1.dist-info/top_level.txt,sha256=zFBbfbv2pshFJvcvcLLigDmlJjjg08iDdb6ABgncaP8,18
-rock_physics_open-0.2.1.dist-info/RECORD,,
+rock_physics_open-0.2.3.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+rock_physics_open-0.2.3.dist-info/METADATA,sha256=hBSKTCwVUb9KD9Fesl_WeRcbz7VDDW8SnIbUCsAHwIA,4114
+rock_physics_open-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rock_physics_open-0.2.3.dist-info/top_level.txt,sha256=zFBbfbv2pshFJvcvcLLigDmlJjjg08iDdb6ABgncaP8,18
+rock_physics_open-0.2.3.dist-info/RECORD,,