Skip to content

Commit 7288d0a

Browse files
committed
[GEOPY-2141] correctly declare dask dependency for pip and dask-core for conda
1 parent 8a2f616 commit 7288d0a

17 files changed

Lines changed: 73 additions & 68 deletions

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

Lines changed: 2 additions & 2 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: bf3275537e5ecaf05c1984281f2fde8ab4042050416af17dce075452328e658d
3+
# input_hash: 1058feab9cbae7f97fa8892c8b52e4358428b4c8c8727f34e560307d0a7f146b
44

55
channels:
66
- conda-forge
@@ -303,7 +303,7 @@ dependencies:
303303
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
304304
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
305305
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
306-
- octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1
306+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
307307
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
308308

309309
variables:

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

Lines changed: 3 additions & 2 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: bf3275537e5ecaf05c1984281f2fde8ab4042050416af17dce075452328e658d
3+
# input_hash: 1058feab9cbae7f97fa8892c8b52e4358428b4c8c8727f34e560307d0a7f146b
44

55
channels:
66
- conda-forge
@@ -40,6 +40,7 @@ dependencies:
4040
- hpack=4.1.0=pyhd8ed1ab_0
4141
- hyperframe=6.1.0=pyhd8ed1ab_0
4242
- importlib-metadata=8.6.1=pyha770c72_0
43+
- importlib_metadata=8.6.1=hd8ed1ab_0
4344
- jinja2=3.1.6=pyhd8ed1ab_0
4445
- joblib=1.4.2=pyhd8ed1ab_1
4546
- keyutils=1.6.1=h166bdaf_0
@@ -155,7 +156,7 @@ dependencies:
155156
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
156157
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
157158
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
158-
- octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1
159+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
159160
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
160161

161162
variables:

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

Lines changed: 2 additions & 2 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: e7bc6ba0193fb36212cebeba8243e70ee2c0c8c368772456f1dad5c253e5f5b5
3+
# input_hash: 3eb894211f0447b50e940ab507354ca73405628ba79e422de74ccae4f2de5217
44

55
channels:
66
- conda-forge
@@ -294,7 +294,7 @@ dependencies:
294294
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
295295
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
296296
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
297-
- octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1
297+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
298298
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
299299

300300
variables:

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

Lines changed: 3 additions & 2 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: e7bc6ba0193fb36212cebeba8243e70ee2c0c8c368772456f1dad5c253e5f5b5
3+
# input_hash: 3eb894211f0447b50e940ab507354ca73405628ba79e422de74ccae4f2de5217
44

55
channels:
66
- conda-forge
@@ -39,6 +39,7 @@ dependencies:
3939
- hpack=4.1.0=pyhd8ed1ab_0
4040
- hyperframe=6.1.0=pyhd8ed1ab_0
4141
- importlib-metadata=8.6.1=pyha770c72_0
42+
- importlib_metadata=8.6.1=hd8ed1ab_0
4243
- intel-openmp=2024.2.1=h57928b3_1083
4344
- jinja2=3.1.6=pyhd8ed1ab_0
4445
- joblib=1.4.2=pyhd8ed1ab_1
@@ -144,7 +145,7 @@ dependencies:
144145
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
145146
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
146147
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
147-
- octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1
148+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
148149
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
149150

150151
variables:

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

Lines changed: 2 additions & 2 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: 8b265443dab30ad551824c6b1a148bd0dd8035f687125469ec0b8495cb8d13ef
3+
# input_hash: 165713729a7490686c97160428f7200e968bd2be21e5a205095d6689087d6c83
44

55
channels:
66
- conda-forge
@@ -306,7 +306,7 @@ dependencies:
306306
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
307307
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
308308
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
309-
- octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1
309+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
310310
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
311311

312312
variables:

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

Lines changed: 3 additions & 2 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: 8b265443dab30ad551824c6b1a148bd0dd8035f687125469ec0b8495cb8d13ef
3+
# input_hash: 165713729a7490686c97160428f7200e968bd2be21e5a205095d6689087d6c83
44

55
channels:
66
- conda-forge
@@ -41,6 +41,7 @@ dependencies:
4141
- hpack=4.1.0=pyhd8ed1ab_0
4242
- hyperframe=6.1.0=pyhd8ed1ab_0
4343
- importlib-metadata=8.6.1=pyha770c72_0
44+
- importlib_metadata=8.6.1=hd8ed1ab_0
4445
- jinja2=3.1.6=pyhd8ed1ab_0
4546
- joblib=1.4.2=pyhd8ed1ab_1
4647
- keyutils=1.6.1=h166bdaf_0
@@ -157,7 +158,7 @@ dependencies:
157158
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
158159
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
159160
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
160-
- octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1
161+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
161162
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
162163

163164
variables:

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

Lines changed: 2 additions & 2 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: 6746234080fb492f036f680bcb88c659a2628254805462ff518405ebc4dc97ec
3+
# input_hash: 261ca9b15cd02bce1a27c3012f0567fa725711fc8e49f750fe801305d738907a
44

55
channels:
66
- conda-forge
@@ -297,7 +297,7 @@ dependencies:
297297
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
298298
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
299299
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
300-
- octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1
300+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
301301
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
302302

303303
variables:

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

Lines changed: 3 additions & 2 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: 6746234080fb492f036f680bcb88c659a2628254805462ff518405ebc4dc97ec
3+
# input_hash: 261ca9b15cd02bce1a27c3012f0567fa725711fc8e49f750fe801305d738907a
44

55
channels:
66
- conda-forge
@@ -40,6 +40,7 @@ dependencies:
4040
- hpack=4.1.0=pyhd8ed1ab_0
4141
- hyperframe=6.1.0=pyhd8ed1ab_0
4242
- importlib-metadata=8.6.1=pyha770c72_0
43+
- importlib_metadata=8.6.1=hd8ed1ab_0
4344
- intel-openmp=2024.2.1=h57928b3_1083
4445
- jinja2=3.1.6=pyhd8ed1ab_0
4546
- joblib=1.4.2=pyhd8ed1ab_1
@@ -146,7 +147,7 @@ dependencies:
146147
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
147148
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
148149
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
149-
- octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1
150+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
150151
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
151152

152153
variables:

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

Lines changed: 2 additions & 2 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: 1dc064917aeb518bbd08c7336c474da8966f79b47d704f7e17aa98ac37fee0d7
3+
# input_hash: 1591aead88ecd028462aadbf35e105044614ac28fd536f6335097aa17d26eb30
44

55
channels:
66
- conda-forge
@@ -306,7 +306,7 @@ dependencies:
306306
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
307307
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
308308
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
309-
- octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1
309+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
310310
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
311311

312312
variables:

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

Lines changed: 2 additions & 2 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: 1dc064917aeb518bbd08c7336c474da8966f79b47d704f7e17aa98ac37fee0d7
3+
# input_hash: 1591aead88ecd028462aadbf35e105044614ac28fd536f6335097aa17d26eb30
44

55
channels:
66
- conda-forge
@@ -157,7 +157,7 @@ dependencies:
157157
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
158158
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
159159
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
160-
- octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1
160+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
161161
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
162162

163163
variables:

0 commit comments

Comments
 (0)