Skip to content

Commit 0c7fa28

Browse files
authored
Merge pull request #334 from MiraGeoscience/GEOPY-2522
GEOPY-2522: Update simpeg fork to 0.25
2 parents 07123ac + bfb7029 commit 0c7fa28

47 files changed

Lines changed: 617 additions & 628 deletions

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: 14 additions & 14 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: a6ff0f06b41216eee046522d72b0e9a8c74c12f846e1d144988a02f0403198ac
3+
# input_hash: 2b50544cb4f1d5b69b9b4ae438e854dd769e9447f4d1f6f37b9c8332259e2f13
44

55
channels:
66
- conda-forge
@@ -9,7 +9,7 @@ dependencies:
99
- _openmp_mutex=4.5=7_kmp_llvm
1010
- alabaster=0.7.16=pyhd8ed1ab_0
1111
- annotated-types=0.7.0=pyhd8ed1ab_1
12-
- anyio=4.12.0=pyhcf101f3_0
12+
- anyio=4.12.1=pyhcf101f3_0
1313
- argon2-cffi=25.1.0=pyhd8ed1ab_0
1414
- argon2-cffi-bindings=25.1.0=py310h7c4b9e2_2
1515
- arrow=1.4.0=pyhcf101f3_0
@@ -59,7 +59,7 @@ dependencies:
5959
- freetype=2.14.1=ha770c72_0
6060
- fsspec=2025.12.0=pyhd8ed1ab_0
6161
- geoana=0.7.2=py310hc563356_1
62-
- h11=0.16.0=pyhd8ed1ab_0
62+
- h11=0.16.0=pyhcf101f3_1
6363
- h2=4.3.0=pyhcf101f3_0
6464
- h5py=3.15.1=nompi_py310h4aa865e_101
6565
- hdf5=1.14.6=nompi_h1b119a7_104
@@ -84,12 +84,12 @@ dependencies:
8484
- joblib=1.5.3=pyhd8ed1ab_0
8585
- json5=0.13.0=pyhd8ed1ab_0
8686
- jsonpointer=3.0.0=pyhcf101f3_3
87-
- jsonschema=4.25.1=pyhe01879c_0
87+
- jsonschema=4.26.0=pyhcf101f3_0
8888
- jsonschema-specifications=2025.9.1=pyhcf101f3_0
89-
- jsonschema-with-format-nongpl=4.25.1=he01879c_0
89+
- jsonschema-with-format-nongpl=4.26.0=hcf101f3_0
9090
- jupyter-book=2.1.0=pyhcf101f3_0
9191
- jupyter-lsp=2.3.0=pyhcf101f3_0
92-
- jupyter_client=8.7.0=pyhcf101f3_0
92+
- jupyter_client=8.8.0=pyhcf101f3_0
9393
- jupyter_core=5.9.1=pyhc90fa1f_0
9494
- jupyter_events=0.12.0=pyh29332c3_0
9595
- jupyter_server=2.17.0=pyhcf101f3_0
@@ -112,7 +112,7 @@ dependencies:
112112
- libbrotlidec=1.2.0=hb03c661_1
113113
- libbrotlienc=1.2.0=hb03c661_1
114114
- libcblas=3.9.0=37_hfef963f_mkl
115-
- libcurl=8.17.0=h4e3cde8_1
115+
- libcurl=8.18.0=h4e3cde8_0
116116
- libdeflate=1.25=h17f619e_0
117117
- libdlf=0.3.0=pyhd8ed1ab_1
118118
- libedit=3.1.20250104=pl5321h7949ede_0
@@ -125,7 +125,7 @@ dependencies:
125125
- libgcc-ng=15.2.0=h69a702a_16
126126
- libgfortran=15.2.0=h69a702a_16
127127
- libgfortran5=15.2.0=h68bc16d_16
128-
- libhwloc=2.12.1=default_hafda6a7_1003
128+
- 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
@@ -245,7 +245,7 @@ dependencies:
245245
- sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1
246246
- sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1
247247
- stack_data=0.6.3=pyhd8ed1ab_1
248-
- tbb=2021.13.0=h8d10470_4
248+
- tbb=2021.13.0=hb700be7_5
249249
- tblib=3.2.2=pyhcf101f3_0
250250
- terminado=0.18.1=pyhc90fa1f_1
251251
- threadpoolctl=3.6.0=pyhecae5ae_0
@@ -265,7 +265,7 @@ dependencies:
265265
- tzdata=2025c=hc9c84f9_1
266266
- unicodedata2=17.0.0=py310h7c4b9e2_1
267267
- uri-template=1.3.0=pyhd8ed1ab_1
268-
- urllib3=2.6.2=pyhd8ed1ab_0
268+
- urllib3=2.6.3=pyhd8ed1ab_0
269269
- wcwidth=0.2.14=pyhd8ed1ab_0
270270
- webcolors=25.10.0=pyhd8ed1ab_0
271271
- webencodings=0.5.1=pyhd8ed1ab_3
@@ -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@04896a8c13a95ccc9045699d36f5a0b2e8bed3ec
287-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2439bd9f48f0ccd8e5fb2399f601c86bb245dec6
288-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@240bfb2713d19ddddca0e394ef406a83885666cd
289-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@62df930b7440442aaf1f56deaf0b8ef85957fb90
286+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3a0ee39b295c1a1fad831a7f88a2e8630b99b2c6
287+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@872fd38e1f3a73fad567de7825e5e2bb0aadab72
288+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a
289+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7d744e889c77fa74ab5addcd26b7c709f395eb77
290290

