Skip to content

Commit 9dc614f

Browse files
authored
Merge pull request #313 from MiraGeoscience/update_develop
Update develop
2 parents 77a483b + 959f90d commit 9dc614f

26 files changed

Lines changed: 1565 additions & 1449 deletions

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

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,40 @@ channels:
66
- conda-forge
77
- nodefaults
88
dependencies:
9-
- _openmp_mutex=4.5=5_kmp_llvm
9+
- _openmp_mutex=4.5=6_kmp_llvm
1010
- alabaster=0.7.16=pyhd8ed1ab_0
1111
- annotated-types=0.7.0=pyhd8ed1ab_1
1212
- anyio=4.11.0=pyhcf101f3_0
1313
- argon2-cffi=25.1.0=pyhd8ed1ab_0
14-
- argon2-cffi-bindings=25.1.0=py310h7c4b9e2_1
14+
- argon2-cffi-bindings=25.1.0=py310h7c4b9e2_2
1515
- arrow=1.4.0=pyhcf101f3_0
1616
- asciitree=0.3.3=py_2
17-
- astroid=4.0.1=py310hff52083_0
18-
- asttokens=2.4.1=pyhd8ed1ab_0
17+
- astroid=4.0.2=py310hff52083_0
18+
- asttokens=3.0.1=pyhd8ed1ab_0
1919
- async-lru=2.0.5=pyh29332c3_0
2020
- attrs=25.4.0=pyh71513ae_0
2121
- babel=2.17.0=pyhd8ed1ab_0
2222
- beautifulsoup4=4.14.2=pyha770c72_0
23-
- bleach=6.2.0=pyh29332c3_4
24-
- bleach-with-css=6.2.0=h82add2a_4
23+
- bleach=6.3.0=pyhcf101f3_0
24+
- bleach-with-css=6.3.0=h5f6438b_0
2525
- bokeh=3.6.3=pyhd8ed1ab_0
2626
- brotli=1.2.0=h41a2e66_0
2727
- brotli-bin=1.2.0=hf2c8021_0
2828
- brotli-python=1.2.0=py310h8cfb67f_0
2929
- bzip2=1.0.8=hda65f42_8
3030
- c-ares=1.34.5=hb9d3cd8_0
31-
- ca-certificates=2025.10.5=hbd8a1cb_0
31+
- ca-certificates=2025.11.12=hbd8a1cb_0
3232
- cached-property=1.5.2=hd8ed1ab_1
3333
- cached_property=1.5.2=pyha770c72_1
34-
- certifi=2025.10.5=pyhd8ed1ab_0
34+
- certifi=2025.11.12=pyhd8ed1ab_0
3535
- cffi=2.0.0=py310he7384ee_1
3636
- charset-normalizer=3.4.4=pyhd8ed1ab_0
37-
- click=8.3.0=pyh707e725_0
37+
- click=8.3.1=pyh707e725_0
3838
- cloudpickle=3.1.2=pyhd8ed1ab_0
3939
- colorama=0.4.6=pyhd8ed1ab_1
4040
- comm=0.2.3=pyhe01879c_0
4141
- contourpy=1.3.2=py310h3788b33_0
42-
- coverage=7.11.0=py310h3406613_0
42+
- coverage=7.12.0=py310h3406613_0
4343
- cycler=0.12.1=pyhd8ed1ab_1
4444
- cytoolz=1.1.0=py310h7c4b9e2_1
4545
- dask-core=2025.3.0=pyhd8ed1ab_0
@@ -70,6 +70,7 @@ dependencies:
7070
- idna=3.11=pyhd8ed1ab_0
7171
- imagesize=1.4.1=pyhd8ed1ab_0
7272
- importlib-metadata=8.7.0=pyhe01879c_1
73+
- importlib_resources=6.5.2=pyhd8ed1ab_0
7374
- iniconfig=2.3.0=pyhd8ed1ab_0
7475
- ipykernel=7.1.0=pyha191276_0
7576
- ipython=8.37.0=pyh8f84b5b_0
@@ -92,17 +93,17 @@ dependencies:
9293
- jupyter_events=0.12.0=pyh29332c3_0
9394
- jupyter_server=2.17.0=pyhcf101f3_0
9495
- jupyter_server_terminals=0.5.3=pyhd8ed1ab_1
95-
- jupyterlab=4.4.10=pyhd8ed1ab_0
96+
- jupyterlab=4.5.0=pyhd8ed1ab_0
9697
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
9798
- jupyterlab_server=2.28.0=pyhcf101f3_0
9899
- jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
99100
- jupytext=1.18.1=pyh80e38bb_0
100101
- keyutils=1.6.3=hb9d3cd8_0
101-
- kiwisolver=1.4.9=py310haaf941d_1
102+
- kiwisolver=1.4.9=py310haaf941d_2
102103
- krb5=1.21.3=h659f571_0
103104
- lark=1.3.1=pyhd8ed1ab_0
104105
- lcms2=2.17=h717163a_0
105-
- ld_impl_linux-64=2.44=h1aa0949_4
106+
- ld_impl_linux-64=2.45=h1aa0949_0
106107
- lerc=4.0.0=h0aef613_1
107108
- libaec=1.1.4=h3f801dc_0
108109
- libblas=3.9.0=37_h5875eb1_mkl
@@ -115,7 +116,7 @@ dependencies:
115116
- libdlf=0.3.0=pyhd8ed1ab_1
116117
- libedit=3.1.20250104=pl5321h7949ede_0
117118
- libev=4.33=hd590300_2
118-
- libexpat=2.7.1=hecca717_0
119+
- libexpat=2.7.3=hecca717_0
119120
- libffi=3.5.2=h9ec8514_0
120121
- libfreetype=2.14.1=ha770c72_0
121122
- libfreetype6=2.14.1=h73754d4_0
@@ -147,7 +148,7 @@ dependencies:
147148
- libxml2=2.15.1=h26afc86_0
148149
- libxml2-16=2.15.1=ha9997c6_0
149150
- libzlib=1.3.1=hb9d3cd8_2
150-
- llvm-openmp=21.1.5=h4922eb0_0
151+
- llvm-openmp=21.1.6=h4922eb0_0
151152
- locket=1.0.0=pyhd8ed1ab_0
152153
- markdown-it-py=4.0.0=pyhd8ed1ab_0
153154
- markupsafe=3.0.3=py310h3406613_0
@@ -159,7 +160,7 @@ dependencies:
159160
- metis=5.1.0=hd0bcaf9_1007
160161
- mistune=3.1.4=pyhcf101f3_0
161162
- mkl=2024.2.2=ha770c72_17
162-
- msgpack-python=1.1.2=py310h03d9f68_0
163+
- msgpack-python=1.1.2=py310h03d9f68_1
163164
- mumps-include=5.7.3=h82cca05_10
164165
- mumps-seq=5.7.3=h06cbf8f_10
165166
- munkres=1.1.4=pyhd8ed1ab_1
@@ -171,12 +172,12 @@ dependencies:
171172
- ncurses=6.5=h2d0b736_3
172173
- nest-asyncio=1.6.0=pyhd8ed1ab_1
173174
- nodejs=22.6.0=hc19f0b3_1
174-
- notebook=7.4.7=pyhd8ed1ab_0
175+
- notebook=7.5.0=pyhcf101f3_0
175176
- notebook-shim=0.2.4=pyhd8ed1ab_1
176177
- numcodecs=0.13.1=py310h5eaa309_0
177178
- numpy=1.26.4=py310hb13e2d6_0
178179
- openjpeg=2.5.4=h55fea9a_0
179-
- openssl=3.5.4=h26f9b46_0
180+
- openssl=3.6.0=h26f9b46_0
180181
- overrides=7.7.0=pyhd8ed1ab_1
181182
- packaging=25.0=pyh29332c3_1
182183
- pandas=2.3.3=py310h0158d43_1
@@ -187,7 +188,7 @@ dependencies:
187188
- pexpect=4.9.0=pyhd8ed1ab_1
188189
- pickleshare=0.7.5=pyhd8ed1ab_1004
189190
- pillow=10.3.0=py310hebfe307_1
190-
- pip=25.2=pyh8b19718_0
191+
- pip=25.3=pyh8b19718_0
191192
- platformdirs=4.5.0=pyhcf101f3_0
192193
- pluggy=1.6.0=pyhd8ed1ab_0
193194
- prometheus_client=0.23.1=pyhd8ed1ab_0
@@ -198,14 +199,14 @@ dependencies:
198199
- pure_eval=0.2.3=pyhd8ed1ab_1
199200
- pycparser=2.22=pyh29332c3_1
200201
- pydantic=2.12.4=pyh3cfb1c2_0
201-
- pydantic-core=2.41.5=py310hd8f68c5_0
202+
- pydantic-core=2.41.5=py310hd8f68c5_1
202203
- pydiso=0.1.2=py310h4b187eb_1
203204
- pygments=2.19.2=pyhd8ed1ab_0
204-
- pylint=4.0.2=pyhcf101f3_0
205+
- pylint=4.0.3=pyhcf101f3_0
205206
- pymatsolver=0.3.1=pyh48887ae_201
206207
- pyparsing=3.2.5=pyhcf101f3_0
207208
- pysocks=1.7.1=pyha55dd90_7
208-
- pytest=8.4.2=pyhcf101f3_1
209+
- pytest=9.0.1=pyhcf101f3_0
209210
- pytest-cov=7.0.0=pyhcf101f3_1
210211
- python=3.10.19=h3c07f61_2_cpython
211212
- python-dateutil=2.9.0.post0=pyhe01879c_2
@@ -224,14 +225,14 @@ dependencies:
224225
- rfc3339-validator=0.1.4=pyhd8ed1ab_1
225226
- rfc3986-validator=0.1.1=pyh9f0ad1d_0
226227
- rfc3987-syntax=1.1.0=pyhe01879c_1
227-
- rpds-py=0.28.0=py310hd8f68c5_1
228+
- rpds-py=0.29.0=py310hd8f68c5_0
228229
- rtree=1.2.0=py310haf1e407_1
229230
- scikit-learn=1.6.1=py310h27f47ee_0
230231
- scipy=1.14.1=py310hfcf56fc_2
231232
- send2trash=1.8.3=pyh0d859eb_1
232233
- setuptools=80.9.0=pyhff2d567_0
233234
- six=1.17.0=pyhe01879c_1
234-
- sniffio=1.3.1=pyhd8ed1ab_1
235+
- sniffio=1.3.1=pyhd8ed1ab_2
235236
- snowballstemmer=3.0.1=pyhd8ed1ab_0
236237
- sortedcontainers=2.4.0=pyhd8ed1ab_1
237238
- soupsieve=2.8=pyhd8ed1ab_0
@@ -243,16 +244,16 @@ dependencies:
243244
- sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1
244245
- sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1
245246
- stack_data=0.6.3=pyhd8ed1ab_1
246-
- tbb=2021.13.0=hb60516a_3
247-
- tblib=3.2.1=pyhcf101f3_0
247+
- tbb=2021.13.0=h8d10470_4
248+
- tblib=3.2.2=pyhcf101f3_0
248249
- terminado=0.18.1=pyh0d859eb_0
249250
- threadpoolctl=3.6.0=pyhecae5ae_0
250-
- tinycss2=1.4.0=pyhd8ed1ab_0
251-
- tk=8.6.13=noxft_hd72426e_102
251+
- tinycss2=1.5.0=pyhcf101f3_0
252+
- tk=8.6.13=noxft_ha0e22de_103
252253
- tomli=2.3.0=pyhcf101f3_0
253254
- tomlkit=0.13.3=pyha770c72_0
254255
- toolz=1.1.0=pyhd8ed1ab_1
255-
- tornado=6.5.2=py310h7c4b9e2_1
256+
- tornado=6.5.2=py310h7c4b9e2_2
256257
- tqdm=4.67.1=pyhd8ed1ab_1
257258
- traitlets=5.14.3=pyhd8ed1ab_1
258259
- trimesh=4.1.8=pyhd8ed1ab_0
@@ -261,7 +262,7 @@ dependencies:
261262
- typing_extensions=4.15.0=pyhcf101f3_0
262263
- typing_utils=0.1.0=pyhd8ed1ab_1
263264
- tzdata=2025b=h78e105d_0
264-
- unicodedata2=17.0.0=py310h7c4b9e2_0
265+
- unicodedata2=17.0.0=py310h7c4b9e2_1
265266
- uri-template=1.3.0=pyhd8ed1ab_1
266267
- urllib3=2.5.0=pyhd8ed1ab_0
267268
- wcwidth=0.2.14=pyhd8ed1ab_0
@@ -270,22 +271,22 @@ dependencies:
270271
- websocket-client=1.9.0=pyhd8ed1ab_0
271272
- wheel=0.45.1=pyhd8ed1ab_1
272273
- widgetsnbextension=3.6.10=pyhd8ed1ab_0
273-
- xorg-libxau=1.0.12=hb9d3cd8_0
274-
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
274+
- xorg-libxau=1.0.12=hb03c661_1
275+
- xorg-libxdmcp=1.1.5=hb03c661_1
275276
- xyzservices=2025.10.0=pyhd8ed1ab_0
276277
- yaml=0.2.5=h280c20c_3
277278
- zarr=2.14.2=pyhd8ed1ab_0
278279
- zeromq=4.3.5=h387f397_9
279280
- zict=3.0.0=pyhd8ed1ab_1
280281
- zipp=3.23.0=pyhd8ed1ab_0
281282
- zlib=1.3.1=hb9d3cd8_2
282-
- zstandard=0.25.0=py310h139afa4_0
283+
- zstandard=0.25.0=py310h139afa4_1
283284
- zstd=1.5.7=hb8e6e7a_2
284285
- pip:
285-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502
286-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c
286+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@15d04763f768cb6f56a3049c9c83a12c88f3060f
287+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6e27ace156c5f5898a77ae96566dea1d90de8cd8
287288
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166
288-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c
289+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@374bd3eb0266841ae256ff8fdbf96cfa6d20f469
289290

