From 915473af44d2d4e81eb5266dc9347736a5d185fa Mon Sep 17 00:00:00 2001 From: domfournier Date: Mon, 20 Apr 2026 09:53:43 -0700 Subject: [PATCH 01/18] Change normalization --- simpeg_drivers/components/data.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/simpeg_drivers/components/data.py b/simpeg_drivers/components/data.py index 9b26c0147..ab759ecff 100644 --- a/simpeg_drivers/components/data.py +++ b/simpeg_drivers/components/data.py @@ -302,9 +302,14 @@ def get_normalizations(self): offsets = { k: v * np.ones(len(self.locations)) for k, v in offsets.items() } + # Normalization for coplanar normalizations[chan][comp] = ( - mu0 * (-1 / offsets[chan] ** 3 / (4 * np.pi)) / 1e6 + mu0 * (2 / offsets[chan] ** 3 / (4 * np.pi)) / 1e6 ) + + if "vertical" in comp: + normalizations[chan][comp] *= -0.5 + elif ( "tdem" in self.params.inversion_type and "dB/dt" in self.params.data_units From 9641cb41f633450b5af9567661e6bb1419828edb Mon Sep 17 00:00:00 2001 From: domfournier Date: Thu, 23 Apr 2026 11:35:05 -0700 Subject: [PATCH 02/18] Better indexing of frequencies in test --- simpeg_drivers/components/factories/survey_factory.py | 2 +- .../utils/synthetics/surveys/frequency_domain/fdem.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/simpeg_drivers/components/factories/survey_factory.py b/simpeg_drivers/components/factories/survey_factory.py index 89605ea27..73e25c6f5 100644 --- a/simpeg_drivers/components/factories/survey_factory.py +++ b/simpeg_drivers/components/factories/survey_factory.py @@ -321,7 +321,7 @@ def _fem_arguments(self, data=None): tx_locs = data.entity.transmitters.vertices frequencies = data.entity.transmitters.workspace.get_entity("Tx frequency")[0] frequencies = np.array( - [int(frequencies.value_map[f]) for f in frequencies.values] + [float(frequencies.value_map[f]) for f in frequencies.values] ) sources = [] diff --git a/simpeg_drivers/utils/synthetics/surveys/frequency_domain/fdem.py b/simpeg_drivers/utils/synthetics/surveys/frequency_domain/fdem.py index 2e5998972..52a9b586f 100644 --- a/simpeg_drivers/utils/synthetics/surveys/frequency_domain/fdem.py +++ b/simpeg_drivers/utils/synthetics/surveys/frequency_domain/fdem.py @@ -42,7 +42,7 @@ def generate_fdem_survey( tx_locs_list = [] frequency_list = [] - for config in frequency_config: + for f_count, config in enumerate(frequency_config): for part in np.unique(survey.parts): line = survey.parts == part delta = np.diff(vertices[line, :], axis=0) @@ -57,7 +57,7 @@ def generate_fdem_survey( tx_vertices = vertices[line, :] - delta * config["Offset"] tx_locs_list.append(tx_vertices) - frequency_list.append([[config["Frequency"]] * sum(line)]) + frequency_list.append([np.full(sum(line), f_count + 1)]) tx_locs = np.vstack(tx_locs_list) freqs = np.hstack(frequency_list).flatten() @@ -74,7 +74,9 @@ def generate_fdem_survey( "values": freqs, "association": "VERTEX", "primitive_type": "REFERENCED", - "value_map": {k: str(k) for k in freqs}, + "value_map": { + k + 1: elem["Frequency"] for k, elem in enumerate(frequency_config) + }, } } ) From 6c17a4fb35a25f985ecdcc366d5443a1317b9be0 Mon Sep 17 00:00:00 2001 From: domfournier Date: Thu, 23 Apr 2026 12:13:14 -0700 Subject: [PATCH 03/18] Change uijson keys for fdem components --- .../uijson/fdem1d_forward.ui.json | 4 +-- .../uijson/fdem1d_inversion.ui.json | 12 +++---- .../uijson/fdem_forward.ui.json | 12 +++---- .../uijson/fdem_inversion.ui.json | 36 +++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index 11512518d..0abc256e7 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -16,14 +16,14 @@ ], "value": "" }, - "z_imag_channel_bool": { + "vertical_imag_channel_bool": { "group": "Survey", "main": true, "label": "Vertical (imaginary)", "tooltip": "Vertical (w) imaginary component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", "value": true }, - "z_real_channel_bool": { + "vertical_real_channel_bool": { "group": "Survey", "main": true, "label": "Vertical (real)", diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index 88f681490..fca945fd4 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -16,7 +16,7 @@ ], "value": "" }, - "z_imag_channel": { + "vertical_imag_channel": { "association": [ "Cell", "Vertex" @@ -32,7 +32,7 @@ "enabled": true, "value": "" }, - "z_imag_uncertainty": { + "vertical_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -43,12 +43,12 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "z_imag_channel", + "dependency": "vertical_imag_channel", "dependencyType": "enabled", "enabled": false, "value": "" }, - "z_real_channel": { + "vertical_real_channel": { "association": [ "Cell", "Vertex" @@ -64,7 +64,7 @@ "enabled": true, "value": "" }, - "z_real_uncertainty": { + "vertical_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -75,7 +75,7 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "z_real_channel", + "dependency": "vertical_real_channel", "dependencyType": "enabled", "enabled": false, "value": "" diff --git a/simpeg_drivers-assets/uijson/fdem_forward.ui.json b/simpeg_drivers-assets/uijson/fdem_forward.ui.json index a60b92c87..29c542a7f 100644 --- a/simpeg_drivers-assets/uijson/fdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_forward.ui.json @@ -38,42 +38,42 @@ "parent": "data_object", "value": "" }, - "z_imag_channel_bool": { + "vertical_imag_channel_bool": { "group": "Survey", "main": true, "label": "Vertical (imaginary)", "tooltip": "Vertical (w) imaginary component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", "value": true }, - "z_real_channel_bool": { + "vertical_real_channel_bool": { "group": "Survey", "main": true, "label": "Vertical (real)", "tooltip": "Vertical (w) real component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", "value": true }, - "y_imag_channel_bool": { + "inline_imag_channel_bool": { "group": "Survey", "main": true, "label": "In-line (imaginary)", "tooltip": "In-line (u) imaginary component of the magnetic data.\nPositive towards North if no receiver orientation provided", "value": true }, - "y_real_channel_bool": { + "inline_real_channel_bool": { "group": "Survey", "main": true, "label": "In-line (real)", "tooltip": "In-line (u) real component of the magnetic data.\nPositive towards North if no receiver orientation provided", "value": true }, - "x_imag_channel_bool": { + "crossline_imag_channel_bool": { "group": "Survey", "main": true, "label": "Cross-line (imaginary)", "tooltip": "Cross-line (v) imaginary component of the magnetic data.\nPositive towards East if no receiver orientation provided", "value": true }, - "x_real_channel_bool": { + "crossline_real_channel_bool": { "group": "Survey", "main": true, "label": "Cross-line (real)", diff --git a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json index ca2cdc3f7..a484e30de 100644 --- a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json @@ -38,7 +38,7 @@ "parent": "data_object", "value": "" }, - "z_imag_channel": { + "vertical_imag_channel": { "association": [ "Cell", "Vertex" @@ -54,7 +54,7 @@ "enabled": true, "value": "" }, - "z_imag_uncertainty": { + "vertical_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -65,12 +65,12 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "z_imag_channel", + "dependency": "vertical_imag_channel", "dependencyType": "enabled", "enabled": false, "value": "" }, - "z_real_channel": { + "vertical_real_channel": { "association": [ "Cell", "Vertex" @@ -86,7 +86,7 @@ "enabled": true, "value": "" }, - "z_real_uncertainty": { + "vertical_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -97,12 +97,12 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "z_real_channel", + "dependency": "vertical_real_channel", "dependencyType": "enabled", "enabled": false, "value": "" }, - "y_imag_channel": { + "inline_imag_channel": { "association": [ "Cell", "Vertex" @@ -118,7 +118,7 @@ "enabled": false, "value": "" }, - "y_imag_uncertainty": { + "inline_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -129,12 +129,12 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "y_imag_channel", + "dependency": "inline_imag_channel", "dependencyType": "enabled", "enabled": false, "value": "" }, - "y_real_channel": { + "inline_real_channel": { "association": [ "Cell", "Vertex" @@ -150,7 +150,7 @@ "enabled": false, "value": "" }, - "y_real_uncertainty": { + "inline_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -161,12 +161,12 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "y_real_channel", + "dependency": "inline_real_channel", "dependencyType": "enabled", "enabled": false, "value": "" }, - "x_imag_channel": { + "crossline_imag_channel": { "association": [ "Cell", "Vertex" @@ -182,7 +182,7 @@ "enabled": false, "value": "" }, - "x_imag_uncertainty": { + "crossline_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -193,12 +193,12 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "x_imag_channel", + "dependency": "crossline_imag_channel", "dependencyType": "enabled", "enabled": false, "value": "" }, - "x_real_channel": { + "crossline_real_channel": { "association": [ "Cell", "Vertex" @@ -214,7 +214,7 @@ "enabled": false, "value": "" }, - "x_real_uncertainty": { + "crossline_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -225,7 +225,7 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "x_real_channel", + "dependency": "crossline_real_channel", "dependencyType": "enabled", "enabled": false, "value": "" From 10ec059b6bfaa780f69a649be547598ed8dbed9f Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 28 Apr 2026 11:11:34 -0700 Subject: [PATCH 04/18] Revert components of FEM to imag and real. Deal with coplanar versus coaxial --- .../uijson/fdem_forward.ui.json | 50 ++---- .../uijson/fdem_inversion.ui.json | 156 +++--------------- .../components/factories/receiver_factory.py | 19 ++- .../components/factories/source_factory.py | 4 + .../components/factories/survey_factory.py | 56 +++---- .../frequency_domain/options.py | 130 +++++---------- 6 files changed, 117 insertions(+), 298 deletions(-) diff --git a/simpeg_drivers-assets/uijson/fdem_forward.ui.json b/simpeg_drivers-assets/uijson/fdem_forward.ui.json index 29c542a7f..f1b5d2d60 100644 --- a/simpeg_drivers-assets/uijson/fdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_forward.ui.json @@ -38,46 +38,28 @@ "parent": "data_object", "value": "" }, - "vertical_imag_channel_bool": { + "imag_channel_bool": { "group": "Survey", "main": true, - "label": "Vertical (imaginary)", - "tooltip": "Vertical (w) imaginary component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", - "value": true - }, - "vertical_real_channel_bool": { - "group": "Survey", - "main": true, - "label": "Vertical (real)", - "tooltip": "Vertical (w) real component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", - "value": true - }, - "inline_imag_channel_bool": { - "group": "Survey", - "main": true, - "label": "In-line (imaginary)", - "tooltip": "In-line (u) imaginary component of the magnetic data.\nPositive towards North if no receiver orientation provided", - "value": true - }, - "inline_real_channel_bool": { - "group": "Survey", - "main": true, - "label": "In-line (real)", - "tooltip": "In-line (u) real component of the magnetic data.\nPositive towards North if no receiver orientation provided", - "value": true - }, - "crossline_imag_channel_bool": { - "group": "Survey", - "main": true, - "label": "Cross-line (imaginary)", - "tooltip": "Cross-line (v) imaginary component of the magnetic data.\nPositive towards East if no receiver orientation provided", + "label": "Imaginary", + "tooltip": [ + "Imaginary component of the magnetic data. If no receiver orientation provided:
", + "
Co-planar data are positive up along the z-axis .", + "
Co-axial data are positive along North.", + "
" + ], "value": true }, - "crossline_real_channel_bool": { + "real_channel_bool": { "group": "Survey", "main": true, - "label": "Cross-line (real)", - "tooltip": "Cross-line (v) real component of the magnetic data.\nPositive towards East if no receiver orientation provided", + "label": "Real", + "tooltip": [ + "Real component of the magnetic data. If no receiver orientation provided:
", + "
Co-planar data are positive up along the z-axis .", + "
Co-axial data are positive along North.", + "
" + ], "value": true }, "mesh": { diff --git a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json index a484e30de..d2648104e 100644 --- a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json @@ -38,7 +38,7 @@ "parent": "data_object", "value": "" }, - "vertical_imag_channel": { + "imag_channel": { "association": [ "Cell", "Vertex" @@ -47,110 +47,19 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Vertical (imaginary)", - "tooltip": "Vertical (w) imaginary component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", - "parent": "data_object", - "optional": true, - "enabled": true, - "value": "" - }, - "vertical_imag_uncertainty": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data", - "dataGroupType": "Multi-element", - "main": true, - "label": "Uncertainty", - "parent": "data_object", - "dependency": "vertical_imag_channel", - "dependencyType": "enabled", - "enabled": false, - "value": "" - }, - "vertical_real_channel": { - "association": [ - "Cell", - "Vertex" + "label": "Imaginary", + "tooltip": [ + "Imaginary component of the magnetic data. If no receiver orientation provided:
", + "
Co-planar data are positive up along the z-axis .", + "
Co-axial data are positive along North.", + "
" ], - "dataType": "Float", - "group": "Data", - "dataGroupType": "Multi-element", - "main": true, - "label": "Vertical (real)", - "tooltip": "Vertical (w) real component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "vertical_real_uncertainty": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data", - "dataGroupType": "Multi-element", - "main": true, - "label": "Uncertainty", - "parent": "data_object", - "dependency": "vertical_real_channel", - "dependencyType": "enabled", - "enabled": false, - "value": "" - }, - "inline_imag_channel": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data", - "dataGroupType": "Multi-element", - "main": true, - "label": "In-line (imaginary)", - "tooltip": "In-line (u) imaginary component of the magnetic data.\nPositive towards North if no receiver orientation provided", - "parent": "data_object", - "optional": true, - "enabled": false, - "value": "" - }, - "inline_imag_uncertainty": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data", - "dataGroupType": "Multi-element", - "main": true, - "label": "Uncertainty", - "parent": "data_object", - "dependency": "inline_imag_channel", - "dependencyType": "enabled", - "enabled": false, - "value": "" - }, - "inline_real_channel": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data", - "dataGroupType": "Multi-element", - "main": true, - "label": "In-line (real)", - "tooltip": "In-line (u) real component of the magnetic data.\nPositive towards North if no receiver orientation provided", - "parent": "data_object", - "optional": true, - "enabled": false, - "value": "" - }, - "inline_real_uncertainty": { + "imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -161,28 +70,12 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "inline_real_channel", + "dependency": "imag_channel", "dependencyType": "enabled", "enabled": false, "value": "" }, - "crossline_imag_channel": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data", - "dataGroupType": "Multi-element", - "main": true, - "label": "Cross-line (imaginary)", - "tooltip": "Cross-line (v) imaginary component of the magnetic data.\nPositive towards East if no receiver orientation provided", - "parent": "data_object", - "optional": true, - "enabled": false, - "value": "" - }, - "crossline_imag_uncertainty": { + "real_channel": { "association": [ "Cell", "Vertex" @@ -191,30 +84,19 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Uncertainty", - "parent": "data_object", - "dependency": "crossline_imag_channel", - "dependencyType": "enabled", - "enabled": false, - "value": "" - }, - "crossline_real_channel": { - "association": [ - "Cell", - "Vertex" + "label": "Real", + "tooltip": [ + "Real component of the magnetic data. If no receiver orientation provided:
", + "
Co-planar data are positive up along the z-axis .", + "
Co-axial data are positive along North.", + "
" ], - "dataType": "Float", - "group": "Data", - "dataGroupType": "Multi-element", - "main": true, - "label": "Cross-line (real)", - "tooltip": "Cross-line (v) real component of the magnetic data.\nPositive towards East if no receiver orientation provided", "parent": "data_object", "optional": true, - "enabled": false, + "enabled": true, "value": "" }, - "crossline_real_uncertainty": { + "real_uncertainty": { "association": [ "Cell", "Vertex" @@ -225,7 +107,7 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "crossline_real_channel", + "dependency": "real_channel", "dependencyType": "enabled", "enabled": false, "value": "" diff --git a/simpeg_drivers/components/factories/receiver_factory.py b/simpeg_drivers/components/factories/receiver_factory.py index 325b40906..c8165f49d 100644 --- a/simpeg_drivers/components/factories/receiver_factory.py +++ b/simpeg_drivers/components/factories/receiver_factory.py @@ -31,6 +31,8 @@ ORIENTATION_MAP = { + "coplanar": "z", + "coaxial": "x", "vertical": "z", "inline": "y", "crossline": "x", @@ -164,12 +166,17 @@ def assemble_keyword_arguments( else: kwargs["storeProjections"] = True - if self.factory_type in ["fdem", "fdem 1d", "magnetotellurics", "tipper"]: - comp = component.split("_")[0] - kwargs["orientation"] = ( - ORIENTATION_MAP[comp] if "fdem" in self.factory_type else comp[1:] - ) - kwargs["component"] = component.split("_")[1] + # Channels such as txz_real or zxy_imag + if self.factory_type in ["magnetotellurics", "tipper"]: + ori, comp = component.split("_") + kwargs["orientation"] = ori[1:] + kwargs["component"] = comp + + # Channels such as real + if self.factory_type in ["fdem", "fdem 1d"]: + comp, ori = component.split("_") + kwargs["orientation"] = ORIENTATION_MAP[ori] + kwargs["component"] = comp if self.factory_type in ["tipper"]: kwargs["orientation"] = kwargs["orientation"][::-1] diff --git a/simpeg_drivers/components/factories/source_factory.py b/simpeg_drivers/components/factories/source_factory.py index 0145d57e9..c9498c146 100644 --- a/simpeg_drivers/components/factories/source_factory.py +++ b/simpeg_drivers/components/factories/source_factory.py @@ -169,6 +169,10 @@ def assemble_keyword_arguments( # pylint: disable=arguments-differ if "fdem" in self.factory_type: kwargs["location"] = locations + kwargs["orientation"] = receivers[ + 0 + ].orientation # For airborne FEM, coaxial or coplanar + if "tdem" in self.factory_type: kwargs["location"] = locations kwargs["waveform"] = waveform diff --git a/simpeg_drivers/components/factories/survey_factory.py b/simpeg_drivers/components/factories/survey_factory.py index 73e25c6f5..28f893981 100644 --- a/simpeg_drivers/components/factories/survey_factory.py +++ b/simpeg_drivers/components/factories/survey_factory.py @@ -327,24 +327,27 @@ def _fem_arguments(self, data=None): sources = [] rx_factory = ReceiversFactory(self.params) tx_factory = SourcesFactory(self.params) - receiver_groups = [] - block_ordering = [] - for rx_id, locs in enumerate(rx_locs): - receivers = [] - for comp_id, component in enumerate(data.components): - receiver = rx_factory.build( - locations=locs, data=data, component=component, local_indices=rx_id - ) - block_ordering.append([comp_id, rx_id]) - receivers.append(receiver) - - receiver_groups.append(receivers) - - block_ordering = np.vstack(block_ordering) ordering = [] tx_count = 0 for freq_id, frequency in enumerate(channels): - for rx_id, receivers in enumerate(receiver_groups): + for rx_id, locs in enumerate(rx_locs): + receivers = [] + block_ordering = [] + for comp_id, component in enumerate(data.components): + receiver = rx_factory.build( + locations=locs, + data=data, + component=component + + ( + "_coaxial" + if self.params.coaxial[frequency] + else "_coplanar" + ), + local_indices=rx_id, + ) + block_ordering.append([comp_id, rx_id]) + receivers.append(receiver) + locs = tx_locs[frequency == frequencies, :][rx_id, :] tx = tx_factory.build( receivers, @@ -354,21 +357,18 @@ def _fem_arguments(self, data=None): tx.rx_ids = np.r_[rx_id] sources.append(tx) - source_ids = ( - np.repeat(np.arange(len(receiver_groups)), len(receivers)).astype(int) - + tx_count - ) - ordering.append( - np.column_stack( - [ - np.ones(block_ordering.shape[0]) * freq_id, - block_ordering, - source_ids, # Source IDs - ] + source_ids = np.arange(len(receivers)).astype(int) + tx_count + ordering.append( + np.column_stack( + [ + np.full(len(block_ordering), freq_id), + np.vstack(block_ordering), + source_ids, # Source IDs + ] + ) ) - ) - tx_count = source_ids.max() + 1 + tx_count = source_ids.max() + 1 self.ordering = np.vstack(ordering).astype(int) self.sorting = np.arange(rx_locs.shape[0], dtype=int) diff --git a/simpeg_drivers/electromagnetics/frequency_domain/options.py b/simpeg_drivers/electromagnetics/frequency_domain/options.py index b8cdaa156..69ba54cc3 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/options.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/options.py @@ -11,6 +11,7 @@ from __future__ import annotations +from functools import cached_property from logging import getLogger from pathlib import Path from typing import ClassVar @@ -49,22 +50,38 @@ class BaseFDEMOptions(EMDataMixin): Base Frequency Domain Electromagnetic options. """ - @property + @cached_property def tx_offsets(self): """Return transmitter offsets from frequency metadata""" try: - offset_data = self.data_object.metadata["EM Dataset"][ + configs = self.data_object.metadata["EM Dataset"][ "Frequency configurations" ] - tx_offsets = {k["Frequency"]: k["Offset"] for k in offset_data} + tx_offsets = {k["Frequency"]: k["Offset"] for k in configs} except KeyError as exception: - msg = "Metadata must contain 'Frequency configurations' dictionary with 'Offset' data." + msg = "Metadata must contain 'Frequency configurations' dictionary with 'Offset' key." raise GeoAppsError(msg) from exception return tx_offsets + @cached_property + def coaxial(self): + """Return transmitter offsets from frequency metadata""" + + try: + configs = self.data_object.metadata["EM Dataset"][ + "Frequency configurations" + ] + coaxial = {k["Frequency"]: k["Coaxial data"] for k in configs} + + except KeyError as exception: + msg = "Metadata must contain 'Frequency configurations' dictionary with 'Coaxial data' key." + raise GeoAppsError(msg) from exception + + return coaxial + @property def unit_conversion(self): """Return time unit conversion factor.""" @@ -108,41 +125,13 @@ class FDEMForwardOptions(BaseForwardOptions, BaseFDEMOptions): | AirborneFEMReceivers ) receivers_orientation: PropertyGroup | None = None - vertical_real_channel_bool: bool = Field( - False, - validation_alias=AliasChoices( - "z_real_channel_bool", "vertical_real_channel_bool" - ), - ) - vertical_imag_channel_bool: bool = Field( - False, - validation_alias=AliasChoices( - "z_imag_channel_bool", "vertical_imag_channel_bool" - ), - ) - inline_real_channel_bool: bool = Field( - False, - validation_alias=AliasChoices( - "y_real_channel_bool", "inline_real_channel_bool" - ), - ) - inline_imag_channel_bool: bool = Field( - False, - validation_alias=AliasChoices( - "y_imag_channel_bool", "inline_imag_channel_bool" - ), - ) - crossline_real_channel_bool: bool = Field( + real_channel_bool: bool = Field( False, - validation_alias=AliasChoices( - "x_real_channel_bool", "crossline_real_channel_bool" - ), + validation_alias=AliasChoices("z_real_channel_bool", "real_channel_bool"), ) - crossline_imag_channel_bool: bool = Field( + imag_channel_bool: bool = Field( False, - validation_alias=AliasChoices( - "x_imag_channel_bool", "crossline_imag_channel_bool" - ), + validation_alias=AliasChoices("z_imag_channel_bool", "imag_channel_bool"), ) models: ConductivityModelOptions @@ -151,18 +140,10 @@ class FDEMInversionOptions(BaseFDEMOptions, BaseInversionOptions): """ Frequency Domain Electromagnetic Inversion options. - :param vertical_real_channel: Vertical (real) impedance channel. - :param vertical_real_uncertainty: Vertical (real) impedance uncertainty channel. - :param vertical_imag_channel: Vertical (imaginary) impedance channel. - :param vertical_imag_uncertainty: Vertical (imaginary) impedance uncertainty channel. - :param inline_real_channel: In-line (real) impedance channel. - :param inline_real_uncertainty: In-line (real) impedance uncertainty channel. - :param inline_imag_channel: In-line (imaginary) impedance channel. - :param inline_imag_uncertainty: In-line (imaginary) impedance uncertainty channel - :param crossline_real_channel: Cross-line (real) impedance channel. - :param crossline_real_uncertainty: Cross-line (real) impedance uncertainty channel. - :param crossline_imag_channel: Cross-line (imaginary) impedance channel. - :param crossline_imag_uncertainty: Cross-line (imaginary) impedance uncertainty channel + :param real_channel: Vertical (real) impedance channel. + :param real_uncertainty: Vertical (real) impedance uncertainty channel. + :param imag_channel: Vertical (imaginary) impedance channel. + :param imag_uncertainty: Vertical (imaginary) impedance uncertainty channel. :param models: ConductivityModelOptions parameter. """ @@ -179,57 +160,20 @@ class FDEMInversionOptions(BaseFDEMOptions, BaseInversionOptions): | AirborneFEMReceivers ) receivers_orientation: PropertyGroup | None = None - vertical_real_channel: PropertyGroup | None = Field( - None, validation_alias=AliasChoices("z_real_channel", "vertical_real_channel") - ) - vertical_real_uncertainty: PropertyGroup | None = Field( - None, - validation_alias=AliasChoices( - "z_real_uncertainty", "vertical_real_uncertainty" - ), - ) - vertical_imag_channel: PropertyGroup | None = Field( - None, validation_alias=AliasChoices("z_imag_channel", "vertical_imag_channel") - ) - vertical_imag_uncertainty: PropertyGroup | None = Field( - None, - validation_alias=AliasChoices( - "z_imag_uncertainty", "vertical_imag_uncertainty" - ), + real_channel: PropertyGroup | None = Field( + None, validation_alias=AliasChoices("z_real_channel", "real_channel") ) - inline_real_channel: PropertyGroup | None = Field( - None, validation_alias=AliasChoices("y_real_channel", "inline_real_channel") - ) - inline_real_uncertainty: PropertyGroup | None = Field( - None, - validation_alias=AliasChoices("y_real_uncertainty", "inline_real_uncertainty"), - ) - inline_imag_channel: PropertyGroup | None = Field( - None, validation_alias=AliasChoices("y_imag_channel", "inline_imag_channel") - ) - inline_imag_uncertainty: PropertyGroup | None = Field( + real_uncertainty: PropertyGroup | None = Field( None, - validation_alias=AliasChoices("y_imag_uncertainty", "inline_imag_uncertainty"), + validation_alias=AliasChoices("z_real_uncertainty", "real_uncertainty"), ) - crossline_real_channel: PropertyGroup | None = Field( - None, validation_alias=AliasChoices("x_real_channel", "crossline_real_channel") + imag_channel: PropertyGroup | None = Field( + None, validation_alias=AliasChoices("z_imag_channel", "imag_channel") ) - crossline_real_uncertainty: PropertyGroup | None = Field( + imag_uncertainty: PropertyGroup | None = Field( None, - validation_alias=AliasChoices( - "x_real_uncertainty", "crossline_real_uncertainty" - ), - ) - crossline_imag_channel: PropertyGroup | None = Field( - None, validation_alias=AliasChoices("x_imag_channel", "crossline_imag_channel") - ) - crossline_imag_uncertainty: PropertyGroup | None = Field( - None, - validation_alias=AliasChoices( - "x_imag_uncertainty", "crossline_imag_uncertainty" - ), + validation_alias=AliasChoices("z_imag_uncertainty", "imag_uncertainty"), ) models: ConductivityModelOptions - directives: DirectiveOptions = DirectiveOptions() From dff119cfcbe8724cd8e7d7d1c9f1ec11f203f17e Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 28 Apr 2026 11:42:41 -0700 Subject: [PATCH 05/18] Fix indexing and adjust test --- .../components/factories/survey_factory.py | 4 ++-- tests/run_tests/driver_airborne_fem_test.py | 23 ++++++++----------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/simpeg_drivers/components/factories/survey_factory.py b/simpeg_drivers/components/factories/survey_factory.py index 28f893981..ba8e0d9e7 100644 --- a/simpeg_drivers/components/factories/survey_factory.py +++ b/simpeg_drivers/components/factories/survey_factory.py @@ -357,7 +357,7 @@ def _fem_arguments(self, data=None): tx.rx_ids = np.r_[rx_id] sources.append(tx) - source_ids = np.arange(len(receivers)).astype(int) + tx_count + source_ids = np.full(len(block_ordering), tx_count) ordering.append( np.column_stack( [ @@ -368,7 +368,7 @@ def _fem_arguments(self, data=None): ) ) - tx_count = source_ids.max() + 1 + tx_count += 1 self.ordering = np.vstack(ordering).astype(int) self.sorting = np.arange(rx_locs.shape[0], dtype=int) diff --git a/tests/run_tests/driver_airborne_fem_test.py b/tests/run_tests/driver_airborne_fem_test.py index 74f6ad161..2da0a56cb 100644 --- a/tests/run_tests/driver_airborne_fem_test.py +++ b/tests/run_tests/driver_airborne_fem_test.py @@ -137,19 +137,16 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True): components = SyntheticsComponents(geoh5) data = {} uncertainties = {} - channels = { - "vertical_real": "vertical_real", - "vertical_imag": "vertical_imag", - } - - for chan, cname in channels.items(): - data[cname] = [] - uncertainties[f"{cname} uncertainties"] = [] + channels = ["real", "imag"] + + for chan in channels: + data[chan] = [] + uncertainties[f"{chan} uncertainties"] = [] for ind, freq in enumerate(components.survey.channels): data_entity = geoh5.get_entity(f"Iteration_0_{chan}_[{ind}]")[0].copy( parent=components.survey ) - data[cname].append(data_entity) + data[chan].append(data_entity) abs_val = np.abs(data_entity.values) uncert = components.survey.add_data( { @@ -160,7 +157,7 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True): } } ) - uncertainties[f"{cname} uncertainties"].append( + uncertainties[f"{chan} uncertainties"].append( uncert.copy(parent=components.survey) ) @@ -174,7 +171,7 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True): data_kwargs[f"{chan}_channel"] = data_group data_kwargs[f"{chan}_uncertainty"] = uncert_group - orig_z_real_1 = geoh5.get_entity("Iteration_0_vertical_real_[0]")[0].values + orig_z_real_1 = geoh5.get_entity("Iteration_0_real_[0]")[0].values # Run the inverse params = FDEMInversionOptions.build( @@ -217,8 +214,8 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True): output["data"] = orig_z_real_1 assert ( - run_ws.get_entity("Iteration_1_vertical_imag_[1]")[0].entity_type.uid - == run_ws.get_entity("Observed_vertical_imag_[1]")[0].entity_type.uid + run_ws.get_entity("Iteration_1_imag_[1]")[0].entity_type.uid + == run_ws.get_entity("Observed_imag_[1]")[0].entity_type.uid ) if pytest: From 0160f45cca6259a94757d014bc96f5352d483387 Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 28 Apr 2026 11:49:24 -0700 Subject: [PATCH 06/18] Change logic for coaxial --- simpeg_drivers/components/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpeg_drivers/components/data.py b/simpeg_drivers/components/data.py index ab759ecff..5c9d828a8 100644 --- a/simpeg_drivers/components/data.py +++ b/simpeg_drivers/components/data.py @@ -307,7 +307,7 @@ def get_normalizations(self): mu0 * (2 / offsets[chan] ** 3 / (4 * np.pi)) / 1e6 ) - if "vertical" in comp: + if not self.params.coaxial[chan]: normalizations[chan][comp] *= -0.5 elif ( From 685261ad60a9763668c52e6707ca11ecfaa28b2b Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 28 Apr 2026 12:58:06 -0700 Subject: [PATCH 07/18] Adjust normalization, adjust rotation test --- simpeg_drivers/components/data.py | 6 +-- .../oriented_airborne_fem_receiver_test.py | 44 +++++++------------ 2 files changed, 19 insertions(+), 31 deletions(-) diff --git a/simpeg_drivers/components/data.py b/simpeg_drivers/components/data.py index 5c9d828a8..eac7f0bda 100644 --- a/simpeg_drivers/components/data.py +++ b/simpeg_drivers/components/data.py @@ -302,13 +302,13 @@ def get_normalizations(self): offsets = { k: v * np.ones(len(self.locations)) for k, v in offsets.items() } - # Normalization for coplanar - normalizations[chan][comp] = ( + normalizations[chan][comp] = -1 * ( mu0 * (2 / offsets[chan] ** 3 / (4 * np.pi)) / 1e6 ) + # Normalization for coplanar if not self.params.coaxial[chan]: - normalizations[chan][comp] *= -0.5 + normalizations[chan][comp] *= 0.5 elif ( "tdem" in self.params.inversion_type diff --git a/tests/run_tests/oriented_airborne_fem_receiver_test.py b/tests/run_tests/oriented_airborne_fem_receiver_test.py index bed27140b..e3b4995cb 100644 --- a/tests/run_tests/oriented_airborne_fem_receiver_test.py +++ b/tests/run_tests/oriented_airborne_fem_receiver_test.py @@ -46,21 +46,21 @@ def collect_real_components(geoh5): # Load results and validate - data_list = {} + with fetch_active_workspace(geoh5) as ws: group = next(group for group in ws.groups if isinstance(group, UIJsonGroup)) survey = next( child for child in group.children if isinstance(child, AirborneFEMReceivers) ) - for comp in ["vertical", "inline", "crossline"]: - data_group = survey.get_entity(f"Iteration_0_{comp}_real")[0] - data_list[comp] = np.vstack( - [survey.get_data(uid)[0].values for uid in data_group.properties] - ) + data_group = survey.get_entity("Iteration_0_real")[0] + data_list = np.vstack( + [survey.get_data(uid)[0].values for uid in data_group.properties] + ) + return data_list -@pytest.mark.parametrize("azimuth, dip", [(90, 0), (45, 0), (90, 90)]) +@pytest.mark.parametrize("azimuth, dip", [(90, 0), (45, 0)]) def test_fem_fwr_run(tmp_path: Path, azimuth, dip): """ Forward simulations with variable receiver orientations. @@ -108,6 +108,12 @@ def test_fem_fwr_run(tmp_path: Path, azimuth, dip): components = SyntheticsComponents(geoh5, options=opts) survey = components.survey + # Make one of the components coaxial + survey.metadata["EM Dataset"]["Frequency configurations"] = [ + {"Coaxial data": False, "Frequency": 900, "Offset": 7.86}, + {"Coaxial data": True, "Frequency": 7200, "Offset": 7.86}, + {"Coaxial data": False, "Frequency": 56000, "Offset": 6.3}, + ] # Create property group with orientation dip = np.ones(survey.n_vertices) * dip azimuth = np.ones(survey.n_vertices) * azimuth @@ -128,12 +134,8 @@ def test_fem_fwr_run(tmp_path: Path, azimuth, dip): topography_object=components.topography, data_object=components.survey, starting_model=components.model, - z_real_channel_bool=True, - z_imag_channel_bool=True, - x_real_channel_bool=True, - x_imag_channel_bool=True, - y_real_channel_bool=True, - y_imag_channel_bool=True, + real_channel_bool=True, + imag_channel_bool=True, receivers_orientation=pg, ) @@ -154,18 +156,4 @@ def test_validate_orientations(tmp_path: Path): sim_45_0 = collect_real_components(geoh5) # Components almost the same at 45 - assert np.mean((sim_90_0["inline"] - sim_45_0["inline"]) / sim_90_0["inline"]) < 0.2 - - with Workspace( - tmp_path / "../test_fem_fwr_run_90_90_0/inversion_test.ui.geoh5" - ) as geoh5: - sim_90_90 = collect_real_components(geoh5) - - # 90 dip makes Y point down and Z east, so Y should be -Z, and Z should be Y - assert ( - np.mean((sim_90_0["inline"] - sim_90_90["vertical"]) / sim_90_0["inline"]) < 0.2 - ) - assert ( - np.mean((sim_90_0["vertical"] + sim_90_90["inline"]) / sim_90_0["vertical"]) - < 0.2 - ) + assert np.mean((sim_90_0 - sim_45_0) / sim_90_0) < 0.2 From d9eb4ab2fff3553e4968442071ccdea7291056bb Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 28 Apr 2026 15:54:53 -0700 Subject: [PATCH 08/18] Update fem 1d --- .../uijson/fdem1d_forward.ui.json | 18 ++++++-- .../uijson/fdem1d_inversion.ui.json | 26 +++++++---- .../frequency_domain_1d/options.py | 44 ++++++++----------- .../run_tests/driver_airborne_fem_1d_test.py | 10 ++--- 4 files changed, 55 insertions(+), 43 deletions(-) diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index 0abc256e7..a5615ca31 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -16,18 +16,28 @@ ], "value": "" }, - "vertical_imag_channel_bool": { + "imag_channel_bool": { "group": "Survey", "main": true, "label": "Vertical (imaginary)", - "tooltip": "Vertical (w) imaginary component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", + "tooltip": [ + "Imaginary component of the magnetic data. If no receiver orientation provided:
", + "
Co-planar data are positive up along the z-axis .", + "
Co-axial data are positive along North.", + "
" + ], "value": true }, - "vertical_real_channel_bool": { + "real_channel_bool": { "group": "Survey", "main": true, "label": "Vertical (real)", - "tooltip": "Vertical (w) real component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", + "tooltip": [ + "Real component of the magnetic data. If no receiver orientation provided:
", + "
Co-planar data are positive up along the z-axis .", + "
Co-axial data are positive along North.", + "
" + ], "value": true }, "u_cell_size": { diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index fca945fd4..6f59214fa 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -16,7 +16,7 @@ ], "value": "" }, - "vertical_imag_channel": { + "imag_channel": { "association": [ "Cell", "Vertex" @@ -26,13 +26,18 @@ "dataGroupType": "Multi-element", "main": true, "label": "Vertical (imaginary)", - "tooltip": "Vertical (w) imaginary component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", + "tooltip": [ + "Imaginary component of the magnetic data. If no receiver orientation provided:
", + "
Co-planar data are positive up along the z-axis .", + "
Co-axial data are positive along North.", + "
" + ], "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "vertical_imag_uncertainty": { + "imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -43,12 +48,12 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "vertical_imag_channel", + "dependency": "imag_channel", "dependencyType": "enabled", "enabled": false, "value": "" }, - "vertical_real_channel": { + "real_channel": { "association": [ "Cell", "Vertex" @@ -58,13 +63,18 @@ "dataGroupType": "Multi-element", "main": true, "label": "Vertical (real)", - "tooltip": "Vertical (w) real component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided", + "tooltip": [ + "Real component of the magnetic data. If no receiver orientation provided:
", + "
Co-planar data are positive up along the z-axis .", + "
Co-axial data are positive along North.", + "
" + ], "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "vertical_real_uncertainty": { + "real_uncertainty": { "association": [ "Cell", "Vertex" @@ -75,7 +85,7 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "vertical_real_channel", + "dependency": "real_channel", "dependencyType": "enabled", "enabled": false, "value": "" diff --git a/simpeg_drivers/electromagnetics/frequency_domain_1d/options.py b/simpeg_drivers/electromagnetics/frequency_domain_1d/options.py index c8ecc9579..5ffd37e20 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain_1d/options.py +++ b/simpeg_drivers/electromagnetics/frequency_domain_1d/options.py @@ -33,8 +33,8 @@ class FDEM1DForwardOptions(BaseForwardOptions, BaseFDEMOptions, Base1DOptions): """ Frequency Domain Electromagnetic forward options. - :param vertical_real_channel_bool: Z-component data channel boolean. - :param vertical_imag_channel_bool: Imaginary Z-component data channel boolean. + :param real_channel_bool: Z-component data channel boolean. + :param imag_channel_bool: Imaginary Z-component data channel boolean. :param drape_model: Drape model options. """ @@ -45,17 +45,13 @@ class FDEM1DForwardOptions(BaseForwardOptions, BaseFDEMOptions, Base1DOptions): physical_property: str = "conductivity" inversion_type: str = "fdem 1d" data_object: AirborneFEMReceivers - vertical_real_channel_bool: bool = Field( + real_channel_bool: bool = Field( False, - validation_alias=AliasChoices( - "z_real_channel_bool", "vertical_real_channel_bool" - ), + validation_alias=AliasChoices("z_real_channel_bool", "real_channel_bool"), ) - vertical_imag_channel_bool: bool = Field( + imag_channel_bool: bool = Field( False, - validation_alias=AliasChoices( - "z_imag_channel_bool", "vertical_imag_channel_bool" - ), + validation_alias=AliasChoices("z_imag_channel_bool", "imag_channel_bool"), ) models: ConductivityModelOptions @@ -64,10 +60,10 @@ class FDEM1DInversionOptions(BaseFDEMOptions, BaseInversionOptions, Base1DOption """ Frequency Domain Electromagnetic Inversion options. - :param vertical_real_channel: Real Z-component data channel. - :param vertical_real_uncertainty: Real Z-component data channel uncertainty. - :param vertical_imag_channel: Imaginary Z-component data channel. - :param vertical_imag_uncertainty: Imaginary Z-component data channel uncertainty. + :param real_channel: Real Z-component data channel. + :param real_uncertainty: Real Z-component data channel uncertainty. + :param imag_channel: Imaginary Z-component data channel. + :param imag_uncertainty: Imaginary Z-component data channel uncertainty. :param drape_model: Drape model options. """ @@ -82,22 +78,18 @@ class FDEM1DInversionOptions(BaseFDEMOptions, BaseInversionOptions, Base1DOption directives: DirectiveOptions = DirectiveOptions( sens_wts_threshold=100.0, ) - vertical_real_channel: PropertyGroup | None = Field( - None, validation_alias=AliasChoices("z_real_channel", "vertical_real_channel") + real_channel: PropertyGroup | None = Field( + None, validation_alias=AliasChoices("z_real_channel", "real_channel") ) - vertical_real_uncertainty: PropertyGroup | None = Field( + real_uncertainty: PropertyGroup | None = Field( None, - validation_alias=AliasChoices( - "z_real_uncertainty", "vertical_real_uncertainty" - ), + validation_alias=AliasChoices("z_real_uncertainty", "real_uncertainty"), ) - vertical_imag_channel: PropertyGroup | None = Field( - None, validation_alias=AliasChoices("z_imag_channel", "vertical_imag_channel") + imag_channel: PropertyGroup | None = Field( + None, validation_alias=AliasChoices("z_imag_channel", "imag_channel") ) - vertical_imag_uncertainty: PropertyGroup | None = Field( + imag_uncertainty: PropertyGroup | None = Field( None, - validation_alias=AliasChoices( - "z_imag_uncertainty", "vertical_imag_uncertainty" - ), + validation_alias=AliasChoices("z_imag_uncertainty", "imag_uncertainty"), ) models: ConductivityModelOptions diff --git a/tests/run_tests/driver_airborne_fem_1d_test.py b/tests/run_tests/driver_airborne_fem_1d_test.py index 1290754f6..479cd224e 100644 --- a/tests/run_tests/driver_airborne_fem_1d_test.py +++ b/tests/run_tests/driver_airborne_fem_1d_test.py @@ -91,8 +91,8 @@ def test_fem_1d_run(tmp_path: Path, max_iterations=1, pytest=True): data = {} uncertainties = {} channels = { - "vertical_real": "vertical_real", - "vertical_imag": "vertical_imag", + "real": "real", + "imag": "imag", } for chan, cname in channels.items(): @@ -127,7 +127,7 @@ def test_fem_1d_run(tmp_path: Path, max_iterations=1, pytest=True): data_kwargs[f"{chan}_channel"] = data_group data_kwargs[f"{chan}_uncertainty"] = uncert_group - orig_z_real_1 = geoh5.get_entity("Iteration_0_vertical_real_[0]")[0].values + orig_z_real_1 = geoh5.get_entity("Iteration_0_real_[0]")[0].values # Run the inverse params = FDEM1DInversionOptions.build( @@ -160,8 +160,8 @@ def test_fem_1d_run(tmp_path: Path, max_iterations=1, pytest=True): output["data"] = orig_z_real_1 assert ( - run_ws.get_entity("Iteration_1_vertical_imag_[1]")[0].entity_type.uid - == run_ws.get_entity("Observed_vertical_imag_[1]")[0].entity_type.uid + run_ws.get_entity("Iteration_1_imag_[1]")[0].entity_type.uid + == run_ws.get_entity("Observed_imag_[1]")[0].entity_type.uid ) if pytest: From 34fb8af0a8781fa3c9bf1a3de804f0be014808b1 Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 28 Apr 2026 15:58:20 -0700 Subject: [PATCH 09/18] Update docstrings --- .../electromagnetics/frequency_domain/options.py | 8 ++------ .../electromagnetics/frequency_domain_1d/options.py | 12 ++++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/simpeg_drivers/electromagnetics/frequency_domain/options.py b/simpeg_drivers/electromagnetics/frequency_domain/options.py index 69ba54cc3..90bc9a74e 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/options.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/options.py @@ -103,12 +103,8 @@ class FDEMForwardOptions(BaseForwardOptions, BaseFDEMOptions): Frequency Domain Electromagnetic Forward options. :param receivers_orientation: Orientation of the receivers provided as a group. - :param vertical_real_channel_bool: Vertical (real) component of impedance channel boolean. - :param vertical_imag_channel_bool: Vertical (imaginary) component of impedance channel boolean. - :param inline_real_channel_bool: In-line (real) component of impedance channel boolean. - :param inline_imag_channel_bool: In-line (imaginary) component of impedance channel boolean. - :param crossline_real_channel_bool: Cross-line (real) component of impedance channel boolean. - :param crossline_imag_channel_bool: Cross-line (imaginary) component of impedance channel + :param real_channel_bool: Real component of impedance channel boolean. + :param imag_channel_bool: Imaginary component of impedance channel boolean. :param models: ConductivityModelOptions parameter. """ diff --git a/simpeg_drivers/electromagnetics/frequency_domain_1d/options.py b/simpeg_drivers/electromagnetics/frequency_domain_1d/options.py index 5ffd37e20..697baeb92 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain_1d/options.py +++ b/simpeg_drivers/electromagnetics/frequency_domain_1d/options.py @@ -33,8 +33,8 @@ class FDEM1DForwardOptions(BaseForwardOptions, BaseFDEMOptions, Base1DOptions): """ Frequency Domain Electromagnetic forward options. - :param real_channel_bool: Z-component data channel boolean. - :param imag_channel_bool: Imaginary Z-component data channel boolean. + :param real_channel_bool: Real component data channel boolean. + :param imag_channel_bool: Imaginary component data channel boolean. :param drape_model: Drape model options. """ @@ -60,10 +60,10 @@ class FDEM1DInversionOptions(BaseFDEMOptions, BaseInversionOptions, Base1DOption """ Frequency Domain Electromagnetic Inversion options. - :param real_channel: Real Z-component data channel. - :param real_uncertainty: Real Z-component data channel uncertainty. - :param imag_channel: Imaginary Z-component data channel. - :param imag_uncertainty: Imaginary Z-component data channel uncertainty. + :param real_channel: Real component data channel. + :param real_uncertainty: Real component data channel uncertainty. + :param imag_channel: Imaginary component data channel. + :param imag_uncertainty: Imaginary component data channel uncertainty. :param drape_model: Drape model options. """ From dc2c9e0d9684a331dd2562f9a9d7b248d1641c33 Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 28 Apr 2026 21:26:51 -0700 Subject: [PATCH 10/18] Change coaxial to y component --- simpeg_drivers/components/factories/receiver_factory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpeg_drivers/components/factories/receiver_factory.py b/simpeg_drivers/components/factories/receiver_factory.py index c8165f49d..b269b9b5b 100644 --- a/simpeg_drivers/components/factories/receiver_factory.py +++ b/simpeg_drivers/components/factories/receiver_factory.py @@ -32,7 +32,7 @@ ORIENTATION_MAP = { "coplanar": "z", - "coaxial": "x", + "coaxial": "y", "vertical": "z", "inline": "y", "crossline": "x", From c7dd2d946914f77cbc92f124b7533bb1338ea83e Mon Sep 17 00:00:00 2001 From: domfournier Date: Wed, 29 Apr 2026 08:12:12 -0700 Subject: [PATCH 11/18] Docstrings --- simpeg_drivers/components/data.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/simpeg_drivers/components/data.py b/simpeg_drivers/components/data.py index eac7f0bda..6fbed69c3 100644 --- a/simpeg_drivers/components/data.py +++ b/simpeg_drivers/components/data.py @@ -296,7 +296,9 @@ def get_normalizations(self): elif self.params.inversion_type in ["tipper"]: if "imag" in comp: normalizations[chan][comp] = -1 * np.ones(self.mask.sum()) - elif "fdem" == self.params.inversion_type: # Assume always ppm data + + # Assume always ppm data, so convert to SI units using a dipole source + elif "fdem" == self.params.inversion_type: mu0 = 4 * np.pi * 1e-7 offsets = self.params.tx_offsets offsets = { @@ -306,7 +308,7 @@ def get_normalizations(self): mu0 * (2 / offsets[chan] ** 3 / (4 * np.pi)) / 1e6 ) - # Normalization for coplanar + # Normalization for primary coplanar, half the strength of the coaxial component if not self.params.coaxial[chan]: normalizations[chan][comp] *= 0.5 From 21aac22d2db87266e5962227f6f8d053c1ec16ad Mon Sep 17 00:00:00 2001 From: domfournier Date: Thu, 30 Apr 2026 19:16:54 -0700 Subject: [PATCH 12/18] Re-lock --- .../py-3.12-linux-64-dev.conda.lock.yml | 34 +- environments/py-3.12-linux-64.conda.lock.yml | 24 +- .../py-3.12-win-64-dev.conda.lock.yml | 30 +- environments/py-3.12-win-64.conda.lock.yml | 20 +- .../py-3.13-linux-64-dev.conda.lock.yml | 34 +- environments/py-3.13-linux-64.conda.lock.yml | 24 +- .../py-3.13-win-64-dev.conda.lock.yml | 30 +- environments/py-3.13-win-64.conda.lock.yml | 20 +- py-3.12.conda-lock.yml | 296 +++++++++--------- py-3.13.conda-lock.yml | 296 +++++++++--------- 10 files changed, 410 insertions(+), 398 deletions(-) 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 7cb6ee376..1920d473e 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -24,7 +24,7 @@ dependencies: - aws-c-common=0.12.6=hb03c661_0 - aws-c-compression=0.3.2=h8b1a151_0 - aws-c-http=0.10.12=h4bacb7b_1 - - aws-c-io=0.26.3=hc87160b_0 + - aws-c-io=0.26.3=h692f434_1 - aws-c-s3=0.11.5=h6d69fc9_5 - aws-c-sdkutils=0.2.4=h8b1a151_4 - aws-checksums=0.2.10=h8b1a151_0 @@ -45,7 +45,7 @@ dependencies: - certifi=2026.4.22=pyhd8ed1ab_0 - cffi=2.0.0=py312h460c074_1 - charset-normalizer=3.4.7=pyhd8ed1ab_0 - - click=8.3.2=pyhc90fa1f_0 + - click=8.3.3=pyhc90fa1f_0 - cloudpickle=3.1.2=pyhcf101f3_1 - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 @@ -70,7 +70,7 @@ dependencies: - fonttools=4.62.1=py312h8a5da7c_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.14.3=ha770c72_0 - - fsspec=2026.3.0=pyhd8ed1ab_0 + - fsspec=2026.4.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py312h2a48985_0 - h11=0.16.0=pyhcf101f3_1 - h2=4.3.0=pyhcf101f3_0 @@ -87,7 +87,7 @@ dependencies: - importlib_resources=7.1.0=pyhd8ed1ab_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.2.0=pyha191276_1 - - ipython=9.12.0=pyhecfbec7_0 + - ipython=9.13.0=pyh53cf698_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -108,7 +108,7 @@ dependencies: - jupyter_events=0.12.1=pyhcf101f3_0 - jupyter_server=2.17.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.4=pyhcf101f3_0 - - jupyterlab=4.5.6=pyhd8ed1ab_0 + - jupyterlab=4.5.7=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -117,7 +117,7 @@ dependencies: - kiwisolver=1.5.0=py312h0a2e395_0 - krb5=1.22.2=ha1258a1_0 - lark=1.3.1=pyhd8ed1ab_0 - - lcms2=2.18=h0c24ade_0 + - lcms2=2.19=h0c24ade_0 - ld_impl_linux-64=2.45.1=default_hbd61a6d_102 - lerc=4.1.0=hdb68285_0 - libaec=1.1.5=h088129d_0 @@ -126,7 +126,7 @@ dependencies: - libbrotlidec=1.2.0=hb03c661_1 - libbrotlienc=1.2.0=hb03c661_1 - libcblas=3.11.0=6_hfef963f_mkl - - libcurl=8.19.0=hcf29cc6_0 + - libcurl=8.20.0=hcf29cc6_0 - libdeflate=1.25=h17f619e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 @@ -167,7 +167,7 @@ dependencies: - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=4.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h8a5da7c_1 - - matplotlib-base=3.10.8=py312he3d6523_0 + - matplotlib-base=3.10.9=py312he3d6523_0 - matplotlib-inline=0.2.1=pyhd8ed1ab_0 - mccabe=0.7.0=pyhd8ed1ab_1 - mdit-py-plugins=0.5.0=pyhd8ed1ab_0 @@ -184,10 +184,10 @@ dependencies: - nbconvert-core=7.16.6=pyhcf101f3_1 - nbconvert-pandoc=7.16.6=h7d6f222_1 - nbformat=5.10.4=pyhd8ed1ab_1 - - ncurses=6.5=h2d0b736_3 + - ncurses=6.6=hdb14827_0 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - nodejs=22.6.0=hc19f0b3_1 - - notebook=7.5.5=pyhcf101f3_0 + - notebook=7.5.6=pyhcf101f3_1 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312hf79963d_1 - numpy=2.4.3=py312h33ff503_0 @@ -196,7 +196,7 @@ dependencies: - openpyxl=3.1.5=py312h7f6eeab_3 - openssl=3.6.2=h35e630c_0 - overrides=7.7.0=pyhd8ed1ab_1 - - packaging=26.1=pyhc364b38_0 + - packaging=26.2=pyhc364b38_0 - pandas=2.3.3=py312hf79963d_1 - pandoc=3.9.0.2=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 @@ -228,9 +228,9 @@ dependencies: - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.21.2=pyhe01879c_0 - python-gil=3.12.13=hd8ed1ab_0 - - python-json-logger=2.0.7=pyhd8ed1ab_0 + - python-json-logger=3.2.1=pyh332efcf_0 - python-mumps=0.0.6=nompi_h4762de1 - - python-tzdata=2026.1=pyhd8ed1ab_0 + - python-tzdata=2026.2=pyhd8ed1ab_0 - python_abi=3.12=8_cp312 - pytz=2026.1.post1=pyhcf101f3_0 - pyyaml=6.0.3=py312h8a5da7c_1 @@ -239,13 +239,13 @@ dependencies: - readline=8.3=h853b02a_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.37.0=pyhcf101f3_0 - - requests=2.33.1=pyhcf101f3_0 + - requests=2.33.1=pyhcf101f3_1 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - rfc3987-syntax=1.1.0=pyhe01879c_1 - rpds-py=0.30.0=py312h868fb18_0 - rtree=1.4.1=pyh11ca60a_0 - - s2n=1.7.1=h1cbb8d7_1 + - s2n=1.7.2=hc5a330e_1 - scikit-learn=1.8.0=np2py312h3226591_1 - scipy=1.17.1=py312h54fa4ab_0 - send2trash=2.1.0=pyha191276_1 @@ -277,7 +277,7 @@ dependencies: - traitlets=5.14.3=pyhd8ed1ab_1 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.2=pyhd8ed1ab_1 + - typing-inspection=0.4.2=pyhcf101f3_2 - typing_extensions=4.15.0=pyhcf101f3_0 - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025c=hc9c84f9_1 @@ -304,7 +304,7 @@ dependencies: - zstd=1.5.7=hb78ec9c_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index efc53f752..d20c8ff64 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -14,7 +14,7 @@ dependencies: - aws-c-common=0.12.6=hb03c661_0 - aws-c-compression=0.3.2=h8b1a151_0 - aws-c-http=0.10.12=h4bacb7b_1 - - aws-c-io=0.26.3=hc87160b_0 + - aws-c-io=0.26.3=h692f434_1 - aws-c-s3=0.11.5=h6d69fc9_5 - aws-c-sdkutils=0.2.4=h8b1a151_4 - aws-checksums=0.2.10=h8b1a151_0 @@ -28,7 +28,7 @@ dependencies: - ca-certificates=2026.4.22=hbd8a1cb_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - click=8.3.2=pyhc90fa1f_0 + - click=8.3.3=pyhc90fa1f_0 - cloudpickle=3.1.2=pyhcf101f3_1 - contourpy=1.3.3=py312h0a2e395_4 - cycler=0.12.1=pyhcf101f3_2 @@ -41,7 +41,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.62.1=py312h8a5da7c_0 - freetype=2.14.3=ha770c72_0 - - fsspec=2026.3.0=pyhd8ed1ab_0 + - fsspec=2026.4.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py312h2a48985_0 - h2=4.3.0=pyhcf101f3_0 - h5py=3.16.0=nompi_py312ha829cd9_102 @@ -55,7 +55,7 @@ dependencies: - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.5.0=py312h0a2e395_0 - krb5=1.22.2=ha1258a1_0 - - lcms2=2.18=h0c24ade_0 + - lcms2=2.19=h0c24ade_0 - ld_impl_linux-64=2.45.1=default_hbd61a6d_102 - lerc=4.1.0=hdb68285_0 - libaec=1.1.5=h088129d_0 @@ -64,7 +64,7 @@ dependencies: - libbrotlidec=1.2.0=hb03c661_1 - libbrotlienc=1.2.0=hb03c661_1 - libcblas=3.11.0=6_hfef963f_mkl - - libcurl=8.19.0=hcf29cc6_0 + - libcurl=8.20.0=hcf29cc6_0 - libdeflate=1.25=h17f619e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 @@ -102,21 +102,21 @@ dependencies: - llvm-openmp=22.1.4=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h8a5da7c_1 - - matplotlib-base=3.10.8=py312he3d6523_0 + - matplotlib-base=3.10.9=py312he3d6523_0 - metis=5.1.0=hd0bcaf9_1007 - mkl=2025.3.1=h0e700b2_11 - msgpack-python=1.1.2=py312hd9148b4_1 - mumps-include=5.8.2=h5a610fb_2 - mumps-seq=5.8.2=hc1b3267_2 - munkres=1.1.4=pyhd8ed1ab_1 - - ncurses=6.5=h2d0b736_3 + - ncurses=6.6=hdb14827_0 - numcodecs=0.15.1=py312hf79963d_1 - numpy=2.4.3=py312h33ff503_0 - onemkl-license=2025.3.1=hf2ce2f3_11 - openjpeg=2.5.4=h55fea9a_0 - openpyxl=3.1.5=py312h7f6eeab_3 - openssl=3.6.2=h35e630c_0 - - packaging=26.1=pyhc364b38_0 + - packaging=26.2=pyhc364b38_0 - pandas=2.3.3=py312hf79963d_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.2.0=py312h50c33e8_0 @@ -132,14 +132,14 @@ dependencies: - python=3.12.13=hd63d673_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.6=nompi_h4762de1 - - python-tzdata=2026.1=pyhd8ed1ab_0 + - python-tzdata=2026.2=pyhd8ed1ab_0 - python_abi=3.12=8_cp312 - pytz=2026.1.post1=pyhcf101f3_0 - pyyaml=6.0.3=py312h8a5da7c_1 - qhull=2020.2=h434a139_5 - readline=8.3=h853b02a_0 - rtree=1.4.1=pyh11ca60a_0 - - s2n=1.7.1=h1cbb8d7_1 + - s2n=1.7.2=hc5a330e_1 - scikit-learn=1.8.0=np2py312h3226591_1 - scipy=1.17.1=py312h54fa4ab_0 - setuptools=82.0.1=pyh332efcf_0 @@ -154,7 +154,7 @@ dependencies: - tqdm=4.67.3=pyh8f84b5b_0 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.2=pyhd8ed1ab_1 + - typing-inspection=0.4.2=pyhcf101f3_2 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025c=hc9c84f9_1 - unicodedata2=17.0.1=py312h4c3975b_0 @@ -172,7 +172,7 @@ dependencies: - zstd=1.5.7=hb78ec9c_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 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 ced9e7351..c3282a8cb 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -24,7 +24,7 @@ dependencies: - aws-c-common=0.12.6=hfd05255_0 - aws-c-compression=0.3.2=hcb3a2da_0 - aws-c-http=0.10.12=h612f3e8_1 - - aws-c-io=0.26.3=h0d5b9f9_0 + - aws-c-io=0.26.3=h0d5b9f9_1 - aws-c-s3=0.11.5=h87bd87b_5 - aws-c-sdkutils=0.2.4=hcb3a2da_4 - aws-checksums=0.2.10=hcb3a2da_0 @@ -44,7 +44,7 @@ dependencies: - certifi=2026.4.22=pyhd8ed1ab_0 - cffi=2.0.0=py312he06e257_1 - charset-normalizer=3.4.7=pyhd8ed1ab_0 - - click=8.3.2=pyh6dadd2b_0 + - click=8.3.3=pyh6dadd2b_0 - cloudpickle=3.1.2=pyhcf101f3_1 - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 @@ -69,7 +69,7 @@ dependencies: - fonttools=4.62.1=py312h05f76fc_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.14.3=h57928b3_0 - - fsspec=2026.3.0=pyhd8ed1ab_0 + - fsspec=2026.4.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py312h7c90ba1_0 - h11=0.16.0=pyhcf101f3_1 - h2=4.3.0=pyhcf101f3_0 @@ -85,7 +85,7 @@ dependencies: - importlib_resources=7.1.0=pyhd8ed1ab_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.2.0=pyh6dadd2b_1 - - ipython=9.12.0=pyhccfa634_0 + - ipython=9.13.0=pyhe2676ad_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -106,7 +106,7 @@ dependencies: - jupyter_events=0.12.1=pyhcf101f3_0 - jupyter_server=2.17.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.4=pyhcf101f3_0 - - jupyterlab=4.5.6=pyhd8ed1ab_0 + - jupyterlab=4.5.7=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -114,7 +114,7 @@ dependencies: - kiwisolver=1.5.0=py312h78d62e6_0 - krb5=1.22.2=h0ea6238_0 - lark=1.3.1=pyhd8ed1ab_0 - - lcms2=2.18=hf2c6c5f_0 + - lcms2=2.19=hf2c6c5f_0 - lerc=4.1.0=hd936e49_0 - libaec=1.1.5=haf901d7_0 - libblas=3.11.0=6_hf2e6a31_mkl @@ -122,7 +122,7 @@ dependencies: - libbrotlidec=1.2.0=hfd05255_1 - libbrotlienc=1.2.0=hfd05255_1 - libcblas=3.11.0=6_h2a3cdd5_mkl - - libcurl=8.19.0=h8206538_0 + - libcurl=8.20.0=h8206538_0 - libdeflate=1.25=h51727cc_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.5=hac47afa_0 @@ -152,7 +152,7 @@ dependencies: - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=4.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h05f76fc_1 - - matplotlib-base=3.10.8=py312h0ebf65c_0 + - matplotlib-base=3.10.9=py312h0ebf65c_0 - matplotlib-inline=0.2.1=pyhd8ed1ab_0 - mccabe=0.7.0=pyhd8ed1ab_1 - mdit-py-plugins=0.5.0=pyhd8ed1ab_0 @@ -169,7 +169,7 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - nodejs=25.8.2=h80d1838_0 - - notebook=7.5.5=pyhcf101f3_0 + - notebook=7.5.6=pyhcf101f3_1 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312hc128f0a_1 - numpy=2.4.3=py312ha3f287d_0 @@ -178,7 +178,7 @@ dependencies: - openpyxl=3.1.5=py312h83acffa_3 - openssl=3.6.2=hf411b9b_0 - overrides=7.7.0=pyhd8ed1ab_1 - - packaging=26.1=pyhc364b38_0 + - packaging=26.2=pyhc364b38_0 - pandas=2.3.3=py312hc128f0a_2 - pandoc=3.9.0.2=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 @@ -208,9 +208,9 @@ dependencies: - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.21.2=pyhe01879c_0 - python-gil=3.12.13=hd8ed1ab_0 - - python-json-logger=2.0.7=pyhd8ed1ab_0 + - python-json-logger=3.2.1=pyh332efcf_0 - python-mumps=0.0.6=nompi_hd0d704b - - python-tzdata=2026.1=pyhd8ed1ab_0 + - python-tzdata=2026.2=pyhd8ed1ab_0 - python_abi=3.12=8_cp312 - pytz=2026.1.post1=pyhcf101f3_0 - pywin32=311=py312h829343e_1 @@ -220,7 +220,7 @@ dependencies: - qhull=2020.2=hc790b64_5 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.37.0=pyhcf101f3_0 - - requests=2.33.1=pyhcf101f3_0 + - requests=2.33.1=pyhcf101f3_1 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - rfc3987-syntax=1.1.0=pyhe01879c_1 @@ -257,7 +257,7 @@ dependencies: - traitlets=5.14.3=pyhd8ed1ab_1 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.2=pyhd8ed1ab_1 + - typing-inspection=0.4.2=pyhcf101f3_2 - typing_extensions=4.15.0=pyhcf101f3_0 - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025c=hc9c84f9_1 @@ -289,7 +289,7 @@ dependencies: - zstd=1.5.7=h534d264_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 1ef3bafae..000e5d697 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -14,7 +14,7 @@ dependencies: - aws-c-common=0.12.6=hfd05255_0 - aws-c-compression=0.3.2=hcb3a2da_0 - aws-c-http=0.10.12=h612f3e8_1 - - aws-c-io=0.26.3=h0d5b9f9_0 + - aws-c-io=0.26.3=h0d5b9f9_1 - aws-c-s3=0.11.5=h87bd87b_5 - aws-c-sdkutils=0.2.4=hcb3a2da_4 - aws-checksums=0.2.10=hcb3a2da_0 @@ -27,7 +27,7 @@ dependencies: - ca-certificates=2026.4.22=h4c7d964_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - click=8.3.2=pyh6dadd2b_0 + - click=8.3.3=pyh6dadd2b_0 - cloudpickle=3.1.2=pyhcf101f3_1 - colorama=0.4.6=pyhd8ed1ab_1 - contourpy=1.3.3=py312h78d62e6_4 @@ -41,7 +41,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.62.1=py312h05f76fc_0 - freetype=2.14.3=h57928b3_0 - - fsspec=2026.3.0=pyhd8ed1ab_0 + - fsspec=2026.4.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py312h7c90ba1_0 - h2=4.3.0=pyhcf101f3_0 - h5py=3.16.0=nompi_py312h5ddec8c_102 @@ -53,7 +53,7 @@ dependencies: - joblib=1.5.3=pyhd8ed1ab_0 - kiwisolver=1.5.0=py312h78d62e6_0 - krb5=1.22.2=h0ea6238_0 - - lcms2=2.18=hf2c6c5f_0 + - lcms2=2.19=hf2c6c5f_0 - lerc=4.1.0=hd936e49_0 - libaec=1.1.5=haf901d7_0 - libblas=3.11.0=6_hf2e6a31_mkl @@ -61,7 +61,7 @@ dependencies: - libbrotlidec=1.2.0=hfd05255_1 - libbrotlienc=1.2.0=hfd05255_1 - libcblas=3.11.0=6_h2a3cdd5_mkl - - libcurl=8.19.0=h8206538_0 + - libcurl=8.20.0=h8206538_0 - libdeflate=1.25=h51727cc_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.5=hac47afa_0 @@ -89,7 +89,7 @@ dependencies: - llvm-openmp=22.1.4=h4fa8253_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h05f76fc_1 - - matplotlib-base=3.10.8=py312h0ebf65c_0 + - matplotlib-base=3.10.9=py312h0ebf65c_0 - mkl=2025.3.1=hac47afa_12 - msgpack-python=1.1.2=py312hf90b1b7_1 - mumps-seq=5.8.2=h607cc0b_2 @@ -100,7 +100,7 @@ dependencies: - openjpeg=2.5.4=h0e57b4f_0 - openpyxl=3.1.5=py312h83acffa_3 - openssl=3.6.2=hf411b9b_0 - - packaging=26.1=pyhc364b38_0 + - packaging=26.2=pyhc364b38_0 - pandas=2.3.3=py312hc128f0a_2 - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.2.0=py312h31f0997_0 @@ -116,7 +116,7 @@ dependencies: - python=3.12.13=h0159041_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.6=nompi_hd0d704b - - python-tzdata=2026.1=pyhd8ed1ab_0 + - python-tzdata=2026.2=pyhd8ed1ab_0 - python_abi=3.12=8_cp312 - pytz=2026.1.post1=pyhcf101f3_0 - pyyaml=6.0.3=py312h05f76fc_1 @@ -136,7 +136,7 @@ dependencies: - tqdm=4.67.3=pyha7b4d00_0 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.2=pyhd8ed1ab_1 + - typing-inspection=0.4.2=pyhcf101f3_2 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025c=hc9c84f9_1 - ucrt=10.0.26100.0=h57928b3_0 @@ -159,7 +159,7 @@ dependencies: - zstd=1.5.7=h534d264_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 diff --git a/environments/py-3.13-linux-64-dev.conda.lock.yml b/environments/py-3.13-linux-64-dev.conda.lock.yml index 0e2f077b3..1f8480d99 100644 --- a/environments/py-3.13-linux-64-dev.conda.lock.yml +++ b/environments/py-3.13-linux-64-dev.conda.lock.yml @@ -24,7 +24,7 @@ dependencies: - aws-c-common=0.12.6=hb03c661_0 - aws-c-compression=0.3.2=h8b1a151_0 - aws-c-http=0.10.12=h4bacb7b_1 - - aws-c-io=0.26.3=hc87160b_0 + - aws-c-io=0.26.3=h692f434_1 - aws-c-s3=0.11.5=h6d69fc9_5 - aws-c-sdkutils=0.2.4=h8b1a151_4 - aws-checksums=0.2.10=h8b1a151_0 @@ -45,7 +45,7 @@ dependencies: - certifi=2026.4.22=pyhd8ed1ab_0 - cffi=2.0.0=py313hf46b229_1 - charset-normalizer=3.4.7=pyhd8ed1ab_0 - - click=8.3.2=pyhc90fa1f_0 + - click=8.3.3=pyhc90fa1f_0 - cloudpickle=3.1.2=pyhcf101f3_1 - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 @@ -70,7 +70,7 @@ dependencies: - fonttools=4.62.1=py313h3dea7bd_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.14.3=ha770c72_0 - - fsspec=2026.3.0=pyhd8ed1ab_0 + - fsspec=2026.4.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py313h0f78c12_0 - h11=0.16.0=pyhcf101f3_1 - h2=4.3.0=pyhcf101f3_0 @@ -87,7 +87,7 @@ dependencies: - importlib_resources=7.1.0=pyhd8ed1ab_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.2.0=pyha191276_1 - - ipython=9.12.0=pyhecfbec7_0 + - ipython=9.13.0=pyh53cf698_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -108,7 +108,7 @@ dependencies: - jupyter_events=0.12.1=pyhcf101f3_0 - jupyter_server=2.17.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.4=pyhcf101f3_0 - - jupyterlab=4.5.6=pyhd8ed1ab_0 + - jupyterlab=4.5.7=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -117,7 +117,7 @@ dependencies: - kiwisolver=1.5.0=py313hc8edb43_0 - krb5=1.22.2=ha1258a1_0 - lark=1.3.1=pyhd8ed1ab_0 - - lcms2=2.18=h0c24ade_0 + - lcms2=2.19=h0c24ade_0 - ld_impl_linux-64=2.45.1=default_hbd61a6d_102 - lerc=4.1.0=hdb68285_0 - libaec=1.1.5=h088129d_0 @@ -126,7 +126,7 @@ dependencies: - libbrotlidec=1.2.0=hb03c661_1 - libbrotlienc=1.2.0=hb03c661_1 - libcblas=3.11.0=6_hfef963f_mkl - - libcurl=8.19.0=hcf29cc6_0 + - libcurl=8.20.0=hcf29cc6_0 - libdeflate=1.25=h17f619e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 @@ -166,7 +166,7 @@ dependencies: - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=4.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py313h3dea7bd_1 - - matplotlib-base=3.10.8=py313h683a580_0 + - matplotlib-base=3.10.9=py313h683a580_0 - matplotlib-inline=0.2.1=pyhd8ed1ab_0 - mccabe=0.7.0=pyhd8ed1ab_1 - mdit-py-plugins=0.5.0=pyhd8ed1ab_0 @@ -183,10 +183,10 @@ dependencies: - nbconvert-core=7.16.6=pyhcf101f3_1 - nbconvert-pandoc=7.16.6=h7d6f222_1 - nbformat=5.10.4=pyhd8ed1ab_1 - - ncurses=6.5=h2d0b736_3 + - ncurses=6.6=hdb14827_0 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - nodejs=22.6.0=hc19f0b3_1 - - notebook=7.5.5=pyhcf101f3_0 + - notebook=7.5.6=pyhcf101f3_1 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py313h08cd8bf_1 - numpy=2.4.3=py313hf6604e3_0 @@ -195,7 +195,7 @@ dependencies: - openpyxl=3.1.5=py313ha4be090_3 - openssl=3.6.2=h35e630c_0 - overrides=7.7.0=pyhd8ed1ab_1 - - packaging=26.1=pyhc364b38_0 + - packaging=26.2=pyhc364b38_0 - pandas=2.3.3=py313h08cd8bf_2 - pandoc=3.9.0.2=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 @@ -227,9 +227,9 @@ dependencies: - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.21.2=pyhe01879c_0 - python-gil=3.13.13=h4df99d1_100 - - python-json-logger=2.0.7=pyhd8ed1ab_0 + - python-json-logger=3.2.1=pyh332efcf_0 - python-mumps=0.0.6=nompi_h2980587 - - python-tzdata=2026.1=pyhd8ed1ab_0 + - python-tzdata=2026.2=pyhd8ed1ab_0 - python_abi=3.13=8_cp313 - pytz=2026.1.post1=pyhcf101f3_0 - pyyaml=6.0.3=py313h3dea7bd_1 @@ -238,13 +238,13 @@ dependencies: - readline=8.3=h853b02a_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.37.0=pyhcf101f3_0 - - requests=2.33.1=pyhcf101f3_0 + - requests=2.33.1=pyhcf101f3_1 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - rfc3987-syntax=1.1.0=pyhe01879c_1 - rpds-py=0.30.0=py313h843e2db_0 - rtree=1.4.1=pyh11ca60a_0 - - s2n=1.7.1=h1cbb8d7_1 + - s2n=1.7.2=hc5a330e_1 - scikit-learn=1.8.0=np2py313h16d504d_1 - scipy=1.17.1=py313h4b8bb8b_0 - send2trash=2.1.0=pyha191276_1 @@ -276,7 +276,7 @@ dependencies: - traitlets=5.14.3=pyhd8ed1ab_1 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.2=pyhd8ed1ab_1 + - typing-inspection=0.4.2=pyhcf101f3_2 - typing_extensions=4.15.0=pyhcf101f3_0 - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025c=hc9c84f9_1 @@ -301,7 +301,7 @@ dependencies: - zstd=1.5.7=hb78ec9c_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 diff --git a/environments/py-3.13-linux-64.conda.lock.yml b/environments/py-3.13-linux-64.conda.lock.yml index b015acab2..e9a9bc446 100644 --- a/environments/py-3.13-linux-64.conda.lock.yml +++ b/environments/py-3.13-linux-64.conda.lock.yml @@ -14,7 +14,7 @@ dependencies: - aws-c-common=0.12.6=hb03c661_0 - aws-c-compression=0.3.2=h8b1a151_0 - aws-c-http=0.10.12=h4bacb7b_1 - - aws-c-io=0.26.3=hc87160b_0 + - aws-c-io=0.26.3=h692f434_1 - aws-c-s3=0.11.5=h6d69fc9_5 - aws-c-sdkutils=0.2.4=h8b1a151_4 - aws-checksums=0.2.10=h8b1a151_0 @@ -28,7 +28,7 @@ dependencies: - ca-certificates=2026.4.22=hbd8a1cb_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - click=8.3.2=pyhc90fa1f_0 + - click=8.3.3=pyhc90fa1f_0 - cloudpickle=3.1.2=pyhcf101f3_1 - contourpy=1.3.3=py313hc8edb43_4 - cycler=0.12.1=pyhcf101f3_2 @@ -41,7 +41,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.62.1=py313h3dea7bd_0 - freetype=2.14.3=ha770c72_0 - - fsspec=2026.3.0=pyhd8ed1ab_0 + - fsspec=2026.4.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py313h0f78c12_0 - h2=4.3.0=pyhcf101f3_0 - h5py=3.16.0=nompi_py313h22c32d4_102 @@ -55,7 +55,7 @@ dependencies: - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.5.0=py313hc8edb43_0 - krb5=1.22.2=ha1258a1_0 - - lcms2=2.18=h0c24ade_0 + - lcms2=2.19=h0c24ade_0 - ld_impl_linux-64=2.45.1=default_hbd61a6d_102 - lerc=4.1.0=hdb68285_0 - libaec=1.1.5=h088129d_0 @@ -64,7 +64,7 @@ dependencies: - libbrotlidec=1.2.0=hb03c661_1 - libbrotlienc=1.2.0=hb03c661_1 - libcblas=3.11.0=6_hfef963f_mkl - - libcurl=8.19.0=hcf29cc6_0 + - libcurl=8.20.0=hcf29cc6_0 - libdeflate=1.25=h17f619e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 @@ -101,21 +101,21 @@ dependencies: - llvm-openmp=22.1.4=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py313h3dea7bd_1 - - matplotlib-base=3.10.8=py313h683a580_0 + - matplotlib-base=3.10.9=py313h683a580_0 - metis=5.1.0=hd0bcaf9_1007 - mkl=2025.3.1=h0e700b2_11 - msgpack-python=1.1.2=py313h7037e92_1 - mumps-include=5.8.2=h5a610fb_2 - mumps-seq=5.8.2=hc1b3267_2 - munkres=1.1.4=pyhd8ed1ab_1 - - ncurses=6.5=h2d0b736_3 + - ncurses=6.6=hdb14827_0 - numcodecs=0.15.1=py313h08cd8bf_1 - numpy=2.4.3=py313hf6604e3_0 - onemkl-license=2025.3.1=hf2ce2f3_11 - openjpeg=2.5.4=h55fea9a_0 - openpyxl=3.1.5=py313ha4be090_3 - openssl=3.6.2=h35e630c_0 - - packaging=26.1=pyhc364b38_0 + - packaging=26.2=pyhc364b38_0 - pandas=2.3.3=py313h08cd8bf_2 - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.2.0=py313h80991f8_0 @@ -131,14 +131,14 @@ dependencies: - python=3.13.13=h6add32d_100_cp313 - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.6=nompi_h2980587 - - python-tzdata=2026.1=pyhd8ed1ab_0 + - python-tzdata=2026.2=pyhd8ed1ab_0 - python_abi=3.13=8_cp313 - pytz=2026.1.post1=pyhcf101f3_0 - pyyaml=6.0.3=py313h3dea7bd_1 - qhull=2020.2=h434a139_5 - readline=8.3=h853b02a_0 - rtree=1.4.1=pyh11ca60a_0 - - s2n=1.7.1=h1cbb8d7_1 + - s2n=1.7.2=hc5a330e_1 - scikit-learn=1.8.0=np2py313h16d504d_1 - scipy=1.17.1=py313h4b8bb8b_0 - setuptools=82.0.1=pyh332efcf_0 @@ -153,7 +153,7 @@ dependencies: - tqdm=4.67.3=pyh8f84b5b_0 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.2=pyhd8ed1ab_1 + - typing-inspection=0.4.2=pyhcf101f3_2 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025c=hc9c84f9_1 - urllib3=2.6.3=pyhd8ed1ab_0 @@ -169,7 +169,7 @@ dependencies: - zstd=1.5.7=hb78ec9c_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 diff --git a/environments/py-3.13-win-64-dev.conda.lock.yml b/environments/py-3.13-win-64-dev.conda.lock.yml index f9e80f484..95667ce62 100644 --- a/environments/py-3.13-win-64-dev.conda.lock.yml +++ b/environments/py-3.13-win-64-dev.conda.lock.yml @@ -24,7 +24,7 @@ dependencies: - aws-c-common=0.12.6=hfd05255_0 - aws-c-compression=0.3.2=hcb3a2da_0 - aws-c-http=0.10.12=h612f3e8_1 - - aws-c-io=0.26.3=h0d5b9f9_0 + - aws-c-io=0.26.3=h0d5b9f9_1 - aws-c-s3=0.11.5=h87bd87b_5 - aws-c-sdkutils=0.2.4=hcb3a2da_4 - aws-checksums=0.2.10=hcb3a2da_0 @@ -44,7 +44,7 @@ dependencies: - certifi=2026.4.22=pyhd8ed1ab_0 - cffi=2.0.0=py313h5ea7bf4_1 - charset-normalizer=3.4.7=pyhd8ed1ab_0 - - click=8.3.2=pyh6dadd2b_0 + - click=8.3.3=pyh6dadd2b_0 - cloudpickle=3.1.2=pyhcf101f3_1 - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 @@ -69,7 +69,7 @@ dependencies: - fonttools=4.62.1=py313hd650c13_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.14.3=h57928b3_0 - - fsspec=2026.3.0=pyhd8ed1ab_0 + - fsspec=2026.4.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py313hedd11bf_0 - h11=0.16.0=pyhcf101f3_1 - h2=4.3.0=pyhcf101f3_0 @@ -85,7 +85,7 @@ dependencies: - importlib_resources=7.1.0=pyhd8ed1ab_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.2.0=pyh6dadd2b_1 - - ipython=9.12.0=pyhccfa634_0 + - ipython=9.13.0=pyhe2676ad_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -106,7 +106,7 @@ dependencies: - jupyter_events=0.12.1=pyhcf101f3_0 - jupyter_server=2.17.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.4=pyhcf101f3_0 - - jupyterlab=4.5.6=pyhd8ed1ab_0 + - jupyterlab=4.5.7=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -114,7 +114,7 @@ dependencies: - kiwisolver=1.5.0=py313h1a38498_0 - krb5=1.22.2=h0ea6238_0 - lark=1.3.1=pyhd8ed1ab_0 - - lcms2=2.18=hf2c6c5f_0 + - lcms2=2.19=hf2c6c5f_0 - lerc=4.1.0=hd936e49_0 - libaec=1.1.5=haf901d7_0 - libblas=3.11.0=6_hf2e6a31_mkl @@ -122,7 +122,7 @@ dependencies: - libbrotlidec=1.2.0=hfd05255_1 - libbrotlienc=1.2.0=hfd05255_1 - libcblas=3.11.0=6_h2a3cdd5_mkl - - libcurl=8.19.0=h8206538_0 + - libcurl=8.20.0=h8206538_0 - libdeflate=1.25=h51727cc_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.5=hac47afa_0 @@ -153,7 +153,7 @@ dependencies: - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=4.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py313hd650c13_1 - - matplotlib-base=3.10.8=py313he1ded55_0 + - matplotlib-base=3.10.9=py313he1ded55_0 - matplotlib-inline=0.2.1=pyhd8ed1ab_0 - mccabe=0.7.0=pyhd8ed1ab_1 - mdit-py-plugins=0.5.0=pyhd8ed1ab_0 @@ -170,7 +170,7 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - nodejs=25.8.2=h80d1838_0 - - notebook=7.5.5=pyhcf101f3_0 + - notebook=7.5.6=pyhcf101f3_1 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py313hc90dcd4_1 - numpy=2.4.3=py313ha8dc839_0 @@ -179,7 +179,7 @@ dependencies: - openpyxl=3.1.5=py313hc624790_3 - openssl=3.6.2=hf411b9b_0 - overrides=7.7.0=pyhd8ed1ab_1 - - packaging=26.1=pyhc364b38_0 + - packaging=26.2=pyhc364b38_0 - pandas=2.3.3=py313hc90dcd4_2 - pandoc=3.9.0.2=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 @@ -209,9 +209,9 @@ dependencies: - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.21.2=pyhe01879c_0 - python-gil=3.13.13=h4df99d1_100 - - python-json-logger=2.0.7=pyhd8ed1ab_0 + - python-json-logger=3.2.1=pyh332efcf_0 - python-mumps=0.0.6=nompi_h88661b0 - - python-tzdata=2026.1=pyhd8ed1ab_0 + - python-tzdata=2026.2=pyhd8ed1ab_0 - python_abi=3.13=8_cp313 - pytz=2026.1.post1=pyhcf101f3_0 - pywin32=311=py313h40c08fc_1 @@ -221,7 +221,7 @@ dependencies: - qhull=2020.2=hc790b64_5 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.37.0=pyhcf101f3_0 - - requests=2.33.1=pyhcf101f3_0 + - requests=2.33.1=pyhcf101f3_1 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - rfc3987-syntax=1.1.0=pyhe01879c_1 @@ -258,7 +258,7 @@ dependencies: - traitlets=5.14.3=pyhd8ed1ab_1 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.2=pyhd8ed1ab_1 + - typing-inspection=0.4.2=pyhcf101f3_2 - typing_extensions=4.15.0=pyhcf101f3_0 - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025c=hc9c84f9_1 @@ -288,7 +288,7 @@ dependencies: - zstd=1.5.7=h534d264_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 diff --git a/environments/py-3.13-win-64.conda.lock.yml b/environments/py-3.13-win-64.conda.lock.yml index a591a3d9f..f0dd0ae42 100644 --- a/environments/py-3.13-win-64.conda.lock.yml +++ b/environments/py-3.13-win-64.conda.lock.yml @@ -14,7 +14,7 @@ dependencies: - aws-c-common=0.12.6=hfd05255_0 - aws-c-compression=0.3.2=hcb3a2da_0 - aws-c-http=0.10.12=h612f3e8_1 - - aws-c-io=0.26.3=h0d5b9f9_0 + - aws-c-io=0.26.3=h0d5b9f9_1 - aws-c-s3=0.11.5=h87bd87b_5 - aws-c-sdkutils=0.2.4=hcb3a2da_4 - aws-checksums=0.2.10=hcb3a2da_0 @@ -27,7 +27,7 @@ dependencies: - ca-certificates=2026.4.22=h4c7d964_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - click=8.3.2=pyh6dadd2b_0 + - click=8.3.3=pyh6dadd2b_0 - cloudpickle=3.1.2=pyhcf101f3_1 - colorama=0.4.6=pyhd8ed1ab_1 - contourpy=1.3.3=py313h1a38498_4 @@ -41,7 +41,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.62.1=py313hd650c13_0 - freetype=2.14.3=h57928b3_0 - - fsspec=2026.3.0=pyhd8ed1ab_0 + - fsspec=2026.4.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py313hedd11bf_0 - h2=4.3.0=pyhcf101f3_0 - h5py=3.16.0=nompi_py313hd050a09_102 @@ -53,7 +53,7 @@ dependencies: - joblib=1.5.3=pyhd8ed1ab_0 - kiwisolver=1.5.0=py313h1a38498_0 - krb5=1.22.2=h0ea6238_0 - - lcms2=2.18=hf2c6c5f_0 + - lcms2=2.19=hf2c6c5f_0 - lerc=4.1.0=hd936e49_0 - libaec=1.1.5=haf901d7_0 - libblas=3.11.0=6_hf2e6a31_mkl @@ -61,7 +61,7 @@ dependencies: - libbrotlidec=1.2.0=hfd05255_1 - libbrotlienc=1.2.0=hfd05255_1 - libcblas=3.11.0=6_h2a3cdd5_mkl - - libcurl=8.19.0=h8206538_0 + - libcurl=8.20.0=h8206538_0 - libdeflate=1.25=h51727cc_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.5=hac47afa_0 @@ -90,7 +90,7 @@ dependencies: - llvm-openmp=22.1.4=h4fa8253_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py313hd650c13_1 - - matplotlib-base=3.10.8=py313he1ded55_0 + - matplotlib-base=3.10.9=py313he1ded55_0 - mkl=2025.3.1=hac47afa_12 - msgpack-python=1.1.2=py313hf069bd2_1 - mumps-seq=5.8.2=h607cc0b_2 @@ -101,7 +101,7 @@ dependencies: - openjpeg=2.5.4=h0e57b4f_0 - openpyxl=3.1.5=py313hc624790_3 - openssl=3.6.2=hf411b9b_0 - - packaging=26.1=pyhc364b38_0 + - packaging=26.2=pyhc364b38_0 - pandas=2.3.3=py313hc90dcd4_2 - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.2.0=py313h38f99e1_0 @@ -117,7 +117,7 @@ dependencies: - python=3.13.13=h09917c8_100_cp313 - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.6=nompi_h88661b0 - - python-tzdata=2026.1=pyhd8ed1ab_0 + - python-tzdata=2026.2=pyhd8ed1ab_0 - python_abi=3.13=8_cp313 - pytz=2026.1.post1=pyhcf101f3_0 - pyyaml=6.0.3=py313hd650c13_1 @@ -137,7 +137,7 @@ dependencies: - tqdm=4.67.3=pyha7b4d00_0 - trimesh=4.1.8=pyhd8ed1ab_0 - typing-extensions=4.15.0=h396c80c_0 - - typing-inspection=0.4.2=pyhd8ed1ab_1 + - typing-inspection=0.4.2=pyhcf101f3_2 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025c=hc9c84f9_1 - ucrt=10.0.26100.0=h57928b3_0 @@ -158,7 +158,7 @@ dependencies: - zstd=1.5.7=h534d264_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 3dc29b61f..0094a7d5d 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -540,11 +540,11 @@ package: aws-c-cal: '>=0.9.13,<0.9.14.0a0' aws-c-common: '>=0.12.6,<0.12.7.0a0' libgcc: '>=14' - s2n: '>=1.7.1,<1.7.2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/aws-c-io-0.26.3-hc87160b_0.conda + s2n: '>=1.7.2,<1.7.3.0a0' + url: https://repo.prefix.dev/conda-forge/linux-64/aws-c-io-0.26.3-h692f434_1.conda hash: - md5: dde6a3e4fe6bb2ecd2a7050dd1e701fb - sha256: c66ebb7815949db72bab7c86bf477197e4bc6937c381cf32248bdd1ce496db00 + md5: 14260392d0b491c537b5e26e9a506fff + sha256: e3e33031d641864128ab11f9b8585ad5beb82fa988fe833bb0767dd01878a371 category: main optional: false - name: aws-c-io @@ -557,10 +557,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/aws-c-io-0.26.3-h0d5b9f9_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/aws-c-io-0.26.3-h0d5b9f9_1.conda hash: - md5: ce36c60ed6b15c8dbb7ccddec4ebf57f - sha256: 3c9d50fb7895df4edd72d177299551608c24d8b0b82db0cf34c8e2bf6644979c + md5: d6091ef6857cee4f541716790de07b48 + sha256: 77a9e9cbbea1ed76d02605955a8cf098d3793a8dc871b31b4617a8054f151639 category: main optional: false - name: aws-c-s3 @@ -1131,30 +1131,30 @@ package: category: dev optional: true - name: click - version: 8.3.2 + version: 8.3.3 manager: conda platform: linux-64 dependencies: __unix: '' python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.2-pyhc90fa1f_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.3-pyhc90fa1f_0.conda hash: - md5: 4d18bc3af7cfcea97bd817164672a08c - sha256: 526d434cf5390310f40f34ea6ec4f0c225cdf1e419010e624d399b13b2059f0f + md5: 2266262ce8a425ecb6523d765f79b303 + sha256: 37a5d8b10ea3516e2c42f870c9c351b9f7b31ff48c66d83490039f417e1e5228 category: main optional: false - name: click - version: 8.3.2 + version: 8.3.3 manager: conda platform: win-64 dependencies: __win: '' colorama: '' python: '' - url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.2-pyh6dadd2b_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.3-pyh6dadd2b_0.conda hash: - md5: 290d6b8ba791f99e068327e5d17e8462 - sha256: e67e85d5837cf0b0151b58b449badb0a8c2018d209e05c28f1b0c079e6e93666 + md5: 8f03c7a39b01ebc57b647f7b48bbeed9 + sha256: acdcff82819e9c20719f8e6b6f69d72109ee056445a9995417dafe15a50d07fa category: main optional: false - name: cloudpickle @@ -1855,27 +1855,27 @@ package: category: main optional: false - name: fsspec - version: 2026.3.0 + version: 2026.4.0 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/fsspec-2026.3.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/fsspec-2026.4.0-pyhd8ed1ab_0.conda hash: - md5: c18d2ba7577cdc618a20d45f1e31d14b - sha256: b4a7aec32167502dd4a2d1fb1208c63760828d7111339aa5b305b2d776afa70f + md5: 2c11aa96ea85ced419de710c1c3a78ff + sha256: 079701b4ff3b317a1a158cabd48cf2b856b8b8d3ef44f152809d9acf20cc8e10 category: main optional: false - name: fsspec - version: 2026.3.0 + version: 2026.4.0 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/fsspec-2026.3.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/fsspec-2026.4.0-pyhd8ed1ab_0.conda hash: - md5: c18d2ba7577cdc618a20d45f1e31d14b - sha256: b4a7aec32167502dd4a2d1fb1208c63760828d7111339aa5b305b2d776afa70f + md5: 2c11aa96ea85ced419de710c1c3a78ff + sha256: 079701b4ff3b317a1a158cabd48cf2b856b8b8d3ef44f152809d9acf20cc8e10 category: main optional: false - name: geoana @@ -2360,7 +2360,7 @@ package: category: dev optional: true - name: ipython - version: 9.12.0 + version: 9.13.0 manager: conda platform: linux-64 dependencies: @@ -2371,18 +2371,20 @@ package: matplotlib-inline: '>=0.1.6' pexpect: '>4.6' prompt-toolkit: '>=3.0.41,<3.1.0' + psutil: '>=7' pygments: '>=2.14.0' python: '' stack_data: '>=0.6.0' traitlets: '>=5.13.0' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.12.0-pyhecfbec7_0.conda + typing_extensions: '>=4.6' + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.13.0-pyh53cf698_0.conda hash: - md5: b293210beb192c3024683bf6a998a0b8 - sha256: 932044bd893f7adce6c9b384b96a72fd3804cc381e76789398c2fae900f21df7 + md5: 73e9657cd19605740d21efb14d8d0cb9 + sha256: a0af49948a1842dfd15a0b0b2fd56c94ddbd07e07a6c8b4bc70d43015eafaff0 category: dev optional: true - name: ipython - version: 9.12.0 + version: 9.13.0 manager: conda platform: win-64 dependencies: @@ -2393,14 +2395,16 @@ package: jedi: '>=0.18.2' matplotlib-inline: '>=0.1.6' prompt-toolkit: '>=3.0.41,<3.1.0' + psutil: '>=7' pygments: '>=2.14.0' python: '' stack_data: '>=0.6.0' traitlets: '>=5.13.0' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.12.0-pyhccfa634_0.conda + typing_extensions: '>=4.6' + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.13.0-pyhe2676ad_0.conda hash: - md5: 3734e3b6618ea6e04ad08678d8ed7a45 - sha256: a0d3e4c8e4d7b3801377a03de32951f68d77dd1bfe25082c7915f4e6b0aaa463 + md5: 5631ab99e902463d9dd4221e5b4eab6d + sha256: f252ec33597115ff21cbb31051f6f9be34ca36cbbbf3d266b597660d8d8edde9 category: dev optional: true - name: ipython_genutils @@ -3021,7 +3025,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.5.6 + version: 4.5.7 manager: conda platform: linux-64 dependencies: @@ -3040,14 +3044,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.5.6-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.5.7-pyhd8ed1ab_0.conda hash: - md5: bcbb401d6fa84e0cee34d4926b0e9e93 - sha256: 436a70259a9b4e13ce8b15faa8b37342835954d77a0a74d21dd24547e0871088 + md5: 2ffe77234070324e763a6eddabb5f467 + sha256: b85befad5ba1f50c0cc042a2ffb26441d13ffc2f18572dc20d3541476da0c7b9 category: dev optional: true - name: jupyterlab - version: 4.5.6 + version: 4.5.7 manager: conda platform: win-64 dependencies: @@ -3066,10 +3070,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.5.6-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.5.7-pyhd8ed1ab_0.conda hash: - md5: bcbb401d6fa84e0cee34d4926b0e9e93 - sha256: 436a70259a9b4e13ce8b15faa8b37342835954d77a0a74d21dd24547e0871088 + md5: 2ffe77234070324e763a6eddabb5f467 + sha256: b85befad5ba1f50c0cc042a2ffb26441d13ffc2f18572dc20d3541476da0c7b9 category: dev optional: true - name: jupyterlab_pygments @@ -3298,34 +3302,34 @@ package: category: dev optional: true - name: lcms2 - version: '2.18' + version: '2.19' manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' - libjpeg-turbo: '>=3.1.2,<4.0a0' + libjpeg-turbo: '>=3.1.4.1,<4.0a0' libtiff: '>=4.7.1,<4.8.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/lcms2-2.18-h0c24ade_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/lcms2-2.19-h0c24ade_0.conda hash: - md5: 6f2e2c8f58160147c4d1c6f4c14cbac4 - sha256: 836ec4b895352110335b9fdcfa83a8dcdbe6c5fb7c06c4929130600caea91c0a + md5: f302dbf397ac82eaf9618575d0b5fe33 + sha256: f1e982b63d505338ff7f9baee80a10360a025b7216deb5ab0fe1494d8ef3bebb category: main optional: false - name: lcms2 - version: '2.18' + version: '2.19' manager: conda platform: win-64 dependencies: - libjpeg-turbo: '>=3.1.2,<4.0a0' + libjpeg-turbo: '>=3.1.4.1,<4.0a0' libtiff: '>=4.7.1,<4.8.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/lcms2-2.18-hf2c6c5f_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/lcms2-2.19-hf2c6c5f_0.conda hash: - md5: b6c68d6b829b044cd17a41e0a8a23ca1 - sha256: 7eeb18c5c86db146b62da66d9e8b0e753a52987f9134a494309588bbeceddf28 + md5: cc37ca38374ac2a5dbe11f9abb10110f + sha256: 500b1907b06c5a1bd43d07203b3d58219a3c31b53e1f20c9c79e97d8a14077fc category: main optional: false - name: ld_impl_linux-64 @@ -3531,39 +3535,39 @@ package: category: main optional: false - name: libcurl - version: 8.19.0 + version: 8.20.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' krb5: '>=1.22.2,<1.23.0a0' libgcc: '>=14' - libnghttp2: '>=1.67.0,<2.0a0' + libnghttp2: '>=1.68.1,<2.0a0' libssh2: '>=1.11.1,<2.0a0' - libzlib: '>=1.3.1,<2.0a0' - openssl: '>=3.5.5,<4.0a0' + libzlib: '>=1.3.2,<2.0a0' + openssl: '>=3.5.6,<4.0a0' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libcurl-8.19.0-hcf29cc6_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libcurl-8.20.0-hcf29cc6_0.conda hash: - md5: d50608c443a30c341c24277d28290f76 - sha256: a0390fd0536ebcd2244e243f5f00ab8e76ab62ed9aa214cd54470fe7496620f4 + md5: c3cc2864f82a944bc90a7beb4d3b0e88 + sha256: 75963a5dd913311f59a35dbd307592f4fa754c4808aff9c33edb430c415e38eb category: main optional: false - name: libcurl - version: 8.19.0 + version: 8.20.0 manager: conda platform: win-64 dependencies: krb5: '>=1.22.2,<1.23.0a0' libssh2: '>=1.11.1,<2.0a0' - libzlib: '>=1.3.1,<2.0a0' + libzlib: '>=1.3.2,<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/libcurl-8.19.0-h8206538_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libcurl-8.20.0-h8206538_0.conda hash: - md5: ed181e29a7ebf0f60b84b98d6140a340 - sha256: 6b2143ba5454b399dab4471e9e1d07352a2f33b569975e6b8aedc2d9bf51cbb0 + md5: 7bee27a8f0a295117ccb864f30d2d87e + sha256: f4ce5aa835a698532feaa368e804365a7e45a9edebe006a8e1c80505d893c24e category: main optional: false - name: libdeflate @@ -4539,7 +4543,7 @@ package: category: main optional: false - name: matplotlib-base - version: 3.10.8 + version: 3.10.9 manager: conda platform: linux-64 dependencies: @@ -4549,8 +4553,8 @@ package: fonttools: '>=4.22.0' freetype: '' kiwisolver: '>=1.3.1' - libfreetype: '>=2.14.1' - libfreetype6: '>=2.14.1' + libfreetype: '>=2.14.3' + libfreetype6: '>=2.14.3' libgcc: '>=14' libstdcxx: '>=14' numpy: '>=1.23,<3' @@ -4562,14 +4566,14 @@ package: python_abi: 3.12.* qhull: '>=2020.2,<2020.3.0a0' tk: '>=8.6.13,<8.7.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/matplotlib-base-3.10.8-py312he3d6523_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/matplotlib-base-3.10.9-py312he3d6523_0.conda hash: - md5: b8dc157bbbb69c1407478feede8b7b42 - sha256: 70cf0e7bfd50ef50eb712a6ca1eef0ef0d63b7884292acc81353327b434b548c + md5: 7d499b5b6d150f133800dc3a582771c7 + sha256: c7e133837376e53e6a52719c205a3067c42f05769bc3e8307417f8d817dfc63e category: main optional: false - name: matplotlib-base - version: 3.10.8 + version: 3.10.9 manager: conda platform: win-64 dependencies: @@ -4578,8 +4582,8 @@ package: fonttools: '>=4.22.0' freetype: '' kiwisolver: '>=1.3.1' - libfreetype: '>=2.14.1' - libfreetype6: '>=2.14.1' + libfreetype: '>=2.14.3' + libfreetype6: '>=2.14.3' numpy: '>=1.23,<3' packaging: '>=20.0' pillow: '>=8' @@ -4591,10 +4595,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/matplotlib-base-3.10.8-py312h0ebf65c_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/matplotlib-base-3.10.9-py312h0ebf65c_0.conda hash: - md5: 46f73e68304eb61df083379b044e9eb9 - sha256: a0b6f97f562ec803483b8c222788a4364aafd47c4023e8529ebbb4f017477a86 + md5: 3752482b0df88d7a08a0791f906e87ae + sha256: 539ca0eac473a1b7f9da1071ddcd6fe9a3bdd9e51eab0f1c498e6345c1898e8b category: main optional: false - name: matplotlib-inline @@ -5048,16 +5052,16 @@ package: category: dev optional: true - name: ncurses - version: '6.5' + version: '6.6' manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' - url: https://repo.prefix.dev/conda-forge/linux-64/ncurses-6.5-h2d0b736_3.conda + libgcc: '>=14' + url: https://repo.prefix.dev/conda-forge/linux-64/ncurses-6.6-hdb14827_0.conda hash: - md5: 47e340acb35de30501a76c7c799c41d7 - sha256: 3fde293232fa3fca98635e1167de6b7c7fda83caf24b9d6c91ec9eefb4f4d586 + md5: fc21868a1a5aacc937e7a18747acb8a5 + sha256: fc89f74bbe362fb29fa3c037697a89bec140b346a2469a90f7936d1d7ea4d8a3 category: main optional: false - name: nest-asyncio @@ -5115,39 +5119,39 @@ package: category: dev optional: true - name: notebook - version: 7.5.5 + version: 7.5.6 manager: conda platform: linux-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.5.6,<4.6' + jupyterlab: '>=4.5.7,<4.6' jupyterlab_server: '>=2.28.0,<3' notebook-shim: '>=0.2,<0.3' python: '' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.5-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.6-pyhcf101f3_1.conda hash: - md5: 471096452091ae8c460928ad5ff143cc - sha256: 11cfeabc41ed73bb088315d96cfdfeaaa10470c06ce6332bae368590e3047ef6 + md5: 1fa699844c163bf17717fed8ca229846 + sha256: 14e85ec737c3f5976d18c71e5a07721c1ff835684330961c3c69e8ba2e7d6ff4 category: dev optional: true - name: notebook - version: 7.5.5 + version: 7.5.6 manager: conda platform: win-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.5.6,<4.6' + jupyterlab: '>=4.5.7,<4.6' jupyterlab_server: '>=2.28.0,<3' notebook-shim: '>=0.2,<0.3' python: '' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.5-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.6-pyhcf101f3_1.conda hash: - md5: 471096452091ae8c460928ad5ff143cc - sha256: 11cfeabc41ed73bb088315d96cfdfeaaa10470c06ce6332bae368590e3047ef6 + md5: 1fa699844c163bf17717fed8ca229846 + sha256: 14e85ec737c3f5976d18c71e5a07721c1ff835684330961c3c69e8ba2e7d6ff4 category: dev optional: true - name: notebook-shim @@ -5398,27 +5402,27 @@ package: category: dev optional: true - name: packaging - version: '26.1' + version: '26.2' manager: conda platform: linux-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/packaging-26.1-pyhc364b38_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/packaging-26.2-pyhc364b38_0.conda hash: - md5: b8ae38639d323d808da535fb71e31be8 - sha256: 171d977bc977fd80f2a05de3d4b7d571c4ec3cdea436ed364e5cd50547c50881 + md5: 4c06a92e74452cfa53623a81592e8934 + sha256: 3906abfb6511a3bb309e39b9b1b7bc38f50a723971de2395489fd1f379255890 category: main optional: false - name: packaging - version: '26.1' + version: '26.2' manager: conda platform: win-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/packaging-26.1-pyhc364b38_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/packaging-26.2-pyhc364b38_0.conda hash: - md5: b8ae38639d323d808da535fb71e31be8 - sha256: 171d977bc977fd80f2a05de3d4b7d571c4ec3cdea436ed364e5cd50547c50881 + md5: 4c06a92e74452cfa53623a81592e8934 + sha256: 3906abfb6511a3bb309e39b9b1b7bc38f50a723971de2395489fd1f379255890 category: main optional: false - name: pandas @@ -6316,27 +6320,29 @@ package: category: dev optional: true - name: python-json-logger - version: 2.0.7 + version: 3.2.1 manager: conda platform: linux-64 dependencies: - python: '>=3.6' - url: https://repo.prefix.dev/conda-forge/noarch/python-json-logger-2.0.7-pyhd8ed1ab_0.conda + python: '>=3.10' + typing_extensions: '' + url: https://repo.prefix.dev/conda-forge/noarch/python-json-logger-3.2.1-pyh332efcf_0.conda hash: - md5: a61bf9ec79426938ff785eb69dbb1960 - sha256: 4790787fe1f4e8da616edca4acf6a4f8ed4e7c6967aa31b920208fc8f95efcca + md5: 1cd2f3e885162ee1366312bd1b1677fd + sha256: 1c55116c22512cef7b01d55ae49697707f2c1fd829407183c19817e2d300fd8d category: dev optional: true - name: python-json-logger - version: 2.0.7 + version: 3.2.1 manager: conda platform: win-64 dependencies: - python: '>=3.6' - url: https://repo.prefix.dev/conda-forge/noarch/python-json-logger-2.0.7-pyhd8ed1ab_0.conda + python: '>=3.10' + typing_extensions: '' + url: https://repo.prefix.dev/conda-forge/noarch/python-json-logger-3.2.1-pyh332efcf_0.conda hash: - md5: a61bf9ec79426938ff785eb69dbb1960 - sha256: 4790787fe1f4e8da616edca4acf6a4f8ed4e7c6967aa31b920208fc8f95efcca + md5: 1cd2f3e885162ee1366312bd1b1677fd + sha256: 1c55116c22512cef7b01d55ae49697707f2c1fd829407183c19817e2d300fd8d category: dev optional: true - name: python-mumps @@ -6377,27 +6383,27 @@ package: category: main optional: false - name: python-tzdata - version: '2026.1' + version: '2026.2' manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/python-tzdata-2026.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/python-tzdata-2026.2-pyhd8ed1ab_0.conda hash: - md5: d8d30923ccee7525704599efd722aa16 - sha256: b5494ef54bc2394c6c4766ceeafac22507c4fc60de6cbfda45524fc2fcc3c9fc + md5: f6ad7450fc21e00ecc23812baed6d2e4 + sha256: e943f9c15a6bdba2e1b9f423ab913b3f6b02197b0ef9f8e6b7464d78b59965b9 category: main optional: false - name: python-tzdata - version: '2026.1' + version: '2026.2' manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/python-tzdata-2026.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/python-tzdata-2026.2-pyhd8ed1ab_0.conda hash: - md5: d8d30923ccee7525704599efd722aa16 - sha256: b5494ef54bc2394c6c4766ceeafac22507c4fc60de6cbfda45524fc2fcc3c9fc + md5: f6ad7450fc21e00ecc23812baed6d2e4 + sha256: e943f9c15a6bdba2e1b9f423ab913b3f6b02197b0ef9f8e6b7464d78b59965b9 category: main optional: false - name: python_abi @@ -6660,10 +6666,10 @@ package: idna: '>=2.5,<4' python: '' urllib3: '>=1.26,<3' - url: https://repo.prefix.dev/conda-forge/noarch/requests-2.33.1-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/requests-2.33.1-pyhcf101f3_1.conda hash: - md5: 10afbb4dbf06ff959ad25a92ccee6e59 - sha256: c0249bc4bf4c0e8e06d0e7b4d117a5d593cc4ab2144d5006d6d47c83cb0af18e + md5: 9659f587a8ceacc21864260acd02fc67 + sha256: 7f2c24dd3bd3c104a1d2c9a10ead5ed6758b0976b74f972cfe9c19884ccc4241 category: dev optional: true - name: requests @@ -6676,10 +6682,10 @@ package: idna: '>=2.5,<4' python: '' urllib3: '>=1.26,<3' - url: https://repo.prefix.dev/conda-forge/noarch/requests-2.33.1-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/requests-2.33.1-pyhcf101f3_1.conda hash: - md5: 10afbb4dbf06ff959ad25a92ccee6e59 - sha256: c0249bc4bf4c0e8e06d0e7b4d117a5d593cc4ab2144d5006d6d47c83cb0af18e + md5: 9659f587a8ceacc21864260acd02fc67 + sha256: 7f2c24dd3bd3c104a1d2c9a10ead5ed6758b0976b74f972cfe9c19884ccc4241 category: dev optional: true - name: rfc3339-validator @@ -6816,17 +6822,17 @@ package: category: main optional: false - name: s2n - version: 1.7.1 + version: 1.7.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' - openssl: '>=3.5.5,<4.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/s2n-1.7.1-h1cbb8d7_1.conda + openssl: '>=3.5.6,<4.0a0' + url: https://repo.prefix.dev/conda-forge/linux-64/s2n-1.7.2-hc5a330e_1.conda hash: - md5: 9d978822b57bafe72ebd3f8b527bba71 - sha256: dbbe4ab36b90427f12d69fc14a8b601b6bca4185c6c4dd67b8046a8da9daec03 + md5: 3f578c7d2b0bb52469340e4060d48d94 + sha256: 856866fd519b812db3e092aba308248dd87b5c308186fcffe593f309373ae94c category: main optional: false - name: scikit-learn @@ -7696,12 +7702,12 @@ package: manager: conda platform: linux-64 dependencies: - python: '>=3.10' + python: '' typing_extensions: '>=4.12.0' - url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhcf101f3_2.conda hash: - md5: a0a4a3035667fc34f29bfbd5c190baa6 - sha256: 70db27de58a97aeb7ba7448366c9853f91b21137492e0b4430251a1870aa8ff4 + md5: 53f5409c5cfd6c5a66417d68e3f0a864 + sha256: 8b90d2f19f9458b8c58a55e1fcdc1d90c1603a847a47654d8a454549413ba60a category: main optional: false - name: typing-inspection @@ -7709,12 +7715,12 @@ package: manager: conda platform: win-64 dependencies: - python: '>=3.10' + python: '' typing_extensions: '>=4.12.0' - url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhcf101f3_2.conda hash: - md5: a0a4a3035667fc34f29bfbd5c190baa6 - sha256: 70db27de58a97aeb7ba7448366c9853f91b21137492e0b4430251a1870aa8ff4 + md5: 53f5409c5cfd6c5a66417d68e3f0a864 + sha256: 8b90d2f19f9458b8c58a55e1fcdc1d90c1603a847a47654d8a454549413ba60a category: main optional: false - name: typing_extensions @@ -8416,7 +8422,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.13.0a4.dev12+a3a1ab3f + geoh5py: 0.13.0a4.dev89+c0aebede matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' @@ -8434,7 +8440,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.13.0a4.dev12+a3a1ab3f + geoh5py: 0.13.0a4.dev89+c0aebede matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' @@ -8448,7 +8454,7 @@ package: category: main optional: false - name: geoh5py - version: 0.13.0a4.dev12+a3a1ab3f + version: 0.13.0a4.dev89+c0aebede manager: pip platform: linux-64 dependencies: @@ -8456,16 +8462,16 @@ package: numpy: '>=2.4.0,<2.5.0' pillow: '>=12.1.0,<12.2.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + url: git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c hash: - sha256: a3a1ab3f86a87139cf46159a4a7f55804428055b + sha256: c0aebede6ba643c03c7c88eb7c47dfc14e56d33c source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + url: git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c category: main optional: false - name: geoh5py - version: 0.13.0a4.dev12+a3a1ab3f + version: 0.13.0a4.dev89+c0aebede manager: pip platform: win-64 dependencies: @@ -8473,12 +8479,12 @@ package: numpy: '>=2.4.0,<2.5.0' pillow: '>=12.1.0,<12.2.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + url: git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c hash: - sha256: a3a1ab3f86a87139cf46159a4a7f55804428055b + sha256: c0aebede6ba643c03c7c88eb7c47dfc14e56d33c source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + url: git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c category: main optional: false - name: grid-apps @@ -8488,7 +8494,7 @@ package: dependencies: discretize: '>=0.12.0,<0.13.0' geoapps-utils: 0.7.0a4.dev22+ed8ce15 - geoh5py: 0.13.0a4.dev12+a3a1ab3f + geoh5py: 0.13.0a4.dev89+c0aebede numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' @@ -8507,7 +8513,7 @@ package: dependencies: discretize: '>=0.12.0,<0.13.0' geoapps-utils: 0.7.0a4.dev22+ed8ce15 - geoh5py: 0.13.0a4.dev12+a3a1ab3f + geoh5py: 0.13.0a4.dev89+c0aebede numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' diff --git a/py-3.13.conda-lock.yml b/py-3.13.conda-lock.yml index fbfc9fa13..6652a27e8 100644 --- a/py-3.13.conda-lock.yml +++ b/py-3.13.conda-lock.yml @@ -540,11 +540,11 @@ package: aws-c-cal: '>=0.9.13,<0.9.14.0a0' aws-c-common: '>=0.12.6,<0.12.7.0a0' libgcc: '>=14' - s2n: '>=1.7.1,<1.7.2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/aws-c-io-0.26.3-hc87160b_0.conda + s2n: '>=1.7.2,<1.7.3.0a0' + url: https://repo.prefix.dev/conda-forge/linux-64/aws-c-io-0.26.3-h692f434_1.conda hash: - md5: dde6a3e4fe6bb2ecd2a7050dd1e701fb - sha256: c66ebb7815949db72bab7c86bf477197e4bc6937c381cf32248bdd1ce496db00 + md5: 14260392d0b491c537b5e26e9a506fff + sha256: e3e33031d641864128ab11f9b8585ad5beb82fa988fe833bb0767dd01878a371 category: main optional: false - name: aws-c-io @@ -557,10 +557,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/aws-c-io-0.26.3-h0d5b9f9_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/aws-c-io-0.26.3-h0d5b9f9_1.conda hash: - md5: ce36c60ed6b15c8dbb7ccddec4ebf57f - sha256: 3c9d50fb7895df4edd72d177299551608c24d8b0b82db0cf34c8e2bf6644979c + md5: d6091ef6857cee4f541716790de07b48 + sha256: 77a9e9cbbea1ed76d02605955a8cf098d3793a8dc871b31b4617a8054f151639 category: main optional: false - name: aws-c-s3 @@ -1131,30 +1131,30 @@ package: category: dev optional: true - name: click - version: 8.3.2 + version: 8.3.3 manager: conda platform: linux-64 dependencies: __unix: '' python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.2-pyhc90fa1f_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.3-pyhc90fa1f_0.conda hash: - md5: 4d18bc3af7cfcea97bd817164672a08c - sha256: 526d434cf5390310f40f34ea6ec4f0c225cdf1e419010e624d399b13b2059f0f + md5: 2266262ce8a425ecb6523d765f79b303 + sha256: 37a5d8b10ea3516e2c42f870c9c351b9f7b31ff48c66d83490039f417e1e5228 category: main optional: false - name: click - version: 8.3.2 + version: 8.3.3 manager: conda platform: win-64 dependencies: __win: '' colorama: '' python: '' - url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.2-pyh6dadd2b_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/click-8.3.3-pyh6dadd2b_0.conda hash: - md5: 290d6b8ba791f99e068327e5d17e8462 - sha256: e67e85d5837cf0b0151b58b449badb0a8c2018d209e05c28f1b0c079e6e93666 + md5: 8f03c7a39b01ebc57b647f7b48bbeed9 + sha256: acdcff82819e9c20719f8e6b6f69d72109ee056445a9995417dafe15a50d07fa category: main optional: false - name: cloudpickle @@ -1853,27 +1853,27 @@ package: category: main optional: false - name: fsspec - version: 2026.3.0 + version: 2026.4.0 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/fsspec-2026.3.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/fsspec-2026.4.0-pyhd8ed1ab_0.conda hash: - md5: c18d2ba7577cdc618a20d45f1e31d14b - sha256: b4a7aec32167502dd4a2d1fb1208c63760828d7111339aa5b305b2d776afa70f + md5: 2c11aa96ea85ced419de710c1c3a78ff + sha256: 079701b4ff3b317a1a158cabd48cf2b856b8b8d3ef44f152809d9acf20cc8e10 category: main optional: false - name: fsspec - version: 2026.3.0 + version: 2026.4.0 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/fsspec-2026.3.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/fsspec-2026.4.0-pyhd8ed1ab_0.conda hash: - md5: c18d2ba7577cdc618a20d45f1e31d14b - sha256: b4a7aec32167502dd4a2d1fb1208c63760828d7111339aa5b305b2d776afa70f + md5: 2c11aa96ea85ced419de710c1c3a78ff + sha256: 079701b4ff3b317a1a158cabd48cf2b856b8b8d3ef44f152809d9acf20cc8e10 category: main optional: false - name: geoana @@ -2358,7 +2358,7 @@ package: category: dev optional: true - name: ipython - version: 9.12.0 + version: 9.13.0 manager: conda platform: linux-64 dependencies: @@ -2369,18 +2369,20 @@ package: matplotlib-inline: '>=0.1.6' pexpect: '>4.6' prompt-toolkit: '>=3.0.41,<3.1.0' + psutil: '>=7' pygments: '>=2.14.0' python: '' stack_data: '>=0.6.0' traitlets: '>=5.13.0' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.12.0-pyhecfbec7_0.conda + typing_extensions: '>=4.6' + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.13.0-pyh53cf698_0.conda hash: - md5: b293210beb192c3024683bf6a998a0b8 - sha256: 932044bd893f7adce6c9b384b96a72fd3804cc381e76789398c2fae900f21df7 + md5: 73e9657cd19605740d21efb14d8d0cb9 + sha256: a0af49948a1842dfd15a0b0b2fd56c94ddbd07e07a6c8b4bc70d43015eafaff0 category: dev optional: true - name: ipython - version: 9.12.0 + version: 9.13.0 manager: conda platform: win-64 dependencies: @@ -2391,14 +2393,16 @@ package: jedi: '>=0.18.2' matplotlib-inline: '>=0.1.6' prompt-toolkit: '>=3.0.41,<3.1.0' + psutil: '>=7' pygments: '>=2.14.0' python: '' stack_data: '>=0.6.0' traitlets: '>=5.13.0' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.12.0-pyhccfa634_0.conda + typing_extensions: '>=4.6' + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.13.0-pyhe2676ad_0.conda hash: - md5: 3734e3b6618ea6e04ad08678d8ed7a45 - sha256: a0d3e4c8e4d7b3801377a03de32951f68d77dd1bfe25082c7915f4e6b0aaa463 + md5: 5631ab99e902463d9dd4221e5b4eab6d + sha256: f252ec33597115ff21cbb31051f6f9be34ca36cbbbf3d266b597660d8d8edde9 category: dev optional: true - name: ipython_genutils @@ -3019,7 +3023,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.5.6 + version: 4.5.7 manager: conda platform: linux-64 dependencies: @@ -3038,14 +3042,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.5.6-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.5.7-pyhd8ed1ab_0.conda hash: - md5: bcbb401d6fa84e0cee34d4926b0e9e93 - sha256: 436a70259a9b4e13ce8b15faa8b37342835954d77a0a74d21dd24547e0871088 + md5: 2ffe77234070324e763a6eddabb5f467 + sha256: b85befad5ba1f50c0cc042a2ffb26441d13ffc2f18572dc20d3541476da0c7b9 category: dev optional: true - name: jupyterlab - version: 4.5.6 + version: 4.5.7 manager: conda platform: win-64 dependencies: @@ -3064,10 +3068,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.5.6-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.5.7-pyhd8ed1ab_0.conda hash: - md5: bcbb401d6fa84e0cee34d4926b0e9e93 - sha256: 436a70259a9b4e13ce8b15faa8b37342835954d77a0a74d21dd24547e0871088 + md5: 2ffe77234070324e763a6eddabb5f467 + sha256: b85befad5ba1f50c0cc042a2ffb26441d13ffc2f18572dc20d3541476da0c7b9 category: dev optional: true - name: jupyterlab_pygments @@ -3296,34 +3300,34 @@ package: category: dev optional: true - name: lcms2 - version: '2.18' + version: '2.19' manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' - libjpeg-turbo: '>=3.1.2,<4.0a0' + libjpeg-turbo: '>=3.1.4.1,<4.0a0' libtiff: '>=4.7.1,<4.8.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/lcms2-2.18-h0c24ade_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/lcms2-2.19-h0c24ade_0.conda hash: - md5: 6f2e2c8f58160147c4d1c6f4c14cbac4 - sha256: 836ec4b895352110335b9fdcfa83a8dcdbe6c5fb7c06c4929130600caea91c0a + md5: f302dbf397ac82eaf9618575d0b5fe33 + sha256: f1e982b63d505338ff7f9baee80a10360a025b7216deb5ab0fe1494d8ef3bebb category: main optional: false - name: lcms2 - version: '2.18' + version: '2.19' manager: conda platform: win-64 dependencies: - libjpeg-turbo: '>=3.1.2,<4.0a0' + libjpeg-turbo: '>=3.1.4.1,<4.0a0' libtiff: '>=4.7.1,<4.8.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/lcms2-2.18-hf2c6c5f_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/lcms2-2.19-hf2c6c5f_0.conda hash: - md5: b6c68d6b829b044cd17a41e0a8a23ca1 - sha256: 7eeb18c5c86db146b62da66d9e8b0e753a52987f9134a494309588bbeceddf28 + md5: cc37ca38374ac2a5dbe11f9abb10110f + sha256: 500b1907b06c5a1bd43d07203b3d58219a3c31b53e1f20c9c79e97d8a14077fc category: main optional: false - name: ld_impl_linux-64 @@ -3529,39 +3533,39 @@ package: category: main optional: false - name: libcurl - version: 8.19.0 + version: 8.20.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' krb5: '>=1.22.2,<1.23.0a0' libgcc: '>=14' - libnghttp2: '>=1.67.0,<2.0a0' + libnghttp2: '>=1.68.1,<2.0a0' libssh2: '>=1.11.1,<2.0a0' - libzlib: '>=1.3.1,<2.0a0' - openssl: '>=3.5.5,<4.0a0' + libzlib: '>=1.3.2,<2.0a0' + openssl: '>=3.5.6,<4.0a0' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libcurl-8.19.0-hcf29cc6_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libcurl-8.20.0-hcf29cc6_0.conda hash: - md5: d50608c443a30c341c24277d28290f76 - sha256: a0390fd0536ebcd2244e243f5f00ab8e76ab62ed9aa214cd54470fe7496620f4 + md5: c3cc2864f82a944bc90a7beb4d3b0e88 + sha256: 75963a5dd913311f59a35dbd307592f4fa754c4808aff9c33edb430c415e38eb category: main optional: false - name: libcurl - version: 8.19.0 + version: 8.20.0 manager: conda platform: win-64 dependencies: krb5: '>=1.22.2,<1.23.0a0' libssh2: '>=1.11.1,<2.0a0' - libzlib: '>=1.3.1,<2.0a0' + libzlib: '>=1.3.2,<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/libcurl-8.19.0-h8206538_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libcurl-8.20.0-h8206538_0.conda hash: - md5: ed181e29a7ebf0f60b84b98d6140a340 - sha256: 6b2143ba5454b399dab4471e9e1d07352a2f33b569975e6b8aedc2d9bf51cbb0 + md5: 7bee27a8f0a295117ccb864f30d2d87e + sha256: f4ce5aa835a698532feaa368e804365a7e45a9edebe006a8e1c80505d893c24e category: main optional: false - name: libdeflate @@ -4539,7 +4543,7 @@ package: category: main optional: false - name: matplotlib-base - version: 3.10.8 + version: 3.10.9 manager: conda platform: linux-64 dependencies: @@ -4549,8 +4553,8 @@ package: fonttools: '>=4.22.0' freetype: '' kiwisolver: '>=1.3.1' - libfreetype: '>=2.14.1' - libfreetype6: '>=2.14.1' + libfreetype: '>=2.14.3' + libfreetype6: '>=2.14.3' libgcc: '>=14' libstdcxx: '>=14' numpy: '>=1.23,<3' @@ -4562,14 +4566,14 @@ package: python_abi: 3.13.* qhull: '>=2020.2,<2020.3.0a0' tk: '>=8.6.13,<8.7.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/matplotlib-base-3.10.8-py313h683a580_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/matplotlib-base-3.10.9-py313h683a580_0.conda hash: - md5: ffe67570e1a9192d2f4c189b27f75f89 - sha256: b1117aa2c1d11ca70d1704054cdc8801cbcf2dfb846c565531edd417ddd82559 + md5: 4265d85b1d706caba7ac1d73b5f43dee + sha256: ae0233aa03da84e0964a4c214faaa9d0735575714529a7f2ebe96bc712c276bf category: main optional: false - name: matplotlib-base - version: 3.10.8 + version: 3.10.9 manager: conda platform: win-64 dependencies: @@ -4578,8 +4582,8 @@ package: fonttools: '>=4.22.0' freetype: '' kiwisolver: '>=1.3.1' - libfreetype: '>=2.14.1' - libfreetype6: '>=2.14.1' + libfreetype: '>=2.14.3' + libfreetype6: '>=2.14.3' numpy: '>=1.23,<3' packaging: '>=20.0' pillow: '>=8' @@ -4591,10 +4595,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/matplotlib-base-3.10.8-py313he1ded55_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/matplotlib-base-3.10.9-py313he1ded55_0.conda hash: - md5: 05f96c429201a64ea752decf4b910a7c - sha256: f63c4a5ded62cfb216c9d107a3c4527940036eef19cf481418080a0bd9bc11d8 + md5: b0d7ed8c9999b16acde682672e712ded + sha256: a77e418fd30aa83e9abb75ad9fbfe08ef3847ef234f17747b8b779fc44a06d54 category: main optional: false - name: matplotlib-inline @@ -5048,16 +5052,16 @@ package: category: dev optional: true - name: ncurses - version: '6.5' + version: '6.6' manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' - url: https://repo.prefix.dev/conda-forge/linux-64/ncurses-6.5-h2d0b736_3.conda + libgcc: '>=14' + url: https://repo.prefix.dev/conda-forge/linux-64/ncurses-6.6-hdb14827_0.conda hash: - md5: 47e340acb35de30501a76c7c799c41d7 - sha256: 3fde293232fa3fca98635e1167de6b7c7fda83caf24b9d6c91ec9eefb4f4d586 + md5: fc21868a1a5aacc937e7a18747acb8a5 + sha256: fc89f74bbe362fb29fa3c037697a89bec140b346a2469a90f7936d1d7ea4d8a3 category: main optional: false - name: nest-asyncio @@ -5115,39 +5119,39 @@ package: category: dev optional: true - name: notebook - version: 7.5.5 + version: 7.5.6 manager: conda platform: linux-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.5.6,<4.6' + jupyterlab: '>=4.5.7,<4.6' jupyterlab_server: '>=2.28.0,<3' notebook-shim: '>=0.2,<0.3' python: '' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.5-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.6-pyhcf101f3_1.conda hash: - md5: 471096452091ae8c460928ad5ff143cc - sha256: 11cfeabc41ed73bb088315d96cfdfeaaa10470c06ce6332bae368590e3047ef6 + md5: 1fa699844c163bf17717fed8ca229846 + sha256: 14e85ec737c3f5976d18c71e5a07721c1ff835684330961c3c69e8ba2e7d6ff4 category: dev optional: true - name: notebook - version: 7.5.5 + version: 7.5.6 manager: conda platform: win-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.5.6,<4.6' + jupyterlab: '>=4.5.7,<4.6' jupyterlab_server: '>=2.28.0,<3' notebook-shim: '>=0.2,<0.3' python: '' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.5-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.6-pyhcf101f3_1.conda hash: - md5: 471096452091ae8c460928ad5ff143cc - sha256: 11cfeabc41ed73bb088315d96cfdfeaaa10470c06ce6332bae368590e3047ef6 + md5: 1fa699844c163bf17717fed8ca229846 + sha256: 14e85ec737c3f5976d18c71e5a07721c1ff835684330961c3c69e8ba2e7d6ff4 category: dev optional: true - name: notebook-shim @@ -5398,27 +5402,27 @@ package: category: dev optional: true - name: packaging - version: '26.1' + version: '26.2' manager: conda platform: linux-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/packaging-26.1-pyhc364b38_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/packaging-26.2-pyhc364b38_0.conda hash: - md5: b8ae38639d323d808da535fb71e31be8 - sha256: 171d977bc977fd80f2a05de3d4b7d571c4ec3cdea436ed364e5cd50547c50881 + md5: 4c06a92e74452cfa53623a81592e8934 + sha256: 3906abfb6511a3bb309e39b9b1b7bc38f50a723971de2395489fd1f379255890 category: main optional: false - name: packaging - version: '26.1' + version: '26.2' manager: conda platform: win-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/packaging-26.1-pyhc364b38_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/packaging-26.2-pyhc364b38_0.conda hash: - md5: b8ae38639d323d808da535fb71e31be8 - sha256: 171d977bc977fd80f2a05de3d4b7d571c4ec3cdea436ed364e5cd50547c50881 + md5: 4c06a92e74452cfa53623a81592e8934 + sha256: 3906abfb6511a3bb309e39b9b1b7bc38f50a723971de2395489fd1f379255890 category: main optional: false - name: pandas @@ -6314,27 +6318,29 @@ package: category: dev optional: true - name: python-json-logger - version: 2.0.7 + version: 3.2.1 manager: conda platform: linux-64 dependencies: - python: '>=3.6' - url: https://repo.prefix.dev/conda-forge/noarch/python-json-logger-2.0.7-pyhd8ed1ab_0.conda + python: '>=3.10' + typing_extensions: '' + url: https://repo.prefix.dev/conda-forge/noarch/python-json-logger-3.2.1-pyh332efcf_0.conda hash: - md5: a61bf9ec79426938ff785eb69dbb1960 - sha256: 4790787fe1f4e8da616edca4acf6a4f8ed4e7c6967aa31b920208fc8f95efcca + md5: 1cd2f3e885162ee1366312bd1b1677fd + sha256: 1c55116c22512cef7b01d55ae49697707f2c1fd829407183c19817e2d300fd8d category: dev optional: true - name: python-json-logger - version: 2.0.7 + version: 3.2.1 manager: conda platform: win-64 dependencies: - python: '>=3.6' - url: https://repo.prefix.dev/conda-forge/noarch/python-json-logger-2.0.7-pyhd8ed1ab_0.conda + python: '>=3.10' + typing_extensions: '' + url: https://repo.prefix.dev/conda-forge/noarch/python-json-logger-3.2.1-pyh332efcf_0.conda hash: - md5: a61bf9ec79426938ff785eb69dbb1960 - sha256: 4790787fe1f4e8da616edca4acf6a4f8ed4e7c6967aa31b920208fc8f95efcca + md5: 1cd2f3e885162ee1366312bd1b1677fd + sha256: 1c55116c22512cef7b01d55ae49697707f2c1fd829407183c19817e2d300fd8d category: dev optional: true - name: python-mumps @@ -6375,27 +6381,27 @@ package: category: main optional: false - name: python-tzdata - version: '2026.1' + version: '2026.2' manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/python-tzdata-2026.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/python-tzdata-2026.2-pyhd8ed1ab_0.conda hash: - md5: d8d30923ccee7525704599efd722aa16 - sha256: b5494ef54bc2394c6c4766ceeafac22507c4fc60de6cbfda45524fc2fcc3c9fc + md5: f6ad7450fc21e00ecc23812baed6d2e4 + sha256: e943f9c15a6bdba2e1b9f423ab913b3f6b02197b0ef9f8e6b7464d78b59965b9 category: main optional: false - name: python-tzdata - version: '2026.1' + version: '2026.2' manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/python-tzdata-2026.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/python-tzdata-2026.2-pyhd8ed1ab_0.conda hash: - md5: d8d30923ccee7525704599efd722aa16 - sha256: b5494ef54bc2394c6c4766ceeafac22507c4fc60de6cbfda45524fc2fcc3c9fc + md5: f6ad7450fc21e00ecc23812baed6d2e4 + sha256: e943f9c15a6bdba2e1b9f423ab913b3f6b02197b0ef9f8e6b7464d78b59965b9 category: main optional: false - name: python_abi @@ -6658,10 +6664,10 @@ package: idna: '>=2.5,<4' python: '' urllib3: '>=1.26,<3' - url: https://repo.prefix.dev/conda-forge/noarch/requests-2.33.1-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/requests-2.33.1-pyhcf101f3_1.conda hash: - md5: 10afbb4dbf06ff959ad25a92ccee6e59 - sha256: c0249bc4bf4c0e8e06d0e7b4d117a5d593cc4ab2144d5006d6d47c83cb0af18e + md5: 9659f587a8ceacc21864260acd02fc67 + sha256: 7f2c24dd3bd3c104a1d2c9a10ead5ed6758b0976b74f972cfe9c19884ccc4241 category: dev optional: true - name: requests @@ -6674,10 +6680,10 @@ package: idna: '>=2.5,<4' python: '' urllib3: '>=1.26,<3' - url: https://repo.prefix.dev/conda-forge/noarch/requests-2.33.1-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/requests-2.33.1-pyhcf101f3_1.conda hash: - md5: 10afbb4dbf06ff959ad25a92ccee6e59 - sha256: c0249bc4bf4c0e8e06d0e7b4d117a5d593cc4ab2144d5006d6d47c83cb0af18e + md5: 9659f587a8ceacc21864260acd02fc67 + sha256: 7f2c24dd3bd3c104a1d2c9a10ead5ed6758b0976b74f972cfe9c19884ccc4241 category: dev optional: true - name: rfc3339-validator @@ -6814,17 +6820,17 @@ package: category: main optional: false - name: s2n - version: 1.7.1 + version: 1.7.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' - openssl: '>=3.5.5,<4.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/s2n-1.7.1-h1cbb8d7_1.conda + openssl: '>=3.5.6,<4.0a0' + url: https://repo.prefix.dev/conda-forge/linux-64/s2n-1.7.2-hc5a330e_1.conda hash: - md5: 9d978822b57bafe72ebd3f8b527bba71 - sha256: dbbe4ab36b90427f12d69fc14a8b601b6bca4185c6c4dd67b8046a8da9daec03 + md5: 3f578c7d2b0bb52469340e4060d48d94 + sha256: 856866fd519b812db3e092aba308248dd87b5c308186fcffe593f309373ae94c category: main optional: false - name: scikit-learn @@ -7694,12 +7700,12 @@ package: manager: conda platform: linux-64 dependencies: - python: '>=3.10' + python: '' typing_extensions: '>=4.12.0' - url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhcf101f3_2.conda hash: - md5: a0a4a3035667fc34f29bfbd5c190baa6 - sha256: 70db27de58a97aeb7ba7448366c9853f91b21137492e0b4430251a1870aa8ff4 + md5: 53f5409c5cfd6c5a66417d68e3f0a864 + sha256: 8b90d2f19f9458b8c58a55e1fcdc1d90c1603a847a47654d8a454549413ba60a category: main optional: false - name: typing-inspection @@ -7707,12 +7713,12 @@ package: manager: conda platform: win-64 dependencies: - python: '>=3.10' + python: '' typing_extensions: '>=4.12.0' - url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/typing-inspection-0.4.2-pyhcf101f3_2.conda hash: - md5: a0a4a3035667fc34f29bfbd5c190baa6 - sha256: 70db27de58a97aeb7ba7448366c9853f91b21137492e0b4430251a1870aa8ff4 + md5: 53f5409c5cfd6c5a66417d68e3f0a864 + sha256: 8b90d2f19f9458b8c58a55e1fcdc1d90c1603a847a47654d8a454549413ba60a category: main optional: false - name: typing_extensions @@ -8357,7 +8363,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.13.0a4.dev12+a3a1ab3f + geoh5py: 0.13.0a4.dev89+c0aebede matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' @@ -8375,7 +8381,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.13.0a4.dev12+a3a1ab3f + geoh5py: 0.13.0a4.dev89+c0aebede matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' @@ -8389,7 +8395,7 @@ package: category: main optional: false - name: geoh5py - version: 0.13.0a4.dev12+a3a1ab3f + version: 0.13.0a4.dev89+c0aebede manager: pip platform: linux-64 dependencies: @@ -8397,16 +8403,16 @@ package: numpy: '>=2.4.0,<2.5.0' pillow: '>=12.1.0,<12.2.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + url: git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c hash: - sha256: a3a1ab3f86a87139cf46159a4a7f55804428055b + sha256: c0aebede6ba643c03c7c88eb7c47dfc14e56d33c source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + url: git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c category: main optional: false - name: geoh5py - version: 0.13.0a4.dev12+a3a1ab3f + version: 0.13.0a4.dev89+c0aebede manager: pip platform: win-64 dependencies: @@ -8414,12 +8420,12 @@ package: numpy: '>=2.4.0,<2.5.0' pillow: '>=12.1.0,<12.2.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + url: git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c hash: - sha256: a3a1ab3f86a87139cf46159a4a7f55804428055b + sha256: c0aebede6ba643c03c7c88eb7c47dfc14e56d33c source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b + url: git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c category: main optional: false - name: grid-apps @@ -8429,7 +8435,7 @@ package: dependencies: discretize: '>=0.12.0,<0.13.0' geoapps-utils: 0.7.0a4.dev22+ed8ce15 - geoh5py: 0.13.0a4.dev12+a3a1ab3f + geoh5py: 0.13.0a4.dev89+c0aebede numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' @@ -8448,7 +8454,7 @@ package: dependencies: discretize: '>=0.12.0,<0.13.0' geoapps-utils: 0.7.0a4.dev22+ed8ce15 - geoh5py: 0.13.0a4.dev12+a3a1ab3f + geoh5py: 0.13.0a4.dev89+c0aebede numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' From 10c4316fc830616266c3cf275527cd7bc53d50e7 Mon Sep 17 00:00:00 2001 From: domfournier Date: Thu, 30 Apr 2026 19:46:32 -0700 Subject: [PATCH 13/18] Re-lock after simpeg merge --- environments/py-3.12-linux-64-dev.conda.lock.yml | 2 +- environments/py-3.12-linux-64.conda.lock.yml | 2 +- environments/py-3.12-win-64-dev.conda.lock.yml | 2 +- environments/py-3.12-win-64.conda.lock.yml | 2 +- environments/py-3.13-linux-64-dev.conda.lock.yml | 2 +- environments/py-3.13-linux-64.conda.lock.yml | 2 +- environments/py-3.13-win-64-dev.conda.lock.yml | 2 +- environments/py-3.13-win-64.conda.lock.yml | 2 +- py-3.12.conda-lock.yml | 16 ++++++++-------- py-3.13.conda-lock.yml | 16 ++++++++-------- 10 files changed, 24 insertions(+), 24 deletions(-) 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 1920d473e..d3235e549 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -306,7 +306,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 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 d20c8ff64..c71a2a310 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -174,7 +174,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 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 c3282a8cb..fa94ab9fe 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -291,7 +291,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 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 000e5d697..5b4e6fd36 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -161,7 +161,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64-dev.conda.lock.yml b/environments/py-3.13-linux-64-dev.conda.lock.yml index 1f8480d99..81321b43e 100644 --- a/environments/py-3.13-linux-64-dev.conda.lock.yml +++ b/environments/py-3.13-linux-64-dev.conda.lock.yml @@ -303,7 +303,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64.conda.lock.yml b/environments/py-3.13-linux-64.conda.lock.yml index e9a9bc446..bfde28766 100644 --- a/environments/py-3.13-linux-64.conda.lock.yml +++ b/environments/py-3.13-linux-64.conda.lock.yml @@ -171,7 +171,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64-dev.conda.lock.yml b/environments/py-3.13-win-64-dev.conda.lock.yml index 95667ce62..53574e42d 100644 --- a/environments/py-3.13-win-64-dev.conda.lock.yml +++ b/environments/py-3.13-win-64-dev.conda.lock.yml @@ -290,7 +290,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64.conda.lock.yml b/environments/py-3.13-win-64.conda.lock.yml index f0dd0ae42..8bdb2b8bd 100644 --- a/environments/py-3.13-win-64.conda.lock.yml +++ b/environments/py-3.13-win-64.conda.lock.yml @@ -160,7 +160,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 variables: KMP_WARNINGS: 0 diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 0094a7d5d..0772756cc 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -8526,7 +8526,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev20+gea70aa21a + version: 0.25.0.1a3.dev25+g012a88402 manager: pip platform: linux-64 dependencies: @@ -8539,16 +8539,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 hash: - sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + sha256: 012a88402a77c172abb21193a1bb9a02b631c180 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev20+gea70aa21a + version: 0.25.0.1a3.dev25+g012a88402 manager: pip platform: win-64 dependencies: @@ -8561,11 +8561,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 hash: - sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + sha256: 012a88402a77c172abb21193a1bb9a02b631c180 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 category: main optional: false diff --git a/py-3.13.conda-lock.yml b/py-3.13.conda-lock.yml index 6652a27e8..7352fc208 100644 --- a/py-3.13.conda-lock.yml +++ b/py-3.13.conda-lock.yml @@ -8467,7 +8467,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev20+gea70aa21a + version: 0.25.0.1a3.dev25+g012a88402 manager: pip platform: linux-64 dependencies: @@ -8479,16 +8479,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 hash: - sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + sha256: 012a88402a77c172abb21193a1bb9a02b631c180 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev20+gea70aa21a + version: 0.25.0.1a3.dev25+g012a88402 manager: pip platform: win-64 dependencies: @@ -8500,11 +8500,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 hash: - sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + sha256: 012a88402a77c172abb21193a1bb9a02b631c180 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 category: main optional: false From 9fd882dc87744b3dc2dc7451eed6c6646760832f Mon Sep 17 00:00:00 2001 From: domfournier Date: Thu, 30 Apr 2026 22:06:23 -0700 Subject: [PATCH 14/18] Test re-lock --- .../py-3.12-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-linux-64.conda.lock.yml | 4 ++-- .../py-3.12-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-win-64.conda.lock.yml | 4 ++-- .../py-3.13-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.13-linux-64.conda.lock.yml | 4 ++-- .../py-3.13-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.13-win-64.conda.lock.yml | 4 ++-- py-3.12.conda-lock.yml | 20 +++++++++---------- py-3.13.conda-lock.yml | 20 +++++++++---------- pyproject.toml | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) 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 d3235e549..180bf070f 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: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a +# input_hash: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 channels: - conda-forge @@ -306,7 +306,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 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 c71a2a310..45c70a43d 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: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a +# input_hash: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 channels: - conda-forge @@ -174,7 +174,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 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 fa94ab9fe..fd4bc87da 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: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b +# input_hash: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 channels: - conda-forge @@ -291,7 +291,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 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 5b4e6fd36..8c5e8ba63 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: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b +# input_hash: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 channels: - conda-forge @@ -161,7 +161,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64-dev.conda.lock.yml b/environments/py-3.13-linux-64-dev.conda.lock.yml index 81321b43e..f04f8f9d1 100644 --- a/environments/py-3.13-linux-64-dev.conda.lock.yml +++ b/environments/py-3.13-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 +# input_hash: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 channels: - conda-forge @@ -303,7 +303,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64.conda.lock.yml b/environments/py-3.13-linux-64.conda.lock.yml index bfde28766..2e0c05656 100644 --- a/environments/py-3.13-linux-64.conda.lock.yml +++ b/environments/py-3.13-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 +# input_hash: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 channels: - conda-forge @@ -171,7 +171,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64-dev.conda.lock.yml b/environments/py-3.13-win-64-dev.conda.lock.yml index 53574e42d..d366fdafd 100644 --- a/environments/py-3.13-win-64-dev.conda.lock.yml +++ b/environments/py-3.13-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 +# input_hash: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 channels: - conda-forge @@ -290,7 +290,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64.conda.lock.yml b/environments/py-3.13-win-64.conda.lock.yml index 8bdb2b8bd..d399c8749 100644 --- a/environments/py-3.13-win-64.conda.lock.yml +++ b/environments/py-3.13-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 +# input_hash: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 channels: - conda-forge @@ -160,7 +160,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 0772756cc..488c84473 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: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b - linux-64: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a + win-64: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 + linux-64: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 channels: - url: conda-forge used_env_vars: [] @@ -8526,7 +8526,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev25+g012a88402 + version: 0.25.0.1a3.dev20+gea70aa21a manager: pip platform: linux-64 dependencies: @@ -8539,16 +8539,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 hash: - sha256: 012a88402a77c172abb21193a1bb9a02b631c180 + sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev25+g012a88402 + version: 0.25.0.1a3.dev20+gea70aa21a manager: pip platform: win-64 dependencies: @@ -8561,11 +8561,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 hash: - sha256: 012a88402a77c172abb21193a1bb9a02b631c180 + sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 category: main optional: false diff --git a/py-3.13.conda-lock.yml b/py-3.13.conda-lock.yml index 7352fc208..0d802db17 100644 --- a/py-3.13.conda-lock.yml +++ b/py-3.13.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 - linux-64: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 + win-64: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 + linux-64: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 channels: - url: conda-forge used_env_vars: [] @@ -8467,7 +8467,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev25+g012a88402 + version: 0.25.0.1a3.dev20+gea70aa21a manager: pip platform: linux-64 dependencies: @@ -8479,16 +8479,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 hash: - sha256: 012a88402a77c172abb21193a1bb9a02b631c180 + sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev25+g012a88402 + version: 0.25.0.1a3.dev20+gea70aa21a manager: pip platform: win-64 dependencies: @@ -8500,11 +8500,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 hash: - sha256: 012a88402a77c172abb21193a1bb9a02b631c180 + sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index 45547b722..c106278a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,7 +103,7 @@ grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "rel geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "release/GA_4.8"} #mira-simpeg = {version = ">=0.23.0.2, 0.23.0.* || >=0.25.0.1a, 0.25.0.*", source="pypi", allow-prereleases = true, extras = ["dask"]} -mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "release/GA_4.8", extras = ["dask"]} +mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "pre-GEOPY-2273", extras = ["dask"]} ## about pip dependencies # to be specified to work with conda-lock From 3b08f5f67cbee896cd29cfd930d0f2b1daa0ca51 Mon Sep 17 00:00:00 2001 From: domfournier Date: Thu, 30 Apr 2026 22:33:27 -0700 Subject: [PATCH 15/18] Re-lock again --- .../py-3.12-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-linux-64.conda.lock.yml | 4 ++-- .../py-3.12-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-win-64.conda.lock.yml | 4 ++-- .../py-3.13-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.13-linux-64.conda.lock.yml | 4 ++-- .../py-3.13-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.13-win-64.conda.lock.yml | 4 ++-- py-3.12.conda-lock.yml | 20 +++++++++---------- py-3.13.conda-lock.yml | 20 +++++++++---------- pyproject.toml | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) 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 180bf070f..d3235e549 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: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 +# input_hash: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a channels: - conda-forge @@ -306,7 +306,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 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 45c70a43d..c71a2a310 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: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 +# input_hash: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a channels: - conda-forge @@ -174,7 +174,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 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 fd4bc87da..fa94ab9fe 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: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 +# input_hash: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b channels: - conda-forge @@ -291,7 +291,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 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 8c5e8ba63..5b4e6fd36 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: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 +# input_hash: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b channels: - conda-forge @@ -161,7 +161,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64-dev.conda.lock.yml b/environments/py-3.13-linux-64-dev.conda.lock.yml index f04f8f9d1..81321b43e 100644 --- a/environments/py-3.13-linux-64-dev.conda.lock.yml +++ b/environments/py-3.13-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 +# input_hash: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 channels: - conda-forge @@ -303,7 +303,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64.conda.lock.yml b/environments/py-3.13-linux-64.conda.lock.yml index 2e0c05656..bfde28766 100644 --- a/environments/py-3.13-linux-64.conda.lock.yml +++ b/environments/py-3.13-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 +# input_hash: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 channels: - conda-forge @@ -171,7 +171,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64-dev.conda.lock.yml b/environments/py-3.13-win-64-dev.conda.lock.yml index d366fdafd..53574e42d 100644 --- a/environments/py-3.13-win-64-dev.conda.lock.yml +++ b/environments/py-3.13-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 +# input_hash: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 channels: - conda-forge @@ -290,7 +290,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64.conda.lock.yml b/environments/py-3.13-win-64.conda.lock.yml index d399c8749..8bdb2b8bd 100644 --- a/environments/py-3.13-win-64.conda.lock.yml +++ b/environments/py-3.13-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 +# input_hash: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 channels: - conda-forge @@ -160,7 +160,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 variables: KMP_WARNINGS: 0 diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 488c84473..0772756cc 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: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 - linux-64: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 + win-64: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b + linux-64: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a channels: - url: conda-forge used_env_vars: [] @@ -8526,7 +8526,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev20+gea70aa21a + version: 0.25.0.1a3.dev25+g012a88402 manager: pip platform: linux-64 dependencies: @@ -8539,16 +8539,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 hash: - sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + sha256: 012a88402a77c172abb21193a1bb9a02b631c180 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev20+gea70aa21a + version: 0.25.0.1a3.dev25+g012a88402 manager: pip platform: win-64 dependencies: @@ -8561,11 +8561,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 hash: - sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + sha256: 012a88402a77c172abb21193a1bb9a02b631c180 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 category: main optional: false diff --git a/py-3.13.conda-lock.yml b/py-3.13.conda-lock.yml index 0d802db17..7352fc208 100644 --- a/py-3.13.conda-lock.yml +++ b/py-3.13.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 - linux-64: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 + win-64: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 + linux-64: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 channels: - url: conda-forge used_env_vars: [] @@ -8467,7 +8467,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev20+gea70aa21a + version: 0.25.0.1a3.dev25+g012a88402 manager: pip platform: linux-64 dependencies: @@ -8479,16 +8479,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 hash: - sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + sha256: 012a88402a77c172abb21193a1bb9a02b631c180 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev20+gea70aa21a + version: 0.25.0.1a3.dev25+g012a88402 manager: pip platform: win-64 dependencies: @@ -8500,11 +8500,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 hash: - sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + sha256: 012a88402a77c172abb21193a1bb9a02b631c180 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 + url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index c106278a5..45547b722 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,7 +103,7 @@ grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "rel geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "release/GA_4.8"} #mira-simpeg = {version = ">=0.23.0.2, 0.23.0.* || >=0.25.0.1a, 0.25.0.*", source="pypi", allow-prereleases = true, extras = ["dask"]} -mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "pre-GEOPY-2273", extras = ["dask"]} +mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "release/GA_4.8", extras = ["dask"]} ## about pip dependencies # to be specified to work with conda-lock From 2856620029c3648aa9eabbbe30972e41b51a1893 Mon Sep 17 00:00:00 2001 From: domfournier Date: Thu, 30 Apr 2026 22:51:29 -0700 Subject: [PATCH 16/18] Try locking early --- .../py-3.12-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-linux-64.conda.lock.yml | 4 ++-- .../py-3.12-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-win-64.conda.lock.yml | 4 ++-- .../py-3.13-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.13-linux-64.conda.lock.yml | 4 ++-- .../py-3.13-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.13-win-64.conda.lock.yml | 4 ++-- py-3.12.conda-lock.yml | 20 +++++++++---------- py-3.13.conda-lock.yml | 20 +++++++++---------- pyproject.toml | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) 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 d3235e549..79ca661fd 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: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a +# input_hash: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 channels: - conda-forge @@ -306,7 +306,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 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 c71a2a310..5dbbccb2e 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: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a +# input_hash: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 channels: - conda-forge @@ -174,7 +174,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 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 fa94ab9fe..902c1d075 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: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b +# input_hash: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 channels: - conda-forge @@ -291,7 +291,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 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 5b4e6fd36..a71f712f2 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: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b +# input_hash: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 channels: - conda-forge @@ -161,7 +161,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64-dev.conda.lock.yml b/environments/py-3.13-linux-64-dev.conda.lock.yml index 81321b43e..e57b6cbd4 100644 --- a/environments/py-3.13-linux-64-dev.conda.lock.yml +++ b/environments/py-3.13-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 +# input_hash: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 channels: - conda-forge @@ -303,7 +303,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64.conda.lock.yml b/environments/py-3.13-linux-64.conda.lock.yml index bfde28766..59f6b4964 100644 --- a/environments/py-3.13-linux-64.conda.lock.yml +++ b/environments/py-3.13-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 +# input_hash: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 channels: - conda-forge @@ -171,7 +171,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64-dev.conda.lock.yml b/environments/py-3.13-win-64-dev.conda.lock.yml index 53574e42d..11d3174c6 100644 --- a/environments/py-3.13-win-64-dev.conda.lock.yml +++ b/environments/py-3.13-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 +# input_hash: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 channels: - conda-forge @@ -290,7 +290,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64.conda.lock.yml b/environments/py-3.13-win-64.conda.lock.yml index 8bdb2b8bd..a1fc50eed 100644 --- a/environments/py-3.13-win-64.conda.lock.yml +++ b/environments/py-3.13-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 +# input_hash: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 channels: - conda-forge @@ -160,7 +160,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 variables: KMP_WARNINGS: 0 diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 0772756cc..0a1feb26a 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: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b - linux-64: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a + win-64: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 + linux-64: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 channels: - url: conda-forge used_env_vars: [] @@ -8526,7 +8526,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev25+g012a88402 + version: 0.25.0.1a3.dev21+g31d7ecfae manager: pip platform: linux-64 dependencies: @@ -8539,16 +8539,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 hash: - sha256: 012a88402a77c172abb21193a1bb9a02b631c180 + sha256: 31d7ecfae7995855c18d80645f0c9baeaecaa3c4 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev25+g012a88402 + version: 0.25.0.1a3.dev21+g31d7ecfae manager: pip platform: win-64 dependencies: @@ -8561,11 +8561,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 hash: - sha256: 012a88402a77c172abb21193a1bb9a02b631c180 + sha256: 31d7ecfae7995855c18d80645f0c9baeaecaa3c4 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 category: main optional: false diff --git a/py-3.13.conda-lock.yml b/py-3.13.conda-lock.yml index 7352fc208..d602b0aed 100644 --- a/py-3.13.conda-lock.yml +++ b/py-3.13.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 - linux-64: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 + win-64: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 + linux-64: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 channels: - url: conda-forge used_env_vars: [] @@ -8467,7 +8467,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev25+g012a88402 + version: 0.25.0.1a3.dev21+g31d7ecfae manager: pip platform: linux-64 dependencies: @@ -8479,16 +8479,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 hash: - sha256: 012a88402a77c172abb21193a1bb9a02b631c180 + sha256: 31d7ecfae7995855c18d80645f0c9baeaecaa3c4 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev25+g012a88402 + version: 0.25.0.1a3.dev21+g31d7ecfae manager: pip platform: win-64 dependencies: @@ -8500,11 +8500,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 hash: - sha256: 012a88402a77c172abb21193a1bb9a02b631c180 + sha256: 31d7ecfae7995855c18d80645f0c9baeaecaa3c4 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@012a88402a77c172abb21193a1bb9a02b631c180 + url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index 45547b722..c106278a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,7 +103,7 @@ grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "rel geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "release/GA_4.8"} #mira-simpeg = {version = ">=0.23.0.2, 0.23.0.* || >=0.25.0.1a, 0.25.0.*", source="pypi", allow-prereleases = true, extras = ["dask"]} -mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "release/GA_4.8", extras = ["dask"]} +mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "pre-GEOPY-2273", extras = ["dask"]} ## about pip dependencies # to be specified to work with conda-lock From 6c94be983a9e503ed5073aa64bbb01cda8fc2764 Mon Sep 17 00:00:00 2001 From: domfournier Date: Thu, 30 Apr 2026 23:17:05 -0700 Subject: [PATCH 17/18] Re-lock on fix simpeg branch --- .../py-3.12-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-linux-64.conda.lock.yml | 4 ++-- .../py-3.12-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-win-64.conda.lock.yml | 4 ++-- .../py-3.13-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.13-linux-64.conda.lock.yml | 4 ++-- .../py-3.13-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.13-win-64.conda.lock.yml | 4 ++-- py-3.12.conda-lock.yml | 20 +++++++++---------- py-3.13.conda-lock.yml | 20 +++++++++---------- pyproject.toml | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) 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 79ca661fd..18503751f 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: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 +# input_hash: ed180f463a14c3fc4aa0f2c882c3e33a74775ba27f01abab5db4d1a31c4b2289 channels: - conda-forge @@ -306,7 +306,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 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 5dbbccb2e..16817a18e 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: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 +# input_hash: ed180f463a14c3fc4aa0f2c882c3e33a74775ba27f01abab5db4d1a31c4b2289 channels: - conda-forge @@ -174,7 +174,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 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 902c1d075..ee6916df0 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: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 +# input_hash: 842fd4ffd53ed7e6b0da1fe622c3b2cf194f0cc3d0abefd2c4af9eb6173f3f83 channels: - conda-forge @@ -291,7 +291,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 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 a71f712f2..52cd9dbdf 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: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 +# input_hash: 842fd4ffd53ed7e6b0da1fe622c3b2cf194f0cc3d0abefd2c4af9eb6173f3f83 channels: - conda-forge @@ -161,7 +161,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64-dev.conda.lock.yml b/environments/py-3.13-linux-64-dev.conda.lock.yml index e57b6cbd4..82fa91c45 100644 --- a/environments/py-3.13-linux-64-dev.conda.lock.yml +++ b/environments/py-3.13-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 +# input_hash: 8cddb3122cd7c0fb6a220d71240092c36d80d2e2caf86bc3d8efd83985599143 channels: - conda-forge @@ -303,7 +303,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64.conda.lock.yml b/environments/py-3.13-linux-64.conda.lock.yml index 59f6b4964..72fd0c911 100644 --- a/environments/py-3.13-linux-64.conda.lock.yml +++ b/environments/py-3.13-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 +# input_hash: 8cddb3122cd7c0fb6a220d71240092c36d80d2e2caf86bc3d8efd83985599143 channels: - conda-forge @@ -171,7 +171,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64-dev.conda.lock.yml b/environments/py-3.13-win-64-dev.conda.lock.yml index 11d3174c6..aa6debf9f 100644 --- a/environments/py-3.13-win-64-dev.conda.lock.yml +++ b/environments/py-3.13-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 +# input_hash: e94f325b80c8f3712794c8d74cfbe76dd4dab9d01bd2326c306ee3c11bae468c channels: - conda-forge @@ -290,7 +290,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64.conda.lock.yml b/environments/py-3.13-win-64.conda.lock.yml index a1fc50eed..91a4d934f 100644 --- a/environments/py-3.13-win-64.conda.lock.yml +++ b/environments/py-3.13-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 +# input_hash: e94f325b80c8f3712794c8d74cfbe76dd4dab9d01bd2326c306ee3c11bae468c channels: - conda-forge @@ -160,7 +160,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 variables: KMP_WARNINGS: 0 diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 0a1feb26a..f3acceb81 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: 6b9d18605960e53c62f22b0068cf73f81bb18da976095dc50ede41213acebd82 - linux-64: 7d499fcdd6e5021455048a16078c83b8ef4c10b40aaca6954a8083da02eedca1 + win-64: 842fd4ffd53ed7e6b0da1fe622c3b2cf194f0cc3d0abefd2c4af9eb6173f3f83 + linux-64: ed180f463a14c3fc4aa0f2c882c3e33a74775ba27f01abab5db4d1a31c4b2289 channels: - url: conda-forge used_env_vars: [] @@ -8526,7 +8526,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev21+g31d7ecfae + version: 0.25.0.1a3.dev26+g9c6f95823 manager: pip platform: linux-64 dependencies: @@ -8539,16 +8539,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 hash: - sha256: 31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + sha256: 9c6f95823c19dc81340f96774d31cc0cde988a76 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev21+g31d7ecfae + version: 0.25.0.1a3.dev26+g9c6f95823 manager: pip platform: win-64 dependencies: @@ -8561,11 +8561,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 hash: - sha256: 31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + sha256: 9c6f95823c19dc81340f96774d31cc0cde988a76 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 category: main optional: false diff --git a/py-3.13.conda-lock.yml b/py-3.13.conda-lock.yml index d602b0aed..82f756b7f 100644 --- a/py-3.13.conda-lock.yml +++ b/py-3.13.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 4412bef7488a78c23ca345560068f7ec1cdbc2012c4d127201ad2699cd6db9c4 - linux-64: c8500982b8c6f8a675443a910fe0b47f019ab5892444b6883f558144c31d99a5 + win-64: e94f325b80c8f3712794c8d74cfbe76dd4dab9d01bd2326c306ee3c11bae468c + linux-64: 8cddb3122cd7c0fb6a220d71240092c36d80d2e2caf86bc3d8efd83985599143 channels: - url: conda-forge used_env_vars: [] @@ -8467,7 +8467,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev21+g31d7ecfae + version: 0.25.0.1a3.dev26+g9c6f95823 manager: pip platform: linux-64 dependencies: @@ -8479,16 +8479,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 hash: - sha256: 31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + sha256: 9c6f95823c19dc81340f96774d31cc0cde988a76 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev21+g31d7ecfae + version: 0.25.0.1a3.dev26+g9c6f95823 manager: pip platform: win-64 dependencies: @@ -8500,11 +8500,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 hash: - sha256: 31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + sha256: 9c6f95823c19dc81340f96774d31cc0cde988a76 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@31d7ecfae7995855c18d80645f0c9baeaecaa3c4 + url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index c106278a5..f2e9b9d0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,7 +103,7 @@ grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "rel geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "release/GA_4.8"} #mira-simpeg = {version = ">=0.23.0.2, 0.23.0.* || >=0.25.0.1a, 0.25.0.*", source="pypi", allow-prereleases = true, extras = ["dask"]} -mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "pre-GEOPY-2273", extras = ["dask"]} +mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "GEOPY-2773B", extras = ["dask"]} ## about pip dependencies # to be specified to work with conda-lock From 284b01734674e2bd69883438a28ea082b3ec52eb Mon Sep 17 00:00:00 2001 From: domfournier Date: Thu, 30 Apr 2026 23:45:19 -0700 Subject: [PATCH 18/18] Final relock --- .../py-3.12-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-linux-64.conda.lock.yml | 4 ++-- .../py-3.12-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-win-64.conda.lock.yml | 4 ++-- .../py-3.13-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.13-linux-64.conda.lock.yml | 4 ++-- .../py-3.13-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.13-win-64.conda.lock.yml | 4 ++-- py-3.12.conda-lock.yml | 20 +++++++++---------- py-3.13.conda-lock.yml | 20 +++++++++---------- pyproject.toml | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) 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 18503751f..e0008638f 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: ed180f463a14c3fc4aa0f2c882c3e33a74775ba27f01abab5db4d1a31c4b2289 +# input_hash: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a channels: - conda-forge @@ -306,7 +306,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae 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 16817a18e..5ca631091 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: ed180f463a14c3fc4aa0f2c882c3e33a74775ba27f01abab5db4d1a31c4b2289 +# input_hash: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a channels: - conda-forge @@ -174,7 +174,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae 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 ee6916df0..d723b2ee5 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: 842fd4ffd53ed7e6b0da1fe622c3b2cf194f0cc3d0abefd2c4af9eb6173f3f83 +# input_hash: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b channels: - conda-forge @@ -291,7 +291,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae 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 52cd9dbdf..35ca50a54 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: 842fd4ffd53ed7e6b0da1fe622c3b2cf194f0cc3d0abefd2c4af9eb6173f3f83 +# input_hash: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b channels: - conda-forge @@ -161,7 +161,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64-dev.conda.lock.yml b/environments/py-3.13-linux-64-dev.conda.lock.yml index 82fa91c45..be08c577a 100644 --- a/environments/py-3.13-linux-64-dev.conda.lock.yml +++ b/environments/py-3.13-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 8cddb3122cd7c0fb6a220d71240092c36d80d2e2caf86bc3d8efd83985599143 +# input_hash: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 channels: - conda-forge @@ -303,7 +303,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64.conda.lock.yml b/environments/py-3.13-linux-64.conda.lock.yml index 72fd0c911..8f01d7609 100644 --- a/environments/py-3.13-linux-64.conda.lock.yml +++ b/environments/py-3.13-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 8cddb3122cd7c0fb6a220d71240092c36d80d2e2caf86bc3d8efd83985599143 +# input_hash: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 channels: - conda-forge @@ -171,7 +171,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64-dev.conda.lock.yml b/environments/py-3.13-win-64-dev.conda.lock.yml index aa6debf9f..41e1d3d3e 100644 --- a/environments/py-3.13-win-64-dev.conda.lock.yml +++ b/environments/py-3.13-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: e94f325b80c8f3712794c8d74cfbe76dd4dab9d01bd2326c306ee3c11bae468c +# input_hash: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 channels: - conda-forge @@ -290,7 +290,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64.conda.lock.yml b/environments/py-3.13-win-64.conda.lock.yml index 91a4d934f..25e0e0bc5 100644 --- a/environments/py-3.13-win-64.conda.lock.yml +++ b/environments/py-3.13-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: e94f325b80c8f3712794c8d74cfbe76dd4dab9d01bd2326c306ee3c11bae468c +# input_hash: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 channels: - conda-forge @@ -160,7 +160,7 @@ dependencies: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c0aebede6ba643c03c7c88eb7c47dfc14e56d33c - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae variables: KMP_WARNINGS: 0 diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index f3acceb81..56a0c22c8 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: 842fd4ffd53ed7e6b0da1fe622c3b2cf194f0cc3d0abefd2c4af9eb6173f3f83 - linux-64: ed180f463a14c3fc4aa0f2c882c3e33a74775ba27f01abab5db4d1a31c4b2289 + win-64: 32712d2e1d1aba2f43aa48b4905384bee4be9aaeb1e316914c9470169fd4d85b + linux-64: d747fea7bb90eb9ee4438c69a8ea18c4f296df1b74154f14919a77014b7b230a channels: - url: conda-forge used_env_vars: [] @@ -8526,7 +8526,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev26+g9c6f95823 + version: 0.25.0.1a3.dev27+g6ea5b9d17 manager: pip platform: linux-64 dependencies: @@ -8539,16 +8539,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + url: git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae hash: - sha256: 9c6f95823c19dc81340f96774d31cc0cde988a76 + sha256: 6ea5b9d178f74b459b5a03f04110e736fe1601ae source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + url: git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev26+g9c6f95823 + version: 0.25.0.1a3.dev27+g6ea5b9d17 manager: pip platform: win-64 dependencies: @@ -8561,11 +8561,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + url: git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae hash: - sha256: 9c6f95823c19dc81340f96774d31cc0cde988a76 + sha256: 6ea5b9d178f74b459b5a03f04110e736fe1601ae source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + url: git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae category: main optional: false diff --git a/py-3.13.conda-lock.yml b/py-3.13.conda-lock.yml index 82f756b7f..91b29f1d9 100644 --- a/py-3.13.conda-lock.yml +++ b/py-3.13.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: e94f325b80c8f3712794c8d74cfbe76dd4dab9d01bd2326c306ee3c11bae468c - linux-64: 8cddb3122cd7c0fb6a220d71240092c36d80d2e2caf86bc3d8efd83985599143 + win-64: 108f2d5624261faddfd5413b082b0ad4dd1652b8f599680c63a28fbff70e0e04 + linux-64: 6a1304daf87733c2c46e134f75783a582318d63b754b36eba640e422c324e954 channels: - url: conda-forge used_env_vars: [] @@ -8467,7 +8467,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev26+g9c6f95823 + version: 0.25.0.1a3.dev27+g6ea5b9d17 manager: pip platform: linux-64 dependencies: @@ -8479,16 +8479,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + url: git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae hash: - sha256: 9c6f95823c19dc81340f96774d31cc0cde988a76 + sha256: 6ea5b9d178f74b459b5a03f04110e736fe1601ae source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + url: git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev26+g9c6f95823 + version: 0.25.0.1a3.dev27+g6ea5b9d17 manager: pip platform: win-64 dependencies: @@ -8500,11 +8500,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + url: git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae hash: - sha256: 9c6f95823c19dc81340f96774d31cc0cde988a76 + sha256: 6ea5b9d178f74b459b5a03f04110e736fe1601ae source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@9c6f95823c19dc81340f96774d31cc0cde988a76 + url: git+https://github.com/MiraGeoscience/simpeg.git@6ea5b9d178f74b459b5a03f04110e736fe1601ae category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index f2e9b9d0a..45547b722 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,7 +103,7 @@ grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "rel geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "release/GA_4.8"} #mira-simpeg = {version = ">=0.23.0.2, 0.23.0.* || >=0.25.0.1a, 0.25.0.*", source="pypi", allow-prereleases = true, extras = ["dask"]} -mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "GEOPY-2773B", extras = ["dask"]} +mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "release/GA_4.8", extras = ["dask"]} ## about pip dependencies # to be specified to work with conda-lock