From cb6e214b9ea0a31db06c48f692257be839b99f42 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 23 Sep 2025 14:13:19 -0400 Subject: [PATCH 01/22] Add parallel component --- simpeg_drivers/plate_simulation/driver.py | 5 +- .../plate_simulation/sweep/driver.py | 142 ++++++++++++++++-- .../plate_simulation/sweep/options.py | 4 +- 3 files changed, 131 insertions(+), 20 deletions(-) diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index 1b26a6ff..a23a79e1 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -20,9 +20,8 @@ from geoh5py.data import FloatData, ReferencedData from geoh5py.groups import UIJsonGroup from geoh5py.objects import Octree, Points, Surface -from geoh5py.shared.utils import fetch_active_workspace +from geoh5py.shared.utils import fetch_active_workspace, stringify from geoh5py.ui_json import InputFile, monitored_directory_copy -from geoh5py.ui_json.utils import demote from grid_apps.octree_creation.driver import OctreeDriver from simpeg_drivers.driver import InversionDriver, InversionLogger @@ -105,7 +104,7 @@ def validate_out_group(self, out_group: UIJsonGroup | None) -> UIJsonGroup: ) out_group.entity_type.name = "Plate Simulation" self.params = self.params.model_copy(update={"out_group": out_group}) - out_group.options = demote(self.params.input_file.ui_json) + out_group.options = stringify(self.params.input_file.ui_json) out_group.metadata = None return out_group diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index a7c68010..4bb7a863 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -8,18 +8,24 @@ # ' # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +import contextlib +import cProfile +import pstats import shutil import sys +import uuid from pathlib import Path +import numpy as np +from dask.distributed import Client, LocalCluster, get_client, performance_report from geoapps_utils.base import Driver +from geoapps_utils.run import load_ui_json from geoapps_utils.utils.importing import GeoAppsError from geoapps_utils.utils.logger import get_logger from geoh5py import Workspace from geoh5py.groups import SimPEGGroup, UIJsonGroup -from geoh5py.shared.utils import fetch_active_workspace +from geoh5py.shared.utils import fetch_active_workspace, stringify from geoh5py.ui_json.input_file import InputFile -from geoh5py.ui_json.utils import demote from simpeg_drivers.plate_simulation.driver import PlateSimulationDriver from simpeg_drivers.plate_simulation.options import PlateSimulationOptions @@ -39,7 +45,9 @@ class PlateSweepDriver(Driver): def __init__(self, params: SweepOptions): super().__init__(params) - self._out_group = self.validate_out_group(self.params.out_group) + self._client: Client | bool | None = None + self._workers: list[str] | None = None + self.out_group = self.validate_out_group(self.params.out_group) @property def out_group(self) -> SimPEGGroup: @@ -48,6 +56,17 @@ def out_group(self) -> SimPEGGroup: """ return self._out_group + @out_group.setter + def out_group(self, value: SimPEGGroup): + if not isinstance(value, SimPEGGroup): + raise TypeError("Output group must be a SimPEGGroup.") + + if self.params.out_group != value: + self.params.out_group = value + self.params.update_out_group_options() + + self._out_group = value + def validate_out_group(self, out_group: SimPEGGroup | None) -> SimPEGGroup: """ Validate or create a UIJsonGroup to store results. @@ -60,12 +79,9 @@ def validate_out_group(self, out_group: SimPEGGroup | None) -> SimPEGGroup: with fetch_active_workspace(self.params.geoh5, mode="r+"): out_group = SimPEGGroup.create( self.params.geoh5, - name="Plate Sweep", + name=self.params.title, ) - out_group.entity_type.name = "Plate Sweep" - self.params = self.params.model_copy(update={"out_group": out_group}) - out_group.options = demote(self.params.input_file.ui_json) - out_group.metadata = None + out_group.entity_type.name = self.params.title return out_group @@ -101,12 +117,37 @@ def run(self): len(trials), self.params.template.options["title"], ) - for kwargs in trials: - uid = SweepOptions.uuid_from_params(kwargs) - kwargs.update({"out_group": str(self.out_group.uid)}) - PlateSweepDriver.run_worker( - uid, kwargs, self.workspace.h5file, self.params.workdir - ) + + use_futures = self.client + + if use_futures: + blocks = np.array_split(trials, len(self.workers)) + else: + blocks = trials + + futures = [] + for block in blocks: + if use_futures: + futures.append( + self.client.submit( + trial_runs, + block, + self.params.geoh5.h5file, + self.params.workdir, + self.out_group.uid, + ) + ) + + else: + trial_runs( + [block], + self.params.geoh5.h5file, + self.params.workdir, + self.out_group.uid, + ) + + if use_futures: + _ = self.client.gather(futures) @staticmethod def run_worker(uid: str, data: dict, h5file: Path, workdir: Path | None): @@ -136,7 +177,76 @@ def run_worker(uid: str, data: dict, h5file: Path, workdir: Path | None): options.write_ui_json(workdir / f"{uid}.ui.json") PlateSimulationDriver.start(workdir / f"{uid}.ui.json") + @property + def client(self) -> Client | bool | None: + if self._client is None: + try: + self._client = get_client() + except ValueError: + self._client = False + + return self._client + + @property + def workers(self): + """List of workers""" + if self._workers is None: + if self.client: + self._workers = [ + (worker.worker_address,) + for worker in self.client.cluster.workers.values() + ] + else: + self._workers = [] + return self._workers + + +def trial_runs( + trials: list[dict], h5file: Path, workdir: Path | None, out_group_id: uuid.UUID +): + """ + Loop through a list of trials and run a worker for each unique parameter set. + """ + for kwargs in trials: + uid = SweepOptions.uuid_from_params(kwargs) + kwargs.update({"out_group": str(out_group_id)}) + PlateSweepDriver.run_worker(uid, kwargs, h5file, workdir) + if __name__ == "__main__": - file = Path(sys.argv[1]).resolve() - PlateSweepDriver.start(file) + file = Path(r"C:\Users\dominiquef\Desktop\Tests\GEOPY-2466.ui.json").resolve() + + input_file = load_ui_json(file) + n_workers = input_file.get("n_workers", None) + n_threads = input_file.get("n_threads", None) + save_report = input_file.get("performance_report", False) + + cluster = ( + LocalCluster(processes=True, n_workers=n_workers, threads_per_worker=n_threads) + if ((n_workers is not None and n_workers > 1) or n_threads is not None) + else None + ) + profiler = cProfile.Profile() + profiler.enable() + + with ( + cluster.get_client() + if cluster is not None + else contextlib.nullcontext() as client + ): + # Full run + with ( + performance_report(filename=file.parent / "dask_profile.html") + if (save_report and isinstance(client, Client)) + else contextlib.nullcontext() + ): + PlateSweepDriver.start(file) + sys.stdout.close() + + profiler.disable() + + if save_report: + with open(file.parent / "runtime_profile.txt", encoding="utf-8", mode="w") as s: + ps = pstats.Stats(profiler, stream=s) + ps.sort_stats("cumulative") + ps.print_stats() diff --git a/simpeg_drivers/plate_simulation/sweep/options.py b/simpeg_drivers/plate_simulation/sweep/options.py index 97476024..772f4715 100644 --- a/simpeg_drivers/plate_simulation/sweep/options.py +++ b/simpeg_drivers/plate_simulation/sweep/options.py @@ -18,7 +18,7 @@ from geoapps_utils.utils.importing import GeoAppsError from geoh5py.groups import SimPEGGroup, UIJsonGroup from geoh5py.ui_json import InputFile -from pydantic import BaseModel, ValidationError, field_serializer +from pydantic import BaseModel, ConfigDict, ValidationError, field_serializer from typing_extensions import Self from simpeg_drivers import assets_path @@ -55,6 +55,8 @@ class SweepOptions(Options): by the template application. """ + model_config = ConfigDict(frozen=False, arbitrary_types_allowed=True) + name: ClassVar[str] = "plate_sweep" default_ui_json: ClassVar[Path] = assets_path() / "uijson/plate_sweep.ui.json" title: ClassVar[str] = "Plate Sweep" From 8ad8ef1eaacb82d41070fdefd20d46d4a75081d2 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Wed, 24 Sep 2025 16:12:54 -0400 Subject: [PATCH 02/22] Add BaseDriver to handle the client/worker --- simpeg_drivers/driver.py | 107 +++++++++++++----- simpeg_drivers/plate_simulation/driver.py | 31 +++-- simpeg_drivers/plate_simulation/options.py | 4 +- .../plate_simulation/sweep/driver.py | 76 +++++-------- 4 files changed, 124 insertions(+), 94 deletions(-) diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 2217590a..63918104 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -31,7 +31,7 @@ from dask.distributed import get_client, Client, LocalCluster, performance_report -from geoapps_utils.base import Driver +from geoapps_utils.base import Driver, Options from geoapps_utils.utils.importing import GeoAppsError from geoapps_utils.param_sweeps.driver import SweepParams @@ -87,12 +87,86 @@ logger = logging.getLogger("simpeg-drivers") -class InversionDriver(Driver): +class BaseDriver(Driver): + """ + Base class for drivers handling the parallel setup. + """ + + def __init__( + self, + params: Options, + client: Client | bool | None = None, + workers: list[str] | None = None, + ): + super().__init__(params) + self._client: Client | bool = self.validate_client(client) + self._workers: list[tuple[str]] | None = self.validate_workers(workers) + + @property + def client(self) -> Client | bool | None: + """ + Dask client or False if not using Dask.distributed. + """ + return self._client + + @property + def workers(self) -> list[tuple[str]]: + """List of workers stored as a list of tuples.""" + return self._workers + + def validate_client(self, client: Client | bool | None) -> Client | bool: + """ + Validate or create a Dask client. + """ + if client is None: + try: + client = get_client() + except ValueError: + client = False + return client + + def validate_workers(self, workers: list[tuple[str]] | None) -> list[tuple[str]]: + """ + Validate the list of workers. + """ + if self.client and self.client.cluster is not None: + available_workers = [ + (worker.worker_address,) + for worker in self.client.cluster.workers.values() + ] + else: + available_workers = [] + + if workers is None: + return available_workers + + if not isinstance(workers, list) or not all( + isinstance(w, tuple) for w in workers + ): + raise TypeError("Workers must be a list of tuple[str].") + + if self.client and self.client.cluster is not None: + invalid_workers = [w for w in workers if w not in available_workers] + if invalid_workers: + raise ValueError( + f"The following workers are not available: {invalid_workers}. " + f"Available workers are: {available_workers}." + ) + + return workers + + +class InversionDriver(BaseDriver): _options_class = BaseForwardOptions | BaseInversionOptions _inversion_type: str | None = None - def __init__(self, params: BaseForwardOptions | BaseInversionOptions): - super().__init__(params) + def __init__( + self, + params: BaseForwardOptions | BaseInversionOptions, + client: Client | bool | None = None, + workers: list[tuple[str]] | None = None, + ): + super().__init__(params, client=client, workers=workers) self.inversion_type = self.params.inversion_type self.out_group = self.validate_out_group(self.params.out_group) @@ -114,31 +188,6 @@ def __init__(self, params: BaseForwardOptions | BaseInversionOptions): self._ordering: list[np.ndarray] | None = None self._mappings: list[maps.IdentityMap] | None = None self._window = None - self._client: Client | bool | None = None - self._workers: list[str] | None = None - - @property - def client(self) -> Client | bool | None: - if self._client is None: - try: - self._client = get_client() - except ValueError: - self._client = False - - return self._client - - @property - def workers(self): - """List of workers""" - if self._workers is None: - if self.client: - self._workers = [ - (worker.worker_address,) - for worker in self.client.cluster.workers.values() - ] - else: - self._workers = [] - return self._workers def split_list(self, tiles: list[np.ndarray]) -> list[np.ndarray]: """ diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index a23a79e1..8e8d6a26 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -14,8 +14,8 @@ from pathlib import Path import numpy as np +from dask.distributed import Client from geoapps_utils.base import Driver, get_logger -from geoapps_utils.param_sweeps.generate import generate from geoapps_utils.utils.transformations import azimuth_to_unit_vector from geoh5py.data import FloatData, ReferencedData from geoh5py.groups import UIJsonGroup @@ -24,7 +24,7 @@ from geoh5py.ui_json import InputFile, monitored_directory_copy from grid_apps.octree_creation.driver import OctreeDriver -from simpeg_drivers.driver import InversionDriver, InversionLogger +from simpeg_drivers.driver import BaseDriver, InversionDriver from simpeg_drivers.options import BaseForwardOptions from simpeg_drivers.plate_simulation.models.events import Anomaly, Erosion, Overburden from simpeg_drivers.plate_simulation.models.parametric import Plate @@ -35,7 +35,7 @@ logger = get_logger(__name__, propagate=False) -class PlateSimulationDriver(Driver): +class PlateSimulationDriver(BaseDriver): """ Driver for simulating background + plate + overburden model. @@ -49,8 +49,13 @@ class PlateSimulationDriver(Driver): _params_class = PlateSimulationOptions - def __init__(self, params: PlateSimulationOptions): - super().__init__(params) + def __init__( + self, + params: PlateSimulationOptions, + client: Client | bool | None = None, + workers: list[tuple[str]] | None = None, + ): + super().__init__(params, client=client, workers=workers) self._plates: list[Plate] | None = None self._survey: Points | None = None @@ -128,7 +133,9 @@ def simulation_driver(self) -> InversionDriver: driver_class = InversionDriver.driver_class_from_name( self.simulation_parameters.inversion_type, forward_only=True ) - self._simulation_driver = driver_class(self.simulation_parameters) + self._simulation_driver = driver_class( + self.simulation_parameters, client=self.client + ) self._simulation_driver.out_group.parent = self.out_group return self._simulation_driver @@ -313,18 +320,6 @@ def start(ifile: str | Path | InputFile): if ifile.data is None: # type: ignore raise ValueError("Input file has no data loaded.") - generate_sweep = ifile.data["generate_sweep"] # type: ignore - if generate_sweep: - filepath = Path(ifile.path_name) # type: ignore - ifile.data["generate_sweep"] = False # type: ignore - name = filepath.name - path = filepath.parent - ifile.write_ui_json(name=name, path=path) # type: ignore - generate( # pylint: disable=unexpected-keyword-arg - str(filepath), update_values={"conda_environment": "plate_simulation"} - ) - return None - with ifile.geoh5.open(mode="r+"): # type: ignore params = PlateSimulationOptions.build(ifile) diff --git a/simpeg_drivers/plate_simulation/options.py b/simpeg_drivers/plate_simulation/options.py index 9a754e84..6c11901f 100644 --- a/simpeg_drivers/plate_simulation/options.py +++ b/simpeg_drivers/plate_simulation/options.py @@ -12,7 +12,7 @@ from pathlib import Path from typing import ClassVar -from geoapps_utils.driver.data import BaseData +from geoapps_utils.base import Options from geoh5py.groups import SimPEGGroup, UIJsonGroup from geoh5py.objects import ObjectBase, Points, Surface from geoh5py.ui_json import InputFile @@ -111,7 +111,7 @@ def octree_params( return octree_params -class PlateSimulationOptions(BaseData): +class PlateSimulationOptions(Options): """ Parameters for the plate simulation driver. diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index 4bb7a863..00fffa5e 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -18,15 +18,16 @@ import numpy as np from dask.distributed import Client, LocalCluster, get_client, performance_report -from geoapps_utils.base import Driver -from geoapps_utils.run import load_ui_json +from geoapps_utils.run import load_ui_json_as_dict from geoapps_utils.utils.importing import GeoAppsError from geoapps_utils.utils.logger import get_logger from geoh5py import Workspace from geoh5py.groups import SimPEGGroup, UIJsonGroup from geoh5py.shared.utils import fetch_active_workspace, stringify from geoh5py.ui_json.input_file import InputFile +from geoh5py.ui_json.utils import flatten +from simpeg_drivers.driver import BaseDriver from simpeg_drivers.plate_simulation.driver import PlateSimulationDriver from simpeg_drivers.plate_simulation.options import PlateSimulationOptions from simpeg_drivers.plate_simulation.sweep.options import SweepOptions @@ -37,16 +38,14 @@ # TODO: Can we make this generic (PlateSweepDriver -> SweepDriver)? -class PlateSweepDriver(Driver): +class PlateSweepDriver(BaseDriver): """Sets up and manages workers to run all combinations of swepts parameters.""" _params_class = SweepOptions - def __init__(self, params: SweepOptions): - super().__init__(params) + def __init__(self, params: SweepOptions, workers: list[tuple[str]] | None = None): + super().__init__(params, workers=workers) - self._client: Client | bool | None = None - self._workers: list[str] | None = None self.out_group = self.validate_out_group(self.params.out_group) @property @@ -86,7 +85,7 @@ def validate_out_group(self, out_group: SimPEGGroup | None) -> SimPEGGroup: return out_group @classmethod - def start(cls, filepath: str | Path, mode="r", **kwargs) -> Driver: + def start(cls, filepath: str | Path, mode="r", **kwargs) -> BaseDriver: """Start the parameter sweep from a ui.json file.""" _ = kwargs logger.info("Loading input file . . .") @@ -126,7 +125,7 @@ def run(self): blocks = trials futures = [] - for block in blocks: + for ind, block in enumerate(blocks): if use_futures: futures.append( self.client.submit( @@ -135,6 +134,7 @@ def run(self): self.params.geoh5.h5file, self.params.workdir, self.out_group.uid, + workers=self.workers[ind], ) ) @@ -150,7 +150,13 @@ def run(self): _ = self.client.gather(futures) @staticmethod - def run_worker(uid: str, data: dict, h5file: Path, workdir: Path | None): + def run_worker( + uid: str, + data: dict, + h5file: Path, + workdir: Path | None, + workers: list[tuple[str]] | None = None, + ): if workdir is None: workdir = h5file.parent @@ -160,49 +166,27 @@ def run_worker(uid: str, data: dict, h5file: Path, workdir: Path | None): return shutil.copy(h5file, workerfile) - with Workspace(workerfile, mode="r+") as worker: + with Workspace(workerfile, mode="r+") as workspace: plate_simulation = next( group - for group in worker.groups + for group in workspace.groups if isinstance(group, SimPEGGroup | UIJsonGroup) and "plate_simulation.driver" in group.options.get("run_command") ) - ifile = InputFile(ui_json=plate_simulation.options, validate=False) - for key, value in data.items(): - ifile.set_data_value(key, value) - options = PlateSimulationOptions.build( - ifile.data, geoh5=worker, out_group=plate_simulation - ) - options.write_ui_json(workdir / f"{uid}.ui.json") - PlateSimulationDriver.start(workdir / f"{uid}.ui.json") - - @property - def client(self) -> Client | bool | None: - if self._client is None: - try: - self._client = get_client() - except ValueError: - self._client = False - - return self._client - - @property - def workers(self): - """List of workers""" - if self._workers is None: - if self.client: - self._workers = [ - (worker.worker_address,) - for worker in self.client.cluster.workers.values() - ] - else: - self._workers = [] - return self._workers + opt_dict = workspace.promote(flatten(plate_simulation.options)) + opt_dict["geoh5"] = workspace + options = PlateSimulationOptions.build(opt_dict) + plate_sim = PlateSimulationDriver(options, client=False) + plate_sim.run() def trial_runs( - trials: list[dict], h5file: Path, workdir: Path | None, out_group_id: uuid.UUID + trials: list[dict], + h5file: Path, + workdir: Path | None, + out_group_id: uuid.UUID, + workers: list[tuple[str]] | None = None, ): """ Loop through a list of trials and run a worker for each unique parameter set. @@ -212,11 +196,13 @@ def trial_runs( kwargs.update({"out_group": str(out_group_id)}) PlateSweepDriver.run_worker(uid, kwargs, h5file, workdir) + return None + if __name__ == "__main__": file = Path(r"C:\Users\dominiquef\Desktop\Tests\GEOPY-2466.ui.json").resolve() - input_file = load_ui_json(file) + input_file = load_ui_json_as_dict(file) n_workers = input_file.get("n_workers", None) n_threads = input_file.get("n_threads", None) save_report = input_file.get("performance_report", False) From 9cddc53a3a9f65942500f6cb6f3c0de05dcfcee2 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 25 Sep 2025 11:35:21 -0400 Subject: [PATCH 03/22] Pass the worker all the way to the simulation --- .../components/factories/misfit_factory.py | 1 + simpeg_drivers/driver.py | 13 +++----- simpeg_drivers/plate_simulation/driver.py | 2 +- .../plate_simulation/sweep/driver.py | 32 ++++++++----------- 4 files changed, 21 insertions(+), 27 deletions(-) diff --git a/simpeg_drivers/components/factories/misfit_factory.py b/simpeg_drivers/components/factories/misfit_factory.py index 7b8cad88..eeb3bb19 100644 --- a/simpeg_drivers/components/factories/misfit_factory.py +++ b/simpeg_drivers/components/factories/misfit_factory.py @@ -125,6 +125,7 @@ def build(self, tiles, **_): return dask_objective_function.DistributedComboMisfits( misfits, client=self.client, + workers=self.workers, ) return self.simpeg_object( # pylint: disable=not-callable diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 63918104..fe4d78f6 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -129,11 +129,8 @@ def validate_workers(self, workers: list[tuple[str]] | None) -> list[tuple[str]] """ Validate the list of workers. """ - if self.client and self.client.cluster is not None: - available_workers = [ - (worker.worker_address,) - for worker in self.client.cluster.workers.values() - ] + if self.client: + available_workers = [(worker,) for worker in self.client.nthreads()] else: available_workers = [] @@ -145,7 +142,7 @@ def validate_workers(self, workers: list[tuple[str]] | None) -> list[tuple[str]] ): raise TypeError("Workers must be a list of tuple[str].") - if self.client and self.client.cluster is not None: + if self.client: invalid_workers = [w for w in workers if w not in available_workers] if invalid_workers: raise ValueError( @@ -833,12 +830,12 @@ def get_path(self, filepath: str | Path) -> str: with ( cluster.get_client() if cluster is not None - else contextlib.nullcontext() as client + else contextlib.nullcontext() as context_client ): # Full run with ( performance_report(filename=file.parent / "dask_profile.html") - if (save_report and isinstance(client, Client)) + if (save_report and isinstance(context_client, Client)) else contextlib.nullcontext() ): InversionDriver.start(input_file) diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index 8e8d6a26..c22013cd 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -134,7 +134,7 @@ def simulation_driver(self) -> InversionDriver: self.simulation_parameters.inversion_type, forward_only=True ) self._simulation_driver = driver_class( - self.simulation_parameters, client=self.client + self.simulation_parameters, client=self.client, workers=self.workers ) self._simulation_driver.out_group.parent = self.out_group diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index 00fffa5e..ed9a9403 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -13,7 +13,6 @@ import pstats import shutil import sys -import uuid from pathlib import Path import numpy as np @@ -133,7 +132,7 @@ def run(self): block, self.params.geoh5.h5file, self.params.workdir, - self.out_group.uid, + self.workers[ind], workers=self.workers[ind], ) ) @@ -143,20 +142,17 @@ def run(self): [block], self.params.geoh5.h5file, self.params.workdir, - self.out_group.uid, ) if use_futures: - _ = self.client.gather(futures) + self.client.gather(futures) @staticmethod - def run_worker( - uid: str, - data: dict, - h5file: Path, - workdir: Path | None, - workers: list[tuple[str]] | None = None, + def run_trial( + data: dict, h5file: Path, workdir: Path | None, worker: tuple[str] | None = None ): + uid = SweepOptions.uuid_from_params(data) + if workdir is None: workdir = h5file.parent @@ -176,27 +172,27 @@ def run_worker( opt_dict = workspace.promote(flatten(plate_simulation.options)) opt_dict["geoh5"] = workspace + opt_dict["out_group"] = None + opt_dict.update(data) options = PlateSimulationOptions.build(opt_dict) - plate_sim = PlateSimulationDriver(options, client=False) + plate_sim = PlateSimulationDriver(options, workers=[worker]) plate_sim.run() + del plate_sim + return None + def trial_runs( trials: list[dict], h5file: Path, workdir: Path | None, - out_group_id: uuid.UUID, - workers: list[tuple[str]] | None = None, + worker: tuple[str] | None = None, ): """ Loop through a list of trials and run a worker for each unique parameter set. """ for kwargs in trials: - uid = SweepOptions.uuid_from_params(kwargs) - kwargs.update({"out_group": str(out_group_id)}) - PlateSweepDriver.run_worker(uid, kwargs, h5file, workdir) - - return None + PlateSweepDriver.run_trial(kwargs, h5file, workdir, worker=worker) if __name__ == "__main__": From e4c0d01f6dc8ae2cfdf6626b2838773a570025bb Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 25 Sep 2025 11:44:07 -0400 Subject: [PATCH 04/22] Use SimPEGGroup for PlateSim, clean up sweep driver --- simpeg_drivers/plate_simulation/driver.py | 14 +++++++------- simpeg_drivers/plate_simulation/sweep/driver.py | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index c22013cd..59b09b8b 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -18,7 +18,7 @@ from geoapps_utils.base import Driver, get_logger from geoapps_utils.utils.transformations import azimuth_to_unit_vector from geoh5py.data import FloatData, ReferencedData -from geoh5py.groups import UIJsonGroup +from geoh5py.groups import SimPEGGroup from geoh5py.objects import Octree, Points, Surface from geoh5py.shared.utils import fetch_active_workspace, stringify from geoh5py.ui_json import InputFile, monitored_directory_copy @@ -87,23 +87,23 @@ def run(self) -> InversionDriver: return self.simulation_driver @property - def out_group(self) -> UIJsonGroup: + def out_group(self) -> SimPEGGroup: """ Returns the output group for the simulation. """ return self._out_group - def validate_out_group(self, out_group: UIJsonGroup | None) -> UIJsonGroup: + def validate_out_group(self, out_group: SimPEGGroup | None) -> SimPEGGroup: """ - Validate or create a UIJsonGroup to store results. + Validate or create a SimPEGGroup to store results. - :param value: Output group from selection. + :param out_group: Output group from selection. """ - if isinstance(out_group, UIJsonGroup): + if isinstance(out_group, SimPEGGroup): return out_group with fetch_active_workspace(self.params.geoh5, mode="r+"): - out_group = UIJsonGroup.create( + out_group = SimPEGGroup.create( self.params.geoh5, name="Plate Simulation", ) diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index ed9a9403..12bb2176 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -16,14 +16,13 @@ from pathlib import Path import numpy as np -from dask.distributed import Client, LocalCluster, get_client, performance_report +from dask.distributed import Client, LocalCluster, performance_report from geoapps_utils.run import load_ui_json_as_dict from geoapps_utils.utils.importing import GeoAppsError from geoapps_utils.utils.logger import get_logger from geoh5py import Workspace from geoh5py.groups import SimPEGGroup, UIJsonGroup -from geoh5py.shared.utils import fetch_active_workspace, stringify -from geoh5py.ui_json.input_file import InputFile +from geoh5py.shared.utils import fetch_active_workspace from geoh5py.ui_json.utils import flatten from simpeg_drivers.driver import BaseDriver @@ -196,7 +195,8 @@ def trial_runs( if __name__ == "__main__": - file = Path(r"C:\Users\dominiquef\Desktop\Tests\GEOPY-2466.ui.json").resolve() + file = Path(sys.argv[1]) + # Path(r"C:\Users\dominiquef\Desktop\Tests\GEOPY-2466.ui.json").resolve() input_file = load_ui_json_as_dict(file) n_workers = input_file.get("n_workers", None) From 0a84d5b96e5ee82e158be7ebf0a3743e4969ba3d Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 25 Sep 2025 12:14:48 -0400 Subject: [PATCH 05/22] Temp re-lock for tests --- .../py-3.10-linux-64-dev.conda.lock.yml | 44 +-- environments/py-3.10-linux-64.conda.lock.yml | 34 +- .../py-3.10-win-64-dev.conda.lock.yml | 36 +- environments/py-3.10-win-64.conda.lock.yml | 26 +- .../py-3.11-linux-64-dev.conda.lock.yml | 44 +-- environments/py-3.11-linux-64.conda.lock.yml | 34 +- .../py-3.11-win-64-dev.conda.lock.yml | 36 +- environments/py-3.11-win-64.conda.lock.yml | 26 +- .../py-3.12-linux-64-dev.conda.lock.yml | 44 +-- environments/py-3.12-linux-64.conda.lock.yml | 34 +- .../py-3.12-win-64-dev.conda.lock.yml | 36 +- environments/py-3.12-win-64.conda.lock.yml | 26 +- py-3.10.conda-lock.yml | 320 ++++++++--------- py-3.11.conda-lock.yml | 322 +++++++++--------- py-3.12.conda-lock.yml | 322 +++++++++--------- pyproject.toml | 2 +- 16 files changed, 693 insertions(+), 693 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 421e3c57..48bc9781 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: c8f7ae0bddeffc0ce95aebb250579b216dcf022feb26f8e2d841be6b05442f87 +# input_hash: 2fbee61177612de9087814534b943c81f23e46c607a507da87dd59a311982edb channels: - conda-forge @@ -10,7 +10,7 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.10.0=pyhe01879c_0 + - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - argon2-cffi-bindings=25.1.0=py310h7c4b9e2_0 - arrow=1.3.0=pyhd8ed1ab_1 @@ -33,14 +33,14 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py310h34a4b09_1 + - cffi=2.0.0=py310h34a4b09_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - - click=8.2.1=pyh707e725_0 + - click=8.3.0=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.2=py310h3788b33_0 - - coverage=7.10.6=py310h3406613_1 + - coverage=7.10.7=py310h3406613_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha75aee5_0 - dask-core=2025.3.0=pyhd8ed1ab_0 @@ -105,17 +105,17 @@ dependencies: - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.4.9=py310haaf941d_1 - krb5=1.21.3=h659f571_0 - - lark=1.2.2=pyhd8ed1ab_1 + - lark=1.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.44=h1423503_1 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - - libblas=3.9.0=35_h5875eb1_mkl + - libblas=3.9.0=36_h5875eb1_mkl - libbrotlicommon=1.1.0=hb03c661_4 - libbrotlidec=1.1.0=hb03c661_4 - libbrotlienc=1.1.0=hb03c661_4 - - libcblas=3.9.0=35_hfef963f_mkl + - libcblas=3.9.0=36_hfef963f_mkl - libcurl=8.14.1=h332b0f4_0 - libdeflate=1.24=h86f0d12_0 - libdlf=0.3.0=pyhd8ed1ab_1 @@ -132,7 +132,7 @@ dependencies: - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 - - liblapack=3.9.0=35_h5e43f62_mkl + - liblapack=3.9.0=36_h5e43f62_mkl - liblzma=5.8.1=hb9d3cd8_2 - libnghttp2=1.67.0=had1ee68_0 - libnsl=2.0.1=hb9d3cd8_1 @@ -144,13 +144,13 @@ dependencies: - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_5 - libstdcxx-ng=15.1.0=h4852527_5 - - libtiff=4.7.0=h8261f1e_6 - - libuuid=2.41.1=he9a06e4_0 + - libtiff=4.7.1=h8261f1e_0 + - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.15.0=h26afc86_0 - - libxml2-16=2.15.0=ha9997c6_0 + - libxml2=2.15.0=h26afc86_1 + - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - llvm-openmp=21.1.0=h4922eb0_0 @@ -182,8 +182,8 @@ dependencies: - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.13.1=py310h5eaa309_0 - numpy=1.26.4=py310hb13e2d6_0 - - openjpeg=2.5.3=h55fea9a_1 - - openssl=3.5.3=h26f9b46_0 + - openjpeg=2.5.4=h55fea9a_0 + - openssl=3.5.3=h26f9b46_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py310h0158d43_0 @@ -197,7 +197,7 @@ dependencies: - pip=25.2=pyh8b19718_0 - platformdirs=4.4.0=pyhcf101f3_0 - pluggy=1.6.0=pyhd8ed1ab_0 - - prometheus_client=0.22.1=pyhd8ed1ab_0 + - prometheus_client=0.23.1=pyhd8ed1ab_0 - prompt-toolkit=3.0.52=pyha770c72_0 - psutil=7.1.0=py310h7c4b9e2_0 - pthread-stubs=0.4=hb9d3cd8_1002 @@ -213,7 +213,7 @@ dependencies: - pygments=2.19.2=pyhd8ed1ab_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 - pytest=8.4.2=pyhd8ed1ab_0 - pytest-cov=7.0.0=pyhcf101f3_1 @@ -288,7 +288,7 @@ dependencies: - unicodedata2=16.0.0=py310h7c4b9e2_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - - wcwidth=0.2.13=pyhd8ed1ab_1 + - wcwidth=0.2.14=pyhd8ed1ab_0 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.8.0=pyhd8ed1ab_1 @@ -305,10 +305,10 @@ dependencies: - zstandard=0.25.0=py310h139afa4_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index d3303174..b58e7fab 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: c8f7ae0bddeffc0ce95aebb250579b216dcf022feb26f8e2d841be6b05442f87 +# input_hash: 2fbee61177612de9087814534b943c81f23e46c607a507da87dd59a311982edb channels: - conda-forge @@ -20,8 +20,8 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py310h34a4b09_1 - - click=8.2.1=pyh707e725_0 + - cffi=2.0.0=py310h34a4b09_0 + - click=8.3.0=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - contourpy=1.3.2=py310h3788b33_0 @@ -53,11 +53,11 @@ dependencies: - ld_impl_linux-64=2.44=h1423503_1 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - - libblas=3.9.0=35_h5875eb1_mkl + - libblas=3.9.0=36_h5875eb1_mkl - libbrotlicommon=1.1.0=hb03c661_4 - libbrotlidec=1.1.0=hb03c661_4 - libbrotlienc=1.1.0=hb03c661_4 - - libcblas=3.9.0=35_hfef963f_mkl + - libcblas=3.9.0=36_hfef963f_mkl - libcurl=8.14.1=h332b0f4_0 - libdeflate=1.24=h86f0d12_0 - libdlf=0.3.0=pyhd8ed1ab_1 @@ -74,7 +74,7 @@ dependencies: - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 - - liblapack=3.9.0=35_h5e43f62_mkl + - liblapack=3.9.0=36_h5e43f62_mkl - liblzma=5.8.1=hb9d3cd8_2 - libnghttp2=1.67.0=had1ee68_0 - libnsl=2.0.1=hb9d3cd8_1 @@ -85,13 +85,13 @@ dependencies: - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_5 - libstdcxx-ng=15.1.0=h4852527_5 - - libtiff=4.7.0=h8261f1e_6 - - libuuid=2.41.1=he9a06e4_0 + - libtiff=4.7.1=h8261f1e_0 + - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.15.0=h26afc86_0 - - libxml2-16=2.15.0=ha9997c6_0 + - libxml2=2.15.0=h26afc86_1 + - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - llvm-openmp=21.1.0=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -107,8 +107,8 @@ dependencies: - ncurses=6.5=h2d0b736_3 - numcodecs=0.13.1=py310h5eaa309_0 - numpy=1.26.4=py310hb13e2d6_0 - - openjpeg=2.5.3=h55fea9a_1 - - openssl=3.5.3=h26f9b46_0 + - openjpeg=2.5.4=h55fea9a_0 + - openssl=3.5.3=h26f9b46_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py310h0158d43_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -123,7 +123,7 @@ dependencies: - pydiso=0.1.2=py310h69a6472_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 - python=3.10.18=hd6af730_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 @@ -166,10 +166,10 @@ dependencies: - zstandard=0.25.0=py310h139afa4_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 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 e5ff75e5..3c747d33 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: 0e4eae48731ca9e26a194a0b731d4cbb5666ce7bac7a5003b542681283abdc39 +# input_hash: 5d32a80f683c1f03364fd44236d6f2efed5bd5e8bbbc5be14bddc05eb96610ee channels: - conda-forge @@ -10,7 +10,7 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.10.0=pyhe01879c_0 + - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - argon2-cffi-bindings=25.1.0=py310h29418f3_0 - arrow=1.3.0=pyhd8ed1ab_1 @@ -32,14 +32,14 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py310h29418f3_1 + - cffi=2.0.0=py310h29418f3_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - - click=8.2.1=pyh7428d3b_0 + - click=8.3.0=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.2=py310hc19bc0b_0 - - coverage=7.10.6=py310hdb0e946_1 + - coverage=7.10.7=py310hdb0e946_0 - cpython=3.10.18=py310hd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha8f682b_0 @@ -104,7 +104,7 @@ dependencies: - jupytext=1.17.3=pyh80e38bb_0 - kiwisolver=1.4.9=py310h1e1005b_1 - krb5=1.21.3=hdf4eb48_0 - - lark=1.2.2=pyhd8ed1ab_1 + - lark=1.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h6470a55_1 @@ -133,12 +133,12 @@ dependencies: - libspatialindex=2.0.0=h5a68840_0 - libsqlite=3.50.4=hf5d6505_0 - libssh2=1.11.1=h9aa295b_0 - - libtiff=4.7.0=h550210a_6 + - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.15.0=ha29bfb0_0 - - libxml2-16=2.15.0=h06f855e_0 + - libxml2=2.15.0=ha29bfb0_1 + - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - llvm-openmp=20.1.8=hfa2b4ca_2 @@ -167,8 +167,8 @@ dependencies: - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 - - openjpeg=2.5.3=h24db6dd_1 - - openssl=3.5.3=h725018a_0 + - openjpeg=2.5.4=h24db6dd_0 + - openssl=3.5.3=h725018a_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py310hed136d8_0 @@ -181,7 +181,7 @@ dependencies: - pip=25.2=pyh8b19718_0 - platformdirs=4.4.0=pyhcf101f3_0 - pluggy=1.6.0=pyhd8ed1ab_0 - - prometheus_client=0.22.1=pyhd8ed1ab_0 + - prometheus_client=0.23.1=pyhd8ed1ab_0 - prompt-toolkit=3.0.52=pyha770c72_0 - psutil=7.1.0=py310h29418f3_0 - pthread-stubs=0.4=h0e40799_1002 @@ -196,7 +196,7 @@ dependencies: - pygments=2.19.2=pyhd8ed1ab_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 - pytest=8.4.2=pyhd8ed1ab_0 - pytest-cov=7.0.0=pyhcf101f3_1 @@ -276,7 +276,7 @@ dependencies: - vc=14.3=h41ae7f8_31 - vc14_runtime=14.44.35208=h818238b_31 - vcomp14=14.44.35208=h818238b_31 - - wcwidth=0.2.13=pyhd8ed1ab_1 + - wcwidth=0.2.14=pyhd8ed1ab_0 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.8.0=pyhd8ed1ab_1 @@ -295,10 +295,10 @@ dependencies: - zstandard=0.25.0=py310h1637853_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 768fee5f..0a6ecee6 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: 0e4eae48731ca9e26a194a0b731d4cbb5666ce7bac7a5003b542681283abdc39 +# input_hash: 5d32a80f683c1f03364fd44236d6f2efed5bd5e8bbbc5be14bddc05eb96610ee channels: - conda-forge @@ -19,8 +19,8 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py310h29418f3_1 - - click=8.2.1=pyh7428d3b_0 + - cffi=2.0.0=py310h29418f3_0 + - click=8.3.0=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - contourpy=1.3.2=py310hc19bc0b_0 @@ -73,12 +73,12 @@ dependencies: - libspatialindex=2.0.0=h5a68840_0 - libsqlite=3.50.4=hf5d6505_0 - libssh2=1.11.1=h9aa295b_0 - - libtiff=4.7.0=h550210a_6 + - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.15.0=ha29bfb0_0 - - libxml2-16=2.15.0=h06f855e_0 + - libxml2=2.15.0=ha29bfb0_1 + - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - llvm-openmp=20.1.8=hfa2b4ca_2 - locket=1.0.0=pyhd8ed1ab_0 @@ -91,8 +91,8 @@ dependencies: - munkres=1.1.4=pyhd8ed1ab_1 - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 - - openjpeg=2.5.3=h24db6dd_1 - - openssl=3.5.3=h725018a_0 + - openjpeg=2.5.4=h24db6dd_0 + - openssl=3.5.3=h725018a_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py310hed136d8_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -107,7 +107,7 @@ dependencies: - pydiso=0.1.2=py310h8f92c26_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 - python=3.10.18=h8c5b53a_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 @@ -154,10 +154,10 @@ dependencies: - zstandard=0.25.0=py310h1637853_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 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 71f60521..2b949e3c 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: c3c882ab7106f1ac6d6821bf96f16035a0c501482813360bc7738edf05725ab9 +# input_hash: 1af1d176267655c55d85f45ce8f6631d705e027c4ba0981011e099ce2fe30e8c channels: - conda-forge @@ -10,7 +10,7 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.10.0=pyhe01879c_0 + - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - argon2-cffi-bindings=25.1.0=py311h49ec1c0_0 - arrow=1.3.0=pyhd8ed1ab_1 @@ -33,14 +33,14 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py311h5b438cf_1 + - cffi=2.0.0=py311h5b438cf_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - - click=8.2.1=pyh707e725_0 + - click=8.3.0=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py311hdf67eae_2 - - coverage=7.10.6=py311h3778330_1 + - coverage=7.10.7=py311h3778330_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py311h9ecbd09_0 - dask-core=2025.3.0=pyhd8ed1ab_0 @@ -107,17 +107,17 @@ dependencies: - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.4.9=py311h724c32c_1 - krb5=1.21.3=h659f571_0 - - lark=1.2.2=pyhd8ed1ab_1 + - lark=1.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.44=h1423503_1 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - - libblas=3.9.0=35_h5875eb1_mkl + - libblas=3.9.0=36_h5875eb1_mkl - libbrotlicommon=1.1.0=hb03c661_4 - libbrotlidec=1.1.0=hb03c661_4 - libbrotlienc=1.1.0=hb03c661_4 - - libcblas=3.9.0=35_hfef963f_mkl + - libcblas=3.9.0=36_hfef963f_mkl - libcurl=8.14.1=h332b0f4_0 - libdeflate=1.24=h86f0d12_0 - libdlf=0.3.0=pyhd8ed1ab_1 @@ -134,7 +134,7 @@ dependencies: - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 - - liblapack=3.9.0=35_h5e43f62_mkl + - liblapack=3.9.0=36_h5e43f62_mkl - liblzma=5.8.1=hb9d3cd8_2 - libnghttp2=1.67.0=had1ee68_0 - libnsl=2.0.1=hb9d3cd8_1 @@ -146,13 +146,13 @@ dependencies: - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_5 - libstdcxx-ng=15.1.0=h4852527_5 - - libtiff=4.7.0=h8261f1e_6 - - libuuid=2.41.1=he9a06e4_0 + - libtiff=4.7.1=h8261f1e_0 + - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.15.0=h26afc86_0 - - libxml2-16=2.15.0=ha9997c6_0 + - libxml2=2.15.0=h26afc86_1 + - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - llvm-openmp=21.1.0=h4922eb0_0 @@ -184,8 +184,8 @@ dependencies: - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py311h7db5c69_0 - numpy=1.26.4=py311h64a7726_0 - - openjpeg=2.5.3=h55fea9a_1 - - openssl=3.5.3=h26f9b46_0 + - openjpeg=2.5.4=h55fea9a_0 + - openssl=3.5.3=h26f9b46_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py311hed34c8f_0 @@ -199,7 +199,7 @@ dependencies: - pip=25.2=pyh8b19718_0 - platformdirs=4.4.0=pyhcf101f3_0 - pluggy=1.6.0=pyhd8ed1ab_0 - - prometheus_client=0.22.1=pyhd8ed1ab_0 + - prometheus_client=0.23.1=pyhd8ed1ab_0 - prompt-toolkit=3.0.52=pyha770c72_0 - psutil=7.1.0=py311h49ec1c0_0 - pthread-stubs=0.4=hb9d3cd8_1002 @@ -215,7 +215,7 @@ dependencies: - pygments=2.19.2=pyhd8ed1ab_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 - pytest=8.4.2=pyhd8ed1ab_0 - pytest-cov=7.0.0=pyhcf101f3_1 @@ -290,7 +290,7 @@ dependencies: - unicodedata2=16.0.0=py311h49ec1c0_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - - wcwidth=0.2.13=pyhd8ed1ab_1 + - wcwidth=0.2.14=pyhd8ed1ab_0 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.8.0=pyhd8ed1ab_1 @@ -308,10 +308,10 @@ dependencies: - zstandard=0.25.0=py311haee01d2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 9c928baa..41024502 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: c3c882ab7106f1ac6d6821bf96f16035a0c501482813360bc7738edf05725ab9 +# input_hash: 1af1d176267655c55d85f45ce8f6631d705e027c4ba0981011e099ce2fe30e8c channels: - conda-forge @@ -20,8 +20,8 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py311h5b438cf_1 - - click=8.2.1=pyh707e725_0 + - cffi=2.0.0=py311h5b438cf_0 + - click=8.3.0=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - contourpy=1.3.3=py311hdf67eae_2 @@ -54,11 +54,11 @@ dependencies: - ld_impl_linux-64=2.44=h1423503_1 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - - libblas=3.9.0=35_h5875eb1_mkl + - libblas=3.9.0=36_h5875eb1_mkl - libbrotlicommon=1.1.0=hb03c661_4 - libbrotlidec=1.1.0=hb03c661_4 - libbrotlienc=1.1.0=hb03c661_4 - - libcblas=3.9.0=35_hfef963f_mkl + - libcblas=3.9.0=36_hfef963f_mkl - libcurl=8.14.1=h332b0f4_0 - libdeflate=1.24=h86f0d12_0 - libdlf=0.3.0=pyhd8ed1ab_1 @@ -75,7 +75,7 @@ dependencies: - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 - - liblapack=3.9.0=35_h5e43f62_mkl + - liblapack=3.9.0=36_h5e43f62_mkl - liblzma=5.8.1=hb9d3cd8_2 - libnghttp2=1.67.0=had1ee68_0 - libnsl=2.0.1=hb9d3cd8_1 @@ -86,13 +86,13 @@ dependencies: - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_5 - libstdcxx-ng=15.1.0=h4852527_5 - - libtiff=4.7.0=h8261f1e_6 - - libuuid=2.41.1=he9a06e4_0 + - libtiff=4.7.1=h8261f1e_0 + - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.15.0=h26afc86_0 - - libxml2-16=2.15.0=ha9997c6_0 + - libxml2=2.15.0=h26afc86_1 + - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - llvm-openmp=21.1.0=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -108,8 +108,8 @@ dependencies: - ncurses=6.5=h2d0b736_3 - numcodecs=0.15.1=py311h7db5c69_0 - numpy=1.26.4=py311h64a7726_0 - - openjpeg=2.5.3=h55fea9a_1 - - openssl=3.5.3=h26f9b46_0 + - openjpeg=2.5.4=h55fea9a_0 + - openssl=3.5.3=h26f9b46_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py311hed34c8f_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -124,7 +124,7 @@ dependencies: - pydiso=0.1.2=py311h19ea254_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 - python=3.11.13=h9e4cc4f_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 @@ -168,10 +168,10 @@ dependencies: - zstandard=0.25.0=py311haee01d2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 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 bc9705bc..d5d35fd2 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: 106a2623766605c1a3c6aa7c479d1dd64f6d252df48e62b2a77761f8e247f0c4 +# input_hash: 06c1dfa4251bc51989748bf3e74139553c7b44a0b709b2171b63434f77cb8b8f channels: - conda-forge @@ -10,7 +10,7 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.10.0=pyhe01879c_0 + - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - argon2-cffi-bindings=25.1.0=py311h3485c13_0 - arrow=1.3.0=pyhd8ed1ab_1 @@ -32,14 +32,14 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py311h3485c13_1 + - cffi=2.0.0=py311h3485c13_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - - click=8.2.1=pyh7428d3b_0 + - click=8.3.0=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py311h3fd045d_2 - - coverage=7.10.6=py311h3f79411_1 + - coverage=7.10.7=py311h3f79411_0 - cpython=3.11.13=py311hd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py311he736701_0 @@ -106,7 +106,7 @@ dependencies: - jupytext=1.17.3=pyh80e38bb_0 - kiwisolver=1.4.9=py311h275cad7_1 - krb5=1.21.3=hdf4eb48_0 - - lark=1.2.2=pyhd8ed1ab_1 + - lark=1.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h6470a55_1 @@ -135,12 +135,12 @@ dependencies: - libspatialindex=2.0.0=h5a68840_0 - libsqlite=3.50.4=hf5d6505_0 - libssh2=1.11.1=h9aa295b_0 - - libtiff=4.7.0=h550210a_6 + - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.15.0=ha29bfb0_0 - - libxml2-16=2.15.0=h06f855e_0 + - libxml2=2.15.0=ha29bfb0_1 + - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - llvm-openmp=20.1.8=hfa2b4ca_2 @@ -169,8 +169,8 @@ dependencies: - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py311hcf9f919_0 - numpy=1.26.4=py311h0b4df5a_0 - - openjpeg=2.5.3=h24db6dd_1 - - openssl=3.5.3=h725018a_0 + - openjpeg=2.5.4=h24db6dd_0 + - openssl=3.5.3=h725018a_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py311h11fd7f3_0 @@ -183,7 +183,7 @@ dependencies: - pip=25.2=pyh8b19718_0 - platformdirs=4.4.0=pyhcf101f3_0 - pluggy=1.6.0=pyhd8ed1ab_0 - - prometheus_client=0.22.1=pyhd8ed1ab_0 + - prometheus_client=0.23.1=pyhd8ed1ab_0 - prompt-toolkit=3.0.52=pyha770c72_0 - psutil=7.1.0=py311h3485c13_0 - pthread-stubs=0.4=h0e40799_1002 @@ -198,7 +198,7 @@ dependencies: - pygments=2.19.2=pyhd8ed1ab_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 - pytest=8.4.2=pyhd8ed1ab_0 - pytest-cov=7.0.0=pyhcf101f3_1 @@ -278,7 +278,7 @@ dependencies: - vc=14.3=h41ae7f8_31 - vc14_runtime=14.44.35208=h818238b_31 - vcomp14=14.44.35208=h818238b_31 - - wcwidth=0.2.13=pyhd8ed1ab_1 + - wcwidth=0.2.14=pyhd8ed1ab_0 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.8.0=pyhd8ed1ab_1 @@ -298,10 +298,10 @@ dependencies: - zstandard=0.25.0=py311hf893f09_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index b2b60c57..8a1f3ae5 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: 106a2623766605c1a3c6aa7c479d1dd64f6d252df48e62b2a77761f8e247f0c4 +# input_hash: 06c1dfa4251bc51989748bf3e74139553c7b44a0b709b2171b63434f77cb8b8f channels: - conda-forge @@ -19,8 +19,8 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py311h3485c13_1 - - click=8.2.1=pyh7428d3b_0 + - cffi=2.0.0=py311h3485c13_0 + - click=8.3.0=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - contourpy=1.3.3=py311h3fd045d_2 @@ -74,12 +74,12 @@ dependencies: - libspatialindex=2.0.0=h5a68840_0 - libsqlite=3.50.4=hf5d6505_0 - libssh2=1.11.1=h9aa295b_0 - - libtiff=4.7.0=h550210a_6 + - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.15.0=ha29bfb0_0 - - libxml2-16=2.15.0=h06f855e_0 + - libxml2=2.15.0=ha29bfb0_1 + - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - llvm-openmp=20.1.8=hfa2b4ca_2 - locket=1.0.0=pyhd8ed1ab_0 @@ -92,8 +92,8 @@ dependencies: - munkres=1.1.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py311hcf9f919_0 - numpy=1.26.4=py311h0b4df5a_0 - - openjpeg=2.5.3=h24db6dd_1 - - openssl=3.5.3=h725018a_0 + - openjpeg=2.5.4=h24db6dd_0 + - openssl=3.5.3=h725018a_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py311h11fd7f3_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -108,7 +108,7 @@ dependencies: - pydiso=0.1.2=py311h66870c1_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 - python=3.11.13=h3f84c4b_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 @@ -156,10 +156,10 @@ dependencies: - zstandard=0.25.0=py311hf893f09_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 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 b536f819..e7adf59a 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: 81aedccfb6112401b5a94619d03cb65bd3c0a1242f995c2c22516fc86dbbaec5 +# input_hash: cb9546b38f57d3e804993094458c11132e417e6b0985a5e006afbb49acca414e channels: - conda-forge @@ -11,7 +11,7 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.10.0=pyhe01879c_0 + - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - argon2-cffi-bindings=25.1.0=py312h4c3975b_0 - arrow=1.3.0=pyhd8ed1ab_1 @@ -34,14 +34,14 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py312h35888ee_1 + - cffi=2.0.0=py312h35888ee_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - - click=8.2.1=pyh707e725_0 + - click=8.3.0=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py312hd9148b4_2 - - coverage=7.10.6=py312h8a5da7c_1 + - coverage=7.10.7=py312h8a5da7c_0 - cpython=3.12.11=py312hd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py312h66e93f0_0 @@ -109,17 +109,17 @@ dependencies: - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.4.9=py312h0a2e395_1 - krb5=1.21.3=h659f571_0 - - lark=1.2.2=pyhd8ed1ab_1 + - lark=1.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.44=h1423503_1 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - - libblas=3.9.0=35_h5875eb1_mkl + - libblas=3.9.0=36_h5875eb1_mkl - libbrotlicommon=1.1.0=hb03c661_4 - libbrotlidec=1.1.0=hb03c661_4 - libbrotlienc=1.1.0=hb03c661_4 - - libcblas=3.9.0=35_hfef963f_mkl + - libcblas=3.9.0=36_hfef963f_mkl - libcurl=8.14.1=h332b0f4_0 - libdeflate=1.24=h86f0d12_0 - libdlf=0.3.0=pyhd8ed1ab_1 @@ -136,7 +136,7 @@ dependencies: - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 - - liblapack=3.9.0=35_h5e43f62_mkl + - liblapack=3.9.0=36_h5e43f62_mkl - liblzma=5.8.1=hb9d3cd8_2 - libnghttp2=1.67.0=had1ee68_0 - libnsl=2.0.1=hb9d3cd8_1 @@ -148,13 +148,13 @@ dependencies: - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_5 - libstdcxx-ng=15.1.0=h4852527_5 - - libtiff=4.7.0=h8261f1e_6 - - libuuid=2.41.1=he9a06e4_0 + - libtiff=4.7.1=h8261f1e_0 + - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.15.0=h26afc86_0 - - libxml2-16=2.15.0=ha9997c6_0 + - libxml2=2.15.0=h26afc86_1 + - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - llvm-openmp=21.1.0=h4922eb0_0 @@ -186,8 +186,8 @@ dependencies: - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312hf9745cd_0 - numpy=1.26.4=py312heda63a1_0 - - openjpeg=2.5.3=h55fea9a_1 - - openssl=3.5.3=h26f9b46_0 + - openjpeg=2.5.4=h55fea9a_0 + - openssl=3.5.3=h26f9b46_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py312hf79963d_0 @@ -201,7 +201,7 @@ dependencies: - pip=25.2=pyh8b19718_0 - platformdirs=4.4.0=pyhcf101f3_0 - pluggy=1.6.0=pyhd8ed1ab_0 - - prometheus_client=0.22.1=pyhd8ed1ab_0 + - prometheus_client=0.23.1=pyhd8ed1ab_0 - prompt-toolkit=3.0.52=pyha770c72_0 - psutil=7.1.0=py312h4c3975b_0 - pthread-stubs=0.4=hb9d3cd8_1002 @@ -217,7 +217,7 @@ dependencies: - pygments=2.19.2=pyhd8ed1ab_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 - pytest=8.4.2=pyhd8ed1ab_0 - pytest-cov=7.0.0=pyhcf101f3_1 @@ -293,7 +293,7 @@ dependencies: - unicodedata2=16.0.0=py312h4c3975b_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - - wcwidth=0.2.13=pyhd8ed1ab_1 + - wcwidth=0.2.14=pyhd8ed1ab_0 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.8.0=pyhd8ed1ab_1 @@ -311,10 +311,10 @@ dependencies: - zstandard=0.25.0=py312h5253ce2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 65d18152..775abd16 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: 81aedccfb6112401b5a94619d03cb65bd3c0a1242f995c2c22516fc86dbbaec5 +# input_hash: cb9546b38f57d3e804993094458c11132e417e6b0985a5e006afbb49acca414e channels: - conda-forge @@ -20,8 +20,8 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py312h35888ee_1 - - click=8.2.1=pyh707e725_0 + - cffi=2.0.0=py312h35888ee_0 + - click=8.3.0=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - contourpy=1.3.3=py312hd9148b4_2 @@ -54,11 +54,11 @@ dependencies: - ld_impl_linux-64=2.44=h1423503_1 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - - libblas=3.9.0=35_h5875eb1_mkl + - libblas=3.9.0=36_h5875eb1_mkl - libbrotlicommon=1.1.0=hb03c661_4 - libbrotlidec=1.1.0=hb03c661_4 - libbrotlienc=1.1.0=hb03c661_4 - - libcblas=3.9.0=35_hfef963f_mkl + - libcblas=3.9.0=36_hfef963f_mkl - libcurl=8.14.1=h332b0f4_0 - libdeflate=1.24=h86f0d12_0 - libdlf=0.3.0=pyhd8ed1ab_1 @@ -75,7 +75,7 @@ dependencies: - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 - - liblapack=3.9.0=35_h5e43f62_mkl + - liblapack=3.9.0=36_h5e43f62_mkl - liblzma=5.8.1=hb9d3cd8_2 - libnghttp2=1.67.0=had1ee68_0 - libnsl=2.0.1=hb9d3cd8_1 @@ -86,13 +86,13 @@ dependencies: - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_5 - libstdcxx-ng=15.1.0=h4852527_5 - - libtiff=4.7.0=h8261f1e_6 - - libuuid=2.41.1=he9a06e4_0 + - libtiff=4.7.1=h8261f1e_0 + - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.15.0=h26afc86_0 - - libxml2-16=2.15.0=ha9997c6_0 + - libxml2=2.15.0=h26afc86_1 + - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - llvm-openmp=21.1.0=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -108,8 +108,8 @@ dependencies: - ncurses=6.5=h2d0b736_3 - numcodecs=0.15.1=py312hf9745cd_0 - numpy=1.26.4=py312heda63a1_0 - - openjpeg=2.5.3=h55fea9a_1 - - openssl=3.5.3=h26f9b46_0 + - openjpeg=2.5.4=h55fea9a_0 + - openssl=3.5.3=h26f9b46_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py312hf79963d_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -124,7 +124,7 @@ dependencies: - pydiso=0.1.2=py312h772f2df_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 - python=3.12.11=h9e4cc4f_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 @@ -168,10 +168,10 @@ dependencies: - zstandard=0.25.0=py312h5253ce2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 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 37e2bc98..fd454689 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: 1184306731b94290082a07ff69198b9bab01231154ed953a92d9f4ce512366a2 +# input_hash: df0a3f0d6a2c3c84822a96397626a26373bf2eaa93e287e4d2c6f7a39e70f663 channels: - conda-forge @@ -11,7 +11,7 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.10.0=pyhe01879c_0 + - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - argon2-cffi-bindings=25.1.0=py312he06e257_0 - arrow=1.3.0=pyhd8ed1ab_1 @@ -33,14 +33,14 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py312he06e257_1 + - cffi=2.0.0=py312he06e257_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - - click=8.2.1=pyh7428d3b_0 + - click=8.3.0=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py312hf90b1b7_2 - - coverage=7.10.6=py312h05f76fc_1 + - coverage=7.10.7=py312h05f76fc_0 - cpython=3.12.11=py312hd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py312h4389bb4_0 @@ -107,7 +107,7 @@ dependencies: - jupytext=1.17.3=pyh80e38bb_0 - kiwisolver=1.4.9=py312h78d62e6_1 - krb5=1.21.3=hdf4eb48_0 - - lark=1.2.2=pyhd8ed1ab_1 + - lark=1.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h6470a55_1 @@ -136,12 +136,12 @@ dependencies: - libspatialindex=2.0.0=h5a68840_0 - libsqlite=3.50.4=hf5d6505_0 - libssh2=1.11.1=h9aa295b_0 - - libtiff=4.7.0=h550210a_6 + - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.15.0=ha29bfb0_0 - - libxml2-16=2.15.0=h06f855e_0 + - libxml2=2.15.0=ha29bfb0_1 + - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - llvm-openmp=20.1.8=hfa2b4ca_2 @@ -170,8 +170,8 @@ dependencies: - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312h72972c8_0 - numpy=1.26.4=py312h8753938_0 - - openjpeg=2.5.3=h24db6dd_1 - - openssl=3.5.3=h725018a_0 + - openjpeg=2.5.4=h24db6dd_0 + - openssl=3.5.3=h725018a_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py312hc128f0a_0 @@ -184,7 +184,7 @@ dependencies: - pip=25.2=pyh8b19718_0 - platformdirs=4.4.0=pyhcf101f3_0 - pluggy=1.6.0=pyhd8ed1ab_0 - - prometheus_client=0.22.1=pyhd8ed1ab_0 + - prometheus_client=0.23.1=pyhd8ed1ab_0 - prompt-toolkit=3.0.52=pyha770c72_0 - psutil=7.1.0=py312he06e257_0 - pthread-stubs=0.4=h0e40799_1002 @@ -199,7 +199,7 @@ dependencies: - pygments=2.19.2=pyhd8ed1ab_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 - pytest=8.4.2=pyhd8ed1ab_0 - pytest-cov=7.0.0=pyhcf101f3_1 @@ -280,7 +280,7 @@ dependencies: - vc=14.3=h41ae7f8_31 - vc14_runtime=14.44.35208=h818238b_31 - vcomp14=14.44.35208=h818238b_31 - - wcwidth=0.2.13=pyhd8ed1ab_1 + - wcwidth=0.2.14=pyhd8ed1ab_0 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.8.0=pyhd8ed1ab_1 @@ -300,10 +300,10 @@ dependencies: - zstandard=0.25.0=py312he5662c2_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 4d4ba317..d2d9d104 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: 1184306731b94290082a07ff69198b9bab01231154ed953a92d9f4ce512366a2 +# input_hash: df0a3f0d6a2c3c84822a96397626a26373bf2eaa93e287e4d2c6f7a39e70f663 channels: - conda-forge @@ -19,8 +19,8 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - certifi=2025.8.3=pyhd8ed1ab_0 - - cffi=1.17.1=py312he06e257_1 - - click=8.2.1=pyh7428d3b_0 + - cffi=2.0.0=py312he06e257_0 + - click=8.3.0=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - contourpy=1.3.3=py312hf90b1b7_2 @@ -74,12 +74,12 @@ dependencies: - libspatialindex=2.0.0=h5a68840_0 - libsqlite=3.50.4=hf5d6505_0 - libssh2=1.11.1=h9aa295b_0 - - libtiff=4.7.0=h550210a_6 + - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.15.0=ha29bfb0_0 - - libxml2-16=2.15.0=h06f855e_0 + - libxml2=2.15.0=ha29bfb0_1 + - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - llvm-openmp=20.1.8=hfa2b4ca_2 - locket=1.0.0=pyhd8ed1ab_0 @@ -92,8 +92,8 @@ dependencies: - munkres=1.1.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312h72972c8_0 - numpy=1.26.4=py312h8753938_0 - - openjpeg=2.5.3=h24db6dd_1 - - openssl=3.5.3=h725018a_0 + - openjpeg=2.5.4=h24db6dd_0 + - openssl=3.5.3=h725018a_1 - packaging=25.0=pyh29332c3_1 - pandas=2.3.2=py312hc128f0a_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -108,7 +108,7 @@ dependencies: - pydiso=0.1.2=py312h01acb21_0 - pylint=3.3.8=pyhe01879c_0 - pymatsolver=0.3.1=pyh48887ae_201 - - pyparsing=3.2.4=pyhcf101f3_0 + - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 - python=3.12.11=h3f84c4b_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 @@ -156,10 +156,10 @@ dependencies: - zstandard=0.25.0=py312he5662c2_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 20990bd4..401fc75d 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: 0e4eae48731ca9e26a194a0b731d4cbb5666ce7bac7a5003b542681283abdc39 - linux-64: c8f7ae0bddeffc0ce95aebb250579b216dcf022feb26f8e2d841be6b05442f87 + win-64: 5d32a80f683c1f03364fd44236d6f2efed5bd5e8bbbc5be14bddc05eb96610ee + linux-64: 2fbee61177612de9087814534b943c81f23e46c607a507da87dd59a311982edb channels: - url: conda-forge used_env_vars: [] @@ -131,7 +131,7 @@ package: category: main optional: false - name: anyio - version: 4.10.0 + version: 4.11.0 manager: conda platform: linux-64 dependencies: @@ -140,26 +140,26 @@ package: python: '' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.11.0-pyhcf101f3_0.conda hash: - md5: cc2613bfa71dec0eb2113ee21ac9ccbf - sha256: d1b50686672ebe7041e44811eda563e45b94a8354db67eca659040392ac74d63 + md5: 814472b61da9792fae28156cb9ee54f5 + sha256: 7378b5b9d81662d73a906fabfc2fb81daddffe8dc0680ed9cda7a9562af894b0 category: dev optional: true - name: anyio - version: 4.10.0 + version: 4.11.0 manager: conda platform: win-64 dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '>=3.9' + python: '>=3.10' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.11.0-pyhcf101f3_0.conda hash: - md5: cc2613bfa71dec0eb2113ee21ac9ccbf - sha256: d1b50686672ebe7041e44811eda563e45b94a8354db67eca659040392ac74d63 + md5: 814472b61da9792fae28156cb9ee54f5 + sha256: 7378b5b9d81662d73a906fabfc2fb81daddffe8dc0680ed9cda7a9562af894b0 category: dev optional: true - name: argon2-cffi @@ -758,7 +758,7 @@ package: category: main optional: false - name: cffi - version: 1.17.1 + version: 2.0.0 manager: conda platform: linux-64 dependencies: @@ -768,14 +768,14 @@ package: pycparser: '' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://repo.prefix.dev/conda-forge/linux-64/cffi-1.17.1-py310h34a4b09_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/cffi-2.0.0-py310h34a4b09_0.conda hash: - md5: 6d582e073a58a7a011716b135819b94a - sha256: a1de720b3b79f2eb51317dd14f14409022f807a59e9107f30d621f0a74293551 + md5: 5a554da3ddfd6dae35ed0f76f70970ff + sha256: 16080097cfd7bb337299d0ee947bffaf04335e74dee7b71893fd92b5ea646173 category: main optional: false - name: cffi - version: 1.17.1 + version: 2.0.0 manager: conda platform: win-64 dependencies: @@ -785,10 +785,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/cffi-1.17.1-py310h29418f3_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/cffi-2.0.0-py310h29418f3_0.conda hash: - md5: 771663d8d11b07dcb22ece2806affac0 - sha256: 9fa2705202603342fb8c5ac29a30af7c77b8582041ff2f29d6db6503ba070a0c + md5: f1966de9724cbe801d7b45b50e861fda + sha256: 25b72b58051125c53f4c94b802509711ae657c317ecb7f39044c560e40acda42 category: main optional: false - name: charset-normalizer @@ -816,30 +816,30 @@ package: category: dev optional: true - name: click - version: 8.2.1 + version: 8.3.0 manager: conda platform: linux-64 dependencies: __unix: '' python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/click-8.2.1-pyh707e725_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda hash: - md5: 94b550b8d3a614dbd326af798c7dfb40 - sha256: 8aee789c82d8fdd997840c952a586db63c6890b00e88c4fb6e80a38edd5f51c0 + md5: e76c4ba9e1837847679421b8d549b784 + sha256: c6567ebc27c4c071a353acaf93eb82bb6d9a6961e40692a359045a89a61d02c0 category: main optional: false - name: click - version: 8.2.1 + version: 8.3.0 manager: conda platform: win-64 dependencies: __win: '' colorama: '' python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/click-8.2.1-pyh7428d3b_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.0-pyh7428d3b_0.conda hash: - md5: 3a59475037bc09da916e4062c5cad771 - sha256: 20c2d8ea3d800485245b586a28985cba281dd6761113a49d7576f6db92a0a891 + md5: 4601476ee4ad7ad522e5ffa5a579a48e + sha256: 0a008359973e833b568d0a18cf04556b12a4f5182e745dfc8ade32c38fa1fca5 category: main optional: false - name: cloudpickle @@ -949,7 +949,7 @@ package: category: main optional: false - name: coverage - version: 7.10.6 + version: 7.10.7 manager: conda platform: linux-64 dependencies: @@ -958,14 +958,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* tomli: '' - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.10.6-py310h3406613_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.10.7-py310h3406613_0.conda hash: - md5: a42ce2be914eabff4bb1674c57304967 - sha256: 917519990bf711336345ff11642853382a8a83be8dcfb4fbd5084084b4e771ca + md5: bc73c61ff9544f3ff7df03696e0548c2 + sha256: fbe57d4a4efbafd56a7b48b462e261487b6adde3d45f47d2ebc244d91156f491 category: dev optional: true - name: coverage - version: 7.10.6 + version: 7.10.7 manager: conda platform: win-64 dependencies: @@ -975,10 +975,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.10.6-py310hdb0e946_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.10.7-py310hdb0e946_0.conda hash: - md5: de8d07aa9fabb48922856f9f67233726 - sha256: 636033b29ab4a1e16840ffa0a7063864776a47c6bedf5edf97c481cc8d996a90 + md5: 7007b00329cefabcc982d9a6409b8360 + sha256: 3fdc5cd1f28dd8398da3c79cd4092b2655b943299ad4397d3a9362ff70b84f8b category: dev optional: true - name: cpython @@ -3004,27 +3004,27 @@ package: category: main optional: false - name: lark - version: 1.2.2 + version: 1.3.0 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 3a8063b25e603999188ed4bbf3485404 - sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + md5: c9ee16acbcea5cc91d9f3eb1d8f903bd + sha256: 6370d6a458b4f11a9ab5db7eb05e895f55f276e6aa4c4bbac7dde412c87fae35 category: dev optional: true - name: lark - version: 1.2.2 + version: 1.3.0 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 3a8063b25e603999188ed4bbf3485404 - sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + md5: c9ee16acbcea5cc91d9f3eb1d8f903bd + sha256: 6370d6a458b4f11a9ab5db7eb05e895f55f276e6aa4c4bbac7dde412c87fae35 category: dev optional: true - name: latexcodec @@ -3158,10 +3158,10 @@ package: platform: linux-64 dependencies: mkl: '>=2024.2.2,<2025.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libblas-3.9.0-35_h5875eb1_mkl.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libblas-3.9.0-36_h5875eb1_mkl.conda hash: - md5: b65e0bee3591c3506ecd7399203b3e01 - sha256: c0e4f8a7b5cc4f455db24ab459a5234c98a652241f8122876fe966fa443be68e + md5: 65a660ed501aaa4f66f341ab46c10975 + sha256: ee96a6697e0bf97693b2ead886b3638498cdfea88ababb2bf3db4b2cff2411e9 category: main optional: false - name: libblas @@ -3267,10 +3267,10 @@ package: platform: linux-64 dependencies: libblas: 3.9.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libcblas-3.9.0-35_hfef963f_mkl.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libcblas-3.9.0-36_hfef963f_mkl.conda hash: - md5: dbe1c207ba67093a0dd7f7a990964959 - sha256: 983dc5c661441e700a5701d872e060a8102700fd9ee4c74267c0ffa5ebeaefcb + md5: 3d52e26e8986f8ee1f28c5db5db083bf + sha256: db02ed8fa1f9e6b5d283bd22382a3c4730fc11e5348a1517740e70490c49da40 category: main optional: false - name: libcblas @@ -3677,10 +3677,10 @@ package: platform: linux-64 dependencies: libblas: 3.9.0 - url: https://repo.prefix.dev/conda-forge/linux-64/liblapack-3.9.0-35_h5e43f62_mkl.conda + url: https://repo.prefix.dev/conda-forge/linux-64/liblapack-3.9.0-36_h5e43f62_mkl.conda hash: - md5: e278459ae50ce80db9594cd3685d1536 - sha256: 2748fbcf57e4c60efa6f4e69bab3009cb361d9b7d6d715672220eb4883ee42e7 + md5: 139897cf3e99d5db77f3331e344528bf + sha256: ef995b43596be175fd270a8c5611cb659037155114717bf8e314487791e34913 category: main optional: false - name: liblapack @@ -3939,7 +3939,7 @@ package: category: main optional: false - name: libtiff - version: 4.7.0 + version: 4.7.1 manager: conda platform: linux-64 dependencies: @@ -3953,14 +3953,14 @@ package: libwebp-base: '>=1.6.0,<2.0a0' libzlib: '>=1.3.1,<2.0a0' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libtiff-4.7.0-h8261f1e_6.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libtiff-4.7.1-h8261f1e_0.conda hash: - md5: b6093922931b535a7ba566b6f384fbe6 - sha256: c62694cd117548d810d2803da6d9063f78b1ffbf7367432c5388ce89474e9ebe + md5: 72b531694ebe4e8aa6f5745d1015c1b4 + sha256: ddda0d7ee67e71e904a452010c73e32da416806f5cb9145fb62c322f97e717fb category: main optional: false - name: libtiff - version: 4.7.0 + version: 4.7.1 manager: conda platform: win-64 dependencies: @@ -3973,23 +3973,23 @@ package: vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/libtiff-4.7.0-h550210a_6.conda + url: https://repo.prefix.dev/conda-forge/win-64/libtiff-4.7.1-h550210a_0.conda hash: - md5: 72d45aa52ebca91aedb0cfd9eac62655 - sha256: fd27821c8cfc425826f13760c3263d7b3b997c5372234cefa1586ff384dcc989 + md5: e23f29747d9d2aa2a39b594c114fac67 + sha256: d6cac6596ded0d5bbbc4198d7eb4db88da8c00236ebf5e2c8ad333ccde8965e2 category: main optional: false - name: libuuid - version: 2.41.1 + version: 2.41.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/libuuid-2.41.1-he9a06e4_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libuuid-2.41.2-he9a06e4_0.conda hash: - md5: af930c65e9a79a3423d6d36e265cef65 - sha256: 776e28735cee84b97e4d05dd5d67b95221a3e2c09b8b13e3d6dbe6494337d527 + md5: 80c07c68d2f6870250959dcc95b209d1 + sha256: e5ec6d2ad7eef538ddcb9ea62ad4346fde70a4736342c4ad87bd713641eb9808 category: main optional: false - name: libwebp-base @@ -4088,10 +4088,10 @@ package: liblzma: '>=5.8.1,<6.0a0' libxml2-16: 2.15.0 libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-2.15.0-h26afc86_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-2.15.0-h26afc86_1.conda hash: - md5: c52b54db4660b44ca75b6a61c533b9f5 - sha256: 09b6703783b2ac600794f7eb2bb5d9e8753a2de607735414e3dbd46d95b17a4c + md5: 8337b675e0cad517fbcb3daf7588087a + sha256: 4310577d7eea817d35a1c05e1e54575b06ce085d73e6dd59aa38523adf50168f category: main optional: false - name: libxml2 @@ -4107,10 +4107,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libxml2-2.15.0-ha29bfb0_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxml2-2.15.0-ha29bfb0_1.conda hash: - md5: 5262552eb2f0d0b443adcfa265d97f0a - sha256: c3c2c74bd917d83b26c102b18bde97759c23f24e0260beb962acf7385627fc38 + md5: 1d6e5fbbe84eebcd62e7cdccec799ce8 + sha256: 8890c03908a407649ac99257b63176b61d10dfa3468aa3db1994ac0973dc2803 category: main optional: false - name: libxml2-16 @@ -4124,10 +4124,10 @@ package: libiconv: '>=1.18,<2.0a0' liblzma: '>=5.8.1,<6.0a0' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-16-2.15.0-ha9997c6_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-16-2.15.0-ha9997c6_1.conda hash: - md5: 84bed2bfefc14e4878bd16979782e522 - sha256: fba83a62276fb3d885e689afc7650b255a93d6e001ceacaccef4e36bbcb9d545 + md5: b24dd2bd61cd8e4f8a13ee2a945a723c + sha256: 5420ea77505a8d5ca7b5351ddb2da7e8a178052fccf8fca00189af7877608e89 category: main optional: false - name: libxml2-16 @@ -4142,10 +4142,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libxml2-16-2.15.0-h06f855e_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxml2-16-2.15.0-h06f855e_1.conda hash: - md5: a1071825a90769083fce8dbcefcccd65 - sha256: 15337581264464842ff28f616422b786161bee0169610ff292e0ea75fa78dba8 + md5: a5d1a1f8745fcd93f39a4b80f389962f + sha256: f29159eef5af2adffe2fef2d89ff2f6feda07e194883f47a4cf366e9608fb91b category: main optional: false - name: libzlib @@ -5059,7 +5059,7 @@ package: category: main optional: false - name: openjpeg - version: 2.5.3 + version: 2.5.4 manager: conda platform: linux-64 dependencies: @@ -5067,29 +5067,29 @@ package: libgcc: '>=14' libpng: '>=1.6.50,<1.7.0a0' libstdcxx: '>=14' - libtiff: '>=4.7.0,<4.8.0a0' + libtiff: '>=4.7.1,<4.8.0a0' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/openjpeg-2.5.3-h55fea9a_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openjpeg-2.5.4-h55fea9a_0.conda hash: - md5: 01243c4aaf71bde0297966125aea4706 - sha256: 0b7396dacf988f0b859798711b26b6bc9c6161dca21bacfd778473da58730afa + md5: 11b3379b191f63139e29c0d19dee24cd + sha256: 3900f9f2dbbf4129cf3ad6acf4e4b6f7101390b53843591c53b00f034343bc4d category: main optional: false - name: openjpeg - version: 2.5.3 + version: 2.5.4 manager: conda platform: win-64 dependencies: libpng: '>=1.6.50,<1.7.0a0' - libtiff: '>=4.7.0,<4.8.0a0' + libtiff: '>=4.7.1,<4.8.0a0' libzlib: '>=1.3.1,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openjpeg-2.5.3-h24db6dd_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/openjpeg-2.5.4-h24db6dd_0.conda hash: - md5: 25f45acb1a234ad1c9b9a20e1e6c559e - sha256: c29cb1641bc5cfc2197e9b7b436f34142be4766dd2430a937b48b7474935aa55 + md5: 5af852046226bb3cb15c7f61c2ac020a + sha256: 226c270a7e3644448954c47959c00a9bf7845f6d600c2a643db187118d028eee category: main optional: false - name: openssl @@ -5100,10 +5100,10 @@ package: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.3-h26f9b46_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.3-h26f9b46_1.conda hash: - md5: 72b3dd72e4f0b88cdacf3421313480f0 - sha256: 8c313f79fd9408f53922441fbb4e38f065e2251840f86862f05bdf613da7980f + md5: 4fc6c4c88da64c0219c0c6c0408cedd4 + sha256: 0572be1b7d3c4f4c288bb8ab1cb6007b5b8b9523985b34b862b5222dea3c45f5 category: main optional: false - name: openssl @@ -5115,10 +5115,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.3-h725018a_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.3-h725018a_1.conda hash: - md5: 19b0ad594e05103080ad8c87fa782a35 - sha256: b8de982a72a9edc4bbfef52113f7dd8f224fb5dc1883aa7945dd48d3c37815d9 + md5: c84884e2c1f899de9a895a1f0b7c9cd8 + sha256: 72dc204b0d59a7262bc77ca0e86cba11cbc6706cb9b4d6656fe7fab9593347c9 category: main optional: false - name: overrides @@ -5471,27 +5471,27 @@ package: category: dev optional: true - name: prometheus_client - version: 0.22.1 + version: 0.23.1 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.22.1-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.23.1-pyhd8ed1ab_0.conda hash: - md5: c64b77ccab10b822722904d889fa83b5 - sha256: 454e2c0ef14accc888dd2cd2e8adb8c6a3a607d2d3c2f93962698b5718e6176d + md5: a1e91db2d17fd258c64921cb38e6745a + sha256: 13dc67de68db151ff909f2c1d2486fa7e2d51355b25cee08d26ede1b62d48d40 category: dev optional: true - name: prometheus_client - version: 0.22.1 + version: 0.23.1 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.22.1-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.23.1-pyhd8ed1ab_0.conda hash: - md5: c64b77ccab10b822722904d889fa83b5 - sha256: 454e2c0ef14accc888dd2cd2e8adb8c6a3a607d2d3c2f93962698b5718e6176d + md5: a1e91db2d17fd258c64921cb38e6745a + sha256: 13dc67de68db151ff909f2c1d2486fa7e2d51355b25cee08d26ede1b62d48d40 category: dev optional: true - name: prompt-toolkit @@ -5945,27 +5945,27 @@ package: category: main optional: false - name: pyparsing - version: 3.2.4 + version: 3.2.5 manager: conda platform: linux-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.4-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.5-pyhcf101f3_0.conda hash: - md5: bf1f1292fc78307956289707e85cb1bf - sha256: c3260cf948da6345770d75ae559d716e557580eddcd19623676931d172346969 + md5: 6c8979be6d7a17692793114fa26916e8 + sha256: 6814b61b94e95ffc45ec539a6424d8447895fef75b0fec7e1be31f5beee883fb category: main optional: false - name: pyparsing - version: 3.2.4 + version: 3.2.5 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.4-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.5-pyhcf101f3_0.conda hash: - md5: bf1f1292fc78307956289707e85cb1bf - sha256: c3260cf948da6345770d75ae559d716e557580eddcd19623676931d172346969 + md5: 6c8979be6d7a17692793114fa26916e8 + sha256: 6814b61b94e95ffc45ec539a6424d8447895fef75b0fec7e1be31f5beee883fb category: main optional: false - name: pysocks @@ -8117,27 +8117,27 @@ package: category: main optional: false - name: wcwidth - version: 0.2.13 + version: 0.2.14 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.13-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda hash: - md5: b68980f2495d096e71c7fd9d7ccf63e6 - sha256: f21e63e8f7346f9074fd00ca3b079bd3d2fa4d71f1f89d5b6934bf31446dc2a5 + md5: 7e1e5ff31239f9cd5855714df8a3783d + sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 category: dev optional: true - name: wcwidth - version: 0.2.13 + version: 0.2.14 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.13-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda hash: - md5: b68980f2495d096e71c7fd9d7ccf63e6 - sha256: f21e63e8f7346f9074fd00ca3b079bd3d2fa4d71f1f89d5b6934bf31446dc2a5 + md5: 7e1e5ff31239f9cd5855714df8a3783d + sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 category: dev optional: true - name: webcolors @@ -8569,41 +8569,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev72+a91e947 + version: 0.6.0a1.dev100+af0d42f manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev113+2c39fbba + geoh5py: 0.12.0a2.dev121+48770d12 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@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 hash: - sha256: a91e9479d6e948728ad430e0db526c75013c9773 + sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev72+a91e947 + version: 0.6.0a1.dev100+af0d42f manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev113+2c39fbba + geoh5py: 0.12.0a2.dev121+48770d12 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@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 hash: - sha256: a91e9479d6e948728ad430e0db526c75013c9773 + sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev113+2c39fbba + version: 0.12.0a2.dev121+48770d12 manager: pip platform: linux-64 dependencies: @@ -8612,16 +8612,16 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 hash: - sha256: 2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + sha256: 48770d12988c340208efa22065022c34cd618ea9 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev113+2c39fbba + version: 0.12.0a2.dev121+48770d12 manager: pip platform: win-64 dependencies: @@ -8630,54 +8630,54 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 hash: - sha256: 2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + sha256: 48770d12988c340208efa22065022c34cd618ea9 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 category: main optional: false - name: grid-apps - version: 0.1.0a1.dev60+4168153 + version: 0.1.0a1.dev64+ed69183 manager: pip platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev72+a91e947 - geoh5py: 0.12.0a2.dev113+2c39fbba + geoapps-utils: 0.6.0a1.dev100+af0d42f + geoh5py: 0.12.0a2.dev121+48770d12 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/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d hash: - sha256: 416815352706add295a9d2b90814d2291068a85e + sha256: ed6918388d6fc4062f72e471e415a1a22cc15d0d source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d category: main optional: false - name: grid-apps - version: 0.1.0a1.dev60+4168153 + version: 0.1.0a1.dev64+ed69183 manager: pip platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev72+a91e947 - geoh5py: 0.12.0a2.dev113+2c39fbba + geoapps-utils: 0.6.0a1.dev100+af0d42f + geoh5py: 0.12.0a2.dev121+48770d12 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/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d hash: - sha256: 416815352706add295a9d2b90814d2291068a85e + sha256: ed6918388d6fc4062f72e471e415a1a22cc15d0d source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev99+mira.g998d6f581 + version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 manager: pip platform: linux-64 dependencies: @@ -8689,16 +8689,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed hash: - sha256: 998d6f58198e4aff55a401e8a6545b93eb8bfd64 + sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev99+mira.g998d6f581 + version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 manager: pip platform: win-64 dependencies: @@ -8710,11 +8710,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed hash: - sha256: 998d6f58198e4aff55a401e8a6545b93eb8bfd64 + sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed category: main optional: false diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 46110a45..1bbf946d 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: 106a2623766605c1a3c6aa7c479d1dd64f6d252df48e62b2a77761f8e247f0c4 - linux-64: c3c882ab7106f1ac6d6821bf96f16035a0c501482813360bc7738edf05725ab9 + win-64: 06c1dfa4251bc51989748bf3e74139553c7b44a0b709b2171b63434f77cb8b8f + linux-64: 1af1d176267655c55d85f45ce8f6631d705e027c4ba0981011e099ce2fe30e8c channels: - url: conda-forge used_env_vars: [] @@ -131,35 +131,35 @@ package: category: main optional: false - name: anyio - version: 4.10.0 + version: 4.11.0 manager: conda platform: linux-64 dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '>=3.9' + python: '>=3.10' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.11.0-pyhcf101f3_0.conda hash: - md5: cc2613bfa71dec0eb2113ee21ac9ccbf - sha256: d1b50686672ebe7041e44811eda563e45b94a8354db67eca659040392ac74d63 + md5: 814472b61da9792fae28156cb9ee54f5 + sha256: 7378b5b9d81662d73a906fabfc2fb81daddffe8dc0680ed9cda7a9562af894b0 category: dev optional: true - name: anyio - version: 4.10.0 + version: 4.11.0 manager: conda platform: win-64 dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '>=3.9' + python: '>=3.10' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.11.0-pyhcf101f3_0.conda hash: - md5: cc2613bfa71dec0eb2113ee21ac9ccbf - sha256: d1b50686672ebe7041e44811eda563e45b94a8354db67eca659040392ac74d63 + md5: 814472b61da9792fae28156cb9ee54f5 + sha256: 7378b5b9d81662d73a906fabfc2fb81daddffe8dc0680ed9cda7a9562af894b0 category: dev optional: true - name: argon2-cffi @@ -756,7 +756,7 @@ package: category: main optional: false - name: cffi - version: 1.17.1 + version: 2.0.0 manager: conda platform: linux-64 dependencies: @@ -766,14 +766,14 @@ package: pycparser: '' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* - url: https://repo.prefix.dev/conda-forge/linux-64/cffi-1.17.1-py311h5b438cf_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/cffi-2.0.0-py311h5b438cf_0.conda hash: - md5: 82e0123a459d095ac99c76d150ccdacf - sha256: bbd04c8729e6400fa358536b1007c1376cc396d569b71de10f1df7669d44170e + md5: 6cb6c4d57d12dfa0ecdd19dbe758ffc9 + sha256: 4986d5b3ce60af4e320448a1a2231cb5dd5e3705537e28a7b58951a24bd69893 category: main optional: false - name: cffi - version: 1.17.1 + version: 2.0.0 manager: conda platform: win-64 dependencies: @@ -783,10 +783,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/cffi-1.17.1-py311h3485c13_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/cffi-2.0.0-py311h3485c13_0.conda hash: - md5: 553a1836df919ca232b80ce1324fa5bb - sha256: 46baee342b50ce7fbf4c52267f73327cb0512b970332037c8911afee1e54f063 + md5: 573fd072e80c1a334e19a1f95024d94d + sha256: 12f5d72b95dbd417367895a92c35922b24bb016d1497f24f3a243224ec6cb81b category: main optional: false - name: charset-normalizer @@ -814,30 +814,30 @@ package: category: dev optional: true - name: click - version: 8.2.1 + version: 8.3.0 manager: conda platform: linux-64 dependencies: __unix: '' python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/click-8.2.1-pyh707e725_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda hash: - md5: 94b550b8d3a614dbd326af798c7dfb40 - sha256: 8aee789c82d8fdd997840c952a586db63c6890b00e88c4fb6e80a38edd5f51c0 + md5: e76c4ba9e1837847679421b8d549b784 + sha256: c6567ebc27c4c071a353acaf93eb82bb6d9a6961e40692a359045a89a61d02c0 category: main optional: false - name: click - version: 8.2.1 + version: 8.3.0 manager: conda platform: win-64 dependencies: __win: '' colorama: '' python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/click-8.2.1-pyh7428d3b_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.0-pyh7428d3b_0.conda hash: - md5: 3a59475037bc09da916e4062c5cad771 - sha256: 20c2d8ea3d800485245b586a28985cba281dd6761113a49d7576f6db92a0a891 + md5: 4601476ee4ad7ad522e5ffa5a579a48e + sha256: 0a008359973e833b568d0a18cf04556b12a4f5182e745dfc8ade32c38fa1fca5 category: main optional: false - name: cloudpickle @@ -947,7 +947,7 @@ package: category: main optional: false - name: coverage - version: 7.10.6 + version: 7.10.7 manager: conda platform: linux-64 dependencies: @@ -956,14 +956,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* tomli: '' - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.10.6-py311h3778330_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.10.7-py311h3778330_0.conda hash: - md5: d4d341946049625afebfb720f011753a - sha256: 5728c93177af112d6d53ea8e1e4a11c47395c8f7d50f00b7e3aabc3b0529922f + md5: 53fdad3b032eee40cf74ac0de87e4518 + sha256: 19f423276875193355458a4a7b68716a13d4d45de8ec376695aa16fd12b16183 category: dev optional: true - name: coverage - version: 7.10.6 + version: 7.10.7 manager: conda platform: win-64 dependencies: @@ -973,10 +973,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.10.6-py311h3f79411_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.10.7-py311h3f79411_0.conda hash: - md5: cb00671279e93d3007cc55ff53023da7 - sha256: 2262f950b8b32e1a3869b872bbff4c0b7324b8cd81e1c590c953e9c970899572 + md5: 56ff543fe8b76f6c40a307ae3ab022cf + sha256: 12ff83b5df97ece299d9923ba68b8843716376dd8a8683a94e076205dac7651b category: dev optional: true - name: cpython @@ -3056,27 +3056,27 @@ package: category: main optional: false - name: lark - version: 1.2.2 + version: 1.3.0 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 3a8063b25e603999188ed4bbf3485404 - sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + md5: c9ee16acbcea5cc91d9f3eb1d8f903bd + sha256: 6370d6a458b4f11a9ab5db7eb05e895f55f276e6aa4c4bbac7dde412c87fae35 category: dev optional: true - name: lark - version: 1.2.2 + version: 1.3.0 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 3a8063b25e603999188ed4bbf3485404 - sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + md5: c9ee16acbcea5cc91d9f3eb1d8f903bd + sha256: 6370d6a458b4f11a9ab5db7eb05e895f55f276e6aa4c4bbac7dde412c87fae35 category: dev optional: true - name: latexcodec @@ -3210,10 +3210,10 @@ package: platform: linux-64 dependencies: mkl: '>=2024.2.2,<2025.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libblas-3.9.0-35_h5875eb1_mkl.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libblas-3.9.0-36_h5875eb1_mkl.conda hash: - md5: b65e0bee3591c3506ecd7399203b3e01 - sha256: c0e4f8a7b5cc4f455db24ab459a5234c98a652241f8122876fe966fa443be68e + md5: 65a660ed501aaa4f66f341ab46c10975 + sha256: ee96a6697e0bf97693b2ead886b3638498cdfea88ababb2bf3db4b2cff2411e9 category: main optional: false - name: libblas @@ -3319,10 +3319,10 @@ package: platform: linux-64 dependencies: libblas: 3.9.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libcblas-3.9.0-35_hfef963f_mkl.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libcblas-3.9.0-36_hfef963f_mkl.conda hash: - md5: dbe1c207ba67093a0dd7f7a990964959 - sha256: 983dc5c661441e700a5701d872e060a8102700fd9ee4c74267c0ffa5ebeaefcb + md5: 3d52e26e8986f8ee1f28c5db5db083bf + sha256: db02ed8fa1f9e6b5d283bd22382a3c4730fc11e5348a1517740e70490c49da40 category: main optional: false - name: libcblas @@ -3729,10 +3729,10 @@ package: platform: linux-64 dependencies: libblas: 3.9.0 - url: https://repo.prefix.dev/conda-forge/linux-64/liblapack-3.9.0-35_h5e43f62_mkl.conda + url: https://repo.prefix.dev/conda-forge/linux-64/liblapack-3.9.0-36_h5e43f62_mkl.conda hash: - md5: e278459ae50ce80db9594cd3685d1536 - sha256: 2748fbcf57e4c60efa6f4e69bab3009cb361d9b7d6d715672220eb4883ee42e7 + md5: 139897cf3e99d5db77f3331e344528bf + sha256: ef995b43596be175fd270a8c5611cb659037155114717bf8e314487791e34913 category: main optional: false - name: liblapack @@ -3991,7 +3991,7 @@ package: category: main optional: false - name: libtiff - version: 4.7.0 + version: 4.7.1 manager: conda platform: linux-64 dependencies: @@ -4005,14 +4005,14 @@ package: libwebp-base: '>=1.6.0,<2.0a0' libzlib: '>=1.3.1,<2.0a0' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libtiff-4.7.0-h8261f1e_6.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libtiff-4.7.1-h8261f1e_0.conda hash: - md5: b6093922931b535a7ba566b6f384fbe6 - sha256: c62694cd117548d810d2803da6d9063f78b1ffbf7367432c5388ce89474e9ebe + md5: 72b531694ebe4e8aa6f5745d1015c1b4 + sha256: ddda0d7ee67e71e904a452010c73e32da416806f5cb9145fb62c322f97e717fb category: main optional: false - name: libtiff - version: 4.7.0 + version: 4.7.1 manager: conda platform: win-64 dependencies: @@ -4025,23 +4025,23 @@ package: vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/libtiff-4.7.0-h550210a_6.conda + url: https://repo.prefix.dev/conda-forge/win-64/libtiff-4.7.1-h550210a_0.conda hash: - md5: 72d45aa52ebca91aedb0cfd9eac62655 - sha256: fd27821c8cfc425826f13760c3263d7b3b997c5372234cefa1586ff384dcc989 + md5: e23f29747d9d2aa2a39b594c114fac67 + sha256: d6cac6596ded0d5bbbc4198d7eb4db88da8c00236ebf5e2c8ad333ccde8965e2 category: main optional: false - name: libuuid - version: 2.41.1 + version: 2.41.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/libuuid-2.41.1-he9a06e4_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libuuid-2.41.2-he9a06e4_0.conda hash: - md5: af930c65e9a79a3423d6d36e265cef65 - sha256: 776e28735cee84b97e4d05dd5d67b95221a3e2c09b8b13e3d6dbe6494337d527 + md5: 80c07c68d2f6870250959dcc95b209d1 + sha256: e5ec6d2ad7eef538ddcb9ea62ad4346fde70a4736342c4ad87bd713641eb9808 category: main optional: false - name: libwebp-base @@ -4140,10 +4140,10 @@ package: liblzma: '>=5.8.1,<6.0a0' libxml2-16: 2.15.0 libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-2.15.0-h26afc86_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-2.15.0-h26afc86_1.conda hash: - md5: c52b54db4660b44ca75b6a61c533b9f5 - sha256: 09b6703783b2ac600794f7eb2bb5d9e8753a2de607735414e3dbd46d95b17a4c + md5: 8337b675e0cad517fbcb3daf7588087a + sha256: 4310577d7eea817d35a1c05e1e54575b06ce085d73e6dd59aa38523adf50168f category: main optional: false - name: libxml2 @@ -4159,10 +4159,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libxml2-2.15.0-ha29bfb0_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxml2-2.15.0-ha29bfb0_1.conda hash: - md5: 5262552eb2f0d0b443adcfa265d97f0a - sha256: c3c2c74bd917d83b26c102b18bde97759c23f24e0260beb962acf7385627fc38 + md5: 1d6e5fbbe84eebcd62e7cdccec799ce8 + sha256: 8890c03908a407649ac99257b63176b61d10dfa3468aa3db1994ac0973dc2803 category: main optional: false - name: libxml2-16 @@ -4176,10 +4176,10 @@ package: libiconv: '>=1.18,<2.0a0' liblzma: '>=5.8.1,<6.0a0' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-16-2.15.0-ha9997c6_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-16-2.15.0-ha9997c6_1.conda hash: - md5: 84bed2bfefc14e4878bd16979782e522 - sha256: fba83a62276fb3d885e689afc7650b255a93d6e001ceacaccef4e36bbcb9d545 + md5: b24dd2bd61cd8e4f8a13ee2a945a723c + sha256: 5420ea77505a8d5ca7b5351ddb2da7e8a178052fccf8fca00189af7877608e89 category: main optional: false - name: libxml2-16 @@ -4194,10 +4194,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libxml2-16-2.15.0-h06f855e_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxml2-16-2.15.0-h06f855e_1.conda hash: - md5: a1071825a90769083fce8dbcefcccd65 - sha256: 15337581264464842ff28f616422b786161bee0169610ff292e0ea75fa78dba8 + md5: a5d1a1f8745fcd93f39a4b80f389962f + sha256: f29159eef5af2adffe2fef2d89ff2f6feda07e194883f47a4cf366e9608fb91b category: main optional: false - name: libzlib @@ -5113,7 +5113,7 @@ package: category: main optional: false - name: openjpeg - version: 2.5.3 + version: 2.5.4 manager: conda platform: linux-64 dependencies: @@ -5121,29 +5121,29 @@ package: libgcc: '>=14' libpng: '>=1.6.50,<1.7.0a0' libstdcxx: '>=14' - libtiff: '>=4.7.0,<4.8.0a0' + libtiff: '>=4.7.1,<4.8.0a0' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/openjpeg-2.5.3-h55fea9a_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openjpeg-2.5.4-h55fea9a_0.conda hash: - md5: 01243c4aaf71bde0297966125aea4706 - sha256: 0b7396dacf988f0b859798711b26b6bc9c6161dca21bacfd778473da58730afa + md5: 11b3379b191f63139e29c0d19dee24cd + sha256: 3900f9f2dbbf4129cf3ad6acf4e4b6f7101390b53843591c53b00f034343bc4d category: main optional: false - name: openjpeg - version: 2.5.3 + version: 2.5.4 manager: conda platform: win-64 dependencies: libpng: '>=1.6.50,<1.7.0a0' - libtiff: '>=4.7.0,<4.8.0a0' + libtiff: '>=4.7.1,<4.8.0a0' libzlib: '>=1.3.1,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openjpeg-2.5.3-h24db6dd_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/openjpeg-2.5.4-h24db6dd_0.conda hash: - md5: 25f45acb1a234ad1c9b9a20e1e6c559e - sha256: c29cb1641bc5cfc2197e9b7b436f34142be4766dd2430a937b48b7474935aa55 + md5: 5af852046226bb3cb15c7f61c2ac020a + sha256: 226c270a7e3644448954c47959c00a9bf7845f6d600c2a643db187118d028eee category: main optional: false - name: openssl @@ -5154,10 +5154,10 @@ package: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.3-h26f9b46_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.3-h26f9b46_1.conda hash: - md5: 72b3dd72e4f0b88cdacf3421313480f0 - sha256: 8c313f79fd9408f53922441fbb4e38f065e2251840f86862f05bdf613da7980f + md5: 4fc6c4c88da64c0219c0c6c0408cedd4 + sha256: 0572be1b7d3c4f4c288bb8ab1cb6007b5b8b9523985b34b862b5222dea3c45f5 category: main optional: false - name: openssl @@ -5169,10 +5169,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.3-h725018a_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.3-h725018a_1.conda hash: - md5: 19b0ad594e05103080ad8c87fa782a35 - sha256: b8de982a72a9edc4bbfef52113f7dd8f224fb5dc1883aa7945dd48d3c37815d9 + md5: c84884e2c1f899de9a895a1f0b7c9cd8 + sha256: 72dc204b0d59a7262bc77ca0e86cba11cbc6706cb9b4d6656fe7fab9593347c9 category: main optional: false - name: overrides @@ -5525,27 +5525,27 @@ package: category: dev optional: true - name: prometheus_client - version: 0.22.1 + version: 0.23.1 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.22.1-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.23.1-pyhd8ed1ab_0.conda hash: - md5: c64b77ccab10b822722904d889fa83b5 - sha256: 454e2c0ef14accc888dd2cd2e8adb8c6a3a607d2d3c2f93962698b5718e6176d + md5: a1e91db2d17fd258c64921cb38e6745a + sha256: 13dc67de68db151ff909f2c1d2486fa7e2d51355b25cee08d26ede1b62d48d40 category: dev optional: true - name: prometheus_client - version: 0.22.1 + version: 0.23.1 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.22.1-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.23.1-pyhd8ed1ab_0.conda hash: - md5: c64b77ccab10b822722904d889fa83b5 - sha256: 454e2c0ef14accc888dd2cd2e8adb8c6a3a607d2d3c2f93962698b5718e6176d + md5: a1e91db2d17fd258c64921cb38e6745a + sha256: 13dc67de68db151ff909f2c1d2486fa7e2d51355b25cee08d26ede1b62d48d40 category: dev optional: true - name: prompt-toolkit @@ -5999,27 +5999,27 @@ package: category: main optional: false - name: pyparsing - version: 3.2.4 + version: 3.2.5 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.4-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.5-pyhcf101f3_0.conda hash: - md5: bf1f1292fc78307956289707e85cb1bf - sha256: c3260cf948da6345770d75ae559d716e557580eddcd19623676931d172346969 + md5: 6c8979be6d7a17692793114fa26916e8 + sha256: 6814b61b94e95ffc45ec539a6424d8447895fef75b0fec7e1be31f5beee883fb category: main optional: false - name: pyparsing - version: 3.2.4 + version: 3.2.5 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.4-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.5-pyhcf101f3_0.conda hash: - md5: bf1f1292fc78307956289707e85cb1bf - sha256: c3260cf948da6345770d75ae559d716e557580eddcd19623676931d172346969 + md5: 6c8979be6d7a17692793114fa26916e8 + sha256: 6814b61b94e95ffc45ec539a6424d8447895fef75b0fec7e1be31f5beee883fb category: main optional: false - name: pysocks @@ -8171,27 +8171,27 @@ package: category: main optional: false - name: wcwidth - version: 0.2.13 + version: 0.2.14 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.13-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda hash: - md5: b68980f2495d096e71c7fd9d7ccf63e6 - sha256: f21e63e8f7346f9074fd00ca3b079bd3d2fa4d71f1f89d5b6934bf31446dc2a5 + md5: 7e1e5ff31239f9cd5855714df8a3783d + sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 category: dev optional: true - name: wcwidth - version: 0.2.13 + version: 0.2.14 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.13-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda hash: - md5: b68980f2495d096e71c7fd9d7ccf63e6 - sha256: f21e63e8f7346f9074fd00ca3b079bd3d2fa4d71f1f89d5b6934bf31446dc2a5 + md5: 7e1e5ff31239f9cd5855714df8a3783d + sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 category: dev optional: true - name: webcolors @@ -8654,41 +8654,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev72+a91e947 + version: 0.6.0a1.dev100+af0d42f manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev113+2c39fbba + geoh5py: 0.12.0a2.dev121+48770d12 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@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 hash: - sha256: a91e9479d6e948728ad430e0db526c75013c9773 + sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev72+a91e947 + version: 0.6.0a1.dev100+af0d42f manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev113+2c39fbba + geoh5py: 0.12.0a2.dev121+48770d12 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@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 hash: - sha256: a91e9479d6e948728ad430e0db526c75013c9773 + sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev113+2c39fbba + version: 0.12.0a2.dev121+48770d12 manager: pip platform: linux-64 dependencies: @@ -8697,16 +8697,16 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 hash: - sha256: 2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + sha256: 48770d12988c340208efa22065022c34cd618ea9 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev113+2c39fbba + version: 0.12.0a2.dev121+48770d12 manager: pip platform: win-64 dependencies: @@ -8715,54 +8715,54 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 hash: - sha256: 2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + sha256: 48770d12988c340208efa22065022c34cd618ea9 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 category: main optional: false - name: grid-apps - version: 0.1.0a1.dev60+4168153 + version: 0.1.0a1.dev64+ed69183 manager: pip platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev72+a91e947 - geoh5py: 0.12.0a2.dev113+2c39fbba + geoapps-utils: 0.6.0a1.dev100+af0d42f + geoh5py: 0.12.0a2.dev121+48770d12 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/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d hash: - sha256: 416815352706add295a9d2b90814d2291068a85e + sha256: ed6918388d6fc4062f72e471e415a1a22cc15d0d source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d category: main optional: false - name: grid-apps - version: 0.1.0a1.dev60+4168153 + version: 0.1.0a1.dev64+ed69183 manager: pip platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev72+a91e947 - geoh5py: 0.12.0a2.dev113+2c39fbba + geoapps-utils: 0.6.0a1.dev100+af0d42f + geoh5py: 0.12.0a2.dev121+48770d12 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/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d hash: - sha256: 416815352706add295a9d2b90814d2291068a85e + sha256: ed6918388d6fc4062f72e471e415a1a22cc15d0d source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev99+mira.g998d6f581 + version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 manager: pip platform: linux-64 dependencies: @@ -8774,16 +8774,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed hash: - sha256: 998d6f58198e4aff55a401e8a6545b93eb8bfd64 + sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev99+mira.g998d6f581 + version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 manager: pip platform: win-64 dependencies: @@ -8795,11 +8795,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed hash: - sha256: 998d6f58198e4aff55a401e8a6545b93eb8bfd64 + sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed category: main optional: false diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 9d4fb99c..b863a23e 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: 1184306731b94290082a07ff69198b9bab01231154ed953a92d9f4ce512366a2 - linux-64: 81aedccfb6112401b5a94619d03cb65bd3c0a1242f995c2c22516fc86dbbaec5 + win-64: df0a3f0d6a2c3c84822a96397626a26373bf2eaa93e287e4d2c6f7a39e70f663 + linux-64: cb9546b38f57d3e804993094458c11132e417e6b0985a5e006afbb49acca414e channels: - url: conda-forge used_env_vars: [] @@ -157,35 +157,35 @@ package: category: main optional: false - name: anyio - version: 4.10.0 + version: 4.11.0 manager: conda platform: linux-64 dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '>=3.9' + python: '>=3.10' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.11.0-pyhcf101f3_0.conda hash: - md5: cc2613bfa71dec0eb2113ee21ac9ccbf - sha256: d1b50686672ebe7041e44811eda563e45b94a8354db67eca659040392ac74d63 + md5: 814472b61da9792fae28156cb9ee54f5 + sha256: 7378b5b9d81662d73a906fabfc2fb81daddffe8dc0680ed9cda7a9562af894b0 category: dev optional: true - name: anyio - version: 4.10.0 + version: 4.11.0 manager: conda platform: win-64 dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '>=3.9' + python: '>=3.10' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.11.0-pyhcf101f3_0.conda hash: - md5: cc2613bfa71dec0eb2113ee21ac9ccbf - sha256: d1b50686672ebe7041e44811eda563e45b94a8354db67eca659040392ac74d63 + md5: 814472b61da9792fae28156cb9ee54f5 + sha256: 7378b5b9d81662d73a906fabfc2fb81daddffe8dc0680ed9cda7a9562af894b0 category: dev optional: true - name: argon2-cffi @@ -782,7 +782,7 @@ package: category: main optional: false - name: cffi - version: 1.17.1 + version: 2.0.0 manager: conda platform: linux-64 dependencies: @@ -792,14 +792,14 @@ package: pycparser: '' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/cffi-1.17.1-py312h35888ee_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/cffi-2.0.0-py312h35888ee_0.conda hash: - md5: 918e2510c64000a916355dcf09d26da2 - sha256: 13bf94678e7a853a39a2c6dc2674b096cfe80f43ad03d7fff4bcde05edf9fda4 + md5: 60b9cd087d22272885a6b8366b1d3d43 + sha256: f9e906b2cb9ae800b5818259472c3f781b14eb1952e867ac5c1f548e92bf02d9 category: main optional: false - name: cffi - version: 1.17.1 + version: 2.0.0 manager: conda platform: win-64 dependencies: @@ -809,10 +809,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/cffi-1.17.1-py312he06e257_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/cffi-2.0.0-py312he06e257_0.conda hash: - md5: a73ee5cb34f7a18dd6a11015de607e15 - sha256: d175cbc3b11496456360922b0773d5b1f0bf8e414b48c55472d0790a5ceefdb9 + md5: 21e34a0fa25e6675e73a18df78dde03b + sha256: 16a68a4a3f6ec4feebe0447298b8d04ca58a3fde720c5e08dc2eed7f27a51f6c category: main optional: false - name: charset-normalizer @@ -840,30 +840,30 @@ package: category: dev optional: true - name: click - version: 8.2.1 + version: 8.3.0 manager: conda platform: linux-64 dependencies: __unix: '' python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/click-8.2.1-pyh707e725_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda hash: - md5: 94b550b8d3a614dbd326af798c7dfb40 - sha256: 8aee789c82d8fdd997840c952a586db63c6890b00e88c4fb6e80a38edd5f51c0 + md5: e76c4ba9e1837847679421b8d549b784 + sha256: c6567ebc27c4c071a353acaf93eb82bb6d9a6961e40692a359045a89a61d02c0 category: main optional: false - name: click - version: 8.2.1 + version: 8.3.0 manager: conda platform: win-64 dependencies: __win: '' colorama: '' python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/click-8.2.1-pyh7428d3b_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.0-pyh7428d3b_0.conda hash: - md5: 3a59475037bc09da916e4062c5cad771 - sha256: 20c2d8ea3d800485245b586a28985cba281dd6761113a49d7576f6db92a0a891 + md5: 4601476ee4ad7ad522e5ffa5a579a48e + sha256: 0a008359973e833b568d0a18cf04556b12a4f5182e745dfc8ade32c38fa1fca5 category: main optional: false - name: cloudpickle @@ -973,7 +973,7 @@ package: category: main optional: false - name: coverage - version: 7.10.6 + version: 7.10.7 manager: conda platform: linux-64 dependencies: @@ -982,14 +982,14 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* tomli: '' - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.10.6-py312h8a5da7c_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.10.7-py312h8a5da7c_0.conda hash: - md5: 0bffddcd9276d65304761c70ba5c2882 - sha256: f4774396137aaeec172e812bbcfc68e21dfa1fae2a04a437a6e2aa52fbddec89 + md5: 03d83efc728a6721a0f1616a04a7fc84 + sha256: 31a5117c6b9ff110deafb007ca781f65409046973744ffb33072604481b333fd category: dev optional: true - name: coverage - version: 7.10.6 + version: 7.10.7 manager: conda platform: win-64 dependencies: @@ -999,10 +999,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.10.6-py312h05f76fc_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.10.7-py312h05f76fc_0.conda hash: - md5: 040ebae03f3f666cae7cd40b95c6ef8c - sha256: 8914bba5e99644b2976003269c87221efd6ee5ba7ad3b0a1ecf0876954116263 + md5: 85f87f69db7da9c361e3babc62733701 + sha256: feb7c603334bc5c4cd55ada7d199ee9b3db877fe76230f0bb1198eb9f21a07c3 category: dev optional: true - name: cpython @@ -3095,27 +3095,27 @@ package: category: main optional: false - name: lark - version: 1.2.2 + version: 1.3.0 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 3a8063b25e603999188ed4bbf3485404 - sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + md5: c9ee16acbcea5cc91d9f3eb1d8f903bd + sha256: 6370d6a458b4f11a9ab5db7eb05e895f55f276e6aa4c4bbac7dde412c87fae35 category: dev optional: true - name: lark - version: 1.2.2 + version: 1.3.0 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 3a8063b25e603999188ed4bbf3485404 - sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + md5: c9ee16acbcea5cc91d9f3eb1d8f903bd + sha256: 6370d6a458b4f11a9ab5db7eb05e895f55f276e6aa4c4bbac7dde412c87fae35 category: dev optional: true - name: latexcodec @@ -3249,10 +3249,10 @@ package: platform: linux-64 dependencies: mkl: '>=2024.2.2,<2025.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libblas-3.9.0-35_h5875eb1_mkl.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libblas-3.9.0-36_h5875eb1_mkl.conda hash: - md5: b65e0bee3591c3506ecd7399203b3e01 - sha256: c0e4f8a7b5cc4f455db24ab459a5234c98a652241f8122876fe966fa443be68e + md5: 65a660ed501aaa4f66f341ab46c10975 + sha256: ee96a6697e0bf97693b2ead886b3638498cdfea88ababb2bf3db4b2cff2411e9 category: main optional: false - name: libblas @@ -3358,10 +3358,10 @@ package: platform: linux-64 dependencies: libblas: 3.9.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libcblas-3.9.0-35_hfef963f_mkl.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libcblas-3.9.0-36_hfef963f_mkl.conda hash: - md5: dbe1c207ba67093a0dd7f7a990964959 - sha256: 983dc5c661441e700a5701d872e060a8102700fd9ee4c74267c0ffa5ebeaefcb + md5: 3d52e26e8986f8ee1f28c5db5db083bf + sha256: db02ed8fa1f9e6b5d283bd22382a3c4730fc11e5348a1517740e70490c49da40 category: main optional: false - name: libcblas @@ -3768,10 +3768,10 @@ package: platform: linux-64 dependencies: libblas: 3.9.0 - url: https://repo.prefix.dev/conda-forge/linux-64/liblapack-3.9.0-35_h5e43f62_mkl.conda + url: https://repo.prefix.dev/conda-forge/linux-64/liblapack-3.9.0-36_h5e43f62_mkl.conda hash: - md5: e278459ae50ce80db9594cd3685d1536 - sha256: 2748fbcf57e4c60efa6f4e69bab3009cb361d9b7d6d715672220eb4883ee42e7 + md5: 139897cf3e99d5db77f3331e344528bf + sha256: ef995b43596be175fd270a8c5611cb659037155114717bf8e314487791e34913 category: main optional: false - name: liblapack @@ -4030,7 +4030,7 @@ package: category: main optional: false - name: libtiff - version: 4.7.0 + version: 4.7.1 manager: conda platform: linux-64 dependencies: @@ -4044,14 +4044,14 @@ package: libwebp-base: '>=1.6.0,<2.0a0' libzlib: '>=1.3.1,<2.0a0' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libtiff-4.7.0-h8261f1e_6.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libtiff-4.7.1-h8261f1e_0.conda hash: - md5: b6093922931b535a7ba566b6f384fbe6 - sha256: c62694cd117548d810d2803da6d9063f78b1ffbf7367432c5388ce89474e9ebe + md5: 72b531694ebe4e8aa6f5745d1015c1b4 + sha256: ddda0d7ee67e71e904a452010c73e32da416806f5cb9145fb62c322f97e717fb category: main optional: false - name: libtiff - version: 4.7.0 + version: 4.7.1 manager: conda platform: win-64 dependencies: @@ -4064,23 +4064,23 @@ package: vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/libtiff-4.7.0-h550210a_6.conda + url: https://repo.prefix.dev/conda-forge/win-64/libtiff-4.7.1-h550210a_0.conda hash: - md5: 72d45aa52ebca91aedb0cfd9eac62655 - sha256: fd27821c8cfc425826f13760c3263d7b3b997c5372234cefa1586ff384dcc989 + md5: e23f29747d9d2aa2a39b594c114fac67 + sha256: d6cac6596ded0d5bbbc4198d7eb4db88da8c00236ebf5e2c8ad333ccde8965e2 category: main optional: false - name: libuuid - version: 2.41.1 + version: 2.41.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/libuuid-2.41.1-he9a06e4_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libuuid-2.41.2-he9a06e4_0.conda hash: - md5: af930c65e9a79a3423d6d36e265cef65 - sha256: 776e28735cee84b97e4d05dd5d67b95221a3e2c09b8b13e3d6dbe6494337d527 + md5: 80c07c68d2f6870250959dcc95b209d1 + sha256: e5ec6d2ad7eef538ddcb9ea62ad4346fde70a4736342c4ad87bd713641eb9808 category: main optional: false - name: libwebp-base @@ -4179,10 +4179,10 @@ package: liblzma: '>=5.8.1,<6.0a0' libxml2-16: 2.15.0 libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-2.15.0-h26afc86_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-2.15.0-h26afc86_1.conda hash: - md5: c52b54db4660b44ca75b6a61c533b9f5 - sha256: 09b6703783b2ac600794f7eb2bb5d9e8753a2de607735414e3dbd46d95b17a4c + md5: 8337b675e0cad517fbcb3daf7588087a + sha256: 4310577d7eea817d35a1c05e1e54575b06ce085d73e6dd59aa38523adf50168f category: main optional: false - name: libxml2 @@ -4198,10 +4198,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libxml2-2.15.0-ha29bfb0_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxml2-2.15.0-ha29bfb0_1.conda hash: - md5: 5262552eb2f0d0b443adcfa265d97f0a - sha256: c3c2c74bd917d83b26c102b18bde97759c23f24e0260beb962acf7385627fc38 + md5: 1d6e5fbbe84eebcd62e7cdccec799ce8 + sha256: 8890c03908a407649ac99257b63176b61d10dfa3468aa3db1994ac0973dc2803 category: main optional: false - name: libxml2-16 @@ -4215,10 +4215,10 @@ package: libiconv: '>=1.18,<2.0a0' liblzma: '>=5.8.1,<6.0a0' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-16-2.15.0-ha9997c6_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libxml2-16-2.15.0-ha9997c6_1.conda hash: - md5: 84bed2bfefc14e4878bd16979782e522 - sha256: fba83a62276fb3d885e689afc7650b255a93d6e001ceacaccef4e36bbcb9d545 + md5: b24dd2bd61cd8e4f8a13ee2a945a723c + sha256: 5420ea77505a8d5ca7b5351ddb2da7e8a178052fccf8fca00189af7877608e89 category: main optional: false - name: libxml2-16 @@ -4233,10 +4233,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libxml2-16-2.15.0-h06f855e_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxml2-16-2.15.0-h06f855e_1.conda hash: - md5: a1071825a90769083fce8dbcefcccd65 - sha256: 15337581264464842ff28f616422b786161bee0169610ff292e0ea75fa78dba8 + md5: a5d1a1f8745fcd93f39a4b80f389962f + sha256: f29159eef5af2adffe2fef2d89ff2f6feda07e194883f47a4cf366e9608fb91b category: main optional: false - name: libzlib @@ -5152,7 +5152,7 @@ package: category: main optional: false - name: openjpeg - version: 2.5.3 + version: 2.5.4 manager: conda platform: linux-64 dependencies: @@ -5160,29 +5160,29 @@ package: libgcc: '>=14' libpng: '>=1.6.50,<1.7.0a0' libstdcxx: '>=14' - libtiff: '>=4.7.0,<4.8.0a0' + libtiff: '>=4.7.1,<4.8.0a0' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/openjpeg-2.5.3-h55fea9a_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openjpeg-2.5.4-h55fea9a_0.conda hash: - md5: 01243c4aaf71bde0297966125aea4706 - sha256: 0b7396dacf988f0b859798711b26b6bc9c6161dca21bacfd778473da58730afa + md5: 11b3379b191f63139e29c0d19dee24cd + sha256: 3900f9f2dbbf4129cf3ad6acf4e4b6f7101390b53843591c53b00f034343bc4d category: main optional: false - name: openjpeg - version: 2.5.3 + version: 2.5.4 manager: conda platform: win-64 dependencies: libpng: '>=1.6.50,<1.7.0a0' - libtiff: '>=4.7.0,<4.8.0a0' + libtiff: '>=4.7.1,<4.8.0a0' libzlib: '>=1.3.1,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openjpeg-2.5.3-h24db6dd_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/openjpeg-2.5.4-h24db6dd_0.conda hash: - md5: 25f45acb1a234ad1c9b9a20e1e6c559e - sha256: c29cb1641bc5cfc2197e9b7b436f34142be4766dd2430a937b48b7474935aa55 + md5: 5af852046226bb3cb15c7f61c2ac020a + sha256: 226c270a7e3644448954c47959c00a9bf7845f6d600c2a643db187118d028eee category: main optional: false - name: openssl @@ -5193,10 +5193,10 @@ package: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.3-h26f9b46_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.3-h26f9b46_1.conda hash: - md5: 72b3dd72e4f0b88cdacf3421313480f0 - sha256: 8c313f79fd9408f53922441fbb4e38f065e2251840f86862f05bdf613da7980f + md5: 4fc6c4c88da64c0219c0c6c0408cedd4 + sha256: 0572be1b7d3c4f4c288bb8ab1cb6007b5b8b9523985b34b862b5222dea3c45f5 category: main optional: false - name: openssl @@ -5208,10 +5208,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.3-h725018a_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.3-h725018a_1.conda hash: - md5: 19b0ad594e05103080ad8c87fa782a35 - sha256: b8de982a72a9edc4bbfef52113f7dd8f224fb5dc1883aa7945dd48d3c37815d9 + md5: c84884e2c1f899de9a895a1f0b7c9cd8 + sha256: 72dc204b0d59a7262bc77ca0e86cba11cbc6706cb9b4d6656fe7fab9593347c9 category: main optional: false - name: overrides @@ -5564,27 +5564,27 @@ package: category: dev optional: true - name: prometheus_client - version: 0.22.1 + version: 0.23.1 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.22.1-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.23.1-pyhd8ed1ab_0.conda hash: - md5: c64b77ccab10b822722904d889fa83b5 - sha256: 454e2c0ef14accc888dd2cd2e8adb8c6a3a607d2d3c2f93962698b5718e6176d + md5: a1e91db2d17fd258c64921cb38e6745a + sha256: 13dc67de68db151ff909f2c1d2486fa7e2d51355b25cee08d26ede1b62d48d40 category: dev optional: true - name: prometheus_client - version: 0.22.1 + version: 0.23.1 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.22.1-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/prometheus_client-0.23.1-pyhd8ed1ab_0.conda hash: - md5: c64b77ccab10b822722904d889fa83b5 - sha256: 454e2c0ef14accc888dd2cd2e8adb8c6a3a607d2d3c2f93962698b5718e6176d + md5: a1e91db2d17fd258c64921cb38e6745a + sha256: 13dc67de68db151ff909f2c1d2486fa7e2d51355b25cee08d26ede1b62d48d40 category: dev optional: true - name: prompt-toolkit @@ -6038,27 +6038,27 @@ package: category: main optional: false - name: pyparsing - version: 3.2.4 + version: 3.2.5 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.4-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.5-pyhcf101f3_0.conda hash: - md5: bf1f1292fc78307956289707e85cb1bf - sha256: c3260cf948da6345770d75ae559d716e557580eddcd19623676931d172346969 + md5: 6c8979be6d7a17692793114fa26916e8 + sha256: 6814b61b94e95ffc45ec539a6424d8447895fef75b0fec7e1be31f5beee883fb category: main optional: false - name: pyparsing - version: 3.2.4 + version: 3.2.5 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.4-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.5-pyhcf101f3_0.conda hash: - md5: bf1f1292fc78307956289707e85cb1bf - sha256: c3260cf948da6345770d75ae559d716e557580eddcd19623676931d172346969 + md5: 6c8979be6d7a17692793114fa26916e8 + sha256: 6814b61b94e95ffc45ec539a6424d8447895fef75b0fec7e1be31f5beee883fb category: main optional: false - name: pysocks @@ -8238,27 +8238,27 @@ package: category: main optional: false - name: wcwidth - version: 0.2.13 + version: 0.2.14 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.13-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda hash: - md5: b68980f2495d096e71c7fd9d7ccf63e6 - sha256: f21e63e8f7346f9074fd00ca3b079bd3d2fa4d71f1f89d5b6934bf31446dc2a5 + md5: 7e1e5ff31239f9cd5855714df8a3783d + sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 category: dev optional: true - name: wcwidth - version: 0.2.13 + version: 0.2.14 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.13-pyhd8ed1ab_1.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda hash: - md5: b68980f2495d096e71c7fd9d7ccf63e6 - sha256: f21e63e8f7346f9074fd00ca3b079bd3d2fa4d71f1f89d5b6934bf31446dc2a5 + md5: 7e1e5ff31239f9cd5855714df8a3783d + sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 category: dev optional: true - name: webcolors @@ -8721,41 +8721,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev72+a91e947 + version: 0.6.0a1.dev100+af0d42f manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev113+2c39fbba + geoh5py: 0.12.0a2.dev121+48770d12 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@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 hash: - sha256: a91e9479d6e948728ad430e0db526c75013c9773 + sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev72+a91e947 + version: 0.6.0a1.dev100+af0d42f manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev113+2c39fbba + geoh5py: 0.12.0a2.dev121+48770d12 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@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 hash: - sha256: a91e9479d6e948728ad430e0db526c75013c9773 + sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev113+2c39fbba + version: 0.12.0a2.dev121+48770d12 manager: pip platform: linux-64 dependencies: @@ -8764,16 +8764,16 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 hash: - sha256: 2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + sha256: 48770d12988c340208efa22065022c34cd618ea9 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev113+2c39fbba + version: 0.12.0a2.dev121+48770d12 manager: pip platform: win-64 dependencies: @@ -8782,54 +8782,54 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 hash: - sha256: 2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + sha256: 48770d12988c340208efa22065022c34cd618ea9 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822 + url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 category: main optional: false - name: grid-apps - version: 0.1.0a1.dev60+4168153 + version: 0.1.0a1.dev64+ed69183 manager: pip platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev72+a91e947 - geoh5py: 0.12.0a2.dev113+2c39fbba + geoapps-utils: 0.6.0a1.dev100+af0d42f + geoh5py: 0.12.0a2.dev121+48770d12 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/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d hash: - sha256: 416815352706add295a9d2b90814d2291068a85e + sha256: ed6918388d6fc4062f72e471e415a1a22cc15d0d source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d category: main optional: false - name: grid-apps - version: 0.1.0a1.dev60+4168153 + version: 0.1.0a1.dev64+ed69183 manager: pip platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev72+a91e947 - geoh5py: 0.12.0a2.dev113+2c39fbba + geoapps-utils: 0.6.0a1.dev100+af0d42f + geoh5py: 0.12.0a2.dev121+48770d12 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/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d hash: - sha256: 416815352706add295a9d2b90814d2291068a85e + sha256: ed6918388d6fc4062f72e471e415a1a22cc15d0d source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e + url: git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev99+mira.g998d6f581 + version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 manager: pip platform: linux-64 dependencies: @@ -8841,16 +8841,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed hash: - sha256: 998d6f58198e4aff55a401e8a6545b93eb8bfd64 + sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev99+mira.g998d6f581 + version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 manager: pip platform: win-64 dependencies: @@ -8862,11 +8862,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed hash: - sha256: 998d6f58198e4aff55a401e8a6545b93eb8bfd64 + sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64 + url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index 9ffff8fb..2a5eaad6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -105,7 +105,7 @@ grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "dev geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"} #mira-simpeg = {version = ">=0.23.0.1b1, <0.23.1.dev", source="pypi", allow-prereleases = true, extras = ["dask"]} -mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "develop", extras = ["dask"]} +mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "GEOPY-2466", extras = ["dask"]} ## about pip dependencies # to be specified to work with conda-lock From 21f78704c51a8e216eecdbfa973665851c26ec6b Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 25 Sep 2025 16:02:48 -0400 Subject: [PATCH 06/22] Switch name to _params to line up with geoapp_utils. Pass sweep and plate through main driver --- .../uijson/plate_simulation.ui.json | 4 +- .../uijson/plate_sweep.ui.json | 4 +- simpeg_drivers/__init__.py | 8 ++++ simpeg_drivers/driver.py | 17 ++++---- .../pseudo_three_dimensions/driver.py | 4 +- .../direct_current/three_dimensions/driver.py | 4 +- .../direct_current/two_dimensions/driver.py | 4 +- simpeg_drivers/electricals/driver.py | 2 +- .../pseudo_three_dimensions/driver.py | 4 +- .../three_dimensions/driver.py | 4 +- .../two_dimensions/driver.py | 4 +- .../electromagnetics/base_1d_driver.py | 2 +- .../frequency_domain/driver.py | 4 +- .../frequency_domain_1d/driver.py | 4 +- .../electromagnetics/time_domain/driver.py | 4 +- .../electromagnetics/time_domain_1d/driver.py | 4 +- .../joint/joint_cross_gradient/driver.py | 2 +- .../joint/joint_petrophysics/driver.py | 2 +- simpeg_drivers/joint/joint_surveys/driver.py | 2 +- .../magnetotellurics/driver.py | 4 +- .../natural_sources/tipper/driver.py | 4 +- simpeg_drivers/plate_simulation/options.py | 2 + .../plate_simulation/sweep/driver.py | 40 +------------------ .../potential_fields/gravity/driver.py | 4 +- .../magnetic_scalar/driver.py | 4 +- .../magnetic_vector/driver.py | 4 +- simpeg_drivers/utils/utils.py | 2 +- 27 files changed, 62 insertions(+), 85 deletions(-) diff --git a/simpeg_drivers-assets/uijson/plate_simulation.ui.json b/simpeg_drivers-assets/uijson/plate_simulation.ui.json index 5431f723..af639c88 100644 --- a/simpeg_drivers-assets/uijson/plate_simulation.ui.json +++ b/simpeg_drivers-assets/uijson/plate_simulation.ui.json @@ -4,9 +4,11 @@ "icon": "maxwellplate", "documentation": "https://mirageoscience-plate-simulation.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", - "run_command": "simpeg_drivers.plate_simulation.driver", + "run_command": "simpeg_drivers.driver", "geoh5": "", "monitoring_directory": "", + "inversion_type": "plate simulation", + "forward_only": true, "simulation": { "main": true, "label": "SimPEG Group", diff --git a/simpeg_drivers-assets/uijson/plate_sweep.ui.json b/simpeg_drivers-assets/uijson/plate_sweep.ui.json index be2e3811..21a7a7f5 100644 --- a/simpeg_drivers-assets/uijson/plate_sweep.ui.json +++ b/simpeg_drivers-assets/uijson/plate_sweep.ui.json @@ -4,9 +4,11 @@ "icon": "maxwellplate", "documentation": "https://mirageoscience-plate-simulation.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", - "run_command": "simpeg_drivers.plate_simulation.sweep.driver", + "run_command": "simpeg_drivers.driver", "geoh5": "", "monitoring_directory": "", + "inversion_type": "plate sweep", + "forward_only": true, "template": { "main": true, "group": "Options", diff --git a/simpeg_drivers/__init__.py b/simpeg_drivers/__init__.py index 220e12ec..cdfa2975 100644 --- a/simpeg_drivers/__init__.py +++ b/simpeg_drivers/__init__.py @@ -168,4 +168,12 @@ def assets_path() -> Path: "simpeg_drivers.natural_sources.tipper.driver", {"forward": "TipperForwardDriver", "inversion": "TipperInversionDriver"}, ), + "plate simulation": ( + "simpeg_drivers.plate_simulation.driver", + {"forward": "PlateSimulationDriver"}, + ), + "plate sweep": ( + "simpeg_drivers.plate_simulation.sweep.driver", + {"forward": "PlateSweepDriver"}, + ), } diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index fe4d78f6..cd4c3818 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -154,7 +154,7 @@ def validate_workers(self, workers: list[tuple[str]] | None) -> list[tuple[str]] class InversionDriver(BaseDriver): - _options_class = BaseForwardOptions | BaseInversionOptions + _params_class = BaseForwardOptions | BaseInversionOptions _inversion_type: str | None = None def __init__( @@ -710,7 +710,7 @@ def start( driver = cls.from_input_file(ifile) else: with ifile.data["geoh5"].open(mode="r+"): - params = driver_class._options_class.build(ifile) + params = driver_class._params_class.build(ifile) driver = driver_class(params) driver.run() @@ -731,16 +731,16 @@ def driver_class_from_name( raise NotImplementedError(msg) mod_name, classes = DRIVER_MAP.get(name) + class_name = classes.get("inversion") if forward_only: - class_name = classes.get("forward", classes["inversion"]) - else: - class_name = classes.get("inversion") + class_name = classes.get("forward", class_name) + module = __import__(mod_name, fromlist=[class_name]) return getattr(module, class_name) @classmethod def from_input_file(cls, ifile: InputFile) -> InversionDriver: - forward_only = ifile.data["forward_only"] + forward_only = ifile.data.get("forward_only", False) inversion_type = ifile.ui_json.get("inversion_type", None) if inversion_type is None: raise GeoAppsError( @@ -753,7 +753,7 @@ def from_input_file(cls, ifile: InputFile) -> InversionDriver: ) with ifile.data["geoh5"].open(mode="r+"): - params = driver_class._options_class.build(ifile) + params = driver_class._params_class.build(ifile) driver = driver_class(params) return driver @@ -808,7 +808,8 @@ def get_path(self, filepath: str | Path) -> str: if __name__ == "__main__": - file = Path(sys.argv[1]).resolve() + # file = Path(sys.argv[1]).resolve() + file = Path(r"C:\Users\dominiquef\Desktop\Tests\GEOPY-2466.ui.json").resolve() input_file = InputFile.read_ui_json(file) n_workers = input_file.data.get("n_workers", None) n_threads = input_file.data.get("n_threads", None) 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 69a7d852..d3ab1185 100644 --- a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py +++ b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py @@ -25,12 +25,12 @@ class DCBatch2DForwardDriver(BaseBatch2DDriver): """Direct Current batch 2D forward driver.""" - _options_class = DCBatch2DForwardOptions + _params_class = DCBatch2DForwardOptions _params_2d_class = DC2DForwardOptions class DCBatch2DInversionDriver(BaseBatch2DDriver): """Direct Current batch 2D inversion driver.""" - _options_class = DCBatch2DInversionOptions + _params_class = DCBatch2DInversionOptions _params_2d_class = DC2DInversionOptions diff --git a/simpeg_drivers/electricals/direct_current/three_dimensions/driver.py b/simpeg_drivers/electricals/direct_current/three_dimensions/driver.py index 59e7b668..b8d46c26 100644 --- a/simpeg_drivers/electricals/direct_current/three_dimensions/driver.py +++ b/simpeg_drivers/electricals/direct_current/three_dimensions/driver.py @@ -19,12 +19,12 @@ class DC3DForwardDriver(InversionDriver): """Direct Current 3D forward driver.""" - _options_class = DC3DForwardOptions + _params_class = DC3DForwardOptions _validation = None class DC3DInversionDriver(InversionDriver): """Direct Current 3D inversion driver.""" - _options_class = DC3DInversionOptions + _params_class = DC3DInversionOptions _validation = None diff --git a/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py b/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py index fae98cf1..5ef715bb 100644 --- a/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py +++ b/simpeg_drivers/electricals/direct_current/two_dimensions/driver.py @@ -19,10 +19,10 @@ class DC2DForwardDriver(Base2DDriver): """Direct Current 2D forward driver.""" - _options_class = DC2DForwardOptions + _params_class = DC2DForwardOptions class DC2DInversionDriver(Base2DDriver): """Direct Current 2D inversion driver.""" - _options_class = DC2DInversionOptions + _params_class = DC2DInversionOptions diff --git a/simpeg_drivers/electricals/driver.py b/simpeg_drivers/electricals/driver.py index 62b5c389..3a85868e 100644 --- a/simpeg_drivers/electricals/driver.py +++ b/simpeg_drivers/electricals/driver.py @@ -81,7 +81,7 @@ def create_drape_mesh(self) -> DrapeModel: class BaseBatch2DDriver(LineSweepDriver): """Base class for batch 2D DC and IP forward and inversion drivers.""" - _options_class: type[BaseForwardOptions | BaseInversionOptions] + _params_class: type[BaseForwardOptions | BaseInversionOptions] _params_2d_class: type[BaseForwardOptions | BaseInversionOptions] _model_list: list[str] = [] 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 4e48c4d7..abbaa095 100644 --- a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py +++ b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py @@ -25,7 +25,7 @@ class IPBatch2DForwardDriver(BaseBatch2DDriver): """Induced Polarization batch 2D forward driver.""" - _options_class = IPBatch2DForwardOptions + _params_class = IPBatch2DForwardOptions _params_2d_class = IP2DForwardOptions _model_list = ["conductivity_model"] @@ -34,7 +34,7 @@ class IPBatch2DForwardDriver(BaseBatch2DDriver): class IPBatch2DInversionDriver(BaseBatch2DDriver): """Induced Polarization batch 2D inversion driver.""" - _options_class = IPBatch2DInversionOptions + _params_class = IPBatch2DInversionOptions _params_2d_class = IP2DInversionOptions _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 076f6d7d..da79b3cf 100644 --- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py +++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py @@ -22,10 +22,10 @@ class IP3DForwardDriver(InversionDriver): """Induced Polarization 3D forward driver.""" - _options_class = IP3DForwardOptions + _params_class = IP3DForwardOptions class IP3DInversionDriver(InversionDriver): """Induced Polarization 3D inversion driver.""" - _options_class = IP3DInversionOptions + _params_class = IP3DInversionOptions diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py index 30bc2a51..8a0197d9 100644 --- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py +++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py @@ -22,10 +22,10 @@ class IP2DForwardDriver(Base2DDriver): """Induced Polarization 2D forward driver.""" - _options_class = IP2DForwardOptions + _params_class = IP2DForwardOptions class IP2DInversionDriver(Base2DDriver): """Induced Polarization 2D inversion driver.""" - _options_class = IP2DInversionOptions + _params_class = IP2DInversionOptions diff --git a/simpeg_drivers/electromagnetics/base_1d_driver.py b/simpeg_drivers/electromagnetics/base_1d_driver.py index 2b10ffc1..a4e93512 100644 --- a/simpeg_drivers/electromagnetics/base_1d_driver.py +++ b/simpeg_drivers/electromagnetics/base_1d_driver.py @@ -35,7 +35,7 @@ class Base1DDriver(InversionDriver): """Base 1D driver for electromagnetic simulations.""" - _options_class = None + _params_class = 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 7be3e060..70dcce70 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/driver.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/driver.py @@ -22,7 +22,7 @@ class FDEMForwardDriver(InversionDriver): """Frequency Domain Electromagnetic forward driver.""" - _options_class = FDEMForwardOptions + _params_class = FDEMForwardOptions def __init__(self, params: FDEMForwardOptions): super().__init__(params) @@ -31,4 +31,4 @@ def __init__(self, params: FDEMForwardOptions): class FDEMInversionDriver(InversionDriver): """Frequency Domain Electromagnetic inversion driver.""" - _options_class = FDEMInversionOptions + _params_class = FDEMInversionOptions diff --git a/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py b/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py index b719232e..acdb00a5 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py +++ b/simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py @@ -22,10 +22,10 @@ class FDEM1DForwardDriver(Base1DDriver): """Frequency Domain 1D Electromagnetic forward driver.""" - _options_class = FDEM1DForwardOptions + _params_class = FDEM1DForwardOptions class FDEM1DInversionDriver(Base1DDriver): """Frequency Domain 1D Electromagnetic inversion driver.""" - _options_class = FDEM1DInversionOptions + _params_class = FDEM1DInversionOptions diff --git a/simpeg_drivers/electromagnetics/time_domain/driver.py b/simpeg_drivers/electromagnetics/time_domain/driver.py index a47a958e..f53c411f 100644 --- a/simpeg_drivers/electromagnetics/time_domain/driver.py +++ b/simpeg_drivers/electromagnetics/time_domain/driver.py @@ -27,10 +27,10 @@ class TDEMForwardDriver(InversionDriver): """Time Domain Electromagnetic forward driver.""" - _options_class = TDEMForwardOptions + _params_class = TDEMForwardOptions class TDEMInversionDriver(InversionDriver): """Time Domain Electromagnetic inversion driver.""" - _options_class = TDEMInversionOptions + _params_class = TDEMInversionOptions diff --git a/simpeg_drivers/electromagnetics/time_domain_1d/driver.py b/simpeg_drivers/electromagnetics/time_domain_1d/driver.py index deba2b40..1a19af2c 100644 --- a/simpeg_drivers/electromagnetics/time_domain_1d/driver.py +++ b/simpeg_drivers/electromagnetics/time_domain_1d/driver.py @@ -22,10 +22,10 @@ class TDEM1DForwardDriver(Base1DDriver): """Time Domain 1D Electromagnetic forward driver.""" - _options_class = TDEM1DForwardOptions + _params_class = TDEM1DForwardOptions class TDEM1DInversionDriver(Base1DDriver): """Time Domain 1D Electromagnetic inversion driver.""" - _options_class = TDEM1DInversionOptions + _params_class = TDEM1DInversionOptions diff --git a/simpeg_drivers/joint/joint_cross_gradient/driver.py b/simpeg_drivers/joint/joint_cross_gradient/driver.py index ffc17d0a..05e500b9 100644 --- a/simpeg_drivers/joint/joint_cross_gradient/driver.py +++ b/simpeg_drivers/joint/joint_cross_gradient/driver.py @@ -32,7 +32,7 @@ class JointCrossGradientDriver(BaseJointDriver): - _options_class = JointCrossGradientOptions + _params_class = JointCrossGradientOptions 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 b36170d9..5e9bacf8 100644 --- a/simpeg_drivers/joint/joint_petrophysics/driver.py +++ b/simpeg_drivers/joint/joint_petrophysics/driver.py @@ -29,7 +29,7 @@ class JointPetrophysicsDriver(BaseJointDriver): - _options_class = JointPetrophysicsOptions + _params_class = JointPetrophysicsOptions 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 b688df45..c0906560 100644 --- a/simpeg_drivers/joint/joint_surveys/driver.py +++ b/simpeg_drivers/joint/joint_surveys/driver.py @@ -30,7 +30,7 @@ class JointSurveyDriver(BaseJointDriver): """Joint surveys inversion driver""" - _options_class = JointSurveysOptions + _params_class = JointSurveysOptions 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 f522d9a2..355023c8 100644 --- a/simpeg_drivers/natural_sources/magnetotellurics/driver.py +++ b/simpeg_drivers/natural_sources/magnetotellurics/driver.py @@ -19,10 +19,10 @@ class MTForwardDriver(InversionDriver): """Magnetotellurics forward driver.""" - _options_class = MTForwardOptions + _params_class = MTForwardOptions class MTInversionDriver(InversionDriver): """Magnetotellurics inversion driver.""" - _options_class = MTInversionOptions + _params_class = MTInversionOptions diff --git a/simpeg_drivers/natural_sources/tipper/driver.py b/simpeg_drivers/natural_sources/tipper/driver.py index 30bd0921..e7bb85dc 100644 --- a/simpeg_drivers/natural_sources/tipper/driver.py +++ b/simpeg_drivers/natural_sources/tipper/driver.py @@ -19,10 +19,10 @@ class TipperForwardDriver(InversionDriver): """Tipper forward driver.""" - _options_class = TipperForwardOptions + _params_class = TipperForwardOptions class TipperInversionDriver(InversionDriver): """Tipper inversion driver.""" - _options_class = TipperInversionOptions + _params_class = TipperInversionOptions diff --git a/simpeg_drivers/plate_simulation/options.py b/simpeg_drivers/plate_simulation/options.py index 6c11901f..44f90972 100644 --- a/simpeg_drivers/plate_simulation/options.py +++ b/simpeg_drivers/plate_simulation/options.py @@ -128,6 +128,8 @@ class PlateSimulationOptions(Options): title: ClassVar[str] = "Plate Simulation" run_command: ClassVar[str] = "simpeg_drivers.plate_simulation.driver" out_group: SimPEGGroup | UIJsonGroup | None = None + forward_only: bool = True + inversion_type: str = "plate simulation" mesh: MeshOptions model: ModelOptions diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index d291ae17..a3b3cca0 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -8,9 +8,6 @@ # ' # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -import contextlib -import cProfile -import pstats import shutil import sys from pathlib import Path @@ -195,39 +192,4 @@ def run_block( if __name__ == "__main__": file = Path(sys.argv[1]) - # Path(r"C:\Users\dominiquef\Desktop\Tests\GEOPY-2466.ui.json").resolve() - - input_file = load_ui_json_as_dict(file) - n_workers = input_file.get("n_workers", None) - n_threads = input_file.get("n_threads", None) - save_report = input_file.get("performance_report", False) - - cluster = ( - LocalCluster(processes=True, n_workers=n_workers, threads_per_worker=n_threads) - if ((n_workers is not None and n_workers > 1) or n_threads is not None) - else None - ) - profiler = cProfile.Profile() - profiler.enable() - - with ( - cluster.get_client() - if cluster is not None - else contextlib.nullcontext() as client - ): - # Full run - with ( - performance_report(filename=file.parent / "dask_profile.html") - if (save_report and isinstance(client, Client)) - else contextlib.nullcontext() - ): - PlateSweepDriver.start(file) - sys.stdout.close() - - profiler.disable() - - if save_report: - with open(file.parent / "runtime_profile.txt", encoding="utf-8", mode="w") as s: - ps = pstats.Stats(profiler, stream=s) - ps.sort_stats("cumulative") - ps.print_stats() + PlateSweepDriver.start(file) diff --git a/simpeg_drivers/potential_fields/gravity/driver.py b/simpeg_drivers/potential_fields/gravity/driver.py index b7509f9a..dac7e166 100644 --- a/simpeg_drivers/potential_fields/gravity/driver.py +++ b/simpeg_drivers/potential_fields/gravity/driver.py @@ -21,10 +21,10 @@ class GravityForwardDriver(InversionDriver): """Gravity forward driver.""" - _options_class = GravityForwardOptions + _params_class = GravityForwardOptions class GravityInversionDriver(InversionDriver): """Gravity inversion driver.""" - _options_class = GravityInversionOptions + _params_class = GravityInversionOptions diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/driver.py b/simpeg_drivers/potential_fields/magnetic_scalar/driver.py index cdeb3628..15ee1baf 100644 --- a/simpeg_drivers/potential_fields/magnetic_scalar/driver.py +++ b/simpeg_drivers/potential_fields/magnetic_scalar/driver.py @@ -21,10 +21,10 @@ class MagneticForwardDriver(InversionDriver): """Magnetic forward driver.""" - _options_class = MagneticForwardOptions + _params_class = MagneticForwardOptions class MagneticInversionDriver(InversionDriver): """Magnetic inversion driver.""" - _options_class = MagneticInversionOptions + _params_class = MagneticInversionOptions diff --git a/simpeg_drivers/potential_fields/magnetic_vector/driver.py b/simpeg_drivers/potential_fields/magnetic_vector/driver.py index ddeaec6d..c3fa6764 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/driver.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/driver.py @@ -21,13 +21,13 @@ class MVIForwardDriver(InversionDriver): """Magnetic Vector forward driver.""" - _options_class = MVIForwardOptions + _params_class = MVIForwardOptions class MVIInversionDriver(InversionDriver): """Magnetic Vector inversion driver.""" - _options_class = MVIInversionOptions + _params_class = MVIInversionOptions @property def mapping(self) -> list[maps.Projection] | None: diff --git a/simpeg_drivers/utils/utils.py b/simpeg_drivers/utils/utils.py index cda6a194..79f82f54 100644 --- a/simpeg_drivers/utils/utils.py +++ b/simpeg_drivers/utils/utils.py @@ -566,6 +566,6 @@ def simpeg_group_to_driver(group: SimPEGGroup, workspace: Workspace) -> Inversio inversion_driver = getattr(module, class_name) ifile.set_data_value("out_group", group) - params = inversion_driver._options_class.build(ifile) # pylint: disable=protected-access + params = inversion_driver._params_class.build(ifile) # pylint: disable=protected-access return inversion_driver(params) From 1a4ee557c9ca7e62db10644e3952c09a49a08bfa Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 25 Sep 2025 16:11:44 -0400 Subject: [PATCH 07/22] Only iterate over full sets --- simpeg_drivers/plate_simulation/sweep/options.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/simpeg_drivers/plate_simulation/sweep/options.py b/simpeg_drivers/plate_simulation/sweep/options.py index 6d089622..cd4be6f3 100644 --- a/simpeg_drivers/plate_simulation/sweep/options.py +++ b/simpeg_drivers/plate_simulation/sweep/options.py @@ -61,6 +61,8 @@ class SweepOptions(Options): title: ClassVar[str] = "Plate Sweep" run_command: ClassVar[str] = "simpeg_drivers.plate_simulation.sweep.driver" out_group: SimPEGGroup | None = None + forward_only: bool = True + inversion_type: str = "plate sweep" template: SimPEGGroup | UIJsonGroup sweeps: list[ParamSweep] workdir: Path | None = None @@ -119,8 +121,10 @@ def collect_sweep(param: str) -> dict: @property def trials(self) -> list[dict]: """Returns a list of parameter combinations to run for each trial.""" - names = [s.name for s in self.sweeps] - iterations = itertools.product(*[np.linspace(*s()) for s in self.sweeps]) + names = [s.name for s in self.sweeps if all(s())] + iterations = itertools.product( + *[np.linspace(*s()) for s in self.sweeps if all(s())] + ) return [dict(zip(names, i, strict=True)) for i in iterations] @staticmethod From 518392924e32432772f41833eaf26667fcf8a4ed Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 25 Sep 2025 16:32:31 -0400 Subject: [PATCH 08/22] Rely on base.start. Move fetching of driver_class in main --- simpeg_drivers/driver.py | 55 +++++++---------------- simpeg_drivers/plate_simulation/driver.py | 18 -------- 2 files changed, 15 insertions(+), 58 deletions(-) diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index cd4c3818..5106697f 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -32,6 +32,7 @@ from dask.distributed import get_client, Client, LocalCluster, performance_report from geoapps_utils.base import Driver, Options +from geoapps_utils.run import load_ui_json_as_dict from geoapps_utils.utils.importing import GeoAppsError from geoapps_utils.param_sweeps.driver import SweepParams @@ -688,36 +689,16 @@ def configure_dask(self): dconf.set(scheduler="threads", pool=ThreadPool(n_cpu)) @classmethod - def start( - cls, filepath: str | Path | InputFile, driver_class=None, **kwargs - ) -> InversionDriver: + def start(cls, filepath: str | Path | InputFile, **kwargs) -> BaseDriver: """ Start the inversion driver. :param filepath: Path to the input file or InputFile object. - :param driver_class: Optional driver class to use instead of the default. :param kwargs: Additional keyword arguments for InputFile read_ui_json. :return: InversionDriver instance with the specified parameters. """ - if isinstance(filepath, InputFile): - ifile = filepath - else: - ifile = InputFile.read_ui_json(filepath, **kwargs) - - try: - if driver_class is None: - driver = cls.from_input_file(ifile) - else: - with ifile.data["geoh5"].open(mode="r+"): - params = driver_class._params_class.build(ifile) - driver = driver_class(params) - - driver.run() - - except GeoAppsError as error: - logger.warning("\n\nApplicationError: %s\n\n", error) - sys.exit(1) + driver = super().start(filepath, **kwargs) return driver @@ -739,24 +720,16 @@ def driver_class_from_name( return getattr(module, class_name) @classmethod - def from_input_file(cls, ifile: InputFile) -> InversionDriver: - forward_only = ifile.data.get("forward_only", False) - inversion_type = ifile.ui_json.get("inversion_type", None) + def from_input_file(cls, data: dict) -> type[InversionDriver]: + forward_only = data.get("forward_only", False) + inversion_type = data.get("inversion_type", "") if inversion_type is None: raise GeoAppsError( "Key/value 'inversion_type' not found in the input file. " "Please specify the inversion type in the UI JSON." ) - driver_class = cls.driver_class_from_name( - inversion_type, forward_only=forward_only - ) - - with ifile.data["geoh5"].open(mode="r+"): - params = driver_class._params_class.build(ifile) - driver = driver_class(params) - - return driver + return cls.driver_class_from_name(inversion_type, forward_only=forward_only) class InversionLogger: @@ -810,13 +783,15 @@ def get_path(self, filepath: str | Path) -> str: if __name__ == "__main__": # file = Path(sys.argv[1]).resolve() file = Path(r"C:\Users\dominiquef\Desktop\Tests\GEOPY-2466.ui.json").resolve() - input_file = InputFile.read_ui_json(file) - n_workers = input_file.data.get("n_workers", None) - n_threads = input_file.data.get("n_threads", None) - save_report = input_file.data.get("performance_report", False) + input_file = load_ui_json_as_dict(file) + n_workers = input_file.get("n_workers", None) + n_threads = input_file.get("n_threads", None) + save_report = input_file.get("performance_report", False) + + driver_class = InversionDriver.from_input_file(input_file) # Force distributed on 1D problems - if "1D" in input_file.data["title"] and n_workers is None: + if "1D" in input_file.get("title") and n_workers is None: n_threads = n_threads or 2 n_workers = multiprocessing.cpu_count() // n_threads @@ -839,7 +814,7 @@ def get_path(self, filepath: str | Path) -> str: if (save_report and isinstance(context_client, Client)) else contextlib.nullcontext() ): - InversionDriver.start(input_file) + driver_class.start(file) sys.stdout.close() profiler.disable() diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index 59b09b8b..42233c0a 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -307,24 +307,6 @@ def replicate( plates.append(new) return plates - @staticmethod - def start(ifile: str | Path | InputFile): - """Run the plate simulation driver from an input file.""" - - if isinstance(ifile, str): - ifile = Path(ifile) - - if isinstance(ifile, Path): - ifile = InputFile.read_ui_json(ifile) - - if ifile.data is None: # type: ignore - raise ValueError("Input file has no data loaded.") - - with ifile.geoh5.open(mode="r+"): # type: ignore - params = PlateSimulationOptions.build(ifile) - - return PlateSimulationDriver(params).run() - if __name__ == "__main__": file = Path(sys.argv[1]) From 6ec09b63ba651fb53e8547aa6fddf5e4407d4dc7 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 25 Sep 2025 16:34:59 -0400 Subject: [PATCH 09/22] Clean up hardcoded path --- simpeg_drivers/driver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 5106697f..a3bba3d1 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -781,8 +781,7 @@ def get_path(self, filepath: str | Path) -> str: if __name__ == "__main__": - # file = Path(sys.argv[1]).resolve() - file = Path(r"C:\Users\dominiquef\Desktop\Tests\GEOPY-2466.ui.json").resolve() + file = Path(sys.argv[1]).resolve() input_file = load_ui_json_as_dict(file) n_workers = input_file.get("n_workers", None) n_threads = input_file.get("n_threads", None) From 2cdacf6e2caf530c706886020483538ff8c2b1b3 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Mon, 29 Sep 2025 12:34:20 -0400 Subject: [PATCH 10/22] Adjust check for run_command --- simpeg_drivers/driver.py | 15 +++++++-------- simpeg_drivers/plate_simulation/sweep/driver.py | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index a3bba3d1..244a4420 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -133,7 +133,7 @@ def validate_workers(self, workers: list[tuple[str]] | None) -> list[tuple[str]] if self.client: available_workers = [(worker,) for worker in self.client.nthreads()] else: - available_workers = [] + return [] if workers is None: return available_workers @@ -143,13 +143,12 @@ def validate_workers(self, workers: list[tuple[str]] | None) -> list[tuple[str]] ): raise TypeError("Workers must be a list of tuple[str].") - if self.client: - invalid_workers = [w for w in workers if w not in available_workers] - if invalid_workers: - raise ValueError( - f"The following workers are not available: {invalid_workers}. " - f"Available workers are: {available_workers}." - ) + invalid_workers = [w for w in workers if w not in available_workers] + if invalid_workers: + raise ValueError( + f"The following workers are not available: {invalid_workers}. " + f"Available workers are: {available_workers}." + ) return workers diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index a3b3cca0..88fbe6df 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -162,7 +162,7 @@ def run_trial( group for group in workspace.groups if isinstance(group, SimPEGGroup | UIJsonGroup) - and "plate_simulation.driver" in group.options.get("run_command") + and "plate simulation" == group.options.get("inversion_type") ) opt_dict = workspace.promote(flatten(plate_simulation.options)) From da8aab7bf3573bad58a0baf10dbe04c444627591 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 2 Oct 2025 11:16:03 -0400 Subject: [PATCH 11/22] Simplify mechanics. Clean up test --- simpeg_drivers/plate_simulation/driver.py | 10 +--- simpeg_drivers/plate_simulation/options.py | 4 -- .../plate_simulation/sweep/driver.py | 14 ++++-- .../plate_simulation/sweep/options.py | 50 +++++++++++-------- tests/plate_simulation/runtest/sweep_test.py | 4 +- 5 files changed, 42 insertions(+), 40 deletions(-) diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index 42233c0a..b7dd61c0 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -71,15 +71,7 @@ def run(self) -> InversionDriver: logger.info("running the simulation...") with fetch_active_workspace(self.params.geoh5, mode="r+"): self.simulation_driver.run() - self.out_group.add_ui_json() - if ( - self.params.monitoring_directory is not None - and Path(self.params.monitoring_directory).is_dir() - ): - monitored_directory_copy( - str(Path(self.params.monitoring_directory).resolve()), - self.out_group, - ) + self.update_monitoring_directory(self.out_group) logger.info("done.") logger.handlers.clear() diff --git a/simpeg_drivers/plate_simulation/options.py b/simpeg_drivers/plate_simulation/options.py index 44f90972..5c2275e9 100644 --- a/simpeg_drivers/plate_simulation/options.py +++ b/simpeg_drivers/plate_simulation/options.py @@ -104,10 +104,6 @@ def octree_params( diagonal_balance=self.diagonal_balance, refinements=refinements, ) - - assert isinstance(survey.workspace.h5file, Path) - path = survey.workspace.h5file.parent - octree_params.write_ui_json(path / "octree.ui.json") return octree_params diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index feeb7624..13ae973f 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -8,6 +8,7 @@ # ' # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +import json import shutil import sys from pathlib import Path @@ -112,7 +113,7 @@ def run(self): ) use_futures = self.client - self.params.jsonify(trials[0]) + if use_futures: blocks = np.array_split(trials, len(self.workers)) else: @@ -146,9 +147,9 @@ def run(self): def run_trial( data: dict, h5file: Path, workdir: Path | None, worker: tuple[str] | None = None ): - uid = SweepOptions.uuid_from_params(data) - # string = SweepOptions.jsonify(data) - # uid = SweepOptions.uuid_from_params(options_string) + options_string = json.dumps(data, indent=4) + uid = SweepOptions.uuid_from_params(options_string) + if workdir is None: workdir = h5file.parent @@ -172,6 +173,11 @@ def run_trial( opt_dict.update(data) options = PlateSimulationOptions.build(opt_dict) plate_sim = PlateSimulationDriver(options, workers=[worker]) + plate_sim.simulation_driver.logger = False + # Knock out the log directive + plate_sim.out_group.add_file( + options_string.encode("utf-8"), name="options.txt" + ) plate_sim.run() del plate_sim diff --git a/simpeg_drivers/plate_simulation/sweep/options.py b/simpeg_drivers/plate_simulation/sweep/options.py index c6c673e7..534da985 100644 --- a/simpeg_drivers/plate_simulation/sweep/options.py +++ b/simpeg_drivers/plate_simulation/sweep/options.py @@ -9,16 +9,15 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' import itertools -import json import uuid from pathlib import Path -from typing import ClassVar +from typing import Any, ClassVar import numpy as np from geoapps_utils.base import Options from geoh5py.groups import SimPEGGroup, UIJsonGroup from geoh5py.shared import Entity -from geoh5py.shared.utils import stringify +from geoh5py.shared.utils import dict_mapper, stringify from geoh5py.ui_json import InputFile from pydantic import BaseModel, ConfigDict, ValidationError, field_serializer @@ -125,11 +124,19 @@ def collect_sweep(param: str) -> dict: @property def trials(self) -> list[dict]: """Returns a list of parameter combinations to run for each trial.""" - names = [s.name for s in self.sweeps if all(s())] - iterations = itertools.product( - *[np.linspace(*s()) for s in self.sweeps if all(s())] - ) - return [dict(zip(names, i, strict=True)) for i in iterations] + names = [s.name for s in self.sweeps] + iterations = itertools.product(*[np.linspace(*s()) for s in self.sweeps]) + options_dict = dict_mapper(self.template_options, [self.format_value]) + + trials = [] + for iterate in iterations: + trial = dict(zip(names, iterate, strict=True)) + trial = dict_mapper(trial, [self.format_value]) + + options_dict.update(trial) + trials.append(options_dict.copy()) + + return trials @staticmethod def all_hashable_options(options: dict) -> dict: @@ -145,26 +152,27 @@ def all_hashable_options(options: dict) -> dict: for k, v in ifile.data.items(): if isinstance(v, SimPEGGroup | UIJsonGroup): out.pop(k) - out.update(SweepOptions.all_hashable_options(v.options)) + opts = v.options + opts["geoh5"] = options["geoh5"] + out.update(SweepOptions.all_hashable_options(opts)) return out @property def template_options(self): """Return a flat version of the template.options dictionary.""" - return stringify(SweepOptions.all_hashable_options(self.template.options)) + options = self.template.options + options["geoh5"] = self.geoh5 + return stringify(SweepOptions.all_hashable_options(options)) - def jsonify(self, updates: dict): - options = dict(self.template_options, **updates) - - def format_value(v): - if isinstance(v, float): - return f"{v:.4e}" - if isinstance(v, Entity): - return str(v.uid) - return v - - return json.dumps({k: format_value(v) for k, v in options.items()}, indent=4) + @staticmethod + def format_value(value: Any) -> Any: + """Format a value for json serialization.""" + if isinstance(value, float): + return f"{value:.4e}" + if isinstance(value, Entity): + return str(value.uid) + return value @staticmethod def uuid_from_params(param_string: str) -> str: diff --git a/tests/plate_simulation/runtest/sweep_test.py b/tests/plate_simulation/runtest/sweep_test.py index d1e983fb..9fa38827 100644 --- a/tests/plate_simulation/runtest/sweep_test.py +++ b/tests/plate_simulation/runtest/sweep_test.py @@ -102,5 +102,5 @@ def test_sweep(tmp_path): PlateSweepDriver.start(tmp_path / "plate_sweep_modified.ui.json") - n = len(list(workdir.glob("*.ui.json"))) - assert n == 7 # 7 trials and one for octree. + n = len(list(workdir.glob("*.geoh5"))) + assert n == 6 From d88c2b4dfb91177f55a91ff0daf669de6d5c862a Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 2 Oct 2025 11:21:20 -0400 Subject: [PATCH 12/22] Make logger optional on driver --- .../factories/directives_factory.py | 2 +- simpeg_drivers/driver.py | 59 ++++++++++++------- simpeg_drivers/joint/driver.py | 17 +++--- 3 files changed, 48 insertions(+), 30 deletions(-) diff --git a/simpeg_drivers/components/factories/directives_factory.py b/simpeg_drivers/components/factories/directives_factory.py index 700b8cce..b51f656d 100644 --- a/simpeg_drivers/components/factories/directives_factory.py +++ b/simpeg_drivers/components/factories/directives_factory.py @@ -244,7 +244,7 @@ def save_iteration_model_directive(self): @property def save_iteration_log_files(self): """""" - if self._save_iteration_log_files is None: + if self._save_iteration_log_files is None and self.driver.logger: self._save_iteration_log_files = directives.SaveLogFilesGeoH5( self.driver.out_group, ) diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 244a4420..6405a932 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -85,9 +85,6 @@ mlogger.setLevel(logging.WARNING) -logger = logging.getLogger("simpeg-drivers") - - class BaseDriver(Driver): """ Base class for drivers handling the parallel setup. @@ -162,6 +159,7 @@ def __init__( params: BaseForwardOptions | BaseInversionOptions, client: Client | bool | None = None, workers: list[tuple[str]] | None = None, + logger: logging.Logger | None | bool = None, ): super().__init__(params, client=client, workers=workers) @@ -174,7 +172,7 @@ def __init__( self._inversion_data: InversionData | None = None self._inversion_mesh: InversionMesh | None = None self._inversion_topography: InversionTopography | None = None - self._logger: InversionLogger | None = None + self.logger: InversionLogger | None = logger self._mapping: list[maps.IdentityMap] | None = None self._models: InversionModelCollection | None = None self._n_values: int | None = None @@ -208,9 +206,10 @@ def split_list(self, tiles: list[np.ndarray]) -> list[np.ndarray]: split_list[count % n_tiles] += 1 count += 1 - self.logger.write( - f"Number of misfits: {np.sum(split_list)} distributed over {len(self.workers)} workers.\n" - ) + if self.logger: + self.logger.write( + f"Number of misfits: {np.sum(split_list)} distributed over {len(self.workers)} workers.\n" + ) flat_tile_list = [] for tile, split in zip(tiles, split_list): @@ -225,14 +224,17 @@ def data_misfit(self): # Tile locations tiles = self.get_tiles() - self.logger.write(f"Setting up {len(tiles)} tile(s) . . .\n") - # Build tiled misfits and combine to form global misfit + if self.logger: + self.logger.write(f"Setting up {len(tiles)} tile(s) . . .\n") + self._data_misfit = MisfitFactory( self.params, self.client, self.simulation, self.workers ).build( self.split_list(tiles), ) - self.logger.write("Saving data to file...\n") + + if self.logger: + self.logger.write("Saving data to file...\n") return self._data_misfit @@ -306,15 +308,25 @@ def inversion_type(self, value): self._inversion_type = value @property - def logger(self): + def logger(self) -> InversionLogger | None: """ Inversion logger """ - if getattr(self, "_logger", None) is None: - self._logger = InversionLogger("SimPEG.log", self) - return self._logger + @logger.setter + def logger(self, value: InversionLogger | None | bool): + if value is True or value is None: + self._logger = InversionLogger("SimPEG.log", self) + elif value is False: + self._logger = None + elif isinstance(value, logging.Logger): + self._logger = value + else: + raise TypeError( + "Logger must be a InversionLogger instance, None, True or False." + ) + @property def models(self): """Inversion models""" @@ -459,8 +471,10 @@ def window(self): def run(self): """Run inversion from params""" - sys.stdout = self.logger - self.logger.start() + if self.logger: + sys.stdout = self.logger + self.logger.start() + self.configure_dask() with fetch_active_workspace(self.workspace, mode="r+"): @@ -472,13 +486,15 @@ def run(self): predicted = None try: if self.params.forward_only: - self.logger.write("Running the forward simulation ...\n") + if self.logger: + self.logger.write("Running the forward simulation ...\n") predicted = simpeg_inversion.invProb.get_dpred( self.models.starting_model, None ) else: # Run the inversion - self.start_inversion_message() + if self.logger: + self.start_inversion_message() simpeg_inversion.run(self.models.starting_model) except np.core._exceptions._ArrayMemoryError as error: # pylint: disable=protected-access @@ -488,9 +504,10 @@ def run(self): "or increase the number of tiles." ) from error - self.logger.end() - sys.stdout = self.logger.terminal - self.logger.log.close() + if self.logger: + self.logger.end() + sys.stdout = self.logger.terminal + self.logger.log.close() if self.params.forward_only: self.directives.save_iteration_data_directive.write(0, predicted) diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index 831915cd..7b865922 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -226,9 +226,10 @@ def n_values(self): def run(self): """Run inversion from params""" - sys.stdout = self.logger - self.logger.start() - self.configure_dask() + if self.logger: + sys.stdout = self.logger + self.logger.start() + self.configure_dask() if Path(self.params.input_file.path_name).is_file(): with fetch_active_workspace(self.workspace, mode="r+"): @@ -248,11 +249,11 @@ def run(self): # Run the inversion self.start_inversion_message() self.inversion.run(self.models.starting_model) - - self.logger.end() - sys.stdout = self.logger.terminal - self.logger.log.close() - self._update_log() + if self.logger: + self.logger.end() + sys.stdout = self.logger.terminal + self.logger.log.close() + self._update_log() def validate_create_mesh(self): """Function to validate and create the inversion mesh.""" From 5cd0bb0ad4c212d6e42159b9a238294e949103e2 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 2 Oct 2025 11:41:51 -0400 Subject: [PATCH 13/22] Only create log file on demand only. Open/close context every write --- simpeg_drivers/driver.py | 12 ++++++++---- simpeg_drivers/joint/driver.py | 1 - 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 6405a932..5a4ec45e 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -507,7 +507,6 @@ def run(self): if self.logger: self.logger.end() sys.stdout = self.logger.terminal - self.logger.log.close() if self.params.forward_only: self.directives.save_iteration_data_directive.write(0, predicted) @@ -749,10 +748,14 @@ def from_input_file(cls, data: dict) -> type[InversionDriver]: class InversionLogger: + """ + Logger for the inversion process. + """ + def __init__(self, logfile, driver): self.driver = driver self.terminal = sys.stdout - self.log = open(self.get_path(logfile), "w", encoding="utf8") + self.logfile = self.get_path(logfile) self.initial_time = time() def start(self): @@ -772,8 +775,9 @@ def end(self): def write(self, message): self.terminal.write(message) - self.log.write(message) - self.log.flush() + with open(self.logfile, "a", encoding="utf8") as logfile: + logfile.write(message) + logfile.flush() @staticmethod def format_seconds(seconds): diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index 7b865922..ac1ae07c 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -252,7 +252,6 @@ def run(self): if self.logger: self.logger.end() sys.stdout = self.logger.terminal - self.logger.log.close() self._update_log() def validate_create_mesh(self): From fe9276b96e0e57b492aed8762847d5379e42a32d Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 2 Oct 2025 14:04:34 -0400 Subject: [PATCH 14/22] RE-instate jsonify, only convert to string inside the call trial --- simpeg_drivers/plate_simulation/sweep/driver.py | 7 +++---- simpeg_drivers/plate_simulation/sweep/options.py | 14 +++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index 13ae973f..a72cd6fc 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -8,7 +8,6 @@ # ' # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -import json import shutil import sys from pathlib import Path @@ -147,8 +146,8 @@ def run(self): def run_trial( data: dict, h5file: Path, workdir: Path | None, worker: tuple[str] | None = None ): - options_string = json.dumps(data, indent=4) - uid = SweepOptions.uuid_from_params(options_string) + json_string = SweepOptions.jsonify(data) + uid = SweepOptions.uuid_from_params(json_string) if workdir is None: workdir = h5file.parent @@ -176,7 +175,7 @@ def run_trial( plate_sim.simulation_driver.logger = False # Knock out the log directive plate_sim.out_group.add_file( - options_string.encode("utf-8"), name="options.txt" + json_string.encode("utf-8"), name="options.txt" ) plate_sim.run() diff --git a/simpeg_drivers/plate_simulation/sweep/options.py b/simpeg_drivers/plate_simulation/sweep/options.py index 534da985..8bc5f509 100644 --- a/simpeg_drivers/plate_simulation/sweep/options.py +++ b/simpeg_drivers/plate_simulation/sweep/options.py @@ -9,6 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' import itertools +import json import uuid from pathlib import Path from typing import Any, ClassVar @@ -126,14 +127,11 @@ def trials(self) -> list[dict]: """Returns a list of parameter combinations to run for each trial.""" names = [s.name for s in self.sweeps] iterations = itertools.product(*[np.linspace(*s()) for s in self.sweeps]) - options_dict = dict_mapper(self.template_options, [self.format_value]) + options_dict = self.template_options.copy() trials = [] for iterate in iterations: - trial = dict(zip(names, iterate, strict=True)) - trial = dict_mapper(trial, [self.format_value]) - - options_dict.update(trial) + options_dict.update(dict(zip(names, iterate, strict=True))) trials.append(options_dict.copy()) return trials @@ -174,6 +172,12 @@ def format_value(value: Any) -> Any: return str(value.uid) return value + @classmethod + def jsonify(cls, data: dict) -> dict: + """Format all values in a dictionary for json serialization.""" + formatted = dict_mapper(data, [cls.format_value]) + return json.dumps(formatted, indent=4) + @staticmethod def uuid_from_params(param_string: str) -> str: """ From d8f632c834f6133ba9d82a531b56b5ce7bcf14f4 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 2 Oct 2025 15:20:56 -0400 Subject: [PATCH 15/22] Fix for batch 2d --- simpeg_drivers/line_sweep/driver.py | 24 +++++++++++++++++++++++- tests/utils/targets.py | 4 ++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/simpeg_drivers/line_sweep/driver.py b/simpeg_drivers/line_sweep/driver.py index a2e6d56f..f29195d9 100644 --- a/simpeg_drivers/line_sweep/driver.py +++ b/simpeg_drivers/line_sweep/driver.py @@ -18,6 +18,7 @@ import numpy as np from geoapps_utils.param_sweeps.driver import SweepDriver, SweepParams from geoapps_utils.param_sweeps.generate import generate +from geoapps_utils.run import load_ui_json_as_dict from geoapps_utils.utils.importing import GeoAppsError from geoh5py.data import FilenameData from geoh5py.groups import ContainerGroup, SimPEGGroup @@ -77,6 +78,8 @@ def validate_out_group(self, out_group: SimPEGGroup | None) -> SimPEGGroup: def run(self): """ Run the line sweep driver. + + TODO: Add parallelization on GEOPY-2490 """ with fetch_active_workspace(self.workspace, mode="r+"): if not isinstance(self.out_group, SimPEGGroup): @@ -84,7 +87,26 @@ def run(self): f"Output group should be a valid SimPEGGroup, received: {type(self.out_group)}." ) - super().run() + lookup = self.get_lookup() + self.write_files(lookup) + + for name, trial in lookup.items(): + file_path = Path(self.working_directory) / f"{name}.ui.json" + if trial["status"] == "complete": + continue + + trial["status"] = "processing" + self.update_lookup(lookup) + params_dict = load_ui_json_as_dict(file_path) + driver = self.driver_class_from_name( + params_dict["inversion_type"], + forward_only=params_dict["forward_only"], + ) + driver.start(file_path) + + trial["status"] = "complete" + self.update_lookup(lookup) + self.collect_results() if self.cleanup: diff --git a/tests/utils/targets.py b/tests/utils/targets.py index 87ef585b..79bf537d 100644 --- a/tests/utils/targets.py +++ b/tests/utils/targets.py @@ -67,10 +67,10 @@ def check_target(output: dict, target: dict, tolerance=0.05): ) np.testing.assert_array_less( - np.abs(output["phi_m"][1] - target["phi_m"]) / target["phi_m"], tolerance + np.abs(output["phi_m"][-1] - target["phi_m"]) / target["phi_m"], tolerance ) np.testing.assert_array_less( - np.abs(output["phi_d"][1] - target["phi_d"]) / target["phi_d"], tolerance + np.abs(output["phi_d"][-1] - target["phi_d"]) / target["phi_d"], tolerance ) From 41319a24803de5321e2008e2132bc498da3964a0 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 2 Oct 2025 15:36:34 -0400 Subject: [PATCH 16/22] Adjust legacy test --- tests/uijson_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/uijson_test.py b/tests/uijson_test.py index 2c836c30..6c9bde99 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -403,7 +403,7 @@ def test_legacy_uijson(tmp_path: Path): ifile.data[CHANNEL_NAME[inversion_type] + "_channel"] = channel ifile.data[CHANNEL_NAME[inversion_type] + "_uncertainty"] = channel - driver = InversionDriver.from_input_file(ifile) + driver = InversionDriver.from_input_file(ifile.data) if hasattr(driver.params, "cooling_factor"): assert driver.params.cooling_factor == 4.0 From de14a98a6e63fc3d5705a342cbb13bb68a42dc47 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Mon, 6 Oct 2025 10:34:48 -0700 Subject: [PATCH 17/22] Re-lock --- .../py-3.10-linux-64-dev.conda.lock.yml | 44 +-- environments/py-3.10-linux-64.conda.lock.yml | 39 +- .../py-3.10-win-64-dev.conda.lock.yml | 36 +- environments/py-3.10-win-64.conda.lock.yml | 29 +- .../py-3.11-linux-64-dev.conda.lock.yml | 44 +-- environments/py-3.11-linux-64.conda.lock.yml | 39 +- .../py-3.11-win-64-dev.conda.lock.yml | 36 +- environments/py-3.11-win-64.conda.lock.yml | 29 +- .../py-3.12-linux-64-dev.conda.lock.yml | 44 +-- environments/py-3.12-linux-64.conda.lock.yml | 39 +- .../py-3.12-win-64-dev.conda.lock.yml | 36 +- environments/py-3.12-win-64.conda.lock.yml | 29 +- py-3.10.conda-lock.yml | 330 ++++++++--------- py-3.11.conda-lock.yml | 332 +++++++++--------- py-3.12.conda-lock.yml | 332 +++++++++--------- pyproject.toml | 2 +- 16 files changed, 726 insertions(+), 714 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 6c0f025b..0c9a6797 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: 2fbee61177612de9087814534b943c81f23e46c607a507da87dd59a311982edb +# input_hash: c8f7ae0bddeffc0ce95aebb250579b216dcf022feb26f8e2d841be6b05442f87 channels: - conda-forge @@ -12,7 +12,7 @@ dependencies: - annotated-types=0.7.0=pyhd8ed1ab_1 - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=25.1.0=py310h7c4b9e2_0 + - argon2-cffi-bindings=25.1.0=py310h7c4b9e2_1 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.11=py310hff52083_1 @@ -29,10 +29,10 @@ dependencies: - brotli-python=1.1.0=py310hea6c23e_4 - bzip2=1.0.8=hda65f42_8 - c-ares=1.34.5=hb9d3cd8_0 - - ca-certificates=2025.8.3=hbd8a1cb_0 + - ca-certificates=2025.10.5=hbd8a1cb_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py310h34a4b09_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - click=8.3.0=pyh707e725_0 @@ -55,7 +55,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.1=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py310h3406613_0 + - fonttools=4.60.1=py310h3406613_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.14.1=ha770c72_0 - fsspec=2025.9.0=pyhd8ed1ab_0 @@ -80,7 +80,7 @@ dependencies: - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - - isort=6.0.1=pyhd8ed1ab_1 + - isort=6.1.0=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 @@ -108,7 +108,7 @@ dependencies: - lark=1.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - - ld_impl_linux-64=2.44=h1423503_1 + - ld_impl_linux-64=2.44=ha97dd6f_2 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - libblas=3.9.0=36_h5875eb1_mkl @@ -125,10 +125,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.1.0=h767d61c_5 - - libgcc-ng=15.1.0=h69a702a_5 - - libgfortran=15.1.0=h69a702a_5 - - libgfortran5=15.1.0=hcea5267_5 + - libgcc=15.2.0=h767d61c_5 + - libgcc-ng=15.2.0=h69a702a_5 + - libgfortran=15.2.0=h69a702a_5 + - libgfortran5=15.2.0=hcd61629_5 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -142,8 +142,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.1.0=h8f9b012_5 - - libstdcxx-ng=15.1.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_5 + - libstdcxx-ng=15.2.0=h4852527_5 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -153,7 +153,7 @@ dependencies: - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=21.1.0=h4922eb0_0 + - llvm-openmp=21.1.2=h4922eb0_3 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py310h3406613_0 @@ -183,11 +183,11 @@ dependencies: - numcodecs=0.13.1=py310h5eaa309_0 - numpy=1.26.4=py310hb13e2d6_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.5.3=h26f9b46_1 + - openssl=3.5.4=h26f9b46_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py310h0158d43_0 - - pandoc=3.8=ha770c72_0 + - pandas=2.3.3=py310h0158d43_1 + - pandoc=3.8.2=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.5=pyhcf101f3_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -204,14 +204,14 @@ dependencies: - ptyprocess=0.7.0=pyhd8ed1ab_1 - pure_eval=0.2.3=pyhd8ed1ab_1 - pybtex=0.25.1=pyhd8ed1ab_0 - - pybtex-docutils=1.0.3=py310hff52083_2 + - pybtex-docutils=1.0.3=py310hff52083_3 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py310hbcd0ec0_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py310h69a6472_0 - pygments=2.19.2=pyhd8ed1ab_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 @@ -280,7 +280,7 @@ dependencies: - trimesh=4.1.8=pyhd8ed1ab_0 - types-python-dateutil=2.9.0.20250822=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025b=h78e105d_0 @@ -308,7 +308,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 94bc3091..973cf968 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: 2fbee61177612de9087814534b943c81f23e46c607a507da87dd59a311982edb +# input_hash: c8f7ae0bddeffc0ce95aebb250579b216dcf022feb26f8e2d841be6b05442f87 channels: - conda-forge @@ -16,10 +16,10 @@ dependencies: - brotli-python=1.1.0=py310hea6c23e_4 - bzip2=1.0.8=hda65f42_8 - c-ares=1.34.5=hb9d3cd8_0 - - ca-certificates=2025.8.3=hbd8a1cb_0 + - ca-certificates=2025.10.5=hbd8a1cb_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py310h34a4b09_0 - click=8.3.0=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 @@ -32,7 +32,7 @@ dependencies: - discretize=0.11.3=py310ha2bacc8_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py310h3406613_0 + - fonttools=4.60.1=py310h3406613_0 - freetype=2.14.1=ha770c72_0 - fsspec=2025.9.0=pyhd8ed1ab_0 - geoana=0.7.2=py310ha2bacc8_0 @@ -43,14 +43,15 @@ dependencies: - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he02047a_0 - importlib-metadata=8.7.0=pyhe01879c_1 - - isort=6.0.1=pyhd8ed1ab_1 + - importlib_metadata=8.7.0=h40b2b14_1 + - isort=6.1.0=pyhd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.4.9=py310haaf941d_1 - krb5=1.21.3=h659f571_0 - lcms2=2.17=h717163a_0 - - ld_impl_linux-64=2.44=h1423503_1 + - ld_impl_linux-64=2.44=ha97dd6f_2 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - libblas=3.9.0=36_h5875eb1_mkl @@ -67,10 +68,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.1.0=h767d61c_5 - - libgcc-ng=15.1.0=h69a702a_5 - - libgfortran=15.1.0=h69a702a_5 - - libgfortran5=15.1.0=hcea5267_5 + - libgcc=15.2.0=h767d61c_5 + - libgcc-ng=15.2.0=h69a702a_5 + - libgfortran=15.2.0=h69a702a_5 + - libgfortran5=15.2.0=hcd61629_5 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -83,8 +84,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.1.0=h8f9b012_5 - - libstdcxx-ng=15.1.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_5 + - libstdcxx-ng=15.2.0=h4852527_5 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -93,7 +94,7 @@ dependencies: - libxml2=2.15.0=h26afc86_1 - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=21.1.0=h4922eb0_0 + - llvm-openmp=21.1.2=h4922eb0_3 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py310h3406613_0 - matplotlib-base=3.8.4=py310hef631a5_2 @@ -108,9 +109,9 @@ dependencies: - numcodecs=0.13.1=py310h5eaa309_0 - numpy=1.26.4=py310hb13e2d6_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.5.3=h26f9b46_1 + - openssl=3.5.4=h26f9b46_0 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py310h0158d43_0 + - pandas=2.3.3=py310h0158d43_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py310hebfe307_1 - pip=25.2=pyh8b19718_0 @@ -118,10 +119,10 @@ dependencies: - psutil=7.1.0=py310h7c4b9e2_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py310hbcd0ec0_0 - pydiso=0.1.2=py310h69a6472_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 @@ -150,7 +151,7 @@ dependencies: - tqdm=4.67.1=pyhd8ed1ab_1 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - unicodedata2=16.0.0=py310h7c4b9e2_1 @@ -169,7 +170,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 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 f7c4a3d7..c02f3440 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: 5d32a80f683c1f03364fd44236d6f2efed5bd5e8bbbc5be14bddc05eb96610ee +# input_hash: 0e4eae48731ca9e26a194a0b731d4cbb5666ce7bac7a5003b542681283abdc39 channels: - conda-forge @@ -12,7 +12,7 @@ dependencies: - annotated-types=0.7.0=pyhd8ed1ab_1 - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=25.1.0=py310h29418f3_0 + - argon2-cffi-bindings=25.1.0=py310h29418f3_1 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.11=py310h5588dad_1 @@ -28,10 +28,10 @@ dependencies: - brotli-bin=1.1.0=hfd05255_4 - brotli-python=1.1.0=py310h73ae2b4_4 - bzip2=1.0.8=h0ad9c76_8 - - ca-certificates=2025.8.3=h4c7d964_0 + - ca-certificates=2025.10.5=h4c7d964_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py310h29418f3_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - click=8.3.0=pyh7428d3b_0 @@ -55,7 +55,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.1=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py310hdb0e946_0 + - fonttools=4.60.1=py310hdb0e946_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.14.1=h57928b3_0 - fsspec=2025.9.0=pyhd8ed1ab_0 @@ -80,7 +80,7 @@ dependencies: - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - - isort=6.0.1=pyhd8ed1ab_1 + - isort=6.1.0=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 @@ -121,8 +121,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.1.0=h1383e82_5 - - libgomp=15.1.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_5 + - libgomp=15.2.0=h1383e82_5 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -141,7 +141,7 @@ dependencies: - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.8=hfa2b4ca_2 + - llvm-openmp=21.1.2=hfa2b4ca_3 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py310hdb0e946_0 @@ -168,11 +168,11 @@ dependencies: - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.5.3=h725018a_1 + - openssl=3.5.4=h725018a_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py310hed136d8_0 - - pandoc=3.8=h57928b3_0 + - pandas=2.3.3=py310hed136d8_1 + - pandoc=3.8.2=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.5=pyhcf101f3_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -187,14 +187,14 @@ dependencies: - pthread-stubs=0.4=h0e40799_1002 - pure_eval=0.2.3=pyhd8ed1ab_1 - pybtex=0.25.1=pyhd8ed1ab_0 - - pybtex-docutils=1.0.3=py310h5588dad_2 + - pybtex-docutils=1.0.3=py310h5588dad_3 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py310hed05c55_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py310h8f92c26_0 - pygments=2.19.2=pyhd8ed1ab_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 @@ -209,7 +209,7 @@ dependencies: - python_abi=3.10=8_cp310 - pytz=2025.2=pyhd8ed1ab_0 - pywin32=311=py310h282bd7d_1 - - pywinpty=2.0.15=py310h9e98ed7_0 + - pywinpty=2.0.15=py310h9e98ed7_1 - pyyaml=6.0.3=py310hdb0e946_0 - pyzmq=27.1.0=py310h535538e_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 @@ -264,7 +264,7 @@ dependencies: - trimesh=4.1.8=pyhd8ed1ab_0 - types-python-dateutil=2.9.0.20250822=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025b=h78e105d_0 @@ -298,7 +298,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 4568cbc6..e756612a 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: 5d32a80f683c1f03364fd44236d6f2efed5bd5e8bbbc5be14bddc05eb96610ee +# input_hash: 0e4eae48731ca9e26a194a0b731d4cbb5666ce7bac7a5003b542681283abdc39 channels: - conda-forge @@ -15,10 +15,10 @@ dependencies: - brotli-bin=1.1.0=hfd05255_4 - brotli-python=1.1.0=py310h73ae2b4_4 - bzip2=1.0.8=h0ad9c76_8 - - ca-certificates=2025.8.3=h4c7d964_0 + - ca-certificates=2025.10.5=h4c7d964_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py310h29418f3_0 - click=8.3.0=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 @@ -31,7 +31,7 @@ dependencies: - discretize=0.11.3=py310h3e8ed56_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py310hdb0e946_0 + - fonttools=4.60.1=py310hdb0e946_0 - freetype=2.14.1=h57928b3_0 - fsspec=2025.9.0=pyhd8ed1ab_0 - geoana=0.7.2=py310h3e8ed56_0 @@ -42,7 +42,8 @@ dependencies: - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he0c23c2_0 - importlib-metadata=8.7.0=pyhe01879c_1 - - isort=6.0.1=pyhd8ed1ab_1 + - importlib_metadata=8.7.0=h40b2b14_1 + - isort=6.1.0=pyhd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - kiwisolver=1.4.9=py310h1e1005b_1 @@ -62,8 +63,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.1.0=h1383e82_5 - - libgomp=15.1.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_5 + - libgomp=15.2.0=h1383e82_5 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -80,7 +81,7 @@ dependencies: - libxml2=2.15.0=ha29bfb0_1 - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.8=hfa2b4ca_2 + - llvm-openmp=21.1.2=hfa2b4ca_3 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py310hdb0e946_0 - matplotlib-base=3.8.4=py310hadb10a8_2 @@ -92,9 +93,9 @@ dependencies: - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.5.3=h725018a_1 + - openssl=3.5.4=h725018a_0 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py310hed136d8_0 + - pandas=2.3.3=py310hed136d8_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py310h3e38d90_1 - pip=25.2=pyh8b19718_0 @@ -102,10 +103,10 @@ dependencies: - psutil=7.1.0=py310h29418f3_0 - pthread-stubs=0.4=h0e40799_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py310hed05c55_0 - pydiso=0.1.2=py310h8f92c26_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 @@ -133,7 +134,7 @@ dependencies: - tqdm=4.67.1=pyhd8ed1ab_1 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - ucrt=10.0.26100.0=h57928b3_0 @@ -157,7 +158,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 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 fe608477..d79cd7ad 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: 1af1d176267655c55d85f45ce8f6631d705e027c4ba0981011e099ce2fe30e8c +# input_hash: c3c882ab7106f1ac6d6821bf96f16035a0c501482813360bc7738edf05725ab9 channels: - conda-forge @@ -12,7 +12,7 @@ dependencies: - annotated-types=0.7.0=pyhd8ed1ab_1 - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=25.1.0=py311h49ec1c0_0 + - argon2-cffi-bindings=25.1.0=py311h49ec1c0_1 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.11=py311h38be061_1 @@ -29,10 +29,10 @@ dependencies: - brotli-python=1.1.0=py311h1ddb823_4 - bzip2=1.0.8=hda65f42_8 - c-ares=1.34.5=hb9d3cd8_0 - - ca-certificates=2025.8.3=hbd8a1cb_0 + - ca-certificates=2025.10.5=hbd8a1cb_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py311h5b438cf_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - click=8.3.0=pyh707e725_0 @@ -56,7 +56,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.1=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py311h3778330_0 + - fonttools=4.60.1=py311h3778330_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.14.1=ha770c72_0 - fsspec=2025.9.0=pyhd8ed1ab_0 @@ -82,7 +82,7 @@ dependencies: - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - - isort=6.0.1=pyhd8ed1ab_1 + - isort=6.1.0=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 @@ -110,7 +110,7 @@ dependencies: - lark=1.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - - ld_impl_linux-64=2.44=h1423503_1 + - ld_impl_linux-64=2.44=ha97dd6f_2 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - libblas=3.9.0=36_h5875eb1_mkl @@ -127,10 +127,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.1.0=h767d61c_5 - - libgcc-ng=15.1.0=h69a702a_5 - - libgfortran=15.1.0=h69a702a_5 - - libgfortran5=15.1.0=hcea5267_5 + - libgcc=15.2.0=h767d61c_5 + - libgcc-ng=15.2.0=h69a702a_5 + - libgfortran=15.2.0=h69a702a_5 + - libgfortran5=15.2.0=hcd61629_5 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -144,8 +144,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.1.0=h8f9b012_5 - - libstdcxx-ng=15.1.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_5 + - libstdcxx-ng=15.2.0=h4852527_5 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -155,7 +155,7 @@ dependencies: - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=21.1.0=h4922eb0_0 + - llvm-openmp=21.1.2=h4922eb0_3 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py311h3778330_0 @@ -185,11 +185,11 @@ dependencies: - numcodecs=0.15.1=py311h7db5c69_0 - numpy=1.26.4=py311h64a7726_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.5.3=h26f9b46_1 + - openssl=3.5.4=h26f9b46_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py311hed34c8f_0 - - pandoc=3.8=ha770c72_0 + - pandas=2.3.3=py311hed34c8f_1 + - pandoc=3.8.2=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.5=pyhcf101f3_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -206,14 +206,14 @@ dependencies: - ptyprocess=0.7.0=pyhd8ed1ab_1 - pure_eval=0.2.3=pyhd8ed1ab_1 - pybtex=0.25.1=pyhd8ed1ab_0 - - pybtex-docutils=1.0.3=py311h38be061_2 + - pybtex-docutils=1.0.3=py311h38be061_3 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py311hdae7d1d_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py311h19ea254_0 - pygments=2.19.2=pyhd8ed1ab_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 @@ -282,7 +282,7 @@ dependencies: - trimesh=4.1.8=pyhd8ed1ab_0 - types-python-dateutil=2.9.0.20250822=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025b=h78e105d_0 @@ -311,7 +311,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index a203e4f7..50bd2a74 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: 1af1d176267655c55d85f45ce8f6631d705e027c4ba0981011e099ce2fe30e8c +# input_hash: c3c882ab7106f1ac6d6821bf96f16035a0c501482813360bc7738edf05725ab9 channels: - conda-forge @@ -16,10 +16,10 @@ dependencies: - brotli-python=1.1.0=py311h1ddb823_4 - bzip2=1.0.8=hda65f42_8 - c-ares=1.34.5=hb9d3cd8_0 - - ca-certificates=2025.8.3=hbd8a1cb_0 + - ca-certificates=2025.10.5=hbd8a1cb_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py311h5b438cf_0 - click=8.3.0=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 @@ -33,7 +33,7 @@ dependencies: - discretize=0.11.3=py311h5b7b71f_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py311h3778330_0 + - fonttools=4.60.1=py311h3778330_0 - freetype=2.14.1=ha770c72_0 - fsspec=2025.9.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h5b7b71f_0 @@ -44,14 +44,15 @@ dependencies: - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he02047a_0 - importlib-metadata=8.7.0=pyhe01879c_1 - - isort=6.0.1=pyhd8ed1ab_1 + - importlib_metadata=8.7.0=h40b2b14_1 + - isort=6.1.0=pyhd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.4.9=py311h724c32c_1 - krb5=1.21.3=h659f571_0 - lcms2=2.17=h717163a_0 - - ld_impl_linux-64=2.44=h1423503_1 + - ld_impl_linux-64=2.44=ha97dd6f_2 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - libblas=3.9.0=36_h5875eb1_mkl @@ -68,10 +69,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.1.0=h767d61c_5 - - libgcc-ng=15.1.0=h69a702a_5 - - libgfortran=15.1.0=h69a702a_5 - - libgfortran5=15.1.0=hcea5267_5 + - libgcc=15.2.0=h767d61c_5 + - libgcc-ng=15.2.0=h69a702a_5 + - libgfortran=15.2.0=h69a702a_5 + - libgfortran5=15.2.0=hcd61629_5 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -84,8 +85,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.1.0=h8f9b012_5 - - libstdcxx-ng=15.1.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_5 + - libstdcxx-ng=15.2.0=h4852527_5 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -94,7 +95,7 @@ dependencies: - libxml2=2.15.0=h26afc86_1 - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=21.1.0=h4922eb0_0 + - llvm-openmp=21.1.2=h4922eb0_3 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py311h3778330_0 - matplotlib-base=3.8.4=py311ha4ca890_2 @@ -109,9 +110,9 @@ dependencies: - numcodecs=0.15.1=py311h7db5c69_0 - numpy=1.26.4=py311h64a7726_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.5.3=h26f9b46_1 + - openssl=3.5.4=h26f9b46_0 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py311hed34c8f_0 + - pandas=2.3.3=py311hed34c8f_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py311h82a398c_1 - pip=25.2=pyh8b19718_0 @@ -119,10 +120,10 @@ dependencies: - psutil=7.1.0=py311h49ec1c0_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py311hdae7d1d_0 - pydiso=0.1.2=py311h19ea254_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 @@ -151,7 +152,7 @@ dependencies: - tqdm=4.67.1=pyhd8ed1ab_1 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - unicodedata2=16.0.0=py311h49ec1c0_1 @@ -171,7 +172,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 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 43102866..fb05c013 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: 06c1dfa4251bc51989748bf3e74139553c7b44a0b709b2171b63434f77cb8b8f +# input_hash: 106a2623766605c1a3c6aa7c479d1dd64f6d252df48e62b2a77761f8e247f0c4 channels: - conda-forge @@ -12,7 +12,7 @@ dependencies: - annotated-types=0.7.0=pyhd8ed1ab_1 - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=25.1.0=py311h3485c13_0 + - argon2-cffi-bindings=25.1.0=py311h3485c13_1 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.11=py311h1ea47a8_1 @@ -28,10 +28,10 @@ dependencies: - brotli-bin=1.1.0=hfd05255_4 - brotli-python=1.1.0=py311h3e6a449_4 - bzip2=1.0.8=h0ad9c76_8 - - ca-certificates=2025.8.3=h4c7d964_0 + - ca-certificates=2025.10.5=h4c7d964_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py311h3485c13_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - click=8.3.0=pyh7428d3b_0 @@ -56,7 +56,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.1=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py311h3f79411_0 + - fonttools=4.60.1=py311h3f79411_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.14.1=h57928b3_0 - fsspec=2025.9.0=pyhd8ed1ab_0 @@ -82,7 +82,7 @@ dependencies: - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - - isort=6.0.1=pyhd8ed1ab_1 + - isort=6.1.0=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 @@ -123,8 +123,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.1.0=h1383e82_5 - - libgomp=15.1.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_5 + - libgomp=15.2.0=h1383e82_5 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -143,7 +143,7 @@ dependencies: - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.8=hfa2b4ca_2 + - llvm-openmp=21.1.2=hfa2b4ca_3 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py311h3f79411_0 @@ -170,11 +170,11 @@ dependencies: - numcodecs=0.15.1=py311hcf9f919_0 - numpy=1.26.4=py311h0b4df5a_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.5.3=h725018a_1 + - openssl=3.5.4=h725018a_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py311h11fd7f3_0 - - pandoc=3.8=h57928b3_0 + - pandas=2.3.3=py311h11fd7f3_1 + - pandoc=3.8.2=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.5=pyhcf101f3_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -189,14 +189,14 @@ dependencies: - pthread-stubs=0.4=h0e40799_1002 - pure_eval=0.2.3=pyhd8ed1ab_1 - pybtex=0.25.1=pyhd8ed1ab_0 - - pybtex-docutils=1.0.3=py311h1ea47a8_2 + - pybtex-docutils=1.0.3=py311h1ea47a8_3 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py311hc4022dc_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py311h66870c1_0 - pygments=2.19.2=pyhd8ed1ab_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 @@ -211,7 +211,7 @@ dependencies: - python_abi=3.11=8_cp311 - pytz=2025.2=pyhd8ed1ab_0 - pywin32=311=py311hefeebc8_1 - - pywinpty=2.0.15=py311hda3d55a_0 + - pywinpty=2.0.15=py311hda3d55a_1 - pyyaml=6.0.3=py311h3f79411_0 - pyzmq=27.1.0=py311hb77b9c8_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 @@ -266,7 +266,7 @@ dependencies: - trimesh=4.1.8=pyhd8ed1ab_0 - types-python-dateutil=2.9.0.20250822=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025b=h78e105d_0 @@ -301,7 +301,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index a7ae54af..c2de2a78 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: 06c1dfa4251bc51989748bf3e74139553c7b44a0b709b2171b63434f77cb8b8f +# input_hash: 106a2623766605c1a3c6aa7c479d1dd64f6d252df48e62b2a77761f8e247f0c4 channels: - conda-forge @@ -15,10 +15,10 @@ dependencies: - brotli-bin=1.1.0=hfd05255_4 - brotli-python=1.1.0=py311h3e6a449_4 - bzip2=1.0.8=h0ad9c76_8 - - ca-certificates=2025.8.3=h4c7d964_0 + - ca-certificates=2025.10.5=h4c7d964_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py311h3485c13_0 - click=8.3.0=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 @@ -32,7 +32,7 @@ dependencies: - discretize=0.11.3=py311h9b10771_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py311h3f79411_0 + - fonttools=4.60.1=py311h3f79411_0 - freetype=2.14.1=h57928b3_0 - fsspec=2025.9.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h9b10771_0 @@ -43,7 +43,8 @@ dependencies: - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he0c23c2_0 - importlib-metadata=8.7.0=pyhe01879c_1 - - isort=6.0.1=pyhd8ed1ab_1 + - importlib_metadata=8.7.0=h40b2b14_1 + - isort=6.1.0=pyhd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - kiwisolver=1.4.9=py311h275cad7_1 @@ -63,8 +64,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.1.0=h1383e82_5 - - libgomp=15.1.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_5 + - libgomp=15.2.0=h1383e82_5 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -81,7 +82,7 @@ dependencies: - libxml2=2.15.0=ha29bfb0_1 - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.8=hfa2b4ca_2 + - llvm-openmp=21.1.2=hfa2b4ca_3 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py311h3f79411_0 - matplotlib-base=3.8.4=py311h9b31f6e_2 @@ -93,9 +94,9 @@ dependencies: - numcodecs=0.15.1=py311hcf9f919_0 - numpy=1.26.4=py311h0b4df5a_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.5.3=h725018a_1 + - openssl=3.5.4=h725018a_0 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py311h11fd7f3_0 + - pandas=2.3.3=py311h11fd7f3_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py311h5592be9_1 - pip=25.2=pyh8b19718_0 @@ -103,10 +104,10 @@ dependencies: - psutil=7.1.0=py311h3485c13_0 - pthread-stubs=0.4=h0e40799_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py311hc4022dc_0 - pydiso=0.1.2=py311h66870c1_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 @@ -134,7 +135,7 @@ dependencies: - tqdm=4.67.1=pyhd8ed1ab_1 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - ucrt=10.0.26100.0=h57928b3_0 @@ -159,7 +160,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 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 cc6a7a61..6c7b065a 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: cb9546b38f57d3e804993094458c11132e417e6b0985a5e006afbb49acca414e +# input_hash: 81aedccfb6112401b5a94619d03cb65bd3c0a1242f995c2c22516fc86dbbaec5 channels: - conda-forge @@ -13,7 +13,7 @@ dependencies: - annotated-types=0.7.0=pyhd8ed1ab_1 - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=25.1.0=py312h4c3975b_0 + - argon2-cffi-bindings=25.1.0=py312h4c3975b_1 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.11=py312h7900ff3_1 @@ -30,10 +30,10 @@ dependencies: - brotli-python=1.1.0=py312h1289d80_4 - bzip2=1.0.8=hda65f42_8 - c-ares=1.34.5=hb9d3cd8_0 - - ca-certificates=2025.8.3=hbd8a1cb_0 + - ca-certificates=2025.10.5=hbd8a1cb_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py312h35888ee_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - click=8.3.0=pyh707e725_0 @@ -58,7 +58,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.1=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py312h8a5da7c_0 + - fonttools=4.60.1=py312h8a5da7c_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.14.1=ha770c72_0 - fsspec=2025.9.0=pyhd8ed1ab_0 @@ -84,7 +84,7 @@ dependencies: - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - - isort=6.0.1=pyhd8ed1ab_1 + - isort=6.1.0=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 @@ -112,7 +112,7 @@ dependencies: - lark=1.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - - ld_impl_linux-64=2.44=h1423503_1 + - ld_impl_linux-64=2.44=ha97dd6f_2 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - libblas=3.9.0=36_h5875eb1_mkl @@ -129,10 +129,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.1.0=h767d61c_5 - - libgcc-ng=15.1.0=h69a702a_5 - - libgfortran=15.1.0=h69a702a_5 - - libgfortran5=15.1.0=hcea5267_5 + - libgcc=15.2.0=h767d61c_5 + - libgcc-ng=15.2.0=h69a702a_5 + - libgfortran=15.2.0=h69a702a_5 + - libgfortran5=15.2.0=hcd61629_5 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -146,8 +146,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.1.0=h8f9b012_5 - - libstdcxx-ng=15.1.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_5 + - libstdcxx-ng=15.2.0=h4852527_5 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -157,7 +157,7 @@ dependencies: - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=21.1.0=h4922eb0_0 + - llvm-openmp=21.1.2=h4922eb0_3 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h8a5da7c_0 @@ -187,11 +187,11 @@ dependencies: - numcodecs=0.15.1=py312hf9745cd_0 - numpy=1.26.4=py312heda63a1_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.5.3=h26f9b46_1 + - openssl=3.5.4=h26f9b46_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py312hf79963d_0 - - pandoc=3.8=ha770c72_0 + - pandas=2.3.3=py312hf79963d_1 + - pandoc=3.8.2=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.5=pyhcf101f3_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -208,14 +208,14 @@ dependencies: - ptyprocess=0.7.0=pyhd8ed1ab_1 - pure_eval=0.2.3=pyhd8ed1ab_1 - pybtex=0.25.1=pyhd8ed1ab_0 - - pybtex-docutils=1.0.3=py312h7900ff3_2 + - pybtex-docutils=1.0.3=py312h7900ff3_3 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py312h680f630_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py312h772f2df_0 - pygments=2.19.2=pyhd8ed1ab_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 @@ -285,7 +285,7 @@ dependencies: - trimesh=4.1.8=pyhd8ed1ab_0 - types-python-dateutil=2.9.0.20250822=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025b=h78e105d_0 @@ -314,7 +314,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 93793d56..8d760a08 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: cb9546b38f57d3e804993094458c11132e417e6b0985a5e006afbb49acca414e +# input_hash: 81aedccfb6112401b5a94619d03cb65bd3c0a1242f995c2c22516fc86dbbaec5 channels: - conda-forge @@ -16,10 +16,10 @@ dependencies: - brotli-python=1.1.0=py312h1289d80_4 - bzip2=1.0.8=hda65f42_8 - c-ares=1.34.5=hb9d3cd8_0 - - ca-certificates=2025.8.3=hbd8a1cb_0 + - ca-certificates=2025.10.5=hbd8a1cb_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py312h35888ee_0 - click=8.3.0=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 @@ -33,7 +33,7 @@ dependencies: - discretize=0.11.3=py312hc39e661_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py312h8a5da7c_0 + - fonttools=4.60.1=py312h8a5da7c_0 - freetype=2.14.1=ha770c72_0 - fsspec=2025.9.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hc39e661_0 @@ -44,14 +44,15 @@ dependencies: - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he02047a_0 - importlib-metadata=8.7.0=pyhe01879c_1 - - isort=6.0.1=pyhd8ed1ab_1 + - importlib_metadata=8.7.0=h40b2b14_1 + - isort=6.1.0=pyhd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.4.9=py312h0a2e395_1 - krb5=1.21.3=h659f571_0 - lcms2=2.17=h717163a_0 - - ld_impl_linux-64=2.44=h1423503_1 + - ld_impl_linux-64=2.44=ha97dd6f_2 - lerc=4.0.0=h0aef613_1 - libaec=1.1.4=h3f801dc_0 - libblas=3.9.0=36_h5875eb1_mkl @@ -68,10 +69,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.1.0=h767d61c_5 - - libgcc-ng=15.1.0=h69a702a_5 - - libgfortran=15.1.0=h69a702a_5 - - libgfortran5=15.1.0=hcea5267_5 + - libgcc=15.2.0=h767d61c_5 + - libgcc-ng=15.2.0=h69a702a_5 + - libgfortran=15.2.0=h69a702a_5 + - libgfortran5=15.2.0=hcd61629_5 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -84,8 +85,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.1.0=h8f9b012_5 - - libstdcxx-ng=15.1.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_5 + - libstdcxx-ng=15.2.0=h4852527_5 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -94,7 +95,7 @@ dependencies: - libxml2=2.15.0=h26afc86_1 - libxml2-16=2.15.0=ha9997c6_1 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=21.1.0=h4922eb0_0 + - llvm-openmp=21.1.2=h4922eb0_3 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h8a5da7c_0 - matplotlib-base=3.8.4=py312h20ab3a6_2 @@ -109,9 +110,9 @@ dependencies: - numcodecs=0.15.1=py312hf9745cd_0 - numpy=1.26.4=py312heda63a1_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.5.3=h26f9b46_1 + - openssl=3.5.4=h26f9b46_0 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py312hf79963d_0 + - pandas=2.3.3=py312hf79963d_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py312h287a98d_1 - pip=25.2=pyh8b19718_0 @@ -119,10 +120,10 @@ dependencies: - psutil=7.1.0=py312h4c3975b_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py312h680f630_0 - pydiso=0.1.2=py312h772f2df_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 @@ -151,7 +152,7 @@ dependencies: - tqdm=4.67.1=pyhd8ed1ab_1 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - unicodedata2=16.0.0=py312h4c3975b_1 @@ -171,7 +172,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 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 97264abf..e01c1e12 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: df0a3f0d6a2c3c84822a96397626a26373bf2eaa93e287e4d2c6f7a39e70f663 +# input_hash: 1184306731b94290082a07ff69198b9bab01231154ed953a92d9f4ce512366a2 channels: - conda-forge @@ -13,7 +13,7 @@ dependencies: - annotated-types=0.7.0=pyhd8ed1ab_1 - anyio=4.11.0=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=25.1.0=py312he06e257_0 + - argon2-cffi-bindings=25.1.0=py312he06e257_1 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.11=py312h2e8e312_1 @@ -29,10 +29,10 @@ dependencies: - brotli-bin=1.1.0=hfd05255_4 - brotli-python=1.1.0=py312hbb81ca0_4 - bzip2=1.0.8=h0ad9c76_8 - - ca-certificates=2025.8.3=h4c7d964_0 + - ca-certificates=2025.10.5=h4c7d964_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py312he06e257_0 - charset-normalizer=3.4.3=pyhd8ed1ab_0 - click=8.3.0=pyh7428d3b_0 @@ -57,7 +57,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.1=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py312h05f76fc_0 + - fonttools=4.60.1=py312h05f76fc_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.14.1=h57928b3_0 - fsspec=2025.9.0=pyhd8ed1ab_0 @@ -83,7 +83,7 @@ dependencies: - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - - isort=6.0.1=pyhd8ed1ab_1 + - isort=6.1.0=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 @@ -124,8 +124,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.1.0=h1383e82_5 - - libgomp=15.1.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_5 + - libgomp=15.2.0=h1383e82_5 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -144,7 +144,7 @@ dependencies: - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.8=hfa2b4ca_2 + - llvm-openmp=21.1.2=hfa2b4ca_3 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h05f76fc_0 @@ -171,11 +171,11 @@ dependencies: - numcodecs=0.15.1=py312h72972c8_0 - numpy=1.26.4=py312h8753938_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.5.3=h725018a_1 + - openssl=3.5.4=h725018a_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py312hc128f0a_0 - - pandoc=3.8=h57928b3_0 + - pandas=2.3.3=py312hc128f0a_1 + - pandoc=3.8.2=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.5=pyhcf101f3_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -190,14 +190,14 @@ dependencies: - pthread-stubs=0.4=h0e40799_1002 - pure_eval=0.2.3=pyhd8ed1ab_1 - pybtex=0.25.1=pyhd8ed1ab_0 - - pybtex-docutils=1.0.3=py312h2e8e312_2 + - pybtex-docutils=1.0.3=py312h2e8e312_3 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py312h8422cdd_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py312h01acb21_0 - pygments=2.19.2=pyhd8ed1ab_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 @@ -213,7 +213,7 @@ dependencies: - python_abi=3.12=8_cp312 - pytz=2025.2=pyhd8ed1ab_0 - pywin32=311=py312h829343e_1 - - pywinpty=2.0.15=py312h275cf98_0 + - pywinpty=2.0.15=py312h275cf98_1 - pyyaml=6.0.3=py312h05f76fc_0 - pyzmq=27.1.0=py312hbb5da91_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 @@ -268,7 +268,7 @@ dependencies: - trimesh=4.1.8=pyhd8ed1ab_0 - types-python-dateutil=2.9.0.20250822=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025b=h78e105d_0 @@ -303,7 +303,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 8f734ec9..b002e143 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: df0a3f0d6a2c3c84822a96397626a26373bf2eaa93e287e4d2c6f7a39e70f663 +# input_hash: 1184306731b94290082a07ff69198b9bab01231154ed953a92d9f4ce512366a2 channels: - conda-forge @@ -15,10 +15,10 @@ dependencies: - brotli-bin=1.1.0=hfd05255_4 - brotli-python=1.1.0=py312hbb81ca0_4 - bzip2=1.0.8=h0ad9c76_8 - - ca-certificates=2025.8.3=h4c7d964_0 + - ca-certificates=2025.10.5=h4c7d964_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2025.8.3=pyhd8ed1ab_0 + - certifi=2025.10.5=pyhd8ed1ab_0 - cffi=2.0.0=py312he06e257_0 - click=8.3.0=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 @@ -32,7 +32,7 @@ dependencies: - discretize=0.11.3=py312hbaa7e33_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.60.0=py312h05f76fc_0 + - fonttools=4.60.1=py312h05f76fc_0 - freetype=2.14.1=h57928b3_0 - fsspec=2025.9.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hbaa7e33_0 @@ -43,7 +43,8 @@ dependencies: - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he0c23c2_0 - importlib-metadata=8.7.0=pyhe01879c_1 - - isort=6.0.1=pyhd8ed1ab_1 + - importlib_metadata=8.7.0=h40b2b14_1 + - isort=6.1.0=pyhd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - kiwisolver=1.4.9=py312h78d62e6_1 @@ -63,8 +64,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.1.0=h1383e82_5 - - libgomp=15.1.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_5 + - libgomp=15.2.0=h1383e82_5 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -81,7 +82,7 @@ dependencies: - libxml2=2.15.0=ha29bfb0_1 - libxml2-16=2.15.0=h06f855e_1 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.8=hfa2b4ca_2 + - llvm-openmp=21.1.2=hfa2b4ca_3 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h05f76fc_0 - matplotlib-base=3.8.4=py312hfee7060_2 @@ -93,9 +94,9 @@ dependencies: - numcodecs=0.15.1=py312h72972c8_0 - numpy=1.26.4=py312h8753938_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.5.3=h725018a_1 + - openssl=3.5.4=h725018a_0 - packaging=25.0=pyh29332c3_1 - - pandas=2.3.2=py312hc128f0a_0 + - pandas=2.3.3=py312hc128f0a_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py312h381445a_1 - pip=25.2=pyh8b19718_0 @@ -103,10 +104,10 @@ dependencies: - psutil=7.1.0=py312he06e257_0 - pthread-stubs=0.4=h0e40799_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.9=pyh3cfb1c2_0 + - pydantic=2.11.10=pyh3cfb1c2_0 - pydantic-core=2.33.2=py312h8422cdd_0 - pydiso=0.1.2=py312h01acb21_0 - - pylint=3.3.8=pyhe01879c_0 + - pylint=3.3.9=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 @@ -134,7 +135,7 @@ dependencies: - tqdm=4.67.1=pyhd8ed1ab_1 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.1=pyhd8ed1ab_0 + - typing-inspection=0.4.2=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - ucrt=10.0.26100.0=h57928b3_0 @@ -159,7 +160,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 8aedd3df..82dc97d0 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: 5d32a80f683c1f03364fd44236d6f2efed5bd5e8bbbc5be14bddc05eb96610ee - linux-64: 2fbee61177612de9087814534b943c81f23e46c607a507da87dd59a311982edb + win-64: 0e4eae48731ca9e26a194a0b731d4cbb5666ce7bac7a5003b542681283abdc39 + linux-64: c8f7ae0bddeffc0ce95aebb250579b216dcf022feb26f8e2d841be6b05442f87 channels: - url: conda-forge used_env_vars: [] @@ -200,10 +200,10 @@ package: libgcc: '>=14' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-25.1.0-py310h7c4b9e2_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-25.1.0-py310h7c4b9e2_1.conda hash: - md5: 3fd41ccdb9263ad51cf89b05cade6fb7 - sha256: 8abeddb7d7ae1838febc154970d514714542c3701f7de9203b3a81d06c307022 + md5: aa3adecd8dd686ae1c28008b6d976b3f + sha256: c2d11d7cb0c45bfaa2c7b8b636b859aace21d33471f5e97f3d777ae2baa58e53 category: dev optional: true - name: argon2-cffi-bindings @@ -217,10 +217,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-25.1.0-py310h29418f3_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-25.1.0-py310h29418f3_1.conda hash: - md5: b2436a86647323c6f4532ac2acb208e6 - sha256: 4dd3297db509800a84c874c23f32d619303b370cd49f4115355a67f54f5316e0 + md5: 6b18353523ba67db3150c67c08ac72ed + sha256: c47522ae0d1fec30e866c619fbe284d564bc05f939fedd2aab7a9d2788ec2580 category: dev optional: true - name: arrow @@ -662,27 +662,27 @@ package: category: main optional: false - name: ca-certificates - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: linux-64 dependencies: __unix: '' - url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.8.3-hbd8a1cb_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.10.5-hbd8a1cb_0.conda hash: - md5: 74784ee3d225fc3dca89edb635b4e5cc - sha256: 837b795a2bb39b75694ba910c13c15fa4998d4bb2a622c214a6a5174b2ae53d1 + md5: f9e5fbc24009179e8b0409624691758a + sha256: 3b5ad78b8bb61b6cdc0978a6a99f8dfb2cc789a451378d054698441005ecbdb6 category: main optional: false - name: ca-certificates - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: win-64 dependencies: __win: '' - url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.8.3-h4c7d964_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.10.5-h4c7d964_0.conda hash: - md5: c9e0c0f82f6e63323827db462b40ede8 - sha256: 3b82f62baad3fd33827b01b0426e8203a2786c8f452f633740868296bcbe8485 + md5: e54200a1cd1fe33d61c9df8d3b00b743 + sha256: bfb7f9f242f441fdcd80f1199edd2ecf09acea0f2bcef6f07d7cbb1a8131a345 category: main optional: false - name: cached-property @@ -734,27 +734,27 @@ package: category: main optional: false - name: certifi - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.8.3-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.10.5-pyhd8ed1ab_0.conda hash: - md5: 11f59985f49df4620890f3e746ed7102 - sha256: a1ad5b0a2a242f439608f22a538d2175cac4444b7b3f4e2b8c090ac337aaea40 + md5: 257ae203f1d204107ba389607d375ded + sha256: 955bac31be82592093f6bc006e09822cd13daf52b28643c9a6abd38cd5f4a306 category: main optional: false - name: certifi - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.8.3-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.10.5-pyhd8ed1ab_0.conda hash: - md5: 11f59985f49df4620890f3e746ed7102 - sha256: a1ad5b0a2a242f439608f22a538d2175cac4444b7b3f4e2b8c090ac337aaea40 + md5: 257ae203f1d204107ba389607d375ded + sha256: 955bac31be82592093f6bc006e09822cd13daf52b28643c9a6abd38cd5f4a306 category: main optional: false - name: cffi @@ -1412,7 +1412,7 @@ package: category: main optional: false - name: fonttools - version: 4.60.0 + version: 4.60.1 manager: conda platform: linux-64 dependencies: @@ -1423,14 +1423,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* unicodedata2: '>=15.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.60.0-py310h3406613_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.60.1-py310h3406613_0.conda hash: - md5: 3f0e123bda4a6794b7b96dfa98b5db23 - sha256: 179889e74cbb0db999f28b56e0b7ab4faaa75d8651bbc5a75c57e9e036920cff + md5: ac183a1fd0cbebd32a20a2aeaf8dc01d + sha256: dc1576438d88ffa4e97012959ad3fb7cc426e6c7eb213eb73815322a42115704 category: main optional: false - name: fonttools - version: 4.60.0 + version: 4.60.1 manager: conda platform: win-64 dependencies: @@ -1442,10 +1442,10 @@ package: unicodedata2: '>=15.1.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.60.0-py310hdb0e946_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.60.1-py310hdb0e946_0.conda hash: - md5: ea3b8e17b32b860d6070b0a4c2d1f66a - sha256: 8c3fa33cdf46d36b581fcabaa57067ca49848f9d2af64bd69d641283b0278ccc + md5: e8ab7eaefb6b9ea807fbe0b841fda092 + sha256: a51bc5251ed0c173918ab67371a8a9b1345c8f7acabf5e4d4535be35916c02ec category: main optional: false - name: fqdn @@ -1949,8 +1949,8 @@ package: hash: md5: 8a77895fb29728b736a1a6c75906ea1a sha256: 46b11943767eece9df0dc9fba787996e4f22cc4c067f5e264969cfdfcb982c39 - category: dev - optional: true + category: main + optional: false - name: importlib_metadata version: 8.7.0 manager: conda @@ -1961,8 +1961,8 @@ package: hash: md5: 8a77895fb29728b736a1a6c75906ea1a sha256: 46b11943767eece9df0dc9fba787996e4f22cc4c067f5e264969cfdfcb982c39 - category: dev - optional: true + category: main + optional: false - name: iniconfig version: 2.0.0 manager: conda @@ -2172,27 +2172,29 @@ package: category: dev optional: true - name: isort - version: 6.0.1 + version: 6.1.0 manager: conda platform: linux-64 dependencies: - python: '>=3.9,<4.0' - url: https://repo.prefix.dev/conda-forge/noarch/isort-6.0.1-pyhd8ed1ab_1.conda + importlib-metadata: '>=4.6.0' + python: '>=3.10,<4.0' + url: https://repo.prefix.dev/conda-forge/noarch/isort-6.1.0-pyhd8ed1ab_0.conda hash: - md5: c25d1a27b791dab1797832aafd6a3e9a - sha256: e1d0e81e3c3da5d7854f9f57ffb89d8f4505bb64a2f05bb01d78eff24344a105 + md5: 1600dda6f61d2bc551676c2cebeb14e8 + sha256: f93e415768129866c8f6b307bfb354fea17c17c1ecd287b32cb14ae9afc1c517 category: main optional: false - name: isort - version: 6.0.1 + version: 6.1.0 manager: conda platform: win-64 dependencies: - python: '>=3.9,<4.0' - url: https://repo.prefix.dev/conda-forge/noarch/isort-6.0.1-pyhd8ed1ab_1.conda + importlib-metadata: '>=4.6.0' + python: '>=3.10,<4.0' + url: https://repo.prefix.dev/conda-forge/noarch/isort-6.1.0-pyhd8ed1ab_0.conda hash: - md5: c25d1a27b791dab1797832aafd6a3e9a - sha256: e1d0e81e3c3da5d7854f9f57ffb89d8f4505bb64a2f05bb01d78eff24344a105 + md5: 1600dda6f61d2bc551676c2cebeb14e8 + sha256: f93e415768129866c8f6b307bfb354fea17c17c1ecd287b32cb14ae9afc1c517 category: main optional: false - name: jedi @@ -3090,10 +3092,10 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://repo.prefix.dev/conda-forge/linux-64/ld_impl_linux-64-2.44-h1423503_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/ld_impl_linux-64-2.44-ha97dd6f_2.conda hash: - md5: 0be7c6e070c19105f966d3758448d018 - sha256: 1a620f27d79217c1295049ba214c2f80372062fd251b569e9873d4a953d27554 + md5: 14bae321b8127b63cba276bd53fac237 + sha256: 707dfb8d55d7a5c6f95c772d778ef07a7ca85417d9971796f7d3daad0b615de8 category: main optional: false - name: lerc @@ -3510,78 +3512,78 @@ package: category: main optional: false - name: libgcc - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.1.0-h767d61c_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.2.0-h767d61c_5.conda hash: - md5: 264fbfba7fb20acf3b29cde153e345ce - sha256: 0caed73aac3966bfbf5710e06c728a24c6c138605121a3dacb2e03440e8baa6a + md5: 67b79092aee4aa9705e4febdf3b73808 + sha256: cf6c34d2c024f1a28ad48f9a352ffbed5dfd0767be0fae50c4ccaa96f2538116 category: main optional: false - name: libgcc - version: 15.1.0 + version: 15.2.0 manager: conda platform: win-64 dependencies: _openmp_mutex: '>=4.5' libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.1.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.2.0-h1383e82_5.conda hash: - md5: c84381a01ede0e28d632fdbeea2debb2 - sha256: 9b997baa85ba495c04e1b30f097b80420c02dcaca6441c4bf2c6bb4b2c5d2114 + md5: c0c867c4f575668ec8359f259eda54e7 + sha256: 25afac9221b3c6205d6c9dcbac112ae1a6769360b769c46633441bf6263b3af9 category: main optional: false - name: libgcc-ng - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: - libgcc: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.1.0-h69a702a_5.conda + libgcc: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.2.0-h69a702a_5.conda hash: - md5: 069afdf8ea72504e48d23ae1171d951c - sha256: f54bb9c3be12b24be327f4c1afccc2969712e0b091cdfbd1d763fb3e61cda03f + md5: e0b75800b155ea7af9740beb1efa97c4 + sha256: ca3f87dcd3fe1a3f82f52bae1f09f75d29cb399825d636befdb5be91ff624fa9 category: main optional: false - name: libgfortran - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: - libgfortran5: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.1.0-h69a702a_5.conda + libgfortran5: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.2.0-h69a702a_5.conda hash: - md5: 0c91408b3dec0b97e8a3c694845bd63b - sha256: 4c1a526198d0d62441549fdfd668cc8e18e77609da1e545bdcc771dd8dc6a990 + md5: b6683cec57969bc26f813252482d323b + sha256: 8c4310fb4819362e21d1c4808f9e89254646a16bb97df77502e2ab978e5e9149 category: main optional: false - name: libgfortran5 - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.1.0-hcea5267_5.conda + libgcc: '>=15.2.0' + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.2.0-hcd61629_5.conda hash: - md5: fbd4008644add05032b6764807ee2cba - sha256: 9d06adc6d8e8187ddc1cad87525c690bc8202d8cb06c13b76ab2fc80a35ed565 + md5: dd6b1ea02e2e7dc42b06d16d946c7fb1 + sha256: 5ca0123f95c095521222a2378d931a9145eb89cb99aa34e0f496581774821cb0 category: main optional: false - name: libgomp - version: 15.1.0 + version: 15.2.0 manager: conda platform: win-64 dependencies: libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.1.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.2.0-h1383e82_5.conda hash: - md5: eae9a32a85152da8e6928a703a514d35 - sha256: 65fd558d8f3296e364b8ae694932a64642fdd26d8eb4cf7adf08941e449be926 + md5: 473d74a4b0a2522bff840306a3955d1a + sha256: a7577c700e130d3b3474d3a038d441b1b1c85c25cf7cd2852f515083a1fe2b37 category: main optional: false - name: libhwloc @@ -3914,28 +3916,28 @@ package: category: main optional: false - name: libstdcxx - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.1.0-h8f9b012_5.conda + libgcc: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.2.0-h8f9b012_5.conda hash: - md5: 4e02a49aaa9d5190cb630fa43528fbe6 - sha256: 0f5f61cab229b6043541c13538d75ce11bd96fb2db76f94ecf81997b1fde6408 + md5: 5dd6bd4f77a17945d5b6054155836a14 + sha256: 803eb5a488314b5e127f014001279795ad0e9a2a096f4a0c84d20bc543109104 category: main optional: false - name: libstdcxx-ng - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: - libstdcxx: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.1.0-h4852527_5.conda + libstdcxx: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.2.0-h4852527_5.conda hash: - md5: 8bba50c7f4679f08c861b597ad2bda6b - sha256: 7b8cabbf0ab4fe3581ca28fe8ca319f964078578a51dd2ca3f703c1d21ba23ff + md5: ca44d750b5f9add2716ad342be3ad7a3 + sha256: 8a176713fe3bd9c620ec2adf47040fc53cbebacc98c338c3fc1aaa5816764063 category: main optional: false - name: libtiff @@ -4202,29 +4204,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 21.1.0 + version: 21.1.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://repo.prefix.dev/conda-forge/linux-64/llvm-openmp-21.1.0-h4922eb0_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/llvm-openmp-21.1.2-h4922eb0_3.conda hash: - md5: d9965f88b86534360e8fce160efb67f1 - sha256: eb42c041e2913e4a8da3e248e4e690b5500c9b9a7533b4f99e959a22064ac599 + md5: 361a5a5b9c201a56fb418a51f66490c1 + sha256: 2b8d157370cb9202d4970a2353a02517ccf72e81f2d95920570aef934d0508fd category: main optional: false - name: llvm-openmp - version: 20.1.8 + version: 21.1.2 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.8-hfa2b4ca_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/llvm-openmp-21.1.2-hfa2b4ca_3.conda hash: - md5: 2dc2edf349464c8b83a576175fc2ad42 - sha256: 8970b7f9057a1c2c18bfd743c6f5ce73b86197d7724423de4fa3d03911d5874b + md5: 166437478d1ec2f9815180e86a3acebd + sha256: 7fb9351d8b566dac4c3f7f20aaf200edfeb8d123ca98be5abe80e38e13f09ee5 category: main optional: false - name: locket @@ -5093,21 +5095,21 @@ package: category: main optional: false - name: openssl - version: 3.5.3 + version: 3.5.4 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.3-h26f9b46_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.4-h26f9b46_0.conda hash: - md5: 4fc6c4c88da64c0219c0c6c0408cedd4 - sha256: 0572be1b7d3c4f4c288bb8ab1cb6007b5b8b9523985b34b862b5222dea3c45f5 + md5: 14edad12b59ccbfa3910d42c72adc2a0 + sha256: e807f3bad09bdf4075dbb4168619e14b0c0360bacb2e12ef18641a834c8c5549 category: main optional: false - name: openssl - version: 3.5.3 + version: 3.5.4 manager: conda platform: win-64 dependencies: @@ -5115,10 +5117,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.3-h725018a_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.4-h725018a_0.conda hash: - md5: c84884e2c1f899de9a895a1f0b7c9cd8 - sha256: 72dc204b0d59a7262bc77ca0e86cba11cbc6706cb9b4d6656fe7fab9593347c9 + md5: f28ffa510fe055ab518cbd9d6ddfea23 + sha256: 5ddc1e39e2a8b72db2431620ad1124016f3df135f87ebde450d235c212a61994 category: main optional: false - name: overrides @@ -5172,7 +5174,7 @@ package: category: main optional: false - name: pandas - version: 2.3.2 + version: 2.3.3 manager: conda platform: linux-64 dependencies: @@ -5185,14 +5187,14 @@ package: python-tzdata: '>=2022.7' python_abi: 3.10.* pytz: '>=2020.1' - url: https://repo.prefix.dev/conda-forge/linux-64/pandas-2.3.2-py310h0158d43_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pandas-2.3.3-py310h0158d43_1.conda hash: - md5: 9ea916bfa386a33807654b2ea336b958 - sha256: e20df771091f99b3d017e0dd86cd8b82a3c2580b608a95defc1ac2e503778f9d + md5: 8bae331f955bac51bacbfb94ad81b7e5 + sha256: cc0935188e132ff9bee7cbed0f81164735ae407d80f4b9cae85b6de2df13e88e category: main optional: false - name: pandas - version: 2.3.2 + version: 2.3.3 manager: conda platform: win-64 dependencies: @@ -5205,32 +5207,32 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/pandas-2.3.2-py310hed136d8_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pandas-2.3.3-py310hed136d8_1.conda hash: - md5: 927ed22167ca78a54b49fb30bb42fa35 - sha256: c75d6da34cb2145d874b440eafd4b1c29d13c50d2355fa7fdd2382ad7ccddfb8 + md5: 044dd35ee11c344a6471fffca2c857ce + sha256: cc50c3c8921a86e79817e1f206440fba207ffc3ca912685a8ef14484eb7ece62 category: main optional: false - name: pandoc - version: '3.8' + version: 3.8.2 manager: conda platform: linux-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/linux-64/pandoc-3.8-ha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pandoc-3.8.2-ha770c72_0.conda hash: - md5: 54043da44c7f3ede07619d68618ac28e - sha256: 350ae6d3a222d8d1b2ccd9d55076f9b11756973ae17710ab0e8eea65bb092e50 + md5: 4c9317a85d1c233f490545392e895118 + sha256: ae3760e865327aaf95df025ccea9ddc1d80ab9f70c5d2478bbfbf324b8eb4e7d category: dev optional: true - name: pandoc - version: '3.8' + version: 3.8.2 manager: conda platform: win-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/win-64/pandoc-3.8-h57928b3_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pandoc-3.8.2-h57928b3_0.conda hash: - md5: 26bdee80bf450ab853cda636486f5cfe - sha256: d720c2358167a5c14f17c222af8b2f59a004c260b67434cb6ec3cf814d652ce0 + md5: 88a11dca037752f036fafb414dd8e0b0 + sha256: ff55de733e42d44f10372f1707e1579bdc56edb6e8b72ab80e6306d9073299b1 category: dev optional: true - name: pandocfilters @@ -5656,10 +5658,10 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* setuptools: '' - url: https://repo.prefix.dev/conda-forge/linux-64/pybtex-docutils-1.0.3-py310hff52083_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pybtex-docutils-1.0.3-py310hff52083_3.conda hash: - md5: e9a2e0883b856ff34cea07ff02f702d3 - sha256: c19926680a369df0a45f61bb1762e3e722afc9e28b7f50a4dc053435a322dbdc + md5: 22e1730cafba181ebf5b719a90a02485 + sha256: e1aa05e27940046ea391401469332b4908922415e703be2d3d871b8b5e127509 category: dev optional: true - name: pybtex-docutils @@ -5672,10 +5674,10 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* setuptools: '' - url: https://repo.prefix.dev/conda-forge/win-64/pybtex-docutils-1.0.3-py310h5588dad_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/pybtex-docutils-1.0.3-py310h5588dad_3.conda hash: - md5: 0caf4a3d5cf845e8d693e7f9bc8a7182 - sha256: 1a6a996ff1bfb607f88d71dbbee0df3cfe71ca135f7d42583f0e548b5e55d9d2 + md5: aa1485fb33be39a1036cdc93ee41a412 + sha256: b4c0a016d409328743e98671c2708d86bf54beb52546926a113696518659f41f category: dev optional: true - name: pycparser @@ -5703,7 +5705,7 @@ package: category: main optional: false - name: pydantic - version: 2.11.9 + version: 2.11.10 manager: conda platform: linux-64 dependencies: @@ -5713,14 +5715,14 @@ package: typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.9-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.10-pyh3cfb1c2_0.conda hash: - md5: a6db60d33fe1ad50314a46749267fdfc - sha256: c3ec0c2202d109cdd5cac008bf7a42b67d4aa3c4cc14b4ee3e00a00541eabd88 + md5: 918d9adfc81cb14ab4cced31d22c7711 + sha256: 26779821ba83b896f319837d7c5301cc244dee41b311d2bd57cbd693ed9e43ef category: main optional: false - name: pydantic - version: 2.11.9 + version: 2.11.10 manager: conda platform: win-64 dependencies: @@ -5730,10 +5732,10 @@ package: typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.9-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.10-pyh3cfb1c2_0.conda hash: - md5: a6db60d33fe1ad50314a46749267fdfc - sha256: c3ec0c2202d109cdd5cac008bf7a42b67d4aa3c4cc14b4ee3e00a00541eabd88 + md5: 918d9adfc81cb14ab4cced31d22c7711 + sha256: 26779821ba83b896f319837d7c5301cc244dee41b311d2bd57cbd693ed9e43ef category: main optional: false - name: pydantic-core @@ -5871,7 +5873,7 @@ package: category: dev optional: true - name: pylint - version: 3.3.8 + version: 3.3.9 manager: conda platform: linux-64 dependencies: @@ -5885,14 +5887,14 @@ package: tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' - url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.8-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.9-pyhcf101f3_0.conda hash: - md5: f5ba3b2c52e855b67fc0abedcebc9675 - sha256: 5b19f8113694ff4e4f0d0870cf38357d9e84330ff6c2516127a65764289b6743 + md5: 3d773559e6b319a802a7c831b7f59138 + sha256: aed395678d4fdcec6ae66c22f06a16a92be600751979e75f6fb39f7c60b9ebf7 category: main optional: false - name: pylint - version: 3.3.8 + version: 3.3.9 manager: conda platform: win-64 dependencies: @@ -5902,14 +5904,14 @@ package: isort: '>=4.2.5,<7,!=5.13.0' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2.0' - python: '>=3.9' + python: '>=3.10' tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' - url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.8-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.9-pyhcf101f3_0.conda hash: - md5: f5ba3b2c52e855b67fc0abedcebc9675 - sha256: 5b19f8113694ff4e4f0d0870cf38357d9e84330ff6c2516127a65764289b6743 + md5: 3d773559e6b319a802a7c831b7f59138 + sha256: aed395678d4fdcec6ae66c22f06a16a92be600751979e75f6fb39f7c60b9ebf7 category: main optional: false - name: pymatsolver @@ -6324,10 +6326,10 @@ package: vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' winpty: '' - url: https://repo.prefix.dev/conda-forge/win-64/pywinpty-2.0.15-py310h9e98ed7_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pywinpty-2.0.15-py310h9e98ed7_1.conda hash: - md5: f49c829097b0b3074801911047e4fd70 - sha256: ca5952309c4faa76c617488da87ac8b77dbeb86b4dae7b767211b2ededf98575 + md5: 2d4cae270689fefe4895ee1690b34bd1 + sha256: b6d9fc08bfb275fcf038e77302d6f3d8429972116acf962401ebf043d6179770 category: dev optional: true - name: pyyaml @@ -7862,29 +7864,29 @@ package: category: main optional: false - name: typing-inspection - version: 0.4.1 + version: 0.4.2 manager: conda platform: linux-64 dependencies: - python: '>=3.9' + python: '>=3.10' typing_extensions: '>=4.12.0' - url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhd8ed1ab_0.conda hash: - md5: e0c3cd765dc15751ee2f0b03cd015712 - sha256: 4259a7502aea516c762ca8f3b8291b0d4114e094bdb3baae3171ccc0900e722f + md5: 399701494e731ce73fdd86c185a3d1b4 + sha256: 8aaf69b828c2b94d0784f18f70f11aa032950d304e57e88467120b45c18c24fd category: main optional: false - name: typing-inspection - version: 0.4.1 + version: 0.4.2 manager: conda platform: win-64 dependencies: - python: '>=3.9' + python: '>=3.10' typing_extensions: '>=4.12.0' - url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhd8ed1ab_0.conda hash: - md5: e0c3cd765dc15751ee2f0b03cd015712 - sha256: 4259a7502aea516c762ca8f3b8291b0d4114e094bdb3baae3171ccc0900e722f + md5: 399701494e731ce73fdd86c185a3d1b4 + sha256: 8aaf69b828c2b94d0784f18f70f11aa032950d304e57e88467120b45c18c24fd category: main optional: false - name: typing_extensions @@ -8677,7 +8679,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 + version: 0.23.0.1.post2.dev107+mira.g825b0b73f manager: pip platform: linux-64 dependencies: @@ -8689,16 +8691,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e hash: - sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed + sha256: 825b0b73fcc95b7b2c9629c19ea8861222adad7e source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 + version: 0.23.0.1.post2.dev107+mira.g825b0b73f manager: pip platform: win-64 dependencies: @@ -8710,11 +8712,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e hash: - sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed + sha256: 825b0b73fcc95b7b2c9629c19ea8861222adad7e source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e category: main optional: false diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 80315a60..30a23ce1 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: 06c1dfa4251bc51989748bf3e74139553c7b44a0b709b2171b63434f77cb8b8f - linux-64: 1af1d176267655c55d85f45ce8f6631d705e027c4ba0981011e099ce2fe30e8c + win-64: 106a2623766605c1a3c6aa7c479d1dd64f6d252df48e62b2a77761f8e247f0c4 + linux-64: c3c882ab7106f1ac6d6821bf96f16035a0c501482813360bc7738edf05725ab9 channels: - url: conda-forge used_env_vars: [] @@ -200,10 +200,10 @@ package: libgcc: '>=14' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* - url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-25.1.0-py311h49ec1c0_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-25.1.0-py311h49ec1c0_1.conda hash: - md5: 112c5e2b7fe99e3678bbd64316d38f0c - sha256: d6d2f38ece253492a3e00800b5d4a5c2cc4b2de73b2c0fcc580c218f1cf58de6 + md5: f3d6bb9cae7a99bb6cd6fdaa09fe394d + sha256: cc71f9a48c41563ec4b433f41c34183a35deff698f4d014ba51796cc5435ec99 category: dev optional: true - name: argon2-cffi-bindings @@ -217,10 +217,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-25.1.0-py311h3485c13_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-25.1.0-py311h3485c13_1.conda hash: - md5: fdb37c9bd914e2a2c20f204f9cb15e6b - sha256: 4bde4487abbca4c8834a582928a80692a32ebba67e906ce676e931035a13d004 + md5: 9295e9a649a303b7400665be86d62db1 + sha256: 6044852adc072b3b9ce1fa87bc44719b467eb5a70b2d7214ed56135eed29a897 category: dev optional: true - name: arrow @@ -660,27 +660,27 @@ package: category: main optional: false - name: ca-certificates - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: linux-64 dependencies: __unix: '' - url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.8.3-hbd8a1cb_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.10.5-hbd8a1cb_0.conda hash: - md5: 74784ee3d225fc3dca89edb635b4e5cc - sha256: 837b795a2bb39b75694ba910c13c15fa4998d4bb2a622c214a6a5174b2ae53d1 + md5: f9e5fbc24009179e8b0409624691758a + sha256: 3b5ad78b8bb61b6cdc0978a6a99f8dfb2cc789a451378d054698441005ecbdb6 category: main optional: false - name: ca-certificates - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: win-64 dependencies: __win: '' - url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.8.3-h4c7d964_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.10.5-h4c7d964_0.conda hash: - md5: c9e0c0f82f6e63323827db462b40ede8 - sha256: 3b82f62baad3fd33827b01b0426e8203a2786c8f452f633740868296bcbe8485 + md5: e54200a1cd1fe33d61c9df8d3b00b743 + sha256: bfb7f9f242f441fdcd80f1199edd2ecf09acea0f2bcef6f07d7cbb1a8131a345 category: main optional: false - name: cached-property @@ -732,27 +732,27 @@ package: category: main optional: false - name: certifi - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.8.3-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.10.5-pyhd8ed1ab_0.conda hash: - md5: 11f59985f49df4620890f3e746ed7102 - sha256: a1ad5b0a2a242f439608f22a538d2175cac4444b7b3f4e2b8c090ac337aaea40 + md5: 257ae203f1d204107ba389607d375ded + sha256: 955bac31be82592093f6bc006e09822cd13daf52b28643c9a6abd38cd5f4a306 category: main optional: false - name: certifi - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.8.3-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.10.5-pyhd8ed1ab_0.conda hash: - md5: 11f59985f49df4620890f3e746ed7102 - sha256: a1ad5b0a2a242f439608f22a538d2175cac4444b7b3f4e2b8c090ac337aaea40 + md5: 257ae203f1d204107ba389607d375ded + sha256: 955bac31be82592093f6bc006e09822cd13daf52b28643c9a6abd38cd5f4a306 category: main optional: false - name: cffi @@ -1436,7 +1436,7 @@ package: category: main optional: false - name: fonttools - version: 4.60.0 + version: 4.60.1 manager: conda platform: linux-64 dependencies: @@ -1447,14 +1447,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* unicodedata2: '>=15.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.60.0-py311h3778330_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.60.1-py311h3778330_0.conda hash: - md5: 92d090806dcf5e5c5f2f3cfacf1d6aa3 - sha256: 031d9205093b4686eaf515adf4847ea798a3ec5ab51f9ee92dfee88485e1bca2 + md5: 91f834f85ac92978cfc3c1c178573e85 + sha256: 1c4e796c337faaeb0606bd6291e53e31848921ac78f295f2b671a2dc09f816cb category: main optional: false - name: fonttools - version: 4.60.0 + version: 4.60.1 manager: conda platform: win-64 dependencies: @@ -1466,10 +1466,10 @@ package: unicodedata2: '>=15.1.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.60.0-py311h3f79411_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.60.1-py311h3f79411_0.conda hash: - md5: 651a6bad4727f609687e18fe2635962d - sha256: d70fb060458061c7d3fa6791019ef3c07488e8dc8ba46aa6ce49d59a8b79a229 + md5: 00f530a3767510908b89b6c0f2698479 + sha256: 8df7f80edb40e6a610683ef33b4dac1e534501e3189ba69032dc547d027c1202 category: main optional: false - name: fqdn @@ -1973,8 +1973,8 @@ package: hash: md5: 8a77895fb29728b736a1a6c75906ea1a sha256: 46b11943767eece9df0dc9fba787996e4f22cc4c067f5e264969cfdfcb982c39 - category: dev - optional: true + category: main + optional: false - name: importlib_metadata version: 8.7.0 manager: conda @@ -1985,8 +1985,8 @@ package: hash: md5: 8a77895fb29728b736a1a6c75906ea1a sha256: 46b11943767eece9df0dc9fba787996e4f22cc4c067f5e264969cfdfcb982c39 - category: dev - optional: true + category: main + optional: false - name: iniconfig version: 2.0.0 manager: conda @@ -2224,27 +2224,29 @@ package: category: dev optional: true - name: isort - version: 6.0.1 + version: 6.1.0 manager: conda platform: linux-64 dependencies: - python: '>=3.9,<4.0' - url: https://repo.prefix.dev/conda-forge/noarch/isort-6.0.1-pyhd8ed1ab_1.conda + importlib-metadata: '>=4.6.0' + python: '>=3.10,<4.0' + url: https://repo.prefix.dev/conda-forge/noarch/isort-6.1.0-pyhd8ed1ab_0.conda hash: - md5: c25d1a27b791dab1797832aafd6a3e9a - sha256: e1d0e81e3c3da5d7854f9f57ffb89d8f4505bb64a2f05bb01d78eff24344a105 + md5: 1600dda6f61d2bc551676c2cebeb14e8 + sha256: f93e415768129866c8f6b307bfb354fea17c17c1ecd287b32cb14ae9afc1c517 category: main optional: false - name: isort - version: 6.0.1 + version: 6.1.0 manager: conda platform: win-64 dependencies: - python: '>=3.9,<4.0' - url: https://repo.prefix.dev/conda-forge/noarch/isort-6.0.1-pyhd8ed1ab_1.conda + importlib-metadata: '>=4.6.0' + python: '>=3.10,<4.0' + url: https://repo.prefix.dev/conda-forge/noarch/isort-6.1.0-pyhd8ed1ab_0.conda hash: - md5: c25d1a27b791dab1797832aafd6a3e9a - sha256: e1d0e81e3c3da5d7854f9f57ffb89d8f4505bb64a2f05bb01d78eff24344a105 + md5: 1600dda6f61d2bc551676c2cebeb14e8 + sha256: f93e415768129866c8f6b307bfb354fea17c17c1ecd287b32cb14ae9afc1c517 category: main optional: false - name: jedi @@ -3142,10 +3144,10 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://repo.prefix.dev/conda-forge/linux-64/ld_impl_linux-64-2.44-h1423503_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/ld_impl_linux-64-2.44-ha97dd6f_2.conda hash: - md5: 0be7c6e070c19105f966d3758448d018 - sha256: 1a620f27d79217c1295049ba214c2f80372062fd251b569e9873d4a953d27554 + md5: 14bae321b8127b63cba276bd53fac237 + sha256: 707dfb8d55d7a5c6f95c772d778ef07a7ca85417d9971796f7d3daad0b615de8 category: main optional: false - name: lerc @@ -3562,78 +3564,78 @@ package: category: main optional: false - name: libgcc - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.1.0-h767d61c_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.2.0-h767d61c_5.conda hash: - md5: 264fbfba7fb20acf3b29cde153e345ce - sha256: 0caed73aac3966bfbf5710e06c728a24c6c138605121a3dacb2e03440e8baa6a + md5: 67b79092aee4aa9705e4febdf3b73808 + sha256: cf6c34d2c024f1a28ad48f9a352ffbed5dfd0767be0fae50c4ccaa96f2538116 category: main optional: false - name: libgcc - version: 15.1.0 + version: 15.2.0 manager: conda platform: win-64 dependencies: _openmp_mutex: '>=4.5' libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.1.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.2.0-h1383e82_5.conda hash: - md5: c84381a01ede0e28d632fdbeea2debb2 - sha256: 9b997baa85ba495c04e1b30f097b80420c02dcaca6441c4bf2c6bb4b2c5d2114 + md5: c0c867c4f575668ec8359f259eda54e7 + sha256: 25afac9221b3c6205d6c9dcbac112ae1a6769360b769c46633441bf6263b3af9 category: main optional: false - name: libgcc-ng - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: - libgcc: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.1.0-h69a702a_5.conda + libgcc: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.2.0-h69a702a_5.conda hash: - md5: 069afdf8ea72504e48d23ae1171d951c - sha256: f54bb9c3be12b24be327f4c1afccc2969712e0b091cdfbd1d763fb3e61cda03f + md5: e0b75800b155ea7af9740beb1efa97c4 + sha256: ca3f87dcd3fe1a3f82f52bae1f09f75d29cb399825d636befdb5be91ff624fa9 category: main optional: false - name: libgfortran - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: - libgfortran5: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.1.0-h69a702a_5.conda + libgfortran5: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.2.0-h69a702a_5.conda hash: - md5: 0c91408b3dec0b97e8a3c694845bd63b - sha256: 4c1a526198d0d62441549fdfd668cc8e18e77609da1e545bdcc771dd8dc6a990 + md5: b6683cec57969bc26f813252482d323b + sha256: 8c4310fb4819362e21d1c4808f9e89254646a16bb97df77502e2ab978e5e9149 category: main optional: false - name: libgfortran5 - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.1.0-hcea5267_5.conda + libgcc: '>=15.2.0' + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.2.0-hcd61629_5.conda hash: - md5: fbd4008644add05032b6764807ee2cba - sha256: 9d06adc6d8e8187ddc1cad87525c690bc8202d8cb06c13b76ab2fc80a35ed565 + md5: dd6b1ea02e2e7dc42b06d16d946c7fb1 + sha256: 5ca0123f95c095521222a2378d931a9145eb89cb99aa34e0f496581774821cb0 category: main optional: false - name: libgomp - version: 15.1.0 + version: 15.2.0 manager: conda platform: win-64 dependencies: libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.1.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.2.0-h1383e82_5.conda hash: - md5: eae9a32a85152da8e6928a703a514d35 - sha256: 65fd558d8f3296e364b8ae694932a64642fdd26d8eb4cf7adf08941e449be926 + md5: 473d74a4b0a2522bff840306a3955d1a + sha256: a7577c700e130d3b3474d3a038d441b1b1c85c25cf7cd2852f515083a1fe2b37 category: main optional: false - name: libhwloc @@ -3966,28 +3968,28 @@ package: category: main optional: false - name: libstdcxx - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.1.0-h8f9b012_5.conda + libgcc: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.2.0-h8f9b012_5.conda hash: - md5: 4e02a49aaa9d5190cb630fa43528fbe6 - sha256: 0f5f61cab229b6043541c13538d75ce11bd96fb2db76f94ecf81997b1fde6408 + md5: 5dd6bd4f77a17945d5b6054155836a14 + sha256: 803eb5a488314b5e127f014001279795ad0e9a2a096f4a0c84d20bc543109104 category: main optional: false - name: libstdcxx-ng - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: - libstdcxx: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.1.0-h4852527_5.conda + libstdcxx: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.2.0-h4852527_5.conda hash: - md5: 8bba50c7f4679f08c861b597ad2bda6b - sha256: 7b8cabbf0ab4fe3581ca28fe8ca319f964078578a51dd2ca3f703c1d21ba23ff + md5: ca44d750b5f9add2716ad342be3ad7a3 + sha256: 8a176713fe3bd9c620ec2adf47040fc53cbebacc98c338c3fc1aaa5816764063 category: main optional: false - name: libtiff @@ -4254,29 +4256,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 21.1.0 + version: 21.1.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://repo.prefix.dev/conda-forge/linux-64/llvm-openmp-21.1.0-h4922eb0_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/llvm-openmp-21.1.2-h4922eb0_3.conda hash: - md5: d9965f88b86534360e8fce160efb67f1 - sha256: eb42c041e2913e4a8da3e248e4e690b5500c9b9a7533b4f99e959a22064ac599 + md5: 361a5a5b9c201a56fb418a51f66490c1 + sha256: 2b8d157370cb9202d4970a2353a02517ccf72e81f2d95920570aef934d0508fd category: main optional: false - name: llvm-openmp - version: 20.1.8 + version: 21.1.2 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.8-hfa2b4ca_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/llvm-openmp-21.1.2-hfa2b4ca_3.conda hash: - md5: 2dc2edf349464c8b83a576175fc2ad42 - sha256: 8970b7f9057a1c2c18bfd743c6f5ce73b86197d7724423de4fa3d03911d5874b + md5: 166437478d1ec2f9815180e86a3acebd + sha256: 7fb9351d8b566dac4c3f7f20aaf200edfeb8d123ca98be5abe80e38e13f09ee5 category: main optional: false - name: locket @@ -5147,21 +5149,21 @@ package: category: main optional: false - name: openssl - version: 3.5.3 + version: 3.5.4 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.3-h26f9b46_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.4-h26f9b46_0.conda hash: - md5: 4fc6c4c88da64c0219c0c6c0408cedd4 - sha256: 0572be1b7d3c4f4c288bb8ab1cb6007b5b8b9523985b34b862b5222dea3c45f5 + md5: 14edad12b59ccbfa3910d42c72adc2a0 + sha256: e807f3bad09bdf4075dbb4168619e14b0c0360bacb2e12ef18641a834c8c5549 category: main optional: false - name: openssl - version: 3.5.3 + version: 3.5.4 manager: conda platform: win-64 dependencies: @@ -5169,10 +5171,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.3-h725018a_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.4-h725018a_0.conda hash: - md5: c84884e2c1f899de9a895a1f0b7c9cd8 - sha256: 72dc204b0d59a7262bc77ca0e86cba11cbc6706cb9b4d6656fe7fab9593347c9 + md5: f28ffa510fe055ab518cbd9d6ddfea23 + sha256: 5ddc1e39e2a8b72db2431620ad1124016f3df135f87ebde450d235c212a61994 category: main optional: false - name: overrides @@ -5226,7 +5228,7 @@ package: category: main optional: false - name: pandas - version: 2.3.2 + version: 2.3.3 manager: conda platform: linux-64 dependencies: @@ -5239,14 +5241,14 @@ package: python-tzdata: '>=2022.7' python_abi: 3.11.* pytz: '>=2020.1' - url: https://repo.prefix.dev/conda-forge/linux-64/pandas-2.3.2-py311hed34c8f_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pandas-2.3.3-py311hed34c8f_1.conda hash: - md5: f98711aba4ad00ea3c286dcea5f57c1f - sha256: ac5372b55c12644ba4bab81270bb294fb70197f86c9b3ede57dfe367ecc6f198 + md5: 72e3452bf0ff08132e86de0272f2fbb0 + sha256: c97f796345f5b9756e4404bbb4ee049afd5ea1762be6ee37ce99162cbee3b1d3 category: main optional: false - name: pandas - version: 2.3.2 + version: 2.3.3 manager: conda platform: win-64 dependencies: @@ -5259,32 +5261,32 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/pandas-2.3.2-py311h11fd7f3_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pandas-2.3.3-py311h11fd7f3_1.conda hash: - md5: 1528d744a31b20442ca7c1f365a28cc2 - sha256: 7eaadbdb9c58274daac8f5659ce448a570ea10e9bfc55c97a72a95a6e9b4d5aa + md5: 638efaab6727c18c6ade0488b72bdfe4 + sha256: da07f88dfd7ee94330f25acd12af2c4974d4cb48030e568a61fbab5c036470b1 category: main optional: false - name: pandoc - version: '3.8' + version: 3.8.2 manager: conda platform: linux-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/linux-64/pandoc-3.8-ha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pandoc-3.8.2-ha770c72_0.conda hash: - md5: 54043da44c7f3ede07619d68618ac28e - sha256: 350ae6d3a222d8d1b2ccd9d55076f9b11756973ae17710ab0e8eea65bb092e50 + md5: 4c9317a85d1c233f490545392e895118 + sha256: ae3760e865327aaf95df025ccea9ddc1d80ab9f70c5d2478bbfbf324b8eb4e7d category: dev optional: true - name: pandoc - version: '3.8' + version: 3.8.2 manager: conda platform: win-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/win-64/pandoc-3.8-h57928b3_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pandoc-3.8.2-h57928b3_0.conda hash: - md5: 26bdee80bf450ab853cda636486f5cfe - sha256: d720c2358167a5c14f17c222af8b2f59a004c260b67434cb6ec3cf814d652ce0 + md5: 88a11dca037752f036fafb414dd8e0b0 + sha256: ff55de733e42d44f10372f1707e1579bdc56edb6e8b72ab80e6306d9073299b1 category: dev optional: true - name: pandocfilters @@ -5710,10 +5712,10 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* setuptools: '' - url: https://repo.prefix.dev/conda-forge/linux-64/pybtex-docutils-1.0.3-py311h38be061_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pybtex-docutils-1.0.3-py311h38be061_3.conda hash: - md5: a092cf434b09ea147245e978999a379d - sha256: f6ce37fc10a1c003f0db95a2bec20f3df09802617815cb848fa379a79c660b76 + md5: c3f40f483b106ac05b01d5482ec6ce5e + sha256: 65def1af82e39c9666cf88a07615ab82c2f41c7aa96525d71b8828ccfb3d5b14 category: dev optional: true - name: pybtex-docutils @@ -5726,10 +5728,10 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* setuptools: '' - url: https://repo.prefix.dev/conda-forge/win-64/pybtex-docutils-1.0.3-py311h1ea47a8_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/pybtex-docutils-1.0.3-py311h1ea47a8_3.conda hash: - md5: 544c4eeebd01975a6d71e3776212623f - sha256: 20ca92d7b6088c217ff65be59d2bfe710402d459b239e23497a04d7bf8a102c4 + md5: 2ec4b5376aeb7a79e07be2864faf45af + sha256: bf212b6aea818cbaf6a97aa1165671c6d5739a70257b6c852e6d1645b1f7aa72 category: dev optional: true - name: pycparser @@ -5757,7 +5759,7 @@ package: category: main optional: false - name: pydantic - version: 2.11.9 + version: 2.11.10 manager: conda platform: linux-64 dependencies: @@ -5767,14 +5769,14 @@ package: typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.9-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.10-pyh3cfb1c2_0.conda hash: - md5: a6db60d33fe1ad50314a46749267fdfc - sha256: c3ec0c2202d109cdd5cac008bf7a42b67d4aa3c4cc14b4ee3e00a00541eabd88 + md5: 918d9adfc81cb14ab4cced31d22c7711 + sha256: 26779821ba83b896f319837d7c5301cc244dee41b311d2bd57cbd693ed9e43ef category: main optional: false - name: pydantic - version: 2.11.9 + version: 2.11.10 manager: conda platform: win-64 dependencies: @@ -5784,10 +5786,10 @@ package: typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.9-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.10-pyh3cfb1c2_0.conda hash: - md5: a6db60d33fe1ad50314a46749267fdfc - sha256: c3ec0c2202d109cdd5cac008bf7a42b67d4aa3c4cc14b4ee3e00a00541eabd88 + md5: 918d9adfc81cb14ab4cced31d22c7711 + sha256: 26779821ba83b896f319837d7c5301cc244dee41b311d2bd57cbd693ed9e43ef category: main optional: false - name: pydantic-core @@ -5925,7 +5927,7 @@ package: category: dev optional: true - name: pylint - version: 3.3.8 + version: 3.3.9 manager: conda platform: linux-64 dependencies: @@ -5935,18 +5937,18 @@ package: isort: '>=4.2.5,<7,!=5.13.0' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2.0' - python: '>=3.9' + python: '>=3.10' tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' - url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.8-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.9-pyhcf101f3_0.conda hash: - md5: f5ba3b2c52e855b67fc0abedcebc9675 - sha256: 5b19f8113694ff4e4f0d0870cf38357d9e84330ff6c2516127a65764289b6743 + md5: 3d773559e6b319a802a7c831b7f59138 + sha256: aed395678d4fdcec6ae66c22f06a16a92be600751979e75f6fb39f7c60b9ebf7 category: main optional: false - name: pylint - version: 3.3.8 + version: 3.3.9 manager: conda platform: win-64 dependencies: @@ -5956,14 +5958,14 @@ package: isort: '>=4.2.5,<7,!=5.13.0' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2.0' - python: '>=3.9' + python: '>=3.10' tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' - url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.8-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.9-pyhcf101f3_0.conda hash: - md5: f5ba3b2c52e855b67fc0abedcebc9675 - sha256: 5b19f8113694ff4e4f0d0870cf38357d9e84330ff6c2516127a65764289b6743 + md5: 3d773559e6b319a802a7c831b7f59138 + sha256: aed395678d4fdcec6ae66c22f06a16a92be600751979e75f6fb39f7c60b9ebf7 category: main optional: false - name: pymatsolver @@ -6378,10 +6380,10 @@ package: vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' winpty: '' - url: https://repo.prefix.dev/conda-forge/win-64/pywinpty-2.0.15-py311hda3d55a_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pywinpty-2.0.15-py311hda3d55a_1.conda hash: - md5: 8a142e0fcd43513c2e876d97ba98c0fa - sha256: fbf3e3f2d5596e755bd4b83b5007fa629b184349781f46e137a4e80b6754c7c0 + md5: e5dd9afed138ff193d4593f1b15a388b + sha256: b1f6b3a907e36f7af486faf3892f47fab42993c13c934cc19855bbae227f2b18 category: dev optional: true - name: pyyaml @@ -7916,29 +7918,29 @@ package: category: main optional: false - name: typing-inspection - version: 0.4.1 + version: 0.4.2 manager: conda platform: linux-64 dependencies: - python: '>=3.9' + python: '>=3.10' typing_extensions: '>=4.12.0' - url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhd8ed1ab_0.conda hash: - md5: e0c3cd765dc15751ee2f0b03cd015712 - sha256: 4259a7502aea516c762ca8f3b8291b0d4114e094bdb3baae3171ccc0900e722f + md5: 399701494e731ce73fdd86c185a3d1b4 + sha256: 8aaf69b828c2b94d0784f18f70f11aa032950d304e57e88467120b45c18c24fd category: main optional: false - name: typing-inspection - version: 0.4.1 + version: 0.4.2 manager: conda platform: win-64 dependencies: - python: '>=3.9' + python: '>=3.10' typing_extensions: '>=4.12.0' - url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhd8ed1ab_0.conda hash: - md5: e0c3cd765dc15751ee2f0b03cd015712 - sha256: 4259a7502aea516c762ca8f3b8291b0d4114e094bdb3baae3171ccc0900e722f + md5: 399701494e731ce73fdd86c185a3d1b4 + sha256: 8aaf69b828c2b94d0784f18f70f11aa032950d304e57e88467120b45c18c24fd category: main optional: false - name: typing_extensions @@ -8762,7 +8764,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 + version: 0.23.0.1.post2.dev107+mira.g825b0b73f manager: pip platform: linux-64 dependencies: @@ -8774,16 +8776,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e hash: - sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed + sha256: 825b0b73fcc95b7b2c9629c19ea8861222adad7e source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 + version: 0.23.0.1.post2.dev107+mira.g825b0b73f manager: pip platform: win-64 dependencies: @@ -8795,11 +8797,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e hash: - sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed + sha256: 825b0b73fcc95b7b2c9629c19ea8861222adad7e source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e category: main optional: false diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index a5be85f9..1033b9d2 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: df0a3f0d6a2c3c84822a96397626a26373bf2eaa93e287e4d2c6f7a39e70f663 - linux-64: cb9546b38f57d3e804993094458c11132e417e6b0985a5e006afbb49acca414e + win-64: 1184306731b94290082a07ff69198b9bab01231154ed953a92d9f4ce512366a2 + linux-64: 81aedccfb6112401b5a94619d03cb65bd3c0a1242f995c2c22516fc86dbbaec5 channels: - url: conda-forge used_env_vars: [] @@ -226,10 +226,10 @@ package: libgcc: '>=14' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-25.1.0-py312h4c3975b_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-25.1.0-py312h4c3975b_1.conda hash: - md5: fdcda5c2e5c6970e9f629c37ec321037 - sha256: d072b579af12d86e239487cea16ec860e2bc2f26edca9f9697a5b3a031735228 + md5: 161fbbd6a2f41743c687ef83ba220ce9 + sha256: 2eeb4a3a81149fec8e94e1454a21042f9eeb63b8f667672afcc63af69fb0bbbf category: dev optional: true - name: argon2-cffi-bindings @@ -243,10 +243,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-25.1.0-py312he06e257_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-25.1.0-py312he06e257_1.conda hash: - md5: 6c1571cfdea59ed345cb391d8a1251dc - sha256: 083e6e558336b9dde39a0bae0a8d99e97afcbdc3649ff0a72e35ccf2ec8f8f92 + md5: 0e4572f4ff505d58454e5a7bc8e7b45d + sha256: 860596eb5dc991cd45e70cc9a32a612cf48c532c2f172cf28d75647f866a32dd category: dev optional: true - name: arrow @@ -686,27 +686,27 @@ package: category: main optional: false - name: ca-certificates - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: linux-64 dependencies: __unix: '' - url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.8.3-hbd8a1cb_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.10.5-hbd8a1cb_0.conda hash: - md5: 74784ee3d225fc3dca89edb635b4e5cc - sha256: 837b795a2bb39b75694ba910c13c15fa4998d4bb2a622c214a6a5174b2ae53d1 + md5: f9e5fbc24009179e8b0409624691758a + sha256: 3b5ad78b8bb61b6cdc0978a6a99f8dfb2cc789a451378d054698441005ecbdb6 category: main optional: false - name: ca-certificates - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: win-64 dependencies: __win: '' - url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.8.3-h4c7d964_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ca-certificates-2025.10.5-h4c7d964_0.conda hash: - md5: c9e0c0f82f6e63323827db462b40ede8 - sha256: 3b82f62baad3fd33827b01b0426e8203a2786c8f452f633740868296bcbe8485 + md5: e54200a1cd1fe33d61c9df8d3b00b743 + sha256: bfb7f9f242f441fdcd80f1199edd2ecf09acea0f2bcef6f07d7cbb1a8131a345 category: main optional: false - name: cached-property @@ -758,27 +758,27 @@ package: category: main optional: false - name: certifi - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.8.3-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.10.5-pyhd8ed1ab_0.conda hash: - md5: 11f59985f49df4620890f3e746ed7102 - sha256: a1ad5b0a2a242f439608f22a538d2175cac4444b7b3f4e2b8c090ac337aaea40 + md5: 257ae203f1d204107ba389607d375ded + sha256: 955bac31be82592093f6bc006e09822cd13daf52b28643c9a6abd38cd5f4a306 category: main optional: false - name: certifi - version: 2025.8.3 + version: 2025.10.5 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.8.3-pyhd8ed1ab_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/certifi-2025.10.5-pyhd8ed1ab_0.conda hash: - md5: 11f59985f49df4620890f3e746ed7102 - sha256: a1ad5b0a2a242f439608f22a538d2175cac4444b7b3f4e2b8c090ac337aaea40 + md5: 257ae203f1d204107ba389607d375ded + sha256: 955bac31be82592093f6bc006e09822cd13daf52b28643c9a6abd38cd5f4a306 category: main optional: false - name: cffi @@ -1475,7 +1475,7 @@ package: category: main optional: false - name: fonttools - version: 4.60.0 + version: 4.60.1 manager: conda platform: linux-64 dependencies: @@ -1486,14 +1486,14 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* unicodedata2: '>=15.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.60.0-py312h8a5da7c_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.60.1-py312h8a5da7c_0.conda hash: - md5: db25d5216c11abf6545782baa2875c80 - sha256: e66bdd1f9846c20f50af2b3f0d8c09f29b6aa982d76dc10b6973449bdbb5f473 + md5: b12bb9cc477156ce84038e0be6d0f763 + sha256: 1be46e58f063c1f563f114df9e78bcb70c4b59760104c5456bbe3b0cb17af9cf category: main optional: false - name: fonttools - version: 4.60.0 + version: 4.60.1 manager: conda platform: win-64 dependencies: @@ -1505,10 +1505,10 @@ package: unicodedata2: '>=15.1.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.60.0-py312h05f76fc_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.60.1-py312h05f76fc_0.conda hash: - md5: 734028fd5e8e7f4238f35e4ece011b3a - sha256: 8ddfc7d964a16af5e5e9d2a45f18ab7baaa00eea974d6ded08fcf3cf5d8f56a1 + md5: f990cc00e7794101abad11b4f2f7b0c7 + sha256: 4902c5818f7852ad8306e5f0706c879b6a496243f9a4e6f9a7d0b833051f005e category: main optional: false - name: fqdn @@ -2012,8 +2012,8 @@ package: hash: md5: 8a77895fb29728b736a1a6c75906ea1a sha256: 46b11943767eece9df0dc9fba787996e4f22cc4c067f5e264969cfdfcb982c39 - category: dev - optional: true + category: main + optional: false - name: importlib_metadata version: 8.7.0 manager: conda @@ -2024,8 +2024,8 @@ package: hash: md5: 8a77895fb29728b736a1a6c75906ea1a sha256: 46b11943767eece9df0dc9fba787996e4f22cc4c067f5e264969cfdfcb982c39 - category: dev - optional: true + category: main + optional: false - name: iniconfig version: 2.0.0 manager: conda @@ -2263,27 +2263,29 @@ package: category: dev optional: true - name: isort - version: 6.0.1 + version: 6.1.0 manager: conda platform: linux-64 dependencies: - python: '>=3.9,<4.0' - url: https://repo.prefix.dev/conda-forge/noarch/isort-6.0.1-pyhd8ed1ab_1.conda + importlib-metadata: '>=4.6.0' + python: '>=3.10,<4.0' + url: https://repo.prefix.dev/conda-forge/noarch/isort-6.1.0-pyhd8ed1ab_0.conda hash: - md5: c25d1a27b791dab1797832aafd6a3e9a - sha256: e1d0e81e3c3da5d7854f9f57ffb89d8f4505bb64a2f05bb01d78eff24344a105 + md5: 1600dda6f61d2bc551676c2cebeb14e8 + sha256: f93e415768129866c8f6b307bfb354fea17c17c1ecd287b32cb14ae9afc1c517 category: main optional: false - name: isort - version: 6.0.1 + version: 6.1.0 manager: conda platform: win-64 dependencies: - python: '>=3.9,<4.0' - url: https://repo.prefix.dev/conda-forge/noarch/isort-6.0.1-pyhd8ed1ab_1.conda + importlib-metadata: '>=4.6.0' + python: '>=3.10,<4.0' + url: https://repo.prefix.dev/conda-forge/noarch/isort-6.1.0-pyhd8ed1ab_0.conda hash: - md5: c25d1a27b791dab1797832aafd6a3e9a - sha256: e1d0e81e3c3da5d7854f9f57ffb89d8f4505bb64a2f05bb01d78eff24344a105 + md5: 1600dda6f61d2bc551676c2cebeb14e8 + sha256: f93e415768129866c8f6b307bfb354fea17c17c1ecd287b32cb14ae9afc1c517 category: main optional: false - name: jedi @@ -3181,10 +3183,10 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://repo.prefix.dev/conda-forge/linux-64/ld_impl_linux-64-2.44-h1423503_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/ld_impl_linux-64-2.44-ha97dd6f_2.conda hash: - md5: 0be7c6e070c19105f966d3758448d018 - sha256: 1a620f27d79217c1295049ba214c2f80372062fd251b569e9873d4a953d27554 + md5: 14bae321b8127b63cba276bd53fac237 + sha256: 707dfb8d55d7a5c6f95c772d778ef07a7ca85417d9971796f7d3daad0b615de8 category: main optional: false - name: lerc @@ -3601,78 +3603,78 @@ package: category: main optional: false - name: libgcc - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.1.0-h767d61c_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.2.0-h767d61c_5.conda hash: - md5: 264fbfba7fb20acf3b29cde153e345ce - sha256: 0caed73aac3966bfbf5710e06c728a24c6c138605121a3dacb2e03440e8baa6a + md5: 67b79092aee4aa9705e4febdf3b73808 + sha256: cf6c34d2c024f1a28ad48f9a352ffbed5dfd0767be0fae50c4ccaa96f2538116 category: main optional: false - name: libgcc - version: 15.1.0 + version: 15.2.0 manager: conda platform: win-64 dependencies: _openmp_mutex: '>=4.5' libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.1.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.2.0-h1383e82_5.conda hash: - md5: c84381a01ede0e28d632fdbeea2debb2 - sha256: 9b997baa85ba495c04e1b30f097b80420c02dcaca6441c4bf2c6bb4b2c5d2114 + md5: c0c867c4f575668ec8359f259eda54e7 + sha256: 25afac9221b3c6205d6c9dcbac112ae1a6769360b769c46633441bf6263b3af9 category: main optional: false - name: libgcc-ng - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: - libgcc: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.1.0-h69a702a_5.conda + libgcc: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.2.0-h69a702a_5.conda hash: - md5: 069afdf8ea72504e48d23ae1171d951c - sha256: f54bb9c3be12b24be327f4c1afccc2969712e0b091cdfbd1d763fb3e61cda03f + md5: e0b75800b155ea7af9740beb1efa97c4 + sha256: ca3f87dcd3fe1a3f82f52bae1f09f75d29cb399825d636befdb5be91ff624fa9 category: main optional: false - name: libgfortran - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: - libgfortran5: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.1.0-h69a702a_5.conda + libgfortran5: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.2.0-h69a702a_5.conda hash: - md5: 0c91408b3dec0b97e8a3c694845bd63b - sha256: 4c1a526198d0d62441549fdfd668cc8e18e77609da1e545bdcc771dd8dc6a990 + md5: b6683cec57969bc26f813252482d323b + sha256: 8c4310fb4819362e21d1c4808f9e89254646a16bb97df77502e2ab978e5e9149 category: main optional: false - name: libgfortran5 - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.1.0-hcea5267_5.conda + libgcc: '>=15.2.0' + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.2.0-hcd61629_5.conda hash: - md5: fbd4008644add05032b6764807ee2cba - sha256: 9d06adc6d8e8187ddc1cad87525c690bc8202d8cb06c13b76ab2fc80a35ed565 + md5: dd6b1ea02e2e7dc42b06d16d946c7fb1 + sha256: 5ca0123f95c095521222a2378d931a9145eb89cb99aa34e0f496581774821cb0 category: main optional: false - name: libgomp - version: 15.1.0 + version: 15.2.0 manager: conda platform: win-64 dependencies: libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.1.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.2.0-h1383e82_5.conda hash: - md5: eae9a32a85152da8e6928a703a514d35 - sha256: 65fd558d8f3296e364b8ae694932a64642fdd26d8eb4cf7adf08941e449be926 + md5: 473d74a4b0a2522bff840306a3955d1a + sha256: a7577c700e130d3b3474d3a038d441b1b1c85c25cf7cd2852f515083a1fe2b37 category: main optional: false - name: libhwloc @@ -4005,28 +4007,28 @@ package: category: main optional: false - name: libstdcxx - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.1.0-h8f9b012_5.conda + libgcc: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.2.0-h8f9b012_5.conda hash: - md5: 4e02a49aaa9d5190cb630fa43528fbe6 - sha256: 0f5f61cab229b6043541c13538d75ce11bd96fb2db76f94ecf81997b1fde6408 + md5: 5dd6bd4f77a17945d5b6054155836a14 + sha256: 803eb5a488314b5e127f014001279795ad0e9a2a096f4a0c84d20bc543109104 category: main optional: false - name: libstdcxx-ng - version: 15.1.0 + version: 15.2.0 manager: conda platform: linux-64 dependencies: - libstdcxx: 15.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.1.0-h4852527_5.conda + libstdcxx: 15.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.2.0-h4852527_5.conda hash: - md5: 8bba50c7f4679f08c861b597ad2bda6b - sha256: 7b8cabbf0ab4fe3581ca28fe8ca319f964078578a51dd2ca3f703c1d21ba23ff + md5: ca44d750b5f9add2716ad342be3ad7a3 + sha256: 8a176713fe3bd9c620ec2adf47040fc53cbebacc98c338c3fc1aaa5816764063 category: main optional: false - name: libtiff @@ -4293,29 +4295,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 21.1.0 + version: 21.1.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://repo.prefix.dev/conda-forge/linux-64/llvm-openmp-21.1.0-h4922eb0_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/llvm-openmp-21.1.2-h4922eb0_3.conda hash: - md5: d9965f88b86534360e8fce160efb67f1 - sha256: eb42c041e2913e4a8da3e248e4e690b5500c9b9a7533b4f99e959a22064ac599 + md5: 361a5a5b9c201a56fb418a51f66490c1 + sha256: 2b8d157370cb9202d4970a2353a02517ccf72e81f2d95920570aef934d0508fd category: main optional: false - name: llvm-openmp - version: 20.1.8 + version: 21.1.2 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.8-hfa2b4ca_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/llvm-openmp-21.1.2-hfa2b4ca_3.conda hash: - md5: 2dc2edf349464c8b83a576175fc2ad42 - sha256: 8970b7f9057a1c2c18bfd743c6f5ce73b86197d7724423de4fa3d03911d5874b + md5: 166437478d1ec2f9815180e86a3acebd + sha256: 7fb9351d8b566dac4c3f7f20aaf200edfeb8d123ca98be5abe80e38e13f09ee5 category: main optional: false - name: locket @@ -5186,21 +5188,21 @@ package: category: main optional: false - name: openssl - version: 3.5.3 + version: 3.5.4 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.3-h26f9b46_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.5.4-h26f9b46_0.conda hash: - md5: 4fc6c4c88da64c0219c0c6c0408cedd4 - sha256: 0572be1b7d3c4f4c288bb8ab1cb6007b5b8b9523985b34b862b5222dea3c45f5 + md5: 14edad12b59ccbfa3910d42c72adc2a0 + sha256: e807f3bad09bdf4075dbb4168619e14b0c0360bacb2e12ef18641a834c8c5549 category: main optional: false - name: openssl - version: 3.5.3 + version: 3.5.4 manager: conda platform: win-64 dependencies: @@ -5208,10 +5210,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.3-h725018a_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.5.4-h725018a_0.conda hash: - md5: c84884e2c1f899de9a895a1f0b7c9cd8 - sha256: 72dc204b0d59a7262bc77ca0e86cba11cbc6706cb9b4d6656fe7fab9593347c9 + md5: f28ffa510fe055ab518cbd9d6ddfea23 + sha256: 5ddc1e39e2a8b72db2431620ad1124016f3df135f87ebde450d235c212a61994 category: main optional: false - name: overrides @@ -5265,7 +5267,7 @@ package: category: main optional: false - name: pandas - version: 2.3.2 + version: 2.3.3 manager: conda platform: linux-64 dependencies: @@ -5278,14 +5280,14 @@ package: python-tzdata: '>=2022.7' python_abi: 3.12.* pytz: '>=2020.1' - url: https://repo.prefix.dev/conda-forge/linux-64/pandas-2.3.2-py312hf79963d_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pandas-2.3.3-py312hf79963d_1.conda hash: - md5: 73ed2394e5a88a403a071355698b48cb - sha256: 1d2bbe7e84460ee68a25687f0312d7a106e97a980e89c491cd5c0ea2d1f9e146 + md5: e597b3e812d9613f659b7d87ad252d18 + sha256: f633d5f9b28e4a8f66a6ec9c89ef1b6743b880b0511330184b4ab9b7e2dda247 category: main optional: false - name: pandas - version: 2.3.2 + version: 2.3.3 manager: conda platform: win-64 dependencies: @@ -5298,32 +5300,32 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/pandas-2.3.2-py312hc128f0a_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pandas-2.3.3-py312hc128f0a_1.conda hash: - md5: 8d15003eebb1f6b913d07172664afb67 - sha256: cb2a3e204e6e1cba20b4409e43b3405fb78713c3d3f7d61e4b52b7356852e391 + md5: 834e92822c8057d3fd682aaf762ea1fa + sha256: 355c8bf100c492f78cd0ca763e08fb0ed7a894f42f4825a6edfec7d78ae0976e category: main optional: false - name: pandoc - version: '3.8' + version: 3.8.2 manager: conda platform: linux-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/linux-64/pandoc-3.8-ha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pandoc-3.8.2-ha770c72_0.conda hash: - md5: 54043da44c7f3ede07619d68618ac28e - sha256: 350ae6d3a222d8d1b2ccd9d55076f9b11756973ae17710ab0e8eea65bb092e50 + md5: 4c9317a85d1c233f490545392e895118 + sha256: ae3760e865327aaf95df025ccea9ddc1d80ab9f70c5d2478bbfbf324b8eb4e7d category: dev optional: true - name: pandoc - version: '3.8' + version: 3.8.2 manager: conda platform: win-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/win-64/pandoc-3.8-h57928b3_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pandoc-3.8.2-h57928b3_0.conda hash: - md5: 26bdee80bf450ab853cda636486f5cfe - sha256: d720c2358167a5c14f17c222af8b2f59a004c260b67434cb6ec3cf814d652ce0 + md5: 88a11dca037752f036fafb414dd8e0b0 + sha256: ff55de733e42d44f10372f1707e1579bdc56edb6e8b72ab80e6306d9073299b1 category: dev optional: true - name: pandocfilters @@ -5749,10 +5751,10 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* setuptools: '' - url: https://repo.prefix.dev/conda-forge/linux-64/pybtex-docutils-1.0.3-py312h7900ff3_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pybtex-docutils-1.0.3-py312h7900ff3_3.conda hash: - md5: 0472f87b9dc0b1db7b501f4d814ba90b - sha256: bf9c8f4c5282d46ce54bd2c6837fa5ff7a1c112382be3d13a7a0ae038d92b7c7 + md5: 97b91618b3c3419d55a76421c9078e07 + sha256: 2397e01959863ed36a9fa70bc7f2e655204d01b575b0809ba224684458460ed3 category: dev optional: true - name: pybtex-docutils @@ -5765,10 +5767,10 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* setuptools: '' - url: https://repo.prefix.dev/conda-forge/win-64/pybtex-docutils-1.0.3-py312h2e8e312_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/pybtex-docutils-1.0.3-py312h2e8e312_3.conda hash: - md5: 3bd0fdb9f643c218de4a0db9d72e734f - sha256: 2118403f158511cd869ac5cfe1d8a4bb50b4a6b7a0f181272909f0e4f60cf91b + md5: 6ac5a13b50c2a563d6adb48f5715d4eb + sha256: 4dd634b9fdb7a1dde8dedf8332f915824cd4f0ae1ccd4dbeec076b7a0e083bcc category: dev optional: true - name: pycparser @@ -5796,7 +5798,7 @@ package: category: main optional: false - name: pydantic - version: 2.11.9 + version: 2.11.10 manager: conda platform: linux-64 dependencies: @@ -5806,14 +5808,14 @@ package: typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.9-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.10-pyh3cfb1c2_0.conda hash: - md5: a6db60d33fe1ad50314a46749267fdfc - sha256: c3ec0c2202d109cdd5cac008bf7a42b67d4aa3c4cc14b4ee3e00a00541eabd88 + md5: 918d9adfc81cb14ab4cced31d22c7711 + sha256: 26779821ba83b896f319837d7c5301cc244dee41b311d2bd57cbd693ed9e43ef category: main optional: false - name: pydantic - version: 2.11.9 + version: 2.11.10 manager: conda platform: win-64 dependencies: @@ -5823,10 +5825,10 @@ package: typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.9-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.11.10-pyh3cfb1c2_0.conda hash: - md5: a6db60d33fe1ad50314a46749267fdfc - sha256: c3ec0c2202d109cdd5cac008bf7a42b67d4aa3c4cc14b4ee3e00a00541eabd88 + md5: 918d9adfc81cb14ab4cced31d22c7711 + sha256: 26779821ba83b896f319837d7c5301cc244dee41b311d2bd57cbd693ed9e43ef category: main optional: false - name: pydantic-core @@ -5964,7 +5966,7 @@ package: category: dev optional: true - name: pylint - version: 3.3.8 + version: 3.3.9 manager: conda platform: linux-64 dependencies: @@ -5974,18 +5976,18 @@ package: isort: '>=4.2.5,<7,!=5.13.0' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2.0' - python: '>=3.9' + python: '>=3.10' tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' - url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.8-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.9-pyhcf101f3_0.conda hash: - md5: f5ba3b2c52e855b67fc0abedcebc9675 - sha256: 5b19f8113694ff4e4f0d0870cf38357d9e84330ff6c2516127a65764289b6743 + md5: 3d773559e6b319a802a7c831b7f59138 + sha256: aed395678d4fdcec6ae66c22f06a16a92be600751979e75f6fb39f7c60b9ebf7 category: main optional: false - name: pylint - version: 3.3.8 + version: 3.3.9 manager: conda platform: win-64 dependencies: @@ -5995,14 +5997,14 @@ package: isort: '>=4.2.5,<7,!=5.13.0' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2.0' - python: '>=3.9' + python: '>=3.10' tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' - url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.8-pyhe01879c_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pylint-3.3.9-pyhcf101f3_0.conda hash: - md5: f5ba3b2c52e855b67fc0abedcebc9675 - sha256: 5b19f8113694ff4e4f0d0870cf38357d9e84330ff6c2516127a65764289b6743 + md5: 3d773559e6b319a802a7c831b7f59138 + sha256: aed395678d4fdcec6ae66c22f06a16a92be600751979e75f6fb39f7c60b9ebf7 category: main optional: false - name: pymatsolver @@ -6443,10 +6445,10 @@ package: vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' winpty: '' - url: https://repo.prefix.dev/conda-forge/win-64/pywinpty-2.0.15-py312h275cf98_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pywinpty-2.0.15-py312h275cf98_1.conda hash: - md5: 1fb4bbe58100be45b37781a367c92fe8 - sha256: 22b901606eda476a19fcc9376a906ef2e16fc6690186bc1d9a213f6c8e93d061 + md5: 66255d136bd0daa41713a334db41d9f0 + sha256: 61cc6c2c712ab4d2b8e7a73d884ef8d3262cb80cc93a4aa074e8b08aa7ddd648 category: dev optional: true - name: pyyaml @@ -7983,29 +7985,29 @@ package: category: main optional: false - name: typing-inspection - version: 0.4.1 + version: 0.4.2 manager: conda platform: linux-64 dependencies: - python: '>=3.9' + python: '>=3.10' typing_extensions: '>=4.12.0' - url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhd8ed1ab_0.conda hash: - md5: e0c3cd765dc15751ee2f0b03cd015712 - sha256: 4259a7502aea516c762ca8f3b8291b0d4114e094bdb3baae3171ccc0900e722f + md5: 399701494e731ce73fdd86c185a3d1b4 + sha256: 8aaf69b828c2b94d0784f18f70f11aa032950d304e57e88467120b45c18c24fd category: main optional: false - name: typing-inspection - version: 0.4.1 + version: 0.4.2 manager: conda platform: win-64 dependencies: - python: '>=3.9' + python: '>=3.10' typing_extensions: '>=4.12.0' - url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhd8ed1ab_0.conda hash: - md5: e0c3cd765dc15751ee2f0b03cd015712 - sha256: 4259a7502aea516c762ca8f3b8291b0d4114e094bdb3baae3171ccc0900e722f + md5: 399701494e731ce73fdd86c185a3d1b4 + sha256: 8aaf69b828c2b94d0784f18f70f11aa032950d304e57e88467120b45c18c24fd category: main optional: false - name: typing_extensions @@ -8829,7 +8831,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 + version: 0.23.0.1.post2.dev107+mira.g825b0b73f manager: pip platform: linux-64 dependencies: @@ -8841,16 +8843,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e hash: - sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed + sha256: 825b0b73fcc95b7b2c9629c19ea8861222adad7e source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e category: main optional: false - name: mira-simpeg - version: 0.23.0.1.post2.dev101+mira.ge7731b8e8 + version: 0.23.0.1.post2.dev107+mira.g825b0b73f manager: pip platform: win-64 dependencies: @@ -8862,11 +8864,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e hash: - sha256: e7731b8e82e1db7a0fb441df0525596652e4e4ed + sha256: 825b0b73fcc95b7b2c9629c19ea8861222adad7e source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@e7731b8e82e1db7a0fb441df0525596652e4e4ed + url: git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index 2a5eaad6..9ffff8fb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -105,7 +105,7 @@ grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "dev geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"} #mira-simpeg = {version = ">=0.23.0.1b1, <0.23.1.dev", source="pypi", allow-prereleases = true, extras = ["dask"]} -mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "GEOPY-2466", extras = ["dask"]} +mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "develop", extras = ["dask"]} ## about pip dependencies # to be specified to work with conda-lock From e3cdfa55cab352d5b6fd78a4b93052bacffa16f1 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Mon, 6 Oct 2025 10:41:17 -0700 Subject: [PATCH 18/22] Fix MVI test looking at wrong iteration --- tests/run_tests/driver_mvi_test.py | 2 +- tests/utils/targets.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index 6fb1a105..b33dc093 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -45,7 +45,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_mvi_run = {"data_norm": 149.10117434016038, "phi_d": 23.9, "phi_m": 0.0079} +target_mvi_run = {"data_norm": 149.10117434016038, "phi_d": 1.95, "phi_m": 0.147} def test_magnetic_vector_fwr_run( diff --git a/tests/utils/targets.py b/tests/utils/targets.py index 79bf537d..e605e6e4 100644 --- a/tests/utils/targets.py +++ b/tests/utils/targets.py @@ -51,7 +51,7 @@ def check_target(output: dict, target: dict, tolerance=0.05): :param tolerance: Tolerance between output and target measured as: |a-b|/b """ print( - f"Output: 'data_norm': {np.linalg.norm(output['data'])}, 'phi_d': {output['phi_d'][1]}, 'phi_m': {output['phi_m'][1]}" + f"Output: 'data_norm': {np.linalg.norm(output['data'])}, 'phi_d': {output['phi_d'][-1]}, 'phi_m': {output['phi_m'][-1]}" ) print(f"Target: {target}") From 4741fbe9d69998bbe431022e4ee12a719cd740bb Mon Sep 17 00:00:00 2001 From: dominiquef Date: Mon, 6 Oct 2025 11:04:04 -0700 Subject: [PATCH 19/22] Fix issue with editing wrong dict --- simpeg_drivers/plate_simulation/sweep/options.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/simpeg_drivers/plate_simulation/sweep/options.py b/simpeg_drivers/plate_simulation/sweep/options.py index 8bc5f509..6e62fffa 100644 --- a/simpeg_drivers/plate_simulation/sweep/options.py +++ b/simpeg_drivers/plate_simulation/sweep/options.py @@ -146,13 +146,17 @@ def all_hashable_options(options: dict) -> dict: ifile = InputFile(ui_json=options, validate=False) exceptions = list(Options.model_fields) + ["version", "icon", "documentation"] # TODO: add these to the Options fields with empty string defaults. - out = {k: v for k, v in ifile.data.items() if k not in exceptions} + out = {} for k, v in ifile.data.items(): + if k in exceptions: + continue + if isinstance(v, SimPEGGroup | UIJsonGroup): - out.pop(k) opts = v.options opts["geoh5"] = options["geoh5"] out.update(SweepOptions.all_hashable_options(opts)) + else: + out[k] = v return out From 8baeaed5b13cadcec885a154ea5b11f55b68e26d Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 7 Oct 2025 08:03:01 -0700 Subject: [PATCH 20/22] Make plate sweep non-optional --- simpeg_drivers-assets/uijson/plate_sweep.ui.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/simpeg_drivers-assets/uijson/plate_sweep.ui.json b/simpeg_drivers-assets/uijson/plate_sweep.ui.json index 1bb5cdd2..822e2988 100644 --- a/simpeg_drivers-assets/uijson/plate_sweep.ui.json +++ b/simpeg_drivers-assets/uijson/plate_sweep.ui.json @@ -32,8 +32,7 @@ "directory" ], "directoryOnly": true, - "optional": true, - "enabled": false, + "enabled": true, "value": "" }, "background_start": { From 389831c53842c74714b2778450752a513db2f3fe Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 7 Oct 2025 09:12:46 -0700 Subject: [PATCH 21/22] Re-lock --- .../py-3.10-linux-64-dev.conda.lock.yml | 18 +-- environments/py-3.10-linux-64.conda.lock.yml | 14 +-- .../py-3.10-win-64-dev.conda.lock.yml | 12 +- environments/py-3.10-win-64.conda.lock.yml | 8 +- .../py-3.11-linux-64-dev.conda.lock.yml | 18 +-- environments/py-3.11-linux-64.conda.lock.yml | 14 +-- .../py-3.11-win-64-dev.conda.lock.yml | 12 +- environments/py-3.11-win-64.conda.lock.yml | 8 +- .../py-3.12-linux-64-dev.conda.lock.yml | 18 +-- environments/py-3.12-linux-64.conda.lock.yml | 14 +-- .../py-3.12-win-64-dev.conda.lock.yml | 12 +- environments/py-3.12-win-64.conda.lock.yml | 8 +- py-3.10.conda-lock.yml | 110 +++++++++--------- py-3.11.conda-lock.yml | 110 +++++++++--------- py-3.12.conda-lock.yml | 110 +++++++++--------- 15 files changed, 243 insertions(+), 243 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 0c9a6797..61169ad6 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -18,7 +18,7 @@ dependencies: - astroid=3.3.11=py310hff52083_1 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.5=pyh29332c3_0 - - attrs=25.3.0=pyh71513ae_0 + - attrs=25.4.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -125,10 +125,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.2.0=h767d61c_5 - - libgcc-ng=15.2.0=h69a702a_5 - - libgfortran=15.2.0=h69a702a_5 - - libgfortran5=15.2.0=hcd61629_5 + - libgcc=15.2.0=h767d61c_6 + - libgcc-ng=15.2.0=h69a702a_6 + - libgfortran=15.2.0=h69a702a_6 + - libgfortran5=15.2.0=hcd61629_6 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -142,8 +142,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.2.0=h8f9b012_5 - - libstdcxx-ng=15.2.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_6 + - libstdcxx-ng=15.2.0=h4852527_6 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -262,7 +262,7 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.43=py310h7c4b9e2_0 + - sqlalchemy=2.0.43=py310h7c4b9e2_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=hb60516a_3 @@ -306,7 +306,7 @@ dependencies: - zstd=1.5.7=hb8e6e7a_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 973cf968..32c9b583 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -68,10 +68,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.2.0=h767d61c_5 - - libgcc-ng=15.2.0=h69a702a_5 - - libgfortran=15.2.0=h69a702a_5 - - libgfortran5=15.2.0=hcd61629_5 + - libgcc=15.2.0=h767d61c_6 + - libgcc-ng=15.2.0=h69a702a_6 + - libgfortran=15.2.0=h69a702a_6 + - libgfortran5=15.2.0=hcd61629_6 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -84,8 +84,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.2.0=h8f9b012_5 - - libstdcxx-ng=15.2.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_6 + - libstdcxx-ng=15.2.0=h4852527_6 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -168,7 +168,7 @@ dependencies: - zstd=1.5.7=hb8e6e7a_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e 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 c02f3440..8e3ad57c 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -18,7 +18,7 @@ dependencies: - astroid=3.3.11=py310h5588dad_1 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.5=pyh29332c3_0 - - attrs=25.3.0=pyh71513ae_0 + - attrs=25.4.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -121,8 +121,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.2.0=h1383e82_5 - - libgomp=15.2.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_6 + - libgomp=15.2.0=h1383e82_6 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -135,7 +135,7 @@ dependencies: - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 - libxcb=1.17.0=h0e4246c_0 - libxml2=2.15.0=ha29bfb0_1 - libxml2-16=2.15.0=h06f855e_1 @@ -246,7 +246,7 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.43=py310h29418f3_0 + - sqlalchemy=2.0.43=py310h29418f3_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=h18a62a1_3 @@ -296,7 +296,7 @@ dependencies: - zstd=1.5.7=hbeecb71_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index e756612a..b80b2a66 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -63,8 +63,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.2.0=h1383e82_5 - - libgomp=15.2.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_6 + - libgomp=15.2.0=h1383e82_6 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -76,7 +76,7 @@ dependencies: - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 - libxcb=1.17.0=h0e4246c_0 - libxml2=2.15.0=ha29bfb0_1 - libxml2-16=2.15.0=h06f855e_1 @@ -156,7 +156,7 @@ dependencies: - zstd=1.5.7=hbeecb71_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e 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 d79cd7ad..957a620f 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -18,7 +18,7 @@ dependencies: - astroid=3.3.11=py311h38be061_1 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.5=pyh29332c3_0 - - attrs=25.3.0=pyh71513ae_0 + - attrs=25.4.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -127,10 +127,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.2.0=h767d61c_5 - - libgcc-ng=15.2.0=h69a702a_5 - - libgfortran=15.2.0=h69a702a_5 - - libgfortran5=15.2.0=hcd61629_5 + - libgcc=15.2.0=h767d61c_6 + - libgcc-ng=15.2.0=h69a702a_6 + - libgfortran=15.2.0=h69a702a_6 + - libgfortran5=15.2.0=hcd61629_6 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -144,8 +144,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.2.0=h8f9b012_5 - - libstdcxx-ng=15.2.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_6 + - libstdcxx-ng=15.2.0=h4852527_6 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -264,7 +264,7 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.43=py311h49ec1c0_0 + - sqlalchemy=2.0.43=py311h49ec1c0_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=hb60516a_3 @@ -309,7 +309,7 @@ dependencies: - zstd=1.5.7=hb8e6e7a_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 50bd2a74..7fe65ea6 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -69,10 +69,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.2.0=h767d61c_5 - - libgcc-ng=15.2.0=h69a702a_5 - - libgfortran=15.2.0=h69a702a_5 - - libgfortran5=15.2.0=hcd61629_5 + - libgcc=15.2.0=h767d61c_6 + - libgcc-ng=15.2.0=h69a702a_6 + - libgfortran=15.2.0=h69a702a_6 + - libgfortran5=15.2.0=hcd61629_6 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -85,8 +85,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.2.0=h8f9b012_5 - - libstdcxx-ng=15.2.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_6 + - libstdcxx-ng=15.2.0=h4852527_6 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -170,7 +170,7 @@ dependencies: - zstd=1.5.7=hb8e6e7a_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e 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 fb05c013..733af0ba 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -18,7 +18,7 @@ dependencies: - astroid=3.3.11=py311h1ea47a8_1 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.5=pyh29332c3_0 - - attrs=25.3.0=pyh71513ae_0 + - attrs=25.4.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -123,8 +123,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.2.0=h1383e82_5 - - libgomp=15.2.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_6 + - libgomp=15.2.0=h1383e82_6 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -137,7 +137,7 @@ dependencies: - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 - libxcb=1.17.0=h0e4246c_0 - libxml2=2.15.0=ha29bfb0_1 - libxml2-16=2.15.0=h06f855e_1 @@ -248,7 +248,7 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.43=py311h3485c13_0 + - sqlalchemy=2.0.43=py311h3485c13_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=h18a62a1_3 @@ -299,7 +299,7 @@ dependencies: - zstd=1.5.7=hbeecb71_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index c2de2a78..a2a0a7d4 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -64,8 +64,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.2.0=h1383e82_5 - - libgomp=15.2.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_6 + - libgomp=15.2.0=h1383e82_6 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -77,7 +77,7 @@ dependencies: - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 - libxcb=1.17.0=h0e4246c_0 - libxml2=2.15.0=ha29bfb0_1 - libxml2-16=2.15.0=h06f855e_1 @@ -158,7 +158,7 @@ dependencies: - zstd=1.5.7=hbeecb71_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e 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 6c7b065a..3ac69597 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -19,7 +19,7 @@ dependencies: - astroid=3.3.11=py312h7900ff3_1 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.5=pyh29332c3_0 - - attrs=25.3.0=pyh71513ae_0 + - attrs=25.4.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -129,10 +129,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.2.0=h767d61c_5 - - libgcc-ng=15.2.0=h69a702a_5 - - libgfortran=15.2.0=h69a702a_5 - - libgfortran5=15.2.0=hcd61629_5 + - libgcc=15.2.0=h767d61c_6 + - libgcc-ng=15.2.0=h69a702a_6 + - libgfortran=15.2.0=h69a702a_6 + - libgfortran5=15.2.0=hcd61629_6 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -146,8 +146,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.2.0=h8f9b012_5 - - libstdcxx-ng=15.2.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_6 + - libstdcxx-ng=15.2.0=h4852527_6 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -267,7 +267,7 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.43=py312h4c3975b_0 + - sqlalchemy=2.0.43=py312h4c3975b_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=hb60516a_3 @@ -312,7 +312,7 @@ dependencies: - zstd=1.5.7=hb8e6e7a_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 8d760a08..e070a783 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -69,10 +69,10 @@ dependencies: - libffi=3.4.6=h2dba641_1 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - - libgcc=15.2.0=h767d61c_5 - - libgcc-ng=15.2.0=h69a702a_5 - - libgfortran=15.2.0=h69a702a_5 - - libgfortran5=15.2.0=hcd61629_5 + - libgcc=15.2.0=h767d61c_6 + - libgcc-ng=15.2.0=h69a702a_6 + - libgfortran=15.2.0=h69a702a_6 + - libgfortran5=15.2.0=hcd61629_6 - libhwloc=2.12.1=default_h7f8ec31_1002 - libiconv=1.18=h3b78370_2 - libjpeg-turbo=3.1.0=hb9d3cd8_0 @@ -85,8 +85,8 @@ dependencies: - libspatialindex=2.0.0=he02047a_0 - libsqlite=3.50.4=h0c1763c_0 - libssh2=1.11.1=hcf80075_0 - - libstdcxx=15.2.0=h8f9b012_5 - - libstdcxx-ng=15.2.0=h4852527_5 + - libstdcxx=15.2.0=h8f9b012_6 + - libstdcxx-ng=15.2.0=h4852527_6 - libtiff=4.7.1=h8261f1e_0 - libuuid=2.41.2=he9a06e4_0 - libwebp-base=1.6.0=hd42ef1d_0 @@ -170,7 +170,7 @@ dependencies: - zstd=1.5.7=hb8e6e7a_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e 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 e01c1e12..c33566e4 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -19,7 +19,7 @@ dependencies: - astroid=3.3.11=py312h2e8e312_1 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.5=pyh29332c3_0 - - attrs=25.3.0=pyh71513ae_0 + - attrs=25.4.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -124,8 +124,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.2.0=h1383e82_5 - - libgomp=15.2.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_6 + - libgomp=15.2.0=h1383e82_6 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -138,7 +138,7 @@ dependencies: - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 - libxcb=1.17.0=h0e4246c_0 - libxml2=2.15.0=ha29bfb0_1 - libxml2-16=2.15.0=h06f855e_1 @@ -250,7 +250,7 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.43=py312he06e257_0 + - sqlalchemy=2.0.43=py312he06e257_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=h18a62a1_3 @@ -301,7 +301,7 @@ dependencies: - zstd=1.5.7=hbeecb71_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index b002e143..2400092f 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -64,8 +64,8 @@ dependencies: - libffi=3.4.6=h537db12_1 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - - libgcc=15.2.0=h1383e82_5 - - libgomp=15.2.0=h1383e82_5 + - libgcc=15.2.0=h1383e82_6 + - libgomp=15.2.0=h1383e82_6 - libhwloc=2.12.1=default_h64bd3f2_1002 - libiconv=1.18=hc1393d2_2 - libjpeg-turbo=3.1.0=h2466b09_0 @@ -77,7 +77,7 @@ dependencies: - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.1=h550210a_0 - libwebp-base=1.6.0=h4d5522a_0 - - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 - libxcb=1.17.0=h0e4246c_0 - libxml2=2.15.0=ha29bfb0_1 - libxml2-16=2.15.0=h06f855e_1 @@ -158,7 +158,7 @@ dependencies: - zstd=1.5.7=hbeecb71_2 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@825b0b73fcc95b7b2c9629c19ea8861222adad7e diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 82dc97d0..83e25a30 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -354,27 +354,27 @@ package: category: dev optional: true - name: attrs - version: 25.3.0 + version: 25.4.0 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.4.0-pyh71513ae_0.conda hash: - md5: a10d11958cadc13fdb43df75f8b1903f - sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 + md5: c7944d55af26b6d2d7629e27e9a972c1 + sha256: f6c3c19fa599a1a856a88db166c318b148cac3ee4851a9905ed8a04eeec79f45 category: dev optional: true - name: attrs - version: 25.3.0 + version: 25.4.0 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.4.0-pyh71513ae_0.conda hash: - md5: a10d11958cadc13fdb43df75f8b1903f - sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 + md5: c7944d55af26b6d2d7629e27e9a972c1 + sha256: f6c3c19fa599a1a856a88db166c318b148cac3ee4851a9905ed8a04eeec79f45 category: dev optional: true - name: babel @@ -3518,10 +3518,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.2.0-h767d61c_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.2.0-h767d61c_6.conda hash: - md5: 67b79092aee4aa9705e4febdf3b73808 - sha256: cf6c34d2c024f1a28ad48f9a352ffbed5dfd0767be0fae50c4ccaa96f2538116 + md5: 99eee6aa5abea12f326f7fc010aef0c8 + sha256: 29c6ce15cf54f89282581d19329c99d1639036c5dde049bf1cae48dcc4137470 category: main optional: false - name: libgcc @@ -3531,10 +3531,10 @@ package: dependencies: _openmp_mutex: '>=4.5' libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.2.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.2.0-h1383e82_6.conda hash: - md5: c0c867c4f575668ec8359f259eda54e7 - sha256: 25afac9221b3c6205d6c9dcbac112ae1a6769360b769c46633441bf6263b3af9 + md5: 15d8f18987161d5a467434a0869cd789 + sha256: f910d04ea9bb4def10870c8c42b1bb55d22897c267eacea15b3cb18c69d8fac2 category: main optional: false - name: libgcc-ng @@ -3543,10 +3543,10 @@ package: platform: linux-64 dependencies: libgcc: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.2.0-h69a702a_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.2.0-h69a702a_6.conda hash: - md5: e0b75800b155ea7af9740beb1efa97c4 - sha256: ca3f87dcd3fe1a3f82f52bae1f09f75d29cb399825d636befdb5be91ff624fa9 + md5: d9717466cca9b9584226ce57a7cd58e6 + sha256: 12c91470ceb8d7d38fcee1a4ff1f50524625349059988f6bd0e8e6b27599a1ad category: main optional: false - name: libgfortran @@ -3555,10 +3555,10 @@ package: platform: linux-64 dependencies: libgfortran5: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.2.0-h69a702a_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.2.0-h69a702a_6.conda hash: - md5: b6683cec57969bc26f813252482d323b - sha256: 8c4310fb4819362e21d1c4808f9e89254646a16bb97df77502e2ab978e5e9149 + md5: c41f84a30601e911a1e7a30f53531a59 + sha256: 37ac19d22718d371b1fd78207eee37bc384c5e7f8880e06187cb817f1124d1e2 category: main optional: false - name: libgfortran5 @@ -3568,10 +3568,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=15.2.0' - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.2.0-hcd61629_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.2.0-hcd61629_6.conda hash: - md5: dd6b1ea02e2e7dc42b06d16d946c7fb1 - sha256: 5ca0123f95c095521222a2378d931a9145eb89cb99aa34e0f496581774821cb0 + md5: 8fc1650fb7c7fca583cc3537a808e21b + sha256: 5046054c10fe5c81433849aa5d569e50ae051c4eac44b3e2a9bb34945eb16fc8 category: main optional: false - name: libgomp @@ -3580,10 +3580,10 @@ package: platform: win-64 dependencies: libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.2.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.2.0-h1383e82_6.conda hash: - md5: 473d74a4b0a2522bff840306a3955d1a - sha256: a7577c700e130d3b3474d3a038d441b1b1c85c25cf7cd2852f515083a1fe2b37 + md5: 5939a1cf8d58da8b11bfc0db95aad396 + sha256: b6e6c2c527b1de0803ae820de9b78246ebcba688c797f77845a67e1125fb2714 category: main optional: false - name: libhwloc @@ -3922,10 +3922,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.2.0-h8f9b012_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.2.0-h8f9b012_6.conda hash: - md5: 5dd6bd4f77a17945d5b6054155836a14 - sha256: 803eb5a488314b5e127f014001279795ad0e9a2a096f4a0c84d20bc543109104 + md5: 9acaf38d72dcddace144f28506d45afa + sha256: fafd1c1320384a664f57e5d75568f214a31fe2201fc8baace6c15d88b8cf89a8 category: main optional: false - name: libstdcxx-ng @@ -3934,10 +3934,10 @@ package: platform: linux-64 dependencies: libstdcxx: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.2.0-h4852527_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.2.0-h4852527_6.conda hash: - md5: ca44d750b5f9add2716ad342be3ad7a3 - sha256: 8a176713fe3bd9c620ec2adf47040fc53cbebacc98c338c3fc1aaa5816764063 + md5: 89611cb5b685d19e6201065720f97561 + sha256: 462fa002d3ab6702045ee330ab45719ac2958a092a4634a955cebc095f564794 category: main optional: false - name: libtiff @@ -4027,10 +4027,10 @@ package: platform: win-64 dependencies: ucrt: '' - url: https://repo.prefix.dev/conda-forge/win-64/libwinpthread-12.0.0.r4.gg4f2fc60ca-h57928b3_9.conda + url: https://repo.prefix.dev/conda-forge/win-64/libwinpthread-12.0.0.r4.gg4f2fc60ca-h57928b3_10.conda hash: - md5: 08bfa5da6e242025304b206d152479ef - sha256: 373f2973b8a358528b22be5e8d84322c165b4c5577d24d94fd67ad1bb0a0f261 + md5: 8a86073cf3b343b87d03f41790d8b4e5 + sha256: 0fccf2d17026255b6e10ace1f191d0a2a18f2d65088fd02430be17c701f8ffe0 category: main optional: false - name: libxcb @@ -7396,10 +7396,10 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* typing-extensions: '>=4.6.0' - url: https://repo.prefix.dev/conda-forge/linux-64/sqlalchemy-2.0.43-py310h7c4b9e2_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/sqlalchemy-2.0.43-py310h7c4b9e2_1.conda hash: - md5: ef71b1b926213f1b198486604727709e - sha256: ce149017f6e6d91f3103ff8017bb2f234aefacbed95acb459c21095da4d9582e + md5: 0849ba912ee3d982bf1eb44ecbe2a412 + sha256: cad1d739a42a01adc2f7a01d07fd35e72900026a3fbd275cb34bbc2323f831ce category: dev optional: true - name: sqlalchemy @@ -7414,10 +7414,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/sqlalchemy-2.0.43-py310h29418f3_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/sqlalchemy-2.0.43-py310h29418f3_1.conda hash: - md5: 328f2420ec397b0f27fee2d001c62704 - sha256: 6211457b98f8ad57665f8bb32e354b39bbcfe93ec6f8f50ef877578a0085556a + md5: afa4c6d3b4bfedfd47385570781f796c + sha256: 897b4080b98a6feacad32c7cee100319cc47b5134d2d105afcf93ae3e86043bd category: dev optional: true - name: stack_data @@ -8575,7 +8575,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8592,7 +8592,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8605,7 +8605,7 @@ package: category: main optional: false - name: geoh5py - version: 0.12.0a2.dev124+3d7c550d + version: 0.12.0a2.dev132+e5a08e7b manager: pip platform: linux-64 dependencies: @@ -8614,16 +8614,16 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 hash: - sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 + sha256: e5a08e7bfed421e16b59c318ea430aec55a2c005 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev124+3d7c550d + version: 0.12.0a2.dev132+e5a08e7b manager: pip platform: win-64 dependencies: @@ -8632,12 +8632,12 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 hash: - sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 + sha256: e5a08e7bfed421e16b59c318ea430aec55a2c005 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 category: main optional: false - name: grid-apps @@ -8647,7 +8647,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.6.0a1.dev103+1398046 - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8666,7 +8666,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.6.0a1.dev103+1398046 - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 30a23ce1..b4ab89c0 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -352,27 +352,27 @@ package: category: dev optional: true - name: attrs - version: 25.3.0 + version: 25.4.0 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.4.0-pyh71513ae_0.conda hash: - md5: a10d11958cadc13fdb43df75f8b1903f - sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 + md5: c7944d55af26b6d2d7629e27e9a972c1 + sha256: f6c3c19fa599a1a856a88db166c318b148cac3ee4851a9905ed8a04eeec79f45 category: dev optional: true - name: attrs - version: 25.3.0 + version: 25.4.0 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.4.0-pyh71513ae_0.conda hash: - md5: a10d11958cadc13fdb43df75f8b1903f - sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 + md5: c7944d55af26b6d2d7629e27e9a972c1 + sha256: f6c3c19fa599a1a856a88db166c318b148cac3ee4851a9905ed8a04eeec79f45 category: dev optional: true - name: babel @@ -3570,10 +3570,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.2.0-h767d61c_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.2.0-h767d61c_6.conda hash: - md5: 67b79092aee4aa9705e4febdf3b73808 - sha256: cf6c34d2c024f1a28ad48f9a352ffbed5dfd0767be0fae50c4ccaa96f2538116 + md5: 99eee6aa5abea12f326f7fc010aef0c8 + sha256: 29c6ce15cf54f89282581d19329c99d1639036c5dde049bf1cae48dcc4137470 category: main optional: false - name: libgcc @@ -3583,10 +3583,10 @@ package: dependencies: _openmp_mutex: '>=4.5' libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.2.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.2.0-h1383e82_6.conda hash: - md5: c0c867c4f575668ec8359f259eda54e7 - sha256: 25afac9221b3c6205d6c9dcbac112ae1a6769360b769c46633441bf6263b3af9 + md5: 15d8f18987161d5a467434a0869cd789 + sha256: f910d04ea9bb4def10870c8c42b1bb55d22897c267eacea15b3cb18c69d8fac2 category: main optional: false - name: libgcc-ng @@ -3595,10 +3595,10 @@ package: platform: linux-64 dependencies: libgcc: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.2.0-h69a702a_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.2.0-h69a702a_6.conda hash: - md5: e0b75800b155ea7af9740beb1efa97c4 - sha256: ca3f87dcd3fe1a3f82f52bae1f09f75d29cb399825d636befdb5be91ff624fa9 + md5: d9717466cca9b9584226ce57a7cd58e6 + sha256: 12c91470ceb8d7d38fcee1a4ff1f50524625349059988f6bd0e8e6b27599a1ad category: main optional: false - name: libgfortran @@ -3607,10 +3607,10 @@ package: platform: linux-64 dependencies: libgfortran5: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.2.0-h69a702a_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.2.0-h69a702a_6.conda hash: - md5: b6683cec57969bc26f813252482d323b - sha256: 8c4310fb4819362e21d1c4808f9e89254646a16bb97df77502e2ab978e5e9149 + md5: c41f84a30601e911a1e7a30f53531a59 + sha256: 37ac19d22718d371b1fd78207eee37bc384c5e7f8880e06187cb817f1124d1e2 category: main optional: false - name: libgfortran5 @@ -3620,10 +3620,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=15.2.0' - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.2.0-hcd61629_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.2.0-hcd61629_6.conda hash: - md5: dd6b1ea02e2e7dc42b06d16d946c7fb1 - sha256: 5ca0123f95c095521222a2378d931a9145eb89cb99aa34e0f496581774821cb0 + md5: 8fc1650fb7c7fca583cc3537a808e21b + sha256: 5046054c10fe5c81433849aa5d569e50ae051c4eac44b3e2a9bb34945eb16fc8 category: main optional: false - name: libgomp @@ -3632,10 +3632,10 @@ package: platform: win-64 dependencies: libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.2.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.2.0-h1383e82_6.conda hash: - md5: 473d74a4b0a2522bff840306a3955d1a - sha256: a7577c700e130d3b3474d3a038d441b1b1c85c25cf7cd2852f515083a1fe2b37 + md5: 5939a1cf8d58da8b11bfc0db95aad396 + sha256: b6e6c2c527b1de0803ae820de9b78246ebcba688c797f77845a67e1125fb2714 category: main optional: false - name: libhwloc @@ -3974,10 +3974,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.2.0-h8f9b012_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.2.0-h8f9b012_6.conda hash: - md5: 5dd6bd4f77a17945d5b6054155836a14 - sha256: 803eb5a488314b5e127f014001279795ad0e9a2a096f4a0c84d20bc543109104 + md5: 9acaf38d72dcddace144f28506d45afa + sha256: fafd1c1320384a664f57e5d75568f214a31fe2201fc8baace6c15d88b8cf89a8 category: main optional: false - name: libstdcxx-ng @@ -3986,10 +3986,10 @@ package: platform: linux-64 dependencies: libstdcxx: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.2.0-h4852527_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.2.0-h4852527_6.conda hash: - md5: ca44d750b5f9add2716ad342be3ad7a3 - sha256: 8a176713fe3bd9c620ec2adf47040fc53cbebacc98c338c3fc1aaa5816764063 + md5: 89611cb5b685d19e6201065720f97561 + sha256: 462fa002d3ab6702045ee330ab45719ac2958a092a4634a955cebc095f564794 category: main optional: false - name: libtiff @@ -4079,10 +4079,10 @@ package: platform: win-64 dependencies: ucrt: '' - url: https://repo.prefix.dev/conda-forge/win-64/libwinpthread-12.0.0.r4.gg4f2fc60ca-h57928b3_9.conda + url: https://repo.prefix.dev/conda-forge/win-64/libwinpthread-12.0.0.r4.gg4f2fc60ca-h57928b3_10.conda hash: - md5: 08bfa5da6e242025304b206d152479ef - sha256: 373f2973b8a358528b22be5e8d84322c165b4c5577d24d94fd67ad1bb0a0f261 + md5: 8a86073cf3b343b87d03f41790d8b4e5 + sha256: 0fccf2d17026255b6e10ace1f191d0a2a18f2d65088fd02430be17c701f8ffe0 category: main optional: false - name: libxcb @@ -7450,10 +7450,10 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* typing-extensions: '>=4.6.0' - url: https://repo.prefix.dev/conda-forge/linux-64/sqlalchemy-2.0.43-py311h49ec1c0_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/sqlalchemy-2.0.43-py311h49ec1c0_1.conda hash: - md5: d666d60bafc3dee42ebc74f0362ac619 - sha256: 8b9c01517b381820699f824972d967d8235ce383b5e39e00f653787c36434bfa + md5: 7e7855cd3f43fd9bd6423d0722f4dbb1 + sha256: 10e6ecbc4034b48ba7dc5e1223c81c35a23fe7e1325980b4bae8b7873b05ac28 category: dev optional: true - name: sqlalchemy @@ -7468,10 +7468,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/sqlalchemy-2.0.43-py311h3485c13_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/sqlalchemy-2.0.43-py311h3485c13_1.conda hash: - md5: 3dc596423e46db6dd8b500311ffeb82f - sha256: dc698ab700d4e7c396e62eaccb004b85556404d0e3013169c3f20ff5b54a8835 + md5: 6e70d0cacca9e2fe5efde69d4e251c30 + sha256: 3d9180233eff5b87d8d290c7fb47d786f9de8bbed0d73fe4ae4fdd31488e9d64 category: dev optional: true - name: stack_data @@ -8660,7 +8660,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8677,7 +8677,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8690,7 +8690,7 @@ package: category: main optional: false - name: geoh5py - version: 0.12.0a2.dev124+3d7c550d + version: 0.12.0a2.dev132+e5a08e7b manager: pip platform: linux-64 dependencies: @@ -8699,16 +8699,16 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 hash: - sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 + sha256: e5a08e7bfed421e16b59c318ea430aec55a2c005 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev124+3d7c550d + version: 0.12.0a2.dev132+e5a08e7b manager: pip platform: win-64 dependencies: @@ -8717,12 +8717,12 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 hash: - sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 + sha256: e5a08e7bfed421e16b59c318ea430aec55a2c005 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 category: main optional: false - name: grid-apps @@ -8732,7 +8732,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.6.0a1.dev103+1398046 - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8751,7 +8751,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.6.0a1.dev103+1398046 - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 1033b9d2..5d6fda6a 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -378,27 +378,27 @@ package: category: dev optional: true - name: attrs - version: 25.3.0 + version: 25.4.0 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.4.0-pyh71513ae_0.conda hash: - md5: a10d11958cadc13fdb43df75f8b1903f - sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 + md5: c7944d55af26b6d2d7629e27e9a972c1 + sha256: f6c3c19fa599a1a856a88db166c318b148cac3ee4851a9905ed8a04eeec79f45 category: dev optional: true - name: attrs - version: 25.3.0 + version: 25.4.0 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/attrs-25.4.0-pyh71513ae_0.conda hash: - md5: a10d11958cadc13fdb43df75f8b1903f - sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 + md5: c7944d55af26b6d2d7629e27e9a972c1 + sha256: f6c3c19fa599a1a856a88db166c318b148cac3ee4851a9905ed8a04eeec79f45 category: dev optional: true - name: babel @@ -3609,10 +3609,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.2.0-h767d61c_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-15.2.0-h767d61c_6.conda hash: - md5: 67b79092aee4aa9705e4febdf3b73808 - sha256: cf6c34d2c024f1a28ad48f9a352ffbed5dfd0767be0fae50c4ccaa96f2538116 + md5: 99eee6aa5abea12f326f7fc010aef0c8 + sha256: 29c6ce15cf54f89282581d19329c99d1639036c5dde049bf1cae48dcc4137470 category: main optional: false - name: libgcc @@ -3622,10 +3622,10 @@ package: dependencies: _openmp_mutex: '>=4.5' libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.2.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgcc-15.2.0-h1383e82_6.conda hash: - md5: c0c867c4f575668ec8359f259eda54e7 - sha256: 25afac9221b3c6205d6c9dcbac112ae1a6769360b769c46633441bf6263b3af9 + md5: 15d8f18987161d5a467434a0869cd789 + sha256: f910d04ea9bb4def10870c8c42b1bb55d22897c267eacea15b3cb18c69d8fac2 category: main optional: false - name: libgcc-ng @@ -3634,10 +3634,10 @@ package: platform: linux-64 dependencies: libgcc: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.2.0-h69a702a_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-15.2.0-h69a702a_6.conda hash: - md5: e0b75800b155ea7af9740beb1efa97c4 - sha256: ca3f87dcd3fe1a3f82f52bae1f09f75d29cb399825d636befdb5be91ff624fa9 + md5: d9717466cca9b9584226ce57a7cd58e6 + sha256: 12c91470ceb8d7d38fcee1a4ff1f50524625349059988f6bd0e8e6b27599a1ad category: main optional: false - name: libgfortran @@ -3646,10 +3646,10 @@ package: platform: linux-64 dependencies: libgfortran5: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.2.0-h69a702a_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-15.2.0-h69a702a_6.conda hash: - md5: b6683cec57969bc26f813252482d323b - sha256: 8c4310fb4819362e21d1c4808f9e89254646a16bb97df77502e2ab978e5e9149 + md5: c41f84a30601e911a1e7a30f53531a59 + sha256: 37ac19d22718d371b1fd78207eee37bc384c5e7f8880e06187cb817f1124d1e2 category: main optional: false - name: libgfortran5 @@ -3659,10 +3659,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=15.2.0' - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.2.0-hcd61629_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-15.2.0-hcd61629_6.conda hash: - md5: dd6b1ea02e2e7dc42b06d16d946c7fb1 - sha256: 5ca0123f95c095521222a2378d931a9145eb89cb99aa34e0f496581774821cb0 + md5: 8fc1650fb7c7fca583cc3537a808e21b + sha256: 5046054c10fe5c81433849aa5d569e50ae051c4eac44b3e2a9bb34945eb16fc8 category: main optional: false - name: libgomp @@ -3671,10 +3671,10 @@ package: platform: win-64 dependencies: libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.2.0-h1383e82_5.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgomp-15.2.0-h1383e82_6.conda hash: - md5: 473d74a4b0a2522bff840306a3955d1a - sha256: a7577c700e130d3b3474d3a038d441b1b1c85c25cf7cd2852f515083a1fe2b37 + md5: 5939a1cf8d58da8b11bfc0db95aad396 + sha256: b6e6c2c527b1de0803ae820de9b78246ebcba688c797f77845a67e1125fb2714 category: main optional: false - name: libhwloc @@ -4013,10 +4013,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.2.0-h8f9b012_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-15.2.0-h8f9b012_6.conda hash: - md5: 5dd6bd4f77a17945d5b6054155836a14 - sha256: 803eb5a488314b5e127f014001279795ad0e9a2a096f4a0c84d20bc543109104 + md5: 9acaf38d72dcddace144f28506d45afa + sha256: fafd1c1320384a664f57e5d75568f214a31fe2201fc8baace6c15d88b8cf89a8 category: main optional: false - name: libstdcxx-ng @@ -4025,10 +4025,10 @@ package: platform: linux-64 dependencies: libstdcxx: 15.2.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.2.0-h4852527_5.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-15.2.0-h4852527_6.conda hash: - md5: ca44d750b5f9add2716ad342be3ad7a3 - sha256: 8a176713fe3bd9c620ec2adf47040fc53cbebacc98c338c3fc1aaa5816764063 + md5: 89611cb5b685d19e6201065720f97561 + sha256: 462fa002d3ab6702045ee330ab45719ac2958a092a4634a955cebc095f564794 category: main optional: false - name: libtiff @@ -4118,10 +4118,10 @@ package: platform: win-64 dependencies: ucrt: '' - url: https://repo.prefix.dev/conda-forge/win-64/libwinpthread-12.0.0.r4.gg4f2fc60ca-h57928b3_9.conda + url: https://repo.prefix.dev/conda-forge/win-64/libwinpthread-12.0.0.r4.gg4f2fc60ca-h57928b3_10.conda hash: - md5: 08bfa5da6e242025304b206d152479ef - sha256: 373f2973b8a358528b22be5e8d84322c165b4c5577d24d94fd67ad1bb0a0f261 + md5: 8a86073cf3b343b87d03f41790d8b4e5 + sha256: 0fccf2d17026255b6e10ace1f191d0a2a18f2d65088fd02430be17c701f8ffe0 category: main optional: false - name: libxcb @@ -7517,10 +7517,10 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* typing-extensions: '>=4.6.0' - url: https://repo.prefix.dev/conda-forge/linux-64/sqlalchemy-2.0.43-py312h4c3975b_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/sqlalchemy-2.0.43-py312h4c3975b_1.conda hash: - md5: 8a8ae29bfb3353ef70ebdad2ca373a40 - sha256: ef1faa38ee1a24a9a26755e9345c7e2ea852a678e0cd56d002a52db9fc87d163 + md5: 95d7654483188c67bd579374361473b8 + sha256: 0a235fad9c2be40cd32cbcb5481ece19c494647f66f55cff22a684ada7a2b802 category: dev optional: true - name: sqlalchemy @@ -7535,10 +7535,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/sqlalchemy-2.0.43-py312he06e257_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/sqlalchemy-2.0.43-py312he06e257_1.conda hash: - md5: 0adeed53f5b3788e5c7ffcef77de8a6f - sha256: 55dc8d0253ab240c988229fdc35202a8d12647b6510f3ac60f4417126fb233c9 + md5: 9e7c0976b93b87e843ff8cdd579ca3f2 + sha256: f6051bff3119693120f13f21aacb1a94fc1b06f7d6a2254211fe48503cc98a99 category: dev optional: true - name: stack_data @@ -8727,7 +8727,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8744,7 +8744,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8757,7 +8757,7 @@ package: category: main optional: false - name: geoh5py - version: 0.12.0a2.dev124+3d7c550d + version: 0.12.0a2.dev132+e5a08e7b manager: pip platform: linux-64 dependencies: @@ -8766,16 +8766,16 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 hash: - sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 + sha256: e5a08e7bfed421e16b59c318ea430aec55a2c005 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev124+3d7c550d + version: 0.12.0a2.dev132+e5a08e7b manager: pip platform: win-64 dependencies: @@ -8784,12 +8784,12 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 hash: - sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 + sha256: e5a08e7bfed421e16b59c318ea430aec55a2c005 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 + url: git+https://github.com/MiraGeoscience/geoh5py.git@e5a08e7bfed421e16b59c318ea430aec55a2c005 category: main optional: false - name: grid-apps @@ -8799,7 +8799,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.6.0a1.dev103+1398046 - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8818,7 +8818,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.6.0a1.dev103+1398046 - geoh5py: 0.12.0a2.dev124+3d7c550d + geoh5py: 0.12.0a2.dev132+e5a08e7b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' From 68d0f163da9899237a024ffb7c851f320e305b94 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 7 Oct 2025 09:43:45 -0700 Subject: [PATCH 22/22] Set mon_dir to None --- simpeg_drivers/plate_simulation/sweep/driver.py | 1 + 1 file changed, 1 insertion(+) diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index a72cd6fc..a042119c 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -169,6 +169,7 @@ def run_trial( opt_dict = workspace.promote(flatten(plate_simulation.options)) opt_dict["geoh5"] = workspace opt_dict["out_group"] = None + opt_dict["monitoring_directory"] = None opt_dict.update(data) options = PlateSimulationOptions.build(opt_dict) plate_sim = PlateSimulationDriver(options, workers=[worker])