Skip to content

Commit 3ef9bde

Browse files
authored
Merge pull request #222 from MiraGeoscience/GEOPY-2234
GEOPY-2234: Use aliases for old parameter names in legacy uijsons
2 parents f5cc15f + 6c08125 commit 3ef9bde

18 files changed

Lines changed: 643 additions & 528 deletions

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

Lines changed: 16 additions & 16 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: c5499f0de074cdd65c7fd129794ec6f29e8e7126d999e2fbd8006ce30cc14765
3+
# input_hash: 808a8fb1b81c016263054465040c418aab1bf1e8b46764e295f18d68b9f82e20
44

55
channels:
66
- conda-forge
@@ -11,7 +11,7 @@ dependencies:
1111
- alabaster=0.7.16=pyhd8ed1ab_0
1212
- annotated-types=0.7.0=pyhd8ed1ab_1
1313
- anyio=4.9.0=pyh29332c3_0
14-
- argon2-cffi=23.1.0=pyhd8ed1ab_1
14+
- argon2-cffi=25.1.0=pyhd8ed1ab_0
1515
- argon2-cffi-bindings=21.2.0=py310ha75aee5_5
1616
- arrow=1.3.0=pyhd8ed1ab_1
1717
- asciitree=0.3.3=py_2
@@ -77,7 +77,7 @@ dependencies:
7777
- importlib_resources=6.5.2=pyhd8ed1ab_0
7878
- iniconfig=2.0.0=pyhd8ed1ab_1
7979
- ipykernel=6.29.5=pyh3099207_0
80-
- ipython=8.36.0=pyh907856f_0
80+
- ipython=8.37.0=pyh8f84b5b_0
8181
- ipython_genutils=0.2.0=pyhd8ed1ab_2
8282
- ipywidgets=7.8.5=pyhd8ed1ab_0
8383
- isoduration=20.11.0=pyhd8ed1ab_1
@@ -102,7 +102,7 @@ dependencies:
102102
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
103103
- jupyterlab_server=2.27.3=pyhd8ed1ab_1
104104
- jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
105-
- jupytext=1.17.1=pyh80e38bb_0
105+
- jupytext=1.17.2=pyh80e38bb_0
106106
- keyutils=1.6.1=h166bdaf_0
107107
- kiwisolver=1.4.7=py310h3788b33_0
108108
- krb5=1.21.3=h659f571_0
@@ -116,7 +116,7 @@ dependencies:
116116
- libbrotlidec=1.1.0=hb9d3cd8_2
117117
- libbrotlienc=1.1.0=hb9d3cd8_2
118118
- libcblas=3.9.0=31_h372d94f_mkl
119-
- libcurl=8.14.0=h332b0f4_0
119+
- libcurl=8.14.1=h332b0f4_0
120120
- libdeflate=1.24=h86f0d12_0
121121
- libdlf=0.3.0=pyhd8ed1ab_1
122122
- libedit=3.1.20250104=pl5321h7949ede_0
@@ -196,7 +196,7 @@ dependencies:
196196
- pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2
197197
- platformdirs=4.3.8=pyhe01879c_0
198198
- pluggy=1.6.0=pyhd8ed1ab_0
199-
- prometheus_client=0.22.0=pyhd8ed1ab_0
199+
- prometheus_client=0.22.1=pyhd8ed1ab_0
200200
- prompt-toolkit=3.0.51=pyha770c72_0
201201
- psutil=7.0.0=py310ha75aee5_0
202202
- pthread-stubs=0.4=hb9d3cd8_1002
@@ -214,9 +214,9 @@ dependencies:
214214
- pymatsolver=0.3.1=pyh48887ae_201
215215
- pyparsing=3.2.3=pyhd8ed1ab_1
216216
- pysocks=1.7.1=pyha55dd90_7
217-
- pytest=8.3.5=pyhd8ed1ab_0
217+
- pytest=8.4.0=pyhd8ed1ab_0
218218
- pytest-cov=6.1.1=pyhd8ed1ab_0
219-
- python=3.10.17=hd6af730_0_cpython
219+
- python=3.10.18=hd6af730_0_cpython
220220
- python-dateutil=2.9.0.post0=pyhff2d567_1
221221
- python-fastjsonschema=2.21.1=pyhd8ed1ab_0
222222
- python-json-logger=2.0.7=pyhd8ed1ab_0
@@ -236,7 +236,7 @@ dependencies:
236236
- scikit-learn=1.4.2=py310h981052a_1
237237
- scipy=1.14.1=py310hfcf56fc_2
238238
- send2trash=1.8.3=pyh0d859eb_1
239-
- setuptools=80.8.0=pyhff2d567_0
239+
- setuptools=80.9.0=pyhff2d567_0
240240
- six=1.17.0=pyhd8ed1ab_0
241241
- sniffio=1.3.1=pyhd8ed1ab_1
242242
- snowballstemmer=3.0.1=pyhd8ed1ab_0
@@ -276,9 +276,9 @@ dependencies:
276276
- tqdm=4.67.1=pyhd8ed1ab_1
277277
- traitlets=5.14.3=pyhd8ed1ab_1
278278
- types-python-dateutil=2.9.0.20250516=pyhd8ed1ab_0
279-
- typing-extensions=4.13.2=h0e9735f_0
279+
- typing-extensions=4.14.0=h32cad80_0
280280
- typing-inspection=0.4.1=pyhd8ed1ab_0
281-
- typing_extensions=4.13.2=pyh29332c3_0
281+
- typing_extensions=4.14.0=pyhe01879c_0
282282
- typing_utils=0.1.0=pyhd8ed1ab_1
283283
- tzdata=2025b=h78e105d_0
284284
- uc-micro-py=1.0.3=pyhd8ed1ab_1
@@ -302,11 +302,11 @@ dependencies:
302302
- zstandard=0.23.0=py310ha75aee5_2
303303
- zstd=1.5.7=hb8e6e7a_2
304304
- pip:
305-
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
306-
- geoh5py == 0.11.0a5 --hash=sha256:78efa387e693fac737e4fd304ab024d37d9eb3eb95c5191a85de57fb82ceea2e
307-
- mira-simpeg == 0.23.0.1b1 --hash=sha256:948a345905e571682b76e44d8527c84919044137d5a335c1a7d707bf3ca86b12
308-
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
309-
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
305+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@73d76d9637603dc24e593c2f83e9a618c5e2a42c
306+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b77c841a3cdedaa8a92022ca47c43d4580db81
307+
- mira-simpeg == 0.23.0.1b1
308+
- octree-creation-app == 0.3.0a2
309+
- param-sweeps == 0.2.1a1
310310

