From f0076cc552e79835718e2cc2277f4eec1d05f353 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 19 Aug 2025 14:15:53 -0700 Subject: [PATCH 1/4] Update all imports --- pyproject.toml | 4 ++-- simpeg_drivers/components/meshes.py | 6 +++--- simpeg_drivers/joint/driver.py | 2 +- simpeg_drivers/plate_simulation/driver.py | 2 +- simpeg_drivers/plate_simulation/options.py | 4 ++-- simpeg_drivers/utils/meshes.py | 6 +++--- simpeg_drivers/utils/utils.py | 2 +- tests/data_test.py | 4 ++-- tests/meshes_test.py | 2 +- tests/plate_simulation/models/__init__.py | 6 +++--- tests/testing_utils.py | 4 ++-- tests/utils_meshes_test.py | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 21605cd5..70cb2c40 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -79,8 +79,8 @@ python-mumps = ">=0.0.3, <0.0.4.dev" #geoh5py = {version = ">=0.12.0a, <0.13.dev", source = "pypi", allow-prereleases = true} geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"} -#octree-creation-app = {version = ">=0.4.0a, <0.5.dev", source = "pypi", allow-prereleases = true} -octree-creation-app = {git = "https://github.com/MiraGeoscience/octree-creation-app.git", rev = "develop"} +#grid-apps = {version = ">=0.1.0a, <0.2.dev", source = "pypi", allow-prereleases = true} +grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "develop"} #geoapps-utils = {version = ">=0.6.0a, <0.7.dev", source = "pypi", allow-prereleases = true} geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"} diff --git a/simpeg_drivers/components/meshes.py b/simpeg_drivers/components/meshes.py index 2bc9722f..91df9b91 100644 --- a/simpeg_drivers/components/meshes.py +++ b/simpeg_drivers/components/meshes.py @@ -19,9 +19,9 @@ from geoh5py import Workspace from geoh5py.groups import UIJsonGroup from geoh5py.objects import DrapeModel, Octree -from octree_creation_app.driver import OctreeDriver -from octree_creation_app.params import OctreeParams -from octree_creation_app.utils import octree_2_treemesh, treemesh_2_octree +from grid_apps.octree_creation.driver import OctreeDriver +from grid_apps.octree_creation.options import OctreeOptions +from grid_apps.utils import octree_2_treemesh, treemesh_2_octree from scipy.sparse import csr_matrix, identity from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index 6f698fc1..7a989644 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -20,7 +20,7 @@ import numpy as np from geoh5py.groups.property_group_type import GroupTypeEnum from geoh5py.shared.utils import fetch_active_workspace -from octree_creation_app.utils import ( +from grid_apps.utils import ( collocate_octrees, create_octree_from_octrees, treemesh_2_octree, diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index 0956e31c..ab2f83d5 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -21,7 +21,7 @@ from geoh5py.objects import Octree, Points, Surface from geoh5py.shared.utils import fetch_active_workspace from geoh5py.ui_json import InputFile, monitored_directory_copy -from octree_creation_app.driver import OctreeDriver +from grid_apps.octree_creation.driver import OctreeDriver from param_sweeps.generate import generate from simpeg_drivers.driver import InversionDriver, InversionLogger diff --git a/simpeg_drivers/plate_simulation/options.py b/simpeg_drivers/plate_simulation/options.py index bf5e35c5..8ae8132e 100644 --- a/simpeg_drivers/plate_simulation/options.py +++ b/simpeg_drivers/plate_simulation/options.py @@ -16,7 +16,7 @@ from geoh5py.groups import SimPEGGroup, UIJsonGroup from geoh5py.objects import ObjectBase, Points, Surface from geoh5py.ui_json import InputFile -from octree_creation_app.params import OctreeParams +from grid_apps.octree_creation.options import OctreeOptions from pydantic import BaseModel from simpeg_drivers import assets_path @@ -90,7 +90,7 @@ def octree_params( } ) - octree_params = OctreeParams( + octree_params = OctreeOptions( geoh5=survey.workspace, objects=survey, u_cell_size=self.u_cell_size, diff --git a/simpeg_drivers/utils/meshes.py b/simpeg_drivers/utils/meshes.py index 77215ec7..290a08e4 100644 --- a/simpeg_drivers/utils/meshes.py +++ b/simpeg_drivers/utils/meshes.py @@ -25,7 +25,7 @@ from geoh5py.groups import UIJsonGroup from geoh5py.objects import ObjectBase from geoh5py.shared.utils import fetch_active_workspace -from octree_creation_app.params import OctreeParams +from grid_apps.octree_creation.options import OctreeOptions from simpeg_drivers.utils.surveys import station_spacing @@ -72,7 +72,7 @@ def auto_mesh_parameters( topography_refinement: list[int] | None = None, cell_size_factor: int = 2, inversion_type: str | None = None, -) -> OctreeParams: +) -> OctreeOptions: """ Return a mesh optimized for the provided data extents and spacing. @@ -126,7 +126,7 @@ def auto_mesh_parameters( ], "out_group": out_group, } - params = OctreeParams(**params_dict) + params = OctreeOptions(**params_dict) options = params.serialize() options.pop("out_group") out_group.options = options diff --git a/simpeg_drivers/utils/utils.py b/simpeg_drivers/utils/utils.py index 11c87a79..25dafe6f 100644 --- a/simpeg_drivers/utils/utils.py +++ b/simpeg_drivers/utils/utils.py @@ -28,7 +28,7 @@ from geoh5py.objects.surveys.electromagnetics.base import LargeLoopGroundEMSurvey from geoh5py.shared import INTEGER_NDV from geoh5py.ui_json import InputFile -from octree_creation_app.utils import octree_2_treemesh +from grid_apps.utils import octree_2_treemesh from scipy.interpolate import LinearNDInterpolator, NearestNDInterpolator, interp1d from scipy.spatial import ConvexHull, Delaunay, cKDTree diff --git a/tests/data_test.py b/tests/data_test.py index 9d40dfca..e376b4cb 100644 --- a/tests/data_test.py +++ b/tests/data_test.py @@ -17,8 +17,8 @@ from discretize.utils import mesh_builder_xyz from geoh5py.objects import Points from geoh5py.workspace import Workspace -from octree_creation_app.driver import OctreeDriver -from octree_creation_app.utils import treemesh_2_octree +from grid_apps.octree_creation.driver import OctreeDriver +from grid_apps.utils import treemesh_2_octree from simpeg_drivers.components import InversionData from simpeg_drivers.electricals.direct_current.three_dimensions.options import ( diff --git a/tests/meshes_test.py b/tests/meshes_test.py index d492c1c8..e920750a 100644 --- a/tests/meshes_test.py +++ b/tests/meshes_test.py @@ -17,7 +17,7 @@ from discretize import TreeMesh from geoh5py import Workspace from geoh5py.objects import Octree -from octree_creation_app.utils import treemesh_2_octree +from grid_apps.utils import treemesh_2_octree from simpeg_drivers.components import InversionMesh from simpeg_drivers.options import ActiveCellsOptions diff --git a/tests/plate_simulation/models/__init__.py b/tests/plate_simulation/models/__init__.py index 87638e04..561190ae 100644 --- a/tests/plate_simulation/models/__init__.py +++ b/tests/plate_simulation/models/__init__.py @@ -10,8 +10,8 @@ import numpy as np from geoh5py.objects import Surface -from octree_creation_app.driver import OctreeDriver -from octree_creation_app.params import OctreeParams +from grid_apps.octree_creation.driver import OctreeDriver +from grid_apps.octree_creation.options import OctreeOptions def get_topo_mesh(workspace): @@ -46,7 +46,7 @@ def get_topo_mesh(workspace): } ], } - params = OctreeParams(**kwargs) + params = OctreeOptions(**kwargs) params.write_ui_json(workspace.h5file.parent / "octree.ui.json") driver = OctreeDriver(params) octree = driver.run() diff --git a/tests/testing_utils.py b/tests/testing_utils.py index da542e98..b2008eb3 100644 --- a/tests/testing_utils.py +++ b/tests/testing_utils.py @@ -33,8 +33,8 @@ TipperBaseStations, TipperReceivers, ) -from octree_creation_app.driver import OctreeDriver -from octree_creation_app.utils import treemesh_2_octree +from grid_apps.octree_creation.driver import OctreeDriver +from grid_apps.utils import treemesh_2_octree from scipy.spatial import Delaunay from simpeg import utils diff --git a/tests/utils_meshes_test.py b/tests/utils_meshes_test.py index cd308164..29217753 100644 --- a/tests/utils_meshes_test.py +++ b/tests/utils_meshes_test.py @@ -24,7 +24,7 @@ import numpy as np from geoh5py import Workspace from geoh5py.objects import Points -from octree_creation_app.driver import OctreeDriver +from grid_apps.octree_creation.driver import OctreeDriver from scipy.interpolate import LinearNDInterpolator from scipy.ndimage import gaussian_filter From f9f129aa0353a75b36648ca78f610a2737e567aa Mon Sep 17 00:00:00 2001 From: dominiquef Date: Wed, 20 Aug 2025 10:46:26 -0700 Subject: [PATCH 2/4] Re-lock --- .../py-3.10-linux-64-dev.conda.lock.yml | 5 +- environments/py-3.10-linux-64.conda.lock.yml | 5 +- .../py-3.10-win-64-dev.conda.lock.yml | 5 +- environments/py-3.10-win-64.conda.lock.yml | 5 +- .../py-3.11-linux-64-dev.conda.lock.yml | 5 +- environments/py-3.11-linux-64.conda.lock.yml | 5 +- .../py-3.11-win-64-dev.conda.lock.yml | 5 +- environments/py-3.11-win-64.conda.lock.yml | 5 +- .../py-3.12-linux-64-dev.conda.lock.yml | 5 +- environments/py-3.12-linux-64.conda.lock.yml | 5 +- .../py-3.12-win-64-dev.conda.lock.yml | 5 +- environments/py-3.12-win-64.conda.lock.yml | 5 +- py-3.10.conda-lock.yml | 60 +++++++++++++++---- py-3.11.conda-lock.yml | 60 +++++++++++++++---- py-3.12.conda-lock.yml | 60 +++++++++++++++---- 15 files changed, 186 insertions(+), 54 deletions(-) diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index 5a3fd877..acb284c8 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: aa70c6c517bbe8472b7de3ce4e8d391ca7e1d86e6bfe0e2a4e53e756c6e8388b +# input_hash: 951d0e25ecbfd95cd4250992ff4a2fd809d3fcbaaff150dc70296bb2f71736c8 channels: - conda-forge @@ -306,7 +306,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 3fcb3bc3..7730b263 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: aa70c6c517bbe8472b7de3ce4e8d391ca7e1d86e6bfe0e2a4e53e756c6e8388b +# input_hash: 951d0e25ecbfd95cd4250992ff4a2fd809d3fcbaaff150dc70296bb2f71736c8 channels: - conda-forge @@ -158,7 +158,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index 394e4aa4..2102f112 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 1f782c60627d60f2457feb3c892be41e0d6af072ae5c102d92ca760ab7d33c09 +# input_hash: afb1c10339c4c180cd200e7fb18bfa0b1a79eeaf2936102a169de6beb9bdf706 channels: - conda-forge @@ -296,7 +296,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index e2a7814e..7ac790a7 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 1f782c60627d60f2457feb3c892be41e0d6af072ae5c102d92ca760ab7d33c09 +# input_hash: afb1c10339c4c180cd200e7fb18bfa0b1a79eeaf2936102a169de6beb9bdf706 channels: - conda-forge @@ -146,7 +146,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index e9929b70..e4a50789 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 8cce520abc7830e77c6c1ae22f85de23c1a3f189a6830f442297dd1ec77be9d5 +# input_hash: 3ee78189e9804da7b2dfd0806eb05c17c2b0d23e3496fe93dd20fc4ee3d5d724 channels: - conda-forge @@ -309,7 +309,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 4322a817..25808ed4 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 8cce520abc7830e77c6c1ae22f85de23c1a3f189a6830f442297dd1ec77be9d5 +# input_hash: 3ee78189e9804da7b2dfd0806eb05c17c2b0d23e3496fe93dd20fc4ee3d5d724 channels: - conda-forge @@ -160,7 +160,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index 0f27d31c..eeafce36 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 45f0aca37ae10be31f2fa4fb7aa7861f4ce4c909c366d8cff8421690d23ebfde +# input_hash: 1b992ff9f8e331f00f3c73c19b2d90a02b15bad512f46790f540c5b81e9a6efd channels: - conda-forge @@ -299,7 +299,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 6a3a0795..4cae0f34 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 45f0aca37ae10be31f2fa4fb7aa7861f4ce4c909c366d8cff8421690d23ebfde +# input_hash: 1b992ff9f8e331f00f3c73c19b2d90a02b15bad512f46790f540c5b81e9a6efd channels: - conda-forge @@ -148,7 +148,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index 46b9ea30..f87ac07c 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 2e48ea762f31ce7d0e20196680dec38b885bd725bb1dc73d18f428e1faa16c06 +# input_hash: 4573afe541246abdcc3b1dd3eaebe69348f71a0bfed06a53c897f32ac38c2fa0 channels: - conda-forge @@ -309,7 +309,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 3496e8df..87d27772 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 2e48ea762f31ce7d0e20196680dec38b885bd725bb1dc73d18f428e1faa16c06 +# input_hash: 4573afe541246abdcc3b1dd3eaebe69348f71a0bfed06a53c897f32ac38c2fa0 channels: - conda-forge @@ -160,7 +160,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index fbd8b395..ac261065 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: f1b3165f9e07e78e108d41f3bc027bfb7c613c94db8a3cc8c190ab178b3d2f2c +# input_hash: d3f6839c7d9ab3576b1808d9f1a2c3c60548a7c2c6a55c70f399e51ee3052040 channels: - conda-forge @@ -299,7 +299,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 7c59f85a..2157042a 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: f1b3165f9e07e78e108d41f3bc027bfb7c613c94db8a3cc8c190ab178b3d2f2c +# input_hash: d3f6839c7d9ab3576b1808d9f1a2c3c60548a7c2c6a55c70f399e51ee3052040 channels: - conda-forge @@ -148,7 +148,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 747b68dc..528c741a 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 1f782c60627d60f2457feb3c892be41e0d6af072ae5c102d92ca760ab7d33c09 - linux-64: aa70c6c517bbe8472b7de3ce4e8d391ca7e1d86e6bfe0e2a4e53e756c6e8388b + win-64: afb1c10339c4c180cd200e7fb18bfa0b1a79eeaf2936102a169de6beb9bdf706 + linux-64: 951d0e25ecbfd95cd4250992ff4a2fd809d3fcbaaff150dc70296bb2f71736c8 channels: - url: conda-forge used_env_vars: [] @@ -8589,8 +8589,48 @@ package: url: git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 category: main optional: false +- name: grid-apps + version: 0.1.0a1 + manager: pip + platform: linux-64 + dependencies: + discretize: '>=0.11.0,<0.12.dev' + geoapps-utils: 0.6.0a1 + geoh5py: 0.12.0a1 + numpy: '>=1.26.0,<1.27.0' + octree-creation-app: 0.4.0a1 + pydantic: '>=2.5.2,<3.0.0' + scipy: '>=1.14.0,<1.15.0' + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + hash: + sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + category: main + optional: false +- name: grid-apps + version: 0.1.0a1 + manager: pip + platform: win-64 + dependencies: + discretize: '>=0.11.0,<0.12.dev' + geoapps-utils: 0.6.0a1 + geoh5py: 0.12.0a1 + numpy: '>=1.26.0,<1.27.0' + octree-creation-app: 0.4.0a1 + pydantic: '>=2.5.2,<3.0.0' + scipy: '>=1.14.0,<1.15.0' + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + hash: + sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + category: main + optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev55+mira.g2e61aceb1 + version: 0.23.0.1.post2.dev57+mira.gdc256f618 manager: pip platform: linux-64 dependencies: @@ -8602,16 +8642,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 hash: - sha256: 2e61aceb15b21e896c6190b8426075e9a04cf78e + sha256: dc256f618543d8ee94fd36737749715fe497f8b7 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev55+mira.g2e61aceb1 + version: 0.23.0.1.post2.dev57+mira.gdc256f618 manager: pip platform: win-64 dependencies: @@ -8623,12 +8663,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 hash: - sha256: 2e61aceb15b21e896c6190b8426075e9a04cf78e + sha256: dc256f618543d8ee94fd36737749715fe497f8b7 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 category: main optional: false - name: octree-creation-app diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index f990e102..3293325f 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 45f0aca37ae10be31f2fa4fb7aa7861f4ce4c909c366d8cff8421690d23ebfde - linux-64: 8cce520abc7830e77c6c1ae22f85de23c1a3f189a6830f442297dd1ec77be9d5 + win-64: 1b992ff9f8e331f00f3c73c19b2d90a02b15bad512f46790f540c5b81e9a6efd + linux-64: 3ee78189e9804da7b2dfd0806eb05c17c2b0d23e3496fe93dd20fc4ee3d5d724 channels: - url: conda-forge used_env_vars: [] @@ -8674,8 +8674,48 @@ package: url: git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 category: main optional: false +- name: grid-apps + version: 0.1.0a1 + manager: pip + platform: linux-64 + dependencies: + discretize: '>=0.11.0,<0.12.dev' + geoapps-utils: 0.6.0a1 + geoh5py: 0.12.0a1 + numpy: '>=1.26.0,<1.27.0' + octree-creation-app: 0.4.0a1 + pydantic: '>=2.5.2,<3.0.0' + scipy: '>=1.14.0,<1.15.0' + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + hash: + sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + category: main + optional: false +- name: grid-apps + version: 0.1.0a1 + manager: pip + platform: win-64 + dependencies: + discretize: '>=0.11.0,<0.12.dev' + geoapps-utils: 0.6.0a1 + geoh5py: 0.12.0a1 + numpy: '>=1.26.0,<1.27.0' + octree-creation-app: 0.4.0a1 + pydantic: '>=2.5.2,<3.0.0' + scipy: '>=1.14.0,<1.15.0' + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + hash: + sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + category: main + optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev55+mira.g2e61aceb1 + version: 0.23.0.1.post2.dev57+mira.gdc256f618 manager: pip platform: linux-64 dependencies: @@ -8687,16 +8727,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 hash: - sha256: 2e61aceb15b21e896c6190b8426075e9a04cf78e + sha256: dc256f618543d8ee94fd36737749715fe497f8b7 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev55+mira.g2e61aceb1 + version: 0.23.0.1.post2.dev57+mira.gdc256f618 manager: pip platform: win-64 dependencies: @@ -8708,12 +8748,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 hash: - sha256: 2e61aceb15b21e896c6190b8426075e9a04cf78e + sha256: dc256f618543d8ee94fd36737749715fe497f8b7 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 category: main optional: false - name: octree-creation-app diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 582866cc..fee67346 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: f1b3165f9e07e78e108d41f3bc027bfb7c613c94db8a3cc8c190ab178b3d2f2c - linux-64: 2e48ea762f31ce7d0e20196680dec38b885bd725bb1dc73d18f428e1faa16c06 + win-64: d3f6839c7d9ab3576b1808d9f1a2c3c60548a7c2c6a55c70f399e51ee3052040 + linux-64: 4573afe541246abdcc3b1dd3eaebe69348f71a0bfed06a53c897f32ac38c2fa0 channels: - url: conda-forge used_env_vars: [] @@ -8674,8 +8674,48 @@ package: url: git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 category: main optional: false +- name: grid-apps + version: 0.1.0a1 + manager: pip + platform: linux-64 + dependencies: + discretize: '>=0.11.0,<0.12.dev' + geoapps-utils: 0.6.0a1 + geoh5py: 0.12.0a1 + numpy: '>=1.26.0,<1.27.0' + octree-creation-app: 0.4.0a1 + pydantic: '>=2.5.2,<3.0.0' + scipy: '>=1.14.0,<1.15.0' + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + hash: + sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + category: main + optional: false +- name: grid-apps + version: 0.1.0a1 + manager: pip + platform: win-64 + dependencies: + discretize: '>=0.11.0,<0.12.dev' + geoapps-utils: 0.6.0a1 + geoh5py: 0.12.0a1 + numpy: '>=1.26.0,<1.27.0' + octree-creation-app: 0.4.0a1 + pydantic: '>=2.5.2,<3.0.0' + scipy: '>=1.14.0,<1.15.0' + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + hash: + sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + category: main + optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev55+mira.g2e61aceb1 + version: 0.23.0.1.post2.dev57+mira.gdc256f618 manager: pip platform: linux-64 dependencies: @@ -8687,16 +8727,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 hash: - sha256: 2e61aceb15b21e896c6190b8426075e9a04cf78e + sha256: dc256f618543d8ee94fd36737749715fe497f8b7 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev55+mira.g2e61aceb1 + version: 0.23.0.1.post2.dev57+mira.gdc256f618 manager: pip platform: win-64 dependencies: @@ -8708,12 +8748,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 hash: - sha256: 2e61aceb15b21e896c6190b8426075e9a04cf78e + sha256: dc256f618543d8ee94fd36737749715fe497f8b7 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@2e61aceb15b21e896c6190b8426075e9a04cf78e + url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 category: main optional: false - name: octree-creation-app From a2b933212bc1b631837b6f27f819695854aa85cf Mon Sep 17 00:00:00 2001 From: dominiquef Date: Wed, 20 Aug 2025 11:27:06 -0700 Subject: [PATCH 3/4] Re-lock with grid-apps --- environments/py-3.10-linux-64-dev.conda.lock.yml | 5 +++-- environments/py-3.10-linux-64.conda.lock.yml | 5 +++-- environments/py-3.10-win-64-dev.conda.lock.yml | 5 +++-- environments/py-3.10-win-64.conda.lock.yml | 5 +++-- environments/py-3.11-linux-64-dev.conda.lock.yml | 5 +++-- environments/py-3.11-linux-64.conda.lock.yml | 5 +++-- environments/py-3.11-win-64-dev.conda.lock.yml | 5 +++-- environments/py-3.11-win-64.conda.lock.yml | 5 +++-- environments/py-3.12-linux-64-dev.conda.lock.yml | 5 +++-- environments/py-3.12-linux-64.conda.lock.yml | 5 +++-- environments/py-3.12-win-64-dev.conda.lock.yml | 5 +++-- environments/py-3.12-win-64.conda.lock.yml | 5 +++-- py-3.10.conda-lock.yml | 12 ++++++------ py-3.11.conda-lock.yml | 12 ++++++------ py-3.12.conda-lock.yml | 12 ++++++------ 15 files changed, 54 insertions(+), 42 deletions(-) diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index a0613d17..11eccf59 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: aa70c6c517bbe8472b7de3ce4e8d391ca7e1d86e6bfe0e2a4e53e756c6e8388b +# input_hash: 951d0e25ecbfd95cd4250992ff4a2fd809d3fcbaaff150dc70296bb2f71736c8 channels: - conda-forge @@ -304,8 +304,9 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 0185ab0a..0ff0e9a2 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: aa70c6c517bbe8472b7de3ce4e8d391ca7e1d86e6bfe0e2a4e53e756c6e8388b +# input_hash: 951d0e25ecbfd95cd4250992ff4a2fd809d3fcbaaff150dc70296bb2f71736c8 channels: - conda-forge @@ -156,8 +156,9 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index 39ed8bb0..5a31ede1 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 1f782c60627d60f2457feb3c892be41e0d6af072ae5c102d92ca760ab7d33c09 +# input_hash: afb1c10339c4c180cd200e7fb18bfa0b1a79eeaf2936102a169de6beb9bdf706 channels: - conda-forge @@ -294,8 +294,9 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index e32a425d..4b611e12 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 1f782c60627d60f2457feb3c892be41e0d6af072ae5c102d92ca760ab7d33c09 +# input_hash: afb1c10339c4c180cd200e7fb18bfa0b1a79eeaf2936102a169de6beb9bdf706 channels: - conda-forge @@ -144,8 +144,9 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index da2fdfe5..37f23038 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 8cce520abc7830e77c6c1ae22f85de23c1a3f189a6830f442297dd1ec77be9d5 +# input_hash: 3ee78189e9804da7b2dfd0806eb05c17c2b0d23e3496fe93dd20fc4ee3d5d724 channels: - conda-forge @@ -307,8 +307,9 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 9f5149d3..9b106421 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 8cce520abc7830e77c6c1ae22f85de23c1a3f189a6830f442297dd1ec77be9d5 +# input_hash: 3ee78189e9804da7b2dfd0806eb05c17c2b0d23e3496fe93dd20fc4ee3d5d724 channels: - conda-forge @@ -158,8 +158,9 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index 03a9e373..bcbdd754 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 45f0aca37ae10be31f2fa4fb7aa7861f4ce4c909c366d8cff8421690d23ebfde +# input_hash: 1b992ff9f8e331f00f3c73c19b2d90a02b15bad512f46790f540c5b81e9a6efd channels: - conda-forge @@ -297,8 +297,9 @@ dependencies: - zstandard=0.23.0=py311he736701_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index a8d63861..84fe72e8 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 45f0aca37ae10be31f2fa4fb7aa7861f4ce4c909c366d8cff8421690d23ebfde +# input_hash: 1b992ff9f8e331f00f3c73c19b2d90a02b15bad512f46790f540c5b81e9a6efd channels: - conda-forge @@ -146,8 +146,9 @@ dependencies: - zstandard=0.23.0=py311he736701_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index 3af6fd8b..73853f9a 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 2e48ea762f31ce7d0e20196680dec38b885bd725bb1dc73d18f428e1faa16c06 +# input_hash: 4573afe541246abdcc3b1dd3eaebe69348f71a0bfed06a53c897f32ac38c2fa0 channels: - conda-forge @@ -307,8 +307,9 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index b11edecf..cd42c36b 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 2e48ea762f31ce7d0e20196680dec38b885bd725bb1dc73d18f428e1faa16c06 +# input_hash: 4573afe541246abdcc3b1dd3eaebe69348f71a0bfed06a53c897f32ac38c2fa0 channels: - conda-forge @@ -158,8 +158,9 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index 87a732de..845109da 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: f1b3165f9e07e78e108d41f3bc027bfb7c613c94db8a3cc8c190ab178b3d2f2c +# input_hash: d3f6839c7d9ab3576b1808d9f1a2c3c60548a7c2c6a55c70f399e51ee3052040 channels: - conda-forge @@ -297,8 +297,9 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index ade6c692..03700cf0 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: f1b3165f9e07e78e108d41f3bc027bfb7c613c94db8a3cc8c190ab178b3d2f2c +# input_hash: d3f6839c7d9ab3576b1808d9f1a2c3c60548a7c2c6a55c70f399e51ee3052040 channels: - conda-forge @@ -146,8 +146,9 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@12bf67269934b26a307c69857c01dd3b4c4742e9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@111d2925130201bae952ff8692bf87663f3481ac - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@cee0044fc645d73d33444cc82ce040772741dc1d diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 528c741a..63d95638 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -8530,12 +8530,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 hash: - sha256: 4bb027706ed3726d42b75d349df087dcdf8450f9 + sha256: 25bf69c7afdfce5e9d4ac7d667c88790aad9c934 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 category: main optional: false - name: geoapps-utils @@ -8547,12 +8547,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 hash: - sha256: 4bb027706ed3726d42b75d349df087dcdf8450f9 + sha256: 25bf69c7afdfce5e9d4ac7d667c88790aad9c934 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 category: main optional: false - name: geoh5py diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 3293325f..d7bdad64 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -8615,12 +8615,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 hash: - sha256: 4bb027706ed3726d42b75d349df087dcdf8450f9 + sha256: 25bf69c7afdfce5e9d4ac7d667c88790aad9c934 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 category: main optional: false - name: geoapps-utils @@ -8632,12 +8632,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 hash: - sha256: 4bb027706ed3726d42b75d349df087dcdf8450f9 + sha256: 25bf69c7afdfce5e9d4ac7d667c88790aad9c934 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 category: main optional: false - name: geoh5py diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index fee67346..f85b963d 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -8615,12 +8615,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 hash: - sha256: 4bb027706ed3726d42b75d349df087dcdf8450f9 + sha256: 25bf69c7afdfce5e9d4ac7d667c88790aad9c934 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 category: main optional: false - name: geoapps-utils @@ -8632,12 +8632,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 hash: - sha256: 4bb027706ed3726d42b75d349df087dcdf8450f9 + sha256: 25bf69c7afdfce5e9d4ac7d667c88790aad9c934 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4bb027706ed3726d42b75d349df087dcdf8450f9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 category: main optional: false - name: geoh5py From 9dbdde762c95346f3d634c686ea75be4162f5b02 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Wed, 20 Aug 2025 14:02:26 -0700 Subject: [PATCH 4/4] Clean ups and re-trigger --- .../direct_current/pseudo_three_dimensions/driver.py | 2 -- .../electricals/direct_current/two_dimensions/driver.py | 2 -- simpeg_drivers/electricals/driver.py | 2 +- .../induced_polarization/pseudo_three_dimensions/driver.py | 4 ++-- .../induced_polarization/three_dimensions/driver.py | 2 -- .../electricals/induced_polarization/two_dimensions/driver.py | 2 -- simpeg_drivers/electromagnetics/base_1d_driver.py | 1 - simpeg_drivers/electromagnetics/frequency_domain/driver.py | 2 -- simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py | 2 -- simpeg_drivers/electromagnetics/time_domain/driver.py | 2 -- simpeg_drivers/electromagnetics/time_domain_1d/driver.py | 2 -- simpeg_drivers/joint/joint_cross_gradient/driver.py | 1 - simpeg_drivers/joint/joint_petrophysics/driver.py | 1 - simpeg_drivers/joint/joint_surveys/driver.py | 1 - simpeg_drivers/natural_sources/magnetotellurics/driver.py | 2 -- simpeg_drivers/natural_sources/tipper/driver.py | 2 -- simpeg_drivers/potential_fields/gravity/driver.py | 2 -- simpeg_drivers/potential_fields/magnetic_scalar/driver.py | 2 -- simpeg_drivers/potential_fields/magnetic_vector/driver.py | 2 -- 19 files changed, 3 insertions(+), 33 deletions(-) diff --git a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py index 6cb8ac9e..69a7d852 100644 --- a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py +++ b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py @@ -27,7 +27,6 @@ class DCBatch2DForwardDriver(BaseBatch2DDriver): _options_class = DCBatch2DForwardOptions _params_2d_class = DC2DForwardOptions - _validations = None class DCBatch2DInversionDriver(BaseBatch2DDriver): @@ -35,4 +34,3 @@ class DCBatch2DInversionDriver(BaseBatch2DDriver): _options_class = DCBatch2DInversionOptions _params_2d_class = DC2DInversionOptions - _validations = None diff --git a/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py b/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py index edb3913b..fae98cf1 100644 --- a/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py +++ b/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py @@ -20,11 +20,9 @@ class DC2DForwardDriver(Base2DDriver): """Direct Current 2D forward driver.""" _options_class = DC2DForwardOptions - _validations = None class DC2DInversionDriver(Base2DDriver): """Direct Current 2D inversion driver.""" _options_class = DC2DInversionOptions - _validations = None diff --git a/simpeg_drivers/electricals/driver.py b/simpeg_drivers/electricals/driver.py index 41f84817..96dcb016 100644 --- a/simpeg_drivers/electricals/driver.py +++ b/simpeg_drivers/electricals/driver.py @@ -83,7 +83,7 @@ class BaseBatch2DDriver(LineSweepDriver): _options_class: type[BaseForwardOptions | BaseInversionOptions] _params_2d_class: type[BaseForwardOptions | BaseInversionOptions] - _validations = None + _model_list: list[str] = [] def __init__(self, params): diff --git a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py index 2f37e47f..4e48c4d7 100644 --- a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py +++ b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py @@ -27,7 +27,7 @@ class IPBatch2DForwardDriver(BaseBatch2DDriver): _options_class = IPBatch2DForwardOptions _params_2d_class = IP2DForwardOptions - _validations = None + _model_list = ["conductivity_model"] @@ -36,5 +36,5 @@ class IPBatch2DInversionDriver(BaseBatch2DDriver): _options_class = IPBatch2DInversionOptions _params_2d_class = IP2DInversionOptions - _validations = None + _model_list = ["conductivity_model"] diff --git a/simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py b/simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py index 777e0c78..076f6d7d 100644 --- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py +++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py @@ -23,11 +23,9 @@ class IP3DForwardDriver(InversionDriver): """Induced Polarization 3D forward driver.""" _options_class = IP3DForwardOptions - _validations = None class IP3DInversionDriver(InversionDriver): """Induced Polarization 3D inversion driver.""" _options_class = IP3DInversionOptions - _validations = None diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py index cd02c79d..30bc2a51 100644 --- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py +++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py @@ -23,11 +23,9 @@ class IP2DForwardDriver(Base2DDriver): """Induced Polarization 2D forward driver.""" _options_class = IP2DForwardOptions - _validations = None class IP2DInversionDriver(Base2DDriver): """Induced Polarization 2D inversion driver.""" _options_class = IP2DInversionOptions - _validations = None diff --git a/simpeg_drivers/electromagnetics/base_1d_driver.py b/simpeg_drivers/electromagnetics/base_1d_driver.py index 9aa2e1c1..5bdcb8b5 100644 --- a/simpeg_drivers/electromagnetics/base_1d_driver.py +++ b/simpeg_drivers/electromagnetics/base_1d_driver.py @@ -34,7 +34,6 @@ class Base1DDriver(InversionDriver): """Base 1D driver for electromagnetic simulations.""" _options_class = None - _validations = None def __init__(self, workspace: Workspace, **kwargs): super().__init__(workspace, **kwargs) diff --git a/simpeg_drivers/electromagnetics/frequency_domain/driver.py b/simpeg_drivers/electromagnetics/frequency_domain/driver.py index 733204b5..7be3e060 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/driver.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/driver.py @@ -23,7 +23,6 @@ class FDEMForwardDriver(InversionDriver): """Frequency Domain Electromagnetic forward driver.""" _options_class = FDEMForwardOptions - _validations = None def __init__(self, params: FDEMForwardOptions): super().__init__(params) @@ -33,4 +32,3 @@ class FDEMInversionDriver(InversionDriver): """Frequency Domain Electromagnetic inversion driver.""" _options_class = FDEMInversionOptions - _validations = None diff --git a/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py b/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py index 469fbaaa..b719232e 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py +++ b/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py @@ -23,11 +23,9 @@ class FDEM1DForwardDriver(Base1DDriver): """Frequency Domain 1D Electromagnetic forward driver.""" _options_class = FDEM1DForwardOptions - _validations = None class FDEM1DInversionDriver(Base1DDriver): """Frequency Domain 1D Electromagnetic inversion driver.""" _options_class = FDEM1DInversionOptions - _validations = None diff --git a/simpeg_drivers/electromagnetics/time_domain/driver.py b/simpeg_drivers/electromagnetics/time_domain/driver.py index e790e0c4..a47a958e 100644 --- a/simpeg_drivers/electromagnetics/time_domain/driver.py +++ b/simpeg_drivers/electromagnetics/time_domain/driver.py @@ -28,11 +28,9 @@ class TDEMForwardDriver(InversionDriver): """Time Domain Electromagnetic forward driver.""" _options_class = TDEMForwardOptions - _validations = None class TDEMInversionDriver(InversionDriver): """Time Domain Electromagnetic inversion driver.""" _options_class = TDEMInversionOptions - _validations = None diff --git a/simpeg_drivers/electromagnetics/time_domain_1d/driver.py b/simpeg_drivers/electromagnetics/time_domain_1d/driver.py index fdecb6b1..deba2b40 100644 --- a/simpeg_drivers/electromagnetics/time_domain_1d/driver.py +++ b/simpeg_drivers/electromagnetics/time_domain_1d/driver.py @@ -23,11 +23,9 @@ class TDEM1DForwardDriver(Base1DDriver): """Time Domain 1D Electromagnetic forward driver.""" _options_class = TDEM1DForwardOptions - _validations = None class TDEM1DInversionDriver(Base1DDriver): """Time Domain 1D Electromagnetic inversion driver.""" _options_class = TDEM1DInversionOptions - _validations = None diff --git a/simpeg_drivers/joint/joint_cross_gradient/driver.py b/simpeg_drivers/joint/joint_cross_gradient/driver.py index 1426872f..ffc17d0a 100644 --- a/simpeg_drivers/joint/joint_cross_gradient/driver.py +++ b/simpeg_drivers/joint/joint_cross_gradient/driver.py @@ -33,7 +33,6 @@ class JointCrossGradientDriver(BaseJointDriver): _options_class = JointCrossGradientOptions - _validations = None def __init__(self, params: JointCrossGradientOptions): self._wires = None diff --git a/simpeg_drivers/joint/joint_petrophysics/driver.py b/simpeg_drivers/joint/joint_petrophysics/driver.py index af812b2e..b36170d9 100644 --- a/simpeg_drivers/joint/joint_petrophysics/driver.py +++ b/simpeg_drivers/joint/joint_petrophysics/driver.py @@ -30,7 +30,6 @@ class JointPetrophysicsDriver(BaseJointDriver): _options_class = JointPetrophysicsOptions - _validations = None def __init__(self, params: JointPetrophysicsOptions): self._wires = None diff --git a/simpeg_drivers/joint/joint_surveys/driver.py b/simpeg_drivers/joint/joint_surveys/driver.py index 5916cbb1..7c325a6f 100644 --- a/simpeg_drivers/joint/joint_surveys/driver.py +++ b/simpeg_drivers/joint/joint_surveys/driver.py @@ -31,7 +31,6 @@ class JointSurveyDriver(BaseJointDriver): """Joint surveys inversion driver""" _options_class = JointSurveysOptions - _validations = None def __init__(self, params: JointSurveysOptions): super().__init__(params) diff --git a/simpeg_drivers/natural_sources/magnetotellurics/driver.py b/simpeg_drivers/natural_sources/magnetotellurics/driver.py index da6aa6ca..f522d9a2 100644 --- a/simpeg_drivers/natural_sources/magnetotellurics/driver.py +++ b/simpeg_drivers/natural_sources/magnetotellurics/driver.py @@ -20,11 +20,9 @@ class MTForwardDriver(InversionDriver): """Magnetotellurics forward driver.""" _options_class = MTForwardOptions - _validations = None class MTInversionDriver(InversionDriver): """Magnetotellurics inversion driver.""" _options_class = MTInversionOptions - _validations = None diff --git a/simpeg_drivers/natural_sources/tipper/driver.py b/simpeg_drivers/natural_sources/tipper/driver.py index 41acbda8..30bd0921 100644 --- a/simpeg_drivers/natural_sources/tipper/driver.py +++ b/simpeg_drivers/natural_sources/tipper/driver.py @@ -20,11 +20,9 @@ class TipperForwardDriver(InversionDriver): """Tipper forward driver.""" _options_class = TipperForwardOptions - _validations = None class TipperInversionDriver(InversionDriver): """Tipper inversion driver.""" _options_class = TipperInversionOptions - _validations = None diff --git a/simpeg_drivers/potential_fields/gravity/driver.py b/simpeg_drivers/potential_fields/gravity/driver.py index cc5727f7..b7509f9a 100644 --- a/simpeg_drivers/potential_fields/gravity/driver.py +++ b/simpeg_drivers/potential_fields/gravity/driver.py @@ -22,11 +22,9 @@ class GravityForwardDriver(InversionDriver): """Gravity forward driver.""" _options_class = GravityForwardOptions - _validations = None class GravityInversionDriver(InversionDriver): """Gravity inversion driver.""" _options_class = GravityInversionOptions - _validations = None diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/driver.py b/simpeg_drivers/potential_fields/magnetic_scalar/driver.py index 1789b959..cdeb3628 100644 --- a/simpeg_drivers/potential_fields/magnetic_scalar/driver.py +++ b/simpeg_drivers/potential_fields/magnetic_scalar/driver.py @@ -22,11 +22,9 @@ class MagneticForwardDriver(InversionDriver): """Magnetic forward driver.""" _options_class = MagneticForwardOptions - _validations = None class MagneticInversionDriver(InversionDriver): """Magnetic inversion driver.""" _options_class = MagneticInversionOptions - _validations = None diff --git a/simpeg_drivers/potential_fields/magnetic_vector/driver.py b/simpeg_drivers/potential_fields/magnetic_vector/driver.py index 6adb1a8b..ddeaec6d 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/driver.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/driver.py @@ -22,14 +22,12 @@ class MVIForwardDriver(InversionDriver): """Magnetic Vector forward driver.""" _options_class = MVIForwardOptions - _validations = None class MVIInversionDriver(InversionDriver): """Magnetic Vector inversion driver.""" _options_class = MVIInversionOptions - _validations = None @property def mapping(self) -> list[maps.Projection] | None: