Skip to content

Commit 7a04b6e

Browse files
authored
Merge pull request #122 from MiraGeoscience/GEOPY-2049_update
GEOPY-2049: update
2 parents 2573cee + cecf5c4 commit 7a04b6e

18 files changed

Lines changed: 722 additions & 689 deletions

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

Lines changed: 7 additions & 6 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: e1e707dbd9df5d6e6e2f57197e1bff45b15c21b10b5ddfa7b1ebab946ade586d
3+
# input_hash: 55144024907b343a6ffec053ff0876faddf2babb810cd76cae9bdbef40082f76
44

55
channels:
66
- conda-forge
@@ -11,7 +11,7 @@ dependencies:
1111
- annotated-types=0.7.0=pyhd8ed1ab_1
1212
- astroid=3.3.9=py310hff52083_0
1313
- bzip2=1.0.8=h4bc722e_7
14-
- c-ares=1.34.4=hb9d3cd8_0
14+
- c-ares=1.34.5=hb9d3cd8_0
1515
- ca-certificates=2025.1.31=hbcca054_0
1616
- cached-property=1.5.2=hd8ed1ab_1
1717
- cached_property=1.5.2=pyha770c72_1
@@ -37,6 +37,7 @@ dependencies:
3737
- libdeflate=1.23=h4ddbbb0_0
3838
- libedit=3.1.20250104=pl5321h7949ede_0
3939
- libev=4.33=hd590300_2
40+
- libexpat=2.7.0=h5888daf_0
4041
- libffi=3.4.6=h2dba641_1
4142
- libgcc=14.2.0=h767d61c_2
4243
- libgcc-ng=14.2.0=h69a702a_2
@@ -65,20 +66,20 @@ dependencies:
6566
- ncurses=6.5=h2d0b736_3
6667
- numpy=1.26.4=py310hb13e2d6_0
6768
- openjpeg=2.5.3=h5fbd93e_0
68-
- openssl=3.4.1=h7b32b05_0
69+
- openssl=3.5.0=h7b32b05_0
6970
- packaging=24.2=pyhd8ed1ab_2
7071
- pillow=10.3.0=py310hebfe307_1
7172
- pip=25.0.1=pyh8b19718_0
7273
- platformdirs=4.3.7=pyh29332c3_0
7374
- pluggy=1.5.0=pyhd8ed1ab_1
7475
- pthread-stubs=0.4=hb9d3cd8_1002
75-
- pydantic=2.11.2=pyh3cfb1c2_0
76+
- pydantic=2.11.3=pyh3cfb1c2_0
7677
- pydantic-core=2.33.1=py310hc1293b2_0
7778
- pygments=2.19.1=pyhd8ed1ab_0
7879
- pylint=3.3.6=pyh29332c3_0
7980
- pytest=8.3.5=pyhd8ed1ab_0
8081
- pytest-cov=6.1.1=pyhd8ed1ab_0
81-
- python=3.10.16=habfa6aa_2_cpython
82+
- python=3.10.16=habfa6aa_3_cpython
8283
- python_abi=3.10=6_cp310
8384
- pyyaml=6.0.2=py310h89163eb_2
8485
- readline=8.2=h8c095d6_2
@@ -98,7 +99,7 @@ dependencies:
9899
- yaml=0.2.5=h7f98852_2
99100
- zstd=1.5.7=hb8e6e7a_2
100101
- pip:
101-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c13b73282c39f606890129d9640d7edd315698b7
102+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6
102103

103104
variables:
104105
KMP_WARNINGS: 0

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

Lines changed: 7 additions & 6 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: e1e707dbd9df5d6e6e2f57197e1bff45b15c21b10b5ddfa7b1ebab946ade586d
3+
# input_hash: 55144024907b343a6ffec053ff0876faddf2babb810cd76cae9bdbef40082f76
44

