From 8a2f61680ac30ef309231311700113691fc18a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 17 Apr 2025 12:56:40 -0400 Subject: [PATCH 1/7] go easy on pylint max-args as long as not too-many-positional-arguments --- pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pylintrc b/pylintrc index 7ee0cda1..23e8e2db 100644 --- a/pylintrc +++ b/pylintrc @@ -355,7 +355,7 @@ exclude-too-few-public-methods= ignored-parents= # Maximum number of arguments for function / method. -max-args=6 +max-args=9 # as long as not hitting too-many-positional-arguments # Maximum number of attributes for a class (see R0902). max-attributes=15 From 7288d0ae41ac3df6b192b7bd109ddba1491e9a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 17 Apr 2025 13:21:22 -0400 Subject: [PATCH 2/7] [GEOPY-2141] correctly declare dask dependency for pip and dask-core for conda --- .../py-3.10-linux-64-dev.conda.lock.yml | 4 +-- environments/py-3.10-linux-64.conda.lock.yml | 5 ++-- .../py-3.10-win-64-dev.conda.lock.yml | 4 +-- environments/py-3.10-win-64.conda.lock.yml | 5 ++-- .../py-3.11-linux-64-dev.conda.lock.yml | 4 +-- environments/py-3.11-linux-64.conda.lock.yml | 5 ++-- .../py-3.11-win-64-dev.conda.lock.yml | 4 +-- environments/py-3.11-win-64.conda.lock.yml | 5 ++-- .../py-3.12-linux-64-dev.conda.lock.yml | 4 +-- environments/py-3.12-linux-64.conda.lock.yml | 4 +-- .../py-3.12-win-64-dev.conda.lock.yml | 4 +-- environments/py-3.12-win-64.conda.lock.yml | 4 +-- py-3.10.conda-lock.yml | 28 +++++++++---------- py-3.11.conda-lock.yml | 28 +++++++++---------- py-3.12.conda-lock.yml | 20 ++++++------- pyproject.toml | 7 ++++- recipe.yaml | 6 +--- 17 files changed, 73 insertions(+), 68 deletions(-) diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index 96dba2e6..81496fa6 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: bf3275537e5ecaf05c1984281f2fde8ab4042050416af17dce075452328e658d +# input_hash: 1058feab9cbae7f97fa8892c8b52e4358428b4c8c8727f34e560307d0a7f146b channels: - conda-forge @@ -303,7 +303,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index b4ef3189..90055093 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: bf3275537e5ecaf05c1984281f2fde8ab4042050416af17dce075452328e658d +# input_hash: 1058feab9cbae7f97fa8892c8b52e4358428b4c8c8727f34e560307d0a7f146b channels: - conda-forge @@ -40,6 +40,7 @@ dependencies: - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 + - importlib_metadata=8.6.1=hd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - keyutils=1.6.1=h166bdaf_0 @@ -155,7 +156,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index de223402..04eab68e 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: e7bc6ba0193fb36212cebeba8243e70ee2c0c8c368772456f1dad5c253e5f5b5 +# input_hash: 3eb894211f0447b50e940ab507354ca73405628ba79e422de74ccae4f2de5217 channels: - conda-forge @@ -294,7 +294,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 077c4bc0..26134616 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: e7bc6ba0193fb36212cebeba8243e70ee2c0c8c368772456f1dad5c253e5f5b5 +# input_hash: 3eb894211f0447b50e940ab507354ca73405628ba79e422de74ccae4f2de5217 channels: - conda-forge @@ -39,6 +39,7 @@ dependencies: - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 + - importlib_metadata=8.6.1=hd8ed1ab_0 - intel-openmp=2024.2.1=h57928b3_1083 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 @@ -144,7 +145,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index a637294d..75006cc6 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 8b265443dab30ad551824c6b1a148bd0dd8035f687125469ec0b8495cb8d13ef +# input_hash: 165713729a7490686c97160428f7200e968bd2be21e5a205095d6689087d6c83 channels: - conda-forge @@ -306,7 +306,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index eda4a425..c3b1024d 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 8b265443dab30ad551824c6b1a148bd0dd8035f687125469ec0b8495cb8d13ef +# input_hash: 165713729a7490686c97160428f7200e968bd2be21e5a205095d6689087d6c83 channels: - conda-forge @@ -41,6 +41,7 @@ dependencies: - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 + - importlib_metadata=8.6.1=hd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - keyutils=1.6.1=h166bdaf_0 @@ -157,7 +158,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index c8e9f8ef..02590517 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 6746234080fb492f036f680bcb88c659a2628254805462ff518405ebc4dc97ec +# input_hash: 261ca9b15cd02bce1a27c3012f0567fa725711fc8e49f750fe801305d738907a channels: - conda-forge @@ -297,7 +297,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index e4def3fb..7f19e6c6 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 6746234080fb492f036f680bcb88c659a2628254805462ff518405ebc4dc97ec +# input_hash: 261ca9b15cd02bce1a27c3012f0567fa725711fc8e49f750fe801305d738907a channels: - conda-forge @@ -40,6 +40,7 @@ dependencies: - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 + - importlib_metadata=8.6.1=hd8ed1ab_0 - intel-openmp=2024.2.1=h57928b3_1083 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 @@ -146,7 +147,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index bbb55741..f32dd855 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 1dc064917aeb518bbd08c7336c474da8966f79b47d704f7e17aa98ac37fee0d7 +# input_hash: 1591aead88ecd028462aadbf35e105044614ac28fd536f6335097aa17d26eb30 channels: - conda-forge @@ -306,7 +306,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 56b2b80c..013dad76 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 1dc064917aeb518bbd08c7336c474da8966f79b47d704f7e17aa98ac37fee0d7 +# input_hash: 1591aead88ecd028462aadbf35e105044614ac28fd536f6335097aa17d26eb30 channels: - conda-forge @@ -157,7 +157,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index 25445698..f58d5f0b 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 40c9d8260ef2ad818f7a0dad316494f49066c56bbffb2b257d078263c4ea329f +# input_hash: 70329e0f3db920a6991911545228690085ba970782c9e7368b93f64ae6b52eb3 channels: - conda-forge @@ -297,7 +297,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index aca3412e..002a9491 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 40c9d8260ef2ad818f7a0dad316494f49066c56bbffb2b257d078263c4ea329f +# input_hash: 70329e0f3db920a6991911545228690085ba970782c9e7368b93f64ae6b52eb3 channels: - conda-forge @@ -146,7 +146,7 @@ dependencies: - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + - octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c variables: diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 0c167963..1018f97d 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: e7bc6ba0193fb36212cebeba8243e70ee2c0c8c368772456f1dad5c253e5f5b5 - linux-64: bf3275537e5ecaf05c1984281f2fde8ab4042050416af17dce075452328e658d + win-64: 3eb894211f0447b50e940ab507354ca73405628ba79e422de74ccae4f2de5217 + linux-64: 1058feab9cbae7f97fa8892c8b52e4358428b4c8c8727f34e560307d0a7f146b channels: - url: conda-forge used_env_vars: [] @@ -1924,8 +1924,8 @@ package: hash: md5: 7f46575a91b1307441abc235d01cab66 sha256: 1e3eb9d65c4d7b87c7347553ef9eef6f994996f90a2299e19b35f5997d3a3e79 - category: dev - optional: true + category: main + optional: false - name: importlib_metadata version: 8.6.1 manager: conda @@ -1936,8 +1936,8 @@ package: hash: md5: 7f46575a91b1307441abc235d01cab66 sha256: 1e3eb9d65c4d7b87c7347553ef9eef6f994996f90a2299e19b35f5997d3a3e79 - category: dev - optional: true + category: main + optional: false - name: importlib_resources version: 6.5.2 manager: conda @@ -8524,35 +8524,35 @@ package: category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0a2 manager: pip platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 + geoapps-utils: '>=0.5.0a3,<0.6.dev' geoh5py: '>=0.11.0a3,<0.12.dev' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.1/octree_creation_app-0.3.0a1-py3-none-any.whl + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.2/octree_creation_app-0.3.0a2-py3-none-any.whl hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0a2 manager: pip platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 + geoapps-utils: '>=0.5.0a3,<0.6.dev' geoh5py: '>=0.11.0a3,<0.12.dev' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.1/octree_creation_app-0.3.0a1-py3-none-any.whl + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.2/octree_creation_app-0.3.0a2-py3-none-any.whl hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff category: main optional: false - name: param-sweeps diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 68334bcf..5d27d4df 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 6746234080fb492f036f680bcb88c659a2628254805462ff518405ebc4dc97ec - linux-64: 8b265443dab30ad551824c6b1a148bd0dd8035f687125469ec0b8495cb8d13ef + win-64: 261ca9b15cd02bce1a27c3012f0567fa725711fc8e49f750fe801305d738907a + linux-64: 165713729a7490686c97160428f7200e968bd2be21e5a205095d6689087d6c83 channels: - url: conda-forge used_env_vars: [] @@ -1948,8 +1948,8 @@ package: hash: md5: 7f46575a91b1307441abc235d01cab66 sha256: 1e3eb9d65c4d7b87c7347553ef9eef6f994996f90a2299e19b35f5997d3a3e79 - category: dev - optional: true + category: main + optional: false - name: importlib_metadata version: 8.6.1 manager: conda @@ -1960,8 +1960,8 @@ package: hash: md5: 7f46575a91b1307441abc235d01cab66 sha256: 1e3eb9d65c4d7b87c7347553ef9eef6f994996f90a2299e19b35f5997d3a3e79 - category: dev - optional: true + category: main + optional: false - name: importlib_resources version: 6.5.2 manager: conda @@ -8609,35 +8609,35 @@ package: category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0a2 manager: pip platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 + geoapps-utils: '>=0.5.0a3,<0.6.dev' geoh5py: '>=0.11.0a3,<0.12.dev' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.1/octree_creation_app-0.3.0a1-py3-none-any.whl + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.2/octree_creation_app-0.3.0a2-py3-none-any.whl hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0a2 manager: pip platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 + geoapps-utils: '>=0.5.0a3,<0.6.dev' geoh5py: '>=0.11.0a3,<0.12.dev' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.1/octree_creation_app-0.3.0a1-py3-none-any.whl + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.2/octree_creation_app-0.3.0a2-py3-none-any.whl hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff category: main optional: false - name: param-sweeps diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index ade1f424..6c288c34 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 40c9d8260ef2ad818f7a0dad316494f49066c56bbffb2b257d078263c4ea329f - linux-64: 1dc064917aeb518bbd08c7336c474da8966f79b47d704f7e17aa98ac37fee0d7 + win-64: 70329e0f3db920a6991911545228690085ba970782c9e7368b93f64ae6b52eb3 + linux-64: 1591aead88ecd028462aadbf35e105044614ac28fd536f6335097aa17d26eb30 channels: - url: conda-forge used_env_vars: [] @@ -8607,35 +8607,35 @@ package: category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0a2 manager: pip platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 + geoapps-utils: '>=0.5.0a3,<0.6.dev' geoh5py: '>=0.11.0a3,<0.12.dev' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.1/octree_creation_app-0.3.0a1-py3-none-any.whl + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.2/octree_creation_app-0.3.0a2-py3-none-any.whl hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0a2 manager: pip platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 + geoapps-utils: '>=0.5.0a3,<0.6.dev' geoh5py: '>=0.11.0a3,<0.12.dev' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.1/octree_creation_app-0.3.0a1-py3-none-any.whl + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/octree-creation-app/0.3.0-alpha.2/octree_creation_app-0.3.0a2-py3-none-any.whl hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff category: main optional: false - name: param-sweeps diff --git a/pyproject.toml b/pyproject.toml index 581b4577..85c4a344 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,9 @@ include = [ [tool.poetry.dependencies] python = "^3.10" -dask-core = "2025.3.*" # also in simpeg[dask] +# (dask also in conda-lock section to tell conda to install with no extras) +dask = {version = "2025.3.*", source = "pypi"} # also in simpeg[dask] + discretize = "0.11.*" # also in simpeg, octree-creation-app distributed = "2025.3.*" # conda needs explicit dask-core etc for equivalent dask[distributed] numpy = "~1.26.0" # also in geoh5py, simpeg @@ -91,6 +93,9 @@ nbconvert = "~7.16.4" platforms = ['win-64', 'linux-64'] channels = ['conda-forge'] +# this is how to tell conda to take dask with no extras +dask-core = ">=2025.3.0, <2025.4.dev" # also in simpeg[dask] + [tool.conda-lock.dependencies] libblas = "*=*mkl" # because simpeg already brings in the MKL diff --git a/recipe.yaml b/recipe.yaml index 98400c03..45eea769 100644 --- a/recipe.yaml +++ b/recipe.yaml @@ -60,11 +60,7 @@ tests: - geoh5py - dask - distributed - - # `pip check` fails on missing dask-core because it only sees name 'dask' - # Possibly, use custom mapping for dask => dask-core - # See `conda-lock --pypi_to_conda_lookup_file`, or the `pixi` option "conda-pypi-map" - pip_check: false + pip_check: true - script: - pytest --ignore=tests/version_test.py From fdd105fe07180717c9bfaca7365fa6dfd61bc2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 17 Apr 2025 14:19:12 -0400 Subject: [PATCH 3/7] bump version to alpha.4 --- pyproject.toml | 2 +- recipe.yaml | 2 +- simpeg_drivers/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 85c4a344..84280574 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "simpeg-drivers" -version = "0.3.0-alpha.3" +version = "0.3.0-alpha.4" description = "Application to run SimPEG inversions with geoh5 files from Geoscience Analyst." license = "MIT" authors = ["Mira Geoscience "] diff --git a/recipe.yaml b/recipe.yaml index 45eea769..55bf1b94 100644 --- a/recipe.yaml +++ b/recipe.yaml @@ -2,7 +2,7 @@ schema_version: 1 context: name: "simpeg-drivers" - version: "0.3.0a3" + version: "0.3.0a4" python_min: "3.10" package: diff --git a/simpeg_drivers/__init__.py b/simpeg_drivers/__init__.py index 672ce2f4..f15ba532 100644 --- a/simpeg_drivers/__init__.py +++ b/simpeg_drivers/__init__.py @@ -12,7 +12,7 @@ from __future__ import annotations -__version__ = "0.3.0-alpha.3" +__version__ = "0.3.0-alpha.4" import logging From d7be108230ff211a96e47ae33a7e4f8e64686f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 17 Apr 2025 23:51:10 -0400 Subject: [PATCH 4/7] [GEOPY-2141] relock not to have dask from pypi --- .../py-3.10-linux-64-dev.conda.lock.yml | 5 +- environments/py-3.10-linux-64.conda.lock.yml | 6 +- .../py-3.10-win-64-dev.conda.lock.yml | 5 +- environments/py-3.10-win-64.conda.lock.yml | 6 +- .../py-3.11-linux-64-dev.conda.lock.yml | 5 +- environments/py-3.11-linux-64.conda.lock.yml | 6 +- .../py-3.11-win-64-dev.conda.lock.yml | 5 +- environments/py-3.11-win-64.conda.lock.yml | 6 +- .../py-3.12-linux-64-dev.conda.lock.yml | 5 +- environments/py-3.12-linux-64.conda.lock.yml | 5 +- .../py-3.12-win-64-dev.conda.lock.yml | 5 +- environments/py-3.12-win-64.conda.lock.yml | 5 +- py-3.10.conda-lock.yml | 64 ++++--------------- py-3.11.conda-lock.yml | 64 ++++--------------- py-3.12.conda-lock.yml | 54 +++------------- pyproject.toml | 9 +-- 16 files changed, 65 insertions(+), 190 deletions(-) diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index 81496fa6..538d374a 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 1058feab9cbae7f97fa8892c8b52e4358428b4c8c8727f34e560307d0a7f146b +# input_hash: 56e602b8af1ebc1738ca576ebfcf93cddf7a032057e30ac11481638bad29d0fc channels: - conda-forge @@ -148,7 +148,7 @@ dependencies: - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h89163eb_1 @@ -299,7 +299,6 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 90055093..37f10f3a 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 1058feab9cbae7f97fa8892c8b52e4358428b4c8c8727f34e560307d0a7f146b +# input_hash: 56e602b8af1ebc1738ca576ebfcf93cddf7a032057e30ac11481638bad29d0fc channels: - conda-forge @@ -40,7 +40,6 @@ dependencies: - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 - - importlib_metadata=8.6.1=hd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - keyutils=1.6.1=h166bdaf_0 @@ -86,7 +85,7 @@ dependencies: - libxcrypt=4.4.36=hd590300_1 - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h89163eb_1 - matplotlib-base=3.8.4=py310hef631a5_2 @@ -152,7 +151,6 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index 04eab68e..d564df06 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 3eb894211f0447b50e940ab507354ca73405628ba79e422de74ccae4f2de5217 +# input_hash: 0681861d5a6c60889d2f28e2c3b2d4398eb25111cff948d5b1597467d9b4bf88 channels: - conda-forge @@ -137,7 +137,7 @@ dependencies: - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h38315fa_1 @@ -290,7 +290,6 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 26134616..bcc26356 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 3eb894211f0447b50e940ab507354ca73405628ba79e422de74ccae4f2de5217 +# input_hash: 0681861d5a6c60889d2f28e2c3b2d4398eb25111cff948d5b1597467d9b4bf88 channels: - conda-forge @@ -39,7 +39,6 @@ dependencies: - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 - - importlib_metadata=8.6.1=hd8ed1ab_0 - intel-openmp=2024.2.1=h57928b3_1083 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 @@ -74,7 +73,7 @@ dependencies: - libxcb=1.17.0=h0e4246c_0 - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h38315fa_1 - matplotlib-base=3.8.4=py310hadb10a8_2 @@ -141,7 +140,6 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index 75006cc6..59f580cf 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 165713729a7490686c97160428f7200e968bd2be21e5a205095d6689087d6c83 +# input_hash: b288805da85e1c40b219f529fb90235726011f92f84617c5c31e8c0809ba537c channels: - conda-forge @@ -150,7 +150,7 @@ dependencies: - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h2dc5d0c_1 @@ -302,7 +302,6 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index c3b1024d..44fd9916 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 165713729a7490686c97160428f7200e968bd2be21e5a205095d6689087d6c83 +# input_hash: b288805da85e1c40b219f529fb90235726011f92f84617c5c31e8c0809ba537c channels: - conda-forge @@ -41,7 +41,6 @@ dependencies: - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 - - importlib_metadata=8.6.1=hd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - keyutils=1.6.1=h166bdaf_0 @@ -87,7 +86,7 @@ dependencies: - libxcrypt=4.4.36=hd590300_1 - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h2dc5d0c_1 - matplotlib-base=3.8.4=py311ha4ca890_2 @@ -154,7 +153,6 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index 02590517..e84cd841 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 261ca9b15cd02bce1a27c3012f0567fa725711fc8e49f750fe801305d738907a +# input_hash: 3a4998ff76243a1b66e35ac77261e40082b6e9abf541529ddf66854d819bdf5c channels: - conda-forge @@ -139,7 +139,7 @@ dependencies: - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h5082efb_1 @@ -293,7 +293,6 @@ dependencies: - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 7f19e6c6..24bf913f 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 261ca9b15cd02bce1a27c3012f0567fa725711fc8e49f750fe801305d738907a +# input_hash: 3a4998ff76243a1b66e35ac77261e40082b6e9abf541529ddf66854d819bdf5c channels: - conda-forge @@ -40,7 +40,6 @@ dependencies: - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 - - importlib_metadata=8.6.1=hd8ed1ab_0 - intel-openmp=2024.2.1=h57928b3_1083 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 @@ -75,7 +74,7 @@ dependencies: - libxcb=1.17.0=h0e4246c_0 - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h5082efb_1 - matplotlib-base=3.8.4=py311h9b31f6e_2 @@ -143,7 +142,6 @@ dependencies: - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index f32dd855..73208bb9 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 1591aead88ecd028462aadbf35e105044614ac28fd536f6335097aa17d26eb30 +# input_hash: ad9ad95bb8f808d4a78fa59bbf06f24e16171bcce57cb9ddc5bae4b57801aff2 channels: - conda-forge @@ -150,7 +150,7 @@ dependencies: - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h178313f_1 @@ -302,7 +302,6 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 013dad76..5402ecd9 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 1591aead88ecd028462aadbf35e105044614ac28fd536f6335097aa17d26eb30 +# input_hash: ad9ad95bb8f808d4a78fa59bbf06f24e16171bcce57cb9ddc5bae4b57801aff2 channels: - conda-forge @@ -86,7 +86,7 @@ dependencies: - libxcrypt=4.4.36=hd590300_1 - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h178313f_1 - matplotlib-base=3.8.4=py312h20ab3a6_2 @@ -153,7 +153,6 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index f58d5f0b..b4acfbcd 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 70329e0f3db920a6991911545228690085ba970782c9e7368b93f64ae6b52eb3 +# input_hash: a0d57351cb04d3f07db9d3f851eb726f0a2fe600f079ad0f1fa01c17eb0cb8b0 channels: - conda-forge @@ -139,7 +139,7 @@ dependencies: - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h31fea79_1 @@ -293,7 +293,6 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_1 - zstd=1.5.7=hbeecb71_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 002a9491..da37d0db 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 70329e0f3db920a6991911545228690085ba970782c9e7368b93f64ae6b52eb3 +# input_hash: a0d57351cb04d3f07db9d3f851eb726f0a2fe600f079ad0f1fa01c17eb0cb8b0 channels: - conda-forge @@ -74,7 +74,7 @@ dependencies: - libxcb=1.17.0=h0e4246c_0 - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h31fea79_1 - matplotlib-base=3.8.4=py312hfee7060_2 @@ -142,7 +142,6 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_1 - zstd=1.5.7=hbeecb71_2 - pip: - - dask == 2025.3.0 --hash=sha256:b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c - geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6 - mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 1018f97d..0de7f61c 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 3eb894211f0447b50e940ab507354ca73405628ba79e422de74ccae4f2de5217 - linux-64: 1058feab9cbae7f97fa8892c8b52e4358428b4c8c8727f34e560307d0a7f146b + win-64: 0681861d5a6c60889d2f28e2c3b2d4398eb25111cff948d5b1597467d9b4bf88 + linux-64: 56e602b8af1ebc1738ca576ebfcf93cddf7a032057e30ac11481638bad29d0fc channels: - url: conda-forge used_env_vars: [] @@ -1924,8 +1924,8 @@ package: hash: md5: 7f46575a91b1307441abc235d01cab66 sha256: 1e3eb9d65c4d7b87c7347553ef9eef6f994996f90a2299e19b35f5997d3a3e79 - category: main - optional: false + category: dev + optional: true - name: importlib_metadata version: 8.6.1 manager: conda @@ -1936,8 +1936,8 @@ package: hash: md5: 7f46575a91b1307441abc235d01cab66 sha256: 1e3eb9d65c4d7b87c7347553ef9eef6f994996f90a2299e19b35f5997d3a3e79 - category: main - optional: false + category: dev + optional: true - name: importlib_resources version: 6.5.2 manager: conda @@ -4062,29 +4062,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_1.conda + url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.3-h024ca30_0.conda hash: - md5: 39a3992c2624b8d8e6b4994dedf3102a - sha256: 2c70e18a5bcb3fc2925e5d2c2c39559253d19e38c111afc91885f0dee4540fb1 + md5: c721339ea8746513e42b1233b4bbdfb0 + sha256: 4327a463f43b0d95ca0e5f92094383ef53fd2a91d649debfc531b941fe44fd48 category: main optional: false - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_1.conda + url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.3-h30eaf37_0.conda hash: - md5: d5a4f53b65d7d1d53104ba24107eda04 - sha256: 3ba2b892d6e153599512fa7fe2791125ff1b7dd6740469f74aff2d1b48edf299 + md5: 183c102075722a7aa993f94de1d135f2 + sha256: 27326e733ce7ad87054a409c02b829594cc6276232b987eb135cd1a225eac669 category: main optional: false - name: locket @@ -8389,42 +8389,6 @@ package: sha256: bc64864377d809b904e877a98d0584f43836c9f2ef27d3d2a1421fa6eae7ca04 category: main optional: false -- name: dask - version: 2025.3.0 - manager: pip - platform: linux-64 - dependencies: - click: '>=8.1' - cloudpickle: '>=3.0.0' - fsspec: '>=2021.09.0' - importlib-metadata: '>=4.13.0' - packaging: '>=20.0' - partd: '>=1.4.0' - pyyaml: '>=5.3.1' - toolz: '>=0.10.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/packages/packages/bd/8a/3609033a4bfd7c9b3e8a4e8a5d6e318dfc06ab2e2d3b5cb0e01a60458858/dask-2025.3.0-py3-none-any.whl - hash: - sha256: b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - category: main - optional: false -- name: dask - version: 2025.3.0 - manager: pip - platform: win-64 - dependencies: - click: '>=8.1' - cloudpickle: '>=3.0.0' - fsspec: '>=2021.09.0' - importlib-metadata: '>=4.13.0' - packaging: '>=20.0' - partd: '>=1.4.0' - pyyaml: '>=5.3.1' - toolz: '>=0.10.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/packages/packages/bd/8a/3609033a4bfd7c9b3e8a4e8a5d6e318dfc06ab2e2d3b5cb0e01a60458858/dask-2025.3.0-py3-none-any.whl - hash: - sha256: b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - category: main - optional: false - name: geoapps-utils version: 0.5.0a3 manager: pip diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 5d27d4df..615778f9 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 261ca9b15cd02bce1a27c3012f0567fa725711fc8e49f750fe801305d738907a - linux-64: 165713729a7490686c97160428f7200e968bd2be21e5a205095d6689087d6c83 + win-64: 3a4998ff76243a1b66e35ac77261e40082b6e9abf541529ddf66854d819bdf5c + linux-64: b288805da85e1c40b219f529fb90235726011f92f84617c5c31e8c0809ba537c channels: - url: conda-forge used_env_vars: [] @@ -1948,8 +1948,8 @@ package: hash: md5: 7f46575a91b1307441abc235d01cab66 sha256: 1e3eb9d65c4d7b87c7347553ef9eef6f994996f90a2299e19b35f5997d3a3e79 - category: main - optional: false + category: dev + optional: true - name: importlib_metadata version: 8.6.1 manager: conda @@ -1960,8 +1960,8 @@ package: hash: md5: 7f46575a91b1307441abc235d01cab66 sha256: 1e3eb9d65c4d7b87c7347553ef9eef6f994996f90a2299e19b35f5997d3a3e79 - category: main - optional: false + category: dev + optional: true - name: importlib_resources version: 6.5.2 manager: conda @@ -4114,29 +4114,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_1.conda + url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.3-h024ca30_0.conda hash: - md5: 39a3992c2624b8d8e6b4994dedf3102a - sha256: 2c70e18a5bcb3fc2925e5d2c2c39559253d19e38c111afc91885f0dee4540fb1 + md5: c721339ea8746513e42b1233b4bbdfb0 + sha256: 4327a463f43b0d95ca0e5f92094383ef53fd2a91d649debfc531b941fe44fd48 category: main optional: false - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_1.conda + url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.3-h30eaf37_0.conda hash: - md5: d5a4f53b65d7d1d53104ba24107eda04 - sha256: 3ba2b892d6e153599512fa7fe2791125ff1b7dd6740469f74aff2d1b48edf299 + md5: 183c102075722a7aa993f94de1d135f2 + sha256: 27326e733ce7ad87054a409c02b829594cc6276232b987eb135cd1a225eac669 category: main optional: false - name: locket @@ -8474,42 +8474,6 @@ package: sha256: bc64864377d809b904e877a98d0584f43836c9f2ef27d3d2a1421fa6eae7ca04 category: main optional: false -- name: dask - version: 2025.3.0 - manager: pip - platform: linux-64 - dependencies: - click: '>=8.1' - cloudpickle: '>=3.0.0' - fsspec: '>=2021.09.0' - importlib-metadata: '>=4.13.0' - packaging: '>=20.0' - partd: '>=1.4.0' - pyyaml: '>=5.3.1' - toolz: '>=0.10.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/packages/packages/bd/8a/3609033a4bfd7c9b3e8a4e8a5d6e318dfc06ab2e2d3b5cb0e01a60458858/dask-2025.3.0-py3-none-any.whl - hash: - sha256: b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - category: main - optional: false -- name: dask - version: 2025.3.0 - manager: pip - platform: win-64 - dependencies: - click: '>=8.1' - cloudpickle: '>=3.0.0' - fsspec: '>=2021.09.0' - importlib-metadata: '>=4.13.0' - packaging: '>=20.0' - partd: '>=1.4.0' - pyyaml: '>=5.3.1' - toolz: '>=0.10.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/packages/packages/bd/8a/3609033a4bfd7c9b3e8a4e8a5d6e318dfc06ab2e2d3b5cb0e01a60458858/dask-2025.3.0-py3-none-any.whl - hash: - sha256: b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - category: main - optional: false - name: geoapps-utils version: 0.5.0a3 manager: pip diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 6c288c34..19a71359 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 70329e0f3db920a6991911545228690085ba970782c9e7368b93f64ae6b52eb3 - linux-64: 1591aead88ecd028462aadbf35e105044614ac28fd536f6335097aa17d26eb30 + win-64: a0d57351cb04d3f07db9d3f851eb726f0a2fe600f079ad0f1fa01c17eb0cb8b0 + linux-64: ad9ad95bb8f808d4a78fa59bbf06f24e16171bcce57cb9ddc5bae4b57801aff2 channels: - url: conda-forge used_env_vars: [] @@ -4114,29 +4114,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_1.conda + url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.3-h024ca30_0.conda hash: - md5: 39a3992c2624b8d8e6b4994dedf3102a - sha256: 2c70e18a5bcb3fc2925e5d2c2c39559253d19e38c111afc91885f0dee4540fb1 + md5: c721339ea8746513e42b1233b4bbdfb0 + sha256: 4327a463f43b0d95ca0e5f92094383ef53fd2a91d649debfc531b941fe44fd48 category: main optional: false - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_1.conda + url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.3-h30eaf37_0.conda hash: - md5: d5a4f53b65d7d1d53104ba24107eda04 - sha256: 3ba2b892d6e153599512fa7fe2791125ff1b7dd6740469f74aff2d1b48edf299 + md5: 183c102075722a7aa993f94de1d135f2 + sha256: 27326e733ce7ad87054a409c02b829594cc6276232b987eb135cd1a225eac669 category: main optional: false - name: locket @@ -8474,40 +8474,6 @@ package: sha256: bc64864377d809b904e877a98d0584f43836c9f2ef27d3d2a1421fa6eae7ca04 category: main optional: false -- name: dask - version: 2025.3.0 - manager: pip - platform: linux-64 - dependencies: - click: '>=8.1' - cloudpickle: '>=3.0.0' - fsspec: '>=2021.09.0' - packaging: '>=20.0' - partd: '>=1.4.0' - pyyaml: '>=5.3.1' - toolz: '>=0.10.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/packages/packages/bd/8a/3609033a4bfd7c9b3e8a4e8a5d6e318dfc06ab2e2d3b5cb0e01a60458858/dask-2025.3.0-py3-none-any.whl - hash: - sha256: b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - category: main - optional: false -- name: dask - version: 2025.3.0 - manager: pip - platform: win-64 - dependencies: - click: '>=8.1' - cloudpickle: '>=3.0.0' - fsspec: '>=2021.09.0' - packaging: '>=20.0' - partd: '>=1.4.0' - pyyaml: '>=5.3.1' - toolz: '>=0.10.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/packages/packages/bd/8a/3609033a4bfd7c9b3e8a4e8a5d6e318dfc06ab2e2d3b5cb0e01a60458858/dask-2025.3.0-py3-none-any.whl - hash: - sha256: b5d72bb33788904a218fd7da1850238517592358ecc79c30bb5c188a71df506d - category: main - optional: false - name: geoapps-utils version: 0.5.0a3 manager: pip diff --git a/pyproject.toml b/pyproject.toml index 84280574..d1b45f4b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,11 +30,11 @@ include = [ [tool.poetry.dependencies] python = "^3.10" -# (dask also in conda-lock section to tell conda to install with no extras) -dask = {version = "2025.3.*", source = "pypi"} # also in simpeg[dask] +# note: py-deps-clock defines custom mapping from dask to dask-core +dask = ">=2025.3, <2025.4.dev" # also in simpeg[dask] discretize = "0.11.*" # also in simpeg, octree-creation-app -distributed = "2025.3.*" # conda needs explicit dask-core etc for equivalent dask[distributed] +distributed = ">=2025.3, <2025.4.dev" # for dask[distributed] numpy = "~1.26.0" # also in geoh5py, simpeg pydantic = "^2.5.2" # also in geoh5py, curve-apps, geoapps-utils scikit-learn = "~1.4.0" @@ -93,9 +93,6 @@ nbconvert = "~7.16.4" platforms = ['win-64', 'linux-64'] channels = ['conda-forge'] -# this is how to tell conda to take dask with no extras -dask-core = ">=2025.3.0, <2025.4.dev" # also in simpeg[dask] - [tool.conda-lock.dependencies] libblas = "*=*mkl" # because simpeg already brings in the MKL From 657c0c4fca03afc1e102e7fb692d6187dcce6108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 17 Apr 2025 23:51:44 -0400 Subject: [PATCH 5/7] [GEOPY-2141] add link to repo, homepage and doc in the Conda recipe --- recipe.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe.yaml b/recipe.yaml index 55bf1b94..4cae6ce1 100644 --- a/recipe.yaml +++ b/recipe.yaml @@ -75,8 +75,10 @@ tests: about: license: MIT - license_file: - - LICENSE + license_file: LICENSE + homepage: https://www.mirageoscience.com/mining-industry-software/python-integration/ + repository: https://github.com/MiraGeoscience/simpeg-drivers + documentation: https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/ extra: recipe-maintainers: From 3bb32dbdb5ca5c42974fcbb1c7097645ee980714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Fri, 18 Apr 2025 13:51:58 -0400 Subject: [PATCH 6/7] bump version to alpha.5 --- pyproject.toml | 2 +- recipe.yaml | 2 +- simpeg_drivers/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d1b45f4b..41620ba8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "simpeg-drivers" -version = "0.3.0-alpha.4" +version = "0.3.0-alpha.5" description = "Application to run SimPEG inversions with geoh5 files from Geoscience Analyst." license = "MIT" authors = ["Mira Geoscience "] diff --git a/recipe.yaml b/recipe.yaml index 4cae6ce1..fb8d18f4 100644 --- a/recipe.yaml +++ b/recipe.yaml @@ -2,7 +2,7 @@ schema_version: 1 context: name: "simpeg-drivers" - version: "0.3.0a4" + version: "0.3.0a5" python_min: "3.10" package: diff --git a/simpeg_drivers/__init__.py b/simpeg_drivers/__init__.py index f15ba532..7de256ac 100644 --- a/simpeg_drivers/__init__.py +++ b/simpeg_drivers/__init__.py @@ -12,7 +12,7 @@ from __future__ import annotations -__version__ = "0.3.0-alpha.4" +__version__ = "0.3.0-alpha.5" import logging From 0b3ab84400506c12658cdca52878c8bfb6c03339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Fri, 18 Apr 2025 14:19:43 -0400 Subject: [PATCH 7/7] [GEOPY-2049] relock env --- .../py-3.10-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.10-linux-64.conda.lock.yml | 4 ++-- .../py-3.10-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.10-win-64.conda.lock.yml | 4 ++-- .../py-3.11-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.11-linux-64.conda.lock.yml | 4 ++-- .../py-3.11-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.11-win-64.conda.lock.yml | 4 ++-- .../py-3.12-linux-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-linux-64.conda.lock.yml | 4 ++-- .../py-3.12-win-64-dev.conda.lock.yml | 4 ++-- environments/py-3.12-win-64.conda.lock.yml | 4 ++-- py-3.10.conda-lock.yml | 20 +++++++++---------- py-3.11.conda-lock.yml | 20 +++++++++---------- py-3.12.conda-lock.yml | 20 +++++++++---------- 15 files changed, 54 insertions(+), 54 deletions(-) diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index a827935f..7d93e681 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: a2cabf95bacbfd8bb5d66336f2fc65ab4b93835b9bef2e05f11dc76ab05735ee +# input_hash: d20cb4f62773f79495ca5432e662a34453afa41e6084f06c349fbb84600a44bb channels: - conda-forge @@ -148,7 +148,7 @@ dependencies: - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h89163eb_1 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 1c283e12..1189d40b 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: a2cabf95bacbfd8bb5d66336f2fc65ab4b93835b9bef2e05f11dc76ab05735ee +# input_hash: d20cb4f62773f79495ca5432e662a34453afa41e6084f06c349fbb84600a44bb channels: - conda-forge @@ -85,7 +85,7 @@ dependencies: - libxcrypt=4.4.36=hd590300_1 - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h89163eb_1 - matplotlib-base=3.8.4=py310hef631a5_2 diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index 018f52ad..fabbde52 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: ec72eab9be00c6979c74796870e2eaa91e103fd1d842d4500d117273ba4dafb3 +# input_hash: eaae335cf36adc80372dc46b8513b3371068cb4b78164f9bf33218ae884e5a43 channels: - conda-forge @@ -137,7 +137,7 @@ dependencies: - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h38315fa_1 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index ede46386..363a7dd3 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: ec72eab9be00c6979c74796870e2eaa91e103fd1d842d4500d117273ba4dafb3 +# input_hash: eaae335cf36adc80372dc46b8513b3371068cb4b78164f9bf33218ae884e5a43 channels: - conda-forge @@ -73,7 +73,7 @@ dependencies: - libxcb=1.17.0=h0e4246c_0 - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h38315fa_1 - matplotlib-base=3.8.4=py310hadb10a8_2 diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index 2e4a294d..3399240d 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 46d7afdeb5add5b5662d343add0729699b5b974363284a7a28caf6c32087c650 +# input_hash: c83206a2eacb4c3e0efe0aa15f924d81adc9fe1f02d077a12434b468bb2045e6 channels: - conda-forge @@ -150,7 +150,7 @@ dependencies: - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h2dc5d0c_1 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index dfbf4910..8d608346 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 46d7afdeb5add5b5662d343add0729699b5b974363284a7a28caf6c32087c650 +# input_hash: c83206a2eacb4c3e0efe0aa15f924d81adc9fe1f02d077a12434b468bb2045e6 channels: - conda-forge @@ -86,7 +86,7 @@ dependencies: - libxcrypt=4.4.36=hd590300_1 - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h2dc5d0c_1 - matplotlib-base=3.8.4=py311ha4ca890_2 diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index 75393a15..380bb268 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: f482900cbfe344b8756276d846dfd524d787c9d1087262096487976a618ab091 +# input_hash: 2d7c4e988ae2df2fbd8349e86ba264f7eb281505021cebbdb8d9a2d3b0dda7ad channels: - conda-forge @@ -139,7 +139,7 @@ dependencies: - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h5082efb_1 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index c324b35d..ceb43abb 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: f482900cbfe344b8756276d846dfd524d787c9d1087262096487976a618ab091 +# input_hash: 2d7c4e988ae2df2fbd8349e86ba264f7eb281505021cebbdb8d9a2d3b0dda7ad channels: - conda-forge @@ -74,7 +74,7 @@ dependencies: - libxcb=1.17.0=h0e4246c_0 - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h5082efb_1 - matplotlib-base=3.8.4=py311h9b31f6e_2 diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index b3c59a9b..69d8a433 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 05900a15d902cd9ad1ad3f1d88b70ed5a188e17024ee606718394727d58b10e6 +# input_hash: 86d8c36c4b440eac7a217d19ba6775b033719c3606e19d205f30e9bf039ae01e channels: - conda-forge @@ -150,7 +150,7 @@ dependencies: - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h178313f_1 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 9b55d820..7893b9f8 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 05900a15d902cd9ad1ad3f1d88b70ed5a188e17024ee606718394727d58b10e6 +# input_hash: 86d8c36c4b440eac7a217d19ba6775b033719c3606e19d205f30e9bf039ae01e channels: - conda-forge @@ -86,7 +86,7 @@ dependencies: - libxcrypt=4.4.36=hd590300_1 - libxml2=2.13.7=h81593ed_1 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=20.1.2=h024ca30_1 + - llvm-openmp=20.1.3=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h178313f_1 - matplotlib-base=3.8.4=py312h20ab3a6_2 diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index 40e528d3..b0b32e67 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 5a7e9e19b107ad74fd7af8b2d1f69ae9733a547063210391aee8c497f0a7962c +# input_hash: dd5f3d6403d5db52a5e41fb35b60dce2df1a615f984bba47e191a2a14a68dd3c channels: - conda-forge @@ -139,7 +139,7 @@ dependencies: - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h31fea79_1 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 14cb321c..0ca0253d 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 5a7e9e19b107ad74fd7af8b2d1f69ae9733a547063210391aee8c497f0a7962c +# input_hash: dd5f3d6403d5db52a5e41fb35b60dce2df1a615f984bba47e191a2a14a68dd3c channels: - conda-forge @@ -74,7 +74,7 @@ dependencies: - libxcb=1.17.0=h0e4246c_0 - libxml2=2.13.7=h442d1da_1 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.2=h30eaf37_1 + - llvm-openmp=20.1.3=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h31fea79_1 - matplotlib-base=3.8.4=py312hfee7060_2 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 8df2190e..5ec7e04c 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: ec72eab9be00c6979c74796870e2eaa91e103fd1d842d4500d117273ba4dafb3 - linux-64: a2cabf95bacbfd8bb5d66336f2fc65ab4b93835b9bef2e05f11dc76ab05735ee + win-64: eaae335cf36adc80372dc46b8513b3371068cb4b78164f9bf33218ae884e5a43 + linux-64: d20cb4f62773f79495ca5432e662a34453afa41e6084f06c349fbb84600a44bb channels: - url: conda-forge used_env_vars: [] @@ -4062,29 +4062,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_1.conda + url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.3-h024ca30_0.conda hash: - md5: 39a3992c2624b8d8e6b4994dedf3102a - sha256: 2c70e18a5bcb3fc2925e5d2c2c39559253d19e38c111afc91885f0dee4540fb1 + md5: c721339ea8746513e42b1233b4bbdfb0 + sha256: 4327a463f43b0d95ca0e5f92094383ef53fd2a91d649debfc531b941fe44fd48 category: main optional: false - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_1.conda + url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.3-h30eaf37_0.conda hash: - md5: d5a4f53b65d7d1d53104ba24107eda04 - sha256: 3ba2b892d6e153599512fa7fe2791125ff1b7dd6740469f74aff2d1b48edf299 + md5: 183c102075722a7aa993f94de1d135f2 + sha256: 27326e733ce7ad87054a409c02b829594cc6276232b987eb135cd1a225eac669 category: main optional: false - name: locket diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index e387c1d1..55685d21 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: f482900cbfe344b8756276d846dfd524d787c9d1087262096487976a618ab091 - linux-64: 46d7afdeb5add5b5662d343add0729699b5b974363284a7a28caf6c32087c650 + win-64: 2d7c4e988ae2df2fbd8349e86ba264f7eb281505021cebbdb8d9a2d3b0dda7ad + linux-64: c83206a2eacb4c3e0efe0aa15f924d81adc9fe1f02d077a12434b468bb2045e6 channels: - url: conda-forge used_env_vars: [] @@ -4114,29 +4114,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_1.conda + url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.3-h024ca30_0.conda hash: - md5: 39a3992c2624b8d8e6b4994dedf3102a - sha256: 2c70e18a5bcb3fc2925e5d2c2c39559253d19e38c111afc91885f0dee4540fb1 + md5: c721339ea8746513e42b1233b4bbdfb0 + sha256: 4327a463f43b0d95ca0e5f92094383ef53fd2a91d649debfc531b941fe44fd48 category: main optional: false - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_1.conda + url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.3-h30eaf37_0.conda hash: - md5: d5a4f53b65d7d1d53104ba24107eda04 - sha256: 3ba2b892d6e153599512fa7fe2791125ff1b7dd6740469f74aff2d1b48edf299 + md5: 183c102075722a7aa993f94de1d135f2 + sha256: 27326e733ce7ad87054a409c02b829594cc6276232b987eb135cd1a225eac669 category: main optional: false - name: locket diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 60fb51c2..5037ffc7 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 5a7e9e19b107ad74fd7af8b2d1f69ae9733a547063210391aee8c497f0a7962c - linux-64: 05900a15d902cd9ad1ad3f1d88b70ed5a188e17024ee606718394727d58b10e6 + win-64: dd5f3d6403d5db52a5e41fb35b60dce2df1a615f984bba47e191a2a14a68dd3c + linux-64: 86d8c36c4b440eac7a217d19ba6775b033719c3606e19d205f30e9bf039ae01e channels: - url: conda-forge used_env_vars: [] @@ -4114,29 +4114,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_1.conda + url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.3-h024ca30_0.conda hash: - md5: 39a3992c2624b8d8e6b4994dedf3102a - sha256: 2c70e18a5bcb3fc2925e5d2c2c39559253d19e38c111afc91885f0dee4540fb1 + md5: c721339ea8746513e42b1233b4bbdfb0 + sha256: 4327a463f43b0d95ca0e5f92094383ef53fd2a91d649debfc531b941fe44fd48 category: main optional: false - name: llvm-openmp - version: 20.1.2 + version: 20.1.3 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_1.conda + url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.3-h30eaf37_0.conda hash: - md5: d5a4f53b65d7d1d53104ba24107eda04 - sha256: 3ba2b892d6e153599512fa7fe2791125ff1b7dd6740469f74aff2d1b48edf299 + md5: 183c102075722a7aa993f94de1d135f2 + sha256: 27326e733ce7ad87054a409c02b829594cc6276232b987eb135cd1a225eac669 category: main optional: false - name: locket