Skip to content

Commit a13ce1c

Browse files
authored
Merge branch 'develop' into pre-commit-ci-update-config
2 parents 626cad5 + b737e1f commit a13ce1c

20 files changed

Lines changed: 854 additions & 1015 deletions

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
- asttokens=3.0.1=pyhd8ed1ab_0
2020
- async-lru=2.2.0=pyhcf101f3_0
2121
- attrs=25.4.0=pyhcf101f3_1
22-
- babel=2.18.0=pyhcf101f3_0
22+
- babel=2.18.0=pyhcf101f3_1
2323
- backports.zstd=1.3.0=py312h90b7ffd_0
2424
- beautifulsoup4=4.14.3=pyha770c72_0
2525
- bleach=6.3.0=pyhcf101f3_1
@@ -35,14 +35,14 @@ dependencies:
3535
- cached_property=1.5.2=pyha770c72_1
3636
- certifi=2026.2.25=pyhd8ed1ab_0
3737
- cffi=2.0.0=py312h460c074_1
38-
- charset-normalizer=3.4.4=pyhd8ed1ab_0
38+
- charset-normalizer=3.4.5=pyhd8ed1ab_0
3939
- click=8.3.1=pyh8f84b5b_1
4040
- cloudpickle=3.1.2=pyhcf101f3_1
4141
- colorama=0.4.6=pyhd8ed1ab_1
4242
- comm=0.2.3=pyhe01879c_0
4343
- contourpy=1.3.3=py312h0a2e395_4
4444
- coverage=7.13.4=py312h8a5da7c_0
45-
- cpython=3.12.12=py312hd8ed1ab_2
45+
- cpython=3.12.13=py312hd8ed1ab_0
4646
- cycler=0.12.1=pyhcf101f3_2
4747
- cytoolz=1.1.0=py312h4c3975b_2
4848
- dask-core=2025.3.1=pyhd8ed1ab_0
@@ -58,9 +58,9 @@ dependencies:
5858
- exceptiongroup=1.3.1=pyhd8ed1ab_0
5959
- executing=2.2.1=pyhd8ed1ab_0
6060
- fasteners=0.19=pyhd8ed1ab_1
61-
- fonttools=4.61.1=py312h8a5da7c_0
61+
- fonttools=4.62.0=py312h8a5da7c_0
6262
- fqdn=1.5.1=pyhd8ed1ab_1
63-
- freetype=2.14.1=ha770c72_0
63+
- freetype=2.14.2=ha770c72_0
6464
- fsspec=2026.2.0=pyhd8ed1ab_0
6565
- geoana=0.8.1=np2py312h2a48985_0
6666
- h11=0.16.0=pyhcf101f3_1
@@ -78,7 +78,7 @@ dependencies:
7878
- importlib_resources=6.5.2=pyhd8ed1ab_0
7979
- iniconfig=2.3.0=pyhd8ed1ab_0
8080
- ipykernel=7.2.0=pyha191276_1
81-
- ipython=9.10.0=pyh53cf698_0
81+
- ipython=9.11.0=pyhecfbec7_0
8282
- ipython_genutils=0.2.0=pyhd8ed1ab_2
8383
- ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0
8484
- ipywidgets=7.8.5=pyhd8ed1ab_0
@@ -99,33 +99,33 @@ dependencies:
9999
- jupyter_events=0.12.0=pyhe01879c_0
100100
- jupyter_server=2.17.0=pyhcf101f3_0
101101
- jupyter_server_terminals=0.5.4=pyhcf101f3_0
102-
- jupyterlab=4.5.5=pyhd8ed1ab_0
102+
- jupyterlab=4.5.6=pyhd8ed1ab_0
103103
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
104104
- jupyterlab_server=2.28.0=pyhcf101f3_0
105105
- jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
106106
- jupytext=1.19.1=pyhbbac1ac_0
107107
- keyutils=1.6.3=hb9d3cd8_0
108-
- kiwisolver=1.4.9=py312h0a2e395_2
108+
- kiwisolver=1.5.0=py312h0a2e395_0
109109
- krb5=1.22.2=ha1258a1_0
110110
- lark=1.3.1=pyhd8ed1ab_0
111111
- lcms2=2.18=h0c24ade_0
112112
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
113-
- lerc=4.0.0=h0aef613_1
113+
- lerc=4.1.0=hdb68285_0
114114
- libaec=1.1.5=h088129d_0
115115
- libblas=3.11.0=5_h5875eb1_mkl
116116
- libbrotlicommon=1.2.0=hb03c661_1
117117
- libbrotlidec=1.2.0=hb03c661_1
118118
- libbrotlienc=1.2.0=hb03c661_1
119119
- libcblas=3.11.0=5_hfef963f_mkl
120-
- libcurl=8.18.0=hcf29cc6_1
120+
- libcurl=8.19.0=hcf29cc6_0
121121
- libdeflate=1.25=h17f619e_0
122122
- libdlf=0.3.0=pyhd8ed1ab_1
123123
- libedit=3.1.20250104=pl5321h7949ede_0
124124
- libev=4.33=hd590300_2
125125
- libexpat=2.7.4=hecca717_0
126126
- libffi=3.5.2=h3435931_0
127-
- libfreetype=2.14.1=ha770c72_0
128-
- libfreetype6=2.14.1=h73754d4_0
127+
- libfreetype=2.14.2=ha770c72_0
128+
- libfreetype6=2.14.2=h73754d4_0
129129
- libgcc=15.2.0=he0feb66_18
130130
- libgcc-ng=15.2.0=h69a702a_18
131131
- libgfortran=15.2.0=h69a702a_18
@@ -141,7 +141,7 @@ dependencies:
141141
- libscotch=7.0.11=int64_hfcc3fd4_2
142142
- libsodium=1.0.21=h280c20c_3
143143
- libspatialindex=2.1.0=he57a185_0
144-
- libsqlite=3.51.2=h0c1763c_0
144+
- libsqlite=3.52.0=h0c1763c_0
145145
- libssh2=1.11.1=hcf80075_0
146146
- libstdcxx=15.2.0=h934c35e_18
147147
- libstdcxx-ng=15.2.0=hdf11a46_18
@@ -178,7 +178,7 @@ dependencies:
178178
- ncurses=6.5=h2d0b736_3
179179
- nest-asyncio=1.6.0=pyhd8ed1ab_1
180180
- nodejs=22.6.0=hc19f0b3_1
181-
- notebook=7.5.4=pyhcf101f3_0
181+
- notebook=7.5.5=pyhcf101f3_0
182182
- notebook-shim=0.2.4=pyhd8ed1ab_1
183183
- numcodecs=0.15.1=py312hf79963d_1
184184
- numpy=2.4.2=py312h33ff503_1
@@ -195,7 +195,7 @@ dependencies:
195195
- pexpect=4.9.0=pyhd8ed1ab_1
196196
- pillow=12.1.1=py312h50c33e8_0
197197
- pip=26.0.1=pyh8b19718_0
198-
- platformdirs=4.9.2=pyhcf101f3_0
198+
- platformdirs=4.9.4=pyhcf101f3_0
199199
- pluggy=1.6.0=pyhf9edf01_1
200200
- prometheus_client=0.24.1=pyhd8ed1ab_0
201201
- prompt-toolkit=3.0.52=pyha770c72_0
@@ -214,15 +214,14 @@ dependencies:
214214
- pysocks=1.7.1=pyha55dd90_7
215215
- pytest=9.0.2=pyhcf101f3_0
216216
- pytest-cov=7.0.0=pyhcf101f3_1
217-
- python=3.12.12=hd63d673_2_cpython
217+
- python=3.12.13=hd63d673_0_cpython
218218
- python-dateutil=2.9.0.post0=pyhe01879c_2
219219
- python-fastjsonschema=2.21.2=pyhe01879c_0
220-
- python-gil=3.12.12=hd8ed1ab_2
220+
- python-gil=3.12.13=hd8ed1ab_0
221221
- python-json-logger=2.0.7=pyhd8ed1ab_0
222222
- python-mumps=0.0.6=nompi_h4762de1
223223
- python-tzdata=2025.3=pyhd8ed1ab_0
224224
- python_abi=3.12=8_cp312
225-
- pytz=2025.2=pyhd8ed1ab_0
226225
- pyyaml=6.0.3=py312h8a5da7c_1
227226
- pyzmq=27.1.0=py312hda471dd_2
228227
- qhull=2020.2=h434a139_5
@@ -238,7 +237,7 @@ dependencies:
238237
- scikit-learn=1.8.0=np2py312h3226591_1
239238
- scipy=1.17.1=py312h54fa4ab_0
240239
- send2trash=2.1.0=pyha191276_1
241-
- setuptools=82.0.0=pyh332efcf_0
240+
- setuptools=82.0.1=pyh332efcf_0
242241
- six=1.17.0=pyhe01879c_1
243242
- sniffio=1.3.1=pyhd8ed1ab_2
244243
- snowballstemmer=3.0.1=pyhd8ed1ab_0
@@ -279,7 +278,7 @@ dependencies:
279278
- websocket-client=1.9.0=pyhd8ed1ab_0
280279
- wheel=0.46.3=pyhd8ed1ab_0
281280
- widgetsnbextension=3.6.10=pyhd8ed1ab_0
282-
- wrapt=2.1.1=py312h4c3975b_0
281+
- wrapt=2.1.2=py312h4c3975b_0
283282
- xorg-libxau=1.0.12=hb03c661_1
284283
- xorg-libxdmcp=1.1.5=hb03c661_1
285284
- xyzservices=2025.11.0=pyhd8ed1ab_0
@@ -293,9 +292,9 @@ dependencies:
293292
- zstd=1.5.7=hb78ec9c_6
294293
- pip:
295294
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb86adf72fb82ea23c8904a39585982ca8793c52
296-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e83842e8acc2dd8e4c4353587b5314bb03714d9d
297-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@cdbbb07e623a260f0834df7261e06daa254e6b79
298-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7297f79aacb30d6149ac535da0ecd148efdb60d0
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
299298

