From 26153bb036b9dabb832a52430b9cb68dd798fd8e Mon Sep 17 00:00:00 2001 From: dominiquef Date: Sat, 1 Nov 2025 09:06:17 -0700 Subject: [PATCH 1/7] Set topo elevation to -inf on global to bypass check --- simpeg_drivers/electromagnetics/base_1d_driver.py | 1 + 1 file changed, 1 insertion(+) diff --git a/simpeg_drivers/electromagnetics/base_1d_driver.py b/simpeg_drivers/electromagnetics/base_1d_driver.py index 2f5b8f3f..fd7779a6 100644 --- a/simpeg_drivers/electromagnetics/base_1d_driver.py +++ b/simpeg_drivers/electromagnetics/base_1d_driver.py @@ -97,6 +97,7 @@ def simulation(self): mesh=self.inversion_mesh.mesh, models=self.models, survey=self.inversion_data.survey, + topo=[0, 0, -np.inf], # Overload for global ) self._simulation.mesh = self.inversion_mesh.mesh From 3d5e9c053a7ee6fc92e4183150ceda94284216df Mon Sep 17 00:00:00 2001 From: dominiquef Date: Sat, 1 Nov 2025 09:15:17 -0700 Subject: [PATCH 2/7] Allow to pass kwargs to simulation construction --- .../components/factories/simulation_factory.py | 12 +++++------- simpeg_drivers/electromagnetics/base_1d_driver.py | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/simpeg_drivers/components/factories/simulation_factory.py b/simpeg_drivers/components/factories/simulation_factory.py index 15514722..c0e106a2 100644 --- a/simpeg_drivers/components/factories/simulation_factory.py +++ b/simpeg_drivers/components/factories/simulation_factory.py @@ -121,19 +121,17 @@ def assemble_arguments( survey=None, mesh=None, models=None, + **kwargs, ): if "1d" in self.factory_type: return () return [mesh] - def assemble_keyword_arguments( - self, - survey=None, - mesh=None, - models=None, - ): - kwargs = {} + def assemble_keyword_arguments(self, survey=None, mesh=None, models=None, **kwargs): + if not kwargs: + kwargs = {} + kwargs["survey"] = survey kwargs["max_chunk_size"] = self.params.compute.max_chunk_size kwargs["store_sensitivities"] = ( diff --git a/simpeg_drivers/electromagnetics/base_1d_driver.py b/simpeg_drivers/electromagnetics/base_1d_driver.py index fd7779a6..00f50095 100644 --- a/simpeg_drivers/electromagnetics/base_1d_driver.py +++ b/simpeg_drivers/electromagnetics/base_1d_driver.py @@ -97,7 +97,7 @@ def simulation(self): mesh=self.inversion_mesh.mesh, models=self.models, survey=self.inversion_data.survey, - topo=[0, 0, -np.inf], # Overload for global + topo=[0, 0, -np.inf], # Bypass check for global simulation ) self._simulation.mesh = self.inversion_mesh.mesh From 677b8498c3c3ce9fc041423880563bf99b0329c4 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Sat, 1 Nov 2025 09:27:27 -0700 Subject: [PATCH 3/7] Check for option when creating directive --- simpeg_drivers/components/factories/directives_factory.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/simpeg_drivers/components/factories/directives_factory.py b/simpeg_drivers/components/factories/directives_factory.py index ba64bba1..5f3bec65 100644 --- a/simpeg_drivers/components/factories/directives_factory.py +++ b/simpeg_drivers/components/factories/directives_factory.py @@ -200,8 +200,10 @@ def save_property_group(self): @property def save_sensitivities_directive(self): """""" - if self._save_sensitivities_directive is None and isinstance( - self.params, BaseInversionOptions + if ( + self._save_sensitivities_directive is None + and isinstance(self.params, BaseInversionOptions) + and self.params.directives.save_sensitivities ): self._save_sensitivities_directive = SaveSensitivitiesGeoh5Factory( self.params From 028ece5f1962878b8bc8f378fd415a16c6367f61 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Sat, 1 Nov 2025 09:29:57 -0700 Subject: [PATCH 4/7] Augment test --- tests/run_tests/driver_airborne_fem_1d_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/run_tests/driver_airborne_fem_1d_test.py b/tests/run_tests/driver_airborne_fem_1d_test.py index 5b9d4b25..c5aae5e6 100644 --- a/tests/run_tests/driver_airborne_fem_1d_test.py +++ b/tests/run_tests/driver_airborne_fem_1d_test.py @@ -143,6 +143,7 @@ def test_fem_1d_run(tmp_path: Path, max_iterations=1, pytest=True): percentile=100, cooling_rate=3, chi_factor=0.25, + save_sensitivities=False, **data_kwargs, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") @@ -154,7 +155,7 @@ def test_fem_1d_run(tmp_path: Path, max_iterations=1, pytest=True): driver.params.geoh5.h5file, driver.params.out_group.uid ) output["data"] = orig_z_real_1 - + assert not run_ws.get_entity("Iteration_0_sensitivities")[0] assert ( run_ws.get_entity("Iteration_1_z_imag_[1]")[0].entity_type.uid == run_ws.get_entity("Observed_z_imag_[1]")[0].entity_type.uid From 30921502cf0d6f01e1827bc4582be4f1c7c89624 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Sat, 1 Nov 2025 10:55:36 -0700 Subject: [PATCH 5/7] Add test to MT --- simpeg_drivers/components/factories/directives_factory.py | 2 +- tests/run_tests/driver_mt_test.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/simpeg_drivers/components/factories/directives_factory.py b/simpeg_drivers/components/factories/directives_factory.py index 5f3bec65..71ed8264 100644 --- a/simpeg_drivers/components/factories/directives_factory.py +++ b/simpeg_drivers/components/factories/directives_factory.py @@ -144,7 +144,7 @@ def save_directives(self): ]: save_directive = getattr(self, directive) if save_directive is not None: - directives_list.append(getattr(self, directive)) + directives_list.append(save_directive) if ( isinstance(save_directive, directives.SaveDataGeoH5) diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index 059fa193..b0b8892c 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -178,6 +178,7 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True): driver.params.geoh5.h5file, driver.params.out_group.uid ) output["data"] = orig_zyy_real_1 + assert not run_ws.get_entity("Iteration_0_sensitivities")[0] if pytest: check_target(output, target_run, tolerance=0.2) nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values) From 11245329c3474defbb63e84781a1af5e7da40340 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Sat, 1 Nov 2025 11:01:20 -0700 Subject: [PATCH 6/7] Revert 1D test --- tests/run_tests/driver_airborne_fem_1d_test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/run_tests/driver_airborne_fem_1d_test.py b/tests/run_tests/driver_airborne_fem_1d_test.py index c5aae5e6..5b9d4b25 100644 --- a/tests/run_tests/driver_airborne_fem_1d_test.py +++ b/tests/run_tests/driver_airborne_fem_1d_test.py @@ -143,7 +143,6 @@ def test_fem_1d_run(tmp_path: Path, max_iterations=1, pytest=True): percentile=100, cooling_rate=3, chi_factor=0.25, - save_sensitivities=False, **data_kwargs, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") @@ -155,7 +154,7 @@ def test_fem_1d_run(tmp_path: Path, max_iterations=1, pytest=True): driver.params.geoh5.h5file, driver.params.out_group.uid ) output["data"] = orig_z_real_1 - assert not run_ws.get_entity("Iteration_0_sensitivities")[0] + assert ( run_ws.get_entity("Iteration_1_z_imag_[1]")[0].entity_type.uid == run_ws.get_entity("Observed_z_imag_[1]")[0].entity_type.uid From b1756fda98281907c6c4cad3220d29d94f9783c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Thu, 6 Nov 2025 14:09:40 -0500 Subject: [PATCH 7/7] relock env on development branches --- .../py-3.10-linux-64-dev.conda.lock.yml | 12 +- environments/py-3.10-linux-64.conda.lock.yml | 12 +- .../py-3.10-win-64-dev.conda.lock.yml | 12 +- 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 | 12 +- .../py-3.11-win-64-dev.conda.lock.yml | 12 +- environments/py-3.11-win-64.conda.lock.yml | 12 +- .../py-3.12-linux-64-dev.conda.lock.yml | 12 +- environments/py-3.12-linux-64.conda.lock.yml | 12 +- .../py-3.12-win-64-dev.conda.lock.yml | 12 +- environments/py-3.12-win-64.conda.lock.yml | 12 +- py-3.10.conda-lock.yml | 114 ++++++++++-------- py-3.11.conda-lock.yml | 114 ++++++++++-------- py-3.12.conda-lock.yml | 114 ++++++++++-------- pyproject.toml | 16 +-- 16 files changed, 278 insertions(+), 224 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 c280eacb..759e4982 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 04182781a63ead68e8e7c31d9a09e754d8ad6f0d4d41762585826d02943a60e8 +# input_hash: 4b44185901b6b216814435620972c2fa2a8d727e93331e011fd42a3a947056ca channels: - conda-forge @@ -244,7 +244,7 @@ dependencies: - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tbb=2021.13.0=hb60516a_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - terminado=0.18.1=pyh0d859eb_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -282,10 +282,10 @@ dependencies: - zstandard=0.25.0=py310h139afa4_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 0961b70c..d6b15ccd 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 04182781a63ead68e8e7c31d9a09e754d8ad6f0d4d41762585826d02943a60e8 +# input_hash: 4b44185901b6b216814435620972c2fa2a8d727e93331e011fd42a3a947056ca channels: - conda-forge @@ -134,7 +134,7 @@ dependencies: - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hb60516a_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_hd72426e_102 - toolz=1.1.0=pyhd8ed1ab_1 @@ -158,10 +158,10 @@ dependencies: - zstandard=0.25.0=py310h139afa4_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index 6f2e2cee..abf7bcc9 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: da80cf40edcb5c1cfb9414b6e2a88c9cf5fbd765ef1e5975629a2f373cc4776a +# input_hash: 4b50ba3c2f65610d4554600e47eaa435e2e4e4159dc928f313a69c754f1172f8 channels: - conda-forge @@ -225,7 +225,7 @@ dependencies: - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tbb=2021.13.0=h18a62a1_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - terminado=0.18.1=pyh5737063_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -268,10 +268,10 @@ dependencies: - zstandard=0.25.0=py310h1637853_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 83a3b25d..baa3b92b 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: da80cf40edcb5c1cfb9414b6e2a88c9cf5fbd765ef1e5975629a2f373cc4776a +# input_hash: 4b50ba3c2f65610d4554600e47eaa435e2e4e4159dc928f313a69c754f1172f8 channels: - conda-forge @@ -116,7 +116,7 @@ dependencies: - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h18a62a1_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h2c6b04d_2 - toolz=1.1.0=pyhd8ed1ab_1 @@ -145,10 +145,10 @@ dependencies: - zstandard=0.25.0=py310h1637853_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index 6ad38454..3c5298bc 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: c2eb8ea440937825b991f1a9ca495d24a3ae8d501aaa0c5e6da2624aebf55dac +# input_hash: 47df5795e1fabb6dd4cb7acb7d5ab271c59d2d0d9aff199c256913c17f5169d1 channels: - conda-forge @@ -245,7 +245,7 @@ dependencies: - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tbb=2021.13.0=hb60516a_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - terminado=0.18.1=pyh0d859eb_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -284,10 +284,10 @@ dependencies: - zstandard=0.25.0=py311haee01d2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 2443e3b3..26c000c3 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: c2eb8ea440937825b991f1a9ca495d24a3ae8d501aaa0c5e6da2624aebf55dac +# input_hash: 47df5795e1fabb6dd4cb7acb7d5ab271c59d2d0d9aff199c256913c17f5169d1 channels: - conda-forge @@ -135,7 +135,7 @@ dependencies: - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hb60516a_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_hd72426e_102 - toolz=1.1.0=pyhd8ed1ab_1 @@ -160,10 +160,10 @@ dependencies: - zstandard=0.25.0=py311haee01d2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index 5a62ee14..738e5f3e 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: b3bafc91b46092ea8d73661dc4e01f372b7d5b9550e3793f855ed382ff152afb +# input_hash: ee33255c0e6d79088a9488622661e4c8bb0064adc36e330771a8a3be1c8eb401 channels: - conda-forge @@ -226,7 +226,7 @@ dependencies: - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tbb=2021.13.0=h18a62a1_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - terminado=0.18.1=pyh5737063_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -270,10 +270,10 @@ dependencies: - zstandard=0.25.0=py311hf893f09_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index d350f589..72ac21a9 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: b3bafc91b46092ea8d73661dc4e01f372b7d5b9550e3793f855ed382ff152afb +# input_hash: ee33255c0e6d79088a9488622661e4c8bb0064adc36e330771a8a3be1c8eb401 channels: - conda-forge @@ -117,7 +117,7 @@ dependencies: - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h18a62a1_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h2c6b04d_2 - toolz=1.1.0=pyhd8ed1ab_1 @@ -147,10 +147,10 @@ dependencies: - zstandard=0.25.0=py311hf893f09_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index e6a75f2e..5d729572 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: d840e5519329f10385a7146db8f04834806ed22c84fa26fd5468a36240867f90 +# input_hash: 608b87f4b855ba292c2017ba4876079f2137ef68271c41d471fdff5adcbddbbb channels: - conda-forge @@ -248,7 +248,7 @@ dependencies: - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tbb=2021.13.0=hb60516a_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - terminado=0.18.1=pyh0d859eb_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -287,10 +287,10 @@ dependencies: - zstandard=0.25.0=py312h5253ce2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 1751176b..6169d145 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: d840e5519329f10385a7146db8f04834806ed22c84fa26fd5468a36240867f90 +# input_hash: 608b87f4b855ba292c2017ba4876079f2137ef68271c41d471fdff5adcbddbbb channels: - conda-forge @@ -135,7 +135,7 @@ dependencies: - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hb60516a_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_hd72426e_102 - toolz=1.1.0=pyhd8ed1ab_1 @@ -160,10 +160,10 @@ dependencies: - zstandard=0.25.0=py312h5253ce2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index f85a1b59..85dad224 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: e9366d490217d0ff14d810f84143aa5b99608204d4f100db017f77dee02ba1b7 +# input_hash: f4227737b8187e2e8802ca32ed30b32d0ca704c31a51c38346f3b858f1284b8f channels: - conda-forge @@ -229,7 +229,7 @@ dependencies: - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tbb=2021.13.0=h18a62a1_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - terminado=0.18.1=pyh5737063_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -273,10 +273,10 @@ dependencies: - zstandard=0.25.0=py312he5662c2_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 6f2accee..a78f1498 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: e9366d490217d0ff14d810f84143aa5b99608204d4f100db017f77dee02ba1b7 +# input_hash: f4227737b8187e2e8802ca32ed30b32d0ca704c31a51c38346f3b858f1284b8f channels: - conda-forge @@ -117,7 +117,7 @@ dependencies: - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h18a62a1_3 - - tblib=3.1.0=pyhd8ed1ab_0 + - tblib=3.2.1=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h2c6b04d_2 - toolz=1.1.0=pyhd8ed1ab_1 @@ -147,10 +147,10 @@ dependencies: - zstandard=0.25.0=py312he5662c2_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 - - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 - - grid-apps == 0.1.0b2 --hash=sha256:36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b - - mira-simpeg == 0.23.0.2b3 --hash=sha256:05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 2edecd85..8a9f0e8b 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: da80cf40edcb5c1cfb9414b6e2a88c9cf5fbd765ef1e5975629a2f373cc4776a - linux-64: 04182781a63ead68e8e7c31d9a09e754d8ad6f0d4d41762585826d02943a60e8 + win-64: 4b50ba3c2f65610d4554600e47eaa435e2e4e4159dc928f313a69c754f1172f8 + linux-64: 4b44185901b6b216814435620972c2fa2a8d727e93331e011fd42a3a947056ca channels: - url: conda-forge used_env_vars: [] @@ -6765,27 +6765,27 @@ package: category: main optional: false - name: tblib - version: 3.1.0 + version: 3.2.1 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.2.1-pyhcf101f3_0.conda hash: - md5: a15c62b8a306b8978f094f76da2f903f - sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 + md5: c07c341cc6ab9ed17b5a087e4bc954d0 + sha256: 60c58dca39b30c3d1e2d8a474fe71c04537b8a5e42b9759706129f36100c84bf category: main optional: false - name: tblib - version: 3.1.0 + version: 3.2.1 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.2.1-pyhcf101f3_0.conda hash: - md5: a15c62b8a306b8978f094f76da2f903f - sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 + md5: c07c341cc6ab9ed17b5a087e4bc954d0 + sha256: 60c58dca39b30c3d1e2d8a474fe71c04537b8a5e42b9759706129f36100c84bf category: main optional: false - name: terminado @@ -7797,35 +7797,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.7.0a1.dev3+80c4658 manager: pip platform: linux-64 dependencies: - geoh5py: '>=0.12.0b1,<0.13.dev' + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: 80c46588d47b70a1dd26aef06ccfa24bc1585502 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.7.0a1.dev3+80c4658 manager: pip platform: win-64 dependencies: - geoh5py: '>=0.12.0b1,<0.13.dev' + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: 80c46588d47b70a1dd26aef06ccfa24bc1585502 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 category: main optional: false - name: geoh5py - version: 0.12.0b3 + version: 0.12.0b4.dev8+a9f57210 manager: pip platform: linux-64 dependencies: @@ -7833,13 +7839,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c hash: - sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 + sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c category: main optional: false - name: geoh5py - version: 0.12.0b3 + version: 0.12.0b4.dev8+a9f57210 manager: pip platform: win-64 dependencies: @@ -7847,51 +7856,58 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c hash: - sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 + sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c category: main optional: false - name: grid-apps - version: 0.1.0b2 + version: 0.2.0a0 manager: pip platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: '>=0.6.0b1,<0.7.dev' - geoh5py: '>=0.12.0b1,<0.13.dev' + geoapps-utils: 0.7.0a1.dev3+80c4658 + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/grid-apps/0.1.0b2/grid_apps-0.1.0b2-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 hash: - sha256: 36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b + sha256: d6a42611003c184354e1367de41a88783b928166 + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 category: main optional: false - name: grid-apps - version: 0.1.0b2 + version: 0.2.0a0 manager: pip platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: '>=0.6.0b1,<0.7.dev' - geoh5py: '>=0.12.0b1,<0.13.dev' + geoapps-utils: 0.7.0a1.dev3+80c4658 + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/grid-apps/0.1.0b2/grid_apps-0.1.0b2-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 hash: - sha256: 36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b + sha256: d6a42611003c184354e1367de41a88783b928166 + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 category: main optional: false - name: mira-simpeg - version: 0.23.0.2b3 + version: 0.23.0.2b2 manager: pip platform: linux-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.12.0b3,<0.13.dev' libdlf: '*' @@ -7899,20 +7915,20 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.2b3/mira_simpeg-0.23.0.2b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c hash: - sha256: 05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + sha256: 268b4944c9bc46a69e9273c9f0d1235612e72b0c + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c category: main optional: false - name: mira-simpeg - version: 0.23.0.2b3 + version: 0.23.0.2b2 manager: pip platform: win-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.12.0b3,<0.13.dev' libdlf: '*' @@ -7920,9 +7936,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.2b3/mira_simpeg-0.23.0.2b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c hash: - sha256: 05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + sha256: 268b4944c9bc46a69e9273c9f0d1235612e72b0c + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c category: main optional: false diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index c2c56f89..62a2a98c 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: b3bafc91b46092ea8d73661dc4e01f372b7d5b9550e3793f855ed382ff152afb - linux-64: c2eb8ea440937825b991f1a9ca495d24a3ae8d501aaa0c5e6da2624aebf55dac + win-64: ee33255c0e6d79088a9488622661e4c8bb0064adc36e330771a8a3be1c8eb401 + linux-64: 47df5795e1fabb6dd4cb7acb7d5ab271c59d2d0d9aff199c256913c17f5169d1 channels: - url: conda-forge used_env_vars: [] @@ -6791,27 +6791,27 @@ package: category: main optional: false - name: tblib - version: 3.1.0 + version: 3.2.1 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.2.1-pyhcf101f3_0.conda hash: - md5: a15c62b8a306b8978f094f76da2f903f - sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 + md5: c07c341cc6ab9ed17b5a087e4bc954d0 + sha256: 60c58dca39b30c3d1e2d8a474fe71c04537b8a5e42b9759706129f36100c84bf category: main optional: false - name: tblib - version: 3.1.0 + version: 3.2.1 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.2.1-pyhcf101f3_0.conda hash: - md5: a15c62b8a306b8978f094f76da2f903f - sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 + md5: c07c341cc6ab9ed17b5a087e4bc954d0 + sha256: 60c58dca39b30c3d1e2d8a474fe71c04537b8a5e42b9759706129f36100c84bf category: main optional: false - name: terminado @@ -7854,35 +7854,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.7.0a1.dev3+80c4658 manager: pip platform: linux-64 dependencies: - geoh5py: '>=0.12.0b1,<0.13.dev' + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: 80c46588d47b70a1dd26aef06ccfa24bc1585502 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.7.0a1.dev3+80c4658 manager: pip platform: win-64 dependencies: - geoh5py: '>=0.12.0b1,<0.13.dev' + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: 80c46588d47b70a1dd26aef06ccfa24bc1585502 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 category: main optional: false - name: geoh5py - version: 0.12.0b3 + version: 0.12.0b4.dev8+a9f57210 manager: pip platform: linux-64 dependencies: @@ -7890,13 +7896,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c hash: - sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 + sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c category: main optional: false - name: geoh5py - version: 0.12.0b3 + version: 0.12.0b4.dev8+a9f57210 manager: pip platform: win-64 dependencies: @@ -7904,51 +7913,58 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c hash: - sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 + sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c category: main optional: false - name: grid-apps - version: 0.1.0b2 + version: 0.2.0a0 manager: pip platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: '>=0.6.0b1,<0.7.dev' - geoh5py: '>=0.12.0b1,<0.13.dev' + geoapps-utils: 0.7.0a1.dev3+80c4658 + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/grid-apps/0.1.0b2/grid_apps-0.1.0b2-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 hash: - sha256: 36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b + sha256: d6a42611003c184354e1367de41a88783b928166 + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 category: main optional: false - name: grid-apps - version: 0.1.0b2 + version: 0.2.0a0 manager: pip platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: '>=0.6.0b1,<0.7.dev' - geoh5py: '>=0.12.0b1,<0.13.dev' + geoapps-utils: 0.7.0a1.dev3+80c4658 + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/grid-apps/0.1.0b2/grid_apps-0.1.0b2-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 hash: - sha256: 36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b + sha256: d6a42611003c184354e1367de41a88783b928166 + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 category: main optional: false - name: mira-simpeg - version: 0.23.0.2b3 + version: 0.23.0.2b2 manager: pip platform: linux-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.12.0b3,<0.13.dev' libdlf: '*' @@ -7956,20 +7972,20 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.2b3/mira_simpeg-0.23.0.2b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c hash: - sha256: 05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + sha256: 268b4944c9bc46a69e9273c9f0d1235612e72b0c + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c category: main optional: false - name: mira-simpeg - version: 0.23.0.2b3 + version: 0.23.0.2b2 manager: pip platform: win-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.12.0b3,<0.13.dev' libdlf: '*' @@ -7977,9 +7993,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.2b3/mira_simpeg-0.23.0.2b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c hash: - sha256: 05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + sha256: 268b4944c9bc46a69e9273c9f0d1235612e72b0c + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c category: main optional: false diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index cc8efe6f..68507394 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: e9366d490217d0ff14d810f84143aa5b99608204d4f100db017f77dee02ba1b7 - linux-64: d840e5519329f10385a7146db8f04834806ed22c84fa26fd5468a36240867f90 + win-64: f4227737b8187e2e8802ca32ed30b32d0ca704c31a51c38346f3b858f1284b8f + linux-64: 608b87f4b855ba292c2017ba4876079f2137ef68271c41d471fdff5adcbddbbb channels: - url: conda-forge used_env_vars: [] @@ -6871,27 +6871,27 @@ package: category: main optional: false - name: tblib - version: 3.1.0 + version: 3.2.1 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.2.1-pyhcf101f3_0.conda hash: - md5: a15c62b8a306b8978f094f76da2f903f - sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 + md5: c07c341cc6ab9ed17b5a087e4bc954d0 + sha256: 60c58dca39b30c3d1e2d8a474fe71c04537b8a5e42b9759706129f36100c84bf category: main optional: false - name: tblib - version: 3.1.0 + version: 3.2.1 manager: conda platform: win-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/tblib-3.2.1-pyhcf101f3_0.conda hash: - md5: a15c62b8a306b8978f094f76da2f903f - sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 + md5: c07c341cc6ab9ed17b5a087e4bc954d0 + sha256: 60c58dca39b30c3d1e2d8a474fe71c04537b8a5e42b9759706129f36100c84bf category: main optional: false - name: terminado @@ -7934,35 +7934,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.7.0a1.dev3+80c4658 manager: pip platform: linux-64 dependencies: - geoh5py: '>=0.12.0b1,<0.13.dev' + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: 80c46588d47b70a1dd26aef06ccfa24bc1585502 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.7.0a1.dev3+80c4658 manager: pip platform: win-64 dependencies: - geoh5py: '>=0.12.0b1,<0.13.dev' + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: 80c46588d47b70a1dd26aef06ccfa24bc1585502 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502 category: main optional: false - name: geoh5py - version: 0.12.0b3 + version: 0.12.0b4.dev8+a9f57210 manager: pip platform: linux-64 dependencies: @@ -7970,13 +7976,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c hash: - sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 + sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c category: main optional: false - name: geoh5py - version: 0.12.0b3 + version: 0.12.0b4.dev8+a9f57210 manager: pip platform: win-64 dependencies: @@ -7984,51 +7993,58 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c hash: - sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 + sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c category: main optional: false - name: grid-apps - version: 0.1.0b2 + version: 0.2.0a0 manager: pip platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: '>=0.6.0b1,<0.7.dev' - geoh5py: '>=0.12.0b1,<0.13.dev' + geoapps-utils: 0.7.0a1.dev3+80c4658 + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/grid-apps/0.1.0b2/grid_apps-0.1.0b2-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 hash: - sha256: 36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b + sha256: d6a42611003c184354e1367de41a88783b928166 + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 category: main optional: false - name: grid-apps - version: 0.1.0b2 + version: 0.2.0a0 manager: pip platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: '>=0.6.0b1,<0.7.dev' - geoh5py: '>=0.12.0b1,<0.13.dev' + geoapps-utils: 0.7.0a1.dev3+80c4658 + geoh5py: 0.12.0b4.dev8+a9f57210 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/grid-apps/0.1.0b2/grid_apps-0.1.0b2-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 hash: - sha256: 36896a6c272ba074aabf882ffb3d288dc816400d720564a41faa561c3dfc3c8b + sha256: d6a42611003c184354e1367de41a88783b928166 + source: + type: url + url: git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166 category: main optional: false - name: mira-simpeg - version: 0.23.0.2b3 + version: 0.23.0.2b2 manager: pip platform: linux-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.12.0b3,<0.13.dev' libdlf: '*' @@ -8036,20 +8052,20 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.2b3/mira_simpeg-0.23.0.2b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c hash: - sha256: 05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + sha256: 268b4944c9bc46a69e9273c9f0d1235612e72b0c + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c category: main optional: false - name: mira-simpeg - version: 0.23.0.2b3 + version: 0.23.0.2b2 manager: pip platform: win-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.12.0b3,<0.13.dev' libdlf: '*' @@ -8057,9 +8073,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.2b3/mira_simpeg-0.23.0.2b3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c hash: - sha256: 05a809903fd5871ed0a6b3b7ad3f25f4980fffb65e925e45be3d244466217ac9 + sha256: 268b4944c9bc46a69e9273c9f0d1235612e72b0c + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index 468d6cef..1d150750 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,17 +93,17 @@ python-mumps = ">=0.0.3, <0.0.4.dev" ## Pip dependencies from Git repositories #---------------------------------------- -geoh5py = {version = ">=0.12.0b1, <0.13.dev", source = "pypi", allow-prereleases = true} -#geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"} +#geoh5y = {version = ">=0.12.0b1, <0.13.dev", source = "pypi", allow-prereleases = true} +geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"} -grid-apps = {version = ">=0.1.0b1, <0.2.dev", source = "pypi", allow-prereleases = true} -#grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "develop"} +#grid-apps = {version = ">=0.1.0b1, <0.2.dev", source = "pypi", allow-prereleases = true} +grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "develop"} -geoapps-utils = {version = ">=0.6.b1, <0.7.dev", source = "pypi", allow-prereleases = true} -#geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"} +#geoapps-utils = {version = ">=0.6.b1, <0.7.dev", source = "pypi", allow-prereleases = true} +geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"} -mira-simpeg = {version = ">=0.23.0.2b1, <0.23.1.dev", source="pypi", allow-prereleases = true, extras = ["dask"]} -#mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "develop", extras = ["dask"]} +#mira-simpeg = {version = ">=0.23.0.2b1, <0.23.1.dev", source="pypi", allow-prereleases = true, extras = ["dask"]} +mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "develop", extras = ["dask"]} ## about pip dependencies # to be specified to work with conda-lock