311311
variables:
312312
KMP_WARNINGS: 0

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

Lines changed: 11 additions & 11 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: c5499f0de074cdd65c7fd129794ec6f29e8e7126d999e2fbd8006ce30cc14765
3+
# input_hash: 808a8fb1b81c016263054465040c418aab1bf1e8b46764e295f18d68b9f82e20
44

55
channels:
66
- conda-forge
@@ -56,7 +56,7 @@ dependencies:
5656
- libbrotlidec=1.1.0=hb9d3cd8_2
5757
- libbrotlienc=1.1.0=hb9d3cd8_2
5858
- libcblas=3.9.0=31_h372d94f_mkl
59-
- libcurl=8.14.0=h332b0f4_0
59+
- libcurl=8.14.1=h332b0f4_0
6060
- libdeflate=1.24=h86f0d12_0
6161
- libdlf=0.3.0=pyhd8ed1ab_1
6262
- libedit=3.1.20250104=pl5321h7949ede_0
@@ -118,7 +118,7 @@ dependencies:
118118
- pymatsolver=0.3.1=pyh48887ae_201
119119
- pyparsing=3.2.3=pyhd8ed1ab_1
120120
- pysocks=1.7.1=pyha55dd90_7
121-
- python=3.10.17=hd6af730_0_cpython
121+
- python=3.10.18=hd6af730_0_cpython
122122
- python-dateutil=2.9.0.post0=pyhff2d567_1
123123
- python-mumps=0.0.3=py310h6410a28_0
124124
- python-tzdata=2025.2=pyhd8ed1ab_0
@@ -128,7 +128,7 @@ dependencies:
128128
- readline=8.2=h8c095d6_2
129129
- scikit-learn=1.4.2=py310h981052a_1
130130
- scipy=1.14.1=py310hfcf56fc_2
131-
- setuptools=80.8.0=pyhff2d567_0
131+
- setuptools=80.9.0=pyhff2d567_0
132132
- six=1.17.0=pyhd8ed1ab_0
133133
- sortedcontainers=2.4.0=pyhd8ed1ab_1
134134
- tbb=2021.13.0=hceb3a55_1
@@ -138,9 +138,9 @@ dependencies:
138138
- toolz=1.0.0=pyhd8ed1ab_1
139139
- tornado=6.5.1=py310ha75aee5_0
140140
- tqdm=4.67.1=pyhd8ed1ab_1
141-
- typing-extensions=4.13.2=h0e9735f_0
141+
- typing-extensions=4.14.0=h32cad80_0
142142
- typing-inspection=0.4.1=pyhd8ed1ab_0
143-
- typing_extensions=4.13.2=pyh29332c3_0
143+
- typing_extensions=4.14.0=pyhe01879c_0
144144
- tzdata=2025b=h78e105d_0
145145
- unicodedata2=16.0.0=py310ha75aee5_0
146146
- urllib3=2.4.0=pyhd8ed1ab_0
@@ -155,11 +155,11 @@ dependencies:
155155
- zstandard=0.23.0=py310ha75aee5_2
156156
- zstd=1.5.7=hb8e6e7a_2
157157
- pip:
158-
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
159-
- geoh5py == 0.11.0a5 --hash=sha256:78efa387e693fac737e4fd304ab024d37d9eb3eb95c5191a85de57fb82ceea2e
160-
- mira-simpeg == 0.23.0.1b1 --hash=sha256:948a345905e571682b76e44d8527c84919044137d5a335c1a7d707bf3ca86b12
161-
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
162-
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
158+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@73d76d9637603dc24e593c2f83e9a618c5e2a42c
159+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b77c841a3cdedaa8a92022ca47c43d4580db81
160+
- mira-simpeg == 0.23.0.1b1
161+
- octree-creation-app == 0.3.0a2
162+
- param-sweeps == 0.2.1a1
163163

