Skip to content

Commit e6920b3

Browse files
committed
Merge branch 'develop' into GEOPY-2758B
# Conflicts: # simpeg_drivers/utils/utils.py
2 parents 62e70ec + 0b4c98e commit e6920b3

38 files changed

Lines changed: 1800 additions & 648 deletions

environments/py-3.12-linux-64-dev.conda.lock.yml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ dependencies:
1919
- asttokens=3.0.1=pyhd8ed1ab_0
2020
- async-lru=2.3.0=pyhcf101f3_0
2121
- attrs=26.1.0=pyhcf101f3_0
22+
- aws-c-auth=0.10.1=h2d2dd48_2
23+
- aws-c-cal=0.9.13=h2c9d079_1
24+
- aws-c-common=0.12.6=hb03c661_0
25+
- aws-c-compression=0.3.2=h8b1a151_0
26+
- aws-c-http=0.10.12=h4bacb7b_1
27+
- aws-c-io=0.26.3=hc87160b_0
28+
- aws-c-s3=0.11.5=h6d69fc9_5
29+
- aws-c-sdkutils=0.2.4=h8b1a151_4
30+
- aws-checksums=0.2.10=h8b1a151_0
2231
- babel=2.18.0=pyhcf101f3_1
2332
- backports.zstd=1.3.0=py312h90b7ffd_0
2433
- beautifulsoup4=4.14.3=pyha770c72_0
@@ -61,12 +70,12 @@ dependencies:
6170
- fonttools=4.62.0=py312h8a5da7c_0
6271
- fqdn=1.5.1=pyhd8ed1ab_1
6372
- freetype=2.14.3=ha770c72_0
64-
- fsspec=2026.2.0=pyhd8ed1ab_0
73+
- fsspec=2026.3.0=pyhd8ed1ab_0
6574
- geoana=0.8.1=np2py312h2a48985_0
6675
- h11=0.16.0=pyhcf101f3_1
6776
- h2=4.3.0=pyhcf101f3_0
68-
- h5py=3.16.0=nompi_py312ha4f8f14_100
69-
- hdf5=1.14.6=nompi_h19486de_108
77+
- h5py=3.16.0=nompi_py312ha829cd9_101
78+
- hdf5=2.1.0=nompi_hd4fcb43_103
7079
- hpack=4.1.0=pyhd8ed1ab_0
7180
- httpcore=1.0.9=pyh29332c3_0
7281
- httpx=0.28.1=pyhd8ed1ab_0
@@ -78,7 +87,7 @@ dependencies:
7887
- importlib_resources=6.5.2=pyhd8ed1ab_0
7988
- iniconfig=2.3.0=pyhd8ed1ab_0
8089
- ipykernel=7.2.0=pyha191276_1
81-
- ipython=9.11.0=pyhecfbec7_0
90+
- ipython=9.12.0=pyhecfbec7_0
8291
- ipython_genutils=0.2.0=pyhd8ed1ab_2
8392
- ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0
8493
- ipywidgets=7.8.5=pyhd8ed1ab_0
@@ -87,7 +96,7 @@ dependencies:
8796
- jedi=0.19.2=pyhd8ed1ab_1
8897
- jinja2=3.1.6=pyhcf101f3_1
8998
- joblib=1.5.3=pyhd8ed1ab_0
90-
- json5=0.13.0=pyhd8ed1ab_0
99+
- json5=0.14.0=pyhd8ed1ab_0
91100
- jsonpointer=3.1.1=pyhcf101f3_0
92101
- jsonschema=4.26.0=pyhcf101f3_0
93102
- jsonschema-specifications=2025.9.1=pyhcf101f3_0
@@ -122,7 +131,7 @@ dependencies:
122131
- libdlf=0.3.0=pyhd8ed1ab_1
123132
- libedit=3.1.20250104=pl5321h7949ede_0
124133
- libev=4.33=hd590300_2
125-
- libexpat=2.7.4=hecca717_0
134+
- libexpat=2.7.5=hecca717_0
126135
- libffi=3.5.2=h3435931_0
127136
- libfreetype=2.14.3=ha770c72_0
128137
- libfreetype6=2.14.3=h73754d4_0
@@ -146,15 +155,15 @@ dependencies:
146155
- libstdcxx=15.2.0=h934c35e_18
147156
- libstdcxx-ng=15.2.0=hdf11a46_18
148157
- libtiff=4.7.1=h9d88235_1
149-
- libuuid=2.41.3=h5347b49_0
158+
- libuuid=2.41.4=h5347b49_0
150159
- libuv=1.51.0=hb03c661_1
151160
- libwebp-base=1.6.0=hd42ef1d_0
152161
- libxcb=1.17.0=h8a09558_0
153162
- libxcrypt=4.4.36=hd590300_1
154163
- libxml2=2.15.1=h26afc86_0
155164
- libxml2-16=2.15.1=ha9997c6_0
156165
- libzlib=1.3.2=h25fd6f3_2
157-
- llvm-openmp=22.1.1=h4922eb0_0
166+
- llvm-openmp=22.1.2=h4922eb0_0
158167
- locket=1.0.0=pyhd8ed1ab_0
159168
- markdown-it-py=4.0.0=pyhd8ed1ab_0
160169
- markupsafe=3.0.3=py312h8a5da7c_1
@@ -187,7 +196,7 @@ dependencies:
187196
- openssl=3.6.1=h35e630c_1
188197
- overrides=7.7.0=pyhd8ed1ab_1
189198
- packaging=26.0=pyhcf101f3_0
190-
- pandas=3.0.1=py312h8ecdadd_0
199+
- pandas=3.0.2=py312h8ecdadd_0
191200
- pandoc=3.9.0.2=ha770c72_0
192201
- pandocfilters=1.5.0=pyhd8ed1ab_0
193202
- parso=0.8.6=pyhcf101f3_0
@@ -207,7 +216,7 @@ dependencies:
207216
- pydantic=2.12.5=pyhcf101f3_1
208217
- pydantic-core=2.41.5=py312h868fb18_1
209218
- pydiso=0.2.0=np2py312h1cfd70e_1
210-
- pygments=2.19.2=pyhd8ed1ab_0
219+
- pygments=2.20.0=pyhd8ed1ab_0
211220
- pylint=4.0.5=pyhcf101f3_0
212221
- pymatsolver=0.3.1=pyh48887ae_201
213222
- pyparsing=3.3.2=pyhcf101f3_0
@@ -228,12 +237,13 @@ dependencies:
228237
- readline=8.3=h853b02a_0
229238
- readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1
230239
- referencing=0.37.0=pyhcf101f3_0
231-
- requests=2.33.0=pyhcf101f3_0
240+
- requests=2.33.1=pyhcf101f3_0
232241
- rfc3339-validator=0.1.4=pyhd8ed1ab_1
233242
- rfc3986-validator=0.1.1=pyh9f0ad1d_0
234243
- rfc3987-syntax=1.1.0=pyhe01879c_1
235244
- rpds-py=0.30.0=py312h868fb18_0
236245
- rtree=1.4.1=pyh11ca60a_0
246+
- s2n=1.7.1=h1cbb8d7_1
237247
- scikit-learn=1.8.0=np2py312h3226591_1
238248
- scipy=1.17.1=py312h54fa4ab_0
239249
- send2trash=2.1.0=pyha191276_1
@@ -281,7 +291,7 @@ dependencies:
281291
- wrapt=2.1.2=py312h4c3975b_0
282292
- xorg-libxau=1.0.12=hb03c661_1
283293
- xorg-libxdmcp=1.1.5=hb03c661_1
284-
- xyzservices=2025.11.0=pyhd8ed1ab_0
294+
- xyzservices=2026.3.0=pyhd8ed1ab_0
285295
- yaml=0.2.5=h280c20c_3
286296
- zarr=2.14.2=pyhd8ed1ab_0
287297
- zeromq=4.3.5=h41580af_10
@@ -292,7 +302,7 @@ dependencies:
292302
- zstd=1.5.7=hb78ec9c_6
293303
- pip:
294304
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@eb0474175000819e93d8dc701ed0fd6101c44451
295-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a4d826715e5f529242e2c7eac2805e05e1ec3027
305+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@f5eca3735bbca573f4cac3925c6f4c0c341d8e28
296306
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@0e66e6b7a44ede34563da6a77ccd87a4cc7b5185
297307
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f7dd0d37aac285dd9ece26396ee39ae72bd6d18d
298308