55
channels:
66
- conda-forge
@@ -10,7 +10,7 @@ dependencies:
1010
- _openmp_mutex=4.5=2_gnu
1111
- annotated-types=0.7.0=pyhd8ed1ab_1
1212
- bzip2=1.0.8=h4bc722e_7
13-
- c-ares=1.34.4=hb9d3cd8_0
13+
- c-ares=1.34.5=hb9d3cd8_0
1414
- ca-certificates=2025.1.31=hbcca054_0
1515
- cached-property=1.5.2=hd8ed1ab_1
1616
- cached_property=1.5.2=pyha770c72_1
@@ -29,6 +29,7 @@ dependencies:
2929
- libdeflate=1.23=h4ddbbb0_0
3030
- libedit=3.1.20250104=pl5321h7949ede_0
3131
- libev=4.33=hd590300_2
32+
- libexpat=2.7.0=h5888daf_0
3233
- libffi=3.4.6=h2dba641_1
3334
- libgcc=14.2.0=h767d61c_2
3435
- libgcc-ng=14.2.0=h69a702a_2
@@ -55,13 +56,13 @@ dependencies:
5556
- ncurses=6.5=h2d0b736_3
5657
- numpy=1.26.4=py310hb13e2d6_0
5758
- openjpeg=2.5.3=h5fbd93e_0
58-
- openssl=3.4.1=h7b32b05_0
59+
- openssl=3.5.0=h7b32b05_0
5960
- pillow=10.3.0=py310hebfe307_1
6061
- pip=25.0.1=pyh8b19718_0
6162
- pthread-stubs=0.4=hb9d3cd8_1002
62-
- pydantic=2.11.2=pyh3cfb1c2_0
63+
- pydantic=2.11.3=pyh3cfb1c2_0
6364
- pydantic-core=2.33.1=py310hc1293b2_0
64-
- python=3.10.16=habfa6aa_2_cpython
65+
- python=3.10.16=habfa6aa_3_cpython
6566
- python_abi=3.10=6_cp310
6667
- readline=8.2=h8c095d6_2
6768
- scipy=1.14.1=py310hfcf56fc_2
@@ -76,7 +77,7 @@ dependencies:
7677
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
7778
- zstd=1.5.7=hb8e6e7a_2
7879
- pip:
79-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c13b73282c39f606890129d9640d7edd315698b7
80+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6
8081

8182
variables:
8283
KMP_WARNINGS: 0

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

Lines changed: 6 additions & 5 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: f23d2f8fa30ce573a476c0f7f035f072ce757afa7141dd402e43d6d597341310
3+
# input_hash: 9149cb3780412dc6287e99bcd565ac8070d45b1a1f919769dd2616e37c83cf3a
44

55
channels:
66
- conda-forge
@@ -32,6 +32,7 @@ dependencies:
3232
- libcblas=3.9.0=31_h5e41251_mkl
3333
- libcurl=8.13.0=h88aaa65_0
3434
- libdeflate=1.23=h9062f6e_0
35+
- libexpat=2.7.0=he0c23c2_0
3536
- libffi=3.4.6=h537db12_1
3637
- libgcc=14.2.0=h1383e82_2
3738
- libgomp=14.2.0=h1383e82_2
@@ -54,20 +55,20 @@ dependencies:
5455
- mkl=2024.2.2=h66d3029_15
5556
- numpy=1.26.4=py310hf667824_0
5657
- openjpeg=2.5.3=h4d64b90_0
57-
- openssl=3.4.1=ha4e3fda_0
58+
- openssl=3.5.0=ha4e3fda_0
5859
- packaging=24.2=pyhd8ed1ab_2
5960
- pillow=10.3.0=py310h3e38d90_1
6061
- pip=25.0.1=pyh8b19718_0
6162
- platformdirs=4.3.7=pyh29332c3_0
6263
- pluggy=1.5.0=pyhd8ed1ab_1
6364
- pthread-stubs=0.4=h0e40799_1002
64-
- pydantic=2.11.2=pyh3cfb1c2_0
65+
- pydantic=2.11.3=pyh3cfb1c2_0
6566
- pydantic-core=2.33.1=py310h7c79e54_0
6667
- pygments=2.19.1=pyhd8ed1ab_0
6768
- pylint=3.3.6=pyh29332c3_0
6869
- pytest=8.3.5=pyhd8ed1ab_0
6970
- pytest-cov=6.1.1=pyhd8ed1ab_0
70-
- python=3.10.16=hfdde91d_2_cpython
71+
- python=3.10.16=hfdde91d_3_cpython
7172
- python_abi=3.10=6_cp310
7273
- pyyaml=6.0.2=py310h38315fa_2
7374
- scipy=1.14.1=py310hbd0dde3_2
@@ -91,7 +92,7 @@ dependencies:
9192
- yaml=0.2.5=h8ffe710_2
9293
- zstd=1.5.7=hbeecb71_2
9394
- pip:
94-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c13b73282c39f606890129d9640d7edd315698b7
95+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6
9596

