From 2e99c86bdc5a9ada61aeb97f3dd46054e1d3ae2f Mon Sep 17 00:00:00 2001 From: dominiquef Date: Wed, 5 Mar 2025 08:23:55 -0800 Subject: [PATCH 01/10] Change reference ind_active to active_cells --- simpeg_drivers/components/factories/simulation_factory.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/simpeg_drivers/components/factories/simulation_factory.py b/simpeg_drivers/components/factories/simulation_factory.py index f62304b8..c7583528 100644 --- a/simpeg_drivers/components/factories/simulation_factory.py +++ b/simpeg_drivers/components/factories/simulation_factory.py @@ -168,20 +168,20 @@ def assemble_keyword_arguments( ) def _magnetic_vector_keywords(self, kwargs, active_cells=None): - kwargs["ind_active"] = active_cells + kwargs["active_cells"] = active_cells kwargs["chiMap"] = maps.IdentityMap(nP=int(active_cells.sum()) * 3) kwargs["model_type"] = "vector" kwargs["chunk_format"] = "row" return kwargs def _magnetic_scalar_keywords(self, kwargs, active_cells=None): - kwargs["ind_active"] = active_cells + kwargs["active_cells"] = active_cells kwargs["chiMap"] = maps.IdentityMap(nP=int(active_cells.sum())) kwargs["chunk_format"] = "row" return kwargs def _gravity_keywords(self, kwargs, active_cells=None): - kwargs["ind_active"] = active_cells + kwargs["active_cells"] = active_cells kwargs["rhoMap"] = maps.IdentityMap(nP=int(active_cells.sum())) kwargs["chunk_format"] = "row" return kwargs From 7a24c808e2f4183b5f45e8a17220575175e214d9 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Wed, 5 Mar 2025 10:30:06 -0800 Subject: [PATCH 02/10] Name change on simpeg classes --- simpeg_drivers/components/factories/directives_factory.py | 2 +- simpeg_drivers/components/factories/simulation_factory.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/simpeg_drivers/components/factories/directives_factory.py b/simpeg_drivers/components/factories/directives_factory.py index 4a0bcf1a..6c699fb3 100644 --- a/simpeg_drivers/components/factories/directives_factory.py +++ b/simpeg_drivers/components/factories/directives_factory.py @@ -59,7 +59,7 @@ def beta_estimate_by_eigenvalues_directive(self): ): self._beta_estimate_by_eigenvalues_directive = ( directives.BetaEstimateDerivative( - beta0_ratio=self.params.initial_beta_ratio, seed=0 + beta0_ratio=self.params.initial_beta_ratio, random_seed=0 ) ) diff --git a/simpeg_drivers/components/factories/simulation_factory.py b/simpeg_drivers/components/factories/simulation_factory.py index c7583528..3e311f6d 100644 --- a/simpeg_drivers/components/factories/simulation_factory.py +++ b/simpeg_drivers/components/factories/simulation_factory.py @@ -192,13 +192,17 @@ def _induced_polarization_keywords( mesh, active_cells=None, ): - etamap = maps.InjectActiveCells(mesh, indActive=active_cells, valInactive=0) + etamap = maps.InjectActiveCells( + mesh, active_cells=active_cells, value_inactive=0 + ) kwargs["etaMap"] = etamap kwargs["solver"] = self.solver return kwargs def _conductivity_keywords(self, kwargs, mesh, active_cells=None): - actmap = maps.InjectActiveCells(mesh, active_cells, valInactive=np.log(1e-8)) + actmap = maps.InjectActiveCells( + mesh, active_cells=active_cells, value_inactive=np.log(1e-8) + ) kwargs["sigmaMap"] = maps.ExpMap(mesh) * actmap kwargs["solver"] = self.solver return kwargs From 938ca05635d6c1577f301213694192b9c95c6616 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 6 Mar 2025 09:22:11 -0800 Subject: [PATCH 03/10] Clean up copy of large l;oop em surveys --- .../components/factories/entity_factory.py | 30 +++---------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/simpeg_drivers/components/factories/entity_factory.py b/simpeg_drivers/components/factories/entity_factory.py index dc8c0a6e..c938c408 100644 --- a/simpeg_drivers/components/factories/entity_factory.py +++ b/simpeg_drivers/components/factories/entity_factory.py @@ -26,6 +26,7 @@ Points, PotentialElectrode, ) +from geoh5py.objects.surveys.electromagnetics.base import BaseEMSurvey from simpeg_drivers.components.factories.abstract_factory import AbstractFactory from simpeg_drivers.utils.surveys import counter_clockwise_sort @@ -92,15 +93,9 @@ def _build(self, inversion_data: InversionData): else: kwargs.update({"mask": inversion_data.mask}) - entity = self.params.data_object.copy(copy_complement=False, **kwargs) - - if getattr(self.params.data_object, "transmitters", None) is not None: - cells = self.params.data_object.transmitters.cells - - if getattr(self.params.data_object, "tx_id_property", None) is not None: - tx_id = self.params.data_object.tx_id_property.copy(parent=entity) - entity.tx_id_property = tx_id + entity = self.params.data_object.copy(**kwargs) + if isinstance(self.params.data_object, BaseEMSurvey): if isinstance( self.params.data_object.transmitters, LargeLoopGroundFEMTransmitters | LargeLoopGroundTEMTransmitters, @@ -108,24 +103,7 @@ def _build(self, inversion_data: InversionData): cells = self._validate_large_loop_cells( self.params.data_object.transmitters ) - - transmitters = self.params.data_object.transmitters.copy( - copy_complement=False, - cells=cells, - parent=self.params.out_group, - copy_children=False, - ) - - if ( - getattr(self.params.data_object.transmitters, "tx_id_property", None) - is not None - ): - tx_id = self.params.data_object.transmitters.tx_id_property.copy( - parent=transmitters - ) - transmitters.tx_id_property = tx_id - - entity.transmitters = transmitters + entity.transmitters.cells = cells tx_freq = self.params.data_object.transmitters.get_data("Tx frequency") if tx_freq: From 0a59d8fca3a245f98e5007070d651554f3240a3c Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 6 Mar 2025 11:06:01 -0800 Subject: [PATCH 04/10] Fix reference to diagonal_balance --- simpeg_drivers/utils/testing.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/simpeg_drivers/utils/testing.py b/simpeg_drivers/utils/testing.py index 6c65c8d8..8f575e0d 100644 --- a/simpeg_drivers/utils/testing.py +++ b/simpeg_drivers/utils/testing.py @@ -457,12 +457,12 @@ def topo_drape(x, y): depth_core=100.0, padding_distance=padDist, mesh_type="TREE", + tree_diagonal_balance=False, ) mesh = OctreeDriver.refine_tree_from_surface( mesh, topography, levels=refinement, - diagonal_balance=False, finalize=False, ) @@ -471,7 +471,6 @@ def topo_drape(x, y): mesh, vertices, levels=[2], - diagonal_balance=False, finalize=False, ) From 269e96cf957964aee7e522bae468371367827cbb Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 6 Mar 2025 11:07:35 -0800 Subject: [PATCH 05/10] Fix test --- tests/data_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data_test.py b/tests/data_test.py index 4592ff84..b93465e7 100644 --- a/tests/data_test.py +++ b/tests/data_test.py @@ -100,12 +100,12 @@ def test_survey_data(tmp_path: Path): [20, 20, 20], depth_core=50, mesh_type="TREE", + tree_diagonal_balance=False, ) mesh = OctreeDriver.refine_tree_from_surface( mesh, test_topo_object, levels=[2], - diagonal_balance=False, finalize=True, ) From 48f679f9a041a6b6a1b3c0d6fa8e098f591fc785 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 6 Mar 2025 11:24:11 -0800 Subject: [PATCH 06/10] Refresh locks --- .../py-3.10-linux-64-dev.conda.lock.yml | 8 +- environments/py-3.10-linux-64.conda.lock.yml | 6 +- .../py-3.10-win-64-dev.conda.lock.yml | 14 +- environments/py-3.10-win-64.conda.lock.yml | 12 +- .../py-3.11-linux-64-dev.conda.lock.yml | 12 +- environments/py-3.11-linux-64.conda.lock.yml | 8 +- .../py-3.11-win-64-dev.conda.lock.yml | 20 +-- environments/py-3.11-win-64.conda.lock.yml | 14 +- .../py-3.12-linux-64-dev.conda.lock.yml | 12 +- environments/py-3.12-linux-64.conda.lock.yml | 8 +- .../py-3.12-win-64-dev.conda.lock.yml | 20 +-- environments/py-3.12-win-64.conda.lock.yml | 14 +- py-3.10.conda-lock.yml | 82 ++++++------ py-3.11.conda-lock.yml | 124 +++++++++--------- py-3.12.conda-lock.yml | 116 ++++++++-------- 15 files changed, 235 insertions(+), 235 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 61f28f13..d52101a6 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -46,7 +46,7 @@ dependencies: - cytoolz=1.0.1=py310ha75aee5_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py310hf71b8c6_0 + - debugpy=1.8.13=py310hf71b8c6_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 @@ -85,7 +85,7 @@ dependencies: - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py310hff52083_1 @@ -304,9 +304,9 @@ dependencies: - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 45337112..b1da509a 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -44,7 +44,7 @@ dependencies: - icu=75.1=he02047a_0 - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.7=py310h3788b33_0 @@ -157,9 +157,9 @@ dependencies: - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 6b70eebd..a0607ab1 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -44,7 +44,7 @@ dependencies: - cytoolz=1.0.1=py310ha8f682b_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py310h9e98ed7_0 + - debugpy=1.8.13=py310h9e98ed7_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 @@ -83,7 +83,7 @@ dependencies: - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py310h5588dad_1 @@ -272,9 +272,9 @@ dependencies: - unicodedata2=16.0.0=py310ha8f682b_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wcwidth=0.2.13=pyhd8ed1ab_1 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 @@ -295,9 +295,9 @@ dependencies: - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index d88dea88..b400c768 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -41,7 +41,7 @@ dependencies: - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - intel-openmp=2024.2.1=h57928b3_1083 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - kiwisolver=1.4.7=py310hc19bc0b_0 - krb5=1.21.3=hdf4eb48_0 @@ -130,9 +130,9 @@ dependencies: - ucrt=10.0.22621.0=h57928b3_1 - unicodedata2=16.0.0=py310ha8f682b_0 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wheel=0.45.1=pyhd8ed1ab_1 - win_inet_pton=1.1.0=pyh7428d3b_8 - xorg-libxau=1.0.11=hcd874cb_0 @@ -146,9 +146,9 @@ dependencies: - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 d2c1a511..a1c44700 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -46,7 +46,7 @@ dependencies: - cytoolz=1.0.1=py311h9ecbd09_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py311hfdbb021_0 + - debugpy=1.8.13=py311hfdbb021_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -80,14 +80,14 @@ dependencies: - importlib_resources=6.5.2=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.29.5=pyh3099207_0 - - ipython=9.0.0=pyhfb0248b_0 + - ipython=9.0.0=pyhfb0248b_1 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py311h38be061_1 @@ -221,7 +221,7 @@ dependencies: - pysocks=1.7.1=pyha55dd90_7 - pytest=8.3.5=pyhd8ed1ab_0 - pytest-cov=6.0.0=pyhd8ed1ab_1 - - python=3.11.11=h9e4cc4f_1_cpython + - python=3.11.11=h9e4cc4f_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-fastjsonschema=2.21.1=pyhd8ed1ab_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -308,9 +308,9 @@ dependencies: - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 549d81ea..9ddce092 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -45,7 +45,7 @@ dependencies: - icu=75.1=he02047a_0 - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.7=py311hd18a35c_0 @@ -122,7 +122,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.1=pyhd8ed1ab_0 - pysocks=1.7.1=pyha55dd90_7 - - python=3.11.11=h9e4cc4f_1_cpython + - python=3.11.11=h9e4cc4f_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py311h4b558b0_0 - python-tzdata=2023.4=pyhd8ed1ab_0 @@ -160,9 +160,9 @@ dependencies: - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 7ef8cb98..3243181c 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -39,12 +39,12 @@ dependencies: - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py311h3257749_0 - coverage=7.6.12=py311h5082efb_0 - - cpython=3.11.11=py311hd8ed1ab_1 + - cpython=3.11.11=py311hd8ed1ab_2 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py311he736701_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py311hda3d55a_0 + - debugpy=1.8.13=py311hda3d55a_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -78,14 +78,14 @@ dependencies: - iniconfig=2.0.0=pyhd8ed1ab_1 - intel-openmp=2024.2.1=h57928b3_1083 - ipykernel=6.29.5=pyh4bbf305_0 - - ipython=9.0.0=pyhca29cf9_0 + - ipython=9.0.0=pyhca29cf9_1 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py311h1ea47a8_1 @@ -205,7 +205,7 @@ dependencies: - pysocks=1.7.1=pyh09c184e_7 - pytest=8.3.5=pyhd8ed1ab_0 - pytest-cov=6.0.0=pyhd8ed1ab_1 - - python=3.11.11=h3f84c4b_1_cpython + - python=3.11.11=h3f84c4b_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-fastjsonschema=2.21.1=pyhd8ed1ab_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -275,9 +275,9 @@ dependencies: - unicodedata2=16.0.0=py311he736701_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wcwidth=0.2.13=pyhd8ed1ab_1 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 @@ -299,9 +299,9 @@ dependencies: - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 17571fd4..365b85df 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -42,7 +42,7 @@ dependencies: - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - intel-openmp=2024.2.1=h57928b3_1083 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - kiwisolver=1.4.7=py311h3257749_0 - krb5=1.21.3=hdf4eb48_0 @@ -107,7 +107,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.1=pyhd8ed1ab_0 - pysocks=1.7.1=pyh09c184e_7 - - python=3.11.11=h3f84c4b_1_cpython + - python=3.11.11=h3f84c4b_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py311h5bfbc98_0 - python-tzdata=2023.4=pyhd8ed1ab_0 @@ -132,9 +132,9 @@ dependencies: - ucrt=10.0.22621.0=h57928b3_1 - unicodedata2=16.0.0=py311he736701_0 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wheel=0.45.1=pyhd8ed1ab_1 - win_inet_pton=1.1.0=pyh7428d3b_8 - wrapt=1.17.2=py311he736701_0 @@ -149,9 +149,9 @@ dependencies: - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 712467d4..5bced799 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -46,7 +46,7 @@ dependencies: - cytoolz=1.0.1=py312h66e93f0_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py312h2ec8cdc_0 + - debugpy=1.8.13=py312h2ec8cdc_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -80,14 +80,14 @@ dependencies: - importlib_resources=6.5.2=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.29.5=pyh3099207_0 - - ipython=9.0.0=pyhfb0248b_0 + - ipython=9.0.0=pyhfb0248b_1 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py312h7900ff3_1 @@ -221,7 +221,7 @@ dependencies: - pysocks=1.7.1=pyha55dd90_7 - pytest=8.3.5=pyhd8ed1ab_0 - pytest-cov=6.0.0=pyhd8ed1ab_1 - - python=3.12.9=h9e4cc4f_0_cpython + - python=3.12.9=h9e4cc4f_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-fastjsonschema=2.21.1=pyhd8ed1ab_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -308,9 +308,9 @@ dependencies: - zstd=1.5.6=ha6fb4c9_0 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index a56cec6c..d6141f19 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -45,7 +45,7 @@ dependencies: - icu=75.1=he02047a_0 - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.8=py312h84d6215_0 @@ -122,7 +122,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.1=pyhd8ed1ab_0 - pysocks=1.7.1=pyha55dd90_7 - - python=3.12.9=h9e4cc4f_0_cpython + - python=3.12.9=h9e4cc4f_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py312h6ad3ee3_0 - python-tzdata=2023.4=pyhd8ed1ab_0 @@ -160,9 +160,9 @@ dependencies: - zstd=1.5.6=ha6fb4c9_0 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 cb7b5d4c..10dd83f7 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -39,12 +39,12 @@ dependencies: - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py312hd5eb7cc_0 - coverage=7.6.12=py312h31fea79_0 - - cpython=3.12.9=py312hd8ed1ab_0 + - cpython=3.12.9=py312hd8ed1ab_1 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py312h4389bb4_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py312h275cf98_0 + - debugpy=1.8.13=py312h275cf98_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -78,14 +78,14 @@ dependencies: - iniconfig=2.0.0=pyhd8ed1ab_1 - intel-openmp=2024.2.1=h57928b3_1083 - ipykernel=6.29.5=pyh4bbf305_0 - - ipython=9.0.0=pyhca29cf9_0 + - ipython=9.0.0=pyhca29cf9_1 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py312h2e8e312_1 @@ -205,7 +205,7 @@ dependencies: - pysocks=1.7.1=pyh09c184e_7 - pytest=8.3.5=pyhd8ed1ab_0 - pytest-cov=6.0.0=pyhd8ed1ab_1 - - python=3.12.9=h3f84c4b_0_cpython + - python=3.12.9=h3f84c4b_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-fastjsonschema=2.21.1=pyhd8ed1ab_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -275,9 +275,9 @@ dependencies: - unicodedata2=16.0.0=py312h4389bb4_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wcwidth=0.2.13=pyhd8ed1ab_1 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 @@ -299,9 +299,9 @@ dependencies: - zstd=1.5.6=h0ea2cb4_0 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index c4dda0df..f93833ae 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -42,7 +42,7 @@ dependencies: - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - intel-openmp=2024.2.1=h57928b3_1083 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - kiwisolver=1.4.8=py312hc790b64_0 - krb5=1.21.3=hdf4eb48_0 @@ -107,7 +107,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.1=pyhd8ed1ab_0 - pysocks=1.7.1=pyh09c184e_7 - - python=3.12.9=h3f84c4b_0_cpython + - python=3.12.9=h3f84c4b_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py312h8095395_0 - python-tzdata=2023.4=pyhd8ed1ab_0 @@ -132,9 +132,9 @@ dependencies: - ucrt=10.0.22621.0=h57928b3_1 - unicodedata2=16.0.0=py312h4389bb4_0 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wheel=0.45.1=pyhd8ed1ab_1 - win_inet_pton=1.1.0=pyh7428d3b_8 - wrapt=1.17.2=py312h4389bb4_0 @@ -149,9 +149,9 @@ dependencies: - zstd=1.5.6=h0ea2cb4_0 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 4ce470d5..6063104b 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -1115,7 +1115,7 @@ package: category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: linux-64 dependencies: @@ -1124,14 +1124,14 @@ package: libstdcxx: '>=13' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.12-py310hf71b8c6_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.13-py310hf71b8c6_0.conda hash: - md5: 9b1dedfc47e1242253d6e2ca3b864693 - sha256: 1de0f06d106d89355977e859320fb0412d757f62114597f9bd1c4f1b377440c3 + md5: dc30b46d5b3ddccd3b3ac1b0bee17026 + sha256: f02fb1862980595a310551f5cd35ddffa1f224e7d9c5aab6c3b9e37922a96e34 category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: win-64 dependencies: @@ -1140,10 +1140,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.12-py310h9e98ed7_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.13-py310h9e98ed7_0.conda hash: - md5: 6ce8c7ad37a65f7c39014a106e9c38e1 - sha256: fa60c05e1ba14eab7f619a0416764e88c7bb8935b59ee936f2562493f6b5a1f5 + md5: 136cdcd7b5c571c42d8c08730e8c4e0b + sha256: a98214b90b595cadb190359957ef046629a8d2e2ae6033e7304288dd65b33c43 category: dev optional: true - name: decorator @@ -2276,29 +2276,29 @@ package: category: dev optional: true - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: linux-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: win-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: joblib @@ -8040,35 +8040,35 @@ package: manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.40.33810' - url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-h5fd82a7_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-hbf610ac_24.conda hash: - md5: 00cf3a61562bd53bd5ea99e6888793d0 - sha256: 7ce178cf139ccea5079f9c353b3d8415d1d49b0a2f774662c355d3f89163d7b4 + md5: 9098c5cfb418fc0b0204bf2efc1e9afa + sha256: 8ef83b62f9f0b885882d0dd41cbe47c2308f7ac0537fd508a5bbe6d3953a176e category: main optional: false - name: vc14_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34433-h6356254_24.conda + url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34438-hfd919c2_24.conda hash: - md5: 2441e010ee255e6a38bf16705a756e94 - sha256: abda97b8728cf6e3c37df8f1178adde7219bed38b96e392cb3be66336386d32e + md5: 5fceb7d965d59955888d9a9732719aa8 + sha256: fb36814355ac12dcb4a55b75b5ef0d49ec219ad9df30d7955f2ace88bd6919c4 category: main optional: false - name: vs2015_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.42.34433' - url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34433-hfef2bbc_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34438-h7142326_24.conda hash: - md5: 117fcc5b86c48f3b322b0722258c7259 - sha256: 09102e0bd283af65772c052d85028410b0c31989b3cd96c260485d28e270836e + md5: 1dd2e838eb13190ae1f1e2760c036fdc + sha256: a7104d3d605d191c8ee8d85d4175df3630d61830583494a5d1e62cd9f1260420 category: main optional: false - name: wcwidth @@ -8558,12 +8558,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: 57e666e69f78e2961fdb54c715bce14b8d25ce4f source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f category: main optional: false - name: geoh5py @@ -8575,12 +8575,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: 57e666e69f78e2961fdb54c715bce14b8d25ce4f source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f category: main optional: false - name: mira-simpeg @@ -8635,12 +8635,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: octree-creation-app @@ -8653,12 +8653,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: param-sweeps diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index aeb80aff..28226013 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -985,10 +985,10 @@ package: dependencies: python: 3.11.11.* python_abi: '*' - url: https://conda.anaconda.org/conda-forge/noarch/cpython-3.11.11-py311hd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/cpython-3.11.11-py311hd8ed1ab_2.conda hash: - md5: 6aab9c45010dc5ed92215f89cdafa201 - sha256: b9bb4486ba7b81d7264e92f346c9fa2d4a6c9678c28b33fb5d1652ecc7f82e26 + md5: fb7bc3f1bccb39021a53309e83bce28d + sha256: 52e462716ff6b062bf6992f9e95fcb65a0b95a47db73f0478bd0ceab8a37036a category: dev optional: true - name: cycler @@ -1113,7 +1113,7 @@ package: category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: linux-64 dependencies: @@ -1122,14 +1122,14 @@ package: libstdcxx: '>=13' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.12-py311hfdbb021_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.13-py311hfdbb021_0.conda hash: - md5: 2a34eab62b5927587e04c7f8beeaf0d7 - sha256: 5c6e1eb9d1ce2b1474d424b10afbe1c5a992b59c002a3e8c6477be3a9accbc2c + md5: f343a9dfe2dd89abbdb1984aa435ca73 + sha256: 5400b19311cefe11fcad1f758ec4341945f0bf1793d5501355d2e51260932a73 category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: win-64 dependencies: @@ -1138,10 +1138,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.12-py311hda3d55a_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.13-py311hda3d55a_0.conda hash: - md5: e37dbdf20c05395ec4a83610e6ff05f2 - sha256: 7459c8b617e0e0fb1b070a7922e511685d4cfe7e71b6cdb5542a0f93931f749d + md5: f95dea661bf83b77246fc1ade349b0f0 + sha256: 4a26009dfb681e79eb1c0e4c1b9f70496b39bc849862baa3b7d3ce01b5b5ead8 category: dev optional: true - name: decorator @@ -2132,10 +2132,10 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhfb0248b_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhfb0248b_1.conda hash: - md5: bdbff76b1425c421d6aa013c9421c809 - sha256: 9b8f7b345b1c1f99c35b7f4d3b864db7dbeb8154e24409e73bff5a063ad70487 + md5: f3fdf97b6316a4b26141717fb3c4ba4d + sha256: a93f4c3b4468529464f7406499a2b7e9bccb61d2aba5c65b15589b78f67a9e4a category: dev optional: true - name: ipython @@ -2157,10 +2157,10 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhca29cf9_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhca29cf9_1.conda hash: - md5: a7e92ff097ac235d3f68e94382bb2ace - sha256: 17098e9163ba4d1bb7d76b41337d36175fc5c3f22df41bfb0c8cc091909dc89b + md5: 69219e74fad26820e5624bc5c832735e + sha256: 25b2c02018aa94d8ea4cc56b859b08f63df755c0dff7f66f236ade8fa8d24326 category: dev optional: true - name: ipython_genutils @@ -2328,29 +2328,29 @@ package: category: dev optional: true - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: linux-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: win-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: joblib @@ -6193,22 +6193,22 @@ package: libexpat: '>=2.6.4,<3.0a0' libffi: '>=3.4,<4.0a0' libgcc: '>=13' - liblzma: '>=5.6.3,<6.0a0' + liblzma: '>=5.6.4,<6.0a0' libnsl: '>=2.0.1,<2.1.0a0' - libsqlite: '>=3.47.0,<4.0a0' + libsqlite: '>=3.49.1,<4.0a0' libuuid: '>=2.38.1,<3.0a0' libxcrypt: '>=4.4.36' libzlib: '>=1.3.1,<2.0a0' ncurses: '>=6.5,<7.0a0' - openssl: '>=3.4.0,<4.0a0' + openssl: '>=3.4.1,<4.0a0' pip: '' readline: '>=8.2,<9.0a0' tk: '>=8.6.13,<8.7.0a0' tzdata: '' - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.11-h9e4cc4f_1_cpython.conda + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.11-h9e4cc4f_2_cpython.conda hash: - md5: 8387070aa413ce9a8cc35a509fae938b - sha256: b29ce0836fce55bdff8d5c5b71c4921a23f87d3b950aea89a9e75784120b06b0 + md5: 81dd3e521f9b9eaa58d06213e28aaa9b + sha256: e0be7ad95a034d10e021f15317bf5c70fc1161564fa47844984c245505cde36c category: main optional: false - name: python @@ -6219,20 +6219,20 @@ package: bzip2: '>=1.0.8,<2.0a0' libexpat: '>=2.6.4,<3.0a0' libffi: '>=3.4,<4.0a0' - liblzma: '>=5.6.3,<6.0a0' - libsqlite: '>=3.47.0,<4.0a0' + liblzma: '>=5.6.4,<6.0a0' + libsqlite: '>=3.49.1,<4.0a0' libzlib: '>=1.3.1,<2.0a0' - openssl: '>=3.4.0,<4.0a0' + openssl: '>=3.4.1,<4.0a0' pip: '' tk: '>=8.6.13,<8.7.0a0' tzdata: '' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/python-3.11.11-h3f84c4b_1_cpython.conda + url: https://conda.anaconda.org/conda-forge/win-64/python-3.11.11-h3f84c4b_2_cpython.conda hash: - md5: 4d490a426481298bdd89a502253a7fd4 - sha256: 5be6181ab6d655ad761490b7808584c5e78e5d7139846685b1850a8b7ef6c5df + md5: 8959f363205d55bb6ada26bdfd6ce8c7 + sha256: d9a31998083225dcbef7c10cf0d379b1f64176cf1d0f8ad7f29941d2eb293d25 category: main optional: false - name: python-dateutil @@ -8123,35 +8123,35 @@ package: manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.40.33810' - url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-h5fd82a7_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-hbf610ac_24.conda hash: - md5: 00cf3a61562bd53bd5ea99e6888793d0 - sha256: 7ce178cf139ccea5079f9c353b3d8415d1d49b0a2f774662c355d3f89163d7b4 + md5: 9098c5cfb418fc0b0204bf2efc1e9afa + sha256: 8ef83b62f9f0b885882d0dd41cbe47c2308f7ac0537fd508a5bbe6d3953a176e category: main optional: false - name: vc14_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34433-h6356254_24.conda + url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34438-hfd919c2_24.conda hash: - md5: 2441e010ee255e6a38bf16705a756e94 - sha256: abda97b8728cf6e3c37df8f1178adde7219bed38b96e392cb3be66336386d32e + md5: 5fceb7d965d59955888d9a9732719aa8 + sha256: fb36814355ac12dcb4a55b75b5ef0d49ec219ad9df30d7955f2ace88bd6919c4 category: main optional: false - name: vs2015_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.42.34433' - url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34433-hfef2bbc_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34438-h7142326_24.conda hash: - md5: 117fcc5b86c48f3b322b0722258c7259 - sha256: 09102e0bd283af65772c052d85028410b0c31989b3cd96c260485d28e270836e + md5: 1dd2e838eb13190ae1f1e2760c036fdc + sha256: a7104d3d605d191c8ee8d85d4175df3630d61830583494a5d1e62cd9f1260420 category: main optional: false - name: wcwidth @@ -8672,12 +8672,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: 57e666e69f78e2961fdb54c715bce14b8d25ce4f source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f category: main optional: false - name: geoh5py @@ -8689,12 +8689,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: 57e666e69f78e2961fdb54c715bce14b8d25ce4f source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f category: main optional: false - name: mira-simpeg @@ -8749,12 +8749,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: octree-creation-app @@ -8767,12 +8767,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: param-sweeps diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index b02cbc4a..389bf216 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -985,10 +985,10 @@ package: dependencies: python: 3.12.9.* python_abi: '*' - url: https://conda.anaconda.org/conda-forge/noarch/cpython-3.12.9-py312hd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/cpython-3.12.9-py312hd8ed1ab_1.conda hash: - md5: a5b10f166467fecec692abaee84d16aa - sha256: f5c7ad0bd23fa8645ac279d99bddba656ff61483dc6312af12aae13910dfb210 + md5: f0f8087079679f3ae375fca13327b17f + sha256: 58a637bc8328b115c9619de3fcd664ec26662083319e3c106917a1b3ee4d7594 category: dev optional: true - name: cycler @@ -1113,7 +1113,7 @@ package: category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: linux-64 dependencies: @@ -1122,14 +1122,14 @@ package: libstdcxx: '>=13' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.12-py312h2ec8cdc_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.13-py312h2ec8cdc_0.conda hash: - md5: 6be6dcb4bffd1d456bdad28341d507bd - sha256: f88c3a7ff384d1726aea2cb2342cf67f1502915391860335c40ab81d7e381e30 + md5: cfad89e517e83c4927fffdbaaf0a30ef + sha256: 3370f9c9a94146a4136ca57ae6e13b789572ff41804cd949cccad70945ae7fb0 category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: win-64 dependencies: @@ -1138,10 +1138,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.12-py312h275cf98_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.13-py312h275cf98_0.conda hash: - md5: 62f81383dba2fb096df3ee7b0df1467f - sha256: e171edeeb28bb8d8a10bc6040606a25490827590c73bfcbdfb1cfc45b2b1523d + md5: a2e7abdc87c10567ad1fdaf05c47a728 + sha256: 24e793d78bb5f2129be7a485c72d6d485d1abff30d90cdcedfa24bad1cf00208 category: dev optional: true - name: decorator @@ -2132,10 +2132,10 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhfb0248b_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhfb0248b_1.conda hash: - md5: bdbff76b1425c421d6aa013c9421c809 - sha256: 9b8f7b345b1c1f99c35b7f4d3b864db7dbeb8154e24409e73bff5a063ad70487 + md5: f3fdf97b6316a4b26141717fb3c4ba4d + sha256: a93f4c3b4468529464f7406499a2b7e9bccb61d2aba5c65b15589b78f67a9e4a category: dev optional: true - name: ipython @@ -2157,10 +2157,10 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhca29cf9_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhca29cf9_1.conda hash: - md5: a7e92ff097ac235d3f68e94382bb2ace - sha256: 17098e9163ba4d1bb7d76b41337d36175fc5c3f22df41bfb0c8cc091909dc89b + md5: 69219e74fad26820e5624bc5c832735e + sha256: 25b2c02018aa94d8ea4cc56b859b08f63df755c0dff7f66f236ade8fa8d24326 category: dev optional: true - name: ipython_genutils @@ -2328,29 +2328,29 @@ package: category: dev optional: true - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: linux-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: win-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: joblib @@ -6195,7 +6195,7 @@ package: libgcc: '>=13' liblzma: '>=5.6.4,<6.0a0' libnsl: '>=2.0.1,<2.1.0a0' - libsqlite: '>=3.48.0,<4.0a0' + libsqlite: '>=3.49.1,<4.0a0' libuuid: '>=2.38.1,<3.0a0' libxcrypt: '>=4.4.36' libzlib: '>=1.3.1,<2.0a0' @@ -6205,10 +6205,10 @@ package: readline: '>=8.2,<9.0a0' tk: '>=8.6.13,<8.7.0a0' tzdata: '' - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.9-h9e4cc4f_0_cpython.conda + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.9-h9e4cc4f_1_cpython.conda hash: - md5: 5665f0079432f8848079c811cdb537d5 - sha256: 64fed5178f1e9c8ac0f572ac0ce37955f5dee7b2bcac665202bc14f1f7dd618a + md5: d82342192dfc9145185190e651065aa9 + sha256: 77f2073889d4c91a57bc0da73a0466d9164dbcf6191ea9c3a7be6872f784d625 category: main optional: false - name: python @@ -6220,7 +6220,7 @@ package: libexpat: '>=2.6.4,<3.0a0' libffi: '>=3.4,<4.0a0' liblzma: '>=5.6.4,<6.0a0' - libsqlite: '>=3.48.0,<4.0a0' + libsqlite: '>=3.49.1,<4.0a0' libzlib: '>=1.3.1,<2.0a0' openssl: '>=3.4.1,<4.0a0' pip: '' @@ -6229,10 +6229,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/python-3.12.9-h3f84c4b_0_cpython.conda + url: https://conda.anaconda.org/conda-forge/win-64/python-3.12.9-h3f84c4b_1_cpython.conda hash: - md5: f01cb4695ac632a3530200455e31cec5 - sha256: 972ef8c58bb1efd058ec70fa957f673e5ad7298d05e501769359f49ae26c7065 + md5: f0a0ad168b815fee4ce9718d4e6c1925 + sha256: 320acd0095442a451c4e0f0f896bed2f52b3b8f05df41774e5b0b433d9fa08e0 category: main optional: false - name: python-dateutil @@ -8123,35 +8123,35 @@ package: manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.40.33810' - url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-h5fd82a7_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-hbf610ac_24.conda hash: - md5: 00cf3a61562bd53bd5ea99e6888793d0 - sha256: 7ce178cf139ccea5079f9c353b3d8415d1d49b0a2f774662c355d3f89163d7b4 + md5: 9098c5cfb418fc0b0204bf2efc1e9afa + sha256: 8ef83b62f9f0b885882d0dd41cbe47c2308f7ac0537fd508a5bbe6d3953a176e category: main optional: false - name: vc14_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34433-h6356254_24.conda + url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34438-hfd919c2_24.conda hash: - md5: 2441e010ee255e6a38bf16705a756e94 - sha256: abda97b8728cf6e3c37df8f1178adde7219bed38b96e392cb3be66336386d32e + md5: 5fceb7d965d59955888d9a9732719aa8 + sha256: fb36814355ac12dcb4a55b75b5ef0d49ec219ad9df30d7955f2ace88bd6919c4 category: main optional: false - name: vs2015_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.42.34433' - url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34433-hfef2bbc_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34438-h7142326_24.conda hash: - md5: 117fcc5b86c48f3b322b0722258c7259 - sha256: 09102e0bd283af65772c052d85028410b0c31989b3cd96c260485d28e270836e + md5: 1dd2e838eb13190ae1f1e2760c036fdc + sha256: a7104d3d605d191c8ee8d85d4175df3630d61830583494a5d1e62cd9f1260420 category: main optional: false - name: wcwidth @@ -8674,12 +8674,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: 57e666e69f78e2961fdb54c715bce14b8d25ce4f source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f category: main optional: false - name: geoh5py @@ -8691,12 +8691,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: 57e666e69f78e2961fdb54c715bce14b8d25ce4f source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f category: main optional: false - name: mira-simpeg @@ -8751,12 +8751,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: octree-creation-app @@ -8769,12 +8769,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: param-sweeps From 9c3ab406b08482a8ede4efc4234680fce6d6f657 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 6 Mar 2025 14:14:52 -0800 Subject: [PATCH 07/10] Re-lock --- .../py-3.10-linux-64-dev.conda.lock.yml | 8 +- environments/py-3.10-linux-64.conda.lock.yml | 6 +- .../py-3.10-win-64-dev.conda.lock.yml | 14 +- environments/py-3.10-win-64.conda.lock.yml | 12 +- .../py-3.11-linux-64-dev.conda.lock.yml | 12 +- environments/py-3.11-linux-64.conda.lock.yml | 8 +- .../py-3.11-win-64-dev.conda.lock.yml | 20 +-- environments/py-3.11-win-64.conda.lock.yml | 14 +- .../py-3.12-linux-64-dev.conda.lock.yml | 12 +- environments/py-3.12-linux-64.conda.lock.yml | 8 +- .../py-3.12-win-64-dev.conda.lock.yml | 20 +-- environments/py-3.12-win-64.conda.lock.yml | 14 +- py-3.10.conda-lock.yml | 82 ++++++------ py-3.11.conda-lock.yml | 124 +++++++++--------- py-3.12.conda-lock.yml | 116 ++++++++-------- 15 files changed, 235 insertions(+), 235 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 61f28f13..75405a74 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -46,7 +46,7 @@ dependencies: - cytoolz=1.0.1=py310ha75aee5_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py310hf71b8c6_0 + - debugpy=1.8.13=py310hf71b8c6_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 @@ -85,7 +85,7 @@ dependencies: - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py310hff52083_1 @@ -304,9 +304,9 @@ dependencies: - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 45337112..75432204 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -44,7 +44,7 @@ dependencies: - icu=75.1=he02047a_0 - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.7=py310h3788b33_0 @@ -157,9 +157,9 @@ dependencies: - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 6b70eebd..faa72b7c 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -44,7 +44,7 @@ dependencies: - cytoolz=1.0.1=py310ha8f682b_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py310h9e98ed7_0 + - debugpy=1.8.13=py310h9e98ed7_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 @@ -83,7 +83,7 @@ dependencies: - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py310h5588dad_1 @@ -272,9 +272,9 @@ dependencies: - unicodedata2=16.0.0=py310ha8f682b_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wcwidth=0.2.13=pyhd8ed1ab_1 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 @@ -295,9 +295,9 @@ dependencies: - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index d88dea88..571c38be 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -41,7 +41,7 @@ dependencies: - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - intel-openmp=2024.2.1=h57928b3_1083 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - kiwisolver=1.4.7=py310hc19bc0b_0 - krb5=1.21.3=hdf4eb48_0 @@ -130,9 +130,9 @@ dependencies: - ucrt=10.0.22621.0=h57928b3_1 - unicodedata2=16.0.0=py310ha8f682b_0 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wheel=0.45.1=pyhd8ed1ab_1 - win_inet_pton=1.1.0=pyh7428d3b_8 - xorg-libxau=1.0.11=hcd874cb_0 @@ -146,9 +146,9 @@ dependencies: - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 d2c1a511..0a8ac022 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -46,7 +46,7 @@ dependencies: - cytoolz=1.0.1=py311h9ecbd09_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py311hfdbb021_0 + - debugpy=1.8.13=py311hfdbb021_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -80,14 +80,14 @@ dependencies: - importlib_resources=6.5.2=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.29.5=pyh3099207_0 - - ipython=9.0.0=pyhfb0248b_0 + - ipython=9.0.0=pyhfb0248b_1 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py311h38be061_1 @@ -221,7 +221,7 @@ dependencies: - pysocks=1.7.1=pyha55dd90_7 - pytest=8.3.5=pyhd8ed1ab_0 - pytest-cov=6.0.0=pyhd8ed1ab_1 - - python=3.11.11=h9e4cc4f_1_cpython + - python=3.11.11=h9e4cc4f_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-fastjsonschema=2.21.1=pyhd8ed1ab_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -308,9 +308,9 @@ dependencies: - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 549d81ea..f44e7f2f 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -45,7 +45,7 @@ dependencies: - icu=75.1=he02047a_0 - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.7=py311hd18a35c_0 @@ -122,7 +122,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.1=pyhd8ed1ab_0 - pysocks=1.7.1=pyha55dd90_7 - - python=3.11.11=h9e4cc4f_1_cpython + - python=3.11.11=h9e4cc4f_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py311h4b558b0_0 - python-tzdata=2023.4=pyhd8ed1ab_0 @@ -160,9 +160,9 @@ dependencies: - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 7ef8cb98..6a6af288 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -39,12 +39,12 @@ dependencies: - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py311h3257749_0 - coverage=7.6.12=py311h5082efb_0 - - cpython=3.11.11=py311hd8ed1ab_1 + - cpython=3.11.11=py311hd8ed1ab_2 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py311he736701_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py311hda3d55a_0 + - debugpy=1.8.13=py311hda3d55a_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -78,14 +78,14 @@ dependencies: - iniconfig=2.0.0=pyhd8ed1ab_1 - intel-openmp=2024.2.1=h57928b3_1083 - ipykernel=6.29.5=pyh4bbf305_0 - - ipython=9.0.0=pyhca29cf9_0 + - ipython=9.0.0=pyhca29cf9_1 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py311h1ea47a8_1 @@ -205,7 +205,7 @@ dependencies: - pysocks=1.7.1=pyh09c184e_7 - pytest=8.3.5=pyhd8ed1ab_0 - pytest-cov=6.0.0=pyhd8ed1ab_1 - - python=3.11.11=h3f84c4b_1_cpython + - python=3.11.11=h3f84c4b_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-fastjsonschema=2.21.1=pyhd8ed1ab_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -275,9 +275,9 @@ dependencies: - unicodedata2=16.0.0=py311he736701_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wcwidth=0.2.13=pyhd8ed1ab_1 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 @@ -299,9 +299,9 @@ dependencies: - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 17571fd4..e2493bab 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -42,7 +42,7 @@ dependencies: - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - intel-openmp=2024.2.1=h57928b3_1083 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - kiwisolver=1.4.7=py311h3257749_0 - krb5=1.21.3=hdf4eb48_0 @@ -107,7 +107,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.1=pyhd8ed1ab_0 - pysocks=1.7.1=pyh09c184e_7 - - python=3.11.11=h3f84c4b_1_cpython + - python=3.11.11=h3f84c4b_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py311h5bfbc98_0 - python-tzdata=2023.4=pyhd8ed1ab_0 @@ -132,9 +132,9 @@ dependencies: - ucrt=10.0.22621.0=h57928b3_1 - unicodedata2=16.0.0=py311he736701_0 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wheel=0.45.1=pyhd8ed1ab_1 - win_inet_pton=1.1.0=pyh7428d3b_8 - wrapt=1.17.2=py311he736701_0 @@ -149,9 +149,9 @@ dependencies: - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 712467d4..e96528be 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -46,7 +46,7 @@ dependencies: - cytoolz=1.0.1=py312h66e93f0_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py312h2ec8cdc_0 + - debugpy=1.8.13=py312h2ec8cdc_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -80,14 +80,14 @@ dependencies: - importlib_resources=6.5.2=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.29.5=pyh3099207_0 - - ipython=9.0.0=pyhfb0248b_0 + - ipython=9.0.0=pyhfb0248b_1 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py312h7900ff3_1 @@ -221,7 +221,7 @@ dependencies: - pysocks=1.7.1=pyha55dd90_7 - pytest=8.3.5=pyhd8ed1ab_0 - pytest-cov=6.0.0=pyhd8ed1ab_1 - - python=3.12.9=h9e4cc4f_0_cpython + - python=3.12.9=h9e4cc4f_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-fastjsonschema=2.21.1=pyhd8ed1ab_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -308,9 +308,9 @@ dependencies: - zstd=1.5.6=ha6fb4c9_0 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index a56cec6c..8494e363 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -45,7 +45,7 @@ dependencies: - icu=75.1=he02047a_0 - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.8=py312h84d6215_0 @@ -122,7 +122,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.1=pyhd8ed1ab_0 - pysocks=1.7.1=pyha55dd90_7 - - python=3.12.9=h9e4cc4f_0_cpython + - python=3.12.9=h9e4cc4f_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py312h6ad3ee3_0 - python-tzdata=2023.4=pyhd8ed1ab_0 @@ -160,9 +160,9 @@ dependencies: - zstd=1.5.6=ha6fb4c9_0 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 cb7b5d4c..a84ae3bd 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -39,12 +39,12 @@ dependencies: - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py312hd5eb7cc_0 - coverage=7.6.12=py312h31fea79_0 - - cpython=3.12.9=py312hd8ed1ab_0 + - cpython=3.12.9=py312hd8ed1ab_1 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py312h4389bb4_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.12=py312h275cf98_0 + - debugpy=1.8.13=py312h275cf98_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -78,14 +78,14 @@ dependencies: - iniconfig=2.0.0=pyhd8ed1ab_1 - intel-openmp=2024.2.1=h57928b3_1083 - ipykernel=6.29.5=pyh4bbf305_0 - - ipython=9.0.0=pyhca29cf9_0 + - ipython=9.0.0=pyhca29cf9_1 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - isort=6.0.1=pyhd8ed1ab_0 - jedi=0.19.2=pyhd8ed1ab_1 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - json5=0.10.0=pyhd8ed1ab_1 - jsonpointer=3.0.0=py312h2e8e312_1 @@ -205,7 +205,7 @@ dependencies: - pysocks=1.7.1=pyh09c184e_7 - pytest=8.3.5=pyhd8ed1ab_0 - pytest-cov=6.0.0=pyhd8ed1ab_1 - - python=3.12.9=h3f84c4b_0_cpython + - python=3.12.9=h3f84c4b_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-fastjsonschema=2.21.1=pyhd8ed1ab_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -275,9 +275,9 @@ dependencies: - unicodedata2=16.0.0=py312h4389bb4_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wcwidth=0.2.13=pyhd8ed1ab_1 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 @@ -299,9 +299,9 @@ dependencies: - zstd=1.5.6=h0ea2cb4_0 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index c4dda0df..9a97ef4d 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -42,7 +42,7 @@ dependencies: - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - intel-openmp=2024.2.1=h57928b3_1083 - - jinja2=3.1.5=pyhd8ed1ab_0 + - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - kiwisolver=1.4.8=py312hc790b64_0 - krb5=1.21.3=hdf4eb48_0 @@ -107,7 +107,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.1=pyhd8ed1ab_0 - pysocks=1.7.1=pyh09c184e_7 - - python=3.12.9=h3f84c4b_0_cpython + - python=3.12.9=h3f84c4b_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py312h8095395_0 - python-tzdata=2023.4=pyhd8ed1ab_0 @@ -132,9 +132,9 @@ dependencies: - ucrt=10.0.22621.0=h57928b3_1 - unicodedata2=16.0.0=py312h4389bb4_0 - urllib3=2.3.0=pyhd8ed1ab_0 - - vc=14.3=h5fd82a7_24 - - vc14_runtime=14.42.34433=h6356254_24 - - vs2015_runtime=14.42.34433=hfef2bbc_24 + - vc=14.3=hbf610ac_24 + - vc14_runtime=14.42.34438=hfd919c2_24 + - vs2015_runtime=14.42.34438=h7142326_24 - wheel=0.45.1=pyhd8ed1ab_1 - win_inet_pton=1.1.0=pyh7428d3b_8 - wrapt=1.17.2=py312h4389bb4_0 @@ -149,9 +149,9 @@ dependencies: - zstd=1.5.6=h0ea2cb4_0 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 4ce470d5..4cb48b17 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -1115,7 +1115,7 @@ package: category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: linux-64 dependencies: @@ -1124,14 +1124,14 @@ package: libstdcxx: '>=13' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.12-py310hf71b8c6_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.13-py310hf71b8c6_0.conda hash: - md5: 9b1dedfc47e1242253d6e2ca3b864693 - sha256: 1de0f06d106d89355977e859320fb0412d757f62114597f9bd1c4f1b377440c3 + md5: dc30b46d5b3ddccd3b3ac1b0bee17026 + sha256: f02fb1862980595a310551f5cd35ddffa1f224e7d9c5aab6c3b9e37922a96e34 category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: win-64 dependencies: @@ -1140,10 +1140,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.12-py310h9e98ed7_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.13-py310h9e98ed7_0.conda hash: - md5: 6ce8c7ad37a65f7c39014a106e9c38e1 - sha256: fa60c05e1ba14eab7f619a0416764e88c7bb8935b59ee936f2562493f6b5a1f5 + md5: 136cdcd7b5c571c42d8c08730e8c4e0b + sha256: a98214b90b595cadb190359957ef046629a8d2e2ae6033e7304288dd65b33c43 category: dev optional: true - name: decorator @@ -2276,29 +2276,29 @@ package: category: dev optional: true - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: linux-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: win-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: joblib @@ -8040,35 +8040,35 @@ package: manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.40.33810' - url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-h5fd82a7_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-hbf610ac_24.conda hash: - md5: 00cf3a61562bd53bd5ea99e6888793d0 - sha256: 7ce178cf139ccea5079f9c353b3d8415d1d49b0a2f774662c355d3f89163d7b4 + md5: 9098c5cfb418fc0b0204bf2efc1e9afa + sha256: 8ef83b62f9f0b885882d0dd41cbe47c2308f7ac0537fd508a5bbe6d3953a176e category: main optional: false - name: vc14_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34433-h6356254_24.conda + url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34438-hfd919c2_24.conda hash: - md5: 2441e010ee255e6a38bf16705a756e94 - sha256: abda97b8728cf6e3c37df8f1178adde7219bed38b96e392cb3be66336386d32e + md5: 5fceb7d965d59955888d9a9732719aa8 + sha256: fb36814355ac12dcb4a55b75b5ef0d49ec219ad9df30d7955f2ace88bd6919c4 category: main optional: false - name: vs2015_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.42.34433' - url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34433-hfef2bbc_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34438-h7142326_24.conda hash: - md5: 117fcc5b86c48f3b322b0722258c7259 - sha256: 09102e0bd283af65772c052d85028410b0c31989b3cd96c260485d28e270836e + md5: 1dd2e838eb13190ae1f1e2760c036fdc + sha256: a7104d3d605d191c8ee8d85d4175df3630d61830583494a5d1e62cd9f1260420 category: main optional: false - name: wcwidth @@ -8558,12 +8558,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: ba95a86578f2f5f461994333cb0212efb8907e2d source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d category: main optional: false - name: geoh5py @@ -8575,12 +8575,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: ba95a86578f2f5f461994333cb0212efb8907e2d source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d category: main optional: false - name: mira-simpeg @@ -8635,12 +8635,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: octree-creation-app @@ -8653,12 +8653,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: param-sweeps diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index aeb80aff..fc365125 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -985,10 +985,10 @@ package: dependencies: python: 3.11.11.* python_abi: '*' - url: https://conda.anaconda.org/conda-forge/noarch/cpython-3.11.11-py311hd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/cpython-3.11.11-py311hd8ed1ab_2.conda hash: - md5: 6aab9c45010dc5ed92215f89cdafa201 - sha256: b9bb4486ba7b81d7264e92f346c9fa2d4a6c9678c28b33fb5d1652ecc7f82e26 + md5: fb7bc3f1bccb39021a53309e83bce28d + sha256: 52e462716ff6b062bf6992f9e95fcb65a0b95a47db73f0478bd0ceab8a37036a category: dev optional: true - name: cycler @@ -1113,7 +1113,7 @@ package: category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: linux-64 dependencies: @@ -1122,14 +1122,14 @@ package: libstdcxx: '>=13' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.12-py311hfdbb021_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.13-py311hfdbb021_0.conda hash: - md5: 2a34eab62b5927587e04c7f8beeaf0d7 - sha256: 5c6e1eb9d1ce2b1474d424b10afbe1c5a992b59c002a3e8c6477be3a9accbc2c + md5: f343a9dfe2dd89abbdb1984aa435ca73 + sha256: 5400b19311cefe11fcad1f758ec4341945f0bf1793d5501355d2e51260932a73 category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: win-64 dependencies: @@ -1138,10 +1138,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.12-py311hda3d55a_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.13-py311hda3d55a_0.conda hash: - md5: e37dbdf20c05395ec4a83610e6ff05f2 - sha256: 7459c8b617e0e0fb1b070a7922e511685d4cfe7e71b6cdb5542a0f93931f749d + md5: f95dea661bf83b77246fc1ade349b0f0 + sha256: 4a26009dfb681e79eb1c0e4c1b9f70496b39bc849862baa3b7d3ce01b5b5ead8 category: dev optional: true - name: decorator @@ -2132,10 +2132,10 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhfb0248b_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhfb0248b_1.conda hash: - md5: bdbff76b1425c421d6aa013c9421c809 - sha256: 9b8f7b345b1c1f99c35b7f4d3b864db7dbeb8154e24409e73bff5a063ad70487 + md5: f3fdf97b6316a4b26141717fb3c4ba4d + sha256: a93f4c3b4468529464f7406499a2b7e9bccb61d2aba5c65b15589b78f67a9e4a category: dev optional: true - name: ipython @@ -2157,10 +2157,10 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhca29cf9_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhca29cf9_1.conda hash: - md5: a7e92ff097ac235d3f68e94382bb2ace - sha256: 17098e9163ba4d1bb7d76b41337d36175fc5c3f22df41bfb0c8cc091909dc89b + md5: 69219e74fad26820e5624bc5c832735e + sha256: 25b2c02018aa94d8ea4cc56b859b08f63df755c0dff7f66f236ade8fa8d24326 category: dev optional: true - name: ipython_genutils @@ -2328,29 +2328,29 @@ package: category: dev optional: true - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: linux-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: win-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: joblib @@ -6193,22 +6193,22 @@ package: libexpat: '>=2.6.4,<3.0a0' libffi: '>=3.4,<4.0a0' libgcc: '>=13' - liblzma: '>=5.6.3,<6.0a0' + liblzma: '>=5.6.4,<6.0a0' libnsl: '>=2.0.1,<2.1.0a0' - libsqlite: '>=3.47.0,<4.0a0' + libsqlite: '>=3.49.1,<4.0a0' libuuid: '>=2.38.1,<3.0a0' libxcrypt: '>=4.4.36' libzlib: '>=1.3.1,<2.0a0' ncurses: '>=6.5,<7.0a0' - openssl: '>=3.4.0,<4.0a0' + openssl: '>=3.4.1,<4.0a0' pip: '' readline: '>=8.2,<9.0a0' tk: '>=8.6.13,<8.7.0a0' tzdata: '' - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.11-h9e4cc4f_1_cpython.conda + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.11-h9e4cc4f_2_cpython.conda hash: - md5: 8387070aa413ce9a8cc35a509fae938b - sha256: b29ce0836fce55bdff8d5c5b71c4921a23f87d3b950aea89a9e75784120b06b0 + md5: 81dd3e521f9b9eaa58d06213e28aaa9b + sha256: e0be7ad95a034d10e021f15317bf5c70fc1161564fa47844984c245505cde36c category: main optional: false - name: python @@ -6219,20 +6219,20 @@ package: bzip2: '>=1.0.8,<2.0a0' libexpat: '>=2.6.4,<3.0a0' libffi: '>=3.4,<4.0a0' - liblzma: '>=5.6.3,<6.0a0' - libsqlite: '>=3.47.0,<4.0a0' + liblzma: '>=5.6.4,<6.0a0' + libsqlite: '>=3.49.1,<4.0a0' libzlib: '>=1.3.1,<2.0a0' - openssl: '>=3.4.0,<4.0a0' + openssl: '>=3.4.1,<4.0a0' pip: '' tk: '>=8.6.13,<8.7.0a0' tzdata: '' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/python-3.11.11-h3f84c4b_1_cpython.conda + url: https://conda.anaconda.org/conda-forge/win-64/python-3.11.11-h3f84c4b_2_cpython.conda hash: - md5: 4d490a426481298bdd89a502253a7fd4 - sha256: 5be6181ab6d655ad761490b7808584c5e78e5d7139846685b1850a8b7ef6c5df + md5: 8959f363205d55bb6ada26bdfd6ce8c7 + sha256: d9a31998083225dcbef7c10cf0d379b1f64176cf1d0f8ad7f29941d2eb293d25 category: main optional: false - name: python-dateutil @@ -8123,35 +8123,35 @@ package: manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.40.33810' - url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-h5fd82a7_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-hbf610ac_24.conda hash: - md5: 00cf3a61562bd53bd5ea99e6888793d0 - sha256: 7ce178cf139ccea5079f9c353b3d8415d1d49b0a2f774662c355d3f89163d7b4 + md5: 9098c5cfb418fc0b0204bf2efc1e9afa + sha256: 8ef83b62f9f0b885882d0dd41cbe47c2308f7ac0537fd508a5bbe6d3953a176e category: main optional: false - name: vc14_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34433-h6356254_24.conda + url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34438-hfd919c2_24.conda hash: - md5: 2441e010ee255e6a38bf16705a756e94 - sha256: abda97b8728cf6e3c37df8f1178adde7219bed38b96e392cb3be66336386d32e + md5: 5fceb7d965d59955888d9a9732719aa8 + sha256: fb36814355ac12dcb4a55b75b5ef0d49ec219ad9df30d7955f2ace88bd6919c4 category: main optional: false - name: vs2015_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.42.34433' - url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34433-hfef2bbc_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34438-h7142326_24.conda hash: - md5: 117fcc5b86c48f3b322b0722258c7259 - sha256: 09102e0bd283af65772c052d85028410b0c31989b3cd96c260485d28e270836e + md5: 1dd2e838eb13190ae1f1e2760c036fdc + sha256: a7104d3d605d191c8ee8d85d4175df3630d61830583494a5d1e62cd9f1260420 category: main optional: false - name: wcwidth @@ -8672,12 +8672,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: ba95a86578f2f5f461994333cb0212efb8907e2d source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d category: main optional: false - name: geoh5py @@ -8689,12 +8689,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: ba95a86578f2f5f461994333cb0212efb8907e2d source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d category: main optional: false - name: mira-simpeg @@ -8749,12 +8749,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: octree-creation-app @@ -8767,12 +8767,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: param-sweeps diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index b02cbc4a..7f3a13f8 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -985,10 +985,10 @@ package: dependencies: python: 3.12.9.* python_abi: '*' - url: https://conda.anaconda.org/conda-forge/noarch/cpython-3.12.9-py312hd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/cpython-3.12.9-py312hd8ed1ab_1.conda hash: - md5: a5b10f166467fecec692abaee84d16aa - sha256: f5c7ad0bd23fa8645ac279d99bddba656ff61483dc6312af12aae13910dfb210 + md5: f0f8087079679f3ae375fca13327b17f + sha256: 58a637bc8328b115c9619de3fcd664ec26662083319e3c106917a1b3ee4d7594 category: dev optional: true - name: cycler @@ -1113,7 +1113,7 @@ package: category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: linux-64 dependencies: @@ -1122,14 +1122,14 @@ package: libstdcxx: '>=13' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.12-py312h2ec8cdc_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.8.13-py312h2ec8cdc_0.conda hash: - md5: 6be6dcb4bffd1d456bdad28341d507bd - sha256: f88c3a7ff384d1726aea2cb2342cf67f1502915391860335c40ab81d7e381e30 + md5: cfad89e517e83c4927fffdbaaf0a30ef + sha256: 3370f9c9a94146a4136ca57ae6e13b789572ff41804cd949cccad70945ae7fb0 category: dev optional: true - name: debugpy - version: 1.8.12 + version: 1.8.13 manager: conda platform: win-64 dependencies: @@ -1138,10 +1138,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.12-py312h275cf98_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/debugpy-1.8.13-py312h275cf98_0.conda hash: - md5: 62f81383dba2fb096df3ee7b0df1467f - sha256: e171edeeb28bb8d8a10bc6040606a25490827590c73bfcbdfb1cfc45b2b1523d + md5: a2e7abdc87c10567ad1fdaf05c47a728 + sha256: 24e793d78bb5f2129be7a485c72d6d485d1abff30d90cdcedfa24bad1cf00208 category: dev optional: true - name: decorator @@ -2132,10 +2132,10 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhfb0248b_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhfb0248b_1.conda hash: - md5: bdbff76b1425c421d6aa013c9421c809 - sha256: 9b8f7b345b1c1f99c35b7f4d3b864db7dbeb8154e24409e73bff5a063ad70487 + md5: f3fdf97b6316a4b26141717fb3c4ba4d + sha256: a93f4c3b4468529464f7406499a2b7e9bccb61d2aba5c65b15589b78f67a9e4a category: dev optional: true - name: ipython @@ -2157,10 +2157,10 @@ package: stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhca29cf9_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-9.0.0-pyhca29cf9_1.conda hash: - md5: a7e92ff097ac235d3f68e94382bb2ace - sha256: 17098e9163ba4d1bb7d76b41337d36175fc5c3f22df41bfb0c8cc091909dc89b + md5: 69219e74fad26820e5624bc5c832735e + sha256: 25b2c02018aa94d8ea4cc56b859b08f63df755c0dff7f66f236ade8fa8d24326 category: dev optional: true - name: ipython_genutils @@ -2328,29 +2328,29 @@ package: category: dev optional: true - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: linux-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: jinja2 - version: 3.1.5 + version: 3.1.6 manager: conda platform: win-64 dependencies: markupsafe: '>=2.0' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.6-pyhd8ed1ab_0.conda hash: - md5: 2752a6ed44105bfb18c9bef1177d9dcd - sha256: 98977694b9ecaa3218662f843425f39501f81973c450f995eec68f1803ed71c3 + md5: 446bd6c8cb26050d528881df495ce646 + sha256: f1ac18b11637ddadc05642e8185a851c7fab5998c6f5470d716812fae943b2af category: main optional: false - name: joblib @@ -6195,7 +6195,7 @@ package: libgcc: '>=13' liblzma: '>=5.6.4,<6.0a0' libnsl: '>=2.0.1,<2.1.0a0' - libsqlite: '>=3.48.0,<4.0a0' + libsqlite: '>=3.49.1,<4.0a0' libuuid: '>=2.38.1,<3.0a0' libxcrypt: '>=4.4.36' libzlib: '>=1.3.1,<2.0a0' @@ -6205,10 +6205,10 @@ package: readline: '>=8.2,<9.0a0' tk: '>=8.6.13,<8.7.0a0' tzdata: '' - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.9-h9e4cc4f_0_cpython.conda + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.9-h9e4cc4f_1_cpython.conda hash: - md5: 5665f0079432f8848079c811cdb537d5 - sha256: 64fed5178f1e9c8ac0f572ac0ce37955f5dee7b2bcac665202bc14f1f7dd618a + md5: d82342192dfc9145185190e651065aa9 + sha256: 77f2073889d4c91a57bc0da73a0466d9164dbcf6191ea9c3a7be6872f784d625 category: main optional: false - name: python @@ -6220,7 +6220,7 @@ package: libexpat: '>=2.6.4,<3.0a0' libffi: '>=3.4,<4.0a0' liblzma: '>=5.6.4,<6.0a0' - libsqlite: '>=3.48.0,<4.0a0' + libsqlite: '>=3.49.1,<4.0a0' libzlib: '>=1.3.1,<2.0a0' openssl: '>=3.4.1,<4.0a0' pip: '' @@ -6229,10 +6229,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/python-3.12.9-h3f84c4b_0_cpython.conda + url: https://conda.anaconda.org/conda-forge/win-64/python-3.12.9-h3f84c4b_1_cpython.conda hash: - md5: f01cb4695ac632a3530200455e31cec5 - sha256: 972ef8c58bb1efd058ec70fa957f673e5ad7298d05e501769359f49ae26c7065 + md5: f0a0ad168b815fee4ce9718d4e6c1925 + sha256: 320acd0095442a451c4e0f0f896bed2f52b3b8f05df41774e5b0b433d9fa08e0 category: main optional: false - name: python-dateutil @@ -8123,35 +8123,35 @@ package: manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.40.33810' - url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-h5fd82a7_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vc-14.3-hbf610ac_24.conda hash: - md5: 00cf3a61562bd53bd5ea99e6888793d0 - sha256: 7ce178cf139ccea5079f9c353b3d8415d1d49b0a2f774662c355d3f89163d7b4 + md5: 9098c5cfb418fc0b0204bf2efc1e9afa + sha256: 8ef83b62f9f0b885882d0dd41cbe47c2308f7ac0537fd508a5bbe6d3953a176e category: main optional: false - name: vc14_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34433-h6356254_24.conda + url: https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.42.34438-hfd919c2_24.conda hash: - md5: 2441e010ee255e6a38bf16705a756e94 - sha256: abda97b8728cf6e3c37df8f1178adde7219bed38b96e392cb3be66336386d32e + md5: 5fceb7d965d59955888d9a9732719aa8 + sha256: fb36814355ac12dcb4a55b75b5ef0d49ec219ad9df30d7955f2ace88bd6919c4 category: main optional: false - name: vs2015_runtime - version: 14.42.34433 + version: 14.42.34438 manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.42.34433' - url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34433-hfef2bbc_24.conda + vc14_runtime: '>=14.42.34438' + url: https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.42.34438-h7142326_24.conda hash: - md5: 117fcc5b86c48f3b322b0722258c7259 - sha256: 09102e0bd283af65772c052d85028410b0c31989b3cd96c260485d28e270836e + md5: 1dd2e838eb13190ae1f1e2760c036fdc + sha256: a7104d3d605d191c8ee8d85d4175df3630d61830583494a5d1e62cd9f1260420 category: main optional: false - name: wcwidth @@ -8674,12 +8674,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: ba95a86578f2f5f461994333cb0212efb8907e2d source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d category: main optional: false - name: geoh5py @@ -8691,12 +8691,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d hash: - sha256: c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + sha256: ba95a86578f2f5f461994333cb0212efb8907e2d source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@ba95a86578f2f5f461994333cb0212efb8907e2d category: main optional: false - name: mira-simpeg @@ -8751,12 +8751,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: octree-creation-app @@ -8769,12 +8769,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab hash: - sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + sha256: 680a233e2d3380c084a05a6e3cb51b28e6b450ab source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab category: main optional: false - name: param-sweeps From 4370fdfb529790a25db0ea069eea66c1cc2727e1 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 6 Mar 2025 14:55:51 -0800 Subject: [PATCH 08/10] Fix issue with transmitters None --- simpeg_drivers/components/factories/entity_factory.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/simpeg_drivers/components/factories/entity_factory.py b/simpeg_drivers/components/factories/entity_factory.py index c938c408..1222272a 100644 --- a/simpeg_drivers/components/factories/entity_factory.py +++ b/simpeg_drivers/components/factories/entity_factory.py @@ -105,9 +105,10 @@ def _build(self, inversion_data: InversionData): ) entity.transmitters.cells = cells - tx_freq = self.params.data_object.transmitters.get_data("Tx frequency") - if tx_freq: - tx_freq[0].copy(parent=entity.transmitters) + if self.params.data_object.transmitters is not None: + tx_freq = self.params.data_object.transmitters.get_data("Tx frequency") + if tx_freq: + tx_freq[0].copy(parent=entity.transmitters) return entity From a43fd83752f5064adfd4c2485e7613348d14714e Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 6 Mar 2025 15:04:53 -0800 Subject: [PATCH 09/10] Fix link --- tests/uijson_test.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/uijson_test.py b/tests/uijson_test.py index 1f4ccbcb..f34506ab 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -93,23 +93,23 @@ def test_gravity_uijson(tmp_path): uijson = GravityInversionUIJson.read(params_uijson_path) uijson_path = tmp_path / "from_uijson.ui.json" uijson.write(uijson_path) - with open(params_uijson_path, encoding="utf-8") as f: - params_data = json.load(f) - with open(uijson_path, encoding="utf-8") as f: - uijson_data = json.load(f) - - params_data_nobraces = {} - for param, data in params_data.items(): - if isinstance(data, dict): - field_data_nobraces = {} - for field, value in data.items(): - if isinstance(value, str): - value = value.removeprefix("{").removesuffix("}") - if isinstance(value, list): - value = [v.removeprefix("{").removesuffix("}") for v in value] - field_data_nobraces[field] = value - else: - field_data_nobraces = data - params_data_nobraces[param] = field_data_nobraces - - assert uijson_data == params_data_nobraces + # with open(params_uijson_path, encoding="utf-8") as f: + # params_data = json.load(f) + # with open(uijson_path, encoding="utf-8") as f: + # uijson_data = json.load(f) + # + # params_data_nobraces = {} + # for param, data in params_data.items(): + # if isinstance(data, dict): + # field_data_nobraces = {} + # for field, value in data.items(): + # if isinstance(value, str): + # value = value.removeprefix("{").removesuffix("}") + # if isinstance(value, list): + # value = [v.removeprefix("{").removesuffix("}") for v in value] + # field_data_nobraces[field] = value + # else: + # field_data_nobraces = data + # params_data_nobraces[param] = field_data_nobraces + # + # assert uijson_data == params_data_nobraces From bf2c1fe14755b372087cfa79dc4774fb199943ec Mon Sep 17 00:00:00 2001 From: dominiquef Date: Fri, 7 Mar 2025 09:11:24 -0800 Subject: [PATCH 10/10] Bring back test --- tests/uijson_test.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/uijson_test.py b/tests/uijson_test.py index f34506ab..1f4ccbcb 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -93,23 +93,23 @@ def test_gravity_uijson(tmp_path): uijson = GravityInversionUIJson.read(params_uijson_path) uijson_path = tmp_path / "from_uijson.ui.json" uijson.write(uijson_path) - # with open(params_uijson_path, encoding="utf-8") as f: - # params_data = json.load(f) - # with open(uijson_path, encoding="utf-8") as f: - # uijson_data = json.load(f) - # - # params_data_nobraces = {} - # for param, data in params_data.items(): - # if isinstance(data, dict): - # field_data_nobraces = {} - # for field, value in data.items(): - # if isinstance(value, str): - # value = value.removeprefix("{").removesuffix("}") - # if isinstance(value, list): - # value = [v.removeprefix("{").removesuffix("}") for v in value] - # field_data_nobraces[field] = value - # else: - # field_data_nobraces = data - # params_data_nobraces[param] = field_data_nobraces - # - # assert uijson_data == params_data_nobraces + with open(params_uijson_path, encoding="utf-8") as f: + params_data = json.load(f) + with open(uijson_path, encoding="utf-8") as f: + uijson_data = json.load(f) + + params_data_nobraces = {} + for param, data in params_data.items(): + if isinstance(data, dict): + field_data_nobraces = {} + for field, value in data.items(): + if isinstance(value, str): + value = value.removeprefix("{").removesuffix("}") + if isinstance(value, list): + value = [v.removeprefix("{").removesuffix("}") for v in value] + field_data_nobraces[field] = value + else: + field_data_nobraces = data + params_data_nobraces[param] = field_data_nobraces + + assert uijson_data == params_data_nobraces