291291
variables:
292292
KMP_WARNINGS: 0

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

Lines changed: 9 additions & 9 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: a6ff0f06b41216eee046522d72b0e9a8c74c12f846e1d144988a02f0403198ac
3+
# input_hash: 2b50544cb4f1d5b69b9b4ae438e854dd769e9447f4d1f6f37b9c8332259e2f13
44

55
channels:
66
- conda-forge
@@ -55,7 +55,7 @@ dependencies:
5555
- libbrotlidec=1.2.0=hb03c661_1
5656
- libbrotlienc=1.2.0=hb03c661_1
5757
- libcblas=3.9.0=37_hfef963f_mkl
58-
- libcurl=8.17.0=h4e3cde8_1
58+
- libcurl=8.18.0=h4e3cde8_0
5959
- libdeflate=1.25=h17f619e_0
6060
- libdlf=0.3.0=pyhd8ed1ab_1
6161
- libedit=3.1.20250104=pl5321h7949ede_0
@@ -68,7 +68,7 @@ dependencies:
6868
- libgcc-ng=15.2.0=h69a702a_16
6969
- libgfortran=15.2.0=h69a702a_16
7070
- libgfortran5=15.2.0=h68bc16d_16
71-
- libhwloc=2.12.1=default_hafda6a7_1003
71+
- libhwloc=2.12.2=default_hafda6a7_1000
7272
- libiconv=1.18=h3b78370_2
7373
- libjpeg-turbo=3.1.2=hb03c661_0
7474
- liblapack=3.9.0=37_h5e43f62_mkl
@@ -132,7 +132,7 @@ dependencies:
132132
- setuptools=80.9.0=pyhff2d567_0
133133
- six=1.17.0=pyhe01879c_1
134134
- sortedcontainers=2.4.0=pyhd8ed1ab_1
135-
- tbb=2021.13.0=h8d10470_4
135+
- tbb=2021.13.0=hb700be7_5
136136
- tblib=3.2.2=pyhcf101f3_0
137137
- threadpoolctl=3.6.0=pyhecae5ae_0
138138
- tk=8.6.13=noxft_ha0e22de_103
@@ -145,7 +145,7 @@ dependencies:
145145
- typing_extensions=4.15.0=pyhcf101f3_0
146146
- tzdata=2025c=hc9c84f9_1
147147
- unicodedata2=17.0.0=py310h7c4b9e2_1
148-
- urllib3=2.6.2=pyhd8ed1ab_0
148+
- urllib3=2.6.3=pyhd8ed1ab_0
149149
- wheel=0.45.1=pyhd8ed1ab_1
150150
- xorg-libxau=1.0.12=hb03c661_1
151151
- xorg-libxdmcp=1.1.5=hb03c661_1
@@ -156,10 +156,10 @@ dependencies:
156156
- zipp=3.23.0=pyhcf101f3_1
157157
- zstd=1.5.7=hb78ec9c_6
158158
- pip:
159-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@04896a8c13a95ccc9045699d36f5a0b2e8bed3ec
160-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2439bd9f48f0ccd8e5fb2399f601c86bb245dec6
161-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@240bfb2713d19ddddca0e394ef406a83885666cd
162-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@62df930b7440442aaf1f56deaf0b8ef85957fb90
159+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3a0ee39b295c1a1fad831a7f88a2e8630b99b2c6
160+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@872fd38e1f3a73fad567de7825e5e2bb0aadab72
161+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a
162+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7d744e889c77fa74ab5addcd26b7c709f395eb77
163163

