Skip to content

Commit b73ef70

Browse files
committed
BUmp version and relock
1 parent 210eb33 commit b73ef70

23 files changed

Lines changed: 2800 additions & 2436 deletions

.github/workflows/python_analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
package-manager: 'conda'
3535
app-name: 'simpeg_drivers'
36-
python-version: '3.10'
36+
python-version: '3.12'
3737
call-workflow-pytest:
3838
name: Pytest
3939
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@v2
@@ -42,10 +42,10 @@ jobs:
4242
pull-requests: read
4343
with:
4444
package-manager: 'conda'
45-
python-versions: '["3.10", "3.11", "3.12"]'
45+
python-versions: '["3.12", "3.13", "3.14"]'
4646
os: '["ubuntu-latest", "windows-latest"]'
4747
cache-number: 1
48-
codecov-reference-python-version: '3.10'
48+
codecov-reference-python-version: '3.12'
4949
codecov-reference-os: '["ubuntu-latest"]'
5050
timeout-minutes: 40
5151
secrets:

.github/workflows/python_deploy_dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
contents: write
2020
with:
2121
package-name: 'simpeg-drivers'
22-
python-version: '3.10'
22+
python-version: '3.12'
2323
source-repo-names: '["public-noremote-conda-dev"]'
2424
conda-channels: '["conda-forge"]'
2525
publish-repo-names: '["public-noremote-conda-dev"]'
@@ -35,7 +35,7 @@ jobs:
3535
package-manager: 'poetry'
3636
package-name: 'simpeg-drivers'
3737
version-tag: ${{ github.ref_name }}
38-
python-version: '3.10'
38+
python-version: '3.12'
3939
virtual-repo-names: '["public-pypi-dev", "test-pypi"]'
4040
secrets:
4141
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}

deps-lock-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include_dev: True
22
py_versions:
3-
- "3.10"
4-
- "3.11"
53
- "3.12"
4+
- "3.13"
5+
- "3.14"
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies:
2-
- python=3.10.*
2+
- python=3.13.*
33
- pip
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies:
2-
- python=3.11.*
2+
- python=3.14.*
33
- pip

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

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 8d2ec2f5bff152c0b1a90962f693656e4ddb9e44ed5c8117e1ca290243cc3f6e
3+
# input_hash: cb8dc97c57f6e80f9d7a889d8e8ac9e26205d4fa90fcdc6b69c8ba96cd5f6f8d
44

