Skip to content

Commit 1f2964f

Browse files
domfournierdomfournier
authored
Merge pull request #40 from MiraGeoscience/GEOPY-2403
GEOPY-2403: align versions of 3rd party dependencies across repositories
2 parents c4db0ed + 1b4806a commit 1f2964f

16 files changed

Lines changed: 1675 additions & 1756 deletions

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

Lines changed: 37 additions & 41 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: a7d70d1725c59f3981a29a3c46b33e79161ba0253537f2e01304b05c029f80bd
3+
# input_hash: 0b5bf197c6326e99c2eebfe35104c30ee42a7348ab3f970520c12021222f0d78
44

55
channels:
66
- conda-forge
@@ -11,33 +11,31 @@ dependencies:
1111
- alabaster=1.0.0=pyhd8ed1ab_1
1212
- annotated-types=0.7.0=pyhd8ed1ab_1
1313
- aom=3.9.1=hac33072_0
14-
- astroid=3.3.11=py310hff52083_0
14+
- astroid=3.3.11=py310hff52083_1
1515
- babel=2.17.0=pyhd8ed1ab_0
1616
- blosc=1.21.6=he440d0b_1
17-
- brotli=1.1.0=hb9d3cd8_3
18-
- brotli-bin=1.1.0=hb9d3cd8_3
19-
- brotli-python=1.1.0=py310hf71b8c6_3
20-
- brunsli=0.1=h9c3ff4c_0
21-
- bzip2=1.0.8=h4bc722e_7
17+
- brotli-python=1.1.0=py310hea6c23e_4
18+
- brunsli=0.1=he3183e4_1
19+
- bzip2=1.0.8=hda65f42_8
2220
- c-ares=1.34.5=hb9d3cd8_0
2321
- c-blosc2=2.19.1=h4cfbee9_0
2422
- ca-certificates=2025.8.3=hbd8a1cb_0
2523
- cached-property=1.5.2=hd8ed1ab_1
2624
- cached_property=1.5.2=pyha770c72_1
2725
- certifi=2025.8.3=pyhd8ed1ab_0
28-
- cffi=1.17.1=py310h8deb56e_0
26+
- cffi=1.17.1=py310h34a4b09_1
2927
- charls=2.4.2=h59595ed_0
3028
- charset-normalizer=3.4.3=pyhd8ed1ab_0
3129
- colorama=0.4.6=pyhd8ed1ab_1
32-
- coverage=7.10.5=py310h3406613_0
30+
- coverage=7.10.6=py310h3406613_1
3331
- dav1d=1.2.1=hd590300_0
3432
- dill=0.4.0=pyhd8ed1ab_0
3533
- docutils=0.21.2=pyhd8ed1ab_1
3634
- exceptiongroup=1.3.0=pyhd8ed1ab_0
37-
- freetype=2.13.3=ha770c72_1
35+
- freetype=2.14.1=ha770c72_0
3836
- giflib=5.2.2=hd590300_0
3937
- h2=4.3.0=pyhcf101f3_0
40-
- h5py=3.14.0=nompi_py310hea1e86d_100
38+
- h5py=3.14.0=nompi_py310h4aa865e_101
4139
- hdf5=1.14.6=nompi_h6e4c0c1_103
4240
- hpack=4.1.0=pyhd8ed1ab_0
4341
- hyperframe=6.1.0=pyhd8ed1ab_0
@@ -53,45 +51,44 @@ dependencies:
5351
- keyutils=1.6.3=hb9d3cd8_0
5452
- krb5=1.21.3=h659f571_0
5553
- lazy-loader=0.4=pyhd8ed1ab_2
56-
- lazy_loader=0.4=pyhd8ed1ab_2
5754
- lcms2=2.17=h717163a_0
5855
- ld_impl_linux-64=2.44=h1423503_1
5956
- lerc=4.0.0=h0aef613_1
6057
- libaec=1.1.4=h3f801dc_0
6158
- libavif16=1.3.0=h6395336_2
62-
- libblas=3.9.0=34_h59b9bed_openblas
63-
- libbrotlicommon=1.1.0=hb9d3cd8_3
64-
- libbrotlidec=1.1.0=hb9d3cd8_3
65-
- libbrotlienc=1.1.0=hb9d3cd8_3
66-
- libcblas=3.9.0=34_he106b2a_openblas
59+
- libblas=3.9.0=35_h4a7cf45_openblas
60+
- libbrotlicommon=1.1.0=hb03c661_4
61+
- libbrotlidec=1.1.0=hb03c661_4
62+
- libbrotlienc=1.1.0=hb03c661_4
63+
- libcblas=3.9.0=35_h0358290_openblas
6764
- libcurl=8.14.1=h332b0f4_0
6865
- libdeflate=1.24=h86f0d12_0
6966
- libedit=3.1.20250104=pl5321h7949ede_0
7067
- libev=4.33=hd590300_2
7168
- libexpat=2.7.1=hecca717_0
7269
- libffi=3.4.6=h2dba641_1
73-
- libfreetype=2.13.3=ha770c72_1
74-
- libfreetype6=2.13.3=h48d6fc4_1
75-
- libgcc=15.1.0=h767d61c_4
76-
- libgcc-ng=15.1.0=h69a702a_4
77-
- libgfortran=15.1.0=h69a702a_4
78-
- libgfortran5=15.1.0=hcea5267_4
79-
- libgomp=15.1.0=h767d61c_4
70+
- libfreetype=2.14.1=ha770c72_0
71+
- libfreetype6=2.14.1=h73754d4_0
72+
- libgcc=15.1.0=h767d61c_5
73+
- libgcc-ng=15.1.0=h69a702a_5
74+
- libgfortran=15.1.0=h69a702a_5
75+
- libgfortran5=15.1.0=hcea5267_5
76+
- libgomp=15.1.0=h767d61c_5
8077
- libhwy=1.3.0=h4c17acf_0
8178
- libjpeg-turbo=3.1.0=hb9d3cd8_0
82-
- libjxl=0.11.1=h0a47e8d_3
83-
- liblapack=3.9.0=34_h7ac8fdf_openblas
79+
- libjxl=0.11.1=h6cb5226_4
80+
- liblapack=3.9.0=35_h47877c9_openblas
8481
- liblzma=5.8.1=hb9d3cd8_2
85-
- libnghttp2=1.64.0=h161d5f1_0
82+
- libnghttp2=1.67.0=had1ee68_0
8683
- libnsl=2.0.1=hb9d3cd8_1
8784
- libopenblas=0.3.30=pthreads_h94d23a6_2
8885
- libpng=1.6.50=h421ea60_1
8986
- libsqlite=3.50.4=h0c1763c_0
9087
- libssh2=1.11.1=hcf80075_0
91-
- libstdcxx=15.1.0=h8f9b012_4
92-
- libstdcxx-ng=15.1.0=h4852527_4
88+
- libstdcxx=15.1.0=h8f9b012_5
89+
- libstdcxx-ng=15.1.0=h4852527_5
9390
- libtiff=4.7.0=h8261f1e_6
94-
- libuuid=2.38.1=h0b41bf4_0
91+
- libuuid=2.41.1=he9a06e4_0
9592
- libwebp-base=1.6.0=hd42ef1d_0
9693
- libxcb=1.17.0=h8a09558_0
9794
- libxcrypt=4.4.36=hd590300_1
@@ -112,13 +109,13 @@ dependencies:
112109
- pluggy=1.6.0=pyhd8ed1ab_0
113110
- pthread-stubs=0.4=hb9d3cd8_1002
114111
- pycparser=2.22=pyh29332c3_1
115-
- pydantic=2.11.7=pyh3cfb1c2_0
112+
- pydantic=2.11.9=pyh3cfb1c2_0
116113
- pydantic-core=2.33.2=py310hbcd0ec0_0
117114
- pygments=2.19.2=pyhd8ed1ab_0
118115
- pylint=3.3.8=pyhe01879c_0
119116
- pysocks=1.7.1=pyha55dd90_7
120-
- pytest=8.4.1=pyhd8ed1ab_0
121-
- pytest-cov=6.2.1=pyhd8ed1ab_0
117+
- pytest=8.4.2=pyhd8ed1ab_0
118+
- pytest-cov=7.0.0=pyhcf101f3_1
122119
- python=3.10.18=hd6af730_0_cpython
123120
- python_abi=3.10=8_cp310
124121
- pytz=2025.2=pyhd8ed1ab_0
@@ -127,15 +124,15 @@ dependencies:
127124
- rav1e=0.7.1=h8fae777_3
128125
- readline=8.2=h8c095d6_2
129126
- requests=2.32.5=pyhd8ed1ab_0
130-
- scikit-image=0.24.0=py310h5eaa309_3
127+
- scikit-image=0.25.2=py310h0158d43_2
131128
- scipy=1.14.1=py310hfcf56fc_2
132129
- setuptools=80.9.0=pyhff2d567_0
133130
- snappy=1.2.2=h03e3b7b_0
134131
- snowballstemmer=3.0.1=pyhd8ed1ab_0
135132
- sphinx=8.1.3=pyhd8ed1ab_1
136133
- sphinx-autodoc-typehints=3.0.1=pyhd8ed1ab_0
137-
- sphinx-rtd-theme=3.0.1=hd8ed1ab_0
138-
- sphinx_rtd_theme=3.0.1=pyha770c72_0
134+
- sphinx-rtd-theme=3.0.2=hd8ed1ab_0
135+
- sphinx_rtd_theme=3.0.2=pyha770c72_0
139136
- sphinxcontrib-applehelp=2.0.0=pyhd8ed1ab_1
140137
- sphinxcontrib-devhelp=2.0.0=pyhd8ed1ab_1
141138
- sphinxcontrib-htmlhelp=2.1.0=pyhd8ed1ab_1
@@ -146,7 +143,6 @@ dependencies:
146143
- svt-av1=3.1.2=hecca717_0
147144
- tifffile=2025.5.10=pyhd8ed1ab_0
148145
- tk=8.6.13=noxft_hd72426e_102
149-
- toml=0.10.2=pyhd8ed1ab_1
150146
- tomli=2.2.1=pyhe01879c_2
151147
- tomlkit=0.13.3=pyha770c72_0
152148
- tqdm=4.67.1=pyhd8ed1ab_1
@@ -159,14 +155,14 @@ dependencies:
159155
- xorg-libxau=1.0.12=hb9d3cd8_0
160156
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
161157
- yaml=0.2.5=h280c20c_3
162-
- zfp=1.0.1=h5888daf_2
158+
- zfp=1.0.1=h909a3a2_3
163159
- zipp=3.23.0=pyhd8ed1ab_0
164160
- zlib-ng=2.2.5=hde8ca8f_0
165-
- zstandard=0.23.0=py310h7c4b9e2_3
161+
- zstandard=0.25.0=py310h139afa4_0
166162
- zstd=1.5.7=hb8e6e7a_2
167163
- pip:
168-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e
169-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef
164+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a6627f0a6e663e9c3f0e9874f401a34ab8990488
165+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@8f4cb4c0ebfb6ce25b3be6c83746d184f47a5f67
170166