environments/py-3.12-linux-64.conda.lock.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ dependencies:
99
- _openmp_mutex=4.5=7_kmp_llvm
1010
- annotated-types=0.7.0=pyhd8ed1ab_1
1111
- asciitree=0.3.3=py_2
12+
- aws-c-auth=0.10.1=h2d2dd48_2
13+
- aws-c-cal=0.9.13=h2c9d079_1
14+
- aws-c-common=0.12.6=hb03c661_0
15+
- aws-c-compression=0.3.2=h8b1a151_0
16+
- aws-c-http=0.10.12=h4bacb7b_1
17+
- aws-c-io=0.26.3=hc87160b_0
18+
- aws-c-s3=0.11.5=h6d69fc9_5
19+
- aws-c-sdkutils=0.2.4=h8b1a151_4
20+
- aws-checksums=0.2.10=h8b1a151_0
1221
- backports.zstd=1.3.0=py312h90b7ffd_0
1322
- bokeh=3.6.3=pyhd8ed1ab_0
1423
- brotli=1.2.0=hed03a55_1
@@ -32,11 +41,11 @@ dependencies:
3241
- fasteners=0.19=pyhd8ed1ab_1
3342
- fonttools=4.62.0=py312h8a5da7c_0
3443
- freetype=2.14.3=ha770c72_0
35-
- fsspec=2026.2.0=pyhd8ed1ab_0
44+
- fsspec=2026.3.0=pyhd8ed1ab_0
3645
- geoana=0.8.1=np2py312h2a48985_0
3746
- h2=4.3.0=pyhcf101f3_0
38-
- h5py=3.16.0=nompi_py312ha4f8f14_100
39-
- hdf5=1.14.6=nompi_h19486de_108
47+
- h5py=3.16.0=nompi_py312ha829cd9_101
48+
- hdf5=2.1.0=nompi_hd4fcb43_103
4049
- hpack=4.1.0=pyhd8ed1ab_0
4150
- hyperframe=6.1.0=pyhd8ed1ab_0
4251
- icu=75.1=he02047a_0
@@ -60,7 +69,7 @@ dependencies:
6069
- libdlf=0.3.0=pyhd8ed1ab_1
6170
- libedit=3.1.20250104=pl5321h7949ede_0
6271
- libev=4.33=hd590300_2
63-
- libexpat=2.7.4=hecca717_0
72+
- libexpat=2.7.5=hecca717_0
6473
- libffi=3.5.2=h3435931_0
6574
- libfreetype=2.14.3=ha770c72_0
6675
- libfreetype6=2.14.3=h73754d4_0
@@ -83,14 +92,14 @@ dependencies:
8392
- libstdcxx=15.2.0=h934c35e_18
8493
- libstdcxx-ng=15.2.0=hdf11a46_18
8594
- libtiff=4.7.1=h9d88235_1
86-
- libuuid=2.41.3=h5347b49_0
95+
- libuuid=2.41.4=h5347b49_0
8796
- libwebp-base=1.6.0=hd42ef1d_0
8897
- libxcb=1.17.0=h8a09558_0
8998
- libxcrypt=4.4.36=hd590300_1
9099
- libxml2=2.15.1=h26afc86_0
91100
- libxml2-16=2.15.1=ha9997c6_0
92101
- libzlib=1.3.2=h25fd6f3_2
93-
- llvm-openmp=22.1.1=h4922eb0_0
102+
- llvm-openmp=22.1.2=h4922eb0_0
94103
- locket=1.0.0=pyhd8ed1ab_0
95104
- markupsafe=3.0.3=py312h8a5da7c_1
96105
- matplotlib-base=3.10.8=py312he3d6523_0
@@ -107,7 +116,7 @@ dependencies:
107116
- openpyxl=3.1.5=py312h7f6eeab_3
108117
- openssl=3.6.1=h35e630c_1
109118
- packaging=26.0=pyhcf101f3_0
110-
- pandas=3.0.1=py312h8ecdadd_0
119+
- pandas=3.0.2=py312h8ecdadd_0
111120
- partd=1.4.2=pyhd8ed1ab_0
112121
- pillow=12.1.1=py312h50c33e8_0
113122
- pip=26.0.1=pyh8b19718_0
@@ -128,6 +137,7 @@ dependencies:
128137
- qhull=2020.2=h434a139_5
129138
- readline=8.3=h853b02a_0
130139
- rtree=1.4.1=pyh11ca60a_0
140+
- s2n=1.7.1=h1cbb8d7_1
131141
- scikit-learn=1.8.0=np2py312h3226591_1
132142
- scipy=1.17.1=py312h54fa4ab_0
133143
- setuptools=82.0.1=pyh332efcf_0
@@ -151,7 +161,7 @@ dependencies:
151161
- wrapt=2.1.2=py312h4c3975b_0
152162
- xorg-libxau=1.0.12=hb03c661_1
153163
- xorg-libxdmcp=1.1.5=hb03c661_1
154-
- xyzservices=2025.11.0=pyhd8ed1ab_0
164+
- xyzservices=2026.3.0=pyhd8ed1ab_0
155165
- yaml=0.2.5=h280c20c_3
156166
- zarr=2.14.2=pyhd8ed1ab_0
157167
- zict=3.0.0=pyhd8ed1ab_1
@@ -160,7 +170,7 @@ dependencies:
160170
- zstd=1.5.7=hb78ec9c_6
161171
- pip:
162172
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@eb0474175000819e93d8dc701ed0fd6101c44451
163-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a4d826715e5f529242e2c7eac2805e05e1ec3027
173+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@f5eca3735bbca573f4cac3925c6f4c0c341d8e28
164174
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@0e66e6b7a44ede34563da6a77ccd87a4cc7b5185
165175
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f7dd0d37aac285dd9ece26396ee39ae72bd6d18d
166176