9697
variables:
9798
KMP_WARNINGS: 0

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

Lines changed: 6 additions & 5 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: f23d2f8fa30ce573a476c0f7f035f072ce757afa7141dd402e43d6d597341310
3+
# input_hash: 9149cb3780412dc6287e99bcd565ac8070d45b1a1f919769dd2616e37c83cf3a
44

55
channels:
66
- conda-forge
@@ -24,6 +24,7 @@ dependencies:
2424
- libcblas=3.9.0=31_h5e41251_mkl
2525
- libcurl=8.13.0=h88aaa65_0
2626
- libdeflate=1.23=h9062f6e_0
27+
- libexpat=2.7.0=he0c23c2_0
2728
- libffi=3.4.6=h537db12_1
2829
- libgcc=14.2.0=h1383e82_2
2930
- libgomp=14.2.0=h1383e82_2
@@ -44,13 +45,13 @@ dependencies:
4445
- mkl=2024.2.2=h66d3029_15
4546
- numpy=1.26.4=py310hf667824_0
4647
- openjpeg=2.5.3=h4d64b90_0
47-
- openssl=3.4.1=ha4e3fda_0
48+
- openssl=3.5.0=ha4e3fda_0
4849
- pillow=10.3.0=py310h3e38d90_1
4950
- pip=25.0.1=pyh8b19718_0
5051
- pthread-stubs=0.4=h0e40799_1002
51-
- pydantic=2.11.2=pyh3cfb1c2_0
52+
- pydantic=2.11.3=pyh3cfb1c2_0
5253
- pydantic-core=2.33.1=py310h7c79e54_0
53-
- python=3.10.16=hfdde91d_2_cpython
54+
- python=3.10.16=hfdde91d_3_cpython
5455
- python_abi=3.10=6_cp310
5556
- scipy=1.14.1=py310hbd0dde3_2
5657
- setuptools=78.1.0=pyhff2d567_0
@@ -69,7 +70,7 @@ dependencies:
6970
- xorg-libxdmcp=1.1.5=h0e40799_0
7071
- zstd=1.5.7=hbeecb71_2
7172
- pip:
72-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c13b73282c39f606890129d9640d7edd315698b7
73+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6
7374

7475
variables:
7576
KMP_WARNINGS: 0

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

Lines changed: 5 additions & 5 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: 2920562ec68caec8078e9f0f94ccca3e9f328c96e89aa66b0904f2fe6cadef72
3+
# input_hash: e0f25357e0c3be1c22aad91a984c4b8f63bba65eebf4ea7f8d251386f29ec2d5
44

55
channels:
66
- conda-forge
@@ -11,7 +11,7 @@ dependencies:
1111
- annotated-types=0.7.0=pyhd8ed1ab_1
1212
- astroid=3.3.9=py311h38be061_0
1313
- bzip2=1.0.8=h4bc722e_7
14-
- c-ares=1.34.4=hb9d3cd8_0
14+
- c-ares=1.34.5=hb9d3cd8_0
1515
- ca-certificates=2025.1.31=hbcca054_0
1616
- cached-property=1.5.2=hd8ed1ab_1
1717
- cached_property=1.5.2=pyha770c72_1
@@ -66,14 +66,14 @@ dependencies:
6666
- ncurses=6.5=h2d0b736_3
6767
- numpy=1.26.4=py311h64a7726_0
6868
- openjpeg=2.5.3=h5fbd93e_0
69-
- openssl=3.4.1=h7b32b05_0
69+
- openssl=3.5.0=h7b32b05_0
7070
- packaging=24.2=pyhd8ed1ab_2
7171
- pillow=10.3.0=py311h82a398c_1
7272
- pip=25.0.1=pyh8b19718_0
7373
- platformdirs=4.3.7=pyh29332c3_0
7474
- pluggy=1.5.0=pyhd8ed1ab_1
7575
- pthread-stubs=0.4=hb9d3cd8_1002
76-
- pydantic=2.11.2=pyh3cfb1c2_0
76+
- pydantic=2.11.3=pyh3cfb1c2_0
7777
- pydantic-core=2.33.1=py311h687327b_0
7878
- pygments=2.19.1=pyhd8ed1ab_0
7979
- pylint=3.3.6=pyh29332c3_0
@@ -99,7 +99,7 @@ dependencies:
9999
- yaml=0.2.5=h7f98852_2
100100
- zstd=1.5.7=hb8e6e7a_2
101101
- pip:
102-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c13b73282c39f606890129d9640d7edd315698b7
102+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6
103103

