Skip to content

Commit 2ee9481

Browse files
authored
Merge pull request #276 from MiraGeoscience/GEOPY-2461
GEOPY-2461: Failure of directives when using Futures for simulation
2 parents b9e9be4 + cfcd4cd commit 2ee9481

19 files changed

Lines changed: 139 additions & 132 deletions

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies:
5555
- exceptiongroup=1.3.0=pyhd8ed1ab_0
5656
- executing=2.2.1=pyhd8ed1ab_0
5757
- fasteners=0.19=pyhd8ed1ab_1
58-
- fonttools=4.59.2=py310h3406613_0
58+
- fonttools=4.60.0=py310h3406613_0
5959
- fqdn=1.5.1=pyhd8ed1ab_1
6060
- freetype=2.14.1=ha770c72_0
6161
- fsspec=2025.9.0=pyhd8ed1ab_0
@@ -306,9 +306,9 @@ dependencies:
306306
- zstd=1.5.7=hb8e6e7a_2
307307
- pip:
308308
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773
309-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
309+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822
310310
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
311-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7da0cb45b4ff1213d1cca120773971aa8468a5c1
311+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64
312312

313313
variables:
314314
KMP_WARNINGS: 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- discretize=0.11.3=py310ha2bacc8_0
3333
- distributed=2025.3.0=pyhd8ed1ab_0
3434
- fasteners=0.19=pyhd8ed1ab_1
35-
- fonttools=4.59.2=py310h3406613_0
35+
- fonttools=4.60.0=py310h3406613_0
3636
- freetype=2.14.1=ha770c72_0
3737
- fsspec=2025.9.0=pyhd8ed1ab_0
3838
- geoana=0.7.2=py310ha2bacc8_0
@@ -167,9 +167,9 @@ dependencies:
167167
- zstd=1.5.7=hb8e6e7a_2
168168
- pip:
169169
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773
170-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
170+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822
171171
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
172-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7da0cb45b4ff1213d1cca120773971aa8468a5c1
172+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64
173173

174174
variables:
175175
KMP_WARNINGS: 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies:
5555
- exceptiongroup=1.3.0=pyhd8ed1ab_0
5656
- executing=2.2.1=pyhd8ed1ab_0
5757
- fasteners=0.19=pyhd8ed1ab_1
58-
- fonttools=4.59.2=py310hdb0e946_0
58+
- fonttools=4.60.0=py310hdb0e946_0
5959
- fqdn=1.5.1=pyhd8ed1ab_1
6060
- freetype=2.14.1=h57928b3_0
6161
- fsspec=2025.9.0=pyhd8ed1ab_0
@@ -296,9 +296,9 @@ dependencies:
296296
- zstd=1.5.7=hbeecb71_2
297297
- pip:
298298
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773
299-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
299+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822
300300
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
301-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7da0cb45b4ff1213d1cca120773971aa8468a5c1
301+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64
302302

303303
variables:
304304
KMP_WARNINGS: 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies:
3131
- discretize=0.11.3=py310h3e8ed56_0
3232
- distributed=2025.3.0=pyhd8ed1ab_0
3333
- fasteners=0.19=pyhd8ed1ab_1
34-
- fonttools=4.59.2=py310hdb0e946_0
34+
- fonttools=4.60.0=py310hdb0e946_0
3535
- freetype=2.14.1=h57928b3_0
3636
- fsspec=2025.9.0=pyhd8ed1ab_0
3737
- geoana=0.7.2=py310h3e8ed56_0
@@ -155,9 +155,9 @@ dependencies:
155155
- zstd=1.5.7=hbeecb71_2
156156
- pip:
157157
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773
158-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
158+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822
159159
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
160-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7da0cb45b4ff1213d1cca120773971aa8468a5c1
160+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64
161161

162162
variables:
163163
KMP_WARNINGS: 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ dependencies:
5656
- exceptiongroup=1.3.0=pyhd8ed1ab_0
5757
- executing=2.2.1=pyhd8ed1ab_0
5858
- fasteners=0.19=pyhd8ed1ab_1
59-
- fonttools=4.59.2=py311h3778330_0
59+
- fonttools=4.60.0=py311h3778330_0
6060
- fqdn=1.5.1=pyhd8ed1ab_1
6161
- freetype=2.14.1=ha770c72_0
6262
- fsspec=2025.9.0=pyhd8ed1ab_0
@@ -309,9 +309,9 @@ dependencies:
309309
- zstd=1.5.7=hb8e6e7a_2
310310
- pip:
311311
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773
312-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
312+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822
313313
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
314-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7da0cb45b4ff1213d1cca120773971aa8468a5c1
314+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64
315315

