Skip to content

Commit db48f30

Browse files
sebhmgsebhmg
committed
Merge remote-tracking branch 'origin/release/ga-4.7' into develop + relock
# Conflicts: # environments/py-3.10-linux-64-dev.conda.lock.yml # environments/py-3.10-linux-64.conda.lock.yml # environments/py-3.10-win-64-dev.conda.lock.yml # environments/py-3.10-win-64.conda.lock.yml # environments/py-3.11-linux-64-dev.conda.lock.yml # environments/py-3.11-linux-64.conda.lock.yml # environments/py-3.11-win-64-dev.conda.lock.yml # environments/py-3.11-win-64.conda.lock.yml # environments/py-3.12-linux-64-dev.conda.lock.yml # environments/py-3.12-linux-64.conda.lock.yml # environments/py-3.12-win-64-dev.conda.lock.yml # environments/py-3.12-win-64.conda.lock.yml # py-3.10.conda-lock.yml # py-3.11.conda-lock.yml # py-3.12.conda-lock.yml # pyproject.toml
2 parents d6a4261 + a542ce4 commit db48f30

17 files changed

Lines changed: 2559 additions & 925 deletions

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

Lines changed: 41 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: 21713b32d9b6a132c84bea08c5a63fb7b87ec20cad1b4004d523bc6d659a7123
3+
# input_hash: 1bcf349820c5e27fc581948d0ff45d4cab62367b9b969468692db399cbc4c415
44