104104
variables:
105105
KMP_WARNINGS: 0

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

Lines changed: 5 additions & 5 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: 2920562ec68caec8078e9f0f94ccca3e9f328c96e89aa66b0904f2fe6cadef72
3+
# input_hash: e0f25357e0c3be1c22aad91a984c4b8f63bba65eebf4ea7f8d251386f29ec2d5
44

55
channels:
66
- conda-forge
@@ -10,7 +10,7 @@ dependencies:
1010
- _openmp_mutex=4.5=2_gnu
1111
- annotated-types=0.7.0=pyhd8ed1ab_1
1212
- bzip2=1.0.8=h4bc722e_7
13-
- c-ares=1.34.4=hb9d3cd8_0
13+
- c-ares=1.34.5=hb9d3cd8_0
1414
- ca-certificates=2025.1.31=hbcca054_0
1515
- cached-property=1.5.2=hd8ed1ab_1
1616
- cached_property=1.5.2=pyha770c72_1
@@ -56,11 +56,11 @@ dependencies:
5656
- ncurses=6.5=h2d0b736_3
5757
- numpy=1.26.4=py311h64a7726_0
5858
- openjpeg=2.5.3=h5fbd93e_0
59-
- openssl=3.4.1=h7b32b05_0
59+
- openssl=3.5.0=h7b32b05_0
6060
- pillow=10.3.0=py311h82a398c_1
6161
- pip=25.0.1=pyh8b19718_0
6262
- pthread-stubs=0.4=hb9d3cd8_1002
63-
- pydantic=2.11.2=pyh3cfb1c2_0
63+
- pydantic=2.11.3=pyh3cfb1c2_0
6464
- pydantic-core=2.33.1=py311h687327b_0
6565
- python=3.11.11=h9e4cc4f_2_cpython
6666
- python_abi=3.11=6_cp311
@@ -77,7 +77,7 @@ dependencies:
7777
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
7878
- zstd=1.5.7=hb8e6e7a_2
7979
- pip:
80-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c13b73282c39f606890129d9640d7edd315698b7
80+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6
8181

8282
variables:
8383
KMP_WARNINGS: 0

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

Lines changed: 4 additions & 4 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: e7d12ddbf9ce82a45c081b92cc5414a0bceb7f2a53db014e3024feeaf29bc218
3+
# input_hash: 53622872e0c9afb3046d47c93a9514d702363b9005b8ec96ba2821b89527a40d
44

55
channels:
66
- conda-forge
@@ -55,14 +55,14 @@ dependencies:
5555
- mkl=2024.2.2=h66d3029_15
5656
- numpy=1.26.4=py311h0b4df5a_0
5757
- openjpeg=2.5.3=h4d64b90_0
58-
- openssl=3.4.1=ha4e3fda_0
58+
- openssl=3.5.0=ha4e3fda_0
5959
- packaging=24.2=pyhd8ed1ab_2
6060
- pillow=10.3.0=py311h5592be9_1
6161
- pip=25.0.1=pyh8b19718_0
6262
- platformdirs=4.3.7=pyh29332c3_0
6363
- pluggy=1.5.0=pyhd8ed1ab_1
6464
- pthread-stubs=0.4=h0e40799_1002
65-
- pydantic=2.11.2=pyh3cfb1c2_0
65+
- pydantic=2.11.3=pyh3cfb1c2_0
6666
- pydantic-core=2.33.1=py311ha250665_0
6767
- pygments=2.19.1=pyhd8ed1ab_0
6868
- pylint=3.3.6=pyh29332c3_0
@@ -92,7 +92,7 @@ dependencies:
9292
- yaml=0.2.5=h8ffe710_2
9393
- zstd=1.5.7=hbeecb71_2
9494
- pip:
95-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c13b73282c39f606890129d9640d7edd315698b7
95+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6
9696