316316
variables:
317317
KMP_WARNINGS: 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies:
3333
- discretize=0.11.3=py311h5b7b71f_0
3434
- distributed=2025.3.0=pyhd8ed1ab_0
3535
- fasteners=0.19=pyhd8ed1ab_1
36-
- fonttools=4.59.2=py311h3778330_0
36+
- fonttools=4.60.0=py311h3778330_0
3737
- freetype=2.14.1=ha770c72_0
3838
- fsspec=2025.9.0=pyhd8ed1ab_0
3939
- geoana=0.7.2=py311h5b7b71f_0
@@ -169,9 +169,9 @@ dependencies:
169169
- zstd=1.5.7=hb8e6e7a_2
170170
- pip:
171171
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773
172-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
172+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822
173173
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
174-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7da0cb45b4ff1213d1cca120773971aa8468a5c1
174+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64
175175

176176
variables:
177177
KMP_WARNINGS: 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ dependencies:
5656
- exceptiongroup=1.3.0=pyhd8ed1ab_0
5757
- executing=2.2.1=pyhd8ed1ab_0
5858
- fasteners=0.19=pyhd8ed1ab_1
59-
- fonttools=4.59.2=py311h3f79411_0
59+
- fonttools=4.60.0=py311h3f79411_0
6060
- fqdn=1.5.1=pyhd8ed1ab_1
6161
- freetype=2.14.1=h57928b3_0
6262
- fsspec=2025.9.0=pyhd8ed1ab_0
@@ -299,9 +299,9 @@ dependencies:
299299
- zstd=1.5.7=hbeecb71_2
300300
- pip:
301301
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773
302-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
302+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822
303303
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
304-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7da0cb45b4ff1213d1cca120773971aa8468a5c1
304+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64
305305

306306
variables:
307307
KMP_WARNINGS: 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies:
3232
- discretize=0.11.3=py311h9b10771_0
3333
- distributed=2025.3.0=pyhd8ed1ab_0
3434
- fasteners=0.19=pyhd8ed1ab_1
35-
- fonttools=4.59.2=py311h3f79411_0
35+
- fonttools=4.60.0=py311h3f79411_0
3636
- freetype=2.14.1=h57928b3_0
3737
- fsspec=2025.9.0=pyhd8ed1ab_0
3838
- geoana=0.7.2=py311h9b10771_0
@@ -157,9 +157,9 @@ dependencies:
157157
- zstd=1.5.7=hbeecb71_2
158158
- pip:
159159
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773
160-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
160+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822
161161
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
162-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7da0cb45b4ff1213d1cca120773971aa8468a5c1
162+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64
163163

164164
variables:
165165
KMP_WARNINGS: 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ dependencies:
5858
- exceptiongroup=1.3.0=pyhd8ed1ab_0
5959
- executing=2.2.1=pyhd8ed1ab_0
6060
- fasteners=0.19=pyhd8ed1ab_1
61-
- fonttools=4.59.2=py312h8a5da7c_0
61+
- fonttools=4.60.0=py312h8a5da7c_0
6262
- fqdn=1.5.1=pyhd8ed1ab_1
6363
- freetype=2.14.1=ha770c72_0
6464
- fsspec=2025.9.0=pyhd8ed1ab_0
@@ -312,9 +312,9 @@ dependencies:
312312
- zstd=1.5.7=hb8e6e7a_2
313313
- pip:
314314
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773
315-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
315+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822
316316
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
317-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7da0cb45b4ff1213d1cca120773971aa8468a5c1
317+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64
318318

319319
variables:
320320
KMP_WARNINGS: 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies:
3333
- discretize=0.11.3=py312hc39e661_0
3434
- distributed=2025.3.0=pyhd8ed1ab_0
3535
- fasteners=0.19=pyhd8ed1ab_1
36-
- fonttools=4.59.2=py312h8a5da7c_0
36+
- fonttools=4.60.0=py312h8a5da7c_0
3737
- freetype=2.14.1=ha770c72_0
3838
- fsspec=2025.9.0=pyhd8ed1ab_0
3939
- geoana=0.7.2=py312hc39e661_0
@@ -169,9 +169,9 @@ dependencies:
169169
- zstd=1.5.7=hb8e6e7a_2
170170
- pip:
171171
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@a91e9479d6e948728ad430e0db526c75013c9773
172-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@496248c06ecbc113df0f0b76e1afc4610c469bf5
172+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c39fbbaceb60a1d3e5a519826f3a59a908ec822
173173
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
174-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7da0cb45b4ff1213d1cca120773971aa8468a5c1
174+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@998d6f58198e4aff55a401e8a6545b93eb8bfd64
175175

176176
variables:
177177
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)