Skip to content

Commit 7d102df

Browse files
domfournierdomfournier
authored
Merge pull request #190 from MiraGeoscience/GEOPY-2739
GEOPY-2739: Accept BaseUIJson in the start of driver
2 parents f0289a8 + 51c1155 commit 7d102df

26 files changed

Lines changed: 3002 additions & 2652 deletions

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

Lines changed: 56 additions & 46 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: a88138472d5cf703033124b201e9efe5ddfd314346943b826d2af3fe2a691cdf
3+
# input_hash: c982be9f74d2279ae1a59209179f62946fcde9b6890aa1eaf6645898d3b782cc
44

55
channels:
66
- conda-forge
@@ -9,100 +9,110 @@ dependencies:
99
- _openmp_mutex=4.5=20_gnu
1010
- annotated-types=0.7.0=pyhd8ed1ab_1
1111
- astroid=4.0.4=py312h7900ff3_0
12+
- aws-c-auth=0.10.1=h2d2dd48_2
13+
- aws-c-cal=0.9.13=h2c9d079_1
14+
- aws-c-common=0.12.6=hb03c661_0
15+
- aws-c-compression=0.3.2=h8b1a151_0
16+
- aws-c-http=0.10.12=h4bacb7b_1
17+
- aws-c-io=0.26.3=hc87160b_0
18+
- aws-c-s3=0.11.5=h6d69fc9_5
19+
- aws-c-sdkutils=0.2.4=h8b1a151_4
20+
- aws-checksums=0.2.10=h8b1a151_0
1221
- brotli=1.2.0=hed03a55_1
1322
- brotli-bin=1.2.0=hb03c661_1
1423
- bzip2=1.0.8=hda65f42_9
1524
- c-ares=1.34.6=hb03c661_0
16-
- ca-certificates=2026.1.4=hbd8a1cb_0
25+
- ca-certificates=2026.2.25=hbd8a1cb_0
1726
- cached-property=1.5.2=hd8ed1ab_1
1827
- cached_property=1.5.2=pyha770c72_1
1928
- colorama=0.4.6=pyhd8ed1ab_1
2029
- contourpy=1.3.3=py312h0a2e395_4
21-
- coverage=7.13.4=py312h8a5da7c_0
30+
- coverage=7.13.5=py312h8a5da7c_0
2231
- cycler=0.12.1=pyhcf101f3_2
2332
- dill=0.4.1=pyhcf101f3_0
2433
- exceptiongroup=1.3.1=pyhd8ed1ab_0
25-
- fonttools=4.61.1=py312h8a5da7c_0
26-
- freetype=2.14.1=ha770c72_0
27-
- h5py=3.15.1=nompi_py312ha4f8f14_101
28-
- hdf5=1.14.6=nompi_h19486de_106
29-
- icu=78.2=h33c6efd_0
30-
- importlib-metadata=8.7.0=pyhe01879c_1
34+
- fonttools=4.62.0=py312h8a5da7c_0
35+
- freetype=2.14.3=ha770c72_0
36+
- h5py=3.16.0=nompi_py312ha829cd9_102
37+
- hdf5=2.1.0=nompi_hd4fcb43_104
38+
- icu=78.3=h33c6efd_0
39+
- importlib-metadata=8.8.0=pyhcf101f3_0
3140
- iniconfig=2.3.0=pyhd8ed1ab_0
32-
- isort=7.0.0=pyhd8ed1ab_0
41+
- isort=8.0.1=pyhd8ed1ab_0
3342
- keyutils=1.6.3=hb9d3cd8_0
34-
- kiwisolver=1.4.9=py312h0a2e395_2
43+
- kiwisolver=1.5.0=py312h0a2e395_0
3544
- krb5=1.22.2=ha1258a1_0
3645
- lcms2=2.18=h0c24ade_0
37-
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
38-
- lerc=4.0.0=h0aef613_1
46+
- ld_impl_linux-64=2.45.1=default_hbd61a6d_102
47+
- lerc=4.1.0=hdb68285_0
3948
- libaec=1.1.5=h088129d_0
40-
- libblas=3.11.0=5_h4a7cf45_openblas
49+
- libblas=3.11.0=6_h4a7cf45_openblas
4150
- libbrotlicommon=1.2.0=hb03c661_1
4251
- libbrotlidec=1.2.0=hb03c661_1
4352
- libbrotlienc=1.2.0=hb03c661_1
44-
- libcblas=3.11.0=5_h0358290_openblas
45-
- libcurl=8.18.0=hcf29cc6_1
53+
- libcblas=3.11.0=6_h0358290_openblas
54+
- libcurl=8.19.0=hcf29cc6_0
4655
- libdeflate=1.25=h17f619e_0
4756
- libedit=3.1.20250104=pl5321h7949ede_0
4857
- libev=4.33=hd590300_2
49-
- libexpat=2.7.4=hecca717_0
58+
- libexpat=2.7.5=hecca717_0
5059
- libffi=3.5.2=h3435931_0
51-
- libfreetype=2.14.1=ha770c72_0
52-
- libfreetype6=2.14.1=h73754d4_0
53-
- libgcc=15.2.0=he0feb66_17
54-
- libgcc-ng=15.2.0=h69a702a_17
55-
- libgfortran=15.2.0=h69a702a_17
56-
- libgfortran5=15.2.0=h68bc16d_17
57-
- libgomp=15.2.0=he0feb66_17
60+
- libfreetype=2.14.3=ha770c72_0
61+
- libfreetype6=2.14.3=h73754d4_0
62+
- libgcc=15.2.0=he0feb66_18
63+
- libgcc-ng=15.2.0=h69a702a_18
64+
- libgfortran=15.2.0=h69a702a_18
65+
- libgfortran5=15.2.0=h68bc16d_18
66+
- libgomp=15.2.0=he0feb66_18
5867
- libjpeg-turbo=3.1.2=hb03c661_0
59-
- liblapack=3.11.0=5_h47877c9_openblas
68+
- liblapack=3.11.0=6_h47877c9_openblas
6069
- liblzma=5.8.2=hb03c661_0
61-
- libnghttp2=1.67.0=had1ee68_0
70+
- libnghttp2=1.68.1=h877daf1_0
6271
- libnsl=2.0.1=hb9d3cd8_1
63-
- libopenblas=0.3.30=pthreads_h94d23a6_4
64-
- libpng=1.6.55=h421ea60_0
65-
- libsqlite=3.51.2=hf4e2dac_0
72+
- libopenblas=0.3.32=pthreads_h94d23a6_0
73+
- libpng=1.6.57=h421ea60_0
74+
- libsqlite=3.52.0=hf4e2dac_0
6675
- libssh2=1.11.1=hcf80075_0
67-
- libstdcxx=15.2.0=h934c35e_17
68-
- libstdcxx-ng=15.2.0=hdf11a46_17
76+
- libstdcxx=15.2.0=h934c35e_18
77+
- libstdcxx-ng=15.2.0=hdf11a46_18
6978
- libtiff=4.7.1=h9d88235_1
70-
- libuuid=2.41.3=h5347b49_0
79+
- libuuid=2.42=h5347b49_0
7180
- libwebp-base=1.6.0=hd42ef1d_0
7281
- libxcb=1.17.0=h8a09558_0
7382
- libxcrypt=4.4.36=hd590300_1
74-
- libzlib=1.3.1=hb9d3cd8_2
83+
- libzlib=1.3.2=h25fd6f3_2
7584
- matplotlib-base=3.10.8=py312he3d6523_0
7685
- mccabe=0.7.0=pyhd8ed1ab_1
7786
- munkres=1.1.4=pyhd8ed1ab_1
7887
- ncurses=6.5=h2d0b736_3
79-
- numpy=2.4.2=py312h33ff503_1
88+
- numpy=2.4.3=py312h33ff503_0
8089
- openjpeg=2.5.4=h55fea9a_0
81-
- openssl=3.6.1=h35e630c_1
90+
- openssl=3.6.2=h35e630c_0
8291
- packaging=26.0=pyhcf101f3_0
83-
- pillow=12.1.1=py312h50c33e8_0
92+
- pillow=12.2.0=py312h50c33e8_0
8493
- pip=26.0.1=pyh8b19718_0
85-
- platformdirs=4.9.2=pyhcf101f3_0
94+
- platformdirs=4.9.6=pyhcf101f3_0
8695
- pluggy=1.6.0=pyhf9edf01_1
8796
- pthread-stubs=0.4=hb9d3cd8_1002
8897
- pydantic=2.12.5=pyhcf101f3_1
8998
- pydantic-core=2.41.5=py312h868fb18_1
90-
- pygments=2.19.2=pyhd8ed1ab_0
91-
- pylint=4.0.4=pyhcf101f3_0
99+
- pygments=2.20.0=pyhd8ed1ab_0
100+
- pylint=4.0.5=pyhcf101f3_0
92101
- pyparsing=3.3.2=pyhcf101f3_0
93-
- pytest=9.0.2=pyhcf101f3_0
94-
- pytest-cov=7.0.0=pyhcf101f3_1
95-
- python=3.12.12=hd63d673_2_cpython
102+
- pytest=9.0.3=pyhc364b38_1
103+
- pytest-cov=7.1.0=pyhcf101f3_0
104+
- python=3.12.13=hd63d673_0_cpython
96105
- python-dateutil=2.9.0.post0=pyhe01879c_2
97106
- python_abi=3.12=8_cp312
98107
- pyyaml=6.0.3=py312h8a5da7c_1
99108
- qhull=2020.2=h434a139_5
100109
- readline=8.3=h853b02a_0
101-
- scipy=1.17.0=py312h54fa4ab_1
102-
- setuptools=82.0.0=pyh332efcf_0
110+
- s2n=1.7.1=h1cbb8d7_1
111+
- scipy=1.17.1=py312h54fa4ab_0
112+
- setuptools=82.0.1=pyh332efcf_0
103113
- six=1.17.0=pyhe01879c_1
104114
- tk=8.6.13=noxft_h366c992_103
105-
- tomli=2.4.0=pyhcf101f3_0
115+
- tomli=2.4.1=pyhcf101f3_0
106116
- tomlkit=0.14.0=pyha770c72_0
107117
- typing-extensions=4.15.0=h396c80c_0
108118
- typing-inspection=0.4.2=pyhd8ed1ab_1
@@ -117,7 +127,7 @@ dependencies:
117127
- zlib-ng=2.3.3=hceb46e0_1
118128
- zstd=1.5.7=hb78ec9c_6
119129
- pip:
120-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3310d7a4521879f99a0a56ce613f265423e73a8f
130+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c45a3ee74a6818f129a72c680dd8ef3614cc4781
121131