55
channels:
66
- conda-forge
@@ -10,48 +10,58 @@ dependencies:
1010
- _openmp_mutex=4.5=2_gnu
1111
- alabaster=1.0.0=pyhd8ed1ab_1
1212
- annotated-types=0.7.0=pyhd8ed1ab_1
13-
- astroid=4.0.1=py310hff52083_0
13+
- astroid=4.0.2=py310hff52083_0
1414
- babel=2.17.0=pyhd8ed1ab_0
15+
- brotli=1.2.0=h41a2e66_0
16+
- brotli-bin=1.2.0=hf2c8021_0
1517
- brotli-python=1.2.0=py310h8cfb67f_0
1618
- bzip2=1.0.8=hda65f42_8
1719
- c-ares=1.34.5=hb9d3cd8_0
18-
- ca-certificates=2025.10.5=hbd8a1cb_0
20+
- ca-certificates=2025.11.12=hbd8a1cb_0
1921
- cached-property=1.5.2=hd8ed1ab_1
2022
- cached_property=1.5.2=pyha770c72_1
21-
- certifi=2025.10.5=pyhd8ed1ab_0
23+
- certifi=2025.11.12=pyhd8ed1ab_0
2224
- cffi=2.0.0=py310he7384ee_1
2325
- charset-normalizer=3.4.4=pyhd8ed1ab_0
2426
- colorama=0.4.6=pyhd8ed1ab_1
25-
- coverage=7.11.0=py310h3406613_0
27+
- contourpy=1.3.2=py310h3788b33_0
28+
- coverage=7.12.0=py310h3406613_0
29+
- cycler=0.12.1=pyhd8ed1ab_1
2630
- dill=0.4.0=pyhd8ed1ab_0
2731
- discretize=0.11.3=py310hc563356_1
2832
- docutils=0.21.2=pyhd8ed1ab_1
2933
- exceptiongroup=1.3.0=pyhd8ed1ab_0
34+
- fonttools=4.60.1=py310h3406613_0
3035
- freetype=2.14.1=ha770c72_0
3136
- h2=4.3.0=pyhcf101f3_0
3237
- h5py=3.15.1=nompi_py310h4aa865e_100
3338
- hdf5=1.14.6=nompi_h6e4c0c1_103
3439
- hpack=4.1.0=pyhd8ed1ab_0
3540
- hyperframe=6.1.0=pyhd8ed1ab_0
41+
- icu=75.1=he02047a_0
3642
- idna=3.11=pyhd8ed1ab_0
3743
- imagesize=1.4.1=pyhd8ed1ab_0
3844
- importlib-metadata=8.7.0=pyhe01879c_1
3945
- iniconfig=2.3.0=pyhd8ed1ab_0
4046
- isort=7.0.0=pyhd8ed1ab_0
4147
- jinja2=3.1.6=pyhd8ed1ab_0
4248
- keyutils=1.6.3=hb9d3cd8_0
49+
- kiwisolver=1.4.9=py310haaf941d_2
4350
- krb5=1.21.3=h659f571_0
4451
- lcms2=2.17=h717163a_0
45-
- ld_impl_linux-64=2.44=h1aa0949_4
52+
- ld_impl_linux-64=2.45=h1aa0949_0
4653
- lerc=4.0.0=h0aef613_1
4754
- libaec=1.1.4=h3f801dc_0
48-
- libblas=3.9.0=38_h4a7cf45_openblas
49-
- libcblas=3.9.0=38_h0358290_openblas
50-
- libcurl=8.16.0=h4e3cde8_0
55+
- libblas=3.11.0=1_h4a7cf45_openblas
56+
- libbrotlicommon=1.2.0=h09219d5_0
57+
- libbrotlidec=1.2.0=hd53d788_0
58+
- libbrotlienc=1.2.0=h02bd7ab_0
59+
- libcblas=3.11.0=1_h0358290_openblas
60+
- libcurl=8.17.0=h4e3cde8_0
5161
- libdeflate=1.25=h17f619e_0
5262
- libedit=3.1.20250104=pl5321h7949ede_0
5363
- libev=4.33=hd590300_2
54-
- libexpat=2.7.1=hecca717_0
64+
- libexpat=2.7.3=hecca717_0
5565
- libffi=3.5.2=h9ec8514_0
5666
- libfreetype=2.14.1=ha770c72_0
5767
- libfreetype6=2.14.1=h73754d4_0
@@ -61,13 +71,13 @@ dependencies:
6171
- libgfortran5=15.2.0=hcd61629_7
6272
- libgomp=15.2.0=h767d61c_7
6373
- libjpeg-turbo=3.1.2=hb03c661_0
64-
- liblapack=3.9.0=38_h47877c9_openblas
74+
- liblapack=3.11.0=1_h47877c9_openblas
6575
- liblzma=5.8.1=hb9d3cd8_2
6676
- libnghttp2=1.67.0=had1ee68_0
6777
- libnsl=2.0.1=hb9d3cd8_1
68-
- libopenblas=0.3.30=pthreads_h94d23a6_3
78+
- libopenblas=0.3.30=pthreads_h94d23a6_4
6979
- libpng=1.6.50=h421ea60_1
70-
- libsqlite=3.50.4=h0c1763c_0
80+
- libsqlite=3.51.0=hee844dc_0
7181
- libssh2=1.11.1=hcf80075_0
7282
- libstdcxx=15.2.0=h8f9b012_7
7383
- libstdcxx-ng=15.2.0=h4852527_7
@@ -78,33 +88,38 @@ dependencies:
7888
- libxcrypt=4.4.36=hd590300_1
7989
- libzlib=1.3.1=hb9d3cd8_2
8090
- markupsafe=3.0.3=py310h3406613_0
91+
- matplotlib-base=3.8.4=py310hef631a5_2
8192
- mccabe=0.7.0=pyhd8ed1ab_1
93+
- munkres=1.1.4=pyhd8ed1ab_1
8294
- ncurses=6.5=h2d0b736_3
8395
- numpy=1.26.4=py310hb13e2d6_0
8496
- openjpeg=2.5.4=h55fea9a_0
85-
- openssl=3.5.4=h26f9b46_0
97+
- openssl=3.6.0=h26f9b46_0
8698
- packaging=25.0=pyh29332c3_1
8799
- pillow=10.3.0=py310hebfe307_1
88-
- pip=25.2=pyh8b19718_0
100+
- pip=25.3=pyh8b19718_0
89101
- platformdirs=4.5.0=pyhcf101f3_0
90102
- pluggy=1.6.0=pyhd8ed1ab_0
91103
- pthread-stubs=0.4=hb9d3cd8_1002
92104
- pycparser=2.22=pyh29332c3_1
93-
- pydantic=2.12.3=pyh3cfb1c2_0
94-
- pydantic-core=2.41.4=py310hd8f68c5_0
105+
- pydantic=2.12.4=pyh3cfb1c2_0
106+
- pydantic-core=2.41.5=py310hd8f68c5_1
95107
- pygments=2.19.2=pyhd8ed1ab_0
96-
- pylint=4.0.2=pyhcf101f3_0
108+
- pylint=4.0.3=pyhcf101f3_0
109+
- pyparsing=3.2.5=pyhcf101f3_0
97110
- pysocks=1.7.1=pyha55dd90_7
98-
- pytest=8.4.2=pyhd8ed1ab_0
111+
- pytest=9.0.1=pyhcf101f3_0
99112
- pytest-cov=7.0.0=pyhcf101f3_1
100113
- python=3.10.19=h3c07f61_2_cpython
114+
- python-dateutil=2.9.0.post0=pyhe01879c_2
101115
- python_abi=3.10=8_cp310
102116
- pytz=2025.2=pyhd8ed1ab_0
103117
- pyyaml=6.0.3=py310h3406613_0
104118
- readline=8.2=h8c095d6_2
105119
- requests=2.32.5=pyhd8ed1ab_0
106120
- scipy=1.14.1=py310hfcf56fc_2
107121
- setuptools=80.9.0=pyhff2d567_0
122+
- six=1.17.0=pyhe01879c_1
108123
- snowballstemmer=3.0.1=pyhd8ed1ab_0
109124
- sphinx=8.1.3=pyhd8ed1ab_1
110125
- sphinx-autodoc-typehints=3.0.1=pyhd8ed1ab_0
@@ -117,24 +132,25 @@ dependencies:
117132
- sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1
118133
- sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1
119134
- sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1
120-
- tk=8.6.13=noxft_hd72426e_102
135+
- tk=8.6.13=noxft_ha0e22de_103
121136
- tomli=2.3.0=pyhcf101f3_0
122137
- tomlkit=0.13.3=pyha770c72_0
123138
- typing-extensions=4.15.0=h396c80c_0
124139
- typing-inspection=0.4.2=pyhd8ed1ab_0
125140
- typing_extensions=4.15.0=pyhcf101f3_0
126141
- tzdata=2025b=h78e105d_0
142+
- unicodedata2=17.0.0=py310h7c4b9e2_1
127143
- urllib3=2.5.0=pyhd8ed1ab_0
128144
- wheel=0.45.1=pyhd8ed1ab_1
129-
- xorg-libxau=1.0.12=hb9d3cd8_0
130-
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
145+
- xorg-libxau=1.0.12=hb03c661_1
146+
- xorg-libxdmcp=1.1.5=hb03c661_1
131147
- yaml=0.2.5=h280c20c_3
132148
- zipp=3.23.0=pyhd8ed1ab_0
133-
- zstandard=0.25.0=py310h139afa4_0
149+
- zstandard=0.25.0=py310h139afa4_1
134150
- zstd=1.5.7=hb8e6e7a_2
135151
- pip:
136-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3
137-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c
152+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@15d04763f768cb6f56a3049c9c83a12c88f3060f
153+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6e27ace156c5f5898a77ae96566dea1d90de8cd8
138154

