Skip to content

Commit 627ac4a

Browse files
authored
Merge pull request #196 from MiraGeoscience/GEOPY-2141_fixup
GEOPY-2141: fixup dask dependency: do not lock on pypi
2 parents fdd105f + 657c0c4 commit 627ac4a

17 files changed

Lines changed: 69 additions & 192 deletions

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

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

55
channels:
66
- conda-forge
@@ -148,7 +148,7 @@ dependencies:
148148
- libxml2=2.13.7=h81593ed_1
149149
- libzlib=1.3.1=hb9d3cd8_2
150150
- linkify-it-py=2.0.3=pyhd8ed1ab_1
151-
- llvm-openmp=20.1.2=h024ca30_1
151+
- llvm-openmp=20.1.3=h024ca30_0
152152
- locket=1.0.0=pyhd8ed1ab_0
153153
- markdown-it-py=2.2.0=pyhd8ed1ab_0
154154
- markupsafe=3.0.2=py310h89163eb_1
@@ -299,7 +299,6 @@ dependencies:
299299
- zstandard=0.23.0=py310ha75aee5_1
300300
- zstd=1.5.7=hb8e6e7a_2
301301
- pip:
302-
- dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d
303302
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
304303
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
305304
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830

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

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

55
channels:
66
- conda-forge
@@ -40,7 +40,6 @@ 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
4443
- jinja2=3.1.6=pyhd8ed1ab_0
4544
- joblib=1.4.2=pyhd8ed1ab_1
4645
- keyutils=1.6.1=h166bdaf_0
@@ -86,7 +85,7 @@ dependencies:
8685
- libxcrypt=4.4.36=hd590300_1
8786
- libxml2=2.13.7=h81593ed_1
8887
- libzlib=1.3.1=hb9d3cd8_2
89-
- llvm-openmp=20.1.2=h024ca30_1
88+
- llvm-openmp=20.1.3=h024ca30_0
9089
- locket=1.0.0=pyhd8ed1ab_0
9190
- markupsafe=3.0.2=py310h89163eb_1
9291
- matplotlib-base=3.8.4=py310hef631a5_2
@@ -152,7 +151,6 @@ dependencies:
152151
- zstandard=0.23.0=py310ha75aee5_1
153152
- zstd=1.5.7=hb8e6e7a_2
154153
- pip:
155-
- dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d
156154
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
157155
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
158156
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830

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

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

55
channels:
66
- conda-forge
@@ -137,7 +137,7 @@ dependencies:
137137
- libxml2=2.13.7=h442d1da_1
138138
- libzlib=1.3.1=h2466b09_2
139139
- linkify-it-py=2.0.3=pyhd8ed1ab_1
140-
- llvm-openmp=20.1.2=h30eaf37_1
140+
- llvm-openmp=20.1.3=h30eaf37_0
141141
- locket=1.0.0=pyhd8ed1ab_0
142142
- markdown-it-py=2.2.0=pyhd8ed1ab_0
143143
- markupsafe=3.0.2=py310h38315fa_1
@@ -290,7 +290,6 @@ dependencies:
290290
- zstandard=0.23.0=py310ha8f682b_1
291291
- zstd=1.5.7=hbeecb71_2
292292
- pip:
293-
- dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d
294293
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
295294
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
296295
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830

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

Lines changed: 2 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: 3eb894211f0447b50e940ab507354ca73405628ba79e422de74ccae4f2de5217
3+
# input_hash: 0681861d5a6c60889d2f28e2c3b2d4398eb25111cff948d5b1597467d9b4bf88
44

55
channels:
66
- conda-forge
@@ -39,7 +39,6 @@ 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
4342
- intel-openmp=2024.2.1=h57928b3_1083
4443
- jinja2=3.1.6=pyhd8ed1ab_0
4544
- joblib=1.4.2=pyhd8ed1ab_1
@@ -74,7 +73,7 @@ dependencies:
7473
- libxcb=1.17.0=h0e4246c_0
7574
- libxml2=2.13.7=h442d1da_1
7675
- libzlib=1.3.1=h2466b09_2
77-
- llvm-openmp=20.1.2=h30eaf37_1
76+
- llvm-openmp=20.1.3=h30eaf37_0
7877
- locket=1.0.0=pyhd8ed1ab_0
7978
- markupsafe=3.0.2=py310h38315fa_1
8079
- matplotlib-base=3.8.4=py310hadb10a8_2
@@ -141,7 +140,6 @@ dependencies:
141140
- zstandard=0.23.0=py310ha8f682b_1
142141
- zstd=1.5.7=hbeecb71_2
143142
- pip:
144-
- dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d
145143
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
146144
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
147145
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830

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

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

55
channels:
66
- conda-forge
@@ -150,7 +150,7 @@ dependencies:
150150
- libxml2=2.13.7=h81593ed_1
151151
- libzlib=1.3.1=hb9d3cd8_2
152152
- linkify-it-py=2.0.3=pyhd8ed1ab_1
153-
- llvm-openmp=20.1.2=h024ca30_1
153+
- llvm-openmp=20.1.3=h024ca30_0
154154
- locket=1.0.0=pyhd8ed1ab_0
155155
- markdown-it-py=2.2.0=pyhd8ed1ab_0
156156
- markupsafe=3.0.2=py311h2dc5d0c_1
@@ -302,7 +302,6 @@ dependencies:
302302
- zstandard=0.23.0=py311h9ecbd09_1
303303
- zstd=1.5.7=hb8e6e7a_2
304304
- pip:
305-
- dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d
306305
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
307306
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
308307
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830

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

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

