Skip to content

Commit 44af353

Browse files
committed
Merge branch 'GEOPY-2770' of github.com:MiraGeoscience/simpeg-drivers into GEOPY-2770
2 parents 51ee9b7 + d2a579c commit 44af353

27 files changed

Lines changed: 2877 additions & 1874 deletions

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

Lines changed: 51 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,24 @@ dependencies:
1010
- _python_abi3_support=1.0=hd8ed1ab_2
1111
- alabaster=0.7.16=pyhd8ed1ab_0
1212
- annotated-types=0.7.0=pyhd8ed1ab_1
13-
- anyio=4.12.1=pyhcf101f3_0
13+
- anyio=4.13.0=pyhcf101f3_0
1414
- argon2-cffi=25.1.0=pyhd8ed1ab_0
1515
- argon2-cffi-bindings=25.1.0=py312h4c3975b_2
1616
- arrow=1.4.0=pyhcf101f3_0
1717
- asciitree=0.3.3=py_2
1818
- astroid=4.0.4=py312h7900ff3_0
1919
- asttokens=3.0.1=pyhd8ed1ab_0
20-
- async-lru=2.2.0=pyhcf101f3_0
21-
- attrs=25.4.0=pyhcf101f3_1
20+
- async-lru=2.3.0=pyhcf101f3_0
21+
- 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
@@ -35,13 +44,13 @@ dependencies:
3544
- cached_property=1.5.2=pyha770c72_1
3645
- certifi=2026.2.25=pyhd8ed1ab_0
3746
- cffi=2.0.0=py312h460c074_1
38-
- charset-normalizer=3.4.5=pyhd8ed1ab_0
47+
- charset-normalizer=3.4.6=pyhd8ed1ab_0
3948
- click=8.3.1=pyh8f84b5b_1
4049
- cloudpickle=3.1.2=pyhcf101f3_1
4150
- colorama=0.4.6=pyhd8ed1ab_1
4251
- comm=0.2.3=pyhe01879c_0
4352
- contourpy=1.3.3=py312h0a2e395_4
44-
- coverage=7.13.4=py312h8a5da7c_0
53+
- coverage=7.13.5=py312h8a5da7c_0
4554
- cpython=3.12.13=py312hd8ed1ab_0
4655
- cycler=0.12.1=pyhcf101f3_2
4756
- cytoolz=1.1.0=py312h4c3975b_2
@@ -60,25 +69,25 @@ dependencies:
6069
- fasteners=0.19=pyhd8ed1ab_1
6170
- fonttools=4.62.0=py312h8a5da7c_0
6271
- fqdn=1.5.1=pyhd8ed1ab_1
63-
- freetype=2.14.2=ha770c72_0
64-
- fsspec=2026.2.0=pyhd8ed1ab_0
72+
- freetype=2.14.3=ha770c72_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.15.1=nompi_py312ha4f8f14_101
69-
- hdf5=1.14.6=nompi_h19486de_106
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
7382
- hyperframe=6.1.0=pyhd8ed1ab_0
7483
- icu=75.1=he02047a_0
7584
- idna=3.11=pyhd8ed1ab_0
76-
- imagesize=1.4.1=pyhd8ed1ab_0
77-
- importlib-metadata=8.7.0=pyhe01879c_1
85+
- imagesize=2.0.0=pyhd8ed1ab_0
86+
- importlib-metadata=8.8.0=pyhcf101f3_0
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,8 +96,8 @@ 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
91-
- jsonpointer=3.0.0=pyhcf101f3_3
99+
- json5=0.14.0=pyhd8ed1ab_0
100+
- jsonpointer=3.1.1=pyhcf101f3_0
92101
- jsonschema=4.26.0=pyhcf101f3_0
93102
- jsonschema-specifications=2025.9.1=pyhcf101f3_0
94103
- jsonschema-with-format-nongpl=4.26.0=hcf101f3_0
@@ -109,35 +118,35 @@ dependencies:
109118
- krb5=1.22.2=ha1258a1_0
110119
- lark=1.3.1=pyhd8ed1ab_0
111120
- lcms2=2.18=h0c24ade_0
112-
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
121+
- ld_impl_linux-64=2.45.1=default_hbd61a6d_102
113122
- lerc=4.1.0=hdb68285_0
114123
- libaec=1.1.5=h088129d_0
115-
- libblas=3.11.0=5_h5875eb1_mkl
124+
- libblas=3.11.0=6_h5875eb1_mkl
116125
- libbrotlicommon=1.2.0=hb03c661_1
117126
- libbrotlidec=1.2.0=hb03c661_1
118127
- libbrotlienc=1.2.0=hb03c661_1
119-
- libcblas=3.11.0=5_hfef963f_mkl
128+
- libcblas=3.11.0=6_hfef963f_mkl
120129
- libcurl=8.19.0=hcf29cc6_0
121130
- libdeflate=1.25=h17f619e_0
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
127-
- libfreetype=2.14.2=ha770c72_0
128-
- libfreetype6=2.14.2=h73754d4_0
136+
- libfreetype=2.14.3=ha770c72_0
137+
- libfreetype6=2.14.3=h73754d4_0
129138
- libgcc=15.2.0=he0feb66_18
130139
- libgcc-ng=15.2.0=h69a702a_18
131140
- libgfortran=15.2.0=h69a702a_18
132141
- libgfortran5=15.2.0=h68bc16d_18
133142
- libhwloc=2.12.2=default_hafda6a7_1000
134143
- libiconv=1.18=h3b78370_2
135144
- libjpeg-turbo=3.1.2=hb03c661_0
136-
- liblapack=3.11.0=5_h5e43f62_mkl
145+
- liblapack=3.11.0=6_h5e43f62_mkl
137146
- liblzma=5.8.2=hb03c661_0
138-
- libnghttp2=1.67.0=had1ee68_0
147+
- libnghttp2=1.68.1=h877daf1_0
139148
- libnsl=2.0.1=hb9d3cd8_1
140-
- libpng=1.6.55=h421ea60_0
149+
- libpng=1.6.56=h421ea60_0
141150
- libscotch=7.0.11=int64_hfcc3fd4_2
142151
- libsodium=1.0.21=h280c20c_3
143152
- libspatialindex=2.1.0=he57a185_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
156-
- libzlib=1.3.1=hb9d3cd8_2
157-
- llvm-openmp=22.1.0=h4922eb0_0
165+
- libzlib=1.3.2=h25fd6f3_2
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
@@ -165,7 +174,7 @@ dependencies:
165174
- mdurl=0.1.2=pyhd8ed1ab_1
166175
- metis=5.1.0=hd0bcaf9_1007
167176
- mistune=3.2.0=pyhcf101f3_0
168-
- mkl=2025.3.0=h0e700b2_463
177+
- mkl=2025.3.1=h0e700b2_10
169178
- msgpack-python=1.1.2=py312hd9148b4_1
170179
- mumps-include=5.8.2=h5a610fb_2
171180
- mumps-seq=5.8.2=hc1b3267_2
@@ -181,14 +190,14 @@ dependencies:
181190
- notebook=7.5.5=pyhcf101f3_0
182191
- notebook-shim=0.2.4=pyhd8ed1ab_1
183192
- numcodecs=0.15.1=py312hf79963d_1
184-
- numpy=2.4.2=py312h33ff503_1
193+
- numpy=2.4.3=py312h33ff503_0
185194
- openjpeg=2.5.4=h55fea9a_0
186195
- openpyxl=3.1.5=py312h7f6eeab_3
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
191-
- pandoc=3.9=ha770c72_0
199+
- pandas=3.0.2=py312h8ecdadd_0
200+
- pandoc=3.9.0.2=ha770c72_0
192201
- pandocfilters=1.5.0=pyhd8ed1ab_0
193202
- parso=0.8.6=pyhcf101f3_0
194203
- partd=1.4.2=pyhd8ed1ab_0
@@ -207,13 +216,13 @@ 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
214223
- pysocks=1.7.1=pyha55dd90_7
215224
- pytest=9.0.2=pyhcf101f3_0
216-
- pytest-cov=7.0.0=pyhcf101f3_1
225+
- pytest-cov=7.1.0=pyhcf101f3_0
217226
- python=3.12.13=hd63d673_0_cpython
218227
- python-dateutil=2.9.0.post0=pyhe01879c_2
219228
- python-fastjsonschema=2.21.2=pyhe01879c_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.32.5=pyhcf101f3_1
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
@@ -257,10 +267,10 @@ dependencies:
257267
- threadpoolctl=3.6.0=pyhecae5ae_0
258268
- tinycss2=1.4.0=pyhd8ed1ab_0
259269
- tk=8.6.13=noxft_h366c992_103
260-
- tomli=2.4.0=pyhcf101f3_0
270+
- tomli=2.4.1=pyhcf101f3_0
261271
- tomlkit=0.14.0=pyha770c72_0
262272
- toolz=1.1.0=pyhd8ed1ab_1
263-
- tornado=6.5.3=py312h4c3975b_0
273+
- tornado=6.5.5=py312h4c3975b_0
264274
- tqdm=4.67.3=pyh8f84b5b_0
265275
- traitlets=5.14.3=pyhd8ed1ab_1
266276
- trimesh=4.1.8=pyhd8ed1ab_0
@@ -281,20 +291,20 @@ 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
288298
- zict=3.0.0=pyhd8ed1ab_1
289299
- zipp=3.23.0=pyhcf101f3_1
290-
- zlib=1.3.1=hb9d3cd8_2
300+
- zlib=1.3.2=h25fd6f3_2
291301
- zlib-ng=2.3.3=hceb46e0_1
292302
- zstd=1.5.7=hb78ec9c_6
293303
- pip:
294-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb86adf72fb82ea23c8904a39585982ca8793c52
295-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@7e3b1de8e0eab8b7b7199487bab23d8bbf18ce26
296-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ad1de3ed43ac802bf71eef3fc5ba75d5be525efe
297-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8a9cf452335379363e15ac7a3cd9bf689d8e2841
304+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@eb0474175000819e93d8dc701ed0fd6101c44451
305+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@f5eca3735bbca573f4cac3925c6f4c0c341d8e28
306+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@0e66e6b7a44ede34563da6a77ccd87a4cc7b5185
307+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f7dd0d37aac285dd9ece26396ee39ae72bd6d18d
298308

299309
variables:
300310
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)