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