From 5d76aab33007b78b180635c23c712e54c734b659 Mon Sep 17 00:00:00 2001 From: benjamink Date: Thu, 25 Sep 2025 09:19:50 -0700 Subject: [PATCH 1/5] Update ui.json file for groupOptional --- .../uijson/plate_sweep.ui.json | 66 +++++++------------ 1 file changed, 22 insertions(+), 44 deletions(-) diff --git a/simpeg_drivers-assets/uijson/plate_sweep.ui.json b/simpeg_drivers-assets/uijson/plate_sweep.ui.json index be2e3811..99f5613e 100644 --- a/simpeg_drivers-assets/uijson/plate_sweep.ui.json +++ b/simpeg_drivers-assets/uijson/plate_sweep.ui.json @@ -9,7 +9,7 @@ "monitoring_directory": "", "template": { "main": true, - "group": "Options", + "group": "Base", "label": "Plate simulation", "groupType": [ "{55ed3daf-c192-4d4b-a439-60fa987fe2b8}", @@ -21,7 +21,7 @@ }, "workdir": { "main": true, - "group": "Options", + "group": "Base", "label": "Working directory", "fileDescription": [ "Directory" @@ -37,184 +37,162 @@ "background_start": { "main": true, "group": "Background", + "groupOptional": true, + "enabled": false, "label": "starting", - "value": 2000.0 + "value": 0.0 }, "background_stop": { "main": true, "group": "Background", - "optional": true, - "enabled": false, + "groupOptional": true, "label": "ending", - "value": 2000.0 + "value": 0.0 }, "background_count": { "main": true, "group": "Background", - "dependency": "background_stop", - "dependencyType": "enabled", - "enabled": false, + "groupOptional": true, "label": "number of samples", "value": 1 }, "overburden_start": { "main": true, "group": "Overburden", + "groupOptional": true, + "enabled": false, "label": "starting", "value": 8000.0 }, "overburden_stop": { "main": true, "group": "Overburden", - "optional": true, - "enabled": false, "label": "ending", "value": 8000.0 }, "overburden_count": { "main": true, "group": "Overburden", - "dependency": "overburden_stop", - "dependencyType": "enabled", - "enabled": false, "label": "number of samples", "value": 1 }, "thickness_start": { "main": true, "group": "Thickness", + "groupOptional": true, + "enabled": false, "label": "starting", "value": 200.0 }, "thickness_stop": { "main": true, "group": "Thickness", - "optional": true, - "enabled": false, "label": "ending", "value": 200.0 }, "thickness_count": { "main": true, "group": "Thickness", - "dependency": "thickness_stop", - "dependencyType": "enabled", - "enabled": false, "label": "number of samples", "value": 1 }, "plate_start": { "main": true, "group": "Plate", + "groupOptional": true, + "enabled": false, "label": "starting", "value": 20.0 }, "plate_stop": { "main": true, "group": "Plate", - "optional": true, - "enabled": false, "label": "ending", "value": 20.0 }, "plate_count": { "main": true, "group": "Plate", - "dependency": "plate_stop", - "dependencyType": "enabled", - "enabled": false, "label": "number of samples", "value": 1 }, "width_start": { "main": true, "group": "Width", + "groupOptional": true, + "enabled": false, "label": "starting", "value": 90.0 }, "width_stop": { "main": true, "group": "Width", - "optional": true, - "enabled": false, "label": "ending", "value": 90.0 }, "width_count": { "main": true, "group": "Width", - "dependency": "width_stop", - "dependencyType": "enabled", - "enabled": false, "label": "number of samples", "value": 1 }, "strike_length_start": { "main": true, "group": "Strike length", + "groupOptional": true, + "enabled": false, "label": "starting", "value": 800.0 }, "strike_length_stop": { "main": true, "group": "Strike length", - "optional": true, - "enabled": false, "label": "ending", "value": 800.0 }, "strike_length_count": { "main": true, "group": "Strike length", - "dependency": "strike_length_stop", - "dependencyType": "enabled", - "enabled": false, "label": "number of samples", "value": 1 }, "dip_length_start": { "main": true, "group": "Dip length", + "groupOptional": true, + "enabled": false, "label": "starting", "value": 800.0 }, "dip_length_stop": { "main": true, "group": "Dip length", - "optional": true, - "enabled": false, "label": "ending", "value": 800.0 }, "dip_length_count": { "main": true, "group": "Dip length", - "dependency": "dip_length_stop", - "dependencyType": "enabled", - "enabled": false, "label": "number of samples", "value": 1 }, "dip_start": { "main": true, "group": "Dip", + "groupOptional": true, + "enabled": false, "label": "starting", "value": 60.0 }, "dip_stop": { "main": true, "group": "Dip", - "optional": true, - "enabled": false, "label": "ending", "value": 60.0 }, "dip_count": { "main": true, "group": "Dip", - "dependency": "dip_stop", - "dependencyType": "enabled", - "enabled": false, "label": "number of samples", "value": 1 }, From ff504447e65267d7fba7602eee4573ccc9109829 Mon Sep 17 00:00:00 2001 From: benjamink Date: Fri, 26 Sep 2025 12:30:42 -0700 Subject: [PATCH 2/5] Following GEOPY-2474, the list of sweep params will include only those that are group optional enabled. This required augmenting the key/values dumped into the uuid_from_params to create a unique has for the worker run. --- .../plate_simulation/sweep/driver.py | 3 +- .../plate_simulation/sweep/options.py | 34 ++++++++++++++++++- tests/plate_simulation/runtest/sweep_test.py | 2 -- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index f59c7678..f0a785b3 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -100,7 +100,8 @@ def run(self): self.params.template.options["title"], ) for kwargs in trials: - uid = SweepOptions.uuid_from_params(kwargs) + options = dict(self.params.template_options, **kwargs) + uid = SweepOptions.uuid_from_params(options) kwargs.update({"out_group": str(self.out_group.uid)}) PlateSweepDriver.run_worker( uid, kwargs, self.workspace.h5file, self.params.workdir diff --git a/simpeg_drivers/plate_simulation/sweep/options.py b/simpeg_drivers/plate_simulation/sweep/options.py index 6473aaa0..90092bb9 100644 --- a/simpeg_drivers/plate_simulation/sweep/options.py +++ b/simpeg_drivers/plate_simulation/sweep/options.py @@ -16,6 +16,9 @@ import numpy as np from geoapps_utils.base import Options from geoh5py.groups import SimPEGGroup, UIJsonGroup +from geoh5py.shared import Entity +from geoh5py.shared.utils import stringify +from geoh5py.ui_json import InputFile from pydantic import BaseModel, field_serializer from simpeg_drivers import assets_path @@ -100,6 +103,7 @@ def collect_sweep(param: str) -> dict: } sweep_params = [k.removesuffix("_start") for k in options if "_start" in k] + options["sweeps"] = [collect_sweep(param) for param in sweep_params] workdir = options["workdir"] if isinstance(workdir, str): @@ -119,6 +123,24 @@ def trials(self) -> list[dict]: iterations = itertools.product(*[np.linspace(*s()) for s in self.sweeps]) return [dict(zip(names, i, strict=True)) for i in iterations] + @staticmethod + def all_hashable_options(options: dict): + ifile = InputFile(ui_json=options, validate=False) + exceptions = list(Options.model_fields) + ["version", "icon", "documentation"] + # TODO: add these to the Options fields with empty string defaults. + out = {k: v for k, v in ifile.data.items() if k not in exceptions} + for k, v in ifile.data.items(): + if isinstance(v, SimPEGGroup | UIJsonGroup): + out.pop(k) + out.update(SweepOptions.all_hashable_options(v.options)) + + return out + + @property + def template_options(self): + """Return a flat version of the template.options dictionary.""" + return stringify(SweepOptions.all_hashable_options(self.template.options)) + @staticmethod def uuid_from_params(params: dict) -> str: """ @@ -128,5 +150,15 @@ def uuid_from_params(params: dict) -> str: :returns: Unique but recoverable uuid file identifier string. """ - param_string = ",".join([f"{k}:{params[k]}" for k in sorted(params)]) + + def format_value(v): + if isinstance(v, float): + return f"{v:.4e}" + if isinstance(v, Entity): + return str(v.uid) + return v + + param_string = ",".join( + [f"{k}:{format_value(params[k])}" for k in sorted(params)] + ) return str(uuid.uuid5(uuid.NAMESPACE_DNS, param_string)) diff --git a/tests/plate_simulation/runtest/sweep_test.py b/tests/plate_simulation/runtest/sweep_test.py index fc6e1c45..d1e983fb 100644 --- a/tests/plate_simulation/runtest/sweep_test.py +++ b/tests/plate_simulation/runtest/sweep_test.py @@ -90,8 +90,6 @@ def test_sweep(tmp_path): ifile.data["plate_start"] = 500.0 ifile.data["plate_stop"] = 1000.0 ifile.data["plate_count"] = 2 - ifile.data["overburden_start"] = 100.0 - ifile.data["thickness_start"] = 20.0 ifile.data["out_group"] = None ifile.write_ui_json(name="plate_sweep.ui.json", path=tmp_path) From 01f9661a68845f237b272dded900b216d5b6bd3f Mon Sep 17 00:00:00 2001 From: benjamink Date: Mon, 29 Sep 2025 09:05:02 -0700 Subject: [PATCH 3/5] Update lock files --- .../py-3.10-linux-64-dev.conda.lock.yml | 14 +- environments/py-3.10-linux-64.conda.lock.yml | 8 +- .../py-3.10-win-64-dev.conda.lock.yml | 14 +- environments/py-3.10-win-64.conda.lock.yml | 8 +- .../py-3.11-linux-64-dev.conda.lock.yml | 16 +- environments/py-3.11-linux-64.conda.lock.yml | 8 +- .../py-3.11-win-64-dev.conda.lock.yml | 16 +- environments/py-3.11-win-64.conda.lock.yml | 8 +- .../py-3.12-linux-64-dev.conda.lock.yml | 16 +- environments/py-3.12-linux-64.conda.lock.yml | 8 +- .../py-3.12-win-64-dev.conda.lock.yml | 16 +- environments/py-3.12-win-64.conda.lock.yml | 8 +- py-3.10.conda-lock.yml | 144 ++++++++-------- py-3.11.conda-lock.yml | 160 +++++++++--------- py-3.12.conda-lock.yml | 160 +++++++++--------- 15 files changed, 302 insertions(+), 302 deletions(-) diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index 8d1c244f..00ad18af 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -20,7 +20,7 @@ dependencies: - async-lru=2.0.5=pyh29332c3_0 - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - - beautifulsoup4=4.13.5=pyha770c72_0 + - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 - bleach-with-css=6.2.0=h82add2a_4 - bokeh=3.6.3=pyhd8ed1ab_0 @@ -97,7 +97,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.17.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.7=pyhd8ed1ab_0 + - jupyterlab=4.4.9=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -156,7 +156,7 @@ dependencies: - llvm-openmp=21.1.0=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py310h89163eb_1 + - markupsafe=3.0.3=py310h3406613_0 - matplotlib-base=3.8.4=py310hef631a5_2 - matplotlib-inline=0.1.7=pyhd8ed1ab_1 - mccabe=0.7.0=pyhd8ed1ab_1 @@ -178,7 +178,7 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - ncurses=6.5=h2d0b736_3 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.4.5=pyhd8ed1ab_0 + - notebook=7.4.7=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.13.1=py310h5eaa309_0 - numpy=1.26.4=py310hb13e2d6_0 @@ -225,7 +225,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.10=8_cp310 - pytz=2025.2=pyhd8ed1ab_0 - - pyyaml=6.0.2=py310h89163eb_2 + - pyyaml=6.0.3=py310h3406613_0 - pyzmq=27.1.0=py310h4f33d48_0 - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 @@ -305,8 +305,8 @@ dependencies: - zstandard=0.25.0=py310h139afa4_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index a49dee4c..5bd791c8 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -95,7 +95,7 @@ dependencies: - libzlib=1.3.1=hb9d3cd8_2 - llvm-openmp=21.1.0=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py310h89163eb_1 + - markupsafe=3.0.3=py310h3406613_0 - matplotlib-base=3.8.4=py310hef631a5_2 - mccabe=0.7.0=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 @@ -131,7 +131,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.10=8_cp310 - pytz=2025.2=pyhd8ed1ab_0 - - pyyaml=6.0.2=py310h89163eb_2 + - pyyaml=6.0.3=py310h3406613_0 - readline=8.2=h8c095d6_2 - rtree=1.2.0=py310haf1e407_1 - scikit-learn=1.6.1=py310h27f47ee_0 @@ -166,8 +166,8 @@ dependencies: - zstandard=0.25.0=py310h139afa4_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index e14b7f94..077679b0 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -20,7 +20,7 @@ dependencies: - async-lru=2.0.5=pyh29332c3_0 - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - - beautifulsoup4=4.13.5=pyha770c72_0 + - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 - bleach-with-css=6.2.0=h82add2a_4 - bokeh=3.6.3=pyhd8ed1ab_0 @@ -97,7 +97,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.17.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.7=pyhd8ed1ab_0 + - jupyterlab=4.4.9=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -144,7 +144,7 @@ dependencies: - llvm-openmp=20.1.8=hfa2b4ca_2 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py310h38315fa_1 + - markupsafe=3.0.3=py310hdb0e946_0 - matplotlib-base=3.8.4=py310hadb10a8_2 - matplotlib-inline=0.1.7=pyhd8ed1ab_1 - mccabe=0.7.0=pyhd8ed1ab_1 @@ -163,7 +163,7 @@ dependencies: - nbconvert-pandoc=7.16.6=hed9df3c_0 - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.4.5=pyhd8ed1ab_0 + - notebook=7.4.7=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 @@ -210,7 +210,7 @@ dependencies: - pytz=2025.2=pyhd8ed1ab_0 - pywin32=311=py310h282bd7d_1 - pywinpty=2.0.15=py310h9e98ed7_0 - - pyyaml=6.0.2=py310h38315fa_2 + - pyyaml=6.0.3=py310hdb0e946_0 - pyzmq=27.1.0=py310h535538e_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 @@ -295,8 +295,8 @@ dependencies: - zstandard=0.25.0=py310h1637853_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index f86933fa..a58f73dd 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -82,7 +82,7 @@ dependencies: - libzlib=1.3.1=h2466b09_2 - llvm-openmp=20.1.8=hfa2b4ca_2 - locket=1.0.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py310h38315fa_1 + - markupsafe=3.0.3=py310hdb0e946_0 - matplotlib-base=3.8.4=py310hadb10a8_2 - mccabe=0.7.0=pyhd8ed1ab_1 - mkl=2024.2.2=h57928b3_16 @@ -115,7 +115,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.10=8_cp310 - pytz=2025.2=pyhd8ed1ab_0 - - pyyaml=6.0.2=py310h38315fa_2 + - pyyaml=6.0.3=py310hdb0e946_0 - rtree=1.2.0=py310h08d5ad2_1 - scikit-learn=1.6.1=py310hf2a6c47_0 - scipy=1.14.1=py310hbd0dde3_2 @@ -154,8 +154,8 @@ dependencies: - zstandard=0.25.0=py310h1637853_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index 719f2f90..e82081d5 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -20,7 +20,7 @@ dependencies: - async-lru=2.0.5=pyh29332c3_0 - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - - beautifulsoup4=4.13.5=pyha770c72_0 + - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 - bleach-with-css=6.2.0=h82add2a_4 - bokeh=3.6.3=pyhd8ed1ab_0 @@ -77,7 +77,7 @@ dependencies: - importlib_metadata=8.7.0=h40b2b14_1 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.30.1=pyh82676e8_0 - - ipython=9.5.0=pyhfa0c392_0 + - ipython=9.6.0=pyhfa0c392_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -99,7 +99,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.17.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.7=pyhd8ed1ab_0 + - jupyterlab=4.4.9=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -158,7 +158,7 @@ dependencies: - llvm-openmp=21.1.0=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py311h2dc5d0c_1 + - markupsafe=3.0.3=py311h3778330_0 - matplotlib-base=3.8.4=py311ha4ca890_2 - matplotlib-inline=0.1.7=pyhd8ed1ab_1 - mccabe=0.7.0=pyhd8ed1ab_1 @@ -180,7 +180,7 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - ncurses=6.5=h2d0b736_3 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.4.5=pyhd8ed1ab_0 + - notebook=7.4.7=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py311h7db5c69_0 - numpy=1.26.4=py311h64a7726_0 @@ -227,7 +227,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.11=8_cp311 - pytz=2025.2=pyhd8ed1ab_0 - - pyyaml=6.0.2=py311h2dc5d0c_2 + - pyyaml=6.0.3=py311h3778330_0 - pyzmq=27.1.0=py311h2315fbb_0 - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 @@ -308,8 +308,8 @@ dependencies: - zstandard=0.25.0=py311haee01d2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 33fd1d22..d41792aa 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -96,7 +96,7 @@ dependencies: - libzlib=1.3.1=hb9d3cd8_2 - llvm-openmp=21.1.0=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py311h2dc5d0c_1 + - markupsafe=3.0.3=py311h3778330_0 - matplotlib-base=3.8.4=py311ha4ca890_2 - mccabe=0.7.0=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 @@ -132,7 +132,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.11=8_cp311 - pytz=2025.2=pyhd8ed1ab_0 - - pyyaml=6.0.2=py311h2dc5d0c_2 + - pyyaml=6.0.3=py311h3778330_0 - readline=8.2=h8c095d6_2 - rtree=1.2.0=py311ha1603b9_1 - scikit-learn=1.6.1=py311h57cc02b_0 @@ -168,8 +168,8 @@ dependencies: - zstandard=0.25.0=py311haee01d2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index 49a9472d..c4b99d9f 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -20,7 +20,7 @@ dependencies: - async-lru=2.0.5=pyh29332c3_0 - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - - beautifulsoup4=4.13.5=pyha770c72_0 + - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 - bleach-with-css=6.2.0=h82add2a_4 - bokeh=3.6.3=pyhd8ed1ab_0 @@ -77,7 +77,7 @@ dependencies: - importlib_metadata=8.7.0=h40b2b14_1 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.30.1=pyh3521513_0 - - ipython=9.5.0=pyh6be1c34_0 + - ipython=9.6.0=pyh6be1c34_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -99,7 +99,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.17.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.7=pyhd8ed1ab_0 + - jupyterlab=4.4.9=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -146,7 +146,7 @@ dependencies: - llvm-openmp=20.1.8=hfa2b4ca_2 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py311h5082efb_1 + - markupsafe=3.0.3=py311h3f79411_0 - matplotlib-base=3.8.4=py311h9b31f6e_2 - matplotlib-inline=0.1.7=pyhd8ed1ab_1 - mccabe=0.7.0=pyhd8ed1ab_1 @@ -165,7 +165,7 @@ dependencies: - nbconvert-pandoc=7.16.6=hed9df3c_0 - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.4.5=pyhd8ed1ab_0 + - notebook=7.4.7=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py311hcf9f919_0 - numpy=1.26.4=py311h0b4df5a_0 @@ -212,7 +212,7 @@ dependencies: - pytz=2025.2=pyhd8ed1ab_0 - pywin32=311=py311hefeebc8_1 - pywinpty=2.0.15=py311hda3d55a_0 - - pyyaml=6.0.2=py311h5082efb_2 + - pyyaml=6.0.3=py311h3f79411_0 - pyzmq=27.1.0=py311hb77b9c8_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 @@ -298,8 +298,8 @@ dependencies: - zstandard=0.25.0=py311hf893f09_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 4aa211cd..b46b8271 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -83,7 +83,7 @@ dependencies: - libzlib=1.3.1=h2466b09_2 - llvm-openmp=20.1.8=hfa2b4ca_2 - locket=1.0.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py311h5082efb_1 + - markupsafe=3.0.3=py311h3f79411_0 - matplotlib-base=3.8.4=py311h9b31f6e_2 - mccabe=0.7.0=pyhd8ed1ab_1 - mkl=2024.2.2=h57928b3_16 @@ -116,7 +116,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.11=8_cp311 - pytz=2025.2=pyhd8ed1ab_0 - - pyyaml=6.0.2=py311h5082efb_2 + - pyyaml=6.0.3=py311h3f79411_0 - rtree=1.2.0=py311h44d53c4_1 - scikit-learn=1.6.1=py311hdcb8d17_0 - scipy=1.14.1=py311hf16d85f_2 @@ -156,8 +156,8 @@ dependencies: - zstandard=0.25.0=py311hf893f09_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed 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 df0dbd44..7be7af10 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -21,7 +21,7 @@ dependencies: - async-lru=2.0.5=pyh29332c3_0 - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - - beautifulsoup4=4.13.5=pyha770c72_0 + - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 - bleach-with-css=6.2.0=h82add2a_4 - bokeh=3.6.3=pyhd8ed1ab_0 @@ -79,7 +79,7 @@ dependencies: - importlib_metadata=8.7.0=h40b2b14_1 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.30.1=pyh82676e8_0 - - ipython=9.5.0=pyhfa0c392_0 + - ipython=9.6.0=pyhfa0c392_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -101,7 +101,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.17.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.7=pyhd8ed1ab_0 + - jupyterlab=4.4.9=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -160,7 +160,7 @@ dependencies: - llvm-openmp=21.1.0=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py312h178313f_1 + - markupsafe=3.0.3=py312h8a5da7c_0 - matplotlib-base=3.8.4=py312h20ab3a6_2 - matplotlib-inline=0.1.7=pyhd8ed1ab_1 - mccabe=0.7.0=pyhd8ed1ab_1 @@ -182,7 +182,7 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - ncurses=6.5=h2d0b736_3 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.4.5=pyhd8ed1ab_0 + - notebook=7.4.7=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312hf9745cd_0 - numpy=1.26.4=py312heda63a1_0 @@ -230,7 +230,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.12=8_cp312 - pytz=2025.2=pyhd8ed1ab_0 - - pyyaml=6.0.2=py312h178313f_2 + - pyyaml=6.0.3=py312h8a5da7c_0 - pyzmq=27.1.0=py312hfb55c3c_0 - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 @@ -311,8 +311,8 @@ dependencies: - zstandard=0.25.0=py312h5253ce2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 718e6d98..7d8ee317 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -96,7 +96,7 @@ dependencies: - libzlib=1.3.1=hb9d3cd8_2 - llvm-openmp=21.1.0=h4922eb0_0 - locket=1.0.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py312h178313f_1 + - markupsafe=3.0.3=py312h8a5da7c_0 - matplotlib-base=3.8.4=py312h20ab3a6_2 - mccabe=0.7.0=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 @@ -132,7 +132,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.12=8_cp312 - pytz=2025.2=pyhd8ed1ab_0 - - pyyaml=6.0.2=py312h178313f_2 + - pyyaml=6.0.3=py312h8a5da7c_0 - readline=8.2=h8c095d6_2 - rtree=1.2.0=py312h3ed4c40_1 - scikit-learn=1.6.1=py312h7a48858_0 @@ -168,8 +168,8 @@ dependencies: - zstandard=0.25.0=py312h5253ce2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed 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 43cc6aa7..12ead2aa 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -21,7 +21,7 @@ dependencies: - async-lru=2.0.5=pyh29332c3_0 - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - - beautifulsoup4=4.13.5=pyha770c72_0 + - beautifulsoup4=4.14.2=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 - bleach-with-css=6.2.0=h82add2a_4 - bokeh=3.6.3=pyhd8ed1ab_0 @@ -78,7 +78,7 @@ dependencies: - importlib_metadata=8.7.0=h40b2b14_1 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.30.1=pyh3521513_0 - - ipython=9.5.0=pyh6be1c34_0 + - ipython=9.6.0=pyh6be1c34_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -100,7 +100,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.17.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.7=pyhd8ed1ab_0 + - jupyterlab=4.4.9=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -147,7 +147,7 @@ dependencies: - llvm-openmp=20.1.8=hfa2b4ca_2 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py312h31fea79_1 + - markupsafe=3.0.3=py312h05f76fc_0 - matplotlib-base=3.8.4=py312hfee7060_2 - matplotlib-inline=0.1.7=pyhd8ed1ab_1 - mccabe=0.7.0=pyhd8ed1ab_1 @@ -166,7 +166,7 @@ dependencies: - nbconvert-pandoc=7.16.6=hed9df3c_0 - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.4.5=pyhd8ed1ab_0 + - notebook=7.4.7=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312h72972c8_0 - numpy=1.26.4=py312h8753938_0 @@ -214,7 +214,7 @@ dependencies: - pytz=2025.2=pyhd8ed1ab_0 - pywin32=311=py312h829343e_1 - pywinpty=2.0.15=py312h275cf98_0 - - pyyaml=6.0.2=py312h31fea79_2 + - pyyaml=6.0.3=py312h05f76fc_0 - pyzmq=27.1.0=py312hbb5da91_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 @@ -300,8 +300,8 @@ dependencies: - zstandard=0.25.0=py312he5662c2_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 4f7da2cc..c2ee29bc 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -83,7 +83,7 @@ dependencies: - libzlib=1.3.1=h2466b09_2 - llvm-openmp=20.1.8=hfa2b4ca_2 - locket=1.0.0=pyhd8ed1ab_0 - - markupsafe=3.0.2=py312h31fea79_1 + - markupsafe=3.0.3=py312h05f76fc_0 - matplotlib-base=3.8.4=py312hfee7060_2 - mccabe=0.7.0=pyhd8ed1ab_1 - mkl=2024.2.2=h57928b3_16 @@ -116,7 +116,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.12=8_cp312 - pytz=2025.2=pyhd8ed1ab_0 - - pyyaml=6.0.2=py312h31fea79_2 + - pyyaml=6.0.3=py312h05f76fc_0 - rtree=1.2.0=py312h50e5f8f_1 - scikit-learn=1.6.1=py312h816cc57_0 - scipy=1.14.1=py312h337df96_2 @@ -156,8 +156,8 @@ dependencies: - zstandard=0.25.0=py312he5662c2_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@6e8d69f8a47b2c4419efa243e2f2087e649eebed diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 05e167bc..9200ba39 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -404,31 +404,31 @@ package: category: dev optional: true - name: beautifulsoup4 - version: 4.13.5 + version: 4.14.2 manager: conda platform: linux-64 dependencies: python: '>=3.10' soupsieve: '>=1.2' typing-extensions: '' - url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.13.5-pyha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.14.2-pyha770c72_0.conda hash: - md5: de0fd9702fd4c1186e930b8c35af6b6b - sha256: d2124c0ea13527c7f54582269b3ae19541141a3740d6d779e7aa95aa82eaf561 + md5: 749ebebabc2cae99b2e5b3edd04c6ca2 + sha256: b949bd0121bb1eabc282c4de0551cc162b621582ee12b415e6f8297398e3b3b4 category: dev optional: true - name: beautifulsoup4 - version: 4.13.5 + version: 4.14.2 manager: conda platform: win-64 dependencies: python: '>=3.10' soupsieve: '>=1.2' typing-extensions: '' - url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.13.5-pyha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.14.2-pyha770c72_0.conda hash: - md5: de0fd9702fd4c1186e930b8c35af6b6b - sha256: d2124c0ea13527c7f54582269b3ae19541141a3740d6d779e7aa95aa82eaf561 + md5: 749ebebabc2cae99b2e5b3edd04c6ca2 + sha256: b949bd0121bb1eabc282c4de0551cc162b621582ee12b415e6f8297398e3b3b4 category: dev optional: true - name: bleach @@ -2748,7 +2748,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.4.7 + version: 4.4.9 manager: conda platform: linux-64 dependencies: @@ -2768,14 +2768,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.7-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.9-pyhd8ed1ab_0.conda hash: - md5: 460d51bb21b7a4c4b6e100c824405fbb - sha256: 042bdb981ad5394530bee8329a10c76b9e17c12651d15a885d68e2cbbfef6869 + md5: 6fcc0ffe96c13a864ec6a1defc830526 + sha256: 79c5b7280b7de7019bb45d9ad6b2131fc03cae7dcca9a8d48e04fbc43627a8c0 category: dev optional: true - name: jupyterlab - version: 4.4.7 + version: 4.4.9 manager: conda platform: win-64 dependencies: @@ -2795,10 +2795,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.7-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.9-pyhd8ed1ab_0.conda hash: - md5: 460d51bb21b7a4c4b6e100c824405fbb - sha256: 042bdb981ad5394530bee8329a10c76b9e17c12651d15a885d68e2cbbfef6869 + md5: 6fcc0ffe96c13a864ec6a1defc830526 + sha256: 79c5b7280b7de7019bb45d9ad6b2131fc03cae7dcca9a8d48e04fbc43627a8c0 category: dev optional: true - name: jupyterlab_pygments @@ -4280,34 +4280,34 @@ package: category: dev optional: true - name: markupsafe - version: 3.0.2 + version: 3.0.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://repo.prefix.dev/conda-forge/linux-64/markupsafe-3.0.2-py310h89163eb_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/markupsafe-3.0.3-py310h3406613_0.conda hash: - md5: 8ce3f0332fd6de0d737e2911d329523f - sha256: 0bed20ec27dcbcaf04f02b2345358e1161fb338f8423a4ada1cf0f4d46918741 + md5: 8854df4fb4e37cc3ea0a024e48c9c180 + sha256: b3894b37cab530d1adab5b9ce39a1b9f28040403cc0042b77e04a2f227a447de category: main optional: false - name: markupsafe - version: 3.0.2 + version: 3.0.3 manager: conda platform: win-64 dependencies: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/markupsafe-3.0.2-py310h38315fa_1.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/markupsafe-3.0.3-py310hdb0e946_0.conda hash: - md5: 79dfc050ae5a7dd4e63e392c984e2576 - sha256: deb8505b7ef76d363174d133e2ff814ae75b91ac4c3ae5550a7686897392f4d0 + md5: 1fdd2255424eaf0d5e707c205ace2c30 + sha256: 87203ea8bbe265ebabb16673c9442d2097e1b405dc70df49d6920730e7be6e74 category: main optional: false - name: matplotlib-base @@ -4926,37 +4926,37 @@ package: category: dev optional: true - name: notebook - version: 7.4.5 + version: 7.4.7 manager: conda platform: linux-64 dependencies: jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.4.5,<4.5' + jupyterlab: '>=4.4.9,<4.5' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' - python: '>=3.9' + python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.5-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.7-pyhd8ed1ab_0.conda hash: - md5: 28062c17cdb444388c00903eaec1ba0e - sha256: ea9d7058d862530755abeb2ee8f0152453cf630b024c73906f689ca1c297cd79 + md5: 8265e246510553a4bcec1af4378d3c96 + sha256: 9d785a993dd149cae89382e24dfc234bf0295d310a34ca8288818c401c097d40 category: dev optional: true - name: notebook - version: 7.4.5 + version: 7.4.7 manager: conda platform: win-64 dependencies: jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.4.5,<4.5' + jupyterlab: '>=4.4.9,<4.5' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' - python: '>=3.9' + python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.5-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.7-pyhd8ed1ab_0.conda hash: - md5: 28062c17cdb444388c00903eaec1ba0e - sha256: ea9d7058d862530755abeb2ee8f0152453cf630b024c73906f689ca1c297cd79 + md5: 8265e246510553a4bcec1af4378d3c96 + sha256: 9d785a993dd149cae89382e24dfc234bf0295d310a34ca8288818c401c097d40 category: dev optional: true - name: notebook-shim @@ -6331,36 +6331,36 @@ package: category: dev optional: true - name: pyyaml - version: 6.0.2 + version: 6.0.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* yaml: '>=0.2.5,<0.3.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/pyyaml-6.0.2-py310h89163eb_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pyyaml-6.0.3-py310h3406613_0.conda hash: - md5: fd343408e64cf1e273ab7c710da374db - sha256: 5fba7f5babcac872c72f6509c25331bcfac4f8f5031f0102530a41b41336fce6 + md5: bc058b3b89fcb525bb4977832aa52014 + sha256: 9b5c6ff9111ac035f18d5e625bcaa6c076e2e64a6f3c8e3f83f5fe2b03bda78d category: main optional: false - name: pyyaml - version: 6.0.2 + version: 6.0.3 manager: conda platform: win-64 dependencies: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' yaml: '>=0.2.5,<0.3.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/pyyaml-6.0.2-py310h38315fa_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/pyyaml-6.0.3-py310hdb0e946_0.conda hash: - md5: 9986c3731bb820db0830dd0825c26cf9 - sha256: 49dd492bdf2c479118ca9d61a59ce259594853d367a1a0548926f41a6e734724 + md5: c6c1bf08ce99a6f5dc7fdb155b088b26 + sha256: a2f80973dae258443b33a07266de8b8a7c9bf91cda41d5a3a907ce9553d79b0b category: main optional: false - name: pyzmq @@ -8569,41 +8569,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev100+af0d42f + version: 0.6.0a1.dev103+1398046 manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev121+48770d12 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca hash: - sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 + sha256: 13980469f5548c3dcbd2bd208b232bf02a2f68ca source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev100+af0d42f + version: 0.6.0a1.dev103+1398046 manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev121+48770d12 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca hash: - sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 + sha256: 13980469f5548c3dcbd2bd208b232bf02a2f68ca source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca category: main optional: false - name: geoh5py - version: 0.12.0a2.dev121+48770d12 + version: 0.12.0a2.dev124+3d7c550d manager: pip platform: linux-64 dependencies: @@ -8612,16 +8612,16 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 hash: - sha256: 48770d12988c340208efa22065022c34cd618ea9 + sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev121+48770d12 + version: 0.12.0a2.dev124+3d7c550d manager: pip platform: win-64 dependencies: @@ -8630,12 +8630,12 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 hash: - sha256: 48770d12988c340208efa22065022c34cd618ea9 + sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 category: main optional: false - name: grid-apps @@ -8644,8 +8644,8 @@ package: platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev100+af0d42f - geoh5py: 0.12.0a2.dev121+48770d12 + geoapps-utils: 0.6.0a1.dev103+1398046 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8663,8 +8663,8 @@ package: platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev100+af0d42f - geoh5py: 0.12.0a2.dev121+48770d12 + geoapps-utils: 0.6.0a1.dev103+1398046 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 45ce992b..99f3a559 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -402,31 +402,31 @@ package: category: dev optional: true - name: beautifulsoup4 - version: 4.13.5 + version: 4.14.2 manager: conda platform: linux-64 dependencies: python: '>=3.10' soupsieve: '>=1.2' typing-extensions: '' - url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.13.5-pyha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.14.2-pyha770c72_0.conda hash: - md5: de0fd9702fd4c1186e930b8c35af6b6b - sha256: d2124c0ea13527c7f54582269b3ae19541141a3740d6d779e7aa95aa82eaf561 + md5: 749ebebabc2cae99b2e5b3edd04c6ca2 + sha256: b949bd0121bb1eabc282c4de0551cc162b621582ee12b415e6f8297398e3b3b4 category: dev optional: true - name: beautifulsoup4 - version: 4.13.5 + version: 4.14.2 manager: conda platform: win-64 dependencies: python: '>=3.10' soupsieve: '>=1.2' typing-extensions: '' - url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.13.5-pyha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.14.2-pyha770c72_0.conda hash: - md5: de0fd9702fd4c1186e930b8c35af6b6b - sha256: d2124c0ea13527c7f54582269b3ae19541141a3740d6d779e7aa95aa82eaf561 + md5: 749ebebabc2cae99b2e5b3edd04c6ca2 + sha256: b949bd0121bb1eabc282c4de0551cc162b621582ee12b415e6f8297398e3b3b4 category: dev optional: true - name: bleach @@ -2062,7 +2062,7 @@ package: category: dev optional: true - name: ipython - version: 9.5.0 + version: 9.6.0 manager: conda platform: linux-64 dependencies: @@ -2080,14 +2080,14 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.5.0-pyhfa0c392_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.6.0-pyhfa0c392_0.conda hash: - md5: c0916cc4b733577cd41df93884d857b0 - sha256: e9ca009d3aab9d8a85f0241d6ada2c7fbc84072008e95f803fa59da3294aa863 + md5: ad6641ef96dd7872acbb802fa3fcb8d1 + sha256: 5b679431867704b46c0f412de1a4963bf2c9b65e55a325a22c4624f88b939453 category: dev optional: true - name: ipython - version: 9.5.0 + version: 9.6.0 manager: conda platform: win-64 dependencies: @@ -2105,10 +2105,10 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.5.0-pyh6be1c34_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.6.0-pyh6be1c34_0.conda hash: - md5: aec1868dd4cbe028b2c8cb11377895a6 - sha256: 658c547dafb10cd0989f2cdf72f8ee9fe8f66240307b64555ee43f6908e9d0ad + md5: ee8541586a0ba8824b5072a540bcc016 + sha256: 0ff7971573863a912ee397c5696f551f4d1a6fb77db59947f6aee4ba04aa25fe category: dev optional: true - name: ipython_genutils @@ -2800,7 +2800,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.4.7 + version: 4.4.9 manager: conda platform: linux-64 dependencies: @@ -2820,14 +2820,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.7-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.9-pyhd8ed1ab_0.conda hash: - md5: 460d51bb21b7a4c4b6e100c824405fbb - sha256: 042bdb981ad5394530bee8329a10c76b9e17c12651d15a885d68e2cbbfef6869 + md5: 6fcc0ffe96c13a864ec6a1defc830526 + sha256: 79c5b7280b7de7019bb45d9ad6b2131fc03cae7dcca9a8d48e04fbc43627a8c0 category: dev optional: true - name: jupyterlab - version: 4.4.7 + version: 4.4.9 manager: conda platform: win-64 dependencies: @@ -2847,10 +2847,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.7-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.9-pyhd8ed1ab_0.conda hash: - md5: 460d51bb21b7a4c4b6e100c824405fbb - sha256: 042bdb981ad5394530bee8329a10c76b9e17c12651d15a885d68e2cbbfef6869 + md5: 6fcc0ffe96c13a864ec6a1defc830526 + sha256: 79c5b7280b7de7019bb45d9ad6b2131fc03cae7dcca9a8d48e04fbc43627a8c0 category: dev optional: true - name: jupyterlab_pygments @@ -4332,34 +4332,34 @@ package: category: dev optional: true - name: markupsafe - version: 3.0.2 + version: 3.0.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* - url: https://repo.prefix.dev/conda-forge/linux-64/markupsafe-3.0.2-py311h2dc5d0c_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/markupsafe-3.0.3-py311h3778330_0.conda hash: - md5: 6565a715337ae279e351d0abd8ffe88a - sha256: 0291d90706ac6d3eea73e66cd290ef6d805da3fad388d1d476b8536ec92ca9a8 + md5: 0954f1a6a26df4a510b54f73b2a0345c + sha256: 66c072c37aefa046f3fd4ca69978429421ef9e8a8572e19de534272a6482e997 category: main optional: false - name: markupsafe - version: 3.0.2 + version: 3.0.3 manager: conda platform: win-64 dependencies: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/markupsafe-3.0.2-py311h5082efb_1.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/markupsafe-3.0.3-py311h3f79411_0.conda hash: - md5: c1f2ddad665323278952a453912dc3bd - sha256: 6f756e13ccf1a521d3960bd3cadddf564e013e210eaeced411c5259f070da08e + md5: f04c6970b6cce548de53b43f6be06586 + sha256: 975a1dcbdc0ced5af5bab681ec50406cf46f04e99c2aecc2f6b684497287cd7e category: main optional: false - name: matplotlib-base @@ -4978,37 +4978,37 @@ package: category: dev optional: true - name: notebook - version: 7.4.5 + version: 7.4.7 manager: conda platform: linux-64 dependencies: jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.4.5,<4.5' + jupyterlab: '>=4.4.9,<4.5' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' - python: '>=3.9' + python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.5-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.7-pyhd8ed1ab_0.conda hash: - md5: 28062c17cdb444388c00903eaec1ba0e - sha256: ea9d7058d862530755abeb2ee8f0152453cf630b024c73906f689ca1c297cd79 + md5: 8265e246510553a4bcec1af4378d3c96 + sha256: 9d785a993dd149cae89382e24dfc234bf0295d310a34ca8288818c401c097d40 category: dev optional: true - name: notebook - version: 7.4.5 + version: 7.4.7 manager: conda platform: win-64 dependencies: jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.4.5,<4.5' + jupyterlab: '>=4.4.9,<4.5' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' - python: '>=3.9' + python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.5-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.7-pyhd8ed1ab_0.conda hash: - md5: 28062c17cdb444388c00903eaec1ba0e - sha256: ea9d7058d862530755abeb2ee8f0152453cf630b024c73906f689ca1c297cd79 + md5: 8265e246510553a4bcec1af4378d3c96 + sha256: 9d785a993dd149cae89382e24dfc234bf0295d310a34ca8288818c401c097d40 category: dev optional: true - name: notebook-shim @@ -6385,36 +6385,36 @@ package: category: dev optional: true - name: pyyaml - version: 6.0.2 + version: 6.0.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* yaml: '>=0.2.5,<0.3.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/pyyaml-6.0.2-py311h2dc5d0c_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pyyaml-6.0.3-py311h3778330_0.conda hash: - md5: 014417753f948da1f70d132b2de573be - sha256: d107ad62ed5c62764fba9400f2c423d89adf917d687c7f2e56c3bfed605fb5b3 + md5: 707c3d23f2476d3bfde8345b4e7d7853 + sha256: 7dc5c27c0c23474a879ef5898ed80095d26de7f89f4720855603c324cca19355 category: main optional: false - name: pyyaml - version: 6.0.2 + version: 6.0.3 manager: conda platform: win-64 dependencies: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' yaml: '>=0.2.5,<0.3.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/pyyaml-6.0.2-py311h5082efb_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/pyyaml-6.0.3-py311h3f79411_0.conda hash: - md5: e474ba674d780f0fa3b979ae9e81ba91 - sha256: 6095e1d58c666f6a06c55338df09485eac34c76e43d92121d5786794e195aa4d + md5: 4e9b677d70d641f233b29d5eab706e20 + sha256: 22dcc6c6779e5bd970a7f5208b871c02bf4985cf4d827d479c4a492ced8ce577 category: main optional: false - name: pyzmq @@ -8654,41 +8654,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev100+af0d42f + version: 0.6.0a1.dev103+1398046 manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev121+48770d12 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca hash: - sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 + sha256: 13980469f5548c3dcbd2bd208b232bf02a2f68ca source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev100+af0d42f + version: 0.6.0a1.dev103+1398046 manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev121+48770d12 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca hash: - sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 + sha256: 13980469f5548c3dcbd2bd208b232bf02a2f68ca source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca category: main optional: false - name: geoh5py - version: 0.12.0a2.dev121+48770d12 + version: 0.12.0a2.dev124+3d7c550d manager: pip platform: linux-64 dependencies: @@ -8697,16 +8697,16 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 hash: - sha256: 48770d12988c340208efa22065022c34cd618ea9 + sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev121+48770d12 + version: 0.12.0a2.dev124+3d7c550d manager: pip platform: win-64 dependencies: @@ -8715,12 +8715,12 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 hash: - sha256: 48770d12988c340208efa22065022c34cd618ea9 + sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 category: main optional: false - name: grid-apps @@ -8729,8 +8729,8 @@ package: platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev100+af0d42f - geoh5py: 0.12.0a2.dev121+48770d12 + geoapps-utils: 0.6.0a1.dev103+1398046 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8748,8 +8748,8 @@ package: platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev100+af0d42f - geoh5py: 0.12.0a2.dev121+48770d12 + geoapps-utils: 0.6.0a1.dev103+1398046 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index a8698989..1ba27a44 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -428,31 +428,31 @@ package: category: dev optional: true - name: beautifulsoup4 - version: 4.13.5 + version: 4.14.2 manager: conda platform: linux-64 dependencies: python: '>=3.10' soupsieve: '>=1.2' typing-extensions: '' - url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.13.5-pyha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.14.2-pyha770c72_0.conda hash: - md5: de0fd9702fd4c1186e930b8c35af6b6b - sha256: d2124c0ea13527c7f54582269b3ae19541141a3740d6d779e7aa95aa82eaf561 + md5: 749ebebabc2cae99b2e5b3edd04c6ca2 + sha256: b949bd0121bb1eabc282c4de0551cc162b621582ee12b415e6f8297398e3b3b4 category: dev optional: true - name: beautifulsoup4 - version: 4.13.5 + version: 4.14.2 manager: conda platform: win-64 dependencies: python: '>=3.10' soupsieve: '>=1.2' typing-extensions: '' - url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.13.5-pyha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/beautifulsoup4-4.14.2-pyha770c72_0.conda hash: - md5: de0fd9702fd4c1186e930b8c35af6b6b - sha256: d2124c0ea13527c7f54582269b3ae19541141a3740d6d779e7aa95aa82eaf561 + md5: 749ebebabc2cae99b2e5b3edd04c6ca2 + sha256: b949bd0121bb1eabc282c4de0551cc162b621582ee12b415e6f8297398e3b3b4 category: dev optional: true - name: bleach @@ -2101,7 +2101,7 @@ package: category: dev optional: true - name: ipython - version: 9.5.0 + version: 9.6.0 manager: conda platform: linux-64 dependencies: @@ -2119,14 +2119,14 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.5.0-pyhfa0c392_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.6.0-pyhfa0c392_0.conda hash: - md5: c0916cc4b733577cd41df93884d857b0 - sha256: e9ca009d3aab9d8a85f0241d6ada2c7fbc84072008e95f803fa59da3294aa863 + md5: ad6641ef96dd7872acbb802fa3fcb8d1 + sha256: 5b679431867704b46c0f412de1a4963bf2c9b65e55a325a22c4624f88b939453 category: dev optional: true - name: ipython - version: 9.5.0 + version: 9.6.0 manager: conda platform: win-64 dependencies: @@ -2144,10 +2144,10 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.5.0-pyh6be1c34_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.6.0-pyh6be1c34_0.conda hash: - md5: aec1868dd4cbe028b2c8cb11377895a6 - sha256: 658c547dafb10cd0989f2cdf72f8ee9fe8f66240307b64555ee43f6908e9d0ad + md5: ee8541586a0ba8824b5072a540bcc016 + sha256: 0ff7971573863a912ee397c5696f551f4d1a6fb77db59947f6aee4ba04aa25fe category: dev optional: true - name: ipython_genutils @@ -2839,7 +2839,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.4.7 + version: 4.4.9 manager: conda platform: linux-64 dependencies: @@ -2859,14 +2859,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.7-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.9-pyhd8ed1ab_0.conda hash: - md5: 460d51bb21b7a4c4b6e100c824405fbb - sha256: 042bdb981ad5394530bee8329a10c76b9e17c12651d15a885d68e2cbbfef6869 + md5: 6fcc0ffe96c13a864ec6a1defc830526 + sha256: 79c5b7280b7de7019bb45d9ad6b2131fc03cae7dcca9a8d48e04fbc43627a8c0 category: dev optional: true - name: jupyterlab - version: 4.4.7 + version: 4.4.9 manager: conda platform: win-64 dependencies: @@ -2886,10 +2886,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.7-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.9-pyhd8ed1ab_0.conda hash: - md5: 460d51bb21b7a4c4b6e100c824405fbb - sha256: 042bdb981ad5394530bee8329a10c76b9e17c12651d15a885d68e2cbbfef6869 + md5: 6fcc0ffe96c13a864ec6a1defc830526 + sha256: 79c5b7280b7de7019bb45d9ad6b2131fc03cae7dcca9a8d48e04fbc43627a8c0 category: dev optional: true - name: jupyterlab_pygments @@ -4371,34 +4371,34 @@ package: category: dev optional: true - name: markupsafe - version: 3.0.2 + version: 3.0.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/markupsafe-3.0.2-py312h178313f_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/markupsafe-3.0.3-py312h8a5da7c_0.conda hash: - md5: eb227c3e0bf58f5bd69c0532b157975b - sha256: 4a6bf68d2a2b669fecc9a4a009abd1cf8e72c2289522ff00d81b5a6e51ae78f5 + md5: f775a43412f7f3d7ed218113ad233869 + sha256: f77f9f1a4da45cbc8792d16b41b6f169f649651a68afdc10b2da9da12b9aa42b category: main optional: false - name: markupsafe - version: 3.0.2 + version: 3.0.3 manager: conda platform: win-64 dependencies: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/markupsafe-3.0.2-py312h31fea79_1.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/markupsafe-3.0.3-py312h05f76fc_0.conda hash: - md5: 944fdd848abfbd6929e57c790b8174dd - sha256: bbb9595fe72231a8fbc8909cfa479af93741ecd2d28dfe37f8f205fef5df2217 + md5: 9a50d5e7b4f2bf5db9790bbe9421cdf8 + sha256: db1d772015ef052fedb3b4e7155b13446b49431a0f8c54c56ca6f82e1d4e258f category: main optional: false - name: matplotlib-base @@ -5017,37 +5017,37 @@ package: category: dev optional: true - name: notebook - version: 7.4.5 + version: 7.4.7 manager: conda platform: linux-64 dependencies: jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.4.5,<4.5' + jupyterlab: '>=4.4.9,<4.5' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' - python: '>=3.9' + python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.5-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.7-pyhd8ed1ab_0.conda hash: - md5: 28062c17cdb444388c00903eaec1ba0e - sha256: ea9d7058d862530755abeb2ee8f0152453cf630b024c73906f689ca1c297cd79 + md5: 8265e246510553a4bcec1af4378d3c96 + sha256: 9d785a993dd149cae89382e24dfc234bf0295d310a34ca8288818c401c097d40 category: dev optional: true - name: notebook - version: 7.4.5 + version: 7.4.7 manager: conda platform: win-64 dependencies: jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.4.5,<4.5' + jupyterlab: '>=4.4.9,<4.5' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' - python: '>=3.9' + python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.5-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.4.7-pyhd8ed1ab_0.conda hash: - md5: 28062c17cdb444388c00903eaec1ba0e - sha256: ea9d7058d862530755abeb2ee8f0152453cf630b024c73906f689ca1c297cd79 + md5: 8265e246510553a4bcec1af4378d3c96 + sha256: 9d785a993dd149cae89382e24dfc234bf0295d310a34ca8288818c401c097d40 category: dev optional: true - name: notebook-shim @@ -6450,36 +6450,36 @@ package: category: dev optional: true - name: pyyaml - version: 6.0.2 + version: 6.0.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* yaml: '>=0.2.5,<0.3.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/pyyaml-6.0.2-py312h178313f_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pyyaml-6.0.3-py312h8a5da7c_0.conda hash: - md5: cf2485f39740de96e2a7f2bb18ed2fee - sha256: 159cba13a93b3fe084a1eb9bda0a07afc9148147647f0d437c3c3da60980503b + md5: fba10c2007c8b06f77c5a23ce3a635ad + sha256: 1b3dc4c25c83093fff08b86a3574bc6b94ba355c8eba1f35d805c5e256455fc7 category: main optional: false - name: pyyaml - version: 6.0.2 + version: 6.0.3 manager: conda platform: win-64 dependencies: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' yaml: '>=0.2.5,<0.3.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/pyyaml-6.0.2-py312h31fea79_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/pyyaml-6.0.3-py312h05f76fc_0.conda hash: - md5: ba00a2e5059c1fde96459858537cc8f5 - sha256: 76fec03ef7e67e37724873e1f805131fb88efb57f19e9a77b4da616068ef5c28 + md5: 4a68f80fbf85499f093101cc17ffbab7 + sha256: 54d04e61d17edffeba1e5cad45f10f272a016b6feec1fa8fa6af364d84a7b4fc category: main optional: false - name: pyzmq @@ -8721,41 +8721,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev100+af0d42f + version: 0.6.0a1.dev103+1398046 manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev121+48770d12 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca hash: - sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 + sha256: 13980469f5548c3dcbd2bd208b232bf02a2f68ca source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca category: main optional: false - name: geoapps-utils - version: 0.6.0a1.dev100+af0d42f + version: 0.6.0a1.dev103+1398046 manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev121+48770d12 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca hash: - sha256: af0d42fa2403dba53d98cc90c2b292865d2e69b1 + sha256: 13980469f5548c3dcbd2bd208b232bf02a2f68ca source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@af0d42fa2403dba53d98cc90c2b292865d2e69b1 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@13980469f5548c3dcbd2bd208b232bf02a2f68ca category: main optional: false - name: geoh5py - version: 0.12.0a2.dev121+48770d12 + version: 0.12.0a2.dev124+3d7c550d manager: pip platform: linux-64 dependencies: @@ -8764,16 +8764,16 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 hash: - sha256: 48770d12988c340208efa22065022c34cd618ea9 + sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev121+48770d12 + version: 0.12.0a2.dev124+3d7c550d manager: pip platform: win-64 dependencies: @@ -8782,12 +8782,12 @@ package: pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' pylint: '>=3.3.8,<4.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 hash: - sha256: 48770d12988c340208efa22065022c34cd618ea9 + sha256: 3d7c550d8271f13faf531eba83615e9ab637ac86 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@48770d12988c340208efa22065022c34cd618ea9 + url: git+https://github.com/MiraGeoscience/geoh5py.git@3d7c550d8271f13faf531eba83615e9ab637ac86 category: main optional: false - name: grid-apps @@ -8796,8 +8796,8 @@ package: platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev100+af0d42f - geoh5py: 0.12.0a2.dev121+48770d12 + geoapps-utils: 0.6.0a1.dev103+1398046 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8815,8 +8815,8 @@ package: platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.6.0a1.dev100+af0d42f - geoh5py: 0.12.0a2.dev121+48770d12 + geoapps-utils: 0.6.0a1.dev103+1398046 + geoh5py: 0.12.0a2.dev124+3d7c550d numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' From d58a64b55fa1608266d88db0b2141df2fb868dd0 Mon Sep 17 00:00:00 2001 From: benjamink Date: Mon, 29 Sep 2025 15:16:56 -0700 Subject: [PATCH 4/5] Reformat options string used in uid hashing to json format and save as file data on trial SimPEGGroups --- .../plate_simulation/sweep/driver.py | 12 ++++--- .../plate_simulation/sweep/options.py | 32 ++++++++++++------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/simpeg_drivers/plate_simulation/sweep/driver.py b/simpeg_drivers/plate_simulation/sweep/driver.py index f0a785b3..4434beaa 100644 --- a/simpeg_drivers/plate_simulation/sweep/driver.py +++ b/simpeg_drivers/plate_simulation/sweep/driver.py @@ -100,15 +100,17 @@ def run(self): self.params.template.options["title"], ) for kwargs in trials: - options = dict(self.params.template_options, **kwargs) - uid = SweepOptions.uuid_from_params(options) + options_string = self.params.jsonify(kwargs) + uid = SweepOptions.uuid_from_params(options_string) kwargs.update({"out_group": str(self.out_group.uid)}) PlateSweepDriver.run_worker( - uid, kwargs, self.workspace.h5file, self.params.workdir + uid, kwargs, self.workspace.h5file, options_string, self.params.workdir ) @staticmethod - def run_worker(uid: str, data: dict, h5file: Path, workdir: Path | None): + def run_worker( + uid: str, data: dict, h5file: Path, options_string: str, workdir: Path | None + ): if workdir is None: workdir = h5file.parent @@ -125,7 +127,7 @@ def run_worker(uid: str, data: dict, h5file: Path, workdir: Path | None): if isinstance(group, SimPEGGroup | UIJsonGroup) and "plate_simulation.driver" in group.options.get("run_command") ) - + plate_simulation.add_file(options_string.encode("utf-8"), name="options") ifile = InputFile(ui_json=plate_simulation.options, validate=False) for key, value in data.items(): ifile.set_data_value(key, value) diff --git a/simpeg_drivers/plate_simulation/sweep/options.py b/simpeg_drivers/plate_simulation/sweep/options.py index 90092bb9..637d8bf3 100644 --- a/simpeg_drivers/plate_simulation/sweep/options.py +++ b/simpeg_drivers/plate_simulation/sweep/options.py @@ -9,6 +9,7 @@ # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' import itertools +import json import uuid from pathlib import Path from typing import ClassVar @@ -124,7 +125,12 @@ def trials(self) -> list[dict]: return [dict(zip(names, i, strict=True)) for i in iterations] @staticmethod - def all_hashable_options(options: dict): + def all_hashable_options(options: dict) -> dict: + """Recurses through UIJson options to return flat dictionary of all key/values.""" + + # TODO: Use the base UIJson to read options and flatten instead of + # InputFile. Requires GEOPY-1875. + ifile = InputFile(ui_json=options, validate=False) exceptions = list(Options.model_fields) + ["version", "icon", "documentation"] # TODO: add these to the Options fields with empty string defaults. @@ -141,8 +147,20 @@ def template_options(self): """Return a flat version of the template.options dictionary.""" return stringify(SweepOptions.all_hashable_options(self.template.options)) + def jsonify(self, updates: dict): + options = dict(self.template_options, **updates) + + def format_value(v): + if isinstance(v, float): + return f"{v:.4e}" + if isinstance(v, Entity): + return str(v.uid) + return v + + return json.dumps({k: format_value(v) for k, v in options.items()}, indent=4) + @staticmethod - def uuid_from_params(params: dict) -> str: + def uuid_from_params(param_string: str) -> str: """ Create a deterministic uuid. @@ -151,14 +169,4 @@ def uuid_from_params(params: dict) -> str: :returns: Unique but recoverable uuid file identifier string. """ - def format_value(v): - if isinstance(v, float): - return f"{v:.4e}" - if isinstance(v, Entity): - return str(v.uid) - return v - - param_string = ",".join( - [f"{k}:{format_value(params[k])}" for k in sorted(params)] - ) return str(uuid.uuid5(uuid.NAMESPACE_DNS, param_string)) From 7d82d9d2f8d2f64990626717c6a852dceb7bec71 Mon Sep 17 00:00:00 2001 From: benjamink Date: Wed, 1 Oct 2025 09:45:11 -0700 Subject: [PATCH 5/5] fix plate-simulation uijson padding_cells -> padding_distance --- simpeg_drivers/plate_simulation/uijson.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpeg_drivers/plate_simulation/uijson.py b/simpeg_drivers/plate_simulation/uijson.py index eecc3e52..c6f20d2f 100644 --- a/simpeg_drivers/plate_simulation/uijson.py +++ b/simpeg_drivers/plate_simulation/uijson.py @@ -44,7 +44,7 @@ class PlateSimulationUIJson(BaseUIJson): w_cell_size: FloatForm depth_core: FloatForm max_distance: FloatForm - padding_cells: FloatForm + padding_distance: FloatForm diagonal_balance: BoolForm minimum_level: IntegerForm export_model: BoolForm