9797
variables:
9898
KMP_WARNINGS: 0

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

Lines changed: 4 additions & 4 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: e7d12ddbf9ce82a45c081b92cc5414a0bceb7f2a53db014e3024feeaf29bc218
3+
# input_hash: 53622872e0c9afb3046d47c93a9514d702363b9005b8ec96ba2821b89527a40d
44

55
channels:
66
- conda-forge
@@ -45,11 +45,11 @@ dependencies:
4545
- mkl=2024.2.2=h66d3029_15
4646
- numpy=1.26.4=py311h0b4df5a_0
4747
- openjpeg=2.5.3=h4d64b90_0
48-
- openssl=3.4.1=ha4e3fda_0
48+
- openssl=3.5.0=ha4e3fda_0
4949
- pillow=10.3.0=py311h5592be9_1
5050
- pip=25.0.1=pyh8b19718_0
5151
- pthread-stubs=0.4=h0e40799_1002
52-
- pydantic=2.11.2=pyh3cfb1c2_0
52+
- pydantic=2.11.3=pyh3cfb1c2_0
5353
- pydantic-core=2.33.1=py311ha250665_0
5454
- python=3.11.11=h3f84c4b_2_cpython
5555
- python_abi=3.11=6_cp311
@@ -70,7 +70,7 @@ dependencies:
7070
- xorg-libxdmcp=1.1.5=h0e40799_0
7171
- zstd=1.5.7=hbeecb71_2
7272
- pip:
73-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c13b73282c39f606890129d9640d7edd315698b7
73+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6
7474

7575
variables:
7676
KMP_WARNINGS: 0

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

Lines changed: 5 additions & 5 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: 2d982a603d3750f15a2d1f48b780fa892fcec6d570617eeceef420875474d1dc
3+
# input_hash: 59e2dda69bb7f8d0ba324097e4652dbea16e078cc30587cfb898758761279a5d
44

55
channels:
66
- conda-forge
@@ -11,7 +11,7 @@ dependencies:
1111
- annotated-types=0.7.0=pyhd8ed1ab_1
1212
- astroid=3.3.9=py312h7900ff3_0
1313
- bzip2=1.0.8=h4bc722e_7
14-
- c-ares=1.34.4=hb9d3cd8_0
14+
- c-ares=1.34.5=hb9d3cd8_0
1515
- ca-certificates=2025.1.31=hbcca054_0
1616
- cached-property=1.5.2=hd8ed1ab_1
1717
- cached_property=1.5.2=pyha770c72_1
@@ -66,14 +66,14 @@ dependencies:
6666
- ncurses=6.5=h2d0b736_3
6767
- numpy=1.26.4=py312heda63a1_0
6868
- openjpeg=2.5.3=h5fbd93e_0
69-
- openssl=3.4.1=h7b32b05_0
69+
- openssl=3.5.0=h7b32b05_0
7070
- packaging=24.2=pyhd8ed1ab_2
7171
- pillow=10.3.0=py312h287a98d_1
7272
- pip=25.0.1=pyh8b19718_0
7373
- platformdirs=4.3.7=pyh29332c3_0
7474
- pluggy=1.5.0=pyhd8ed1ab_1
7575
- pthread-stubs=0.4=hb9d3cd8_1002
76-
- pydantic=2.11.2=pyh3cfb1c2_0
76+
- pydantic=2.11.3=pyh3cfb1c2_0
7777
- pydantic-core=2.33.1=py312h3b7be25_0
7878
- pygments=2.19.1=pyhd8ed1ab_0
7979
- pylint=3.3.6=pyh29332c3_0
@@ -99,7 +99,7 @@ dependencies:
9999
- yaml=0.2.5=h7f98852_2
100100
- zstd=1.5.7=hb8e6e7a_2
101101
- pip:
102-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c13b73282c39f606890129d9640d7edd315698b7
102+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6
103103

104104
variables:
105105
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)