139155
variables:
140156
KMP_WARNINGS: 0

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

Lines changed: 37 additions & 19 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: 21713b32d9b6a132c84bea08c5a63fb7b87ec20cad1b4004d523bc6d659a7123
3+
# input_hash: 1bcf349820c5e27fc581948d0ff45d4cab62367b9b969468692db399cbc4c415
44

55
channels:
66
- conda-forge
@@ -9,28 +9,39 @@ dependencies:
99
- _libgcc_mutex=0.1=conda_forge
1010
- _openmp_mutex=4.5=2_gnu
1111
- annotated-types=0.7.0=pyhd8ed1ab_1
12+
- brotli=1.2.0=h41a2e66_0
13+
- brotli-bin=1.2.0=hf2c8021_0
1214
- bzip2=1.0.8=hda65f42_8
1315
- c-ares=1.34.5=hb9d3cd8_0
14-
- ca-certificates=2025.10.5=hbd8a1cb_0
16+
- ca-certificates=2025.11.12=hbd8a1cb_0
1517
- cached-property=1.5.2=hd8ed1ab_1
1618
- cached_property=1.5.2=pyha770c72_1
19+
- certifi=2025.11.12=pyhd8ed1ab_0
20+
- contourpy=1.3.2=py310h3788b33_0
21+
- cycler=0.12.1=pyhd8ed1ab_1
1722
- discretize=0.11.3=py310hc563356_1
23+
- fonttools=4.60.1=py310h3406613_0
1824
- freetype=2.14.1=ha770c72_0
1925
- h5py=3.15.1=nompi_py310h4aa865e_100
2026
- hdf5=1.14.6=nompi_h6e4c0c1_103
27+
- icu=75.1=he02047a_0
2128
- keyutils=1.6.3=hb9d3cd8_0
29+
- kiwisolver=1.4.9=py310haaf941d_2
2230
- krb5=1.21.3=h659f571_0
2331
- lcms2=2.17=h717163a_0
24-
- ld_impl_linux-64=2.44=h1aa0949_4
32+
- ld_impl_linux-64=2.45=h1aa0949_0
2533
- lerc=4.0.0=h0aef613_1
2634
- libaec=1.1.4=h3f801dc_0
27-
- libblas=3.9.0=38_h4a7cf45_openblas
28-
- libcblas=3.9.0=38_h0358290_openblas
29-
- libcurl=8.16.0=h4e3cde8_0
35+
- libblas=3.11.0=1_h4a7cf45_openblas
36+
- libbrotlicommon=1.2.0=h09219d5_0
37+
- libbrotlidec=1.2.0=hd53d788_0
38+
- libbrotlienc=1.2.0=h02bd7ab_0
39+
- libcblas=3.11.0=1_h0358290_openblas
40+
- libcurl=8.17.0=h4e3cde8_0
3041
- libdeflate=1.25=h17f619e_0
3142
- libedit=3.1.20250104=pl5321h7949ede_0
3243
- libev=4.33=hd590300_2
33-
- libexpat=2.7.1=hecca717_0
44+
- libexpat=2.7.3=hecca717_0
3445
- libffi=3.5.2=h9ec8514_0
3546
- libfreetype=2.14.1=ha770c72_0
3647
- libfreetype6=2.14.1=h73754d4_0
@@ -40,13 +51,13 @@ dependencies:
4051
- libgfortran5=15.2.0=hcd61629_7
4152
- libgomp=15.2.0=h767d61c_7
4253
- libjpeg-turbo=3.1.2=hb03c661_0
43-
- liblapack=3.9.0=38_h47877c9_openblas
54+
- liblapack=3.11.0=1_h47877c9_openblas
4455
- liblzma=5.8.1=hb9d3cd8_2
4556
- libnghttp2=1.67.0=had1ee68_0
4657
- libnsl=2.0.1=hb9d3cd8_1
47-
- libopenblas=0.3.30=pthreads_h94d23a6_3
58+
- libopenblas=0.3.30=pthreads_h94d23a6_4
4859
- libpng=1.6.50=h421ea60_1
49-
- libsqlite=3.50.4=h0c1763c_0
60+
- libsqlite=3.51.0=hee844dc_0
5061
- libssh2=1.11.1=hcf80075_0
5162
- libstdcxx=15.2.0=h8f9b012_7
5263
- libstdcxx-ng=15.2.0=h4852527_7
@@ -56,32 +67,39 @@ dependencies:
5667
- libxcb=1.17.0=h8a09558_0
5768
- libxcrypt=4.4.36=hd590300_1
5869
- libzlib=1.3.1=hb9d3cd8_2
70+
- matplotlib-base=3.8.4=py310hef631a5_2
71+
- munkres=1.1.4=pyhd8ed1ab_1
5972
- ncurses=6.5=h2d0b736_3
6073
- numpy=1.26.4=py310hb13e2d6_0
6174
- openjpeg=2.5.4=h55fea9a_0
62-
- openssl=3.5.4=h26f9b46_0
75+
- openssl=3.6.0=h26f9b46_0
76+
- packaging=25.0=pyh29332c3_1
6377
- pillow=10.3.0=py310hebfe307_1
64-
- pip=25.2=pyh8b19718_0
78+
- pip=25.3=pyh8b19718_0
6579
- pthread-stubs=0.4=hb9d3cd8_1002
66-
- pydantic=2.12.3=pyh3cfb1c2_0
67-
- pydantic-core=2.41.4=py310hd8f68c5_0
80+
- pydantic=2.12.4=pyh3cfb1c2_0
81+
- pydantic-core=2.41.5=py310hd8f68c5_1
82+
- pyparsing=3.2.5=pyhcf101f3_0
6883
- python=3.10.19=h3c07f61_2_cpython
84+
- python-dateutil=2.9.0.post0=pyhe01879c_2
6985
- python_abi=3.10=8_cp310
7086
- readline=8.2=h8c095d6_2
7187
- scipy=1.14.1=py310hfcf56fc_2
7288
- setuptools=80.9.0=pyhff2d567_0
73-
- tk=8.6.13=noxft_hd72426e_102
89+
- six=1.17.0=pyhe01879c_1
90+
- tk=8.6.13=noxft_ha0e22de_103
7491
- typing-extensions=4.15.0=h396c80c_0
7592
- typing-inspection=0.4.2=pyhd8ed1ab_0
7693
- typing_extensions=4.15.0=pyhcf101f3_0
7794
- tzdata=2025b=h78e105d_0
95+
- unicodedata2=17.0.0=py310h7c4b9e2_1
7896
- wheel=0.45.1=pyhd8ed1ab_1
79-
- xorg-libxau=1.0.12=hb9d3cd8_0
80-
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
97+
- xorg-libxau=1.0.12=hb03c661_1
98+
- xorg-libxdmcp=1.1.5=hb03c661_1
8199
- zstd=1.5.7=hb8e6e7a_2
82100
- pip:
83-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3
84-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c
101+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@15d04763f768cb6f56a3049c9c83a12c88f3060f
102+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6e27ace156c5f5898a77ae96566dea1d90de8cd8
85103

86104
variables:
87105
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)