Skip to content

Commit 78700bc

Browse files
committed
Merge branch 'GEOPY-2622' of github.com:MiraGeoscience/simpeg-drivers into GEOPY-2622
2 parents 785d246 + 4767a2d commit 78700bc

58 files changed

Lines changed: 2339 additions & 1196 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ dependencies:
1414
- 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.3=py310hff52083_0
17+
- astroid=4.0.4=py310hff52083_0
1818
- asttokens=3.0.1=pyhd8ed1ab_0
1919
- async-lru=2.1.0=pyhcf101f3_0
2020
- attrs=25.4.0=pyhcf101f3_1
21-
- babel=2.17.0=pyhd8ed1ab_0
21+
- babel=2.18.0=pyhcf101f3_0
2222
- backports.zstd=1.3.0=py310h69bd2ac_0
2323
- beautifulsoup4=4.14.3=pyha770c72_0
24-
- bleach=6.3.0=pyhcf101f3_0
25-
- bleach-with-css=6.3.0=h5f6438b_0
24+
- bleach=6.3.0=pyhcf101f3_1
25+
- bleach-with-css=6.3.0=hbca2aae_1
2626
- bokeh=3.6.3=pyhd8ed1ab_0
2727
- brotli=1.2.0=hed03a55_1
2828
- brotli-bin=1.2.0=hb03c661_1
@@ -40,29 +40,29 @@ dependencies:
4040
- colorama=0.4.6=pyhd8ed1ab_1
4141
- comm=0.2.3=pyhe01879c_0
4242
- contourpy=1.3.2=py310h3788b33_0
43-
- coverage=7.13.2=py310h3406613_0
43+
- coverage=7.13.4=py310h3406613_0
4444
- cycler=0.12.1=pyhcf101f3_2
4545
- cytoolz=1.1.0=py310h7c4b9e2_1
46-
- dask-core=2025.3.0=pyhd8ed1ab_0
47-
- debugpy=1.8.18=py310h25320af_0
46+
- dask-core=2025.3.1=pyhd8ed1ab_0
47+
- debugpy=1.8.20=py310h25320af_0
4848
- decorator=5.2.1=pyhd8ed1ab_0
4949
- defusedxml=0.7.1=pyhd8ed1ab_0
5050
- dill=0.4.1=pyhcf101f3_0
5151
- discretize=0.11.3=py310hc563356_1
52-
- distributed=2025.3.0=pyhd8ed1ab_0
52+
- distributed=2025.3.1=pyhd8ed1ab_0
5353
- docutils=0.19=py310hff52083_1
5454
- exceptiongroup=1.3.1=pyhd8ed1ab_0
5555
- executing=2.2.1=pyhd8ed1ab_0
5656
- fasteners=0.19=pyhd8ed1ab_1
5757
- fonttools=4.61.1=py310h3406613_0
5858
- fqdn=1.5.1=pyhd8ed1ab_1
5959
- freetype=2.14.1=ha770c72_0
60-
- fsspec=2026.1.0=pyhd8ed1ab_0
60+
- fsspec=2026.2.0=pyhd8ed1ab_0
6161
- geoana=0.7.2=py310hc563356_1
6262
- h11=0.16.0=pyhcf101f3_1
6363
- h2=4.3.0=pyhcf101f3_0
6464
- h5py=3.15.1=nompi_py310h4aa865e_101
65-
- hdf5=1.14.6=nompi_h1b119a7_105
65+
- hdf5=1.14.6=nompi_h19486de_106
6666
- hpack=4.1.0=pyhd8ed1ab_0
6767
- httpcore=1.0.9=pyh29332c3_0
6868
- httpx=0.28.1=pyhd8ed1ab_0
@@ -73,7 +73,7 @@ dependencies:
7373
- importlib-metadata=8.7.0=pyhe01879c_1
7474
- importlib_resources=6.5.2=pyhd8ed1ab_0
7575
- iniconfig=2.3.0=pyhd8ed1ab_0
76-
- ipykernel=7.1.0=pyha191276_0
76+
- ipykernel=7.2.0=pyha191276_1
7777
- ipython=8.37.0=pyh8f84b5b_0
7878
- ipython_genutils=0.2.0=pyhd8ed1ab_2
7979
- ipywidgets=7.8.5=pyhd8ed1ab_0
@@ -87,7 +87,7 @@ dependencies:
8787
- jsonschema=4.26.0=pyhcf101f3_0
8888
- jsonschema-specifications=2025.9.1=pyhcf101f3_0
8989
- jsonschema-with-format-nongpl=4.26.0=hcf101f3_0
90-
- jupyter-book=2.1.1=pyhcf101f3_0
90+
- jupyter-book=2.1.2=pyhcf101f3_0
9191
- jupyter-lsp=2.3.0=pyhcf101f3_0
9292
- jupyter_client=8.8.0=pyhcf101f3_0
9393
- jupyter_core=5.9.1=pyhc90fa1f_0
@@ -104,7 +104,7 @@ dependencies:
104104
- krb5=1.21.3=h659f571_0
105105
- lark=1.3.1=pyhd8ed1ab_0
106106
- lcms2=2.18=h0c24ade_0
107-
- ld_impl_linux-64=2.45=default_hbd61a6d_105
107+
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
108108
- lerc=4.0.0=h0aef613_1
109109
- libaec=1.1.5=h088129d_0
110110
- libblas=3.9.0=37_h5875eb1_mkl
@@ -121,25 +121,25 @@ dependencies:
121121
- libffi=3.5.2=h3435931_0
122122
- libfreetype=2.14.1=ha770c72_0
123123
- libfreetype6=2.14.1=h73754d4_0
124-
- libgcc=15.2.0=he0feb66_16
125-
- libgcc-ng=15.2.0=h69a702a_16
126-
- libgfortran=15.2.0=h69a702a_16
127-
- libgfortran5=15.2.0=h68bc16d_16
124+
- libgcc=15.2.0=he0feb66_17
125+
- libgcc-ng=15.2.0=h69a702a_17
126+
- libgfortran=15.2.0=h69a702a_17
127+
- libgfortran5=15.2.0=h68bc16d_17
128128
- libhwloc=2.12.2=default_hafda6a7_1000
129129
- libiconv=1.18=h3b78370_2
130130
- libjpeg-turbo=3.1.2=hb03c661_0
131131
- liblapack=3.9.0=37_h5e43f62_mkl
132132
- liblzma=5.8.2=hb03c661_0
133133
- libnghttp2=1.67.0=had1ee68_0
134134
- libnsl=2.0.1=hb9d3cd8_1
135-
- libpng=1.6.54=h421ea60_0
135+
- libpng=1.6.55=h421ea60_0
136136
- libscotch=7.0.6=hea33c07_1
137137
- libsodium=1.0.20=h4ab18f5_0
138138
- libspatialindex=2.0.0=he02047a_0
139139
- libsqlite=3.51.2=h0c1763c_0
140140
- libssh2=1.11.1=hcf80075_0
141-
- libstdcxx=15.2.0=h934c35e_16
142-
- libstdcxx-ng=15.2.0=hdf11a46_16
141+
- libstdcxx=15.2.0=h934c35e_17
142+
- libstdcxx-ng=15.2.0=hdf11a46_17
143143
- libtiff=4.7.1=h9d88235_1
144144
- libuuid=2.41.3=h5347b49_0
145145
- libuv=1.51.0=hb03c661_1
@@ -182,19 +182,19 @@ dependencies:
182182
- overrides=7.7.0=pyhd8ed1ab_1
183183
- packaging=26.0=pyhcf101f3_0
184184
- pandas=2.3.3=py310h0158d43_2
185-
- pandoc=3.8.3=ha770c72_0
185+
- pandoc=3.9=ha770c72_0
186186
- pandocfilters=1.5.0=pyhd8ed1ab_0
187-
- parso=0.8.5=pyhcf101f3_0
187+
- parso=0.8.6=pyhcf101f3_0
188188
- partd=1.4.2=pyhd8ed1ab_0
189189
- pexpect=4.9.0=pyhd8ed1ab_1
190190
- pickleshare=0.7.5=pyhd8ed1ab_1004
191191
- pillow=10.3.0=py310hebfe307_1
192-
- pip=25.3=pyh8b19718_0
192+
- pip=26.0.1=pyh8b19718_0
193193
- platformdirs=4.5.1=pyhcf101f3_0
194194
- pluggy=1.6.0=pyhf9edf01_1
195195
- prometheus_client=0.24.1=pyhd8ed1ab_0
196196
- prompt-toolkit=3.0.52=pyha770c72_0
197-
- psutil=7.2.1=py310h139afa4_0
197+
- psutil=7.2.2=py310h139afa4_0
198198
- pthread-stubs=0.4=hb9d3cd8_1002
199199
- ptyprocess=0.7.0=pyhd8ed1ab_1
200200
- pure_eval=0.2.3=pyhd8ed1ab_1
@@ -217,7 +217,7 @@ dependencies:
217217
- python-tzdata=2025.3=pyhd8ed1ab_0
218218
- python_abi=3.10=8_cp310
219219
- pytz=2025.2=pyhd8ed1ab_0
220-
- pyyaml=6.0.3=py310h3406613_0
220+
- pyyaml=6.0.3=py310h3406613_1
221221
- pyzmq=27.1.0=py310h4f33d48_0
222222
- readline=8.3=h853b02a_0
223223
- readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1
@@ -231,7 +231,7 @@ dependencies:
231231
- scikit-learn=1.6.1=py310h27f47ee_0
232232
- scipy=1.14.1=py310hfcf56fc_2
233233
- send2trash=2.1.0=pyha191276_0
234-
- setuptools=80.10.2=pyh332efcf_0
234+
- setuptools=82.0.0=pyh332efcf_0
235235
- six=1.17.0=pyhe01879c_1
236236
- sniffio=1.3.1=pyhd8ed1ab_2
237237
- snowballstemmer=3.0.1=pyhd8ed1ab_0
@@ -249,13 +249,13 @@ dependencies:
249249
- tblib=3.2.2=pyhcf101f3_0
250250
- terminado=0.18.1=pyhc90fa1f_1
251251
- threadpoolctl=3.6.0=pyhecae5ae_0
252-
- tinycss2=1.5.1=pyhcf101f3_0
252+
- tinycss2=1.4.0=pyhd8ed1ab_0
253253
- tk=8.6.13=noxft_h366c992_103
254254
- tomli=2.4.0=pyhcf101f3_0
255255
- tomlkit=0.14.0=pyha770c72_0
256256
- toolz=1.1.0=pyhd8ed1ab_1
257257
- tornado=6.5.3=py310h7c4b9e2_0
258-
- tqdm=4.67.1=pyhd8ed1ab_1
258+
- tqdm=4.67.3=pyh8f84b5b_0
259259
- traitlets=5.14.3=pyhd8ed1ab_1
260260
- trimesh=4.1.8=pyhd8ed1ab_0
261261
- typing-extensions=4.15.0=h396c80c_0
@@ -266,7 +266,7 @@ dependencies:
266266
- unicodedata2=17.0.0=py310h7c4b9e2_1
267267
- uri-template=1.3.0=pyhd8ed1ab_1
268268
- urllib3=2.6.3=pyhd8ed1ab_0
269-
- wcwidth=0.5.0=pyhd8ed1ab_0
269+
- wcwidth=0.6.0=pyhd8ed1ab_0
270270
- webcolors=25.10.0=pyhd8ed1ab_0
271271
- webencodings=0.5.1=pyhd8ed1ab_3
272272
- websocket-client=1.9.0=pyhd8ed1ab_0
@@ -283,10 +283,10 @@ dependencies:
283283
- zlib=1.3.1=hb9d3cd8_2
284284
- zstd=1.5.7=hb78ec9c_6
285285
- pip:
286-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a
287-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e
288-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a
289-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b
286+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f38f025b418b3cc80f26f198084566fbf2f9711e
287+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53fbc8c6620894ac37f52dfa210909a2fa472714
288+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b453eb336ace73ced82149313b91eeff030371de
289+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ef94a62a27ecf9713377801f6632861a07e2a65c
290290