164164
variables:
165165
KMP_WARNINGS: 0

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: win-64
3-
# input_hash: 5a523f55851ea5ed6e7146aeac0dfd79b1514c92c7b0ab9282d0538c1a3e532b
3+
# input_hash: ade6f8568a23d600ae9ce846ee88765a4745040016210637a40b1410b32073fe
44

55
channels:
66
- conda-forge
@@ -9,7 +9,7 @@ dependencies:
99
- _openmp_mutex=4.5=2_gnu
1010
- alabaster=0.7.16=pyhd8ed1ab_0
1111
- annotated-types=0.7.0=pyhd8ed1ab_1
12-
- anyio=4.12.0=pyhcf101f3_0
12+
- anyio=4.12.1=pyhcf101f3_0
1313
- argon2-cffi=25.1.0=pyhd8ed1ab_0
1414
- argon2-cffi-bindings=25.1.0=py310h29418f3_2
1515
- arrow=1.4.0=pyhcf101f3_0
@@ -58,15 +58,15 @@ dependencies:
5858
- freetype=2.14.1=h57928b3_0
5959
- fsspec=2025.12.0=pyhd8ed1ab_0
6060
- geoana=0.7.2=py310hfb7dd09_1
61-
- h11=0.16.0=pyhd8ed1ab_0
61+
- h11=0.16.0=pyhcf101f3_1
6262
- h2=4.3.0=pyhcf101f3_0
6363
- h5py=3.15.1=nompi_py310hb7e4da9_101
6464
- hdf5=1.14.6=nompi_h89f0904_104
6565
- hpack=4.1.0=pyhd8ed1ab_0
6666
- httpcore=1.0.9=pyh29332c3_0
6767
- httpx=0.28.1=pyhd8ed1ab_0
6868
- hyperframe=6.1.0=pyhd8ed1ab_0
69-
- icu=78.1=h637d24d_0
69+
- icu=78.2=h637d24d_0
7070
- idna=3.11=pyhd8ed1ab_0
7171
- imagesize=1.4.1=pyhd8ed1ab_0
7272
- importlib-metadata=8.7.0=pyhe01879c_1
@@ -83,12 +83,12 @@ dependencies:
8383
- joblib=1.5.3=pyhd8ed1ab_0
8484
- json5=0.13.0=pyhd8ed1ab_0
8585
- jsonpointer=3.0.0=pyhcf101f3_3
86-
- jsonschema=4.25.1=pyhe01879c_0
86+
- jsonschema=4.26.0=pyhcf101f3_0
8787
- jsonschema-specifications=2025.9.1=pyhcf101f3_0
88-
- jsonschema-with-format-nongpl=4.25.1=he01879c_0
88+
- jsonschema-with-format-nongpl=4.26.0=hcf101f3_0
8989
- jupyter-book=2.1.0=pyhcf101f3_0
9090
- jupyter-lsp=2.3.0=pyhcf101f3_0
91-
- jupyter_client=8.7.0=pyhcf101f3_0
91+
- jupyter_client=8.8.0=pyhcf101f3_0
9292
- jupyter_core=5.9.1=pyh6dadd2b_0
9393
- jupyter_events=0.12.0=pyh29332c3_0
9494
- jupyter_server=2.17.0=pyhcf101f3_0
@@ -109,7 +109,7 @@ dependencies:
109109
- libbrotlidec=1.2.0=hfd05255_1
110110
- libbrotlienc=1.2.0=hfd05255_1
111111
- libcblas=3.9.0=35_h2a3cdd5_mkl
112-
- libcurl=8.17.0=h43ecb02_1
112+
- libcurl=8.18.0=h43ecb02_0
113113
- libdeflate=1.25=h51727cc_0
114114
- libdlf=0.3.0=pyhd8ed1ab_1
115115
- libexpat=2.7.3=hac47afa_0
@@ -118,7 +118,7 @@ dependencies:
118118
- libfreetype6=2.14.1=hdbac1cb_0
119119
- libgcc=15.2.0=h8ee18e1_16
120120
- libgomp=15.2.0=h8ee18e1_16
121-
- libhwloc=2.12.1=default_h4379cf1_1003
121+
- libhwloc=2.12.2=default_h4379cf1_1000
122122
- libiconv=1.18=hc1393d2_2
123123
- libjpeg-turbo=3.1.2=hfd05255_0
124124
- liblapack=3.9.0=35_hf9ab0e9_mkl
@@ -227,7 +227,7 @@ dependencies:
227227
- sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1
228228
- sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1
229229
- stack_data=0.6.3=pyhd8ed1ab_1
230-
- tbb=2021.13.0=hd094cb3_4
230+
- tbb=2021.13.0=h3155e25_5
231231
- tblib=3.2.2=pyhcf101f3_0
232232
- terminado=0.18.1=pyh6dadd2b_1
233233
- threadpoolctl=3.6.0=pyhecae5ae_0
@@ -248,7 +248,7 @@ dependencies:
248248
- ucrt=10.0.26100.0=h57928b3_0
249249
- unicodedata2=17.0.0=py310h29418f3_1
250250
- uri-template=1.3.0=pyhd8ed1ab_1
251-
- urllib3=2.6.2=pyhd8ed1ab_0
251+
- urllib3=2.6.3=pyhd8ed1ab_0
252252
- vc=14.3=h41ae7f8_34
253253
- vc14_runtime=14.44.35208=h818238b_34
254254
- vcomp14=14.44.35208=h818238b_34
@@ -270,10 +270,10 @@ dependencies:
270270
- zipp=3.23.0=pyhcf101f3_1
271271
- zstd=1.5.7=h534d264_6
272272
- pip:
273-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@04896a8c13a95ccc9045699d36f5a0b2e8bed3ec
274-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2439bd9f48f0ccd8e5fb2399f601c86bb245dec6
275-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@240bfb2713d19ddddca0e394ef406a83885666cd
276-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@62df930b7440442aaf1f56deaf0b8ef85957fb90
273+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3a0ee39b295c1a1fad831a7f88a2e8630b99b2c6
274+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@872fd38e1f3a73fad567de7825e5e2bb0aadab72
275+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a
276+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7d744e889c77fa74ab5addcd26b7c709f395eb77
277277