122132
variables:
123133
KMP_WARNINGS: 0

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

Lines changed: 47 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,99 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: a88138472d5cf703033124b201e9efe5ddfd314346943b826d2af3fe2a691cdf
3+
# input_hash: c982be9f74d2279ae1a59209179f62946fcde9b6890aa1eaf6645898d3b782cc
44

55
channels:
66
- conda-forge
77
- nodefaults
88
dependencies:
99
- _openmp_mutex=4.5=20_gnu
1010
- annotated-types=0.7.0=pyhd8ed1ab_1
11+
- aws-c-auth=0.10.1=h2d2dd48_2
12+
- aws-c-cal=0.9.13=h2c9d079_1
13+
- aws-c-common=0.12.6=hb03c661_0
14+
- aws-c-compression=0.3.2=h8b1a151_0
15+
- aws-c-http=0.10.12=h4bacb7b_1
16+
- aws-c-io=0.26.3=hc87160b_0
17+
- aws-c-s3=0.11.5=h6d69fc9_5
18+
- aws-c-sdkutils=0.2.4=h8b1a151_4
19+
- aws-checksums=0.2.10=h8b1a151_0
1120
- brotli=1.2.0=hed03a55_1
1221
- brotli-bin=1.2.0=hb03c661_1
1322
- bzip2=1.0.8=hda65f42_9
1423
- c-ares=1.34.6=hb03c661_0
15-
- ca-certificates=2026.1.4=hbd8a1cb_0
24+
- ca-certificates=2026.2.25=hbd8a1cb_0
1625
- cached-property=1.5.2=hd8ed1ab_1
1726
- cached_property=1.5.2=pyha770c72_1
1827
- contourpy=1.3.3=py312h0a2e395_4
1928
- cycler=0.12.1=pyhcf101f3_2
20-
- fonttools=4.61.1=py312h8a5da7c_0
21-
- freetype=2.14.1=ha770c72_0
22-
- h5py=3.15.1=nompi_py312ha4f8f14_101
23-
- hdf5=1.14.6=nompi_h19486de_106
24-
- icu=78.2=h33c6efd_0
29+
- fonttools=4.62.0=py312h8a5da7c_0
30+
- freetype=2.14.3=ha770c72_0
31+
- h5py=3.16.0=nompi_py312ha829cd9_102
32+
- hdf5=2.1.0=nompi_hd4fcb43_104
33+
- icu=78.3=h33c6efd_0
2534
- keyutils=1.6.3=hb9d3cd8_0
26-
- kiwisolver=1.4.9=py312h0a2e395_2
35+
- kiwisolver=1.5.0=py312h0a2e395_0
2736
- krb5=1.22.2=ha1258a1_0
2837
- lcms2=2.18=h0c24ade_0
29-
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
30-
- lerc=4.0.0=h0aef613_1
38+
- ld_impl_linux-64=2.45.1=default_hbd61a6d_102
39+
- lerc=4.1.0=hdb68285_0
3140
- libaec=1.1.5=h088129d_0
32-
- libblas=3.11.0=5_h4a7cf45_openblas
41+
- libblas=3.11.0=6_h4a7cf45_openblas
3342
- libbrotlicommon=1.2.0=hb03c661_1
3443
- libbrotlidec=1.2.0=hb03c661_1
3544
- libbrotlienc=1.2.0=hb03c661_1
36-
- libcblas=3.11.0=5_h0358290_openblas
37-
- libcurl=8.18.0=hcf29cc6_1
45+
- libcblas=3.11.0=6_h0358290_openblas
46+
- libcurl=8.19.0=hcf29cc6_0
3847
- libdeflate=1.25=h17f619e_0
3948
- libedit=3.1.20250104=pl5321h7949ede_0
4049
- libev=4.33=hd590300_2
41-
- libexpat=2.7.4=hecca717_0
50+
- libexpat=2.7.5=hecca717_0
4251
- libffi=3.5.2=h3435931_0
43-
- libfreetype=2.14.1=ha770c72_0
44-
- libfreetype6=2.14.1=h73754d4_0
45-
- libgcc=15.2.0=he0feb66_17
46-
- libgcc-ng=15.2.0=h69a702a_17
47-
- libgfortran=15.2.0=h69a702a_17
48-
- libgfortran5=15.2.0=h68bc16d_17
49-
- libgomp=15.2.0=he0feb66_17
52+
- libfreetype=2.14.3=ha770c72_0
53+
- libfreetype6=2.14.3=h73754d4_0
54+
- libgcc=15.2.0=he0feb66_18
55+
- libgcc-ng=15.2.0=h69a702a_18
56+
- libgfortran=15.2.0=h69a702a_18
57+
- libgfortran5=15.2.0=h68bc16d_18
58+
- libgomp=15.2.0=he0feb66_18
5059
- libjpeg-turbo=3.1.2=hb03c661_0
51-
- liblapack=3.11.0=5_h47877c9_openblas
60+
- liblapack=3.11.0=6_h47877c9_openblas
5261
- liblzma=5.8.2=hb03c661_0
53-
- libnghttp2=1.67.0=had1ee68_0
62+
- libnghttp2=1.68.1=h877daf1_0
5463
- libnsl=2.0.1=hb9d3cd8_1
55-
- libopenblas=0.3.30=pthreads_h94d23a6_4
56-
- libpng=1.6.55=h421ea60_0
57-
- libsqlite=3.51.2=hf4e2dac_0
64+
- libopenblas=0.3.32=pthreads_h94d23a6_0
65+
- libpng=1.6.57=h421ea60_0
66+
- libsqlite=3.52.0=hf4e2dac_0
5867
- libssh2=1.11.1=hcf80075_0
59-
- libstdcxx=15.2.0=h934c35e_17
60-
- libstdcxx-ng=15.2.0=hdf11a46_17
68+
- libstdcxx=15.2.0=h934c35e_18
69+
- libstdcxx-ng=15.2.0=hdf11a46_18
6170
- libtiff=4.7.1=h9d88235_1
62-
- libuuid=2.41.3=h5347b49_0
71+
- libuuid=2.42=h5347b49_0
6372
- libwebp-base=1.6.0=hd42ef1d_0
6473
- libxcb=1.17.0=h8a09558_0
6574
- libxcrypt=4.4.36=hd590300_1
66-
- libzlib=1.3.1=hb9d3cd8_2
75+
- libzlib=1.3.2=h25fd6f3_2
6776
- matplotlib-base=3.10.8=py312he3d6523_0
6877
- munkres=1.1.4=pyhd8ed1ab_1
6978
- ncurses=6.5=h2d0b736_3
70-
- numpy=2.4.2=py312h33ff503_1
79+
- numpy=2.4.3=py312h33ff503_0
7180
- openjpeg=2.5.4=h55fea9a_0
72-
- openssl=3.6.1=h35e630c_1
81+
- openssl=3.6.2=h35e630c_0
7382
- packaging=26.0=pyhcf101f3_0
74-
- pillow=12.1.1=py312h50c33e8_0
83+
- pillow=12.2.0=py312h50c33e8_0
7584
- pip=26.0.1=pyh8b19718_0
7685
- pthread-stubs=0.4=hb9d3cd8_1002
7786
- pydantic=2.12.5=pyhcf101f3_1
7887
- pydantic-core=2.41.5=py312h868fb18_1
7988
- pyparsing=3.3.2=pyhcf101f3_0
80-
- python=3.12.12=hd63d673_2_cpython
89+
- python=3.12.13=hd63d673_0_cpython
8190
- python-dateutil=2.9.0.post0=pyhe01879c_2
8291
- python_abi=3.12=8_cp312
8392
- qhull=2020.2=h434a139_5
8493
- readline=8.3=h853b02a_0
85-
- scipy=1.17.0=py312h54fa4ab_1
86-
- setuptools=82.0.0=pyh332efcf_0
94+
- s2n=1.7.1=h1cbb8d7_1
95+
- scipy=1.17.1=py312h54fa4ab_0
96+
- setuptools=82.0.1=pyh332efcf_0
8797
- six=1.17.0=pyhe01879c_1
8898
- tk=8.6.13=noxft_h366c992_103
8999
- typing-extensions=4.15.0=h396c80c_0
@@ -97,7 +107,7 @@ dependencies:
97107
- zlib-ng=2.3.3=hceb46e0_1
98108
- zstd=1.5.7=hb78ec9c_6
99109
- pip:
100-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3310d7a4521879f99a0a56ce613f265423e73a8f
110+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c45a3ee74a6818f129a72c680dd8ef3614cc4781
101111

102112
variables:
103113
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)