171167
variables:
172168
KMP_WARNINGS: 0

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

Lines changed: 36 additions & 31 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: a7d70d1725c59f3981a29a3c46b33e79161ba0253537f2e01304b05c029f80bd
3+
# input_hash: 0b5bf197c6326e99c2eebfe35104c30ee42a7348ab3f970520c12021222f0d78
44

55
channels:
66
- conda-forge
@@ -10,11 +10,10 @@ dependencies:
1010
- _openmp_mutex=4.5=2_gnu
1111
- annotated-types=0.7.0=pyhd8ed1ab_1
1212
- aom=3.9.1=hac33072_0
13+
- astroid=3.3.11=py310hff52083_1
1314
- blosc=1.21.6=he440d0b_1
14-
- brotli=1.1.0=hb9d3cd8_3
15-
- brotli-bin=1.1.0=hb9d3cd8_3
16-
- brunsli=0.1=h9c3ff4c_0
17-
- bzip2=1.0.8=h4bc722e_7
15+
- brunsli=0.1=he3183e4_1
16+
- bzip2=1.0.8=hda65f42_8
1817
- c-ares=1.34.5=hb9d3cd8_0
1918
- c-blosc2=2.19.1=h4cfbee9_0
2019
- ca-certificates=2025.8.3=hbd8a1cb_0
@@ -23,62 +22,64 @@ dependencies:
2322
- charls=2.4.2=h59595ed_0
2423
- colorama=0.4.6=pyhd8ed1ab_1
2524
- dav1d=1.2.1=hd590300_0
26-
- freetype=2.13.3=ha770c72_1
25+
- dill=0.4.0=pyhd8ed1ab_0
26+
- freetype=2.14.1=ha770c72_0
2727
- giflib=5.2.2=hd590300_0
28-
- h5py=3.14.0=nompi_py310hea1e86d_100
28+
- h5py=3.14.0=nompi_py310h4aa865e_101
2929
- hdf5=1.14.6=nompi_h6e4c0c1_103
3030
- imagecodecs=2025.3.30=py310h4eb8eaf_2
3131
- imageio=2.37.0=pyhfb79c49_0
3232
- importlib-metadata=8.7.0=pyhe01879c_1
33+
- isort=6.0.1=pyhd8ed1ab_1
3334
- jxrlib=1.1=hd590300_3
3435
- keyutils=1.6.3=hb9d3cd8_0
3536
- krb5=1.21.3=h659f571_0
3637
- lazy-loader=0.4=pyhd8ed1ab_2
37-
- lazy_loader=0.4=pyhd8ed1ab_2
3838
- lcms2=2.17=h717163a_0
3939
- ld_impl_linux-64=2.44=h1423503_1
4040
- lerc=4.0.0=h0aef613_1
4141
- libaec=1.1.4=h3f801dc_0
4242
- libavif16=1.3.0=h6395336_2
43-
- libblas=3.9.0=34_h59b9bed_openblas
44-
- libbrotlicommon=1.1.0=hb9d3cd8_3
45-
- libbrotlidec=1.1.0=hb9d3cd8_3
46-
- libbrotlienc=1.1.0=hb9d3cd8_3
47-
- libcblas=3.9.0=34_he106b2a_openblas
43+
- libblas=3.9.0=35_h4a7cf45_openblas
44+
- libbrotlicommon=1.1.0=hb03c661_4
45+
- libbrotlidec=1.1.0=hb03c661_4
46+
- libbrotlienc=1.1.0=hb03c661_4
47+
- libcblas=3.9.0=35_h0358290_openblas
4848
- libcurl=8.14.1=h332b0f4_0
4949
- libdeflate=1.24=h86f0d12_0
5050
- libedit=3.1.20250104=pl5321h7949ede_0
5151
- libev=4.33=hd590300_2
5252
- libexpat=2.7.1=hecca717_0
5353
- libffi=3.4.6=h2dba641_1
54-
- libfreetype=2.13.3=ha770c72_1
55-
- libfreetype6=2.13.3=h48d6fc4_1
56-
- libgcc=15.1.0=h767d61c_4
57-
- libgcc-ng=15.1.0=h69a702a_4
58-
- libgfortran=15.1.0=h69a702a_4
59-
- libgfortran5=15.1.0=hcea5267_4
60-
- libgomp=15.1.0=h767d61c_4
54+
- libfreetype=2.14.1=ha770c72_0
55+
- libfreetype6=2.14.1=h73754d4_0
56+
- libgcc=15.1.0=h767d61c_5
57+
- libgcc-ng=15.1.0=h69a702a_5
58+
- libgfortran=15.1.0=h69a702a_5
59+
- libgfortran5=15.1.0=hcea5267_5
60+
- libgomp=15.1.0=h767d61c_5
6161
- libhwy=1.3.0=h4c17acf_0
6262
- libjpeg-turbo=3.1.0=hb9d3cd8_0
63-
- libjxl=0.11.1=h0a47e8d_3
64-
- liblapack=3.9.0=34_h7ac8fdf_openblas
63+
- libjxl=0.11.1=h6cb5226_4
64+
- liblapack=3.9.0=35_h47877c9_openblas
6565
- liblzma=5.8.1=hb9d3cd8_2
66-
- libnghttp2=1.64.0=h161d5f1_0
66+
- libnghttp2=1.67.0=had1ee68_0
6767
- libnsl=2.0.1=hb9d3cd8_1
6868
- libopenblas=0.3.30=pthreads_h94d23a6_2
6969
- libpng=1.6.50=h421ea60_1
7070
- libsqlite=3.50.4=h0c1763c_0
7171
- libssh2=1.11.1=hcf80075_0
72-
- libstdcxx=15.1.0=h8f9b012_4
73-
- libstdcxx-ng=15.1.0=h4852527_4
72+
- libstdcxx=15.1.0=h8f9b012_5
73+
- libstdcxx-ng=15.1.0=h4852527_5
7474
- libtiff=4.7.0=h8261f1e_6
75-
- libuuid=2.38.1=h0b41bf4_0
75+
- libuuid=2.41.1=he9a06e4_0
7676
- libwebp-base=1.6.0=hd42ef1d_0
7777
- libxcb=1.17.0=h8a09558_0
7878
- libxcrypt=4.4.36=hd590300_1
7979
- libzlib=1.3.1=hb9d3cd8_2
8080
- libzopfli=1.0.3=h9c3ff4c_0
8181
- lz4-c=1.10.0=h5888daf_1
82+
- mccabe=0.7.0=pyhd8ed1ab_1
8283
- ncurses=6.5=h2d0b736_3
8384
- networkx=3.4.2=pyh267e887_2
8485
- numpy=1.26.4=py310hb13e2d6_0
@@ -87,21 +88,25 @@ dependencies:
8788
- packaging=25.0=pyh29332c3_1
8889
- pillow=10.3.0=py310hebfe307_1
8990
- pip=25.2=pyh8b19718_0
91+
- platformdirs=4.4.0=pyhcf101f3_0
9092
- pthread-stubs=0.4=hb9d3cd8_1002
91-
- pydantic=2.11.7=pyh3cfb1c2_0
93+
- pydantic=2.11.9=pyh3cfb1c2_0
9294
- pydantic-core=2.33.2=py310hbcd0ec0_0
95+
- pylint=3.3.8=pyhe01879c_0
9396
- python=3.10.18=hd6af730_0_cpython
9497
- python_abi=3.10=8_cp310
9598
- pywavelets=1.8.0=py310hf462985_0
9699
- rav1e=0.7.1=h8fae777_3
97100
- readline=8.2=h8c095d6_2
98-
- scikit-image=0.24.0=py310h5eaa309_3
101+
- scikit-image=0.25.2=py310h0158d43_2
99102
- scipy=1.14.1=py310hfcf56fc_2
100103
- setuptools=80.9.0=pyhff2d567_0
101104
- snappy=1.2.2=h03e3b7b_0
102105
- svt-av1=3.1.2=hecca717_0
103106
- tifffile=2025.5.10=pyhd8ed1ab_0
104107
- tk=8.6.13=noxft_hd72426e_102
108+
- tomli=2.2.1=pyhe01879c_2
109+
- tomlkit=0.13.3=pyha770c72_0
105110
- tqdm=4.67.1=pyhd8ed1ab_1
106111
- typing-extensions=4.15.0=h396c80c_0
107112
- typing-inspection=0.4.1=pyhd8ed1ab_0
@@ -110,13 +115,13 @@ dependencies:
110115
- wheel=0.45.1=pyhd8ed1ab_1
111116
- xorg-libxau=1.0.12=hb9d3cd8_0
112117
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
113-
- zfp=1.0.1=h5888daf_2
118+
- zfp=1.0.1=h909a3a2_3
114119
- zipp=3.23.0=pyhd8ed1ab_0
115120
- zlib-ng=2.2.5=hde8ca8f_0
116121
- zstd=1.5.7=hb8e6e7a_2
117122
- pip:
118-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e
119-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef
123+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a6627f0a6e663e9c3f0e9874f401a34ab8990488
124+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@8f4cb4c0ebfb6ce25b3be6c83746d184f47a5f67
120125

121126
variables:
122127
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)