environments/py-3.12-win-64-dev.conda.lock.yml

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ dependencies:
1919
- asttokens=3.0.1=pyhd8ed1ab_0
2020
- async-lru=2.3.0=pyhcf101f3_0
2121
- attrs=26.1.0=pyhcf101f3_0
22+
- aws-c-auth=0.10.1=h5d51246_2
23+
- aws-c-cal=0.9.13=h46f3b43_1
24+
- aws-c-common=0.12.6=hfd05255_0
25+
- aws-c-compression=0.3.2=hcb3a2da_0
26+
- aws-c-http=0.10.12=h612f3e8_1
27+
- aws-c-io=0.26.3=h0d5b9f9_0
28+
- aws-c-s3=0.11.5=h87bd87b_5
29+
- aws-c-sdkutils=0.2.4=hcb3a2da_4
30+
- aws-checksums=0.2.10=hcb3a2da_0
2231
- babel=2.18.0=pyhcf101f3_1
2332
- backports.zstd=1.3.0=py312h06d0912_0
2433
- beautifulsoup4=4.14.3=pyha770c72_0
@@ -60,12 +69,12 @@ dependencies:
6069
- fonttools=4.62.0=py312h05f76fc_0
6170
- fqdn=1.5.1=pyhd8ed1ab_1
6271
- freetype=2.14.3=h57928b3_0
63-
- fsspec=2026.2.0=pyhd8ed1ab_0
72+
- fsspec=2026.3.0=pyhd8ed1ab_0
6473
- geoana=0.8.1=np2py312h7c90ba1_0
6574
- h11=0.16.0=pyhcf101f3_1
6675
- h2=4.3.0=pyhcf101f3_0
67-
- h5py=3.16.0=nompi_py312h03cd2ba_100
68-
- hdf5=1.14.6=nompi_hae35d4c_108
76+
- h5py=3.16.0=nompi_py312h5ddec8c_101
77+
- hdf5=2.1.0=nompi_hd96b29f_103
6978
- hpack=4.1.0=pyhd8ed1ab_0
7079
- httpcore=1.0.9=pyh29332c3_0
7180
- httpx=0.28.1=pyhd8ed1ab_0
@@ -76,7 +85,7 @@ dependencies:
7685
- importlib_resources=6.5.2=pyhd8ed1ab_0
7786
- iniconfig=2.3.0=pyhd8ed1ab_0
7887
- ipykernel=7.2.0=pyh6dadd2b_1
79-
- ipython=9.11.0=pyhccfa634_0
88+
- ipython=9.12.0=pyhccfa634_0
8089
- ipython_genutils=0.2.0=pyhd8ed1ab_2
8190
- ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0
8291
- ipywidgets=7.8.5=pyhd8ed1ab_0
@@ -85,7 +94,7 @@ dependencies:
8594
- jedi=0.19.2=pyhd8ed1ab_1
8695
- jinja2=3.1.6=pyhcf101f3_1
8796
- joblib=1.5.3=pyhd8ed1ab_0
88-
- json5=0.13.0=pyhd8ed1ab_0
97+
- json5=0.14.0=pyhd8ed1ab_0
8998
- jsonpointer=3.1.1=pyhcf101f3_0
9099
- jsonschema=4.26.0=pyhcf101f3_0
91100
- jsonschema-specifications=2025.9.1=pyhcf101f3_0
@@ -116,7 +125,7 @@ dependencies:
116125
- libcurl=8.19.0=h8206538_0
117126
- libdeflate=1.25=h51727cc_0
118127
- libdlf=0.3.0=pyhd8ed1ab_1
119-
- libexpat=2.7.4=hac47afa_0
128+
- libexpat=2.7.5=hac47afa_0
120129
- libffi=3.5.2=h3d046cb_0
121130
- libfreetype=2.14.3=h57928b3_0
122131
- libfreetype6=2.14.3=hdbac1cb_0
@@ -139,7 +148,7 @@ dependencies:
139148
- libxml2=2.15.2=h5d26750_0
140149
- libxml2-16=2.15.2=h692994f_0
141150
- libzlib=1.3.2=hfd05255_2
142-
- llvm-openmp=22.1.1=h4fa8253_0
151+
- llvm-openmp=22.1.2=h4fa8253_0
143152
- locket=1.0.0=pyhd8ed1ab_0
144153
- markdown-it-py=4.0.0=pyhd8ed1ab_0
145154
- markupsafe=3.0.3=py312h05f76fc_1
@@ -169,7 +178,7 @@ dependencies:
169178
- openssl=3.6.1=hf411b9b_1
170179
- overrides=7.7.0=pyhd8ed1ab_1
171180
- packaging=26.0=pyhcf101f3_0
172-
- pandas=3.0.1=py312h95189c4_0
181+
- pandas=3.0.2=py312h95189c4_0
173182
- pandoc=3.9.0.2=h57928b3_0
174183
- pandocfilters=1.5.0=pyhd8ed1ab_0
175184
- parso=0.8.6=pyhcf101f3_0
@@ -187,7 +196,7 @@ dependencies:
187196
- pydantic=2.12.5=pyhcf101f3_1
188197
- pydantic-core=2.41.5=py312hdabe01f_1
189198
- pydiso=0.2.0=np2py312hd8dafd6_1
190-
- pygments=2.19.2=pyhd8ed1ab_0
199+
- pygments=2.20.0=pyhd8ed1ab_0
191200
- pylint=4.0.5=pyhcf101f3_0
192201
- pymatsolver=0.3.1=pyh48887ae_201
193202
- pyparsing=3.3.2=pyhcf101f3_0
@@ -209,7 +218,7 @@ dependencies:
209218
- qhull=2020.2=hc790b64_5
210219
- readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1
211220
- referencing=0.37.0=pyhcf101f3_0
212-
- requests=2.33.0=pyhcf101f3_0
221+
- requests=2.33.1=pyhcf101f3_0
213222
- rfc3339-validator=0.1.4=pyhd8ed1ab_1
214223
- rfc3986-validator=0.1.1=pyh9f0ad1d_0
215224
- rfc3987-syntax=1.1.0=pyhe01879c_1
@@ -268,7 +277,7 @@ dependencies:
268277
- wrapt=2.1.2=py312he06e257_0
269278
- xorg-libxau=1.0.12=hba3369d_1
270279
- xorg-libxdmcp=1.1.5=hba3369d_1
271-
- xyzservices=2025.11.0=pyhd8ed1ab_0
280+
- xyzservices=2026.3.0=pyhd8ed1ab_0
272281
- yaml=0.2.5=h6a83c73_3
273282
- zarr=2.14.2=pyhd8ed1ab_0
274283
- zeromq=4.3.5=h507cc87_10
@@ -278,7 +287,7 @@ dependencies:
278287
- zstd=1.5.7=h534d264_6
279288
- pip:
280289
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@eb0474175000819e93d8dc701ed0fd6101c44451
281-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a4d826715e5f529242e2c7eac2805e05e1ec3027
290+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@f5eca3735bbca573f4cac3925c6f4c0c341d8e28
282291
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@0e66e6b7a44ede34563da6a77ccd87a4cc7b5185
283292
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f7dd0d37aac285dd9ece26396ee39ae72bd6d18d
284293

0 commit comments

Comments
 (0)