55
channels:
66
- conda-forge
@@ -41,7 +41,6 @@ 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
4544
- jinja2=3.1.6=pyhd8ed1ab_0
4645
- joblib=1.4.2=pyhd8ed1ab_1
4746
- keyutils=1.6.1=h166bdaf_0
@@ -87,7 +86,7 @@ dependencies:
8786
- libxcrypt=4.4.36=hd590300_1
8887
- libxml2=2.13.7=h81593ed_1
8988
- libzlib=1.3.1=hb9d3cd8_2
90-
- llvm-openmp=20.1.2=h024ca30_1
89+
- llvm-openmp=20.1.3=h024ca30_0
9190
- locket=1.0.0=pyhd8ed1ab_0
9291
- markupsafe=3.0.2=py311h2dc5d0c_1
9392
- matplotlib-base=3.8.4=py311ha4ca890_2
@@ -154,7 +153,6 @@ dependencies:
154153
- zstandard=0.23.0=py311h9ecbd09_1
155154
- zstd=1.5.7=hb8e6e7a_2
156155
- pip:
157-
- dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d
158156
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
159157
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
160158
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830

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

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

55
channels:
66
- conda-forge
@@ -139,7 +139,7 @@ dependencies:
139139
- libxml2=2.13.7=h442d1da_1
140140
- libzlib=1.3.1=h2466b09_2
141141
- linkify-it-py=2.0.3=pyhd8ed1ab_1
142-
- llvm-openmp=20.1.2=h30eaf37_1
142+
- llvm-openmp=20.1.3=h30eaf37_0
143143
- locket=1.0.0=pyhd8ed1ab_0
144144
- markdown-it-py=2.2.0=pyhd8ed1ab_0
145145
- markupsafe=3.0.2=py311h5082efb_1
@@ -293,7 +293,6 @@ dependencies:
293293
- zstandard=0.23.0=py311he736701_1
294294
- zstd=1.5.7=hbeecb71_2
295295
- pip:
296-
- dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d
297296
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
298297
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
299298
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830

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

Lines changed: 2 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: 261ca9b15cd02bce1a27c3012f0567fa725711fc8e49f750fe801305d738907a
3+
# input_hash: 3a4998ff76243a1b66e35ac77261e40082b6e9abf541529ddf66854d819bdf5c
44

55
channels:
66
- conda-forge
@@ -40,7 +40,6 @@ 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
4443
- intel-openmp=2024.2.1=h57928b3_1083
4544
- jinja2=3.1.6=pyhd8ed1ab_0
4645
- joblib=1.4.2=pyhd8ed1ab_1
@@ -75,7 +74,7 @@ dependencies:
7574
- libxcb=1.17.0=h0e4246c_0
7675
- libxml2=2.13.7=h442d1da_1
7776
- libzlib=1.3.1=h2466b09_2
78-
- llvm-openmp=20.1.2=h30eaf37_1
77+
- llvm-openmp=20.1.3=h30eaf37_0
7978
- locket=1.0.0=pyhd8ed1ab_0
8079
- markupsafe=3.0.2=py311h5082efb_1
8180
- matplotlib-base=3.8.4=py311h9b31f6e_2
@@ -143,7 +142,6 @@ dependencies:
143142
- zstandard=0.23.0=py311he736701_1
144143
- zstd=1.5.7=hbeecb71_2
145144
- pip:
146-
- dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d
147145
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
148146
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
149147
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830

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

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

55
channels:
66
- conda-forge
@@ -150,7 +150,7 @@ dependencies:
150150
- libxml2=2.13.7=h81593ed_1
151151
- libzlib=1.3.1=hb9d3cd8_2
152152
- linkify-it-py=2.0.3=pyhd8ed1ab_1
153-
- llvm-openmp=20.1.2=h024ca30_1
153+
- llvm-openmp=20.1.3=h024ca30_0
154154
- locket=1.0.0=pyhd8ed1ab_0
155155
- markdown-it-py=2.2.0=pyhd8ed1ab_0
156156
- markupsafe=3.0.2=py312h178313f_1
@@ -302,7 +302,6 @@ dependencies:
302302
- zstandard=0.23.0=py312h66e93f0_1
303303
- zstd=1.5.7=hb8e6e7a_2
304304
- pip:
305-
- dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d
306305
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
307306
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
308307
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830

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

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

55
channels:
66
- conda-forge
@@ -86,7 +86,7 @@ dependencies:
8686
- libxcrypt=4.4.36=hd590300_1
8787
- libxml2=2.13.7=h81593ed_1
8888
- libzlib=1.3.1=hb9d3cd8_2
89-
- llvm-openmp=20.1.2=h024ca30_1
89+
- llvm-openmp=20.1.3=h024ca30_0
9090
- locket=1.0.0=pyhd8ed1ab_0
9191
- markupsafe=3.0.2=py312h178313f_1
9292
- matplotlib-base=3.8.4=py312h20ab3a6_2
@@ -153,7 +153,6 @@ dependencies:
153153
- zstandard=0.23.0=py312h66e93f0_1
154154
- zstd=1.5.7=hb8e6e7a_2
155155
- pip:
156-
- dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d
157156
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
158157
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
159158
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830

0 commit comments

Comments
 (0)