55
channels:
66
- conda-forge
@@ -95,10 +95,10 @@ dependencies:
9595
- jupyter-lsp=2.3.0=pyhcf101f3_0
9696
- jupyter_client=8.8.0=pyhcf101f3_0
9797
- jupyter_core=5.9.1=pyhc90fa1f_0
98-
- jupyter_events=0.12.0=pyh29332c3_0
98+
- jupyter_events=0.12.0=pyhe01879c_0
9999
- jupyter_server=2.17.0=pyhcf101f3_0
100100
- jupyter_server_terminals=0.5.4=pyhcf101f3_0
101-
- jupyterlab=4.5.3=pyhd8ed1ab_0
101+
- jupyterlab=4.5.4=pyhd8ed1ab_0
102102
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
103103
- jupyterlab_server=2.28.0=pyhcf101f3_0
104104
- jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
@@ -111,11 +111,11 @@ dependencies:
111111
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
112112
- lerc=4.0.0=h0aef613_1
113113
- libaec=1.1.5=h088129d_0
114-
- libblas=3.9.0=37_h5875eb1_mkl
114+
- libblas=3.11.0=5_h4a7cf45_openblas
115115
- libbrotlicommon=1.2.0=hb03c661_1
116116
- libbrotlidec=1.2.0=hb03c661_1
117117
- libbrotlienc=1.2.0=hb03c661_1
118-
- libcblas=3.9.0=37_hfef963f_mkl
118+
- libcblas=3.11.0=5_h0358290_openblas
119119
- libcurl=8.18.0=h4e3cde8_0
120120
- libdeflate=1.25=h17f619e_0
121121
- libdlf=0.3.0=pyhd8ed1ab_1
@@ -132,14 +132,15 @@ dependencies:
132132
- libhwloc=2.12.2=default_hafda6a7_1000
133133
- libiconv=1.18=h3b78370_2
134134
- libjpeg-turbo=3.1.2=hb03c661_0
135-
- liblapack=3.9.0=37_h5e43f62_mkl
135+
- liblapack=3.11.0=5_h47877c9_openblas
136136
- liblzma=5.8.2=hb03c661_0
137137
- libnghttp2=1.67.0=had1ee68_0
138138
- libnsl=2.0.1=hb9d3cd8_1
139+
- libopenblas=0.3.30=openmp_hd680484_4
139140
- libpng=1.6.55=h421ea60_0
140-
- libscotch=7.0.6=hea33c07_1
141+
- libscotch=7.0.10=int32_h8512f2c_2
141142
- libsodium=1.0.20=h4ab18f5_0
142-
- libspatialindex=2.0.0=he02047a_0
143+
- libspatialindex=2.1.0=he57a185_0
143144
- libsqlite=3.51.2=h0c1763c_0
144145
- libssh2=1.11.1=hcf80075_0
145146
- libstdcxx=15.2.0=h934c35e_17
@@ -157,17 +158,17 @@ dependencies:
157158
- locket=1.0.0=pyhd8ed1ab_0
158159
- markdown-it-py=4.0.0=pyhd8ed1ab_0
159160
- markupsafe=3.0.3=py312h8a5da7c_0
160-
- matplotlib-base=3.8.4=py312h20ab3a6_2
161+
- matplotlib-base=3.10.8=py312he3d6523_0
161162
- matplotlib-inline=0.2.1=pyhd8ed1ab_0
162163
- mccabe=0.7.0=pyhd8ed1ab_1
163164
- mdit-py-plugins=0.5.0=pyhd8ed1ab_0
164165
- mdurl=0.1.2=pyhd8ed1ab_1
165166
- metis=5.1.0=hd0bcaf9_1007
166167
- mistune=3.2.0=pyhcf101f3_0
167-
- mkl=2024.2.2=ha770c72_17
168+
- mkl=2025.3.0=h0e700b2_463
168169
- msgpack-python=1.1.2=py312hd9148b4_1
169-
- mumps-include=5.7.3=h82cca05_10
170-
- mumps-seq=5.7.3=h06cbf8f_10
170+
- mumps-include=5.8.1=h1795ed4_4
171+
- mumps-seq=5.8.1=h4374b6a_4
171172
- munkres=1.1.4=pyhd8ed1ab_1
172173
- nbclient=0.10.4=pyhd8ed1ab_0
173174
- nbconvert=7.16.6=hc388f54_1
@@ -180,7 +181,7 @@ dependencies:
180181
- notebook=7.5.3=pyhcf101f3_0
181182
- notebook-shim=0.2.4=pyhd8ed1ab_1
182183
- numcodecs=0.15.1=py312hf79963d_1
183-
- numpy=1.26.4=py312heda63a1_0
184+
- numpy=2.4.2=py312h33ff503_1
184185
- openjpeg=2.5.4=h55fea9a_0
185186
- openssl=3.6.1=h35e630c_1
186187
- overrides=7.7.0=pyhd8ed1ab_1
@@ -191,7 +192,7 @@ dependencies:
191192
- parso=0.8.6=pyhcf101f3_0
192193
- partd=1.4.2=pyhd8ed1ab_0
193194
- pexpect=4.9.0=pyhd8ed1ab_1
194-
- pillow=10.3.0=py312h287a98d_1
195+
- pillow=12.1.1=py312h50c33e8_0
195196
- pip=26.0.1=pyh8b19718_0
196197
- platformdirs=4.5.1=pyhcf101f3_0
197198
- pluggy=1.6.0=pyhf9edf01_1
@@ -204,7 +205,7 @@ dependencies:
204205
- pycparser=2.22=pyh29332c3_1
205206
- pydantic=2.12.5=pyhcf101f3_1
206207
- pydantic-core=2.41.5=py312h868fb18_1
207-
- pydiso=0.1.2=py312h686354e_1
208+
- pydiso=0.2.0=np2py312h1cfd70e_1
208209
- pygments=2.19.2=pyhd8ed1ab_0
209210
- pylint=4.0.4=pyhcf101f3_0
210211
- pymatsolver=0.3.1=pyh48887ae_201
@@ -217,12 +218,13 @@ dependencies:
217218
- python-fastjsonschema=2.21.2=pyhe01879c_0
218219
- python-gil=3.12.12=hd8ed1ab_2
219220
- python-json-logger=2.0.7=pyhd8ed1ab_0
220-
- python-mumps=0.0.3=py312h6ad3ee3_0
221+
- python-mumps=0.0.6=nompi_hf5ef983
221222
- python-tzdata=2025.3=pyhd8ed1ab_0
222223
- python_abi=3.12=8_cp312
223224
- pytz=2025.2=pyhd8ed1ab_0
224225
- pyyaml=6.0.3=py312h8a5da7c_1
225226
- pyzmq=27.1.0=py312hfb55c3c_0
227+
- qhull=2020.2=h434a139_5
226228
- readline=8.3=h853b02a_0
227229
- readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1
228230
- referencing=0.37.0=pyhcf101f3_0
@@ -231,10 +233,10 @@ dependencies:
231233
- rfc3986-validator=0.1.1=pyh9f0ad1d_0
232234
- rfc3987-syntax=1.1.0=pyhe01879c_1
233235
- rpds-py=0.30.0=py312h868fb18_0
234-
- rtree=1.2.0=py312h3ed4c40_1
235-
- scikit-learn=1.6.1=py312h7a48858_0
236-
- scipy=1.14.1=py312h62794b6_2
237-
- send2trash=2.1.0=pyha191276_0
236+
- rtree=1.4.1=pyh11ca60a_0
237+
- scikit-learn=1.8.0=np2py312h3226591_1
238+
- scipy=1.17.0=py312h54fa4ab_1
239+
- send2trash=2.1.0=pyha191276_1
238240
- setuptools=82.0.0=pyh332efcf_0
239241
- six=1.17.0=pyhe01879c_1
240242
- sniffio=1.3.1=pyhd8ed1ab_2
@@ -249,7 +251,7 @@ dependencies:
249251
- sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1
250252
- sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1
251253
- stack_data=0.6.3=pyhd8ed1ab_1
252-
- tbb=2021.13.0=hb700be7_5
254+
- tbb=2022.3.0=hb700be7_2
253255
- tblib=3.2.2=pyhcf101f3_0
254256
- terminado=0.18.1=pyhc90fa1f_1
255257
- threadpoolctl=3.6.0=pyhecae5ae_0
@@ -267,7 +269,7 @@ dependencies:
267269
- typing_extensions=4.15.0=pyhcf101f3_0
268270
- typing_utils=0.1.0=pyhd8ed1ab_1
269271
- tzdata=2025c=hc9c84f9_1
270-
- unicodedata2=17.0.0=py312h4c3975b_1
272+
- unicodedata2=17.0.1=py312h4c3975b_0
271273
- uri-template=1.3.0=pyhd8ed1ab_1
272274
- urllib3=2.6.3=pyhd8ed1ab_0
273275
- wcwidth=0.6.0=pyhd8ed1ab_0
@@ -286,11 +288,12 @@ dependencies:
286288
- zict=3.0.0=pyhd8ed1ab_1
287289
- zipp=3.23.0=pyhcf101f3_1
288290
- zlib=1.3.1=hb9d3cd8_2
291+
- zlib-ng=2.3.3=hceb46e0_1
289292
- zstd=1.5.7=hb78ec9c_6
290293
- pip:
291-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f38f025b418b3cc80f26f198084566fbf2f9711e
292-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53fbc8c6620894ac37f52dfa210909a2fa472714
293-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b453eb336ace73ced82149313b91eeff030371de
294+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@9039f80d05d94149589480f02eaa1455a58e5970
295+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@84e4d20a541ac82d5579f42aea28bb2bd233fed2
296+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@433adcf84aed0ea450cbd128d4c567bf35d47881
294297
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ef94a62a27ecf9713377801f6632861a07e2a65c
295298