300299
variables:
301300
KMP_WARNINGS: 0

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ dependencies:
3030
- distributed=2025.3.1=pyhd8ed1ab_0
3131
- et_xmlfile=2.0.0=pyhd8ed1ab_1
3232
- fasteners=0.19=pyhd8ed1ab_1
33-
- fonttools=4.61.1=py312h8a5da7c_0
34-
- freetype=2.14.1=ha770c72_0
33+
- fonttools=4.62.0=py312h8a5da7c_0
34+
- freetype=2.14.2=ha770c72_0
3535
- fsspec=2026.2.0=pyhd8ed1ab_0
3636
- geoana=0.8.1=np2py312h2a48985_0
3737
- h2=4.3.0=pyhcf101f3_0
@@ -44,26 +44,26 @@ dependencies:
4444
- jinja2=3.1.6=pyhcf101f3_1
4545
- joblib=1.5.3=pyhd8ed1ab_0
4646
- keyutils=1.6.3=hb9d3cd8_0
47-
- kiwisolver=1.4.9=py312h0a2e395_2
47+
- kiwisolver=1.5.0=py312h0a2e395_0
4848
- krb5=1.22.2=ha1258a1_0
4949
- lcms2=2.18=h0c24ade_0
5050
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
51-
- lerc=4.0.0=h0aef613_1
51+
- lerc=4.1.0=hdb68285_0
5252
- libaec=1.1.5=h088129d_0
5353
- libblas=3.11.0=5_h5875eb1_mkl
5454
- libbrotlicommon=1.2.0=hb03c661_1
5555
- libbrotlidec=1.2.0=hb03c661_1
5656
- libbrotlienc=1.2.0=hb03c661_1
5757
- libcblas=3.11.0=5_hfef963f_mkl
58-
- libcurl=8.18.0=hcf29cc6_1
58+
- libcurl=8.19.0=hcf29cc6_0
5959
- libdeflate=1.25=h17f619e_0
6060
- libdlf=0.3.0=pyhd8ed1ab_1
6161
- libedit=3.1.20250104=pl5321h7949ede_0
6262
- libev=4.33=hd590300_2
6363
- libexpat=2.7.4=hecca717_0
6464
- libffi=3.5.2=h3435931_0
65-
- libfreetype=2.14.1=ha770c72_0
66-
- libfreetype6=2.14.1=h73754d4_0
65+
- libfreetype=2.14.2=ha770c72_0
66+
- libfreetype6=2.14.2=h73754d4_0
6767
- libgcc=15.2.0=he0feb66_18
6868
- libgcc-ng=15.2.0=h69a702a_18
6969
- libgfortran=15.2.0=h69a702a_18
@@ -78,7 +78,7 @@ dependencies:
7878
- libpng=1.6.55=h421ea60_0
7979
- libscotch=7.0.11=int64_hfcc3fd4_2
8080
- libspatialindex=2.1.0=he57a185_0
81-
- libsqlite=3.51.2=h0c1763c_0
81+
- libsqlite=3.52.0=h0c1763c_0
8282
- libssh2=1.11.1=hcf80075_0
8383
- libstdcxx=15.2.0=h934c35e_18
8484
- libstdcxx-ng=15.2.0=hdf11a46_18
@@ -119,7 +119,7 @@ dependencies:
119119
- pymatsolver=0.3.1=pyh48887ae_201
120120
- pyparsing=3.3.2=pyhcf101f3_0
121121
- pysocks=1.7.1=pyha55dd90_7
122-
- python=3.12.12=hd63d673_2_cpython
122+
- python=3.12.13=hd63d673_0_cpython
123123
- python-dateutil=2.9.0.post0=pyhe01879c_2
124124
- python-mumps=0.0.6=nompi_h4762de1
125125
- python-tzdata=2025.3=pyhd8ed1ab_0
@@ -130,7 +130,7 @@ dependencies:
130130
- rtree=1.4.1=pyh11ca60a_0
131131
- scikit-learn=1.8.0=np2py312h3226591_1
132132
- scipy=1.17.1=py312h54fa4ab_0
133-
- setuptools=82.0.0=pyh332efcf_0
133+
- setuptools=82.0.1=pyh332efcf_0
134134
- six=1.17.0=pyhe01879c_1
135135
- sortedcontainers=2.4.0=pyhd8ed1ab_1
136136
- tbb=2022.3.0=hb700be7_2
@@ -148,7 +148,7 @@ dependencies:
148148
- unicodedata2=17.0.1=py312h4c3975b_0
149149
- urllib3=2.6.3=pyhd8ed1ab_0
150150
- wheel=0.46.3=pyhd8ed1ab_0
151-
- wrapt=2.1.1=py312h4c3975b_0
151+
- wrapt=2.1.2=py312h4c3975b_0
152152
- xorg-libxau=1.0.12=hb03c661_1
153153
- xorg-libxdmcp=1.1.5=hb03c661_1
154154
- xyzservices=2025.11.0=pyhd8ed1ab_0
@@ -160,9 +160,9 @@ dependencies:
160160
- zstd=1.5.7=hb78ec9c_6
161161
- pip:
162162
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb86adf72fb82ea23c8904a39585982ca8793c52
163-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@e83842e8acc2dd8e4c4353587b5314bb03714d9d
164-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@cdbbb07e623a260f0834df7261e06daa254e6b79
165-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7297f79aacb30d6149ac535da0ecd148efdb60d0
163+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@7e3b1de8e0eab8b7b7199487bab23d8bbf18ce26
164+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ad1de3ed43ac802bf71eef3fc5ba75d5be525efe
165+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8a9cf452335379363e15ac7a3cd9bf689d8e2841
166166

167167
variables:
168168
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)