278278
variables:
279279
KMP_WARNINGS: 0

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: win-64
3-
# input_hash: 5a523f55851ea5ed6e7146aeac0dfd79b1514c92c7b0ab9282d0538c1a3e532b
3+
# input_hash: ade6f8568a23d600ae9ce846ee88765a4745040016210637a40b1410b32073fe
44

55
channels:
66
- conda-forge
@@ -38,7 +38,7 @@ dependencies:
3838
- hdf5=1.14.6=nompi_h89f0904_104
3939
- hpack=4.1.0=pyhd8ed1ab_0
4040
- hyperframe=6.1.0=pyhd8ed1ab_0
41-
- icu=78.1=h637d24d_0
41+
- icu=78.2=h637d24d_0
4242
- importlib-metadata=8.7.0=pyhe01879c_1
4343
- jinja2=3.1.6=pyhcf101f3_1
4444
- joblib=1.5.3=pyhd8ed1ab_0
@@ -52,7 +52,7 @@ dependencies:
5252
- libbrotlidec=1.2.0=hfd05255_1
5353
- libbrotlienc=1.2.0=hfd05255_1
5454
- libcblas=3.9.0=35_h2a3cdd5_mkl
55-
- libcurl=8.17.0=h43ecb02_1
55+
- libcurl=8.18.0=h43ecb02_0
5656
- libdeflate=1.25=h51727cc_0
5757
- libdlf=0.3.0=pyhd8ed1ab_1
5858
- libexpat=2.7.3=hac47afa_0
@@ -61,7 +61,7 @@ dependencies:
6161
- libfreetype6=2.14.1=hdbac1cb_0
6262
- libgcc=15.2.0=h8ee18e1_16
6363
- libgomp=15.2.0=h8ee18e1_16
64-
- libhwloc=2.12.1=default_h4379cf1_1003
64+
- libhwloc=2.12.2=default_h4379cf1_1000
6565
- libiconv=1.18=hc1393d2_2
6666
- libjpeg-turbo=3.1.2=hfd05255_0
6767
- liblapack=3.9.0=35_hf9ab0e9_mkl
@@ -115,7 +115,7 @@ dependencies:
115115
- setuptools=80.9.0=pyhff2d567_0
116116
- six=1.17.0=pyhe01879c_1
117117
- sortedcontainers=2.4.0=pyhd8ed1ab_1
118-
- tbb=2021.13.0=hd094cb3_4
118+
- tbb=2021.13.0=h3155e25_5
119119
- tblib=3.2.2=pyhcf101f3_0
120120
- threadpoolctl=3.6.0=pyhecae5ae_0
121121
- tk=8.6.13=h2c6b04d_3
@@ -129,7 +129,7 @@ dependencies:
129129
- tzdata=2025c=hc9c84f9_1
130130
- ucrt=10.0.26100.0=h57928b3_0
131131
- unicodedata2=17.0.0=py310h29418f3_1
132-
- urllib3=2.6.2=pyhd8ed1ab_0
132+
- urllib3=2.6.3=pyhd8ed1ab_0
133133
- vc=14.3=h41ae7f8_34
134134
- vc14_runtime=14.44.35208=h818238b_34
135135
- vcomp14=14.44.35208=h818238b_34
@@ -144,10 +144,10 @@ dependencies:
144144
- zipp=3.23.0=pyhcf101f3_1
145145
- zstd=1.5.7=h534d264_6
146146
- pip:
147-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@04896a8c13a95ccc9045699d36f5a0b2e8bed3ec
148-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2439bd9f48f0ccd8e5fb2399f601c86bb245dec6
149-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@240bfb2713d19ddddca0e394ef406a83885666cd
150-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@62df930b7440442aaf1f56deaf0b8ef85957fb90
147+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3a0ee39b295c1a1fad831a7f88a2e8630b99b2c6
148+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@872fd38e1f3a73fad567de7825e5e2bb0aadab72
149+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a
150+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7d744e889c77fa74ab5addcd26b7c709f395eb77
151151

152152
variables:
153153
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)