291291
variables:
292292
KMP_WARNINGS: 0

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

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,20 @@ dependencies:
2222
- certifi=2026.1.4=pyhd8ed1ab_0
2323
- click=8.3.1=pyh8f84b5b_1
2424
- cloudpickle=3.1.2=pyhcf101f3_1
25-
- colorama=0.4.6=pyhd8ed1ab_1
2625
- contourpy=1.3.2=py310h3788b33_0
2726
- cycler=0.12.1=pyhcf101f3_2
2827
- cytoolz=1.1.0=py310h7c4b9e2_1
29-
- dask-core=2025.3.0=pyhd8ed1ab_0
28+
- dask-core=2025.3.1=pyhd8ed1ab_0
3029
- discretize=0.11.3=py310hc563356_1
31-
- distributed=2025.3.0=pyhd8ed1ab_0
30+
- distributed=2025.3.1=pyhd8ed1ab_0
3231
- fasteners=0.19=pyhd8ed1ab_1
3332
- fonttools=4.61.1=py310h3406613_0
3433
- freetype=2.14.1=ha770c72_0
35-
- fsspec=2026.1.0=pyhd8ed1ab_0
34+
- fsspec=2026.2.0=pyhd8ed1ab_0
3635
- geoana=0.7.2=py310hc563356_1
3736
- h2=4.3.0=pyhcf101f3_0
3837
- h5py=3.15.1=nompi_py310h4aa865e_101
39-
- hdf5=1.14.6=nompi_h1b119a7_105
38+
- hdf5=1.14.6=nompi_h19486de_106
4039
- hpack=4.1.0=pyhd8ed1ab_0
4140
- hyperframe=6.1.0=pyhd8ed1ab_0
4241
- icu=75.1=he02047a_0
@@ -47,7 +46,7 @@ dependencies:
4746
- kiwisolver=1.4.9=py310haaf941d_2
4847
- krb5=1.21.3=h659f571_0
4948
- lcms2=2.18=h0c24ade_0
50-
- ld_impl_linux-64=2.45=default_hbd61a6d_105
49+
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
5150
- lerc=4.0.0=h0aef613_1
5251
- libaec=1.1.5=h088129d_0
5352
- libblas=3.9.0=37_h5875eb1_mkl
@@ -64,24 +63,24 @@ dependencies:
6463
- libffi=3.5.2=h3435931_0
6564
- libfreetype=2.14.1=ha770c72_0
6665
- libfreetype6=2.14.1=h73754d4_0
67-
- libgcc=15.2.0=he0feb66_16
68-
- libgcc-ng=15.2.0=h69a702a_16
69-
- libgfortran=15.2.0=h69a702a_16
70-
- libgfortran5=15.2.0=h68bc16d_16
66+
- libgcc=15.2.0=he0feb66_17
67+
- libgcc-ng=15.2.0=h69a702a_17
68+
- libgfortran=15.2.0=h69a702a_17
69+
- libgfortran5=15.2.0=h68bc16d_17
7170
- libhwloc=2.12.2=default_hafda6a7_1000
7271
- libiconv=1.18=h3b78370_2
7372
- libjpeg-turbo=3.1.2=hb03c661_0
7473
- liblapack=3.9.0=37_h5e43f62_mkl
7574
- liblzma=5.8.2=hb03c661_0
7675
- libnghttp2=1.67.0=had1ee68_0
7776
- libnsl=2.0.1=hb9d3cd8_1
78-
- libpng=1.6.54=h421ea60_0
77+
- libpng=1.6.55=h421ea60_0
7978
- libscotch=7.0.6=hea33c07_1
8079
- libspatialindex=2.0.0=he02047a_0
8180
- libsqlite=3.51.2=h0c1763c_0
8281
- libssh2=1.11.1=hcf80075_0
83-
- libstdcxx=15.2.0=h934c35e_16
84-
- libstdcxx-ng=15.2.0=hdf11a46_16
82+
- libstdcxx=15.2.0=h934c35e_17
83+
- libstdcxx-ng=15.2.0=hdf11a46_17
8584
- libtiff=4.7.1=h9d88235_1
8685
- libuuid=2.41.3=h5347b49_0
8786
- libwebp-base=1.6.0=hd42ef1d_0
@@ -109,8 +108,8 @@ dependencies:
109108
- pandas=2.3.3=py310h0158d43_2
110109
- partd=1.4.2=pyhd8ed1ab_0
111110
- pillow=10.3.0=py310hebfe307_1
112-
- pip=25.3=pyh8b19718_0
113-
- psutil=7.2.1=py310h139afa4_0
111+
- pip=26.0.1=pyh8b19718_0
112+
- psutil=7.2.2=py310h139afa4_0
114113
- pthread-stubs=0.4=hb9d3cd8_1002
115114
- pydantic=2.12.5=pyhcf101f3_1
116115
- pydantic-core=2.41.5=py310hd8f68c5_1
@@ -124,12 +123,12 @@ dependencies:
124123
- python-tzdata=2025.3=pyhd8ed1ab_0
125124
- python_abi=3.10=8_cp310
126125
- pytz=2025.2=pyhd8ed1ab_0
127-
- pyyaml=6.0.3=py310h3406613_0
126+
- pyyaml=6.0.3=py310h3406613_1
128127
- readline=8.3=h853b02a_0
129128
- rtree=1.2.0=py310haf1e407_1
130129
- scikit-learn=1.6.1=py310h27f47ee_0
131130
- scipy=1.14.1=py310hfcf56fc_2
132-
- setuptools=80.10.2=pyh332efcf_0
131+
- setuptools=82.0.0=pyh332efcf_0
133132
- six=1.17.0=pyhe01879c_1
134133
- sortedcontainers=2.4.0=pyhd8ed1ab_1
135134
- tbb=2021.13.0=hb700be7_5
@@ -138,7 +137,7 @@ dependencies:
138137
- tk=8.6.13=noxft_h366c992_103
139138
- toolz=1.1.0=pyhd8ed1ab_1
140139
- tornado=6.5.3=py310h7c4b9e2_0
141-
- tqdm=4.67.1=pyhd8ed1ab_1
140+
- tqdm=4.67.3=pyh8f84b5b_0
142141
- trimesh=4.1.8=pyhd8ed1ab_0
143142
- typing-extensions=4.15.0=h396c80c_0
144143
- typing-inspection=0.4.2=pyhd8ed1ab_1
@@ -156,10 +155,10 @@ dependencies:
156155
- zipp=3.23.0=pyhcf101f3_1
157156
- zstd=1.5.7=hb78ec9c_6
158157
- pip:
159-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a
160-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e
161-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a
162-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b
158+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f38f025b418b3cc80f26f198084566fbf2f9711e
159+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53fbc8c6620894ac37f52dfa210909a2fa472714
160+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b453eb336ace73ced82149313b91eeff030371de
161+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ef94a62a27ecf9713377801f6632861a07e2a65c
163162

164163
variables:
165164
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)