290291
variables:
291292
KMP_WARNINGS: 0

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ channels:
66
- conda-forge
77
- nodefaults
88
dependencies:
9-
- _openmp_mutex=4.5=5_kmp_llvm
9+
- _openmp_mutex=4.5=6_kmp_llvm
1010
- annotated-types=0.7.0=pyhd8ed1ab_1
1111
- asciitree=0.3.3=py_2
1212
- bokeh=3.6.3=pyhd8ed1ab_0
@@ -15,12 +15,12 @@ dependencies:
1515
- brotli-python=1.2.0=py310h8cfb67f_0
1616
- bzip2=1.0.8=hda65f42_8
1717
- c-ares=1.34.5=hb9d3cd8_0
18-
- ca-certificates=2025.10.5=hbd8a1cb_0
18+
- ca-certificates=2025.11.12=hbd8a1cb_0
1919
- cached-property=1.5.2=hd8ed1ab_1
2020
- cached_property=1.5.2=pyha770c72_1
21-
- certifi=2025.10.5=pyhd8ed1ab_0
21+
- certifi=2025.11.12=pyhd8ed1ab_0
2222
- cffi=2.0.0=py310he7384ee_1
23-
- click=8.3.0=pyh707e725_0
23+
- click=8.3.1=pyh707e725_0
2424
- cloudpickle=3.1.2=pyhd8ed1ab_0
2525
- colorama=0.4.6=pyhd8ed1ab_1
2626
- contourpy=1.3.2=py310h3788b33_0
@@ -44,10 +44,10 @@ dependencies:
4444
- jinja2=3.1.6=pyhd8ed1ab_0
4545
- joblib=1.5.2=pyhd8ed1ab_0
4646
- keyutils=1.6.3=hb9d3cd8_0
47-
- kiwisolver=1.4.9=py310haaf941d_1
47+
- kiwisolver=1.4.9=py310haaf941d_2
4848
- krb5=1.21.3=h659f571_0
4949
- lcms2=2.17=h717163a_0
50-
- ld_impl_linux-64=2.44=h1aa0949_4
50+
- ld_impl_linux-64=2.45=h1aa0949_0
5151
- lerc=4.0.0=h0aef613_1
5252
- libaec=1.1.4=h3f801dc_0
5353
- libblas=3.9.0=37_h5875eb1_mkl
@@ -60,7 +60,7 @@ dependencies:
6060
- libdlf=0.3.0=pyhd8ed1ab_1
6161
- libedit=3.1.20250104=pl5321h7949ede_0
6262
- libev=4.33=hd590300_2
63-
- libexpat=2.7.1=hecca717_0
63+
- libexpat=2.7.3=hecca717_0
6464
- libffi=3.5.2=h9ec8514_0
6565
- libfreetype=2.14.1=ha770c72_0
6666
- libfreetype6=2.14.1=h73754d4_0
@@ -90,31 +90,31 @@ dependencies:
9090
- libxml2=2.15.1=h26afc86_0
9191
- libxml2-16=2.15.1=ha9997c6_0
9292
- libzlib=1.3.1=hb9d3cd8_2
93-
- llvm-openmp=21.1.5=h4922eb0_0
93+
- llvm-openmp=21.1.6=h4922eb0_0
9494
- locket=1.0.0=pyhd8ed1ab_0
9595
- markupsafe=3.0.3=py310h3406613_0
9696
- matplotlib-base=3.8.4=py310hef631a5_2
9797
- metis=5.1.0=hd0bcaf9_1007
9898
- mkl=2024.2.2=ha770c72_17
99-
- msgpack-python=1.1.2=py310h03d9f68_0
99+
- msgpack-python=1.1.2=py310h03d9f68_1
100100
- mumps-include=5.7.3=h82cca05_10
101101
- mumps-seq=5.7.3=h06cbf8f_10
102102
- munkres=1.1.4=pyhd8ed1ab_1
103103
- ncurses=6.5=h2d0b736_3
104104
- numcodecs=0.13.1=py310h5eaa309_0
105105
- numpy=1.26.4=py310hb13e2d6_0
106106
- openjpeg=2.5.4=h55fea9a_0
107-
- openssl=3.5.4=h26f9b46_0
107+
- openssl=3.6.0=h26f9b46_0
108108
- packaging=25.0=pyh29332c3_1
109109
- pandas=2.3.3=py310h0158d43_1
110110
- partd=1.4.2=pyhd8ed1ab_0
111111
- pillow=10.3.0=py310hebfe307_1
112-
- pip=25.2=pyh8b19718_0
112+
- pip=25.3=pyh8b19718_0
113113
- psutil=7.1.3=py310h139afa4_0
114114
- pthread-stubs=0.4=hb9d3cd8_1002
115115
- pycparser=2.22=pyh29332c3_1
116116
- pydantic=2.12.4=pyh3cfb1c2_0
117-
- pydantic-core=2.41.5=py310hd8f68c5_0
117+
- pydantic-core=2.41.5=py310hd8f68c5_1
118118
- pydiso=0.1.2=py310h4b187eb_1
119119
- pymatsolver=0.3.1=pyh48887ae_201
120120
- pyparsing=3.2.5=pyhcf101f3_0
@@ -133,35 +133,35 @@ dependencies:
133133
- setuptools=80.9.0=pyhff2d567_0
134134
- six=1.17.0=pyhe01879c_1
135135
- sortedcontainers=2.4.0=pyhd8ed1ab_1
136-
- tbb=2021.13.0=hb60516a_3
137-
- tblib=3.2.1=pyhcf101f3_0
136+
- tbb=2021.13.0=h8d10470_4
137+
- tblib=3.2.2=pyhcf101f3_0
138138
- threadpoolctl=3.6.0=pyhecae5ae_0
139-
- tk=8.6.13=noxft_hd72426e_102
139+
- tk=8.6.13=noxft_ha0e22de_103
140140
- toolz=1.1.0=pyhd8ed1ab_1
141-
- tornado=6.5.2=py310h7c4b9e2_1
141+
- tornado=6.5.2=py310h7c4b9e2_2
142142
- tqdm=4.67.1=pyhd8ed1ab_1
143143
- trimesh=4.1.8=pyhd8ed1ab_0
144144
- typing-extensions=4.15.0=h396c80c_0
145145
- typing-inspection=0.4.2=pyhd8ed1ab_0
146146
- typing_extensions=4.15.0=pyhcf101f3_0
147147
- tzdata=2025b=h78e105d_0
148-
- unicodedata2=17.0.0=py310h7c4b9e2_0
148+
- unicodedata2=17.0.0=py310h7c4b9e2_1
149149
- urllib3=2.5.0=pyhd8ed1ab_0
150150
- wheel=0.45.1=pyhd8ed1ab_1
151-
- xorg-libxau=1.0.12=hb9d3cd8_0
152-
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
151+
- xorg-libxau=1.0.12=hb03c661_1
152+
- xorg-libxdmcp=1.1.5=hb03c661_1
153153
- xyzservices=2025.10.0=pyhd8ed1ab_0
154154
- yaml=0.2.5=h280c20c_3
155155
- zarr=2.14.2=pyhd8ed1ab_0
156156
- zict=3.0.0=pyhd8ed1ab_1
157157
- zipp=3.23.0=pyhd8ed1ab_0
158-
- zstandard=0.25.0=py310h139afa4_0
158+
- zstandard=0.25.0=py310h139afa4_1
159159
- zstd=1.5.7=hb8e6e7a_2
160160
- pip:
161-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@80c46588d47b70a1dd26aef06ccfa24bc1585502
162-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c
161+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@15d04763f768cb6f56a3049c9c83a12c88f3060f
162+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6e27ace156c5f5898a77ae96566dea1d90de8cd8
163163
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@d6a42611003c184354e1367de41a88783b928166
164-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@268b4944c9bc46a69e9273c9f0d1235612e72b0c
164+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@374bd3eb0266841ae256ff8fdbf96cfa6d20f469
165165

166166
variables:
167167
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)