From 9033b326a7315de341d353e8ee19023bc2cf6511 Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 25 Aug 2026 10:40:41 -0700 Subject: [PATCH 1/8] Allow integers in forms --- .../apparent_conductivity_inversion.ui.json | 5 +- .../uijson/direct_current_2d_forward.ui.json | 10 ++- .../direct_current_2d_inversion.ui.json | 60 ++++++++++--- .../direct_current_3d_inversion.ui.json | 70 ++++++++++++--- .../uijson/fdem1d_forward.ui.json | 10 ++- .../uijson/fdem1d_inversion.ui.json | 55 +++++++++--- .../uijson/fdem_inversion.ui.json | 75 ++++++++++++---- .../uijson/gravity_inversion.ui.json | 70 ++++++++++++--- .../induced_polarization_2d_inversion.ui.json | 65 +++++++++++--- .../induced_polarization_3d_inversion.ui.json | 75 ++++++++++++---- .../joint_cross_gradient_inversion.ui.json | 30 +++++-- .../joint_petrophysics_inversion.ui.json | 30 +++++-- .../uijson/joint_surveys_inversion.ui.json | 70 ++++++++++++--- .../uijson/magnetic_scalar_inversion.ui.json | 70 ++++++++++++--- .../uijson/magnetic_vector_inversion.ui.json | 85 +++++++++++++++---- .../magnetic_vector_pde_inversion.ui.json | 75 ++++++++++++---- .../uijson/magnetotellurics_forward.ui.json | 10 ++- .../uijson/magnetotellurics_inversion.ui.json | 70 ++++++++++++--- .../uijson/tdem1d_forward.ui.json | 10 ++- .../uijson/tdem1d_inversion.ui.json | 55 +++++++++--- .../uijson/tdem_inversion.ui.json | 55 +++++++++--- .../uijson/tipper_forward.ui.json | 10 ++- .../uijson/tipper_inversion.ui.json | 70 ++++++++++++--- 23 files changed, 908 insertions(+), 227 deletions(-) diff --git a/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json b/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json index b55117b5..5934987e 100644 --- a/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json @@ -287,7 +287,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index d9a08b45..0d105a4e 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -112,7 +112,10 @@ }, "starting_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -142,7 +145,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json index 31362e80..eb418ed5 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -132,7 +132,10 @@ }, "starting_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -143,7 +146,10 @@ }, "reference_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -157,7 +163,10 @@ "lower_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -170,7 +179,10 @@ "upper_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -201,7 +213,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -242,7 +257,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -255,7 +273,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -269,14 +290,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -291,7 +318,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -309,7 +339,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -326,7 +359,10 @@ "y_norm": "", "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json index af1723e6..2f6d2b31 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -69,7 +69,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -84,7 +87,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -100,7 +106,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -117,7 +126,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -149,7 +161,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -190,7 +205,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -203,7 +221,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -216,7 +237,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -229,14 +253,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -251,7 +281,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -269,7 +302,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -285,7 +321,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -301,7 +340,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index 222436a4..d2fc8bdd 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -104,7 +104,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -134,7 +137,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index 6cfa6a2f..25602098 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -154,7 +154,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -168,7 +171,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -185,7 +191,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -201,7 +210,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -232,7 +244,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -256,7 +271,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -269,7 +287,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -283,14 +304,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": "", "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -308,7 +335,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -325,7 +355,10 @@ "y_norm": "", "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json index c6c5754f..cf113bdb 100644 --- a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json @@ -20,7 +20,10 @@ "group": "Survey", "main": true, "association": "Vertex", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Dip direction & dip", "3D vector" @@ -136,7 +139,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -150,7 +156,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -167,7 +176,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -183,7 +195,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -214,7 +229,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -255,7 +273,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -268,7 +289,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -281,7 +305,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -294,14 +321,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -316,7 +349,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -334,7 +370,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -350,7 +389,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -366,7 +408,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json index ccc1afd0..2d9c5786 100644 --- a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json @@ -337,7 +337,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -352,7 +355,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "optional": true, @@ -368,7 +374,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -384,7 +393,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -415,7 +427,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -456,7 +471,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -469,7 +487,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -482,7 +503,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -495,14 +519,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -517,7 +547,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -535,7 +568,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -551,7 +587,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -567,7 +606,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index 1490d9b3..46190dc3 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -131,7 +131,10 @@ }, "conductivity_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -143,7 +146,10 @@ }, "starting_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -154,7 +160,10 @@ }, "reference_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -168,7 +177,10 @@ "lower_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -181,7 +193,10 @@ "upper_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -212,7 +227,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -253,7 +271,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -266,7 +287,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -280,14 +304,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -302,7 +332,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -320,7 +353,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -337,7 +373,10 @@ "y_norm": "", "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index e6a0e841..445dbca4 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -69,7 +69,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -84,7 +87,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -100,7 +106,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -117,7 +126,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -134,7 +146,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -166,7 +181,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -207,7 +225,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -220,7 +241,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -233,7 +257,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -246,14 +273,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -268,7 +301,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -286,7 +322,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -302,7 +341,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -318,7 +360,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index a130bcfd..85f58707 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -126,7 +126,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -166,7 +169,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": false }, @@ -179,7 +185,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -192,7 +201,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -205,14 +217,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", diff --git a/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json index 4357f3e7..9612de76 100644 --- a/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json @@ -108,7 +108,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -174,7 +177,10 @@ "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": "Dip direction & dip", "label": "Gradient rotation", "optional": true, @@ -192,7 +198,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true, "visible": false @@ -206,7 +215,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -219,7 +231,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -232,7 +247,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 3a72255c..22790db9 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -80,7 +80,10 @@ }, "starting_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -94,7 +97,10 @@ "reference_model": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -107,7 +113,10 @@ "lower_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -120,7 +129,10 @@ "upper_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -151,7 +163,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -192,7 +207,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -205,7 +223,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -218,7 +239,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -231,14 +255,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -253,7 +283,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -271,7 +304,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -287,7 +323,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -303,7 +342,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index cf49684c..80c8a0cc 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -368,7 +368,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -383,7 +386,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "optional": true, @@ -399,7 +405,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -415,7 +424,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -446,7 +458,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -487,7 +502,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -500,7 +518,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -513,7 +534,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -526,14 +550,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -548,7 +578,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -566,7 +599,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -582,7 +618,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -598,7 +637,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index baa91f96..0fb5348d 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -368,7 +368,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -383,7 +386,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "optional": true, @@ -399,7 +405,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -414,7 +423,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -430,7 +442,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -446,7 +461,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -462,7 +480,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -494,7 +515,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -535,7 +559,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -548,7 +575,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -561,7 +591,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -574,14 +607,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -596,7 +635,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -614,7 +656,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -630,7 +675,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -646,7 +694,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_pde_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_pde_inversion.ui.json index aa899198..48d60666 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_pde_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_pde_inversion.ui.json @@ -188,7 +188,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -202,7 +205,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -218,7 +224,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -235,7 +244,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "optional": true, @@ -251,7 +263,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -282,7 +297,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -323,7 +341,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -336,7 +357,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -349,7 +373,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -362,14 +389,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -384,7 +417,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -402,7 +438,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -418,7 +457,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -434,7 +476,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index d5274193..5cfb612d 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -95,7 +95,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -125,7 +128,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index 15d0707b..f32681c1 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -287,7 +287,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -301,7 +304,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -318,7 +324,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -334,7 +343,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -365,7 +377,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -406,7 +421,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -419,7 +437,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -432,7 +453,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -445,14 +469,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -467,7 +497,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -485,7 +518,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -501,7 +537,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -517,7 +556,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index a0a6dde8..f554d20d 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -109,7 +109,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -139,7 +142,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index 0e44d3ed..a00eef9b 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -133,7 +133,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -147,7 +150,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -161,7 +167,10 @@ "lower_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -174,7 +183,10 @@ "upper_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -205,7 +217,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -229,7 +244,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -242,7 +260,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -256,14 +277,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": "", "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -281,7 +308,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Lateral-smoothness norm", "isValue": true, @@ -298,7 +328,10 @@ "y_norm": "", "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Vertical-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index 1f5e67ed..08f03dea 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -21,7 +21,10 @@ "group": "Survey", "main": true, "association": "Vertex", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Dip direction & dip", "3D vector" @@ -177,7 +180,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -191,7 +197,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -205,7 +214,10 @@ "lower_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -218,7 +230,10 @@ "upper_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -249,7 +264,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -290,7 +308,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -303,7 +324,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -316,7 +340,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -329,14 +356,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index d26a1b91..a55db676 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -71,7 +71,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -101,7 +104,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index 142f61aa..759d14b3 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -167,7 +167,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -181,7 +184,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -198,7 +204,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -214,7 +223,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -245,7 +257,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -286,7 +301,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -299,7 +317,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -312,7 +333,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -325,14 +349,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -347,7 +377,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -365,7 +398,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -381,7 +417,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -397,7 +436,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, From a41bbb91fc6bffb692f730aa00c607c0b32501dc Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 25 Aug 2026 14:14:43 -0700 Subject: [PATCH 2/8] Apply to remaining jsons --- .../apparent_conductivity_forward.ui.json | 10 ++++++++-- .../uijson/direct_current_3d_forward.ui.json | 10 ++++++++-- .../uijson/fdem_forward.ui.json | 10 ++++++++-- .../uijson/gravity_forward.ui.json | 10 ++++++++-- .../induced_polarization_2d_forward.ui.json | 15 +++++++++++--- .../induced_polarization_3d_forward.ui.json | 15 +++++++++++--- .../uijson/magnetic_scalar_forward.ui.json | 10 ++++++++-- .../uijson/magnetic_vector_forward.ui.json | 20 +++++++++++++++---- .../magnetic_vector_pde_forward.ui.json | 20 +++++++++++++++---- .../uijson/tdem_forward.ui.json | 10 ++++++++-- 10 files changed, 104 insertions(+), 26 deletions(-) diff --git a/simpeg_drivers-assets/uijson/apparent_conductivity_forward.ui.json b/simpeg_drivers-assets/uijson/apparent_conductivity_forward.ui.json index 1a6da245..b190ae8d 100644 --- a/simpeg_drivers-assets/uijson/apparent_conductivity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/apparent_conductivity_forward.ui.json @@ -47,7 +47,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -77,7 +80,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index 7f7b68dc..06ee6718 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -41,7 +41,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -71,7 +74,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/fdem_forward.ui.json b/simpeg_drivers-assets/uijson/fdem_forward.ui.json index 005e1d19..e6e706c5 100644 --- a/simpeg_drivers-assets/uijson/fdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_forward.ui.json @@ -86,7 +86,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -116,7 +119,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/gravity_forward.ui.json b/simpeg_drivers-assets/uijson/gravity_forward.ui.json index 351c9e0d..ddd3f82a 100644 --- a/simpeg_drivers-assets/uijson/gravity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_forward.ui.json @@ -97,7 +97,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -127,7 +130,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index 35981ed3..b94de38f 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -112,7 +112,10 @@ }, "conductivity_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -124,7 +127,10 @@ }, "starting_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -154,7 +160,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json index bbecb26e..f88a56a9 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -41,7 +41,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -56,7 +59,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -88,7 +94,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json index 80153d3e..b0fc225e 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json @@ -58,7 +58,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -178,7 +181,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json index 41391fd3..e56abf53 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json @@ -60,7 +60,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -179,7 +182,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -193,7 +199,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -209,7 +218,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_pde_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_pde_forward.ui.json index 74b4eb13..d13db3ca 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_pde_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_pde_forward.ui.json @@ -59,7 +59,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -142,7 +145,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -156,7 +162,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -172,7 +181,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index 39acca38..0e28aacc 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -105,7 +105,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -135,7 +138,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, From 595922cd15e5a25aac1a9e91aa0d08015ee3a2ec Mon Sep 17 00:00:00 2001 From: domfournier Date: Wed, 26 Aug 2026 10:50:18 -0700 Subject: [PATCH 3/8] Re-lock --- .../py-3.12-linux-64-dev.conda.lock.yml | 70 +-- environments/py-3.12-linux-64.conda.lock.yml | 48 +- .../py-3.12-win-64-dev.conda.lock.yml | 66 +-- environments/py-3.12-win-64.conda.lock.yml | 42 +- .../py-3.13-linux-64-dev.conda.lock.yml | 64 +- environments/py-3.13-linux-64.conda.lock.yml | 46 +- .../py-3.13-win-64-dev.conda.lock.yml | 60 +- environments/py-3.13-win-64.conda.lock.yml | 40 +- py-3.12.conda-lock.yml | 560 +++++++++--------- py-3.13.conda-lock.yml | 508 ++++++++-------- pyproject.toml | 6 +- 11 files changed, 755 insertions(+), 755 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 6ed34c74..1c962764 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: 796a885d21de56e2bb7eebd504e05579d6ec33b32e9aca481c365a62bcf51060 +# input_hash: d4e89447ddc89490b9baa6153c503886506d9dbc1b81466f4cc3e6a28d370325 channels: - conda-forge @@ -12,7 +12,7 @@ dependencies: - annotated-types=0.8.0=pyhd8ed1ab_0 - anyio=4.14.2=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=25.1.0=py312h4c3975b_2 + - argon2-cffi-bindings=26.1.0=py312h5cc1888_0 - arrow=1.4.0=pyhcf101f3_0 - asciitree=0.3.3=py_2 - astroid=4.0.4=py312h7900ff3_0 @@ -38,10 +38,10 @@ dependencies: - brotli-bin=1.2.0=h9908984_3 - brotli-python=1.2.0=py312he9c40d5_3 - bzip2=1.0.8=hda65f42_10 - - c-ares=1.34.8=h280c20c_1 + - c-ares=1.34.8=hebe6cf0_2 - ca-certificates=2026.7.22=hbd8a1cb_0 - - cached-property=1.5.2=hd8ed1ab_2 - - cached_property=1.5.2=pyha770c72_2 + - cached-property=2.0.1=pyhcf101f3_0 + - cached_property=2.0.1=pyhcf101f3_0 - certifi=2026.7.22=pyhd8ed1ab_0 - cffi=2.1.1=py312h703531f_2 - charset-normalizer=3.5.1=pyhd8ed1ab_0 @@ -51,7 +51,7 @@ dependencies: - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py312h0a2e395_4 - coverage=7.15.4=py312h589e9ff_1 - - cpython=3.12.13=py312hd8ed1ab_1 + - cpython=3.12.14=py312hd8ed1ab_0 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py312h4c3975b_2 - dask-core=2025.3.1=pyhd8ed1ab_0 @@ -73,7 +73,7 @@ dependencies: - geoana=0.8.1=np2py312h2a48985_0 - h11=0.16.0=pyhcf101f3_1 - h2=4.4.1=pyhcf101f3_0 - - h5py=3.16.0=nompi_py312h7082e50_103 + - h5py=3.16.0=nompi_py312h7082e50_104 - hdf5=2.2.0=nompi_hc529623_100 - hpack=4.2.0=pyhd8ed1ab_0 - httpcore=1.0.9=pyh29332c3_0 @@ -81,7 +81,7 @@ dependencies: - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he02047a_0 - idna=3.19=pyhcf101f3_0 - - imagesize=2.0.0=pyhd8ed1ab_0 + - imagesize=2.0.1=pyhd8ed1ab_0 - importlib-metadata=9.0.0=pyhcf101f3_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.3.0=pyha191276_0 @@ -96,9 +96,9 @@ dependencies: - joblib=1.5.3=pyhd8ed1ab_0 - json5=0.15.0=pyhd8ed1ab_0 - jsonpointer=3.1.1=pyhcf101f3_0 - - jsonschema=4.26.0=pyhcf101f3_0 + - jsonschema=4.26.0=pyhcf101f3_1 - jsonschema-specifications=2025.9.1=pyhcf101f3_0 - - jsonschema-with-format-nongpl=4.26.0=hcf101f3_0 + - jsonschema-with-format-nongpl=4.26.0=hcf101f3_1 - jupyter-book=2.1.6=pyhcf101f3_0 - jupyter-builder=1.2.2=pyhcf101f3_0 - jupyter-lsp=2.3.1=pyhcf101f3_0 @@ -131,29 +131,29 @@ dependencies: - libedit=3.1.20250104=pl5321h373387f_1 - libev=4.33=h280c20c_3 - libexpat=2.8.1=hecca717_1 - - libffi=3.7.0=h3435931_0 + - libffi=3.7.0=h81df57d_1 - libfreetype=2.14.3=ha770c72_2 - libfreetype6=2.14.3=h5e6c136_2 - - libgcc=16.1.0=ha9f2e26_1 - - libgcc-ng=16.1.0=h69a702a_1 - - libgfortran=16.1.0=h69a702a_1 - - libgfortran5=16.1.0=h79bb938_1 + - libgcc=16.2.0=ha9f2e26_4 + - libgcc-ng=16.2.0=h69a702a_4 + - libgfortran=16.2.0=h69a702a_4 + - libgfortran5=16.2.0=h6b99dfc_4 - libhwloc=2.13.0=default_he001693_1000 - libiconv=1.18=h0cb94f2_3 - libjpeg-turbo=3.2.0=hb03c661_1 - liblapack=3.11.0=6_h5e43f62_mkl - liblzma=5.8.3=hb03c661_1 - - libnghttp2=1.68.1=h877daf1_0 + - libnghttp2=1.68.1=h74cf4be_1 - libnsl=2.0.1=hb9d3cd8_1 - libpng=1.6.58=h922cc85_1 - libscotch=7.0.11=int64_h807e49d_3 - - libsodium=1.0.22=h280c20c_1 + - libsodium=1.0.22=hebe6cf0_2 - libspatialindex=2.1.0=h54a6638_1 - libsqlite=3.53.4=h0737f62_1 - libssh2=1.11.1=h6154650_1 - - libstdcxx=16.1.0=h934c35e_1 - - libstdcxx-ng=16.1.0=hdf11a46_1 - - libtiff=4.7.2=h9d88235_0 + - libstdcxx=16.2.0=h934c35e_4 + - libstdcxx-ng=16.2.0=hdf11a46_4 + - libtiff=4.7.2=hcc2c06a_1 - libuuid=2.42.2=h5347b49_0 - libuv=1.52.1=h280c20c_1 - libwebp-base=1.6.0=hd42ef1d_1 @@ -162,7 +162,7 @@ dependencies: - libxml2=2.15.1=h26afc86_0 - libxml2-16=2.15.1=ha9997c6_0 - libzlib=1.3.2=h25fd6f3_3 - - llvm-openmp=22.1.8=h4922eb0_0 + - llvm-openmp=23.1.0=h7148c6a_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=4.2.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h8a5da7c_1 @@ -182,7 +182,7 @@ dependencies: - nbconvert=7.16.6=hc388f54_1 - nbconvert-core=7.16.6=pyhcf101f3_1 - nbconvert-pandoc=7.16.6=h7d6f222_1 - - nbformat=5.11.0=pyhcf101f3_1 + - nbformat=5.11.1=pyhcf101f3_0 - ncurses=6.6=hdb14827_1 - nest-asyncio2=1.7.2=pyhcf101f3_0 - nodejs=22.6.0=hc19f0b3_1 @@ -193,7 +193,7 @@ dependencies: - onemkl-license=2025.3.1=hf2ce2f3_12 - openjpeg=2.5.4=h55fea9a_0 - openpyxl=3.1.5=py312h7f6eeab_3 - - openssl=3.6.3=h35e630c_1 + - openssl=3.6.4=h781a0a9_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py312hf79963d_1 @@ -204,11 +204,11 @@ dependencies: - pexpect=4.9.0=pyhd8ed1ab_1 - pillow=12.3.0=py312h50c33e8_0 - pip=26.2.1=pyh8b19718_0 - - platformdirs=4.11.3=pyhcf101f3_0 + - platformdirs=4.11.4=pyhcf101f3_0 - pluggy=1.6.0=pyhf9edf01_1 - prometheus_client=0.26.0=pyhd8ed1ab_0 - prompt-toolkit=3.0.53=pyha770c72_0 - - psutil=7.2.2=py312h5253ce2_0 + - psutil=7.2.2=py312h1b36aeb_1 - pthread-stubs=0.4=hb03c661_1003 - ptyprocess=0.7.0=pyhd8ed1ab_1 - pure_eval=0.2.3=pyhd8ed1ab_1 @@ -223,17 +223,17 @@ dependencies: - pysocks=1.7.1=pyha55dd90_7 - pytest=9.1.1=pyhc364b38_2 - pytest-cov=7.1.0=pyhcf101f3_0 - - python=3.12.13=h8ab3286_1_cpython + - python=3.12.14=h8ab3286_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.22.2=pyhcf101f3_0 - - python-gil=3.12.13=hd8ed1ab_1 + - python-gil=3.12.14=hd8ed1ab_0 - python-json-logger=4.2.0=pyhd8ed1ab_0 - python-mumps=0.0.6=nompi_h4762de1 - python-tzdata=2026.3=pyhd8ed1ab_0 - python_abi=3.12=8_cp312 - pytz=2026.3.post1=pyhcf101f3_0 - pyyaml=6.0.3=py312h8a5da7c_1 - - pyzmq=27.1.0=py312hda471dd_3 + - pyzmq=27.2.0=py312h8a5ba0d_0 - qhull=2020.2=h434a139_5 - readline=8.3=hd6e31c0_1 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 @@ -242,7 +242,7 @@ dependencies: - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - rfc3987-syntax=1.1.0=pyhe01879c_1 - - rpds-py=2026.6.3=py312h192e038_0 + - rpds-py=2026.6.3=py312hc767a74_0 - rtree=1.4.1=pyh11ca60a_0 - s2n=1.7.6=h7e3ee7f_0 - scikit-learn=1.8.0=np2py312h3226591_1 @@ -267,7 +267,7 @@ dependencies: - terminado=0.18.1=pyhc90fa1f_1 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - - tk=8.6.13=noxft_hd70dff1_3 + - tk=8.6.13=noxft_h1df4ec4_4 - tomli=2.4.1=pyhcf101f3_0 - tomlkit=0.15.1=pyhcf101f3_0 - toolz=1.1.0=pyhd8ed1ab_1 @@ -293,7 +293,7 @@ dependencies: - xorg-libxau=1.0.12=hb03c661_2 - xorg-libxdmcp=1.1.5=hb03c661_2 - xyzservices=2026.3.0=pyhd8ed1ab_0 - - yaml=0.2.5=h280c20c_3 + - yaml=0.2.5=hebe6cf0_3 - zarr=2.14.2=pyhd8ed1ab_0 - zeromq=4.3.5=h09e67af_11 - zict=3.0.0=pyhd8ed1ab_1 @@ -302,10 +302,10 @@ dependencies: - zlib-ng=2.3.3=hce19668_1 - zstd=1.5.7=hb78ec9c_7 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 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 735f8bfa..ac238e48 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: 796a885d21de56e2bb7eebd504e05579d6ec33b32e9aca481c365a62bcf51060 +# input_hash: d4e89447ddc89490b9baa6153c503886506d9dbc1b81466f4cc3e6a28d370325 channels: - conda-forge @@ -24,10 +24,10 @@ dependencies: - brotli-bin=1.2.0=h9908984_3 - brotli-python=1.2.0=py312he9c40d5_3 - bzip2=1.0.8=hda65f42_10 - - c-ares=1.34.8=h280c20c_1 + - c-ares=1.34.8=hebe6cf0_2 - ca-certificates=2026.7.22=hbd8a1cb_0 - - cached-property=1.5.2=hd8ed1ab_2 - - cached_property=1.5.2=pyha770c72_2 + - cached-property=2.0.1=pyhcf101f3_0 + - cached_property=2.0.1=pyhcf101f3_0 - click=8.4.2=pyhc90fa1f_0 - cloudpickle=3.1.2=pyhcf101f3_1 - contourpy=1.3.3=py312h0a2e395_4 @@ -44,7 +44,7 @@ dependencies: - fsspec=2026.7.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py312h2a48985_0 - h2=4.4.1=pyhcf101f3_0 - - h5py=3.16.0=nompi_py312h7082e50_103 + - h5py=3.16.0=nompi_py312h7082e50_104 - hdf5=2.2.0=nompi_hc529623_100 - hpack=4.2.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 @@ -70,28 +70,28 @@ dependencies: - libedit=3.1.20250104=pl5321h373387f_1 - libev=4.33=h280c20c_3 - libexpat=2.8.1=hecca717_1 - - libffi=3.7.0=h3435931_0 + - libffi=3.7.0=h81df57d_1 - libfreetype=2.14.3=ha770c72_2 - libfreetype6=2.14.3=h5e6c136_2 - - libgcc=16.1.0=ha9f2e26_1 - - libgcc-ng=16.1.0=h69a702a_1 - - libgfortran=16.1.0=h69a702a_1 - - libgfortran5=16.1.0=h79bb938_1 + - libgcc=16.2.0=ha9f2e26_4 + - libgcc-ng=16.2.0=h69a702a_4 + - libgfortran=16.2.0=h69a702a_4 + - libgfortran5=16.2.0=h6b99dfc_4 - libhwloc=2.13.0=default_he001693_1000 - libiconv=1.18=h0cb94f2_3 - libjpeg-turbo=3.2.0=hb03c661_1 - liblapack=3.11.0=6_h5e43f62_mkl - liblzma=5.8.3=hb03c661_1 - - libnghttp2=1.68.1=h877daf1_0 + - libnghttp2=1.68.1=h74cf4be_1 - libnsl=2.0.1=hb9d3cd8_1 - libpng=1.6.58=h922cc85_1 - libscotch=7.0.11=int64_h807e49d_3 - libspatialindex=2.1.0=h54a6638_1 - libsqlite=3.53.4=h0737f62_1 - libssh2=1.11.1=h6154650_1 - - libstdcxx=16.1.0=h934c35e_1 - - libstdcxx-ng=16.1.0=hdf11a46_1 - - libtiff=4.7.2=h9d88235_0 + - libstdcxx=16.2.0=h934c35e_4 + - libstdcxx-ng=16.2.0=hdf11a46_4 + - libtiff=4.7.2=hcc2c06a_1 - libuuid=2.42.2=h5347b49_0 - libwebp-base=1.6.0=hd42ef1d_1 - libxcb=1.17.0=hb83e432_1 @@ -99,7 +99,7 @@ dependencies: - libxml2=2.15.1=h26afc86_0 - libxml2-16=2.15.1=ha9997c6_0 - libzlib=1.3.2=h25fd6f3_3 - - llvm-openmp=22.1.8=h4922eb0_0 + - llvm-openmp=23.1.0=h7148c6a_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h8a5da7c_1 - matplotlib-base=3.10.9=py312he3d6523_0 @@ -115,13 +115,13 @@ dependencies: - onemkl-license=2025.3.1=hf2ce2f3_12 - openjpeg=2.5.4=h55fea9a_0 - openpyxl=3.1.5=py312h7f6eeab_3 - - openssl=3.6.3=h35e630c_1 + - openssl=3.6.4=h781a0a9_0 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py312hf79963d_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.3.0=py312h50c33e8_0 - pip=26.2.1=pyh8b19718_0 - - psutil=7.2.2=py312h5253ce2_0 + - psutil=7.2.2=py312h1b36aeb_1 - pthread-stubs=0.4=hb03c661_1003 - pydantic=2.12.5=pyhcf101f3_1 - pydantic-core=2.41.5=py312h868fb18_1 @@ -129,7 +129,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 - - python=3.12.13=h8ab3286_1_cpython + - python=3.12.14=h8ab3286_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.6=nompi_h4762de1 - python-tzdata=2026.3=pyhd8ed1ab_0 @@ -148,7 +148,7 @@ dependencies: - tbb=2023.0.0=hab88423_2 - tblib=3.2.2=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - - tk=8.6.13=noxft_hd70dff1_3 + - tk=8.6.13=noxft_h1df4ec4_4 - toolz=1.1.0=pyhd8ed1ab_1 - tornado=6.5.8=py312h4c3975b_0 - tqdm=4.70.0=pyh8f84b5b_0 @@ -164,17 +164,17 @@ dependencies: - xorg-libxau=1.0.12=hb03c661_2 - xorg-libxdmcp=1.1.5=hb03c661_2 - xyzservices=2026.3.0=pyhd8ed1ab_0 - - yaml=0.2.5=h280c20c_3 + - yaml=0.2.5=hebe6cf0_3 - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=4.1.0=pyhcf101f3_0 - zlib-ng=2.3.3=hce19668_1 - zstd=1.5.7=hb78ec9c_7 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 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 506ce8e3..40262156 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: 552d4415b447b8e845ba8a98cf78ef5318078e47b4c098d9da7cd8bd0eb5f058 +# input_hash: b09e66847f78fcc9809b6d746d19563387f7cb275b1d47dddaf7b7a70cff0686 channels: - conda-forge @@ -12,7 +12,7 @@ dependencies: - annotated-types=0.8.0=pyhd8ed1ab_0 - anyio=4.14.2=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=25.1.0=py312he06e257_2 + - argon2-cffi-bindings=26.1.0=py312he06e257_0 - arrow=1.4.0=pyhcf101f3_0 - asciitree=0.3.3=py_2 - astroid=4.0.4=py312h2e8e312_0 @@ -39,8 +39,8 @@ dependencies: - brotli-python=1.2.0=py312ha763cb9_3 - bzip2=1.0.8=h0ad9c76_10 - ca-certificates=2026.7.22=h4c7d964_0 - - cached-property=1.5.2=hd8ed1ab_2 - - cached_property=1.5.2=pyha770c72_2 + - cached-property=2.0.1=pyhcf101f3_0 + - cached_property=2.0.1=pyhcf101f3_0 - certifi=2026.7.22=pyhd8ed1ab_0 - cffi=2.1.1=py312he06e257_2 - charset-normalizer=3.5.1=pyhd8ed1ab_0 @@ -50,7 +50,7 @@ dependencies: - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py312h78d62e6_4 - coverage=7.15.4=py312h6fa65f5_1 - - cpython=3.12.13=py312hd8ed1ab_1 + - cpython=3.12.14=py312hd8ed1ab_0 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py312he06e257_2 - dask-core=2025.3.1=pyhd8ed1ab_0 @@ -72,7 +72,7 @@ dependencies: - geoana=0.8.1=np2py312h7c90ba1_0 - h11=0.16.0=pyhcf101f3_1 - h2=4.4.1=pyhcf101f3_0 - - h5py=3.16.0=nompi_py312h5ddec8c_103 + - h5py=3.16.0=nompi_py312h5ddec8c_104 - hdf5=2.2.0=nompi_hf525611_100 - hpack=4.2.0=pyhd8ed1ab_0 - httpcore=1.0.9=pyh29332c3_0 @@ -80,7 +80,7 @@ dependencies: - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=78.3=h5112557_2 - idna=3.19=pyhcf101f3_0 - - imagesize=2.0.0=pyhd8ed1ab_0 + - imagesize=2.0.1=pyhd8ed1ab_0 - importlib-metadata=9.0.0=pyhcf101f3_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.3.0=pyh6dadd2b_0 @@ -95,9 +95,9 @@ dependencies: - joblib=1.5.3=pyhd8ed1ab_0 - json5=0.15.0=pyhd8ed1ab_0 - jsonpointer=3.1.1=pyhcf101f3_0 - - jsonschema=4.26.0=pyhcf101f3_0 + - jsonschema=4.26.0=pyhcf101f3_1 - jsonschema-specifications=2025.9.1=pyhcf101f3_0 - - jsonschema-with-format-nongpl=4.26.0=hcf101f3_0 + - jsonschema-with-format-nongpl=4.26.0=hcf101f3_1 - jupyter-book=2.1.6=pyhcf101f3_0 - jupyter-builder=1.2.2=pyhcf101f3_0 - jupyter-lsp=2.3.1=pyhcf101f3_0 @@ -122,15 +122,15 @@ dependencies: - libbrotlidec=1.2.0=h84f9c24_3 - libbrotlienc=1.2.0=he2a975b_3 - libcblas=3.11.0=6_h2a3cdd5_mkl - - libcurl=8.21.0=hdb0ef4a_4 + - libcurl=8.21.0=hdb0ef4a_5 - libdeflate=1.25=h1a1d4e4_1 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.8.1=hac47afa_1 - - libffi=3.7.0=h3d046cb_0 + - libffi=3.7.0=h3d046cb_1 - libfreetype=2.14.3=h57928b3_2 - libfreetype6=2.14.3=hdbac1cb_2 - - libgcc=16.1.0=h110b43a_1 - - libgomp=16.1.0=h8ee18e1_1 + - libgcc=16.2.0=h110b43a_4 + - libgomp=16.2.0=h8ee18e1_4 - libhwloc=2.13.0=default_h049141e_1000 - libiconv=1.18=hc1393d2_3 - libjpeg-turbo=3.2.0=hfd05255_1 @@ -138,18 +138,18 @@ dependencies: - liblzma=5.8.3=hfd05255_1 - libpng=1.6.58=hdc8cecf_1 - libpsl=0.23.1=h9b16d47_1 - - libsodium=1.0.22=h6a83c73_1 + - libsodium=1.0.22=h6a83c73_2 - libspatialindex=2.1.0=h2854ae6_1 - libsqlite=3.53.4=hf5d6505_1 - libssh2=1.11.1=h734d217_1 - - libtiff=4.7.2=h8f73337_0 + - libtiff=4.7.2=h8f73337_1 - libwebp-base=1.6.0=h4d5522a_1 - - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h11686cb_11 - libxcb=1.17.0=h874e120_1 - - libxml2=2.15.3=h8ef44ab_0 - - libxml2-16=2.15.3=h3cfd58e_0 + - libxml2=2.15.3=h8ef44ab_1 + - libxml2-16=2.15.3=h3cfd58e_1 - libzlib=1.3.2=hfd05255_3 - - llvm-openmp=22.1.8=h4fa8253_0 + - llvm-openmp=23.1.0=h49e36cd_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=4.2.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h05f76fc_1 @@ -167,7 +167,7 @@ dependencies: - nbconvert=7.16.6=hc388f54_1 - nbconvert-core=7.16.6=pyhcf101f3_1 - nbconvert-pandoc=7.16.6=h7d6f222_1 - - nbformat=5.11.0=pyhcf101f3_1 + - nbformat=5.11.1=pyhcf101f3_0 - nest-asyncio2=1.7.2=pyhcf101f3_0 - nodejs=26.6.0=h80d1838_0 - notebook=7.6.2=pyhcf101f3_0 @@ -177,7 +177,7 @@ dependencies: - onemkl-license=2025.3.1=h57928b3_13 - openjpeg=2.5.4=h0e57b4f_0 - openpyxl=3.1.5=py312h83acffa_3 - - openssl=3.6.3=hf411b9b_1 + - openssl=3.6.4=hf411b9b_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py312hc128f0a_2 @@ -187,11 +187,11 @@ dependencies: - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.3.0=py312h31f0997_0 - pip=26.2.1=pyh8b19718_0 - - platformdirs=4.11.3=pyhcf101f3_0 + - platformdirs=4.11.4=pyhcf101f3_0 - pluggy=1.6.0=pyhf9edf01_1 - prometheus_client=0.26.0=pyhd8ed1ab_0 - prompt-toolkit=3.0.53=pyha770c72_0 - - psutil=7.2.2=py312he5662c2_0 + - psutil=7.2.2=py312he5662c2_1 - pthread-stubs=0.4=hba3369d_1003 - pure_eval=0.2.3=pyhd8ed1ab_1 - pycparser=3.0=pyhcf101f3_0 @@ -205,19 +205,19 @@ dependencies: - pysocks=1.7.1=pyh09c184e_7 - pytest=9.1.1=pyhc364b38_2 - pytest-cov=7.1.0=pyhcf101f3_0 - - python=3.12.13=hb12b558_1_cpython + - python=3.12.14=hb12b558_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.22.2=pyhcf101f3_0 - - python-gil=3.12.13=hd8ed1ab_1 + - python-gil=3.12.14=hd8ed1ab_0 - python-json-logger=4.2.0=pyhd8ed1ab_0 - python-mumps=0.0.6=nompi_hd0d704b - python-tzdata=2026.3=pyhd8ed1ab_0 - python_abi=3.12=8_cp312 - pytz=2026.3.post1=pyhcf101f3_0 - - pywin32=312=py312h829343e_0 + - pywin32=312=py312h95189c4_1 - pywinpty=3.0.5=py312h275cf98_0 - pyyaml=6.0.3=py312h05f76fc_1 - - pyzmq=27.1.0=py312h343a6d4_3 + - pyzmq=27.2.0=py312h343a6d4_0 - qhull=2020.2=hc790b64_5 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.37.0=pyhcf101f3_0 @@ -225,7 +225,7 @@ dependencies: - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - rfc3987-syntax=1.1.0=pyhe01879c_1 - - rpds-py=2026.6.3=py312hd944d65_0 + - rpds-py=2026.6.3=py312hdabe01f_0 - rtree=1.4.1=pyh11ca60a_0 - scikit-learn=1.8.0=np2py312hea30aaf_1 - scipy=1.17.1=py312h9b3c559_1 @@ -249,7 +249,7 @@ dependencies: - terminado=0.18.1=pyh6dadd2b_1 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - - tk=8.6.13=h967ab96_3 + - tk=8.6.13=h967ab96_4 - tomli=2.4.1=pyhcf101f3_0 - tomlkit=0.15.1=pyhcf101f3_0 - toolz=1.1.0=pyhd8ed1ab_1 @@ -290,10 +290,10 @@ dependencies: - zlib-ng=2.3.3=h0261ad2_1 - zstd=1.5.7=h534d264_7 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 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 a974492c..9b053aa1 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: 552d4415b447b8e845ba8a98cf78ef5318078e47b4c098d9da7cd8bd0eb5f058 +# input_hash: b09e66847f78fcc9809b6d746d19563387f7cb275b1d47dddaf7b7a70cff0686 channels: - conda-forge @@ -25,8 +25,8 @@ dependencies: - brotli-python=1.2.0=py312ha763cb9_3 - bzip2=1.0.8=h0ad9c76_10 - ca-certificates=2026.7.22=h4c7d964_0 - - cached-property=1.5.2=hd8ed1ab_2 - - cached_property=1.5.2=pyha770c72_2 + - cached-property=2.0.1=pyhcf101f3_0 + - cached_property=2.0.1=pyhcf101f3_0 - click=8.4.2=pyh6dadd2b_0 - cloudpickle=3.1.2=pyhcf101f3_1 - colorama=0.4.6=pyhd8ed1ab_1 @@ -44,7 +44,7 @@ dependencies: - fsspec=2026.7.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py312h7c90ba1_0 - h2=4.4.1=pyhcf101f3_0 - - h5py=3.16.0=nompi_py312h5ddec8c_103 + - h5py=3.16.0=nompi_py312h5ddec8c_104 - hdf5=2.2.0=nompi_hf525611_100 - hpack=4.2.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 @@ -62,15 +62,15 @@ dependencies: - libbrotlidec=1.2.0=h84f9c24_3 - libbrotlienc=1.2.0=he2a975b_3 - libcblas=3.11.0=6_h2a3cdd5_mkl - - libcurl=8.21.0=hdb0ef4a_4 + - libcurl=8.21.0=hdb0ef4a_5 - libdeflate=1.25=h1a1d4e4_1 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.8.1=hac47afa_1 - - libffi=3.7.0=h3d046cb_0 + - libffi=3.7.0=h3d046cb_1 - libfreetype=2.14.3=h57928b3_2 - libfreetype6=2.14.3=hdbac1cb_2 - - libgcc=16.1.0=h110b43a_1 - - libgomp=16.1.0=h8ee18e1_1 + - libgcc=16.2.0=h110b43a_4 + - libgomp=16.2.0=h8ee18e1_4 - libhwloc=2.13.0=default_h049141e_1000 - libiconv=1.18=hc1393d2_3 - libjpeg-turbo=3.2.0=hfd05255_1 @@ -81,14 +81,14 @@ dependencies: - libspatialindex=2.1.0=h2854ae6_1 - libsqlite=3.53.4=hf5d6505_1 - libssh2=1.11.1=h734d217_1 - - libtiff=4.7.2=h8f73337_0 + - libtiff=4.7.2=h8f73337_1 - libwebp-base=1.6.0=h4d5522a_1 - - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h11686cb_11 - libxcb=1.17.0=h874e120_1 - - libxml2=2.15.3=h8ef44ab_0 - - libxml2-16=2.15.3=h3cfd58e_0 + - libxml2=2.15.3=h8ef44ab_1 + - libxml2-16=2.15.3=h3cfd58e_1 - libzlib=1.3.2=hfd05255_3 - - llvm-openmp=22.1.8=h4fa8253_0 + - llvm-openmp=23.1.0=h49e36cd_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h05f76fc_1 - matplotlib-base=3.10.9=py312h0ebf65c_0 @@ -101,13 +101,13 @@ dependencies: - onemkl-license=2025.3.1=h57928b3_13 - openjpeg=2.5.4=h0e57b4f_0 - openpyxl=3.1.5=py312h83acffa_3 - - openssl=3.6.3=hf411b9b_1 + - openssl=3.6.4=hf411b9b_0 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py312hc128f0a_2 - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.3.0=py312h31f0997_0 - pip=26.2.1=pyh8b19718_0 - - psutil=7.2.2=py312he5662c2_0 + - psutil=7.2.2=py312he5662c2_1 - pthread-stubs=0.4=hba3369d_1003 - pydantic=2.12.5=pyhcf101f3_1 - pydantic-core=2.41.5=py312hdabe01f_1 @@ -115,7 +115,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 - - python=3.12.13=hb12b558_1_cpython + - python=3.12.14=hb12b558_0_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.6=nompi_hd0d704b - python-tzdata=2026.3=pyhd8ed1ab_0 @@ -132,7 +132,7 @@ dependencies: - tbb=2023.0.0=hd3d4ead_2 - tblib=3.2.2=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - - tk=8.6.13=h967ab96_3 + - tk=8.6.13=h967ab96_4 - toolz=1.1.0=pyhd8ed1ab_1 - tornado=6.5.8=py312he06e257_0 - tqdm=4.70.0=pyha7b4d00_0 @@ -161,10 +161,10 @@ dependencies: - zlib-ng=2.3.3=h0261ad2_1 - zstd=1.5.7=h534d264_7 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 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 0bb79b88..a9043fbd 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: 90b1e25f0d8bb2738a191cb99acd28fd5c85b43df3849935d85d42946d01479d +# input_hash: 46e87a977a45c0b272bd0321b439febe2f11e1e69a0ddc4e780729ddb9a22d9c channels: - conda-forge @@ -12,7 +12,7 @@ dependencies: - annotated-types=0.8.0=pyhd8ed1ab_0 - anyio=4.14.2=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=25.1.0=py313h07c4f96_2 + - argon2-cffi-bindings=26.1.0=py313h995f894_0 - arrow=1.4.0=pyhcf101f3_0 - asciitree=0.3.3=py_2 - astroid=4.0.4=py313h78bf25f_0 @@ -38,10 +38,10 @@ dependencies: - brotli-bin=1.2.0=h9908984_3 - brotli-python=1.2.0=py313h2fc2bef_3 - bzip2=1.0.8=hda65f42_10 - - c-ares=1.34.8=h280c20c_1 + - c-ares=1.34.8=hebe6cf0_2 - ca-certificates=2026.7.22=hbd8a1cb_0 - - cached-property=1.5.2=hd8ed1ab_2 - - cached_property=1.5.2=pyha770c72_2 + - cached-property=2.0.1=pyhcf101f3_0 + - cached_property=2.0.1=pyhcf101f3_0 - certifi=2026.7.22=pyhd8ed1ab_0 - cffi=2.1.1=py313ha52865f_2 - charset-normalizer=3.5.1=pyhd8ed1ab_0 @@ -73,7 +73,7 @@ dependencies: - geoana=0.8.1=np2py313h0f78c12_0 - h11=0.16.0=pyhcf101f3_1 - h2=4.4.1=pyhcf101f3_0 - - h5py=3.16.0=nompi_py313hce4e9db_103 + - h5py=3.16.0=nompi_py313hce4e9db_104 - hdf5=2.2.0=nompi_hc529623_100 - hpack=4.2.0=pyhd8ed1ab_0 - httpcore=1.0.9=pyh29332c3_0 @@ -81,7 +81,7 @@ dependencies: - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he02047a_0 - idna=3.19=pyhcf101f3_0 - - imagesize=2.0.0=pyhd8ed1ab_0 + - imagesize=2.0.1=pyhd8ed1ab_0 - importlib-metadata=9.0.0=pyhcf101f3_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.3.0=pyha191276_0 @@ -96,9 +96,9 @@ dependencies: - joblib=1.5.3=pyhd8ed1ab_0 - json5=0.15.0=pyhd8ed1ab_0 - jsonpointer=3.1.1=pyhcf101f3_0 - - jsonschema=4.26.0=pyhcf101f3_0 + - jsonschema=4.26.0=pyhcf101f3_1 - jsonschema-specifications=2025.9.1=pyhcf101f3_0 - - jsonschema-with-format-nongpl=4.26.0=hcf101f3_0 + - jsonschema-with-format-nongpl=4.26.0=hcf101f3_1 - jupyter-book=2.1.6=pyhcf101f3_0 - jupyter-builder=1.2.2=pyhcf101f3_0 - jupyter-lsp=2.3.1=pyhcf101f3_0 @@ -131,29 +131,29 @@ dependencies: - libedit=3.1.20250104=pl5321h373387f_1 - libev=4.33=h280c20c_3 - libexpat=2.8.1=hecca717_1 - - libffi=3.7.0=h3435931_0 + - libffi=3.7.0=h81df57d_1 - libfreetype=2.14.3=ha770c72_2 - libfreetype6=2.14.3=h5e6c136_2 - - libgcc=16.1.0=ha9f2e26_1 - - libgcc-ng=16.1.0=h69a702a_1 - - libgfortran=16.1.0=h69a702a_1 - - libgfortran5=16.1.0=h79bb938_1 + - libgcc=16.2.0=ha9f2e26_4 + - libgcc-ng=16.2.0=h69a702a_4 + - libgfortran=16.2.0=h69a702a_4 + - libgfortran5=16.2.0=h6b99dfc_4 - libhwloc=2.13.0=default_he001693_1000 - libiconv=1.18=h0cb94f2_3 - libjpeg-turbo=3.2.0=hb03c661_1 - liblapack=3.11.0=6_h5e43f62_mkl - liblzma=5.8.3=hb03c661_1 - libmpdec=4.0.0=hb03c661_2 - - libnghttp2=1.68.1=h877daf1_0 + - libnghttp2=1.68.1=h74cf4be_1 - libpng=1.6.58=h922cc85_1 - libscotch=7.0.11=int64_h807e49d_3 - - libsodium=1.0.22=h280c20c_1 + - libsodium=1.0.22=hebe6cf0_2 - libspatialindex=2.1.0=h54a6638_1 - libsqlite=3.53.4=h0737f62_1 - libssh2=1.11.1=h6154650_1 - - libstdcxx=16.1.0=h934c35e_1 - - libstdcxx-ng=16.1.0=hdf11a46_1 - - libtiff=4.7.2=h9d88235_0 + - libstdcxx=16.2.0=h934c35e_4 + - libstdcxx-ng=16.2.0=hdf11a46_4 + - libtiff=4.7.2=hcc2c06a_1 - libuuid=2.42.2=h5347b49_0 - libuv=1.52.1=h280c20c_1 - libwebp-base=1.6.0=hd42ef1d_1 @@ -161,7 +161,7 @@ dependencies: - libxml2=2.15.1=h26afc86_0 - libxml2-16=2.15.1=ha9997c6_0 - libzlib=1.3.2=h25fd6f3_3 - - llvm-openmp=22.1.8=h4922eb0_0 + - llvm-openmp=23.1.0=h7148c6a_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=4.2.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py313h3dea7bd_1 @@ -181,7 +181,7 @@ dependencies: - nbconvert=7.16.6=hc388f54_1 - nbconvert-core=7.16.6=pyhcf101f3_1 - nbconvert-pandoc=7.16.6=h7d6f222_1 - - nbformat=5.11.0=pyhcf101f3_1 + - nbformat=5.11.1=pyhcf101f3_0 - ncurses=6.6=hdb14827_1 - nest-asyncio2=1.7.2=pyhcf101f3_0 - nodejs=22.6.0=hc19f0b3_1 @@ -192,7 +192,7 @@ dependencies: - onemkl-license=2025.3.1=hf2ce2f3_12 - openjpeg=2.5.4=h55fea9a_0 - openpyxl=3.1.5=py313ha4be090_3 - - openssl=3.6.3=h35e630c_1 + - openssl=3.6.4=h781a0a9_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py313h08cd8bf_2 @@ -203,11 +203,11 @@ dependencies: - pexpect=4.9.0=pyhd8ed1ab_1 - pillow=12.3.0=py313h80991f8_0 - pip=26.2.1=pyh145f28c_0 - - platformdirs=4.11.3=pyhcf101f3_0 + - platformdirs=4.11.4=pyhcf101f3_0 - pluggy=1.6.0=pyhf9edf01_1 - prometheus_client=0.26.0=pyhd8ed1ab_0 - prompt-toolkit=3.0.53=pyha770c72_0 - - psutil=7.2.2=py313h54dd161_0 + - psutil=7.2.2=py313hd42f317_1 - pthread-stubs=0.4=hb03c661_1003 - ptyprocess=0.7.0=pyhd8ed1ab_1 - pure_eval=0.2.3=pyhd8ed1ab_1 @@ -232,7 +232,7 @@ dependencies: - python_abi=3.13=8_cp313 - pytz=2026.3.post1=pyhcf101f3_0 - pyyaml=6.0.3=py313h3dea7bd_1 - - pyzmq=27.1.0=py312hda471dd_3 + - pyzmq=27.2.0=py312h8a5ba0d_0 - qhull=2020.2=h434a139_5 - readline=8.3=hd6e31c0_1 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 @@ -241,7 +241,7 @@ dependencies: - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - rfc3987-syntax=1.1.0=pyhe01879c_1 - - rpds-py=2026.6.3=py313hafbe609_0 + - rpds-py=2026.6.3=py313ha296275_0 - rtree=1.4.1=pyh11ca60a_0 - s2n=1.7.6=h7e3ee7f_0 - scikit-learn=1.8.0=np2py313h16d504d_1 @@ -266,7 +266,7 @@ dependencies: - terminado=0.18.1=pyhc90fa1f_1 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - - tk=8.6.13=noxft_hd70dff1_3 + - tk=8.6.13=noxft_h1df4ec4_4 - tomli=2.4.1=pyhcf101f3_0 - tomlkit=0.15.1=pyhcf101f3_0 - toolz=1.1.0=pyhd8ed1ab_1 @@ -290,7 +290,7 @@ dependencies: - xorg-libxau=1.0.12=hb03c661_2 - xorg-libxdmcp=1.1.5=hb03c661_2 - xyzservices=2026.3.0=pyhd8ed1ab_0 - - yaml=0.2.5=h280c20c_3 + - yaml=0.2.5=hebe6cf0_3 - zarr=2.14.2=pyhd8ed1ab_0 - zeromq=4.3.5=h09e67af_11 - zict=3.0.0=pyhd8ed1ab_1 @@ -299,10 +299,10 @@ dependencies: - zlib-ng=2.3.3=hce19668_1 - zstd=1.5.7=hb78ec9c_7 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 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 90718fb0..26735f6a 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: 90b1e25f0d8bb2738a191cb99acd28fd5c85b43df3849935d85d42946d01479d +# input_hash: 46e87a977a45c0b272bd0321b439febe2f11e1e69a0ddc4e780729ddb9a22d9c channels: - conda-forge @@ -24,10 +24,10 @@ dependencies: - brotli-bin=1.2.0=h9908984_3 - brotli-python=1.2.0=py313h2fc2bef_3 - bzip2=1.0.8=hda65f42_10 - - c-ares=1.34.8=h280c20c_1 + - c-ares=1.34.8=hebe6cf0_2 - ca-certificates=2026.7.22=hbd8a1cb_0 - - cached-property=1.5.2=hd8ed1ab_2 - - cached_property=1.5.2=pyha770c72_2 + - cached-property=2.0.1=pyhcf101f3_0 + - cached_property=2.0.1=pyhcf101f3_0 - click=8.4.2=pyhc90fa1f_0 - cloudpickle=3.1.2=pyhcf101f3_1 - contourpy=1.3.3=py313hc8edb43_4 @@ -44,7 +44,7 @@ dependencies: - fsspec=2026.7.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py313h0f78c12_0 - h2=4.4.1=pyhcf101f3_0 - - h5py=3.16.0=nompi_py313hce4e9db_103 + - h5py=3.16.0=nompi_py313hce4e9db_104 - hdf5=2.2.0=nompi_hc529623_100 - hpack=4.2.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 @@ -70,35 +70,35 @@ dependencies: - libedit=3.1.20250104=pl5321h373387f_1 - libev=4.33=h280c20c_3 - libexpat=2.8.1=hecca717_1 - - libffi=3.7.0=h3435931_0 + - libffi=3.7.0=h81df57d_1 - libfreetype=2.14.3=ha770c72_2 - libfreetype6=2.14.3=h5e6c136_2 - - libgcc=16.1.0=ha9f2e26_1 - - libgcc-ng=16.1.0=h69a702a_1 - - libgfortran=16.1.0=h69a702a_1 - - libgfortran5=16.1.0=h79bb938_1 + - libgcc=16.2.0=ha9f2e26_4 + - libgcc-ng=16.2.0=h69a702a_4 + - libgfortran=16.2.0=h69a702a_4 + - libgfortran5=16.2.0=h6b99dfc_4 - libhwloc=2.13.0=default_he001693_1000 - libiconv=1.18=h0cb94f2_3 - libjpeg-turbo=3.2.0=hb03c661_1 - liblapack=3.11.0=6_h5e43f62_mkl - liblzma=5.8.3=hb03c661_1 - libmpdec=4.0.0=hb03c661_2 - - libnghttp2=1.68.1=h877daf1_0 + - libnghttp2=1.68.1=h74cf4be_1 - libpng=1.6.58=h922cc85_1 - libscotch=7.0.11=int64_h807e49d_3 - libspatialindex=2.1.0=h54a6638_1 - libsqlite=3.53.4=h0737f62_1 - libssh2=1.11.1=h6154650_1 - - libstdcxx=16.1.0=h934c35e_1 - - libstdcxx-ng=16.1.0=hdf11a46_1 - - libtiff=4.7.2=h9d88235_0 + - libstdcxx=16.2.0=h934c35e_4 + - libstdcxx-ng=16.2.0=hdf11a46_4 + - libtiff=4.7.2=hcc2c06a_1 - libuuid=2.42.2=h5347b49_0 - libwebp-base=1.6.0=hd42ef1d_1 - libxcb=1.17.0=hb83e432_1 - libxml2=2.15.1=h26afc86_0 - libxml2-16=2.15.1=ha9997c6_0 - libzlib=1.3.2=h25fd6f3_3 - - llvm-openmp=22.1.8=h4922eb0_0 + - llvm-openmp=23.1.0=h7148c6a_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py313h3dea7bd_1 - matplotlib-base=3.10.9=py313h683a580_0 @@ -114,13 +114,13 @@ dependencies: - onemkl-license=2025.3.1=hf2ce2f3_12 - openjpeg=2.5.4=h55fea9a_0 - openpyxl=3.1.5=py313ha4be090_3 - - openssl=3.6.3=h35e630c_1 + - openssl=3.6.4=h781a0a9_0 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py313h08cd8bf_2 - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.3.0=py313h80991f8_0 - pip=26.2.1=pyh145f28c_0 - - psutil=7.2.2=py313h54dd161_0 + - psutil=7.2.2=py313hd42f317_1 - pthread-stubs=0.4=hb03c661_1003 - pydantic=2.12.5=pyhcf101f3_1 - pydantic-core=2.41.5=py313h843e2db_1 @@ -147,7 +147,7 @@ dependencies: - tbb=2023.0.0=hab88423_2 - tblib=3.2.2=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - - tk=8.6.13=noxft_hd70dff1_3 + - tk=8.6.13=noxft_h1df4ec4_4 - toolz=1.1.0=pyhd8ed1ab_1 - tornado=6.5.8=py313h07c4f96_0 - tqdm=4.70.0=pyh8f84b5b_0 @@ -161,17 +161,17 @@ dependencies: - xorg-libxau=1.0.12=hb03c661_2 - xorg-libxdmcp=1.1.5=hb03c661_2 - xyzservices=2026.3.0=pyhd8ed1ab_0 - - yaml=0.2.5=h280c20c_3 + - yaml=0.2.5=hebe6cf0_3 - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=4.1.0=pyhcf101f3_0 - zlib-ng=2.3.3=hce19668_1 - zstd=1.5.7=hb78ec9c_7 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 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 63bd0fea..23486e7a 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: 3b4ec78c573a5c0dfc853d59cf3c5327a15581a671813a9486f247192fdda8f5 +# input_hash: d81085ff8b943e3347da9c2174e4427cd5736c1d273bc4a6b4c77ebac25efae5 channels: - conda-forge @@ -12,7 +12,7 @@ dependencies: - annotated-types=0.8.0=pyhd8ed1ab_0 - anyio=4.14.2=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=25.1.0=py313h5ea7bf4_2 + - argon2-cffi-bindings=26.1.0=py313h5ea7bf4_0 - arrow=1.4.0=pyhcf101f3_0 - asciitree=0.3.3=py_2 - astroid=4.0.4=py313hfa70ccb_0 @@ -39,8 +39,8 @@ dependencies: - brotli-python=1.2.0=py313h3c654a2_3 - bzip2=1.0.8=h0ad9c76_10 - ca-certificates=2026.7.22=h4c7d964_0 - - cached-property=1.5.2=hd8ed1ab_2 - - cached_property=1.5.2=pyha770c72_2 + - cached-property=2.0.1=pyhcf101f3_0 + - cached_property=2.0.1=pyhcf101f3_0 - certifi=2026.7.22=pyhd8ed1ab_0 - cffi=2.1.1=py313h5ea7bf4_2 - charset-normalizer=3.5.1=pyhd8ed1ab_0 @@ -72,7 +72,7 @@ dependencies: - geoana=0.8.1=np2py313hedd11bf_0 - h11=0.16.0=pyhcf101f3_1 - h2=4.4.1=pyhcf101f3_0 - - h5py=3.16.0=nompi_py313hd050a09_103 + - h5py=3.16.0=nompi_py313hd050a09_104 - hdf5=2.2.0=nompi_hf525611_100 - hpack=4.2.0=pyhd8ed1ab_0 - httpcore=1.0.9=pyh29332c3_0 @@ -80,7 +80,7 @@ dependencies: - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=78.3=h5112557_2 - idna=3.19=pyhcf101f3_0 - - imagesize=2.0.0=pyhd8ed1ab_0 + - imagesize=2.0.1=pyhd8ed1ab_0 - importlib-metadata=9.0.0=pyhcf101f3_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.3.0=pyh6dadd2b_0 @@ -95,9 +95,9 @@ dependencies: - joblib=1.5.3=pyhd8ed1ab_0 - json5=0.15.0=pyhd8ed1ab_0 - jsonpointer=3.1.1=pyhcf101f3_0 - - jsonschema=4.26.0=pyhcf101f3_0 + - jsonschema=4.26.0=pyhcf101f3_1 - jsonschema-specifications=2025.9.1=pyhcf101f3_0 - - jsonschema-with-format-nongpl=4.26.0=hcf101f3_0 + - jsonschema-with-format-nongpl=4.26.0=hcf101f3_1 - jupyter-book=2.1.6=pyhcf101f3_0 - jupyter-builder=1.2.2=pyhcf101f3_0 - jupyter-lsp=2.3.1=pyhcf101f3_0 @@ -122,15 +122,15 @@ dependencies: - libbrotlidec=1.2.0=h84f9c24_3 - libbrotlienc=1.2.0=he2a975b_3 - libcblas=3.11.0=6_h2a3cdd5_mkl - - libcurl=8.21.0=hdb0ef4a_4 + - libcurl=8.21.0=hdb0ef4a_5 - libdeflate=1.25=h1a1d4e4_1 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.8.1=hac47afa_1 - - libffi=3.7.0=h3d046cb_0 + - libffi=3.7.0=h3d046cb_1 - libfreetype=2.14.3=h57928b3_2 - libfreetype6=2.14.3=hdbac1cb_2 - - libgcc=16.1.0=h110b43a_1 - - libgomp=16.1.0=h8ee18e1_1 + - libgcc=16.2.0=h110b43a_4 + - libgomp=16.2.0=h8ee18e1_4 - libhwloc=2.13.0=default_h049141e_1000 - libiconv=1.18=hc1393d2_3 - libjpeg-turbo=3.2.0=hfd05255_1 @@ -139,18 +139,18 @@ dependencies: - libmpdec=4.0.0=hfd05255_2 - libpng=1.6.58=hdc8cecf_1 - libpsl=0.23.1=h9b16d47_1 - - libsodium=1.0.22=h6a83c73_1 + - libsodium=1.0.22=h6a83c73_2 - libspatialindex=2.1.0=h2854ae6_1 - libsqlite=3.53.4=hf5d6505_1 - libssh2=1.11.1=h734d217_1 - - libtiff=4.7.2=h8f73337_0 + - libtiff=4.7.2=h8f73337_1 - libwebp-base=1.6.0=h4d5522a_1 - - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h11686cb_11 - libxcb=1.17.0=h874e120_1 - - libxml2=2.15.3=h8ef44ab_0 - - libxml2-16=2.15.3=h3cfd58e_0 + - libxml2=2.15.3=h8ef44ab_1 + - libxml2-16=2.15.3=h3cfd58e_1 - libzlib=1.3.2=hfd05255_3 - - llvm-openmp=22.1.8=h4fa8253_0 + - llvm-openmp=23.1.0=h49e36cd_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=4.2.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py313hd650c13_1 @@ -168,7 +168,7 @@ dependencies: - nbconvert=7.16.6=hc388f54_1 - nbconvert-core=7.16.6=pyhcf101f3_1 - nbconvert-pandoc=7.16.6=h7d6f222_1 - - nbformat=5.11.0=pyhcf101f3_1 + - nbformat=5.11.1=pyhcf101f3_0 - nest-asyncio2=1.7.2=pyhcf101f3_0 - nodejs=26.6.0=h80d1838_0 - notebook=7.6.2=pyhcf101f3_0 @@ -178,7 +178,7 @@ dependencies: - onemkl-license=2025.3.1=h57928b3_13 - openjpeg=2.5.4=h0e57b4f_0 - openpyxl=3.1.5=py313hc624790_3 - - openssl=3.6.3=hf411b9b_1 + - openssl=3.6.4=hf411b9b_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py313hc90dcd4_2 @@ -188,11 +188,11 @@ dependencies: - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.3.0=py313h38f99e1_0 - pip=26.2.1=pyh145f28c_0 - - platformdirs=4.11.3=pyhcf101f3_0 + - platformdirs=4.11.4=pyhcf101f3_0 - pluggy=1.6.0=pyhf9edf01_1 - prometheus_client=0.26.0=pyhd8ed1ab_0 - prompt-toolkit=3.0.53=pyha770c72_0 - - psutil=7.2.2=py313h5fd188c_0 + - psutil=7.2.2=py313h5fd188c_1 - pthread-stubs=0.4=hba3369d_1003 - pure_eval=0.2.3=pyhd8ed1ab_1 - pycparser=3.0=pyhcf101f3_0 @@ -215,10 +215,10 @@ dependencies: - python-tzdata=2026.3=pyhd8ed1ab_0 - python_abi=3.13=8_cp313 - pytz=2026.3.post1=pyhcf101f3_0 - - pywin32=312=py313h40c08fc_0 + - pywin32=312=py313h26f5e95_1 - pywinpty=3.0.5=py313h5813708_0 - pyyaml=6.0.3=py313hd650c13_1 - - pyzmq=27.1.0=py312h343a6d4_3 + - pyzmq=27.2.0=py312h343a6d4_0 - qhull=2020.2=hc790b64_5 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.37.0=pyhcf101f3_0 @@ -226,7 +226,7 @@ dependencies: - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - rfc3987-syntax=1.1.0=pyhe01879c_1 - - rpds-py=2026.6.3=py313ha9ea572_0 + - rpds-py=2026.6.3=py313hfbe8231_0 - rtree=1.4.1=pyh11ca60a_0 - scikit-learn=1.8.0=np2py313h4ce4a18_1 - scipy=1.17.1=py313he51e9a2_1 @@ -250,7 +250,7 @@ dependencies: - terminado=0.18.1=pyh6dadd2b_1 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - - tk=8.6.13=h967ab96_3 + - tk=8.6.13=h967ab96_4 - tomli=2.4.1=pyhcf101f3_0 - tomlkit=0.15.1=pyhcf101f3_0 - toolz=1.1.0=pyhd8ed1ab_1 @@ -289,10 +289,10 @@ dependencies: - zlib-ng=2.3.3=h0261ad2_1 - zstd=1.5.7=h534d264_7 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 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 31e0175a..20aded09 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: 3b4ec78c573a5c0dfc853d59cf3c5327a15581a671813a9486f247192fdda8f5 +# input_hash: d81085ff8b943e3347da9c2174e4427cd5736c1d273bc4a6b4c77ebac25efae5 channels: - conda-forge @@ -25,8 +25,8 @@ dependencies: - brotli-python=1.2.0=py313h3c654a2_3 - bzip2=1.0.8=h0ad9c76_10 - ca-certificates=2026.7.22=h4c7d964_0 - - cached-property=1.5.2=hd8ed1ab_2 - - cached_property=1.5.2=pyha770c72_2 + - cached-property=2.0.1=pyhcf101f3_0 + - cached_property=2.0.1=pyhcf101f3_0 - click=8.4.2=pyh6dadd2b_0 - cloudpickle=3.1.2=pyhcf101f3_1 - colorama=0.4.6=pyhd8ed1ab_1 @@ -44,7 +44,7 @@ dependencies: - fsspec=2026.7.0=pyhd8ed1ab_0 - geoana=0.8.1=np2py313hedd11bf_0 - h2=4.4.1=pyhcf101f3_0 - - h5py=3.16.0=nompi_py313hd050a09_103 + - h5py=3.16.0=nompi_py313hd050a09_104 - hdf5=2.2.0=nompi_hf525611_100 - hpack=4.2.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 @@ -62,15 +62,15 @@ dependencies: - libbrotlidec=1.2.0=h84f9c24_3 - libbrotlienc=1.2.0=he2a975b_3 - libcblas=3.11.0=6_h2a3cdd5_mkl - - libcurl=8.21.0=hdb0ef4a_4 + - libcurl=8.21.0=hdb0ef4a_5 - libdeflate=1.25=h1a1d4e4_1 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.8.1=hac47afa_1 - - libffi=3.7.0=h3d046cb_0 + - libffi=3.7.0=h3d046cb_1 - libfreetype=2.14.3=h57928b3_2 - libfreetype6=2.14.3=hdbac1cb_2 - - libgcc=16.1.0=h110b43a_1 - - libgomp=16.1.0=h8ee18e1_1 + - libgcc=16.2.0=h110b43a_4 + - libgomp=16.2.0=h8ee18e1_4 - libhwloc=2.13.0=default_h049141e_1000 - libiconv=1.18=hc1393d2_3 - libjpeg-turbo=3.2.0=hfd05255_1 @@ -82,14 +82,14 @@ dependencies: - libspatialindex=2.1.0=h2854ae6_1 - libsqlite=3.53.4=hf5d6505_1 - libssh2=1.11.1=h734d217_1 - - libtiff=4.7.2=h8f73337_0 + - libtiff=4.7.2=h8f73337_1 - libwebp-base=1.6.0=h4d5522a_1 - - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h11686cb_11 - libxcb=1.17.0=h874e120_1 - - libxml2=2.15.3=h8ef44ab_0 - - libxml2-16=2.15.3=h3cfd58e_0 + - libxml2=2.15.3=h8ef44ab_1 + - libxml2-16=2.15.3=h3cfd58e_1 - libzlib=1.3.2=hfd05255_3 - - llvm-openmp=22.1.8=h4fa8253_0 + - llvm-openmp=23.1.0=h49e36cd_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py313hd650c13_1 - matplotlib-base=3.10.9=py313he1ded55_0 @@ -102,13 +102,13 @@ dependencies: - onemkl-license=2025.3.1=h57928b3_13 - openjpeg=2.5.4=h0e57b4f_0 - openpyxl=3.1.5=py313hc624790_3 - - openssl=3.6.3=hf411b9b_1 + - openssl=3.6.4=hf411b9b_0 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py313hc90dcd4_2 - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.3.0=py313h38f99e1_0 - pip=26.2.1=pyh145f28c_0 - - psutil=7.2.2=py313h5fd188c_0 + - psutil=7.2.2=py313h5fd188c_1 - pthread-stubs=0.4=hba3369d_1003 - pydantic=2.12.5=pyhcf101f3_1 - pydantic-core=2.41.5=py313hfbe8231_1 @@ -133,7 +133,7 @@ dependencies: - tbb=2023.0.0=hd3d4ead_2 - tblib=3.2.2=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - - tk=8.6.13=h967ab96_3 + - tk=8.6.13=h967ab96_4 - toolz=1.1.0=pyhd8ed1ab_1 - tornado=6.5.8=py313h5ea7bf4_0 - tqdm=4.70.0=pyha7b4d00_0 @@ -160,10 +160,10 @@ dependencies: - zlib-ng=2.3.3=h0261ad2_1 - zstd=1.5.7=h534d264_7 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 variables: KMP_WARNINGS: 0 diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index b96d0ebb..8ca65004 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: 552d4415b447b8e845ba8a98cf78ef5318078e47b4c098d9da7cd8bd0eb5f058 - linux-64: 796a885d21de56e2bb7eebd504e05579d6ec33b32e9aca481c365a62bcf51060 + win-64: b09e66847f78fcc9809b6d746d19563387f7cb275b1d47dddaf7b7a70cff0686 + linux-64: d4e89447ddc89490b9baa6153c503886506d9dbc1b81466f4cc3e6a28d370325 channels: - url: conda-forge used_env_vars: [] @@ -189,23 +189,23 @@ package: category: dev optional: true - name: argon2-cffi-bindings - version: 25.1.0 + version: 26.1.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' cffi: '>=1.0.1' - libgcc: '>=14' + libgcc: '>=15' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-25.1.0-py312h4c3975b_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-26.1.0-py312h5cc1888_0.conda hash: - md5: 1567f06d717246abab170736af8bad1b - sha256: 7988c207b2b766dad5ebabf25a92b8d75cb8faed92f256fd7a4e0875c9ec6d58 + md5: 206a3c2e73a15a4956df784f165f4ed8 + sha256: 9b97ce25a43e1aa998286971da972a13f5803cccb12df45013edff46ed3dc2b3 category: dev optional: true - name: argon2-cffi-bindings - version: 25.1.0 + version: 26.1.0 manager: conda platform: win-64 dependencies: @@ -215,10 +215,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-25.1.0-py312he06e257_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-26.1.0-py312he06e257_0.conda hash: - md5: 5dc3781bbc4ddce0bf250a04c1a192c2 - sha256: 38c5e43d991b0c43713fa2ceba3063afa4ccad2dd4c8eb720143de54d461a338 + md5: 38764c8f1723841acac6c0bc2d766afc + sha256: ae4d0f74b48266849555b69b195ee96e5db7067359ffde700d5f35dc41d5f8f1 category: dev optional: true - name: arrow @@ -969,11 +969,11 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/c-ares-1.34.8-h280c20c_1.conda + libgcc: '>=15' + url: https://repo.prefix.dev/conda-forge/linux-64/c-ares-1.34.8-hebe6cf0_2.conda hash: - md5: 2cef891b791040aab83e218c7d137679 - sha256: 5139b6afbfaca91c47104ba9a6a40f81211e1c9200e96b73ce3a56f0ca1902f4 + md5: 3ad2b403be8fc5612b9159e2ce621f69 + sha256: 9c37cc233238adf366ea75b0e845662a5be07ceadf62e458183516369340274b category: main optional: false - name: ca-certificates @@ -1001,51 +1001,51 @@ package: category: main optional: false - name: cached-property - version: 1.5.2 + version: 2.0.1 manager: conda platform: linux-64 dependencies: - cached_property: '>=1.5.2,<1.5.3.0a0' - url: https://repo.prefix.dev/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_2.conda + cached_property: '>=2.0.1,<2.0.2.0a0' + url: https://repo.prefix.dev/conda-forge/noarch/cached-property-2.0.1-pyhcf101f3_0.conda hash: - md5: 1990eb3f49022846fbc7fc9624a0ee43 - sha256: 0d00dd61cb91b1bd1536600c64c9db4f94f3c699fec42864d0a2f4bc2ad8c3e8 + md5: 70e764e549c6c25de5e429d6e4a28b39 + sha256: 39358005c3cc44d8315ed79789b18a960d69365be979970cc6bae8f7a6177703 category: main optional: false - name: cached-property - version: 1.5.2 + version: 2.0.1 manager: conda platform: win-64 dependencies: - cached_property: '>=1.5.2,<1.5.3.0a0' - url: https://repo.prefix.dev/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_2.conda + cached_property: '>=2.0.1,<2.0.2.0a0' + url: https://repo.prefix.dev/conda-forge/noarch/cached-property-2.0.1-pyhcf101f3_0.conda hash: - md5: 1990eb3f49022846fbc7fc9624a0ee43 - sha256: 0d00dd61cb91b1bd1536600c64c9db4f94f3c699fec42864d0a2f4bc2ad8c3e8 + md5: 70e764e549c6c25de5e429d6e4a28b39 + sha256: 39358005c3cc44d8315ed79789b18a960d69365be979970cc6bae8f7a6177703 category: main optional: false - name: cached_property - version: 1.5.2 + version: 2.0.1 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/cached_property-1.5.2-pyha770c72_2.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/cached_property-2.0.1-pyhcf101f3_0.conda hash: - md5: f71e6840332854fd2eac6c3229768a9c - sha256: b1808a7811b5688d045b204425bb7ee824b340b40025b4ad0a39b4db1f4f1c98 + md5: 256d863ded0f79464391a075944d24a6 + sha256: 4bd96dab5a434e4ee59fb6910cae704d4c5b453907d4886272a9943d37e42b6f category: main optional: false - name: cached_property - version: 1.5.2 + version: 2.0.1 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/cached_property-1.5.2-pyha770c72_2.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/cached_property-2.0.1-pyhcf101f3_0.conda hash: - md5: f71e6840332854fd2eac6c3229768a9c - sha256: b1808a7811b5688d045b204425bb7ee824b340b40025b4ad0a39b4db1f4f1c98 + md5: 256d863ded0f79464391a075944d24a6 + sha256: 4bd96dab5a434e4ee59fb6910cae704d4c5b453907d4886272a9943d37e42b6f category: main optional: false - name: certifi @@ -1297,29 +1297,29 @@ package: category: dev optional: true - name: cpython - version: 3.12.13 + version: 3.12.14 manager: conda platform: linux-64 dependencies: python: '>=3.12,<3.13.0a0' python_abi: '*' - url: https://repo.prefix.dev/conda-forge/noarch/cpython-3.12.13-py312hd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/cpython-3.12.14-py312hd8ed1ab_0.conda hash: - md5: 171d0cc7f621a0371ea273a05abdb46c - sha256: b7ea8ebc1b2059159cbd49e0c9d1815713c73c4a55156b060c28dd61cfbdf9c2 + md5: c602a908e40a3ae4431b162695a8ba8b + sha256: 2311eaabe48d48d03c9c4569ba6c789cb190a005805983fae7d16eb0c0c0c60c category: dev optional: true - name: cpython - version: 3.12.13 + version: 3.12.14 manager: conda platform: win-64 dependencies: python: '>=3.12,<3.13.0a0' python_abi: '*' - url: https://repo.prefix.dev/conda-forge/noarch/cpython-3.12.13-py312hd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/cpython-3.12.14-py312hd8ed1ab_0.conda hash: - md5: 171d0cc7f621a0371ea273a05abdb46c - sha256: b7ea8ebc1b2059159cbd49e0c9d1815713c73c4a55156b060c28dd61cfbdf9c2 + md5: c602a908e40a3ae4431b162695a8ba8b + sha256: 2311eaabe48d48d03c9c4569ba6c789cb190a005805983fae7d16eb0c0c0c60c category: dev optional: true - name: cycler @@ -1959,10 +1959,10 @@ package: numpy: '>=1.25,<3' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/h5py-3.16.0-nompi_py312h7082e50_103.conda + url: https://repo.prefix.dev/conda-forge/linux-64/h5py-3.16.0-nompi_py312h7082e50_104.conda hash: - md5: c2871b57fd5e7306b0e5656be11b5efa - sha256: af050bc79b58d31636e32356db0487ee35a54f8024eb5bce0440738d1a3c55a4 + md5: 5ff86c0aab697f7ebf36c0be5cde30b9 + sha256: 89f02df4fe64e8aa2ea9c16d682687c850a9393bfc4b57e71b5758a2ae389e6e category: main optional: false - name: h5py @@ -1978,10 +1978,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/h5py-3.16.0-nompi_py312h5ddec8c_103.conda + url: https://repo.prefix.dev/conda-forge/win-64/h5py-3.16.0-nompi_py312h5ddec8c_104.conda hash: - md5: 5f70ad2d7d0e9e9aa51c2ae6012fb63a - sha256: 116634688f80f2a7ab37ba260a7167e2ede2fa21aee445096ebf99cef53b3282 + md5: 96ec291f7612ee9cb0c39ec6d424b2e9 + sha256: 04d09361c1575d4637dd33098dd42b147f312a04ba33c148916cece7bc163b42 category: main optional: false - name: hdf5 @@ -2201,27 +2201,27 @@ package: category: dev optional: true - name: imagesize - version: 2.0.0 + version: 2.0.1 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/imagesize-2.0.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/imagesize-2.0.1-pyhd8ed1ab_0.conda hash: - md5: 92617c2ba2847cca7a6ed813b6f4ab79 - sha256: 5a047f9eac290e679b4e6f6f4cbfcc5acdfbf031a4f06824d4ddb590cdbb850b + md5: ebc56022e4ef7e74a829be94c53797ca + sha256: 4e787f9ccc31053ccea56d98ecd284a4f788988a3f9c4627db72fdd0b127529b category: dev optional: true - name: imagesize - version: 2.0.0 + version: 2.0.1 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/imagesize-2.0.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/imagesize-2.0.1-pyhd8ed1ab_0.conda hash: - md5: 92617c2ba2847cca7a6ed813b6f4ab79 - sha256: 5a047f9eac290e679b4e6f6f4cbfcc5acdfbf031a4f06824d4ddb590cdbb850b + md5: ebc56022e4ef7e74a829be94c53797ca + sha256: 4e787f9ccc31053ccea56d98ecd284a4f788988a3f9c4627db72fdd0b127529b category: dev optional: true - name: importlib-metadata @@ -2644,10 +2644,10 @@ package: python: '' referencing: '>=0.28.4' rpds-py: '>=0.25.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.26.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.26.0-pyhcf101f3_1.conda hash: - md5: ada41c863af263cc4c5fcbaff7c3e4dc - sha256: db973a37d75db8e19b5f44bbbdaead0c68dde745407f281e2a7fe4db74ec51d7 + md5: 204b5ca91eba7738790ecc333facbbbe + sha256: 328756a4555941d57af4a5f553e5d8598e9f3b37db028f557e30f9f0b3086db6 category: dev optional: true - name: jsonschema @@ -2660,10 +2660,10 @@ package: python: '' referencing: '>=0.28.4' rpds-py: '>=0.25.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.26.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.26.0-pyhcf101f3_1.conda hash: - md5: ada41c863af263cc4c5fcbaff7c3e4dc - sha256: db973a37d75db8e19b5f44bbbdaead0c68dde745407f281e2a7fe4db74ec51d7 + md5: 204b5ca91eba7738790ecc333facbbbe + sha256: 328756a4555941d57af4a5f553e5d8598e9f3b37db028f557e30f9f0b3086db6 category: dev optional: true - name: jsonschema-specifications @@ -2707,10 +2707,10 @@ package: rfc3987-syntax: '>=1.1.0' uri-template: '' webcolors: '>=24.6.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.26.0-hcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.26.0-hcf101f3_1.conda hash: - md5: 8368d58342d0825f0843dc6acdd0c483 - sha256: 6886fc61e4e4edd38fd38729976b134e8bd2143f7fce56cc80d7ac7bac99bce1 + md5: ae36c895b9e25a127d2acbdbaa87e301 + sha256: 1b8ed25276ceae973e21d269fbe11f08d0b5f73c7ac9584e2d6a9dd763b8707a category: dev optional: true - name: jsonschema-with-format-nongpl @@ -2728,10 +2728,10 @@ package: rfc3987-syntax: '>=1.1.0' uri-template: '' webcolors: '>=24.6.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.26.0-hcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.26.0-hcf101f3_1.conda hash: - md5: 8368d58342d0825f0843dc6acdd0c483 - sha256: 6886fc61e4e4edd38fd38729976b134e8bd2143f7fce56cc80d7ac7bac99bce1 + md5: ae36c895b9e25a127d2acbdbaa87e301 + sha256: 1b8ed25276ceae973e21d269fbe11f08d0b5f73c7ac9584e2d6a9dd763b8707a category: dev optional: true - name: jupyter-book @@ -3556,16 +3556,16 @@ package: platform: win-64 dependencies: krb5: '>=1.22.2,<1.23.0a0' - libpsl: '>=0.23.0,<0.24.0a0' + libpsl: '>=0.23.1,<0.24.0a0' libssh2: '>=1.11.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.21.0-hdb0ef4a_4.conda + url: https://repo.prefix.dev/conda-forge/win-64/libcurl-8.21.0-hdb0ef4a_5.conda hash: - md5: 5e9c5b83929cf7ab2c04121af771e7b5 - sha256: af17c990ec52b6aba29e052c438d7ac61bfd541d6d183a8f09aa4f2c532c9bab + md5: 50861643cbe90dc7267feb7854b8efdf + sha256: bf5445ab8acfaccaf511d774f131cf0d99c5eef6b8def270e832ad26970d5011 category: main optional: false - name: libdeflate @@ -3681,11 +3681,11 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/libffi-3.7.0-h3435931_0.conda + libgcc: '>=15' + url: https://repo.prefix.dev/conda-forge/linux-64/libffi-3.7.0-h81df57d_1.conda hash: - md5: 0abe40a9880086ca4d2e5daf09dceff9 - sha256: ac38603008bf1e99b8ed379b1a656a67a70e2841f2b6a069c630cdf6316012d2 + md5: 6525a0b06aa4fd390795f0740636a9dd + sha256: c8c7583ef063bc3c430f1d48298e5ad24f796a35c22ed5b14183325825a61106 category: main optional: false - name: libffi @@ -3696,10 +3696,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/libffi-3.7.0-h3d046cb_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libffi-3.7.0-h3d046cb_1.conda hash: - md5: 92bdfc0e5012660892b0e0eaf3069a5c - sha256: 2ea8d2fe7b84ca37653777e15ac1e7abd35f0c90d3efbe7f6c4de9b489606369 + md5: ceb38b0ba900847d8da4289c3c8e5708 + sha256: 613e8077c5cca5df7fe84ade7d5050301bee3c6c4c450ffe61d34a349ab4f11c category: main optional: false - name: libfreetype @@ -3758,78 +3758,78 @@ package: category: main optional: false - name: libgcc - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-16.1.0-ha9f2e26_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-16.2.0-ha9f2e26_4.conda hash: - md5: 5a7d954665c707c93311657cd779c705 - sha256: d5cb8475131c31680f8fd30512c418f373064e272e452063276a8fb14c9fa42f + md5: cba14d01083fc62ffd32c24d7d390633 + sha256: 24090e675d34403b4ee1cd4372d8f6c0937da7ecfd66a19a57cac2ed0f4ea793 category: main optional: false - name: libgcc - version: 16.1.0 + version: 16.2.0 manager: conda platform: win-64 dependencies: _openmp_mutex: '>=4.5' libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgcc-16.1.0-h110b43a_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgcc-16.2.0-h110b43a_4.conda hash: - md5: 0b5cc3373b5f925934421259463397a4 - sha256: 9d12bae84edf872eefcddef28677b80d3550e1ef42b319122659aaf732c4ee53 + md5: 02793cf48b68687fee158a48c92850a6 + sha256: 32c0d1adcc96835d5f681c7e72b7f5e2e30088149239e002b8a6f581a072e1d2 category: main optional: false - name: libgcc-ng - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: - libgcc: 16.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-16.1.0-h69a702a_1.conda + libgcc: 16.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-16.2.0-h69a702a_4.conda hash: - md5: 7ed870c014a6f23c7dfafda53d2763a9 - sha256: 225275c562337a1cd61705da0ee4235dde7bba7504de1c34b74c894adb2b0eee + md5: b3e52878163a841f6fb951989cc0b217 + sha256: d8e66c14e23f2b3c70410cff5979d9d357e6edfb990b28d8e630852f4d395629 category: main optional: false - name: libgfortran - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: - libgfortran5: 16.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-16.1.0-h69a702a_1.conda + libgfortran5: 16.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-16.2.0-h69a702a_4.conda hash: - md5: 2fbed65cc90cf0724e1ec4de13696737 - sha256: 9e82d410a50bd4e5e47cbbb026454c3eb543954baca4db23929575b571bf56a3 + md5: 5e92b8413fd1c8f8f3006f4661b12def + sha256: 7653be4d88a4d74676c38dd892914d027dcecc0c65c406be772d31cb641f8cfd category: main optional: false - name: libgfortran5 - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=16.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-16.1.0-h79bb938_1.conda + libgcc: '>=16.2.0' + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-16.2.0-h6b99dfc_4.conda hash: - md5: dd51ed33e8c70995f8e33cc9dc537297 - sha256: 05078ab464d506dff971860cb1a553b35bc27c0b5ce8ec29b8bfaca5f2359652 + md5: c22348a769bb072b6184eb6f7f05e4f2 + sha256: a5510cbcea3b9e9ab24b336429de997fa727af1dba323031500a962a20e38600 category: main optional: false - name: libgomp - version: 16.1.0 + version: 16.2.0 manager: conda platform: win-64 dependencies: libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgomp-16.1.0-h8ee18e1_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgomp-16.2.0-h8ee18e1_4.conda hash: - md5: baa80f69f3a43e4ec7e1cfb3addeae56 - sha256: ab1b70f492c859e2e76bb2c2a0725880f5ed5aa0e142a7650b0b78d6e64487de + md5: 91189f0bc9ff21f385fcda6232346612 + sha256: 9ef1a22fb50b31fbf9c01cf709e8f55b60fd3c02401d150be4a55943f9e3832f category: main optional: false - name: libhwloc @@ -3976,16 +3976,16 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - c-ares: '>=1.34.6,<2.0a0' + c-ares: '>=1.34.8,<2.0a0' libev: '>=4.33,<5.0a0' - libgcc: '>=14' - libstdcxx: '>=14' - libzlib: '>=1.3.1,<2.0a0' - openssl: '>=3.5.5,<4.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libnghttp2-1.68.1-h877daf1_0.conda + libgcc: '>=15' + libstdcxx: '>=15' + libzlib: '>=1.3.2,<2.0a0' + openssl: '>=3.5.7,<4.0a0' + url: https://repo.prefix.dev/conda-forge/linux-64/libnghttp2-1.68.1-h74cf4be_1.conda hash: - md5: 2a45e7f8af083626f009645a6481f12d - sha256: 663444d77a42f2265f54fb8b48c5450bfff4388d9c0f8253dd7855f0d993153f + md5: 75d211f04ac87506f1f43420712a69fe + sha256: 11a2f54a6f391e25738bce0023e6ef499600147bbcf21c1fa69d2e251b03cc6a category: main optional: false - name: libnsl @@ -4069,11 +4069,11 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/libsodium-1.0.22-h280c20c_1.conda + libgcc: '>=15' + url: https://repo.prefix.dev/conda-forge/linux-64/libsodium-1.0.22-hebe6cf0_2.conda hash: - md5: 965e4d531b588b2e42f66fd8e48b056c - sha256: b677bbf1c339d894757c3dcfbb2f88649e499e4991d70ae09a1466da9a6c92d6 + md5: 42c585f153c17b790cd01f01553d24a1 + sha256: 7454c6a7cf27033757f2895bc5e3941fe27604506edd62cf6bc00e50ab015a43 category: dev optional: true - name: libsodium @@ -4084,10 +4084,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/libsodium-1.0.22-h6a83c73_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/libsodium-1.0.22-h6a83c73_2.conda hash: - md5: 7d5abf7ca1bd00b43d273f44d93d05dc - sha256: de45b71224da77a1c3a7dd48d8885eb957c9f05455d4f0828463293e7144330f + md5: 2a001157df8205a7785ea69dd3270a8f + sha256: 7dc8d243cc8bcd12d1666640664288822eda5d30411a0b22ff05090bbac4c32b category: dev optional: true - name: libspatialindex @@ -4178,28 +4178,28 @@ package: category: main optional: false - name: libstdcxx - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: 16.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-16.1.0-h934c35e_1.conda + libgcc: 16.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-16.2.0-h934c35e_4.conda hash: - md5: aed6cf89adc1e9b846e4367ac538e434 - sha256: 79721dd08aeb0ab9e773f1f9ef41cf4e6c17477e3d72319147619045bce05a09 + md5: 2f2ef0d96de5bdd8c1270ff22fdf9352 + sha256: 40b792b0186c1e8859280a1f6f19a54fc50a11b32724fc7b637009c1a9bd302b category: main optional: false - name: libstdcxx-ng - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: - libstdcxx: 16.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-16.1.0-hdf11a46_1.conda + libstdcxx: 16.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-16.2.0-hdf11a46_4.conda hash: - md5: c94f06123272d8e129d4acf3a25ffb35 - sha256: 2876ca4463d1b394eb969ce4a84d1620aa63fb8202a6397837d1e45ec76c1208 + md5: de0dceacf3e33c5fc88e167885dc8274 + sha256: 4cdebd87b76cf53a58a08ebd6d15336daa79c5f0aa34d83a895ac503c0203632 category: main optional: false - name: libtiff @@ -4208,19 +4208,19 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - lerc: '>=4.1.0,<5.0a0' + lerc: '>=4.2.0,<5.0a0' libdeflate: '>=1.25,<1.26.0a0' - libgcc: '>=14' - libjpeg-turbo: '>=3.1.4.1,<4.0a0' + libgcc: '>=15' + libjpeg-turbo: '>=3.2.0,<4.0a0' liblzma: '>=5.8.3,<6.0a0' - libstdcxx: '>=14' + libstdcxx: '>=15' libwebp-base: '>=1.6.0,<2.0a0' libzlib: '>=1.3.2,<2.0a0' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libtiff-4.7.2-h9d88235_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libtiff-4.7.2-hcc2c06a_1.conda hash: - md5: c1fcb4a88bc15a9f77ad8d27d7af1df9 - sha256: b31346e1c01ab40a170e91147092ee8fd92b1dee3c66ee47ef025571c879b159 + md5: 0907d876f460ebc941ae590338b6102f + sha256: 10e125da82ca93e09191e66e5a94d566b2cf8d4024e2a0db3a9114297447e0d9 category: main optional: false - name: libtiff @@ -4228,19 +4228,19 @@ package: manager: conda platform: win-64 dependencies: - lerc: '>=4.1.0,<5.0a0' + lerc: '>=4.2.0,<5.0a0' libdeflate: '>=1.25,<1.26.0a0' - libjpeg-turbo: '>=3.1.4.1,<4.0a0' + libjpeg-turbo: '>=3.2.0,<4.0a0' liblzma: '>=5.8.3,<6.0a0' libzlib: '>=1.3.2,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/libtiff-4.7.2-h8f73337_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libtiff-4.7.2-h8f73337_1.conda hash: - md5: e83f459471905a04ebe15e21d063c49d - sha256: ec6d66308a6d6abaf3225f2f185113e6172e77eb0fa8622af982d7a5d6d47a2c + md5: 970dbe48f843e7fbd179a9b6c22f865a + sha256: 3575a092e3e52625a1767804a4ebd321becaadf61b63dcd6735ebb88c0b3c359 category: main optional: false - name: libuuid @@ -4302,10 +4302,10 @@ package: platform: win-64 dependencies: ucrt: '' - url: https://repo.prefix.dev/conda-forge/win-64/libwinpthread-12.0.0.r4.gg4f2fc60ca-h57928b3_10.conda + url: https://repo.prefix.dev/conda-forge/win-64/libwinpthread-12.0.0.r4.gg4f2fc60ca-h11686cb_11.conda hash: - md5: 8a86073cf3b343b87d03f41790d8b4e5 - sha256: 0fccf2d17026255b6e10ace1f191d0a2a18f2d65088fd02430be17c701f8ffe0 + md5: fc1e6626817ba55a0d141858d6c0ef5d + sha256: 988c8fe5fca9e3510fd0b5671d67ae42c1fd632f8bd28f832a6735970eb69a36 category: main optional: false - name: libxcb @@ -4385,10 +4385,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libxml2-2.15.3-h8ef44ab_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxml2-2.15.3-h8ef44ab_1.conda hash: - md5: 95591ca5671d2213f5b2d5aa7818420d - sha256: a4599c6bbbbdd7db570896e520c557eec8e66d94e839a59d17dc1f24a3d5f82b + md5: 45a5a1c709a69f14cf176220788d18a9 + sha256: a83e9adcf7c50f20289dc6890707c8e4e84151b4204b0f7344998138807458d1 category: main optional: false - name: libxml2-16 @@ -4420,10 +4420,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libxml2-16-2.15.3-h3cfd58e_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxml2-16-2.15.3-h3cfd58e_1.conda hash: - md5: 9e8dd0d90ed830107b2c36801035b7db - sha256: 3b61ee3caba702d2ff432fa3920835db963026e5c99c4e6fdca0c6114f59e7ce + md5: 6e7dadff3f3bde2d29d29a3ec34f2d58 + sha256: 8163de24a7ddb4ebf9587c3a45ba950caf3690b9646b76f007ca15e6e52b5881 category: main optional: false - name: libzlib @@ -4453,29 +4453,29 @@ package: category: main optional: false - name: llvm-openmp - version: 22.1.8 + version: 23.1.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://repo.prefix.dev/conda-forge/linux-64/llvm-openmp-22.1.8-h4922eb0_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/llvm-openmp-23.1.0-h7148c6a_0.conda hash: - md5: 7bbfdc5a6eca997d3b0873a575c3e155 - sha256: a37aba21b85800af1e7c5b04ba76abab96b6e591eedf99dc6e4df83b0fefd7a5 + md5: 58b4529023435973ab911c3c51892671 + sha256: b6fa85a30cceca3ad7a811ab34f842b9c2ae9d9d4c520e084b62b2abe50e9a70 category: main optional: false - name: llvm-openmp - version: 22.1.8 + version: 23.1.0 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/llvm-openmp-22.1.8-h4fa8253_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/llvm-openmp-23.1.0-h49e36cd_0.conda hash: - md5: de3551bf6508d45ca46b714639e52823 - sha256: 50c02902bb516eeb56680358f052be38b5bf74b40e78ea4b2a675e84957e7307 + md5: 79055ec79e1b43749763122cead30976 + sha256: f9658ec83a6744f38e2b8188c76e1c2dea2614f5aa0e14d9d274b19f60646b8c category: main optional: false - name: locket @@ -5037,7 +5037,7 @@ package: category: dev optional: true - name: nbformat - version: 5.11.0 + version: 5.11.1 manager: conda platform: linux-64 dependencies: @@ -5046,14 +5046,14 @@ package: python: '' python-fastjsonschema: '>=2.15' traitlets: '>=5.1' - url: https://repo.prefix.dev/conda-forge/noarch/nbformat-5.11.0-pyhcf101f3_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/nbformat-5.11.1-pyhcf101f3_0.conda hash: - md5: 3e7eb1cc4a342b2e7f68199b50fbe3cb - sha256: 4aeff72162e4b3f77238c859547275b9a989ed6873bffbdbc4d688291a60919b + md5: 2fbbf92e1173ae024f0b12759c1e64a1 + sha256: d85d76827ff732e1639f50f45e4d7d3387a27abd857b194dcbb5bb4166c2a7c2 category: dev optional: true - name: nbformat - version: 5.11.0 + version: 5.11.1 manager: conda platform: win-64 dependencies: @@ -5062,10 +5062,10 @@ package: python: '' python-fastjsonschema: '>=2.15' traitlets: '>=5.1' - url: https://repo.prefix.dev/conda-forge/noarch/nbformat-5.11.0-pyhcf101f3_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/nbformat-5.11.1-pyhcf101f3_0.conda hash: - md5: 3e7eb1cc4a342b2e7f68199b50fbe3cb - sha256: 4aeff72162e4b3f77238c859547275b9a989ed6873bffbdbc4d688291a60919b + md5: 2fbbf92e1173ae024f0b12759c1e64a1 + sha256: d85d76827ff732e1639f50f45e4d7d3387a27abd857b194dcbb5bb4166c2a7c2 category: dev optional: true - name: ncurses @@ -5364,21 +5364,21 @@ package: category: main optional: false - name: openssl - version: 3.6.3 + version: 3.6.4 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' - libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.6.3-h35e630c_1.conda + libgcc: '>=15' + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.6.4-h781a0a9_0.conda hash: - md5: c5955c27917ff2234def47f075e71e02 - sha256: 012096056b97abf1f68c46b7146bd2cbd68c1be762340b4f5dad4fbbe99177bc + md5: 16e3034a330cc625f2c685edec60cf4e + sha256: 4747b2d6a8336f52343bceb8a1ebf41a9e6e665b9d2e3f989972de53a310599e category: main optional: false - name: openssl - version: 3.6.3 + version: 3.6.4 manager: conda platform: win-64 dependencies: @@ -5386,10 +5386,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.3-hf411b9b_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.4-hf411b9b_0.conda hash: - md5: a978392692a910ba1c8920ccb1e784b3 - sha256: 2ebff5a1b5793e82495bf33c91fba040e11ff23333c2385ac66d0c3aee2cc14c + md5: 73cb1783f47c452be4c309430fbef89f + sha256: 9dddb559ba49744d5d94092d8d13cb0567f5c3b3f439f3acf28433d1f4256acc category: main optional: false - name: overrides @@ -5673,27 +5673,27 @@ package: category: main optional: false - name: platformdirs - version: 4.11.3 + version: 4.11.4 manager: conda platform: linux-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.3-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.4-pyhcf101f3_0.conda hash: - md5: 31474b00d0ca5accac14eda09ba11216 - sha256: 810511c90649ca59fa0174958a210fd5051c0a7848cfbd42c87054a6836726b5 + md5: 840f27e0254bcdc8382ac2ca32782a22 + sha256: 36596d60d6bc49c4c27f009ab3128c63ea50ac5d67dffc44df05ab3d78bc4669 category: dev optional: true - name: platformdirs - version: 4.11.3 + version: 4.11.4 manager: conda platform: win-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.3-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.4-pyhcf101f3_0.conda hash: - md5: 31474b00d0ca5accac14eda09ba11216 - sha256: 810511c90649ca59fa0174958a210fd5051c0a7848cfbd42c87054a6836726b5 + md5: 840f27e0254bcdc8382ac2ca32782a22 + sha256: 36596d60d6bc49c4c27f009ab3128c63ea50ac5d67dffc44df05ab3d78bc4669 category: dev optional: true - name: pluggy @@ -5776,13 +5776,13 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' + libgcc: '>=15' python: '' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/psutil-7.2.2-py312h5253ce2_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/psutil-7.2.2-py312h1b36aeb_1.conda hash: - md5: dd94c506b119130aef5a9382aed648e7 - sha256: d834fd656133c9e4eaf63ffe9a117c7d0917d86d89f7d64073f4e3a0020bd8a7 + md5: 1653ce584b7859810f116e592eba9c0c + sha256: 2c6e88ac7aa5384fb843cb96023deb4382d6d5afbc81f5db1c7a1ef09c9e3090 category: main optional: false - name: psutil @@ -5795,10 +5795,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/psutil-7.2.2-py312he5662c2_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/psutil-7.2.2-py312he5662c2_1.conda hash: - md5: a2724c93b745fc7861948eb8b9f6679a - sha256: edffc84c001a05b996b5f8607c8164432754e86ec9224e831cd00ebabdec04e7 + md5: 14ea08081e760cf916895c6bd80e4500 + sha256: f0df1874d646c57ef1c4908a1e8fa4139b76fb260a2001332bf145cff753f0bb category: main optional: false - name: pthread-stubs @@ -6208,7 +6208,7 @@ package: category: dev optional: true - name: python - version: 3.12.13 + version: 3.12.14 manager: conda platform: linux-64 dependencies: @@ -6230,14 +6230,14 @@ package: readline: '>=8.3,<9.0a0' tk: '>=8.6.13,<8.7.0a0' tzdata: '' - url: https://repo.prefix.dev/conda-forge/linux-64/python-3.12.13-h8ab3286_1_cpython.conda + url: https://repo.prefix.dev/conda-forge/linux-64/python-3.12.14-h8ab3286_0_cpython.conda hash: - md5: c6e02a78e3b6427c633328fea9399534 - sha256: df3d1e5f972e79e78b61730c09135c795f6e7aa45b7777835c95f451e85eff0d + md5: e9dcdd23a1c68738eb3257d23d5f7285 + sha256: ceb9c724de53ee3560f121dbfcb00fe8acb22c08691158fce7b6c32425855626 category: main optional: false - name: python - version: 3.12.13 + version: 3.12.14 manager: conda platform: win-64 dependencies: @@ -6254,10 +6254,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/python-3.12.13-hb12b558_1_cpython.conda + url: https://repo.prefix.dev/conda-forge/win-64/python-3.12.14-hb12b558_0_cpython.conda hash: - md5: a028e8d8ad74ff4e53af5411cb34e9c2 - sha256: 14a64c3256f018e185490fd64bbdf29c327a6143432fb6545363ddf49ceababb + md5: 1948cdb3b317f50c8c8c4b6b96ce8a72 + sha256: 0911d8c3e93d5746e7cb1d8f76ba680aa7cbdf90a68dcd697e641e9f761642af category: main optional: false - name: python-dateutil @@ -6311,29 +6311,29 @@ package: category: dev optional: true - name: python-gil - version: 3.12.13 + version: 3.12.14 manager: conda platform: linux-64 dependencies: - cpython: 3.12.13.* + cpython: 3.12.14.* python_abi: '*' - url: https://repo.prefix.dev/conda-forge/noarch/python-gil-3.12.13-hd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/python-gil-3.12.14-hd8ed1ab_0.conda hash: - md5: 87225cc6af32ec67528efa39c4945aaf - sha256: cf0972372c4469881e13e9342ab51aed8b25d0d5dff45fcd0fe847b3dd11f97c + md5: 3b084ff55bd64d09178194042f50f6ba + sha256: d006a720b5ff306e5d58f5ceeeb11ecae6d0b071200fb014ab6e2d2c3be65733 category: dev optional: true - name: python-gil - version: 3.12.13 + version: 3.12.14 manager: conda platform: win-64 dependencies: - cpython: 3.12.13.* + cpython: 3.12.14.* python_abi: '*' - url: https://repo.prefix.dev/conda-forge/noarch/python-gil-3.12.13-hd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/python-gil-3.12.14-hd8ed1ab_0.conda hash: - md5: 87225cc6af32ec67528efa39c4945aaf - sha256: cf0972372c4469881e13e9342ab51aed8b25d0d5dff45fcd0fe847b3dd11f97c + md5: 3b084ff55bd64d09178194042f50f6ba + sha256: d006a720b5ff306e5d58f5ceeeb11ecae6d0b071200fb014ab6e2d2c3be65733 category: dev optional: true - name: python-json-logger @@ -6479,10 +6479,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/pywin32-312-py312h829343e_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pywin32-312-py312h95189c4_1.conda hash: - md5: 47f425e058b0a4b66712784a0d24b45d - sha256: e4560c30234075bf17c641cb651279ff6c6f2bad581dfc37ed780f159909b2d3 + md5: fc8069ad0018f7d73c4f93d7ae167b05 + sha256: cf3c94dd27c098161356e395f283ce37c359a975299b97fb3959ed51e011cc0f category: dev optional: true - name: pywinpty @@ -6536,25 +6536,25 @@ package: category: main optional: false - name: pyzmq - version: 27.1.0 + version: 27.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' _python_abi3_support: 1.* cpython: '>=3.12' - libgcc: '>=14' - libstdcxx: '>=14' + libgcc: '>=15' + libstdcxx: '>=15' python: '' zeromq: '>=4.3.5,<4.4.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/pyzmq-27.1.0-py312hda471dd_3.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pyzmq-27.2.0-py312h8a5ba0d_0.conda hash: - md5: acd216255e1370e9aeab5351b831f07c - sha256: 970b2a1d12983d8d1cc05d914ad88a0b6ef1fa14038c9649aa834dd6ebee65d7 + md5: ceffbc006d87e8f81e750cebd63fd8c4 + sha256: 9e8b94a2c9b4479cac80def117178a1658b089b9e5d4ee64408d2e4ff89fdaba category: dev optional: true - name: pyzmq - version: 27.1.0 + version: 27.2.0 manager: conda platform: win-64 dependencies: @@ -6565,10 +6565,10 @@ package: vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' zeromq: '>=4.3.5,<4.3.6.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/pyzmq-27.1.0-py312h343a6d4_3.conda + url: https://repo.prefix.dev/conda-forge/win-64/pyzmq-27.2.0-py312h343a6d4_0.conda hash: - md5: ebbda9a4e5161d6e1f98146ad057dc10 - sha256: d7e65c44ea8a92f80cc0e424b4b7dbe63b8a9ec04ea774b7d4f7aed4c34cce4c + md5: 58bcf20b110e99aa69ab892a6ced10f5 + sha256: 56d33fdddf6fb7ffb86120b8e2f1398cc406d0d3e85e5647d3a72cad05c17509 category: dev optional: true - name: qhull @@ -6787,13 +6787,13 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' + libgcc: '>=15' python: '' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/rpds-py-2026.6.3-py312h192e038_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/rpds-py-2026.6.3-py312hc767a74_0.conda hash: - md5: 40984fba15f43a366ea4c6dea2b4c8bd - sha256: 4a190c74b5f3b441820a3142b03a489987c724b65237882ebe87d75892345d17 + md5: 4c5bc78879aabba9ec582ef330109996 + sha256: b189c45a480760097c0e8ad376be0c2467f436539097f7a12f8bb132930ad4ed category: dev optional: true - name: rpds-py @@ -6806,10 +6806,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/rpds-py-2026.6.3-py312hd944d65_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/rpds-py-2026.6.3-py312hdabe01f_0.conda hash: - md5: 4a097aa0b62666ceb97a5ed5b9345131 - sha256: 8df011d21a56a4fb9aa0d5b27c2d0138058a4d82af532723e1002a643c02dead + md5: afd5801201072561302df580440ba322 + sha256: f3c0e6f8e9b2bcfc3bb150c429e95f0adad305739de9e11165b798fa63a17c73 category: dev optional: true - name: rtree @@ -7488,12 +7488,12 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' + libgcc: '>=15' libzlib: '>=1.3.2,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/tk-8.6.13-noxft_hd70dff1_3.conda + url: https://repo.prefix.dev/conda-forge/linux-64/tk-8.6.13-noxft_h1df4ec4_4.conda hash: - md5: 48a1049e710857572fc2a832aa394d9f - sha256: 43624eab22f5f29df7d6ffe914cf442f28fd559b55b290906255492826e636e8 + md5: 676a2f9b1c4fcf57b70aa5c65f6c60d0 + sha256: a1a241d172c1ccab067ba245206dd048bc3c2d1b84504b53c9468e99adfc16a1 category: main optional: false - name: tk @@ -7504,10 +7504,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/tk-8.6.13-h967ab96_3.conda + url: https://repo.prefix.dev/conda-forge/win-64/tk-8.6.13-h967ab96_4.conda hash: - md5: aaf79e2af50a151fb5b5a3e3f38b7a69 - sha256: 13fa29257d43f8e630a1e591ed77fae9bbbb236b011432f01e2034cf36e6bf03 + md5: dd9eb33c99d352b6356f86964d6040f7 + sha256: f19618a3a82cc483dacf1c70a30367ee7b0c7e71b90f1f80e14feff44fbd3688 category: main optional: false - name: tomli @@ -8232,11 +8232,11 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/yaml-0.2.5-h280c20c_3.conda + libgcc: '>=15' + url: https://repo.prefix.dev/conda-forge/linux-64/yaml-0.2.5-hebe6cf0_3.conda hash: - md5: a77f85f77be52ff59391544bfe73390a - sha256: 6d9ea2f731e284e9316d95fa61869fe7bbba33df7929f82693c121022810f4ad + md5: e741576fb8f89821ac7c1c537322a33d + sha256: d164dfa75ecd538f6fd68765defcc06aa875bc697b9b215362d79a2a73125dd0 category: main optional: false - name: yaml @@ -8450,43 +8450,43 @@ package: category: main optional: false - name: geoapps-utils - version: 0.7.1.dev89+abb77df + version: 0.7.1.dev100+f19fcbc manager: pip platform: linux-64 dependencies: - geoh5py: 0.14.0a1.dev242+a7f9b631 + geoh5py: 0.14.0a1.dev268+77b6932a matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c hash: - sha256: abb77df087054a4d3657213b0df7dfcfe4cb2843 + sha256: f19fcbcf7335f65362fafd01562a0cdbae8d482c source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c category: main optional: false - name: geoapps-utils - version: 0.7.1.dev89+abb77df + version: 0.7.1.dev100+f19fcbc manager: pip platform: win-64 dependencies: - geoh5py: 0.14.0a1.dev242+a7f9b631 + geoh5py: 0.14.0a1.dev268+77b6932a matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c hash: - sha256: abb77df087054a4d3657213b0df7dfcfe4cb2843 + sha256: f19fcbcf7335f65362fafd01562a0cdbae8d482c source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c category: main optional: false - name: geoh5py - version: 0.14.0a1.dev242+a7f9b631 + version: 0.14.0a1.dev268+77b6932a manager: pip platform: linux-64 dependencies: @@ -8495,16 +8495,16 @@ package: pillow: '>=12.2.0,<12.3.0' psutil: '>=7.2.2,<7.3.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a + url: git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a hash: - sha256: a7f9b63166faab9031fa5692df218d11933ad43a + sha256: 77b6932a68b9814a580f89101a12ce81c84c739a source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a + url: git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a category: main optional: false - name: geoh5py - version: 0.14.0a1.dev242+a7f9b631 + version: 0.14.0a1.dev268+77b6932a manager: pip platform: win-64 dependencies: @@ -8513,54 +8513,54 @@ package: pillow: '>=12.2.0,<12.3.0' psutil: '>=7.2.2,<7.3.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a + url: git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a hash: - sha256: a7f9b63166faab9031fa5692df218d11933ad43a + sha256: 77b6932a68b9814a580f89101a12ce81c84c739a source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a + url: git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a category: main optional: false - name: grid-apps - version: 0.2.1.dev79+7d7ad60 + version: 0.2.0.post2.dev92+60cc4f1 manager: pip platform: linux-64 dependencies: discretize: '>=0.12.0,<0.13.0' - geoapps-utils: 0.7.1.dev89+abb77df - geoh5py: 0.14.0a1.dev242+a7f9b631 + geoapps-utils: 0.7.1.dev100+f19fcbc + geoh5py: 0.14.0a1.dev268+77b6932a numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + url: git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df hash: - sha256: 7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + sha256: 60cc4f14053bf22013b89d53a6dbdf0c739ff2df source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + url: git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df category: main optional: false - name: grid-apps - version: 0.2.1.dev79+7d7ad60 + version: 0.2.0.post2.dev92+60cc4f1 manager: pip platform: win-64 dependencies: discretize: '>=0.12.0,<0.13.0' - geoapps-utils: 0.7.1.dev89+abb77df - geoh5py: 0.14.0a1.dev242+a7f9b631 + geoapps-utils: 0.7.1.dev100+f19fcbc + geoh5py: 0.14.0a1.dev268+77b6932a numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + url: git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df hash: - sha256: 7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + sha256: 60cc4f14053bf22013b89d53a6dbdf0c739ff2df source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + url: git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df category: main optional: false - name: mira-simpeg - version: 0.25.0.2.dev21+ge1ba45a37 + version: 0.25.0.2.dev48+gf99e4a081 manager: pip platform: linux-64 dependencies: @@ -8573,16 +8573,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + url: git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 hash: - sha256: e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + sha256: f99e4a081f420af06e4722d3a0fe8163ae6c0390 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + url: git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 category: main optional: false - name: mira-simpeg - version: 0.25.0.2.dev21+ge1ba45a37 + version: 0.25.0.2.dev48+gf99e4a081 manager: pip platform: win-64 dependencies: @@ -8595,11 +8595,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + url: git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 hash: - sha256: e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + sha256: f99e4a081f420af06e4722d3a0fe8163ae6c0390 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + url: git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 category: main optional: false diff --git a/py-3.13.conda-lock.yml b/py-3.13.conda-lock.yml index 78a18c44..c1efe1ec 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: 3b4ec78c573a5c0dfc853d59cf3c5327a15581a671813a9486f247192fdda8f5 - linux-64: 90b1e25f0d8bb2738a191cb99acd28fd5c85b43df3849935d85d42946d01479d + win-64: d81085ff8b943e3347da9c2174e4427cd5736c1d273bc4a6b4c77ebac25efae5 + linux-64: 46e87a977a45c0b272bd0321b439febe2f11e1e69a0ddc4e780729ddb9a22d9c channels: - url: conda-forge used_env_vars: [] @@ -189,23 +189,23 @@ package: category: dev optional: true - name: argon2-cffi-bindings - version: 25.1.0 + version: 26.1.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' cffi: '>=1.0.1' - libgcc: '>=14' + libgcc: '>=15' python: '>=3.13,<3.14.0a0' python_abi: 3.13.* - url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-25.1.0-py313h07c4f96_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-26.1.0-py313h995f894_0.conda hash: - md5: 27bbec9f2f3a15d32b60ec5734f5b41c - sha256: ad188ccc06a06c633dc124b09e9e06fb9df4c32ffc38acc96ecc86e506062090 + md5: db73f7be4911943040efc5ca79c9775e + sha256: e07a2c721f480ee8109b519ca2201603abcc3aed5a9673fb830adbc9b6768ab8 category: dev optional: true - name: argon2-cffi-bindings - version: 25.1.0 + version: 26.1.0 manager: conda platform: win-64 dependencies: @@ -215,10 +215,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-25.1.0-py313h5ea7bf4_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-26.1.0-py313h5ea7bf4_0.conda hash: - md5: eabb4b677b54874d7d6ab775fdaa3d27 - sha256: 3f8a1affdfeb2be5289d709e365fc6e386d734773895215cf8cbc5100fa6af9a + md5: 0e05f2b2dba8c28bc6be0ee952ce4fbc + sha256: 0532093a043aa452c90798cbff19dfc3ab4e331726239dad42ffce83538d94cc category: dev optional: true - name: arrow @@ -969,11 +969,11 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/c-ares-1.34.8-h280c20c_1.conda + libgcc: '>=15' + url: https://repo.prefix.dev/conda-forge/linux-64/c-ares-1.34.8-hebe6cf0_2.conda hash: - md5: 2cef891b791040aab83e218c7d137679 - sha256: 5139b6afbfaca91c47104ba9a6a40f81211e1c9200e96b73ce3a56f0ca1902f4 + md5: 3ad2b403be8fc5612b9159e2ce621f69 + sha256: 9c37cc233238adf366ea75b0e845662a5be07ceadf62e458183516369340274b category: main optional: false - name: ca-certificates @@ -1001,51 +1001,51 @@ package: category: main optional: false - name: cached-property - version: 1.5.2 + version: 2.0.1 manager: conda platform: linux-64 dependencies: - cached_property: '>=1.5.2,<1.5.3.0a0' - url: https://repo.prefix.dev/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_2.conda + cached_property: '>=2.0.1,<2.0.2.0a0' + url: https://repo.prefix.dev/conda-forge/noarch/cached-property-2.0.1-pyhcf101f3_0.conda hash: - md5: 1990eb3f49022846fbc7fc9624a0ee43 - sha256: 0d00dd61cb91b1bd1536600c64c9db4f94f3c699fec42864d0a2f4bc2ad8c3e8 + md5: 70e764e549c6c25de5e429d6e4a28b39 + sha256: 39358005c3cc44d8315ed79789b18a960d69365be979970cc6bae8f7a6177703 category: main optional: false - name: cached-property - version: 1.5.2 + version: 2.0.1 manager: conda platform: win-64 dependencies: - cached_property: '>=1.5.2,<1.5.3.0a0' - url: https://repo.prefix.dev/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_2.conda + cached_property: '>=2.0.1,<2.0.2.0a0' + url: https://repo.prefix.dev/conda-forge/noarch/cached-property-2.0.1-pyhcf101f3_0.conda hash: - md5: 1990eb3f49022846fbc7fc9624a0ee43 - sha256: 0d00dd61cb91b1bd1536600c64c9db4f94f3c699fec42864d0a2f4bc2ad8c3e8 + md5: 70e764e549c6c25de5e429d6e4a28b39 + sha256: 39358005c3cc44d8315ed79789b18a960d69365be979970cc6bae8f7a6177703 category: main optional: false - name: cached_property - version: 1.5.2 + version: 2.0.1 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/cached_property-1.5.2-pyha770c72_2.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/cached_property-2.0.1-pyhcf101f3_0.conda hash: - md5: f71e6840332854fd2eac6c3229768a9c - sha256: b1808a7811b5688d045b204425bb7ee824b340b40025b4ad0a39b4db1f4f1c98 + md5: 256d863ded0f79464391a075944d24a6 + sha256: 4bd96dab5a434e4ee59fb6910cae704d4c5b453907d4886272a9943d37e42b6f category: main optional: false - name: cached_property - version: 1.5.2 + version: 2.0.1 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/cached_property-1.5.2-pyha770c72_2.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/cached_property-2.0.1-pyhcf101f3_0.conda hash: - md5: f71e6840332854fd2eac6c3229768a9c - sha256: b1808a7811b5688d045b204425bb7ee824b340b40025b4ad0a39b4db1f4f1c98 + md5: 256d863ded0f79464391a075944d24a6 + sha256: 4bd96dab5a434e4ee59fb6910cae704d4c5b453907d4886272a9943d37e42b6f category: main optional: false - name: certifi @@ -1957,10 +1957,10 @@ package: numpy: '>=1.25,<3' python: '>=3.13,<3.14.0a0' python_abi: 3.13.* - url: https://repo.prefix.dev/conda-forge/linux-64/h5py-3.16.0-nompi_py313hce4e9db_103.conda + url: https://repo.prefix.dev/conda-forge/linux-64/h5py-3.16.0-nompi_py313hce4e9db_104.conda hash: - md5: f01a48ddb9f5add526a445c5065a92cc - sha256: 79a0479900879501c0f1882a75cc7d3d8b85815821cd7ee78f8fbd57c466154f + md5: 7dfbf9e531653851f910ca031b9435c3 + sha256: 9607bed2b2aa655a739ae5dea23ec888193d04d500b527a5cb0e3981ae641352 category: main optional: false - name: h5py @@ -1976,10 +1976,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/h5py-3.16.0-nompi_py313hd050a09_103.conda + url: https://repo.prefix.dev/conda-forge/win-64/h5py-3.16.0-nompi_py313hd050a09_104.conda hash: - md5: a8ec5e7508022a23210387bcc3af0a4b - sha256: 4d51b074f34227cfd3415bed18678eb1f79a1f41bc825383ab4f9ac41df2e21a + md5: 41479c21dc1dee160147330952227442 + sha256: 921b640d97d3592e1b778e734ca33c885a5fe6d46c694ae0aaf785202b72159a category: main optional: false - name: hdf5 @@ -2199,27 +2199,27 @@ package: category: dev optional: true - name: imagesize - version: 2.0.0 + version: 2.0.1 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/imagesize-2.0.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/imagesize-2.0.1-pyhd8ed1ab_0.conda hash: - md5: 92617c2ba2847cca7a6ed813b6f4ab79 - sha256: 5a047f9eac290e679b4e6f6f4cbfcc5acdfbf031a4f06824d4ddb590cdbb850b + md5: ebc56022e4ef7e74a829be94c53797ca + sha256: 4e787f9ccc31053ccea56d98ecd284a4f788988a3f9c4627db72fdd0b127529b category: dev optional: true - name: imagesize - version: 2.0.0 + version: 2.0.1 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/imagesize-2.0.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/imagesize-2.0.1-pyhd8ed1ab_0.conda hash: - md5: 92617c2ba2847cca7a6ed813b6f4ab79 - sha256: 5a047f9eac290e679b4e6f6f4cbfcc5acdfbf031a4f06824d4ddb590cdbb850b + md5: ebc56022e4ef7e74a829be94c53797ca + sha256: 4e787f9ccc31053ccea56d98ecd284a4f788988a3f9c4627db72fdd0b127529b category: dev optional: true - name: importlib-metadata @@ -2642,10 +2642,10 @@ package: python: '' referencing: '>=0.28.4' rpds-py: '>=0.25.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.26.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.26.0-pyhcf101f3_1.conda hash: - md5: ada41c863af263cc4c5fcbaff7c3e4dc - sha256: db973a37d75db8e19b5f44bbbdaead0c68dde745407f281e2a7fe4db74ec51d7 + md5: 204b5ca91eba7738790ecc333facbbbe + sha256: 328756a4555941d57af4a5f553e5d8598e9f3b37db028f557e30f9f0b3086db6 category: dev optional: true - name: jsonschema @@ -2658,10 +2658,10 @@ package: python: '' referencing: '>=0.28.4' rpds-py: '>=0.25.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.26.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.26.0-pyhcf101f3_1.conda hash: - md5: ada41c863af263cc4c5fcbaff7c3e4dc - sha256: db973a37d75db8e19b5f44bbbdaead0c68dde745407f281e2a7fe4db74ec51d7 + md5: 204b5ca91eba7738790ecc333facbbbe + sha256: 328756a4555941d57af4a5f553e5d8598e9f3b37db028f557e30f9f0b3086db6 category: dev optional: true - name: jsonschema-specifications @@ -2705,10 +2705,10 @@ package: rfc3987-syntax: '>=1.1.0' uri-template: '' webcolors: '>=24.6.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.26.0-hcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.26.0-hcf101f3_1.conda hash: - md5: 8368d58342d0825f0843dc6acdd0c483 - sha256: 6886fc61e4e4edd38fd38729976b134e8bd2143f7fce56cc80d7ac7bac99bce1 + md5: ae36c895b9e25a127d2acbdbaa87e301 + sha256: 1b8ed25276ceae973e21d269fbe11f08d0b5f73c7ac9584e2d6a9dd763b8707a category: dev optional: true - name: jsonschema-with-format-nongpl @@ -2726,10 +2726,10 @@ package: rfc3987-syntax: '>=1.1.0' uri-template: '' webcolors: '>=24.6.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.26.0-hcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.26.0-hcf101f3_1.conda hash: - md5: 8368d58342d0825f0843dc6acdd0c483 - sha256: 6886fc61e4e4edd38fd38729976b134e8bd2143f7fce56cc80d7ac7bac99bce1 + md5: ae36c895b9e25a127d2acbdbaa87e301 + sha256: 1b8ed25276ceae973e21d269fbe11f08d0b5f73c7ac9584e2d6a9dd763b8707a category: dev optional: true - name: jupyter-book @@ -3554,16 +3554,16 @@ package: platform: win-64 dependencies: krb5: '>=1.22.2,<1.23.0a0' - libpsl: '>=0.23.0,<0.24.0a0' + libpsl: '>=0.23.1,<0.24.0a0' libssh2: '>=1.11.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.21.0-hdb0ef4a_4.conda + url: https://repo.prefix.dev/conda-forge/win-64/libcurl-8.21.0-hdb0ef4a_5.conda hash: - md5: 5e9c5b83929cf7ab2c04121af771e7b5 - sha256: af17c990ec52b6aba29e052c438d7ac61bfd541d6d183a8f09aa4f2c532c9bab + md5: 50861643cbe90dc7267feb7854b8efdf + sha256: bf5445ab8acfaccaf511d774f131cf0d99c5eef6b8def270e832ad26970d5011 category: main optional: false - name: libdeflate @@ -3679,11 +3679,11 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/libffi-3.7.0-h3435931_0.conda + libgcc: '>=15' + url: https://repo.prefix.dev/conda-forge/linux-64/libffi-3.7.0-h81df57d_1.conda hash: - md5: 0abe40a9880086ca4d2e5daf09dceff9 - sha256: ac38603008bf1e99b8ed379b1a656a67a70e2841f2b6a069c630cdf6316012d2 + md5: 6525a0b06aa4fd390795f0740636a9dd + sha256: c8c7583ef063bc3c430f1d48298e5ad24f796a35c22ed5b14183325825a61106 category: main optional: false - name: libffi @@ -3694,10 +3694,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/libffi-3.7.0-h3d046cb_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libffi-3.7.0-h3d046cb_1.conda hash: - md5: 92bdfc0e5012660892b0e0eaf3069a5c - sha256: 2ea8d2fe7b84ca37653777e15ac1e7abd35f0c90d3efbe7f6c4de9b489606369 + md5: ceb38b0ba900847d8da4289c3c8e5708 + sha256: 613e8077c5cca5df7fe84ade7d5050301bee3c6c4c450ffe61d34a349ab4f11c category: main optional: false - name: libfreetype @@ -3756,78 +3756,78 @@ package: category: main optional: false - name: libgcc - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-16.1.0-ha9f2e26_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-16.2.0-ha9f2e26_4.conda hash: - md5: 5a7d954665c707c93311657cd779c705 - sha256: d5cb8475131c31680f8fd30512c418f373064e272e452063276a8fb14c9fa42f + md5: cba14d01083fc62ffd32c24d7d390633 + sha256: 24090e675d34403b4ee1cd4372d8f6c0937da7ecfd66a19a57cac2ed0f4ea793 category: main optional: false - name: libgcc - version: 16.1.0 + version: 16.2.0 manager: conda platform: win-64 dependencies: _openmp_mutex: '>=4.5' libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgcc-16.1.0-h110b43a_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgcc-16.2.0-h110b43a_4.conda hash: - md5: 0b5cc3373b5f925934421259463397a4 - sha256: 9d12bae84edf872eefcddef28677b80d3550e1ef42b319122659aaf732c4ee53 + md5: 02793cf48b68687fee158a48c92850a6 + sha256: 32c0d1adcc96835d5f681c7e72b7f5e2e30088149239e002b8a6f581a072e1d2 category: main optional: false - name: libgcc-ng - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: - libgcc: 16.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-16.1.0-h69a702a_1.conda + libgcc: 16.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libgcc-ng-16.2.0-h69a702a_4.conda hash: - md5: 7ed870c014a6f23c7dfafda53d2763a9 - sha256: 225275c562337a1cd61705da0ee4235dde7bba7504de1c34b74c894adb2b0eee + md5: b3e52878163a841f6fb951989cc0b217 + sha256: d8e66c14e23f2b3c70410cff5979d9d357e6edfb990b28d8e630852f4d395629 category: main optional: false - name: libgfortran - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: - libgfortran5: 16.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-16.1.0-h69a702a_1.conda + libgfortran5: 16.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran-16.2.0-h69a702a_4.conda hash: - md5: 2fbed65cc90cf0724e1ec4de13696737 - sha256: 9e82d410a50bd4e5e47cbbb026454c3eb543954baca4db23929575b571bf56a3 + md5: 5e92b8413fd1c8f8f3006f4661b12def + sha256: 7653be4d88a4d74676c38dd892914d027dcecc0c65c406be772d31cb641f8cfd category: main optional: false - name: libgfortran5 - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=16.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-16.1.0-h79bb938_1.conda + libgcc: '>=16.2.0' + url: https://repo.prefix.dev/conda-forge/linux-64/libgfortran5-16.2.0-h6b99dfc_4.conda hash: - md5: dd51ed33e8c70995f8e33cc9dc537297 - sha256: 05078ab464d506dff971860cb1a553b35bc27c0b5ce8ec29b8bfaca5f2359652 + md5: c22348a769bb072b6184eb6f7f05e4f2 + sha256: a5510cbcea3b9e9ab24b336429de997fa727af1dba323031500a962a20e38600 category: main optional: false - name: libgomp - version: 16.1.0 + version: 16.2.0 manager: conda platform: win-64 dependencies: libwinpthread: '>=12.0.0.r4.gg4f2fc60ca' - url: https://repo.prefix.dev/conda-forge/win-64/libgomp-16.1.0-h8ee18e1_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/libgomp-16.2.0-h8ee18e1_4.conda hash: - md5: baa80f69f3a43e4ec7e1cfb3addeae56 - sha256: ab1b70f492c859e2e76bb2c2a0725880f5ed5aa0e142a7650b0b78d6e64487de + md5: 91189f0bc9ff21f385fcda6232346612 + sha256: 9ef1a22fb50b31fbf9c01cf709e8f55b60fd3c02401d150be4a55943f9e3832f category: main optional: false - name: libhwloc @@ -4001,16 +4001,16 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - c-ares: '>=1.34.6,<2.0a0' + c-ares: '>=1.34.8,<2.0a0' libev: '>=4.33,<5.0a0' - libgcc: '>=14' - libstdcxx: '>=14' - libzlib: '>=1.3.1,<2.0a0' - openssl: '>=3.5.5,<4.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libnghttp2-1.68.1-h877daf1_0.conda + libgcc: '>=15' + libstdcxx: '>=15' + libzlib: '>=1.3.2,<2.0a0' + openssl: '>=3.5.7,<4.0a0' + url: https://repo.prefix.dev/conda-forge/linux-64/libnghttp2-1.68.1-h74cf4be_1.conda hash: - md5: 2a45e7f8af083626f009645a6481f12d - sha256: 663444d77a42f2265f54fb8b48c5450bfff4388d9c0f8253dd7855f0d993153f + md5: 75d211f04ac87506f1f43420712a69fe + sha256: 11a2f54a6f391e25738bce0023e6ef499600147bbcf21c1fa69d2e251b03cc6a category: main optional: false - name: libpng @@ -4081,11 +4081,11 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/libsodium-1.0.22-h280c20c_1.conda + libgcc: '>=15' + url: https://repo.prefix.dev/conda-forge/linux-64/libsodium-1.0.22-hebe6cf0_2.conda hash: - md5: 965e4d531b588b2e42f66fd8e48b056c - sha256: b677bbf1c339d894757c3dcfbb2f88649e499e4991d70ae09a1466da9a6c92d6 + md5: 42c585f153c17b790cd01f01553d24a1 + sha256: 7454c6a7cf27033757f2895bc5e3941fe27604506edd62cf6bc00e50ab015a43 category: dev optional: true - name: libsodium @@ -4096,10 +4096,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/libsodium-1.0.22-h6a83c73_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/libsodium-1.0.22-h6a83c73_2.conda hash: - md5: 7d5abf7ca1bd00b43d273f44d93d05dc - sha256: de45b71224da77a1c3a7dd48d8885eb957c9f05455d4f0828463293e7144330f + md5: 2a001157df8205a7785ea69dd3270a8f + sha256: 7dc8d243cc8bcd12d1666640664288822eda5d30411a0b22ff05090bbac4c32b category: dev optional: true - name: libspatialindex @@ -4190,28 +4190,28 @@ package: category: main optional: false - name: libstdcxx - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: 16.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-16.1.0-h934c35e_1.conda + libgcc: 16.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-16.2.0-h934c35e_4.conda hash: - md5: aed6cf89adc1e9b846e4367ac538e434 - sha256: 79721dd08aeb0ab9e773f1f9ef41cf4e6c17477e3d72319147619045bce05a09 + md5: 2f2ef0d96de5bdd8c1270ff22fdf9352 + sha256: 40b792b0186c1e8859280a1f6f19a54fc50a11b32724fc7b637009c1a9bd302b category: main optional: false - name: libstdcxx-ng - version: 16.1.0 + version: 16.2.0 manager: conda platform: linux-64 dependencies: - libstdcxx: 16.1.0 - url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-16.1.0-hdf11a46_1.conda + libstdcxx: 16.2.0 + url: https://repo.prefix.dev/conda-forge/linux-64/libstdcxx-ng-16.2.0-hdf11a46_4.conda hash: - md5: c94f06123272d8e129d4acf3a25ffb35 - sha256: 2876ca4463d1b394eb969ce4a84d1620aa63fb8202a6397837d1e45ec76c1208 + md5: de0dceacf3e33c5fc88e167885dc8274 + sha256: 4cdebd87b76cf53a58a08ebd6d15336daa79c5f0aa34d83a895ac503c0203632 category: main optional: false - name: libtiff @@ -4220,19 +4220,19 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - lerc: '>=4.1.0,<5.0a0' + lerc: '>=4.2.0,<5.0a0' libdeflate: '>=1.25,<1.26.0a0' - libgcc: '>=14' - libjpeg-turbo: '>=3.1.4.1,<4.0a0' + libgcc: '>=15' + libjpeg-turbo: '>=3.2.0,<4.0a0' liblzma: '>=5.8.3,<6.0a0' - libstdcxx: '>=14' + libstdcxx: '>=15' libwebp-base: '>=1.6.0,<2.0a0' libzlib: '>=1.3.2,<2.0a0' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libtiff-4.7.2-h9d88235_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libtiff-4.7.2-hcc2c06a_1.conda hash: - md5: c1fcb4a88bc15a9f77ad8d27d7af1df9 - sha256: b31346e1c01ab40a170e91147092ee8fd92b1dee3c66ee47ef025571c879b159 + md5: 0907d876f460ebc941ae590338b6102f + sha256: 10e125da82ca93e09191e66e5a94d566b2cf8d4024e2a0db3a9114297447e0d9 category: main optional: false - name: libtiff @@ -4240,19 +4240,19 @@ package: manager: conda platform: win-64 dependencies: - lerc: '>=4.1.0,<5.0a0' + lerc: '>=4.2.0,<5.0a0' libdeflate: '>=1.25,<1.26.0a0' - libjpeg-turbo: '>=3.1.4.1,<4.0a0' + libjpeg-turbo: '>=3.2.0,<4.0a0' liblzma: '>=5.8.3,<6.0a0' libzlib: '>=1.3.2,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' zstd: '>=1.5.7,<1.6.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/libtiff-4.7.2-h8f73337_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libtiff-4.7.2-h8f73337_1.conda hash: - md5: e83f459471905a04ebe15e21d063c49d - sha256: ec6d66308a6d6abaf3225f2f185113e6172e77eb0fa8622af982d7a5d6d47a2c + md5: 970dbe48f843e7fbd179a9b6c22f865a + sha256: 3575a092e3e52625a1767804a4ebd321becaadf61b63dcd6735ebb88c0b3c359 category: main optional: false - name: libuuid @@ -4314,10 +4314,10 @@ package: platform: win-64 dependencies: ucrt: '' - url: https://repo.prefix.dev/conda-forge/win-64/libwinpthread-12.0.0.r4.gg4f2fc60ca-h57928b3_10.conda + url: https://repo.prefix.dev/conda-forge/win-64/libwinpthread-12.0.0.r4.gg4f2fc60ca-h11686cb_11.conda hash: - md5: 8a86073cf3b343b87d03f41790d8b4e5 - sha256: 0fccf2d17026255b6e10ace1f191d0a2a18f2d65088fd02430be17c701f8ffe0 + md5: fc1e6626817ba55a0d141858d6c0ef5d + sha256: 988c8fe5fca9e3510fd0b5671d67ae42c1fd632f8bd28f832a6735970eb69a36 category: main optional: false - name: libxcb @@ -4384,10 +4384,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libxml2-2.15.3-h8ef44ab_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxml2-2.15.3-h8ef44ab_1.conda hash: - md5: 95591ca5671d2213f5b2d5aa7818420d - sha256: a4599c6bbbbdd7db570896e520c557eec8e66d94e839a59d17dc1f24a3d5f82b + md5: 45a5a1c709a69f14cf176220788d18a9 + sha256: a83e9adcf7c50f20289dc6890707c8e4e84151b4204b0f7344998138807458d1 category: main optional: false - name: libxml2-16 @@ -4419,10 +4419,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libxml2-16-2.15.3-h3cfd58e_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxml2-16-2.15.3-h3cfd58e_1.conda hash: - md5: 9e8dd0d90ed830107b2c36801035b7db - sha256: 3b61ee3caba702d2ff432fa3920835db963026e5c99c4e6fdca0c6114f59e7ce + md5: 6e7dadff3f3bde2d29d29a3ec34f2d58 + sha256: 8163de24a7ddb4ebf9587c3a45ba950caf3690b9646b76f007ca15e6e52b5881 category: main optional: false - name: libzlib @@ -4452,29 +4452,29 @@ package: category: main optional: false - name: llvm-openmp - version: 22.1.8 + version: 23.1.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://repo.prefix.dev/conda-forge/linux-64/llvm-openmp-22.1.8-h4922eb0_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/llvm-openmp-23.1.0-h7148c6a_0.conda hash: - md5: 7bbfdc5a6eca997d3b0873a575c3e155 - sha256: a37aba21b85800af1e7c5b04ba76abab96b6e591eedf99dc6e4df83b0fefd7a5 + md5: 58b4529023435973ab911c3c51892671 + sha256: b6fa85a30cceca3ad7a811ab34f842b9c2ae9d9d4c520e084b62b2abe50e9a70 category: main optional: false - name: llvm-openmp - version: 22.1.8 + version: 23.1.0 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/llvm-openmp-22.1.8-h4fa8253_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/llvm-openmp-23.1.0-h49e36cd_0.conda hash: - md5: de3551bf6508d45ca46b714639e52823 - sha256: 50c02902bb516eeb56680358f052be38b5bf74b40e78ea4b2a675e84957e7307 + md5: 79055ec79e1b43749763122cead30976 + sha256: f9658ec83a6744f38e2b8188c76e1c2dea2614f5aa0e14d9d274b19f60646b8c category: main optional: false - name: locket @@ -5036,7 +5036,7 @@ package: category: dev optional: true - name: nbformat - version: 5.11.0 + version: 5.11.1 manager: conda platform: linux-64 dependencies: @@ -5045,14 +5045,14 @@ package: python: '' python-fastjsonschema: '>=2.15' traitlets: '>=5.1' - url: https://repo.prefix.dev/conda-forge/noarch/nbformat-5.11.0-pyhcf101f3_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/nbformat-5.11.1-pyhcf101f3_0.conda hash: - md5: 3e7eb1cc4a342b2e7f68199b50fbe3cb - sha256: 4aeff72162e4b3f77238c859547275b9a989ed6873bffbdbc4d688291a60919b + md5: 2fbbf92e1173ae024f0b12759c1e64a1 + sha256: d85d76827ff732e1639f50f45e4d7d3387a27abd857b194dcbb5bb4166c2a7c2 category: dev optional: true - name: nbformat - version: 5.11.0 + version: 5.11.1 manager: conda platform: win-64 dependencies: @@ -5061,10 +5061,10 @@ package: python: '' python-fastjsonschema: '>=2.15' traitlets: '>=5.1' - url: https://repo.prefix.dev/conda-forge/noarch/nbformat-5.11.0-pyhcf101f3_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/nbformat-5.11.1-pyhcf101f3_0.conda hash: - md5: 3e7eb1cc4a342b2e7f68199b50fbe3cb - sha256: 4aeff72162e4b3f77238c859547275b9a989ed6873bffbdbc4d688291a60919b + md5: 2fbbf92e1173ae024f0b12759c1e64a1 + sha256: d85d76827ff732e1639f50f45e4d7d3387a27abd857b194dcbb5bb4166c2a7c2 category: dev optional: true - name: ncurses @@ -5363,21 +5363,21 @@ package: category: main optional: false - name: openssl - version: 3.6.3 + version: 3.6.4 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' - libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.6.3-h35e630c_1.conda + libgcc: '>=15' + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.6.4-h781a0a9_0.conda hash: - md5: c5955c27917ff2234def47f075e71e02 - sha256: 012096056b97abf1f68c46b7146bd2cbd68c1be762340b4f5dad4fbbe99177bc + md5: 16e3034a330cc625f2c685edec60cf4e + sha256: 4747b2d6a8336f52343bceb8a1ebf41a9e6e665b9d2e3f989972de53a310599e category: main optional: false - name: openssl - version: 3.6.3 + version: 3.6.4 manager: conda platform: win-64 dependencies: @@ -5385,10 +5385,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.3-hf411b9b_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.4-hf411b9b_0.conda hash: - md5: a978392692a910ba1c8920ccb1e784b3 - sha256: 2ebff5a1b5793e82495bf33c91fba040e11ff23333c2385ac66d0c3aee2cc14c + md5: 73cb1783f47c452be4c309430fbef89f + sha256: 9dddb559ba49744d5d94092d8d13cb0567f5c3b3f439f3acf28433d1f4256acc category: main optional: false - name: overrides @@ -5668,27 +5668,27 @@ package: category: main optional: false - name: platformdirs - version: 4.11.3 + version: 4.11.4 manager: conda platform: linux-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.3-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.4-pyhcf101f3_0.conda hash: - md5: 31474b00d0ca5accac14eda09ba11216 - sha256: 810511c90649ca59fa0174958a210fd5051c0a7848cfbd42c87054a6836726b5 + md5: 840f27e0254bcdc8382ac2ca32782a22 + sha256: 36596d60d6bc49c4c27f009ab3128c63ea50ac5d67dffc44df05ab3d78bc4669 category: dev optional: true - name: platformdirs - version: 4.11.3 + version: 4.11.4 manager: conda platform: win-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.3-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.4-pyhcf101f3_0.conda hash: - md5: 31474b00d0ca5accac14eda09ba11216 - sha256: 810511c90649ca59fa0174958a210fd5051c0a7848cfbd42c87054a6836726b5 + md5: 840f27e0254bcdc8382ac2ca32782a22 + sha256: 36596d60d6bc49c4c27f009ab3128c63ea50ac5d67dffc44df05ab3d78bc4669 category: dev optional: true - name: pluggy @@ -5771,13 +5771,13 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' + libgcc: '>=15' python: '' python_abi: 3.13.* - url: https://repo.prefix.dev/conda-forge/linux-64/psutil-7.2.2-py313h54dd161_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/psutil-7.2.2-py313hd42f317_1.conda hash: - md5: 25fe6e02c2083497b3239e21b49d8093 - sha256: f19fd682d874689dfde20bf46d7ec1a28084af34583e0405685981363af47c91 + md5: 04b0a2e271f49b0463be6d57ae4c2b56 + sha256: 23a4931a85e82bd1cfd96267e68a663ee366ed61f5447829616cec38268c2146 category: main optional: false - name: psutil @@ -5790,10 +5790,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/psutil-7.2.2-py313h5fd188c_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/psutil-7.2.2-py313h5fd188c_1.conda hash: - md5: 761b299a6289c77459defea3563f8fc0 - sha256: 3ec3373748f83069bef93b540de416e637ee30231b222d5df8f712e93f2f9195 + md5: 6f595daca6c327de634a3e7ee31a4954 + sha256: eb29ef488e3d502aed7797f970734d8ade25f3edb8eafc4562a925fb57cc99b6 category: main optional: false - name: pthread-stubs @@ -6476,10 +6476,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/pywin32-312-py313h40c08fc_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pywin32-312-py313h26f5e95_1.conda hash: - md5: 5c1dea2e266c8f03d16bde15f09169cd - sha256: 38caa16a0b9cc55bfaaf84d273ce6d768f8bce8d5949b5c41a8746ec65741b20 + md5: 4eb4c2ae8f9db363b4522ea0ef27b308 + sha256: 996c1a17732641bfe25071ad5846190be1a5d2800c93e0fd0d8cfc21dc551db7 category: dev optional: true - name: pywinpty @@ -6533,25 +6533,25 @@ package: category: main optional: false - name: pyzmq - version: 27.1.0 + version: 27.2.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' _python_abi3_support: 1.* cpython: '>=3.12' - libgcc: '>=14' - libstdcxx: '>=14' + libgcc: '>=15' + libstdcxx: '>=15' python: '' zeromq: '>=4.3.5,<4.4.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/pyzmq-27.1.0-py312hda471dd_3.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pyzmq-27.2.0-py312h8a5ba0d_0.conda hash: - md5: acd216255e1370e9aeab5351b831f07c - sha256: 970b2a1d12983d8d1cc05d914ad88a0b6ef1fa14038c9649aa834dd6ebee65d7 + md5: ceffbc006d87e8f81e750cebd63fd8c4 + sha256: 9e8b94a2c9b4479cac80def117178a1658b089b9e5d4ee64408d2e4ff89fdaba category: dev optional: true - name: pyzmq - version: 27.1.0 + version: 27.2.0 manager: conda platform: win-64 dependencies: @@ -6562,10 +6562,10 @@ package: vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' zeromq: '>=4.3.5,<4.3.6.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/pyzmq-27.1.0-py312h343a6d4_3.conda + url: https://repo.prefix.dev/conda-forge/win-64/pyzmq-27.2.0-py312h343a6d4_0.conda hash: - md5: ebbda9a4e5161d6e1f98146ad057dc10 - sha256: d7e65c44ea8a92f80cc0e424b4b7dbe63b8a9ec04ea774b7d4f7aed4c34cce4c + md5: 58bcf20b110e99aa69ab892a6ced10f5 + sha256: 56d33fdddf6fb7ffb86120b8e2f1398cc406d0d3e85e5647d3a72cad05c17509 category: dev optional: true - name: qhull @@ -6784,13 +6784,13 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' + libgcc: '>=15' python: '' python_abi: 3.13.* - url: https://repo.prefix.dev/conda-forge/linux-64/rpds-py-2026.6.3-py313hafbe609_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/rpds-py-2026.6.3-py313ha296275_0.conda hash: - md5: 0ff19d7aef2cd2f61cf12838c3138a2e - sha256: 42f2aec0823d8493682a18993912d725a108b5a27a606ad5cf7b41ac307b9575 + md5: 4f02ada1a38d9b96e0e1c2724a489c12 + sha256: 44fffe871fe2df29fabd98c5fa39c467cfd1f514aca3288cff84b6a8186763a9 category: dev optional: true - name: rpds-py @@ -6803,10 +6803,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/rpds-py-2026.6.3-py313ha9ea572_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/rpds-py-2026.6.3-py313hfbe8231_0.conda hash: - md5: 39b5a29d39e4d10e529b4b16ad1f1a91 - sha256: 6122d23e9856d159eb420dd29f27876dbc7f63fd9c18293d82ae29815bc33518 + md5: 613d2e8dbcf02757e130144814e0bcc4 + sha256: c3c9babdffb3b2f1f284937b6c0e801d2ccf6f6b5331016b8e3e1a71397c283b category: dev optional: true - name: rtree @@ -7485,12 +7485,12 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' + libgcc: '>=15' libzlib: '>=1.3.2,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/tk-8.6.13-noxft_hd70dff1_3.conda + url: https://repo.prefix.dev/conda-forge/linux-64/tk-8.6.13-noxft_h1df4ec4_4.conda hash: - md5: 48a1049e710857572fc2a832aa394d9f - sha256: 43624eab22f5f29df7d6ffe914cf442f28fd559b55b290906255492826e636e8 + md5: 676a2f9b1c4fcf57b70aa5c65f6c60d0 + sha256: a1a241d172c1ccab067ba245206dd048bc3c2d1b84504b53c9468e99adfc16a1 category: main optional: false - name: tk @@ -7501,10 +7501,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/tk-8.6.13-h967ab96_3.conda + url: https://repo.prefix.dev/conda-forge/win-64/tk-8.6.13-h967ab96_4.conda hash: - md5: aaf79e2af50a151fb5b5a3e3f38b7a69 - sha256: 13fa29257d43f8e630a1e591ed77fae9bbbb236b011432f01e2034cf36e6bf03 + md5: dd9eb33c99d352b6356f86964d6040f7 + sha256: f19618a3a82cc483dacf1c70a30367ee7b0c7e71b90f1f80e14feff44fbd3688 category: main optional: false - name: tomli @@ -8172,11 +8172,11 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/yaml-0.2.5-h280c20c_3.conda + libgcc: '>=15' + url: https://repo.prefix.dev/conda-forge/linux-64/yaml-0.2.5-hebe6cf0_3.conda hash: - md5: a77f85f77be52ff59391544bfe73390a - sha256: 6d9ea2f731e284e9316d95fa61869fe7bbba33df7929f82693c121022810f4ad + md5: e741576fb8f89821ac7c1c537322a33d + sha256: d164dfa75ecd538f6fd68765defcc06aa875bc697b9b215362d79a2a73125dd0 category: main optional: false - name: yaml @@ -8390,43 +8390,43 @@ package: category: main optional: false - name: geoapps-utils - version: 0.7.1.dev89+abb77df + version: 0.7.1.dev100+f19fcbc manager: pip platform: linux-64 dependencies: - geoh5py: 0.14.0a1.dev242+a7f9b631 + geoh5py: 0.14.0a1.dev268+77b6932a matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c hash: - sha256: abb77df087054a4d3657213b0df7dfcfe4cb2843 + sha256: f19fcbcf7335f65362fafd01562a0cdbae8d482c source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c category: main optional: false - name: geoapps-utils - version: 0.7.1.dev89+abb77df + version: 0.7.1.dev100+f19fcbc manager: pip platform: win-64 dependencies: - geoh5py: 0.14.0a1.dev242+a7f9b631 + geoh5py: 0.14.0a1.dev268+77b6932a matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c hash: - sha256: abb77df087054a4d3657213b0df7dfcfe4cb2843 + sha256: f19fcbcf7335f65362fafd01562a0cdbae8d482c source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@abb77df087054a4d3657213b0df7dfcfe4cb2843 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@f19fcbcf7335f65362fafd01562a0cdbae8d482c category: main optional: false - name: geoh5py - version: 0.14.0a1.dev242+a7f9b631 + version: 0.14.0a1.dev268+77b6932a manager: pip platform: linux-64 dependencies: @@ -8435,16 +8435,16 @@ package: pillow: '>=12.2.0,<12.3.0' psutil: '>=7.2.2,<7.3.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a + url: git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a hash: - sha256: a7f9b63166faab9031fa5692df218d11933ad43a + sha256: 77b6932a68b9814a580f89101a12ce81c84c739a source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a + url: git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a category: main optional: false - name: geoh5py - version: 0.14.0a1.dev242+a7f9b631 + version: 0.14.0a1.dev268+77b6932a manager: pip platform: win-64 dependencies: @@ -8453,54 +8453,54 @@ package: pillow: '>=12.2.0,<12.3.0' psutil: '>=7.2.2,<7.3.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a + url: git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a hash: - sha256: a7f9b63166faab9031fa5692df218d11933ad43a + sha256: 77b6932a68b9814a580f89101a12ce81c84c739a source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7f9b63166faab9031fa5692df218d11933ad43a + url: git+https://github.com/MiraGeoscience/geoh5py.git@77b6932a68b9814a580f89101a12ce81c84c739a category: main optional: false - name: grid-apps - version: 0.2.1.dev79+7d7ad60 + version: 0.2.0.post2.dev92+60cc4f1 manager: pip platform: linux-64 dependencies: discretize: '>=0.12.0,<0.13.0' - geoapps-utils: 0.7.1.dev89+abb77df - geoh5py: 0.14.0a1.dev242+a7f9b631 + geoapps-utils: 0.7.1.dev100+f19fcbc + geoh5py: 0.14.0a1.dev268+77b6932a numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + url: git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df hash: - sha256: 7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + sha256: 60cc4f14053bf22013b89d53a6dbdf0c739ff2df source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + url: git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df category: main optional: false - name: grid-apps - version: 0.2.1.dev79+7d7ad60 + version: 0.2.0.post2.dev92+60cc4f1 manager: pip platform: win-64 dependencies: discretize: '>=0.12.0,<0.13.0' - geoapps-utils: 0.7.1.dev89+abb77df - geoh5py: 0.14.0a1.dev242+a7f9b631 + geoapps-utils: 0.7.1.dev100+f19fcbc + geoh5py: 0.14.0a1.dev268+77b6932a numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + url: git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df hash: - sha256: 7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + sha256: 60cc4f14053bf22013b89d53a6dbdf0c739ff2df source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@7d7ad6007a6e1e9dd87d684fa17c9183dd03c93d + url: git+https://github.com/MiraGeoscience/grid-apps.git@60cc4f14053bf22013b89d53a6dbdf0c739ff2df category: main optional: false - name: mira-simpeg - version: 0.25.0.2.dev21+ge1ba45a37 + version: 0.25.0.2.dev48+gf99e4a081 manager: pip platform: linux-64 dependencies: @@ -8512,16 +8512,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + url: git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 hash: - sha256: e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + sha256: f99e4a081f420af06e4722d3a0fe8163ae6c0390 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + url: git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 category: main optional: false - name: mira-simpeg - version: 0.25.0.2.dev21+ge1ba45a37 + version: 0.25.0.2.dev48+gf99e4a081 manager: pip platform: win-64 dependencies: @@ -8533,11 +8533,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + url: git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 hash: - sha256: e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + sha256: f99e4a081f420af06e4722d3a0fe8163ae6c0390 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@e1ba45a371563cac0a44ade5ce9d2d5337dc5d9e + url: git+https://github.com/MiraGeoscience/simpeg.git@f99e4a081f420af06e4722d3a0fe8163ae6c0390 category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index b79e11fe..2ac06cad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -94,13 +94,13 @@ trimesh = "^4.1.3" ## Pip dependencies from Git repositories #---------------------------------------- # geoh5py = {version = ">=0.14.0a, 0.14.*", source = "pypi", allow-prereleases = true} -geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "feature/uijson"} +geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"} # grid-apps = {version = ">=0.3.0a, 0.3.*", source = "pypi", allow-prereleases = true} -grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "feature/uijson"} +grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "develop"} # geoapps-utils = {version = ">=0.8.0a, 0.8.*", source = "pypi", allow-prereleases = true} -geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "feature/uijson"} +geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"} # mira-simpeg = {version = ">=0.25.0.2a, 0.25.0.*", source="pypi", allow-prereleases = true, extras = ["dask"]} mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "develop", extras = ["dask"]} From f5d96ca48d44b3c63f83a4f1f607a21bae1be5d2 Mon Sep 17 00:00:00 2001 From: domfournier Date: Wed, 26 Aug 2026 11:42:10 -0700 Subject: [PATCH 4/8] Add IntegerData as accepted type where needed. Augment unit test --- simpeg_drivers/components/topography.py | 4 +-- .../sensitivity_cutoff/options.py | 2 +- simpeg_drivers/electricals/base_2d.py | 4 +-- .../joint/joint_petrophysics/options.py | 5 ++-- simpeg_drivers/joint/joint_surveys/options.py | 6 ++-- simpeg_drivers/joint/options.py | 22 +++++++-------- simpeg_drivers/options.py | 28 +++++++++---------- simpeg_drivers/plate_simulation/driver.py | 4 +-- .../potential_fields/gravity/options.py | 4 +-- .../magnetic_scalar/options.py | 18 ++++++------ .../magnetic_vector/options.py | 18 ++++++------ .../magnetic_vector_pde/options.py | 20 ++++++------- tests/run_tests/driver_grav_test.py | 14 ++++++++-- 13 files changed, 77 insertions(+), 72 deletions(-) diff --git a/simpeg_drivers/components/topography.py b/simpeg_drivers/components/topography.py index 0d0bf910..e7509d75 100644 --- a/simpeg_drivers/components/topography.py +++ b/simpeg_drivers/components/topography.py @@ -157,9 +157,7 @@ def get_locations(self, entity: Entity) -> np.ndarray: elif isinstance(self.params.active_cells.topography, int | float): elev = np.ones_like(locs[:, 2]) * self.params.active_cells.topography else: - elev = ( - self.params.active_cells.topography.values - ) # Must be FloatData at this point + elev = (self.params.active_cells.topography.values).astype(float) if not np.all(locs[:, 2] == elev): locs[:, 2] = elev diff --git a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py index c72e1b90..e6abc5eb 100644 --- a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py +++ b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py @@ -13,7 +13,7 @@ from geoapps_utils.base import Options from geoh5py.data import FloatData -from geoh5py.groups import SimPEGGroup, UIJsonGroup +from geoh5py.groups import UIJsonGroup from geoh5py.objects import DrapeModel, Octree from pydantic import field_validator diff --git a/simpeg_drivers/electricals/base_2d.py b/simpeg_drivers/electricals/base_2d.py index 7c7be85e..75d4bc05 100644 --- a/simpeg_drivers/electricals/base_2d.py +++ b/simpeg_drivers/electricals/base_2d.py @@ -16,7 +16,7 @@ from typing import Any import numpy as np -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from geoh5py.objects import DrapeModel, Octree, PotentialElectrode from geoh5py.ui_json.ui_json import fetch_active_workspace from pydantic import AliasChoices, Field, field_validator, model_validator @@ -51,7 +51,7 @@ class Conductivity2DModelOptions(ModelOptions): """ model_type: ModelTypeEnum = ModelTypeEnum.conductivity - conductivity_model: float | FloatData | None = Field( + conductivity_model: float | FloatData | IntegerData | None = Field( None, validation_alias=AliasChoices("background_conductivity", "conductivity_model"), ) diff --git a/simpeg_drivers/joint/joint_petrophysics/options.py b/simpeg_drivers/joint/joint_petrophysics/options.py index 2e1a2488..32dba3cb 100644 --- a/simpeg_drivers/joint/joint_petrophysics/options.py +++ b/simpeg_drivers/joint/joint_petrophysics/options.py @@ -14,13 +14,12 @@ from pathlib import Path from typing import ClassVar -from geoh5py.data import FloatData, ReferencedData +from geoh5py.data import FloatData, IntegerData, ReferencedData from geoh5py.groups import SimPEGGroup from geoh5py.objects import Octree from simpeg_drivers import assets_path from simpeg_drivers.joint.options import BaseJointOptions, JointModelOptions -from simpeg_drivers.options import ModelOptions class JointPetrophysicsModelOptions(JointModelOptions): @@ -30,7 +29,7 @@ class JointPetrophysicsModelOptions(JointModelOptions): :param petrophysical: The reference geology data. """ - alpha_s: float | FloatData = 1.0 + alpha_s: float | FloatData | IntegerData = 1.0 petrophysical_model: ReferencedData diff --git a/simpeg_drivers/joint/joint_surveys/options.py b/simpeg_drivers/joint/joint_surveys/options.py index 0ae5eb04..a3f84166 100644 --- a/simpeg_drivers/joint/joint_surveys/options.py +++ b/simpeg_drivers/joint/joint_surveys/options.py @@ -15,7 +15,7 @@ from typing import ClassVar from geoapps_utils.run import fetch_driver_class_from_string -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from pydantic import model_validator from simpeg_drivers import assets_path @@ -33,8 +33,8 @@ class JointSurveysModelOptions(JointModelOptions): """ model_type: ModelTypeEnum | None = None - starting_model: float | FloatData | None = None - reference_model: float | FloatData | None = None + starting_model: float | FloatData | IntegerData | None = None + reference_model: float | FloatData | IntegerData | None = None class JointSurveysOptions(BaseJointOptions): diff --git a/simpeg_drivers/joint/options.py b/simpeg_drivers/joint/options.py index 0bcac3bb..3d9d8a79 100644 --- a/simpeg_drivers/joint/options.py +++ b/simpeg_drivers/joint/options.py @@ -11,7 +11,7 @@ from __future__ import annotations -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from geoh5py.groups import PropertyGroup, SimPEGGroup from pydantic import BaseModel, ConfigDict @@ -33,21 +33,21 @@ class JointModelOptions(ModelOptions): starting_model: None = None reference_model: None = None - lower_bound: float | FloatData | None = None - upper_bound: float | FloatData | None = None + lower_bound: float | FloatData | IntegerData | None = None + upper_bound: float | FloatData | IntegerData | None = None # Model values for regularization - alpha_s: float | FloatData | None | None = None - length_scale_x: float | FloatData | None = None - length_scale_y: float | FloatData | None = None - length_scale_z: float | FloatData | None = None + alpha_s: float | FloatData | IntegerData | None | None = None + length_scale_x: float | FloatData | IntegerData | None = None + length_scale_y: float | FloatData | IntegerData | None = None + length_scale_z: float | FloatData | IntegerData | None = None gradient_rotation: PropertyGroup | None = None # Model values for IRLS - s_norm: float | FloatData | None = None - x_norm: float | FloatData | None = None - y_norm: float | FloatData | None = None - z_norm: float | FloatData | None = None + s_norm: float | FloatData | IntegerData | None = None + x_norm: float | FloatData | IntegerData | None = None + y_norm: float | FloatData | IntegerData | None = None + z_norm: float | FloatData | IntegerData | None = None class DirectiveOptions(BaseModel): diff --git a/simpeg_drivers/options.py b/simpeg_drivers/options.py index 8e0e8185..477902f4 100644 --- a/simpeg_drivers/options.py +++ b/simpeg_drivers/options.py @@ -79,7 +79,7 @@ class ActiveCellsOptions(BaseModel): arbitrary_types_allowed=True, ) topography_object: Points | Grid2D | None = None - topography: FloatData | float | None = None + topography: FloatData | IntegerData | float | None = None active_model: BooleanData | IntegerData | None = None @model_validator(mode="before") @@ -261,25 +261,25 @@ class ModelOptions(BaseModel): ) # Model options - starting_model: float | FloatData - reference_model: float | FloatData | None = None - lower_bound: float | FloatData | None = None - upper_bound: float | FloatData | None = None + starting_model: float | FloatData | IntegerData + reference_model: float | FloatData | IntegerData | None = None + lower_bound: float | FloatData | IntegerData | None = None + upper_bound: float | FloatData | IntegerData | None = None # Model values for regularization - alpha_s: float | FloatData | None = 1.0 - length_scale_x: float | FloatData = 1.0 - length_scale_y: float | FloatData | None = 1.0 - length_scale_z: float | FloatData = 1.0 + alpha_s: float | FloatData | IntegerData | None = 1.0 + length_scale_x: float | FloatData | IntegerData = 1.0 + length_scale_y: float | FloatData | IntegerData | None = 1.0 + length_scale_z: float | FloatData | IntegerData = 1.0 gradient_rotation: PropertyGroup | None = None # Model values for IRLS - s_norm: float | FloatData | None = 0.0 - x_norm: float | FloatData = 2.0 - y_norm: float | FloatData | None = 2.0 - z_norm: float | FloatData = 2.0 + s_norm: float | FloatData | IntegerData | None = 0.0 + x_norm: float | FloatData | IntegerData = 2.0 + y_norm: float | FloatData | IntegerData | None = 2.0 + z_norm: float | FloatData | IntegerData = 2.0 - _gradient_orientations: list[FloatData] | None = None + _gradient_orientations: list[FloatData | IntegerData] | None = None @property def gradient_direction(self) -> FloatData | None: diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index ca37df06..a8489c0a 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -19,7 +19,7 @@ from geoapps_utils.base import Driver, get_logger from geoapps_utils.modelling.plates import Plate from geoapps_utils.utils.transformations import azimuth_to_unit_vector -from geoh5py.data import FloatData, ReferencedData +from geoh5py.data import FloatData, IntegerData, ReferencedData from geoh5py.groups import SimPEGGroup from geoh5py.objects import Octree, Points, Surface from geoh5py.ui_json import UIJson @@ -67,7 +67,7 @@ def __init__( self._plates: list[Plate] | None = None self._survey: Points | None = None self._mesh: Octree | None = None - self._model: FloatData | None = None + self._model: FloatData | IntegerData | None = None self._client: Client | bool = validate_client(client) self._workers: list[tuple[str]] = validate_workers(self._client, workers) self._simulation_driver: InversionDriver | None = None diff --git a/simpeg_drivers/potential_fields/gravity/options.py b/simpeg_drivers/potential_fields/gravity/options.py index a6ccef65..267b5462 100644 --- a/simpeg_drivers/potential_fields/gravity/options.py +++ b/simpeg_drivers/potential_fields/gravity/options.py @@ -14,7 +14,7 @@ from pathlib import Path from typing import ClassVar -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from simpeg_drivers import assets_path from simpeg_drivers.options import ( @@ -30,7 +30,7 @@ class GravityModelOptions(ModelOptions): ModelOptions class with defaulted reference model. """ - reference_model: float | FloatData | None = None + reference_model: float | FloatData | IntegerData | None = None class GravityForwardOptions(BaseForwardOptions): diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/options.py b/simpeg_drivers/potential_fields/magnetic_scalar/options.py index a229f61d..dfabe518 100644 --- a/simpeg_drivers/potential_fields/magnetic_scalar/options.py +++ b/simpeg_drivers/potential_fields/magnetic_scalar/options.py @@ -14,7 +14,7 @@ from pathlib import Path from typing import ClassVar -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from simpeg_drivers import assets_path from simpeg_drivers.options import ( @@ -30,8 +30,8 @@ class MagneticModelOptions(ModelOptions): ModelOptions class with defaulted lower bound. """ - reference_model: float | FloatData | None = None - lower_bound: float | FloatData | None = 0 + reference_model: float | FloatData | IntegerData | None = None + lower_bound: float | FloatData | IntegerData | None = 0 class MagneticForwardOptions(BaseForwardOptions): @@ -71,9 +71,9 @@ class MagneticForwardOptions(BaseForwardOptions): byy_channel_bool: bool = False byz_channel_bool: bool = False bzz_channel_bool: bool = False - inducing_field_strength: float | FloatData - inducing_field_inclination: float | FloatData - inducing_field_declination: float | FloatData + inducing_field_strength: float + inducing_field_inclination: float + inducing_field_declination: float models: MagneticModelOptions @@ -138,9 +138,9 @@ class MagneticInversionOptions(BaseInversionOptions): byy_uncertainty: float | FloatData | None = None byz_uncertainty: float | FloatData | None = None bzz_uncertainty: float | FloatData | None = None - inducing_field_strength: float | FloatData - inducing_field_inclination: float | FloatData - inducing_field_declination: float | FloatData + inducing_field_strength: float + inducing_field_inclination: float + inducing_field_declination: float models: MagneticModelOptions diff --git a/simpeg_drivers/potential_fields/magnetic_vector/options.py b/simpeg_drivers/potential_fields/magnetic_vector/options.py index f982f772..dff18e82 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/options.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/options.py @@ -14,7 +14,7 @@ from pathlib import Path from typing import ClassVar -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from simpeg_drivers import assets_path from simpeg_drivers.options import ( @@ -32,11 +32,11 @@ class VectorModelOptions(ModelOptions): """ lower_bound: Deprecated - reference_model: float | FloatData | None = None - starting_inclination: float | FloatData | None = None - starting_declination: float | FloatData | None = None - reference_inclination: float | FloatData | None = None - reference_declination: float | FloatData | None = None + reference_model: float | FloatData | IntegerData | None = None + starting_inclination: float | FloatData | IntegerData | None = None + starting_declination: float | FloatData | IntegerData | None = None + reference_inclination: float | FloatData | IntegerData | None = None + reference_declination: float | FloatData | IntegerData | None = None class MagneticVectorForwardOptions(BaseForwardOptions): @@ -75,9 +75,9 @@ class MagneticVectorForwardOptions(BaseForwardOptions): byy_channel_bool: bool = False byz_channel_bool: bool = False bzz_channel_bool: bool = False - inducing_field_strength: float | FloatData - inducing_field_inclination: float | FloatData - inducing_field_declination: float | FloatData + inducing_field_strength: float + inducing_field_inclination: float + inducing_field_declination: float models: VectorModelOptions diff --git a/simpeg_drivers/potential_fields/magnetic_vector_pde/options.py b/simpeg_drivers/potential_fields/magnetic_vector_pde/options.py index 1c74ca3a..ac22df7d 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector_pde/options.py +++ b/simpeg_drivers/potential_fields/magnetic_vector_pde/options.py @@ -14,7 +14,7 @@ from pathlib import Path from typing import ClassVar -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from simpeg_drivers import assets_path from simpeg_drivers.options import ( @@ -32,9 +32,9 @@ class VectorModelPDEOptions(ModelOptions): """ lower_bound: Deprecated - reference_model: float | FloatData | None = None - starting_inclination: float | FloatData | None = None - starting_declination: float | FloatData | None = None + reference_model: float | FloatData | IntegerData | None = None + starting_inclination: float | FloatData | IntegerData | None = None + starting_declination: float | FloatData | IntegerData | None = None class MagneticVectorPDEForwardOptions(BaseForwardOptions): @@ -61,9 +61,9 @@ class MagneticVectorPDEForwardOptions(BaseForwardOptions): by_channel_bool: bool = False bz_channel_bool: bool = False - inducing_field_strength: float | FloatData - inducing_field_inclination: float | FloatData - inducing_field_declination: float | FloatData + inducing_field_strength: float + inducing_field_inclination: float + inducing_field_declination: float models: VectorModelPDEOptions @@ -103,9 +103,9 @@ class MagneticVectorPDEInversionOptions(BaseInversionOptions): by_uncertainty: float | FloatData | None = None bz_uncertainty: float | FloatData | None = None - inducing_field_strength: float | FloatData - inducing_field_inclination: float | FloatData - inducing_field_declination: float | FloatData + inducing_field_strength: float + inducing_field_inclination: float + inducing_field_declination: float models: VectorModelPDEOptions directives: DirectiveOptions = DirectiveOptions(sens_wts_threshold=1e-3) diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py index 41918d48..0e6a6b43 100644 --- a/tests/run_tests/driver_grav_test.py +++ b/tests/run_tests/driver_grav_test.py @@ -109,10 +109,15 @@ def test_gravity_run( inds = (components.mesh.centroids[:, 0] > -35) & ( components.mesh.centroids[:, 0] < 35 ) - norms = np.ones(components.mesh.n_cells) * 2 + norms = np.full(components.mesh.n_cells, 2, dtype=int) norms[inds] = 0 gradient_norms = components.mesh.add_data({"norms": {"values": norms}}) - + length_scales = components.mesh.add_data( + {"lengths": {"values": np.ones(components.mesh.n_cells, dtype=int)}} + ) + reference = components.mesh.add_data( + {"reference": {"values": np.zeros(components.mesh.n_cells, dtype=int)}} + ) # Test mesh UBC ordered ind = np.argsort(components.mesh.octree_cells, order=["K", "J", "I"]) components.mesh.octree_cells = components.mesh.octree_cells[ind] @@ -133,6 +138,9 @@ def test_gravity_run( x_norm=gradient_norms, y_norm=gradient_norms, z_norm=gradient_norms, + length_scale_x=length_scales, + length_scale_y=length_scales, + length_scale_z=length_scales, gz_channel=gz, gz_uncertainty=2e-3, lower_bound=0.0, @@ -141,7 +149,7 @@ def test_gravity_run( percentile=100, starting_model=1e-4, topography_object=components.topography, - reference_model=0.0, + reference_model=reference, sens_wts_threshold=1.0, save_sensitivities=True, ) From 345a77fe6c0a0fdec7eff7cb4422d2b6d5827233 Mon Sep 17 00:00:00 2001 From: domfournier Date: Wed, 26 Aug 2026 11:48:34 -0700 Subject: [PATCH 5/8] Augment test for rotated angles as Ints --- tests/run_tests/driver_rotated_gradients_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run_tests/driver_rotated_gradients_test.py b/tests/run_tests/driver_rotated_gradients_test.py index c8752ef2..7ad932cc 100644 --- a/tests/run_tests/driver_rotated_gradients_test.py +++ b/tests/run_tests/driver_rotated_gradients_test.py @@ -121,8 +121,8 @@ def test_rotated_grad_run( topography = components.topography # Create property group with orientation - dip = np.ones(mesh.n_cells) * 70 - azimuth = np.ones(mesh.n_cells) * 60 + dip = np.full(mesh.n_cells, 70, dtype=int) + azimuth = np.full(mesh.n_cells, 60, dtype=int) data_list = mesh.add_data( { From cea1afad37ef278375338f82ea4e0a2cf52aa529 Mon Sep 17 00:00:00 2001 From: domfournier Date: Mon, 31 Aug 2026 09:17:25 -0700 Subject: [PATCH 6/8] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- simpeg_drivers/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpeg_drivers/options.py b/simpeg_drivers/options.py index 477902f4..39fa4947 100644 --- a/simpeg_drivers/options.py +++ b/simpeg_drivers/options.py @@ -282,7 +282,7 @@ class ModelOptions(BaseModel): _gradient_orientations: list[FloatData | IntegerData] | None = None @property - def gradient_direction(self) -> FloatData | None: + def gradient_direction(self) -> FloatData | IntegerData | None: if self.gradient_orientations is None: return None return self.gradient_orientations[0] From 3ee3dbb8f7bf5b9e73337bd2bd6801ee05f8561e Mon Sep 17 00:00:00 2001 From: domfournier Date: Mon, 31 Aug 2026 09:29:13 -0700 Subject: [PATCH 7/8] Multi fixes from review --- .../apparent_conductivity_inversion.ui.json | 65 +++++++++++++++---- simpeg_drivers/joint/options.py | 2 +- simpeg_drivers/options.py | 4 +- tests/run_tests/driver_ip_test.py | 8 ++- 4 files changed, 62 insertions(+), 17 deletions(-) diff --git a/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json b/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json index 5934987e..949ae31f 100644 --- a/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json @@ -73,7 +73,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -87,7 +90,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -104,7 +110,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -120,7 +129,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -151,7 +163,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -192,7 +207,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -205,7 +223,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -218,7 +239,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -231,14 +255,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -253,7 +283,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -271,7 +304,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -306,7 +342,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers/joint/options.py b/simpeg_drivers/joint/options.py index 3d9d8a79..8a09f04f 100644 --- a/simpeg_drivers/joint/options.py +++ b/simpeg_drivers/joint/options.py @@ -37,7 +37,7 @@ class JointModelOptions(ModelOptions): upper_bound: float | FloatData | IntegerData | None = None # Model values for regularization - alpha_s: float | FloatData | IntegerData | None | None = None + alpha_s: float | FloatData | IntegerData | None = None length_scale_x: float | FloatData | IntegerData | None = None length_scale_y: float | FloatData | IntegerData | None = None length_scale_z: float | FloatData | IntegerData | None = None diff --git a/simpeg_drivers/options.py b/simpeg_drivers/options.py index 477902f4..34716c18 100644 --- a/simpeg_drivers/options.py +++ b/simpeg_drivers/options.py @@ -320,7 +320,7 @@ class ConductivityModelOptions(ModelOptions): """ model_type: ModelTypeEnum = ModelTypeEnum.conductivity - conductivity_model: float | FloatData | None = Field( + conductivity_model: float | FloatData | IntegerData | None = Field( None, validation_alias=AliasChoices("background_conductivity", "conductivity_model"), ) @@ -657,4 +657,4 @@ class IPModelOptions(ConductivityModelOptions): ModelOptions class with defaulted lower bound. """ - lower_bound: float | FloatData | None = 0 + lower_bound: float | FloatData | IntegerData | None = 0 diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py index ca15138f..487eb95e 100644 --- a/tests/run_tests/driver_ip_test.py +++ b/tests/run_tests/driver_ip_test.py @@ -12,6 +12,7 @@ from pathlib import Path +import numpy as np from geoh5py.workspace import Workspace from simpeg_drivers.electricals.induced_polarization.three_dimensions.forward import ( @@ -92,13 +93,18 @@ def test_ip_3d_run( mesh = geoh5.get_entity("mesh")[0] topography = geoh5.get_entity("topography")[0] + # Test conductivity model as IntegerData + conductivity_model = mesh.add_data( + {"conductivity": {"values": np.full(mesh.n_cells, 1e2, dtype=int)}} + ) + # Run the inverse params = IP3DInversionOptions.build( geoh5=geoh5, mesh=mesh, topography_object=topography, data_object=potential.parent, - conductivity_model=1e2, + conductivity_model=conductivity_model, model_type="Resistivity (Ohm-m)", reference_model=1e-6, starting_model=1e-6, From c512a74ca370aa0dba7e3bc7900754a1a167b4cd Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 1 Sep 2026 13:14:16 -0700 Subject: [PATCH 8/8] More missing dataType changes --- .../joint_cross_gradient_inversion.ui.json | 20 +++++++++++++++---- .../uijson/tdem_inversion.ui.json | 20 +++++++++++++++---- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index 85f58707..18ea3cbc 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -252,7 +252,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -265,7 +268,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -278,7 +284,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -291,7 +300,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index 08f03dea..10ecbd1a 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -384,7 +384,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -402,7 +405,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -418,7 +424,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -434,7 +443,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true,