164164
variables:
165165
KMP_WARNINGS: 0

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

Lines changed: 17 additions & 17 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: ad2901cfddc3a6e4376804b4543f4be34b929a03a0238fa356381a0d9c2774c9
3+
# input_hash: 5dd0c312b3c867d2321897b70baa2b9a30142b8cfd047512279386fe19a8657d
44

55
channels:
66
- conda-forge
@@ -11,7 +11,7 @@ dependencies:
1111
- alabaster=0.7.16=pyhd8ed1ab_0
1212
- annotated-types=0.7.0=pyhd8ed1ab_1
1313
- anyio=4.9.0=pyh29332c3_0
14-
- argon2-cffi=23.1.0=pyhd8ed1ab_1
14+
- argon2-cffi=25.1.0=pyhd8ed1ab_0
1515
- argon2-cffi-bindings=21.2.0=py310ha8f682b_5
1616
- arrow=1.3.0=pyhd8ed1ab_1
1717
- asciitree=0.3.3=py_2
@@ -40,7 +40,7 @@ dependencies:
4040
- comm=0.2.2=pyhd8ed1ab_1
4141
- contourpy=1.3.2=py310hc19bc0b_0
4242
- coverage=7.8.2=py310h38315fa_0
43-
- cpython=3.10.17=py310hd8ed1ab_0
43+
- cpython=3.10.18=py310hd8ed1ab_0
4444
- cycler=0.12.1=pyhd8ed1ab_1
4545
- cytoolz=1.0.1=py310ha8f682b_0
4646
- dask-core=2025.3.0=pyhd8ed1ab_0
@@ -77,7 +77,7 @@ dependencies:
7777
- iniconfig=2.0.0=pyhd8ed1ab_1
7878
- intel-openmp=2024.2.1=h57928b3_1083
7979
- ipykernel=6.29.5=pyh4bbf305_0
80-
- ipython=8.36.0=pyh9ab4c32_0
80+
- ipython=8.37.0=pyha7b4d00_0
8181
- ipython_genutils=0.2.0=pyhd8ed1ab_2
8282
- ipywidgets=7.8.5=pyhd8ed1ab_0
8383
- isoduration=20.11.0=pyhd8ed1ab_1
@@ -102,7 +102,7 @@ dependencies:
102102
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
103103
- jupyterlab_server=2.27.3=pyhd8ed1ab_1
104104
- jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
105-
- jupytext=1.17.1=pyh80e38bb_0
105+
- jupytext=1.17.2=pyh80e38bb_0
106106
- kiwisolver=1.4.7=py310hc19bc0b_0
107107
- krb5=1.21.3=hdf4eb48_0
108108
- latexcodec=2.0.1=pyh9f0ad1d_0
@@ -114,7 +114,7 @@ dependencies:
114114
- libbrotlidec=1.1.0=h2466b09_2
115115
- libbrotlienc=1.1.0=h2466b09_2
116116
- libcblas=3.9.0=31_h5e41251_mkl
117-
- libcurl=8.14.0=h88aaa65_0
117+
- libcurl=8.14.1=h88aaa65_0
118118
- libdeflate=1.24=h76ddb4d_0
119119
- libdlf=0.3.0=pyhd8ed1ab_1
120120
- libexpat=2.7.0=he0c23c2_0
@@ -180,7 +180,7 @@ dependencies:
180180
- pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2
181181
- platformdirs=4.3.8=pyhe01879c_0
182182
- pluggy=1.6.0=pyhd8ed1ab_0
183-
- prometheus_client=0.22.0=pyhd8ed1ab_0
183+
- prometheus_client=0.22.1=pyhd8ed1ab_0
184184
- prompt-toolkit=3.0.51=pyha770c72_0
185185
- psutil=7.0.0=py310ha8f682b_0
186186
- pthread-stubs=0.4=h0e40799_1002
@@ -197,9 +197,9 @@ dependencies:
197197
- pymatsolver=0.3.1=pyh48887ae_201
198198
- pyparsing=3.2.3=pyhd8ed1ab_1
199199
- pysocks=1.7.1=pyh09c184e_7
200-
- pytest=8.3.5=pyhd8ed1ab_0
200+
- pytest=8.4.0=pyhd8ed1ab_0
201201
- pytest-cov=6.1.1=pyhd8ed1ab_0
202-
- python=3.10.17=h8c5b53a_0_cpython
202+
- python=3.10.18=h8c5b53a_0_cpython
203203
- python-dateutil=2.9.0.post0=pyhff2d567_1
204204
- python-fastjsonschema=2.21.1=pyhd8ed1ab_0
205205
- python-json-logger=2.0.7=pyhd8ed1ab_0
@@ -220,7 +220,7 @@ dependencies:
220220
- scikit-learn=1.4.2=py310hf2a6c47_1
221221
- scipy=1.14.1=py310hbd0dde3_2
222222
- send2trash=1.8.3=pyh5737063_1
223-
- setuptools=80.8.0=pyhff2d567_0
223+
- setuptools=80.9.0=pyhff2d567_0
224224
- six=1.17.0=pyhd8ed1ab_0
225225
- sniffio=1.3.1=pyhd8ed1ab_1
226226
- snowballstemmer=3.0.1=pyhd8ed1ab_0
@@ -260,9 +260,9 @@ dependencies:
260260
- tqdm=4.67.1=pyhd8ed1ab_1
261261
- traitlets=5.14.3=pyhd8ed1ab_1
262262
- types-python-dateutil=2.9.0.20250516=pyhd8ed1ab_0
263-
- typing-extensions=4.13.2=h0e9735f_0
263+
- typing-extensions=4.14.0=h32cad80_0
264264
- typing-inspection=0.4.1=pyhd8ed1ab_0
265-
- typing_extensions=4.13.2=pyh29332c3_0
265+
- typing_extensions=4.14.0=pyhe01879c_0
266266
- typing_utils=0.1.0=pyhd8ed1ab_1
267267
- tzdata=2025b=h78e105d_0
268268
- uc-micro-py=1.0.3=pyhd8ed1ab_1
@@ -292,11 +292,11 @@ dependencies:
292292
- zstandard=0.23.0=py310ha8f682b_2
293293
- zstd=1.5.7=hbeecb71_2
294294
- pip:
295-
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
296-
- geoh5py == 0.11.0a5 --hash=sha256:78efa387e693fac737e4fd304ab024d37d9eb3eb95c5191a85de57fb82ceea2e
297-
- mira-simpeg == 0.23.0.1b1 --hash=sha256:948a345905e571682b76e44d8527c84919044137d5a335c1a7d707bf3ca86b12
298-
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
299-
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
295+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@73d76d9637603dc24e593c2f83e9a618c5e2a42c
296+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b77c841a3cdedaa8a92022ca47c43d4580db81
297+
- mira-simpeg == 0.23.0.1b1
298+
- octree-creation-app == 0.3.0a2
299+
- param-sweeps == 0.2.1a1
300300

