From edb5bffa1e0fa1b99105b4c27df6ed7262f950fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Wed, 5 Nov 2025 17:03:36 -0500 Subject: [PATCH 1/3] [GEOPY-2561] fix return typehint --- simpeg_drivers/driver.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index c4252c9c..f43ab7cb 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -26,6 +26,8 @@ from pathlib import Path from time import time +from typing_extensions import Self + import numpy as np from dask import config as dconf @@ -738,7 +740,7 @@ def configure_dask(self): dconf.set(scheduler="threads", pool=ThreadPool(n_cpu)) @classmethod - def start(cls, filepath: str | Path | InputFile, **kwargs) -> BaseDriver: + def start(cls, filepath: str | Path | InputFile, **kwargs) -> Self: """ Start the inversion driver. From cde115eb3a491a42ee42452a0a51db0ff553f6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Wed, 5 Nov 2025 17:20:43 -0500 Subject: [PATCH 2/3] [GEOPY-2561] temporarily use geoapps-util @GEOPY-2561 --- .../py-3.10-linux-64-dev.conda.lock.yml | 10 ++++----- environments/py-3.10-linux-64.conda.lock.yml | 10 ++++----- .../py-3.10-win-64-dev.conda.lock.yml | 10 ++++----- environments/py-3.10-win-64.conda.lock.yml | 10 ++++----- .../py-3.11-linux-64-dev.conda.lock.yml | 10 ++++----- environments/py-3.11-linux-64.conda.lock.yml | 10 ++++----- .../py-3.11-win-64-dev.conda.lock.yml | 10 ++++----- environments/py-3.11-win-64.conda.lock.yml | 10 ++++----- .../py-3.12-linux-64-dev.conda.lock.yml | 10 ++++----- environments/py-3.12-linux-64.conda.lock.yml | 10 ++++----- .../py-3.12-win-64-dev.conda.lock.yml | 10 ++++----- environments/py-3.12-win-64.conda.lock.yml | 10 ++++----- py-3.10.conda-lock.yml | 22 ++++++++++++------- py-3.11.conda-lock.yml | 22 ++++++++++++------- py-3.12.conda-lock.yml | 22 ++++++++++++------- pyproject.toml | 4 ++-- 16 files changed, 104 insertions(+), 86 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 547f37dc..4f92e96c 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: 8260da684096669baf3af9786ecbbf422c0dfb7325dce2aab6cbccfc78f7c20d channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 d216c7e3..48ca9552 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: 8260da684096669baf3af9786ecbbf422c0dfb7325dce2aab6cbccfc78f7c20d channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 a27a96ad..33aa7ce3 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: ee2aea01b96686e9b047add10127f0a3f2462215f2d3afba559c1ba7bce2d183 channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 cf02d45d..fa019a07 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: ee2aea01b96686e9b047add10127f0a3f2462215f2d3afba559c1ba7bce2d183 channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 14a4af3d..f51e616e 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: 44e9b390494f89230b48f2074d6767ada5cf47201e6b13ed4a09f07d0e74f92e channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 fa047881..5f84804e 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: 44e9b390494f89230b48f2074d6767ada5cf47201e6b13ed4a09f07d0e74f92e channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 2385b550..01faa131 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: d213ba290206d8da750434e52d9824112027cb2cec2bed20b0bc8a782652abc8 channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 4e6b191e..f8adb3ff 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: d213ba290206d8da750434e52d9824112027cb2cec2bed20b0bc8a782652abc8 channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 31c17b64..6aa068d3 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: a3b463c777ff8f00f38afcd60129a3d7fd075b6e4cb55f16810c77bb624dc036 channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 df866cbe..3c275533 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: a3b463c777ff8f00f38afcd60129a3d7fd075b6e4cb55f16810c77bb624dc036 channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 53ff3062..2df26ba1 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: 474f7d0036aa561fd601b94bf54f28c4eba21136e36a67c81c35a578433904b1 channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 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 caf01261..7f3d62c7 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: 474f7d0036aa561fd601b94bf54f28c4eba21136e36a67c81c35a578433904b1 channels: - conda-forge @@ -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@ff99cd060c244d4fa9853ba878de48ad11626257 + - geoh5py == 0.12.0b3 + - grid-apps == 0.1.0b2 + - mira-simpeg == 0.23.0.2b3 variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 5c00eb7f..40703827 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: ee2aea01b96686e9b047add10127f0a3f2462215f2d3afba559c1ba7bce2d183 + linux-64: 8260da684096669baf3af9786ecbbf422c0dfb7325dce2aab6cbccfc78f7c20d channels: - url: conda-forge used_env_vars: [] @@ -7797,7 +7797,7 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.6.0b2.dev1+ff99cd0 manager: pip platform: linux-64 dependencies: @@ -7805,13 +7805,16 @@ package: 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@ff99cd060c244d4fa9853ba878de48ad11626257 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: ff99cd060c244d4fa9853ba878de48ad11626257 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.6.0b2.dev1+ff99cd0 manager: pip platform: win-64 dependencies: @@ -7819,9 +7822,12 @@ package: 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@ff99cd060c244d4fa9853ba878de48ad11626257 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: ff99cd060c244d4fa9853ba878de48ad11626257 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 category: main optional: false - name: geoh5py diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index e570ce08..472422b4 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: d213ba290206d8da750434e52d9824112027cb2cec2bed20b0bc8a782652abc8 + linux-64: 44e9b390494f89230b48f2074d6767ada5cf47201e6b13ed4a09f07d0e74f92e channels: - url: conda-forge used_env_vars: [] @@ -7854,7 +7854,7 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.6.0b2.dev1+ff99cd0 manager: pip platform: linux-64 dependencies: @@ -7862,13 +7862,16 @@ package: 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@ff99cd060c244d4fa9853ba878de48ad11626257 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: ff99cd060c244d4fa9853ba878de48ad11626257 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.6.0b2.dev1+ff99cd0 manager: pip platform: win-64 dependencies: @@ -7876,9 +7879,12 @@ package: 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@ff99cd060c244d4fa9853ba878de48ad11626257 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: ff99cd060c244d4fa9853ba878de48ad11626257 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 category: main optional: false - name: geoh5py diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 797faf05..1b3adfc2 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: 474f7d0036aa561fd601b94bf54f28c4eba21136e36a67c81c35a578433904b1 + linux-64: a3b463c777ff8f00f38afcd60129a3d7fd075b6e4cb55f16810c77bb624dc036 channels: - url: conda-forge used_env_vars: [] @@ -7934,7 +7934,7 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.6.0b2.dev1+ff99cd0 manager: pip platform: linux-64 dependencies: @@ -7942,13 +7942,16 @@ package: 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@ff99cd060c244d4fa9853ba878de48ad11626257 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: ff99cd060c244d4fa9853ba878de48ad11626257 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 category: main optional: false - name: geoapps-utils - version: 0.6.0b1 + version: 0.6.0b2.dev1+ff99cd0 manager: pip platform: win-64 dependencies: @@ -7956,9 +7959,12 @@ package: 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@ff99cd060c244d4fa9853ba878de48ad11626257 hash: - sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + sha256: ff99cd060c244d4fa9853ba878de48ad11626257 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 category: main optional: false - name: geoh5py diff --git a/pyproject.toml b/pyproject.toml index de2b1488..5ba0bca8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -100,8 +100,8 @@ geoh5py = {version = ">=0.12.0b1, <0.13.dev", source = "pypi", allow-prereleases 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 = "GEOPY-2561"} 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"]} From b11e64fc6de89958d92519478f57f84a2e850762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Wed, 5 Nov 2025 18:28:12 -0500 Subject: [PATCH 3/3] [GEOPY-2561] relock env on published dependencies --- .../py-3.10-linux-64-dev.conda.lock.yml | 14 ++--- environments/py-3.10-linux-64.conda.lock.yml | 14 ++--- .../py-3.10-win-64-dev.conda.lock.yml | 14 ++--- environments/py-3.10-win-64.conda.lock.yml | 14 ++--- .../py-3.11-linux-64-dev.conda.lock.yml | 14 ++--- environments/py-3.11-linux-64.conda.lock.yml | 14 ++--- .../py-3.11-win-64-dev.conda.lock.yml | 14 ++--- environments/py-3.11-win-64.conda.lock.yml | 14 ++--- .../py-3.12-linux-64-dev.conda.lock.yml | 14 ++--- environments/py-3.12-linux-64.conda.lock.yml | 14 ++--- .../py-3.12-win-64-dev.conda.lock.yml | 14 ++--- environments/py-3.12-win-64.conda.lock.yml | 14 ++--- py-3.10.conda-lock.yml | 58 +++++++++---------- py-3.11.conda-lock.yml | 58 +++++++++---------- py-3.12.conda-lock.yml | 58 +++++++++---------- pyproject.toml | 4 +- 16 files changed, 164 insertions(+), 182 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 4f92e96c..c280eacb 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: 8260da684096669baf3af9786ecbbf422c0dfb7325dce2aab6cbccfc78f7c20d +# input_hash: 04182781a63ead68e8e7c31d9a09e754d8ad6f0d4d41762585826d02943a60e8 channels: - conda-forge @@ -197,8 +197,8 @@ dependencies: - ptyprocess=0.7.0=pyhd8ed1ab_1 - pure_eval=0.2.3=pyhd8ed1ab_1 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py310hd8f68c5_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py310hd8f68c5_0 - pydiso=0.1.2=py310h4b187eb_1 - pygments=2.19.2=pyhd8ed1ab_0 - pylint=4.0.2=pyhcf101f3_0 @@ -282,10 +282,10 @@ dependencies: - zstandard=0.25.0=py310h139afa4_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 48ca9552..0961b70c 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: 8260da684096669baf3af9786ecbbf422c0dfb7325dce2aab6cbccfc78f7c20d +# input_hash: 04182781a63ead68e8e7c31d9a09e754d8ad6f0d4d41762585826d02943a60e8 channels: - conda-forge @@ -113,8 +113,8 @@ dependencies: - psutil=7.1.3=py310h139afa4_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py310hd8f68c5_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py310hd8f68c5_0 - pydiso=0.1.2=py310h4b187eb_1 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 @@ -158,10 +158,10 @@ dependencies: - zstandard=0.25.0=py310h139afa4_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 33aa7ce3..6f2e2cee 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: ee2aea01b96686e9b047add10127f0a3f2462215f2d3afba559c1ba7bce2d183 +# input_hash: da80cf40edcb5c1cfb9414b6e2a88c9cf5fbd765ef1e5975629a2f373cc4776a channels: - conda-forge @@ -177,8 +177,8 @@ dependencies: - pthread-stubs=0.4=h0e40799_1002 - pure_eval=0.2.3=pyhd8ed1ab_1 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py310h034784e_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py310h034784e_0 - pydiso=0.1.2=py310h3dbbb0c_1 - pygments=2.19.2=pyhd8ed1ab_0 - pylint=4.0.2=pyhcf101f3_0 @@ -268,10 +268,10 @@ dependencies: - zstandard=0.25.0=py310h1637853_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 fa019a07..83a3b25d 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: ee2aea01b96686e9b047add10127f0a3f2462215f2d3afba559c1ba7bce2d183 +# input_hash: da80cf40edcb5c1cfb9414b6e2a88c9cf5fbd765ef1e5975629a2f373cc4776a channels: - conda-forge @@ -96,8 +96,8 @@ dependencies: - psutil=7.1.3=py310h1637853_0 - pthread-stubs=0.4=h0e40799_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py310h034784e_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py310h034784e_0 - pydiso=0.1.2=py310h3dbbb0c_1 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 @@ -145,10 +145,10 @@ dependencies: - zstandard=0.25.0=py310h1637853_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 f51e616e..6ad38454 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: 44e9b390494f89230b48f2074d6767ada5cf47201e6b13ed4a09f07d0e74f92e +# input_hash: c2eb8ea440937825b991f1a9ca495d24a3ae8d501aaa0c5e6da2624aebf55dac channels: - conda-forge @@ -198,8 +198,8 @@ dependencies: - ptyprocess=0.7.0=pyhd8ed1ab_1 - pure_eval=0.2.3=pyhd8ed1ab_1 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py311h902ca64_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py311h902ca64_0 - pydiso=0.1.2=py311h6070e36_1 - pygments=2.19.2=pyhd8ed1ab_0 - pylint=4.0.2=pyhcf101f3_0 @@ -284,10 +284,10 @@ dependencies: - zstandard=0.25.0=py311haee01d2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 5f84804e..2443e3b3 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: 44e9b390494f89230b48f2074d6767ada5cf47201e6b13ed4a09f07d0e74f92e +# input_hash: c2eb8ea440937825b991f1a9ca495d24a3ae8d501aaa0c5e6da2624aebf55dac channels: - conda-forge @@ -114,8 +114,8 @@ dependencies: - psutil=7.1.3=py311haee01d2_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py311h902ca64_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py311h902ca64_0 - pydiso=0.1.2=py311h6070e36_1 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 @@ -160,10 +160,10 @@ dependencies: - zstandard=0.25.0=py311haee01d2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 01faa131..5a62ee14 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: d213ba290206d8da750434e52d9824112027cb2cec2bed20b0bc8a782652abc8 +# input_hash: b3bafc91b46092ea8d73661dc4e01f372b7d5b9550e3793f855ed382ff152afb channels: - conda-forge @@ -178,8 +178,8 @@ dependencies: - pthread-stubs=0.4=h0e40799_1002 - pure_eval=0.2.3=pyhd8ed1ab_1 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py311hf51aa87_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py311hf51aa87_0 - pydiso=0.1.2=py311h1c8cef1_1 - pygments=2.19.2=pyhd8ed1ab_0 - pylint=4.0.2=pyhcf101f3_0 @@ -270,10 +270,10 @@ dependencies: - zstandard=0.25.0=py311hf893f09_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 f8adb3ff..d350f589 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: d213ba290206d8da750434e52d9824112027cb2cec2bed20b0bc8a782652abc8 +# input_hash: b3bafc91b46092ea8d73661dc4e01f372b7d5b9550e3793f855ed382ff152afb channels: - conda-forge @@ -97,8 +97,8 @@ dependencies: - psutil=7.1.3=py311hf893f09_0 - pthread-stubs=0.4=h0e40799_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py311hf51aa87_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py311hf51aa87_0 - pydiso=0.1.2=py311h1c8cef1_1 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 @@ -147,10 +147,10 @@ dependencies: - zstandard=0.25.0=py311hf893f09_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 6aa068d3..e6a75f2e 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: a3b463c777ff8f00f38afcd60129a3d7fd075b6e4cb55f16810c77bb624dc036 +# input_hash: d840e5519329f10385a7146db8f04834806ed22c84fa26fd5468a36240867f90 channels: - conda-forge @@ -200,8 +200,8 @@ dependencies: - ptyprocess=0.7.0=pyhd8ed1ab_1 - pure_eval=0.2.3=pyhd8ed1ab_1 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py312h868fb18_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py312h868fb18_0 - pydiso=0.1.2=py312h686354e_1 - pygments=2.19.2=pyhd8ed1ab_0 - pylint=4.0.2=pyhcf101f3_0 @@ -287,10 +287,10 @@ dependencies: - zstandard=0.25.0=py312h5253ce2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 3c275533..1751176b 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: a3b463c777ff8f00f38afcd60129a3d7fd075b6e4cb55f16810c77bb624dc036 +# input_hash: d840e5519329f10385a7146db8f04834806ed22c84fa26fd5468a36240867f90 channels: - conda-forge @@ -114,8 +114,8 @@ dependencies: - psutil=7.1.3=py312h5253ce2_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py312h868fb18_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py312h868fb18_0 - pydiso=0.1.2=py312h686354e_1 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 @@ -160,10 +160,10 @@ dependencies: - zstandard=0.25.0=py312h5253ce2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 2df26ba1..f85a1b59 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: 474f7d0036aa561fd601b94bf54f28c4eba21136e36a67c81c35a578433904b1 +# input_hash: e9366d490217d0ff14d810f84143aa5b99608204d4f100db017f77dee02ba1b7 channels: - conda-forge @@ -180,8 +180,8 @@ dependencies: - pthread-stubs=0.4=h0e40799_1002 - pure_eval=0.2.3=pyhd8ed1ab_1 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py312hdabe01f_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py312hdabe01f_0 - pydiso=0.1.2=py312h3fe0e52_1 - pygments=2.19.2=pyhd8ed1ab_0 - pylint=4.0.2=pyhcf101f3_0 @@ -273,10 +273,10 @@ dependencies: - zstandard=0.25.0=py312he5662c2_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 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 7f3d62c7..6f2accee 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: 474f7d0036aa561fd601b94bf54f28c4eba21136e36a67c81c35a578433904b1 +# input_hash: e9366d490217d0ff14d810f84143aa5b99608204d4f100db017f77dee02ba1b7 channels: - conda-forge @@ -97,8 +97,8 @@ dependencies: - psutil=7.1.3=py312he5662c2_0 - pthread-stubs=0.4=h0e40799_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.12.3=pyh3cfb1c2_0 - - pydantic-core=2.41.4=py312hdabe01f_0 + - pydantic=2.12.4=pyh3cfb1c2_0 + - pydantic-core=2.41.5=py312hdabe01f_0 - pydiso=0.1.2=py312h3fe0e52_1 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.5=pyhcf101f3_0 @@ -147,10 +147,10 @@ dependencies: - zstandard=0.25.0=py312he5662c2_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 - - geoh5py == 0.12.0b3 - - grid-apps == 0.1.0b2 - - mira-simpeg == 0.23.0.2b3 + - 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 variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 40703827..2edecd85 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: ee2aea01b96686e9b047add10127f0a3f2462215f2d3afba559c1ba7bce2d183 - linux-64: 8260da684096669baf3af9786ecbbf422c0dfb7325dce2aab6cbccfc78f7c20d + win-64: da80cf40edcb5c1cfb9414b6e2a88c9cf5fbd765ef1e5975629a2f373cc4776a + linux-64: 04182781a63ead68e8e7c31d9a09e754d8ad6f0d4d41762585826d02943a60e8 channels: - url: conda-forge used_env_vars: [] @@ -5346,41 +5346,41 @@ package: category: main optional: false - name: pydantic - version: 2.12.3 + version: 2.12.4 manager: conda platform: linux-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.41.4 + pydantic-core: 2.41.5 python: '>=3.10' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.2' typing_extensions: '>=4.14.1' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.3-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.4-pyh3cfb1c2_0.conda hash: - md5: 2cb5d62fdf68deb0263663598feb9fc5 - sha256: 6a940747e8445653224dcff95fadf1060c66b9e544fdb0ed469b70a98c3aee7e + md5: bf6ce72315b6759453d8c90a894e9e4c + sha256: c51297f0f6ef13776cc5b61c37d00c0d45faaed34f81d196e64bebc989f3e497 category: main optional: false - name: pydantic - version: 2.12.3 + version: 2.12.4 manager: conda platform: win-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.41.4 + pydantic-core: 2.41.5 python: '>=3.10' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.2' typing_extensions: '>=4.14.1' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.3-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.4-pyh3cfb1c2_0.conda hash: - md5: 2cb5d62fdf68deb0263663598feb9fc5 - sha256: 6a940747e8445653224dcff95fadf1060c66b9e544fdb0ed469b70a98c3aee7e + md5: bf6ce72315b6759453d8c90a894e9e4c + sha256: c51297f0f6ef13776cc5b61c37d00c0d45faaed34f81d196e64bebc989f3e497 category: main optional: false - name: pydantic-core - version: 2.41.4 + version: 2.41.5 manager: conda platform: linux-64 dependencies: @@ -5389,14 +5389,14 @@ package: python: '' python_abi: 3.10.* typing-extensions: '>=4.6.0,!=4.7.0' - url: https://repo.prefix.dev/conda-forge/linux-64/pydantic-core-2.41.4-py310hd8f68c5_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pydantic-core-2.41.5-py310hd8f68c5_0.conda hash: - md5: e6a2c9696ff99ae8a47c898f643cc2b0 - sha256: 5108adc2d3c25343cfc26f8fccdb407427eb7053e4fb4b37f07f1c95187fd6cc + md5: 9b2338c7021dca0c0f3149e6b1e11bdb + sha256: 37663ebef306620b84e9c3f26bcb122f7f70904374c1fa305221cc4d87aae403 category: main optional: false - name: pydantic-core - version: 2.41.4 + version: 2.41.5 manager: conda platform: win-64 dependencies: @@ -5406,10 +5406,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/pydantic-core-2.41.4-py310h034784e_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pydantic-core-2.41.5-py310h034784e_0.conda hash: - md5: 63b4a7922606d8e280d58c51380774bd - sha256: 51e5a7d247832664da04201d4e8a1750c361f0fd175f5e24c993a579f6bf0d6c + md5: 082a265124fef1094d6d7941441cdc15 + sha256: f6eb0c918e7104b7f27c6f9589c7e2b0c1b73544f8f59c1cbba9ab73ec95df6e category: main optional: false - name: pydiso @@ -7797,7 +7797,7 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0b2.dev1+ff99cd0 + version: 0.6.0b1 manager: pip platform: linux-64 dependencies: @@ -7805,16 +7805,13 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + 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 hash: - sha256: ff99cd060c244d4fa9853ba878de48ad11626257 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoapps-utils - version: 0.6.0b2.dev1+ff99cd0 + version: 0.6.0b1 manager: pip platform: win-64 dependencies: @@ -7822,12 +7819,9 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + 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 hash: - sha256: ff99cd060c244d4fa9853ba878de48ad11626257 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoh5py diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 472422b4..c2c56f89 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: d213ba290206d8da750434e52d9824112027cb2cec2bed20b0bc8a782652abc8 - linux-64: 44e9b390494f89230b48f2074d6767ada5cf47201e6b13ed4a09f07d0e74f92e + win-64: b3bafc91b46092ea8d73661dc4e01f372b7d5b9550e3793f855ed382ff152afb + linux-64: c2eb8ea440937825b991f1a9ca495d24a3ae8d501aaa0c5e6da2624aebf55dac channels: - url: conda-forge used_env_vars: [] @@ -5372,41 +5372,41 @@ package: category: main optional: false - name: pydantic - version: 2.12.3 + version: 2.12.4 manager: conda platform: linux-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.41.4 + pydantic-core: 2.41.5 python: '>=3.10' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.2' typing_extensions: '>=4.14.1' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.3-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.4-pyh3cfb1c2_0.conda hash: - md5: 2cb5d62fdf68deb0263663598feb9fc5 - sha256: 6a940747e8445653224dcff95fadf1060c66b9e544fdb0ed469b70a98c3aee7e + md5: bf6ce72315b6759453d8c90a894e9e4c + sha256: c51297f0f6ef13776cc5b61c37d00c0d45faaed34f81d196e64bebc989f3e497 category: main optional: false - name: pydantic - version: 2.12.3 + version: 2.12.4 manager: conda platform: win-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.41.4 + pydantic-core: 2.41.5 python: '>=3.10' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.2' typing_extensions: '>=4.14.1' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.3-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.4-pyh3cfb1c2_0.conda hash: - md5: 2cb5d62fdf68deb0263663598feb9fc5 - sha256: 6a940747e8445653224dcff95fadf1060c66b9e544fdb0ed469b70a98c3aee7e + md5: bf6ce72315b6759453d8c90a894e9e4c + sha256: c51297f0f6ef13776cc5b61c37d00c0d45faaed34f81d196e64bebc989f3e497 category: main optional: false - name: pydantic-core - version: 2.41.4 + version: 2.41.5 manager: conda platform: linux-64 dependencies: @@ -5415,14 +5415,14 @@ package: python: '' python_abi: 3.11.* typing-extensions: '>=4.6.0,!=4.7.0' - url: https://repo.prefix.dev/conda-forge/linux-64/pydantic-core-2.41.4-py311h902ca64_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pydantic-core-2.41.5-py311h902ca64_0.conda hash: - md5: a440367c3ba0b93cfb7c6b1b93989720 - sha256: 7f7472dfc6a7275ea6c03b7fa7c1060fa5a3d0e39bbab16eac907d13421abd0e + md5: ffddb15810f766cdde04fe1af24d7168 + sha256: 2632d271a937fe1aa932f40b282e8786c7d59158268042f158a31ef6bcc7edfe category: main optional: false - name: pydantic-core - version: 2.41.4 + version: 2.41.5 manager: conda platform: win-64 dependencies: @@ -5432,10 +5432,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/pydantic-core-2.41.4-py311hf51aa87_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pydantic-core-2.41.5-py311hf51aa87_0.conda hash: - md5: 67883b7e8b7260fa4571304e60cf0b01 - sha256: 9ed29654119c308889d3cdc08ddbefa4b070cba554d7f7db1cf372325dc8bed5 + md5: 7e97287ec2a853ff9588481dc19bc3ec + sha256: b99307c2f938550abd8e1ed2f1f5f57a81dac99f0c7daf86ccc2d8ad8a7e0e5c category: main optional: false - name: pydiso @@ -7854,7 +7854,7 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0b2.dev1+ff99cd0 + version: 0.6.0b1 manager: pip platform: linux-64 dependencies: @@ -7862,16 +7862,13 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + 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 hash: - sha256: ff99cd060c244d4fa9853ba878de48ad11626257 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoapps-utils - version: 0.6.0b2.dev1+ff99cd0 + version: 0.6.0b1 manager: pip platform: win-64 dependencies: @@ -7879,12 +7876,9 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + 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 hash: - sha256: ff99cd060c244d4fa9853ba878de48ad11626257 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoh5py diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 1b3adfc2..cc8efe6f 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: 474f7d0036aa561fd601b94bf54f28c4eba21136e36a67c81c35a578433904b1 - linux-64: a3b463c777ff8f00f38afcd60129a3d7fd075b6e4cb55f16810c77bb624dc036 + win-64: e9366d490217d0ff14d810f84143aa5b99608204d4f100db017f77dee02ba1b7 + linux-64: d840e5519329f10385a7146db8f04834806ed22c84fa26fd5468a36240867f90 channels: - url: conda-forge used_env_vars: [] @@ -5424,41 +5424,41 @@ package: category: main optional: false - name: pydantic - version: 2.12.3 + version: 2.12.4 manager: conda platform: linux-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.41.4 + pydantic-core: 2.41.5 python: '>=3.10' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.2' typing_extensions: '>=4.14.1' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.3-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.4-pyh3cfb1c2_0.conda hash: - md5: 2cb5d62fdf68deb0263663598feb9fc5 - sha256: 6a940747e8445653224dcff95fadf1060c66b9e544fdb0ed469b70a98c3aee7e + md5: bf6ce72315b6759453d8c90a894e9e4c + sha256: c51297f0f6ef13776cc5b61c37d00c0d45faaed34f81d196e64bebc989f3e497 category: main optional: false - name: pydantic - version: 2.12.3 + version: 2.12.4 manager: conda platform: win-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.41.4 + pydantic-core: 2.41.5 python: '>=3.10' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.2' typing_extensions: '>=4.14.1' - url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.3-pyh3cfb1c2_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pydantic-2.12.4-pyh3cfb1c2_0.conda hash: - md5: 2cb5d62fdf68deb0263663598feb9fc5 - sha256: 6a940747e8445653224dcff95fadf1060c66b9e544fdb0ed469b70a98c3aee7e + md5: bf6ce72315b6759453d8c90a894e9e4c + sha256: c51297f0f6ef13776cc5b61c37d00c0d45faaed34f81d196e64bebc989f3e497 category: main optional: false - name: pydantic-core - version: 2.41.4 + version: 2.41.5 manager: conda platform: linux-64 dependencies: @@ -5467,14 +5467,14 @@ package: python: '' python_abi: 3.12.* typing-extensions: '>=4.6.0,!=4.7.0' - url: https://repo.prefix.dev/conda-forge/linux-64/pydantic-core-2.41.4-py312h868fb18_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pydantic-core-2.41.5-py312h868fb18_0.conda hash: - md5: e0767518fa45df8b484421a405f764c6 - sha256: c0bcd8b16188ecb0b9148701d166888a91103e898c2401a45b290e8483d5bbca + md5: c7017a8aaec0ee5a5212d004e73bfdef + sha256: d1b924c342f3b526bb0a0d74e7ef8a8294f9df71355f0bbc619f9d3486931fe6 category: main optional: false - name: pydantic-core - version: 2.41.4 + version: 2.41.5 manager: conda platform: win-64 dependencies: @@ -5484,10 +5484,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/pydantic-core-2.41.4-py312hdabe01f_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pydantic-core-2.41.5-py312hdabe01f_0.conda hash: - md5: fa35bb0b9c3dca0da27c46ed61a5dfd4 - sha256: ee389c910c4fb3329c0dc36f3d68212c759c6082e7fa03d3d2ca85c2899b0a6b + md5: 79baaa876cfe843b62b0bcc3d0a1db2e + sha256: 931c28d0a67d4c0a388f172ffc1ee956a32a386fa5490b643406a1e02e8135d9 category: main optional: false - name: pydiso @@ -7934,7 +7934,7 @@ package: category: main optional: false - name: geoapps-utils - version: 0.6.0b2.dev1+ff99cd0 + version: 0.6.0b1 manager: pip platform: linux-64 dependencies: @@ -7942,16 +7942,13 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + 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 hash: - sha256: ff99cd060c244d4fa9853ba878de48ad11626257 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoapps-utils - version: 0.6.0b2.dev1+ff99cd0 + version: 0.6.0b1 manager: pip platform: win-64 dependencies: @@ -7959,12 +7956,9 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + 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 hash: - sha256: ff99cd060c244d4fa9853ba878de48ad11626257 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ff99cd060c244d4fa9853ba878de48ad11626257 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoh5py diff --git a/pyproject.toml b/pyproject.toml index 5ba0bca8..de2b1488 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -100,8 +100,8 @@ geoh5py = {version = ">=0.12.0b1, <0.13.dev", source = "pypi", allow-prereleases 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 = "GEOPY-2561"} +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"]}