296299
variables:

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

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 8d2ec2f5bff152c0b1a90962f693656e4ddb9e44ed5c8117e1ca290243cc3f6e
3+
# input_hash: cb8dc97c57f6e80f9d7a889d8e8ac9e26205d4fa90fcdc6b69c8ba96cd5f6f8d
44

55
channels:
66
- conda-forge
@@ -19,7 +19,6 @@ dependencies:
1919
- ca-certificates=2026.1.4=hbd8a1cb_0
2020
- cached-property=1.5.2=hd8ed1ab_1
2121
- cached_property=1.5.2=pyha770c72_1
22-
- certifi=2026.1.4=pyhd8ed1ab_0
2322
- click=8.3.1=pyh8f84b5b_1
2423
- cloudpickle=3.1.2=pyhcf101f3_1
2524
- contourpy=1.3.3=py312h0a2e395_4
@@ -50,11 +49,11 @@ dependencies:
5049
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
5150
- lerc=4.0.0=h0aef613_1
5251
- libaec=1.1.5=h088129d_0
53-
- libblas=3.9.0=37_h5875eb1_mkl
52+
- libblas=3.11.0=5_h4a7cf45_openblas
5453
- libbrotlicommon=1.2.0=hb03c661_1
5554
- libbrotlidec=1.2.0=hb03c661_1
5655
- libbrotlienc=1.2.0=hb03c661_1
57-
- libcblas=3.9.0=37_hfef963f_mkl
56+
- libcblas=3.11.0=5_h0358290_openblas
5857
- libcurl=8.18.0=h4e3cde8_0
5958
- libdeflate=1.25=h17f619e_0
6059
- libdlf=0.3.0=pyhd8ed1ab_1
@@ -71,13 +70,14 @@ dependencies:
7170
- libhwloc=2.12.2=default_hafda6a7_1000
7271
- libiconv=1.18=h3b78370_2
7372
- libjpeg-turbo=3.1.2=hb03c661_0
74-
- liblapack=3.9.0=37_h5e43f62_mkl
73+
- liblapack=3.11.0=5_h47877c9_openblas
7574
- liblzma=5.8.2=hb03c661_0
7675
- libnghttp2=1.67.0=had1ee68_0
7776
- libnsl=2.0.1=hb9d3cd8_1
77+
- libopenblas=0.3.30=openmp_hd680484_4
7878
- libpng=1.6.55=h421ea60_0
79-
- libscotch=7.0.6=hea33c07_1
80-
- libspatialindex=2.0.0=he02047a_0
79+
- libscotch=7.0.10=int32_h8512f2c_2
80+
- libspatialindex=2.1.0=he57a185_0
8181
- libsqlite=3.51.2=h0c1763c_0
8282
- libssh2=1.11.1=hcf80075_0
8383
- libstdcxx=15.2.0=h934c35e_17
@@ -93,45 +93,46 @@ dependencies:
9393
- llvm-openmp=21.1.8=h4922eb0_0
9494
- locket=1.0.0=pyhd8ed1ab_0
9595
- markupsafe=3.0.3=py312h8a5da7c_0
96-
- matplotlib-base=3.8.4=py312h20ab3a6_2
96+
- matplotlib-base=3.10.8=py312he3d6523_0
9797
- metis=5.1.0=hd0bcaf9_1007
98-
- mkl=2024.2.2=ha770c72_17
98+
- mkl=2025.3.0=h0e700b2_463
9999
- msgpack-python=1.1.2=py312hd9148b4_1
100-
- mumps-include=5.7.3=h82cca05_10
101-
- mumps-seq=5.7.3=h06cbf8f_10
100+
- mumps-include=5.8.1=h1795ed4_4
101+
- mumps-seq=5.8.1=h4374b6a_4
102102
- munkres=1.1.4=pyhd8ed1ab_1
103103
- ncurses=6.5=h2d0b736_3
104104
- numcodecs=0.15.1=py312hf79963d_1
105-
- numpy=1.26.4=py312heda63a1_0
105+
- numpy=2.4.2=py312h33ff503_1
106106
- openjpeg=2.5.4=h55fea9a_0
107107
- openssl=3.6.1=h35e630c_1
108108
- packaging=26.0=pyhcf101f3_0
109109
- pandas=3.0.0=py312h8ecdadd_0
110110
- partd=1.4.2=pyhd8ed1ab_0
111-
- pillow=10.3.0=py312h287a98d_1
111+
- pillow=12.1.1=py312h50c33e8_0
112112
- pip=26.0.1=pyh8b19718_0
113113
- psutil=7.2.2=py312h5253ce2_0
114114
- pthread-stubs=0.4=hb9d3cd8_1002
115115
- pydantic=2.12.5=pyhcf101f3_1
116116
- pydantic-core=2.41.5=py312h868fb18_1
117-
- pydiso=0.1.2=py312h686354e_1
117+
- pydiso=0.2.0=np2py312h1cfd70e_1
118118
- pymatsolver=0.3.1=pyh48887ae_201
119119
- pyparsing=3.3.2=pyhcf101f3_0
120120
- pysocks=1.7.1=pyha55dd90_7
121121
- python=3.12.12=hd63d673_2_cpython
122122
- python-dateutil=2.9.0.post0=pyhe01879c_2
123-
- python-mumps=0.0.3=py312h6ad3ee3_0
123+
- python-mumps=0.0.6=nompi_hf5ef983
124124
- python-tzdata=2025.3=pyhd8ed1ab_0
125125
- python_abi=3.12=8_cp312
126126
- pyyaml=6.0.3=py312h8a5da7c_1
127+
- qhull=2020.2=h434a139_5
127128
- readline=8.3=h853b02a_0
128-
- rtree=1.2.0=py312h3ed4c40_1
129-
- scikit-learn=1.6.1=py312h7a48858_0
130-
- scipy=1.14.1=py312h62794b6_2
129+
- rtree=1.4.1=pyh11ca60a_0
130+
- scikit-learn=1.8.0=np2py312h3226591_1
131+
- scipy=1.17.0=py312h54fa4ab_1
131132
- setuptools=82.0.0=pyh332efcf_0
132133
- six=1.17.0=pyhe01879c_1
133134
- sortedcontainers=2.4.0=pyhd8ed1ab_1
134-
- tbb=2021.13.0=hb700be7_5
135+
- tbb=2022.3.0=hb700be7_2
135136
- tblib=3.2.2=pyhcf101f3_0
136137
- threadpoolctl=3.6.0=pyhecae5ae_0
137138
- tk=8.6.13=noxft_h366c992_103
@@ -143,7 +144,7 @@ dependencies:
143144
- typing-inspection=0.4.2=pyhd8ed1ab_1
144145
- typing_extensions=4.15.0=pyhcf101f3_0
145146
- tzdata=2025c=hc9c84f9_1
146-
- unicodedata2=17.0.0=py312h4c3975b_1
147+
- unicodedata2=17.0.1=py312h4c3975b_0
147148
- urllib3=2.6.3=pyhd8ed1ab_0
148149
- wheel=0.46.3=pyhd8ed1ab_0
149150
- wrapt=2.1.1=py312h4c3975b_0
@@ -154,11 +155,12 @@ dependencies:
154155
- zarr=2.14.2=pyhd8ed1ab_0
155156
- zict=3.0.0=pyhd8ed1ab_1
156157
- zipp=3.23.0=pyhcf101f3_1
158+
- zlib-ng=2.3.3=hceb46e0_1
157159
- zstd=1.5.7=hb78ec9c_6
158160
- pip:
159-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@f38f025b418b3cc80f26f198084566fbf2f9711e
160-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53fbc8c6620894ac37f52dfa210909a2fa472714
161-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b453eb336ace73ced82149313b91eeff030371de
161+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@9039f80d05d94149589480f02eaa1455a58e5970
162+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@84e4d20a541ac82d5579f42aea28bb2bd233fed2
163+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@433adcf84aed0ea450cbd128d4c567bf35d47881
162164
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ef94a62a27ecf9713377801f6632861a07e2a65c
163165

164166
variables:

0 commit comments

Comments
 (0)