301301
variables:
302302
KMP_WARNINGS: 0

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

Lines changed: 11 additions & 11 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: ad2901cfddc3a6e4376804b4543f4be34b929a03a0238fa356381a0d9c2774c9
3+
# input_hash: 5dd0c312b3c867d2321897b70baa2b9a30142b8cfd047512279386fe19a8657d
44

55
channels:
66
- conda-forge
@@ -53,7 +53,7 @@ dependencies:
5353
- libbrotlidec=1.1.0=h2466b09_2
5454
- libbrotlienc=1.1.0=h2466b09_2
5555
- libcblas=3.9.0=31_h5e41251_mkl
56-
- libcurl=8.14.0=h88aaa65_0
56+
- libcurl=8.14.1=h88aaa65_0
5757
- libdeflate=1.24=h76ddb4d_0
5858
- libdlf=0.3.0=pyhd8ed1ab_1
5959
- libexpat=2.7.0=he0c23c2_0
@@ -102,7 +102,7 @@ dependencies:
102102
- pymatsolver=0.3.1=pyh48887ae_201
103103
- pyparsing=3.2.3=pyhd8ed1ab_1
104104
- pysocks=1.7.1=pyh09c184e_7
105-
- python=3.10.17=h8c5b53a_0_cpython
105+
- python=3.10.18=h8c5b53a_0_cpython
106106
- python-dateutil=2.9.0.post0=pyhff2d567_1
107107
- python-mumps=0.0.3=py310hb64895d_0
108108
- python-tzdata=2025.2=pyhd8ed1ab_0
@@ -111,7 +111,7 @@ dependencies:
111111
- pyyaml=6.0.2=py310h38315fa_2
112112
- scikit-learn=1.4.2=py310hf2a6c47_1
113113
- scipy=1.14.1=py310hbd0dde3_2
114-
- setuptools=80.8.0=pyhff2d567_0
114+
- setuptools=80.9.0=pyhff2d567_0
115115
- six=1.17.0=pyhd8ed1ab_0
116116
- sortedcontainers=2.4.0=pyhd8ed1ab_1
117117
- tbb=2021.13.0=h62715c5_1
@@ -121,9 +121,9 @@ dependencies:
121121
- toolz=1.0.0=pyhd8ed1ab_1
122122
- tornado=6.5.1=py310ha8f682b_0
123123
- tqdm=4.67.1=pyhd8ed1ab_1
124-
- typing-extensions=4.13.2=h0e9735f_0
124+
- typing-extensions=4.14.0=h32cad80_0
125125
- typing-inspection=0.4.1=pyhd8ed1ab_0
126-
- typing_extensions=4.13.2=pyh29332c3_0
126+
- typing_extensions=4.14.0=pyhe01879c_0
127127
- tzdata=2025b=h78e105d_0
128128
- ucrt=10.0.22621.0=h57928b3_1
129129
- unicodedata2=16.0.0=py310ha8f682b_0
@@ -143,11 +143,11 @@ dependencies:
143143
- zstandard=0.23.0=py310ha8f682b_2
144144
- zstd=1.5.7=hbeecb71_2
145145
- pip:
146-
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
147-
- geoh5py == 0.11.0a5 --hash=sha256:78efa387e693fac737e4fd304ab024d37d9eb3eb95c5191a85de57fb82ceea2e
148-
- mira-simpeg == 0.23.0.1b1 --hash=sha256:948a345905e571682b76e44d8527c84919044137d5a335c1a7d707bf3ca86b12
149-
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
150-
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
146+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@73d76d9637603dc24e593c2f83e9a618c5e2a42c
147+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@77b77c841a3cdedaa8a92022ca47c43d4580db81
148+
- mira-simpeg == 0.23.0.1b1
149+
- octree-creation-app == 0.3.0a2
150+
- param-sweeps == 0.2.1a1
151151

152152
variables:
153153
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)