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 4e74fb80..7eb9166f 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: 80b90d1dac6dd53ca8599208996488fde55264cf5f6f13d3981ae3e667ee4a82 +# input_hash: a2cabf95bacbfd8bb5d66336f2fc65ab4b93835b9bef2e05f11dc76ab05735ee channels: - conda-forge @@ -299,11 +299,11 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 0f4d51d5..0517c190 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: 80b90d1dac6dd53ca8599208996488fde55264cf5f6f13d3981ae3e667ee4a82 +# input_hash: a2cabf95bacbfd8bb5d66336f2fc65ab4b93835b9bef2e05f11dc76ab05735ee channels: - conda-forge @@ -151,11 +151,11 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 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 726b370b..c2fca5b5 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: da13aca8b655e002cd330dad17edc06eb03e6e817d3fccc293d1e3bee477c615 +# input_hash: ec72eab9be00c6979c74796870e2eaa91e103fd1d842d4500d117273ba4dafb3 channels: - conda-forge @@ -167,7 +167,7 @@ dependencies: - openssl=3.5.0=ha4e3fda_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - - pandas=2.2.3=py310hb4db72f_1 + - pandas=2.2.3=py310hb4db72f_3 - pandoc=3.6.4=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 @@ -204,7 +204,7 @@ dependencies: - python-mumps=0.0.3=py310hb64895d_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.10=6_cp310 - - pytz=2024.1=pyhd8ed1ab_0 + - pytz=2025.2=pyhd8ed1ab_0 - pywin32=307=py310h9e98ed7_3 - pywinpty=2.0.15=py310h9e98ed7_0 - pyyaml=6.0.2=py310h38315fa_2 @@ -290,11 +290,11 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 1a37b3b3..c1533817 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: da13aca8b655e002cd330dad17edc06eb03e6e817d3fccc293d1e3bee477c615 +# input_hash: ec72eab9be00c6979c74796870e2eaa91e103fd1d842d4500d117273ba4dafb3 channels: - conda-forge @@ -86,7 +86,7 @@ dependencies: - openjpeg=2.5.3=h4d64b90_0 - openssl=3.5.0=ha4e3fda_0 - packaging=24.2=pyhd8ed1ab_2 - - pandas=2.2.3=py310hb4db72f_1 + - pandas=2.2.3=py310hb4db72f_3 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py310h3e38d90_1 - pip=25.0.1=pyh8b19718_0 @@ -104,7 +104,7 @@ dependencies: - python-mumps=0.0.3=py310hb64895d_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.10=6_cp310 - - pytz=2024.1=pyhd8ed1ab_0 + - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h38315fa_2 - scikit-learn=1.4.2=py310hf2a6c47_1 - scipy=1.14.1=py310hbd0dde3_2 @@ -140,11 +140,11 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 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 c5cea1ff..407e4ce8 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: eb982334c3fa092fa3598f8b286ac1625273bca7a4363256b1ca4191cb9abc12 +# input_hash: 46d7afdeb5add5b5662d343add0729699b5b974363284a7a28caf6c32087c650 channels: - conda-forge @@ -302,11 +302,11 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index ccbf3689..8501eb5a 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: eb982334c3fa092fa3598f8b286ac1625273bca7a4363256b1ca4191cb9abc12 +# input_hash: 46d7afdeb5add5b5662d343add0729699b5b974363284a7a28caf6c32087c650 channels: - conda-forge @@ -153,11 +153,11 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 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 ccdd57e3..51192b7e 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: 0fe35ae24ea2ec604ddabfcd3988350722f278e2b91783946c9b2dba4d43b717 +# input_hash: f482900cbfe344b8756276d846dfd524d787c9d1087262096487976a618ab091 channels: - conda-forge @@ -169,7 +169,7 @@ dependencies: - openssl=3.5.0=ha4e3fda_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - - pandas=2.2.3=py311hcf9f919_1 + - pandas=2.2.3=py311hcf9f919_3 - pandoc=3.6.4=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 @@ -206,7 +206,7 @@ dependencies: - python-mumps=0.0.3=py311h5bfbc98_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.11=6_cp311 - - pytz=2024.1=pyhd8ed1ab_0 + - pytz=2025.2=pyhd8ed1ab_0 - pywin32=307=py311hda3d55a_3 - pywinpty=2.0.15=py311hda3d55a_0 - pyyaml=6.0.2=py311h5082efb_2 @@ -293,11 +293,11 @@ dependencies: - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index b5fcad30..e881be24 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: 0fe35ae24ea2ec604ddabfcd3988350722f278e2b91783946c9b2dba4d43b717 +# input_hash: f482900cbfe344b8756276d846dfd524d787c9d1087262096487976a618ab091 channels: - conda-forge @@ -87,7 +87,7 @@ dependencies: - openjpeg=2.5.3=h4d64b90_0 - openssl=3.5.0=ha4e3fda_0 - packaging=24.2=pyhd8ed1ab_2 - - pandas=2.2.3=py311hcf9f919_1 + - pandas=2.2.3=py311hcf9f919_3 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py311h5592be9_1 - pip=25.0.1=pyh8b19718_0 @@ -105,7 +105,7 @@ dependencies: - python-mumps=0.0.3=py311h5bfbc98_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.11=6_cp311 - - pytz=2024.1=pyhd8ed1ab_0 + - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h5082efb_2 - scikit-learn=1.4.2=py311hdcb8d17_1 - scipy=1.14.1=py311hf16d85f_2 @@ -142,11 +142,11 @@ dependencies: - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 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 486d9442..027eaa55 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: bcbc4f1192606dfa8ea0ccc5cd64af77eb60f30a3e3559f22cfd750e7fd6fd1d +# input_hash: 05900a15d902cd9ad1ad3f1d88b70ed5a188e17024ee606718394727d58b10e6 channels: - conda-forge @@ -302,11 +302,11 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 0ee4fa3b..ec12ddae 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: bcbc4f1192606dfa8ea0ccc5cd64af77eb60f30a3e3559f22cfd750e7fd6fd1d +# input_hash: 05900a15d902cd9ad1ad3f1d88b70ed5a188e17024ee606718394727d58b10e6 channels: - conda-forge @@ -153,11 +153,11 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 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 c840c3f5..a378a8fc 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: a549693d2d92dc963ee6106297eedc7867ef6d890603dbaf37bb4cec69a82191 +# input_hash: 5a7e9e19b107ad74fd7af8b2d1f69ae9733a547063210391aee8c497f0a7962c channels: - conda-forge @@ -293,11 +293,11 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 996835ec..79b20cd8 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: a549693d2d92dc963ee6106297eedc7867ef6d890603dbaf37bb4cec69a82191 +# input_hash: 5a7e9e19b107ad74fd7af8b2d1f69ae9733a547063210391aee8c497f0a7962c channels: - conda-forge @@ -142,11 +142,11 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 0e522feb..9fe63ce5 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: da13aca8b655e002cd330dad17edc06eb03e6e817d3fccc293d1e3bee477c615 - linux-64: 80b90d1dac6dd53ca8599208996488fde55264cf5f6f13d3981ae3e667ee4a82 + win-64: ec72eab9be00c6979c74796870e2eaa91e103fd1d842d4500d117273ba4dafb3 + linux-64: a2cabf95bacbfd8bb5d66336f2fc65ab4b93835b9bef2e05f11dc76ab05735ee channels: - url: conda-forge used_env_vars: [] @@ -5058,17 +5058,17 @@ package: dependencies: numpy: '>=1.22.4' python: '>=3.10,<3.11.0a0' - python-dateutil: '>=2.8.1' - python-tzdata: '>=2022a' + python-dateutil: '>=2.8.2' + python-tzdata: '>=2022.7' python_abi: 3.10.* - pytz: '>=2020.1,<2024.2' + pytz: '>=2020.1' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://packages.prefix.dev/conda-forge/win-64/pandas-2.2.3-py310hb4db72f_1.conda + url: https://packages.prefix.dev/conda-forge/win-64/pandas-2.2.3-py310hb4db72f_3.conda hash: - md5: 565b3f19282642a23e5ff9bbfb01569c - sha256: 1fa40b4a351f1eb7a878d1f25f6bec71664699cd4a39c8ed5e2221f53ecca0c4 + md5: 60c6ae5813eb1cbc4f7774fb69623db8 + sha256: fa3986017273899fd21aa14a524469bedac3923e2ecfdfdba59a34769b56b9b8 category: main optional: false - name: pandoc @@ -6168,15 +6168,15 @@ package: category: main optional: false - name: pytz - version: '2024.1' + version: '2025.2' manager: conda platform: win-64 dependencies: - python: '>=3.7' - url: https://packages.prefix.dev/conda-forge/noarch/pytz-2024.1-pyhd8ed1ab_0.conda + python: '>=3.9' + url: https://packages.prefix.dev/conda-forge/noarch/pytz-2025.2-pyhd8ed1ab_0.conda hash: - md5: 3eeeeb9e4827ace8c0c1419c85d590ad - sha256: 1a7d6b233f7e6e3bbcbad054c8fd51e690a67b129a899a056a5e45dd9f00cb41 + md5: bc8e3267d44011051f2eb14d22fb0960 + sha256: 8d2a8bf110cc1fc3df6904091dead158ba3e614d8402a83e51ed3a8aa93cdeb0 category: main optional: false - name: pywin32 @@ -8390,41 +8390,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.4 + version: 0.6.0-alpha.1 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da hash: - sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + sha256: 6e21320c89581dccb1635d8460dfe296ec41b6da source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.4 + version: 0.6.0-alpha.1 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da hash: - sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + sha256: 6e21320c89581dccb1635d8460dfe296ec41b6da source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da category: main optional: false - name: geoh5py - version: 0.11.0-alpha.3 + version: 0.12.0-alpha.1 manager: pip platform: linux-64 dependencies: @@ -8432,16 +8432,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 hash: - sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + sha256: 4b9756b5c9e98c709a2b23e2e558edb29e5f3416 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 category: main optional: false - name: geoh5py - version: 0.11.0-alpha.3 + version: 0.12.0-alpha.1 manager: pip platform: win-64 dependencies: @@ -8449,121 +8449,121 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 hash: - sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + sha256: 4b9756b5c9e98c709a2b23e2e558edb29e5f3416 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1 + version: 0.23.0.2a1.dev0 manager: pip platform: linux-64 dependencies: discretize: '>=0.11' geoana: '>=0.7.0' - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: '>=0.12.0a1,<0.13.dev' libdlf: '*' matplotlib: '*' numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 hash: - sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + sha256: 8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1 + version: 0.23.0.2a1.dev0 manager: pip platform: win-64 dependencies: discretize: '>=0.11' geoana: '>=0.7.0' - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: '>=0.12.0a1,<0.13.dev' libdlf: '*' matplotlib: '*' numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 hash: - sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + sha256: 8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 category: main optional: false - name: octree-creation-app - version: 0.3.0-alpha.2 + version: 0.4.0-alpha.1 manager: pip platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.4 - geoh5py: 0.11.0-alpha.3 + geoapps-utils: 0.6.0-alpha.1 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca hash: - sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + sha256: e9c99d6fd5d324571a2717990aecb3ed673cbaca source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca category: main optional: false - name: octree-creation-app - version: 0.3.0-alpha.2 + version: 0.4.0-alpha.1 manager: pip platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.4 - geoh5py: 0.11.0-alpha.3 + geoapps-utils: 0.6.0-alpha.1 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca hash: - sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + sha256: e9c99d6fd5d324571a2717990aecb3ed673cbaca source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca category: main optional: false - name: param-sweeps - version: 0.2.1-alpha.2 + version: 0.3.0-alpha.1 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 hash: - sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + sha256: d5959a0e19b45a89eb8a02cd608bc8accb74adb7 source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 category: main optional: false - name: param-sweeps - version: 0.2.1-alpha.2 + version: 0.3.0-alpha.1 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 hash: - sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + sha256: d5959a0e19b45a89eb8a02cd608bc8accb74adb7 source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 category: main optional: false diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index b1ecebec..f71fbc80 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: 0fe35ae24ea2ec604ddabfcd3988350722f278e2b91783946c9b2dba4d43b717 - linux-64: eb982334c3fa092fa3598f8b286ac1625273bca7a4363256b1ca4191cb9abc12 + win-64: f482900cbfe344b8756276d846dfd524d787c9d1087262096487976a618ab091 + linux-64: 46d7afdeb5add5b5662d343add0729699b5b974363284a7a28caf6c32087c650 channels: - url: conda-forge used_env_vars: [] @@ -5112,17 +5112,17 @@ package: dependencies: numpy: '>=1.22.4' python: '>=3.11,<3.12.0a0' - python-dateutil: '>=2.8.1' - python-tzdata: '>=2022a' + python-dateutil: '>=2.8.2' + python-tzdata: '>=2022.7' python_abi: 3.11.* - pytz: '>=2020.1,<2024.2' + pytz: '>=2020.1' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://packages.prefix.dev/conda-forge/win-64/pandas-2.2.3-py311hcf9f919_1.conda + url: https://packages.prefix.dev/conda-forge/win-64/pandas-2.2.3-py311hcf9f919_3.conda hash: - md5: 5965b8926efba14e6fde98cc8713c083 - sha256: f5477bf3a2b7919481009ce87212d7bbd16c61a5bb05c692a7c336fb45646534 + md5: 84c8b4aab176baefd352cd34f7e69469 + sha256: 7aabb8d23a6817844a7f1b402e7e147e341cade5f470a908b8239f969c7b681c category: main optional: false - name: pandoc @@ -6222,15 +6222,15 @@ package: category: main optional: false - name: pytz - version: '2024.1' + version: '2025.2' manager: conda platform: win-64 dependencies: - python: '>=3.7' - url: https://packages.prefix.dev/conda-forge/noarch/pytz-2024.1-pyhd8ed1ab_0.conda + python: '>=3.9' + url: https://packages.prefix.dev/conda-forge/noarch/pytz-2025.2-pyhd8ed1ab_0.conda hash: - md5: 3eeeeb9e4827ace8c0c1419c85d590ad - sha256: 1a7d6b233f7e6e3bbcbad054c8fd51e690a67b129a899a056a5e45dd9f00cb41 + md5: bc8e3267d44011051f2eb14d22fb0960 + sha256: 8d2a8bf110cc1fc3df6904091dead158ba3e614d8402a83e51ed3a8aa93cdeb0 category: main optional: false - name: pywin32 @@ -8475,41 +8475,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.4 + version: 0.6.0-alpha.1 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da hash: - sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + sha256: 6e21320c89581dccb1635d8460dfe296ec41b6da source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.4 + version: 0.6.0-alpha.1 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da hash: - sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + sha256: 6e21320c89581dccb1635d8460dfe296ec41b6da source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da category: main optional: false - name: geoh5py - version: 0.11.0-alpha.3 + version: 0.12.0-alpha.1 manager: pip platform: linux-64 dependencies: @@ -8517,16 +8517,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 hash: - sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + sha256: 4b9756b5c9e98c709a2b23e2e558edb29e5f3416 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 category: main optional: false - name: geoh5py - version: 0.11.0-alpha.3 + version: 0.12.0-alpha.1 manager: pip platform: win-64 dependencies: @@ -8534,121 +8534,121 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 hash: - sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + sha256: 4b9756b5c9e98c709a2b23e2e558edb29e5f3416 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1 + version: 0.23.0.2a1.dev0 manager: pip platform: linux-64 dependencies: discretize: '>=0.11' geoana: '>=0.7.0' - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: '>=0.12.0a1,<0.13.dev' libdlf: '*' matplotlib: '*' numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 hash: - sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + sha256: 8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1 + version: 0.23.0.2a1.dev0 manager: pip platform: win-64 dependencies: discretize: '>=0.11' geoana: '>=0.7.0' - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: '>=0.12.0a1,<0.13.dev' libdlf: '*' matplotlib: '*' numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 hash: - sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + sha256: 8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 category: main optional: false - name: octree-creation-app - version: 0.3.0-alpha.2 + version: 0.4.0-alpha.1 manager: pip platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.4 - geoh5py: 0.11.0-alpha.3 + geoapps-utils: 0.6.0-alpha.1 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca hash: - sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + sha256: e9c99d6fd5d324571a2717990aecb3ed673cbaca source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca category: main optional: false - name: octree-creation-app - version: 0.3.0-alpha.2 + version: 0.4.0-alpha.1 manager: pip platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.4 - geoh5py: 0.11.0-alpha.3 + geoapps-utils: 0.6.0-alpha.1 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca hash: - sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + sha256: e9c99d6fd5d324571a2717990aecb3ed673cbaca source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca category: main optional: false - name: param-sweeps - version: 0.2.1-alpha.2 + version: 0.3.0-alpha.1 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 hash: - sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + sha256: d5959a0e19b45a89eb8a02cd608bc8accb74adb7 source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 category: main optional: false - name: param-sweeps - version: 0.2.1-alpha.2 + version: 0.3.0-alpha.1 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 hash: - sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + sha256: d5959a0e19b45a89eb8a02cd608bc8accb74adb7 source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 category: main optional: false diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index c8bf0978..69753ee8 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: a549693d2d92dc963ee6106297eedc7867ef6d890603dbaf37bb4cec69a82191 - linux-64: bcbc4f1192606dfa8ea0ccc5cd64af77eb60f30a3e3559f22cfd750e7fd6fd1d + win-64: 5a7e9e19b107ad74fd7af8b2d1f69ae9733a547063210391aee8c497f0a7962c + linux-64: 05900a15d902cd9ad1ad3f1d88b70ed5a188e17024ee606718394727d58b10e6 channels: - url: conda-forge used_env_vars: [] @@ -8475,41 +8475,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.4 + version: 0.6.0-alpha.1 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da hash: - sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + sha256: 6e21320c89581dccb1635d8460dfe296ec41b6da source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.4 + version: 0.6.0-alpha.1 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da hash: - sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + sha256: 6e21320c89581dccb1635d8460dfe296ec41b6da source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da category: main optional: false - name: geoh5py - version: 0.11.0-alpha.3 + version: 0.12.0-alpha.1 manager: pip platform: linux-64 dependencies: @@ -8517,16 +8517,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 hash: - sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + sha256: 4b9756b5c9e98c709a2b23e2e558edb29e5f3416 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 category: main optional: false - name: geoh5py - version: 0.11.0-alpha.3 + version: 0.12.0-alpha.1 manager: pip platform: win-64 dependencies: @@ -8534,121 +8534,121 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 hash: - sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + sha256: 4b9756b5c9e98c709a2b23e2e558edb29e5f3416 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1 + version: 0.23.0.2a1.dev0 manager: pip platform: linux-64 dependencies: discretize: '>=0.11' geoana: '>=0.7.0' - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: '>=0.12.0a1,<0.13.dev' libdlf: '*' matplotlib: '*' numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 hash: - sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + sha256: 8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1 + version: 0.23.0.2a1.dev0 manager: pip platform: win-64 dependencies: discretize: '>=0.11' geoana: '>=0.7.0' - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: '>=0.12.0a1,<0.13.dev' libdlf: '*' matplotlib: '*' numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 hash: - sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + sha256: 8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + url: git+https://github.com/MiraGeoscience/simpeg.git@8c73f0647ae51f1ca7d4af6ded7f2e63db52a428 category: main optional: false - name: octree-creation-app - version: 0.3.0-alpha.2 + version: 0.4.0-alpha.1 manager: pip platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.4 - geoh5py: 0.11.0-alpha.3 + geoapps-utils: 0.6.0-alpha.1 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca hash: - sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + sha256: e9c99d6fd5d324571a2717990aecb3ed673cbaca source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca category: main optional: false - name: octree-creation-app - version: 0.3.0-alpha.2 + version: 0.4.0-alpha.1 manager: pip platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.4 - geoh5py: 0.11.0-alpha.3 + geoapps-utils: 0.6.0-alpha.1 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca hash: - sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + sha256: e9c99d6fd5d324571a2717990aecb3ed673cbaca source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca category: main optional: false - name: param-sweeps - version: 0.2.1-alpha.2 + version: 0.3.0-alpha.1 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 hash: - sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + sha256: d5959a0e19b45a89eb8a02cd608bc8accb74adb7 source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 category: main optional: false - name: param-sweeps - version: 0.2.1-alpha.2 + version: 0.3.0-alpha.1 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.3 + geoh5py: 0.12.0-alpha.1 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 hash: - sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + sha256: d5959a0e19b45a89eb8a02cd608bc8accb74adb7 source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7 category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index 4ebb573e..ad26cccd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "simpeg-drivers" -version = "0.3.0-alpha.2" +version = "0.4.0-alpha.1" description = "Application to run SimPEG inversions with geoh5 files from Geoscience Analyst." license = "MIT" authors = ["Mira Geoscience "] @@ -30,9 +30,9 @@ include = [ [tool.poetry.dependencies] python = "^3.10" -dask-core = {version = "2025.3.*"} # also in simpeg[dask] +dask-core = "2025.3.*" # also in simpeg[dask] discretize = "0.11.*" # also in simpeg, octree-creation-app -distributed = "2025.3.*" # because conda-lock doesn't take dask extras into account +distributed = "2025.3.*" # conda needs explicit dask-core etc for equivalent 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" @@ -46,20 +46,20 @@ python-mumps = ">=0.0.3, <0.0.4.dev" ## Pip dependencies from Git repositories #---------------------------------------- -#geoh5py = {version = ">=0.11.0a3, <0.12.dev", source = "pypi", allow-prereleases = true} -geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "release/0.11.0"} +#geoh5py = {version = ">=0.12.0a, <0.13.dev", source = "pypi", allow-prereleases = true} +geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"} -#octree-creation-app = {version = ">=0.3.0a1, <0.4.dev", source = "pypi", allow-prereleases = true} -octree-creation-app = {git = "https://github.com/MiraGeoscience/octree-creation-app.git", rev = "release/0.3.0"} +#octree-creation-app = {version = ">=0.4.0a, <0.5.dev", source = "pypi", allow-prereleases = true} +octree-creation-app = {git = "https://github.com/MiraGeoscience/octree-creation-app.git", rev = "develop"} -#geoapps-utils = {version = ">=0.5.0a3, <0.6.dev", source = "pypi", allow-prereleases = true} -geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "release/0.5.0"} +#geoapps-utils = {version = ">=0.6.0a, <0.7.dev", source = "pypi", allow-prereleases = true} +geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"} -#mira-simpeg = {version = ">=0.23.0.1a1, <0.23.1.dev", source="pypi", allow-prereleases = true, extras = ["dask"]} -mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "release/0.23.0.1", extras = ["dask"]} +#mira-simpeg = {version = ">=0.23.0.2a, <0.23.1.dev", source="pypi", allow-prereleases = true, extras = ["dask"]} +mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "develop", extras = ["dask"]} -#param-sweeps = {version = ">=0.2.1a1, <0.3.dev", source = "pypi", allow-prereleases = true} -param-sweeps = {git = "https://github.com/MiraGeoscience/param-sweeps.git", rev = "release/0.2.1"} +#param-sweeps = {version = ">=0.3.0a, <0.4.dev", source = "pypi", allow-prereleases = true} +param-sweeps = {git = "https://github.com/MiraGeoscience/param-sweeps.git", rev = "develop"} ## about pip dependencies # to be specified to work with conda-lock diff --git a/recipe.yaml b/recipe.yaml index 0cf0c14c..2538e095 100644 --- a/recipe.yaml +++ b/recipe.yaml @@ -2,7 +2,7 @@ schema_version: 1 context: name: "simpeg-drivers" - version: "0.3.0a2" + version: "0.4.0a1" python_min: "3.10" package: @@ -26,11 +26,11 @@ requirements: run: - python >=${{ python_min }} # Mira packages - - geoapps-utils >=0.5.0a3, <0.6.dev - - geoh5py >=0.11.0a3, <0.12.dev + - geoapps-utils >=0.6.0a1, <0.7.dev + - geoh5py >=0.12.0a1, <0.13.dev - mira-simpeg >=0.23.0.1a1, <0.23.1.dev - - octree-creation-app >=0.3.0a1, <0.4.dev - - param-sweeps >=0.2.1a1, <0.3.dev + - octree-creation-app >=0.4.0a1, <0.5.dev + - param-sweeps >=0.3.0a1, <0.4.dev # direct dependencies - dask-core >=2025.3, <2025.4.dev - discretize >=0.11.0, <0.12.dev @@ -60,7 +60,11 @@ tests: - geoh5py - dask - distributed - pip_check: false # pip checks fails on missing dask-core because it only sees name 'dask' + + # `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 - script: - pytest --ignore=tests/version_test.py diff --git a/simpeg_drivers/__init__.py b/simpeg_drivers/__init__.py index eb923430..e2a98e42 100644 --- a/simpeg_drivers/__init__.py +++ b/simpeg_drivers/__init__.py @@ -12,7 +12,7 @@ from __future__ import annotations -__version__ = "0.3.0-alpha.2" +__version__ = "0.4.0-alpha.1" import logging diff --git a/simpeg_drivers/uijson.py b/simpeg_drivers/uijson.py index 2b4321c0..9593fd9f 100644 --- a/simpeg_drivers/uijson.py +++ b/simpeg_drivers/uijson.py @@ -12,6 +12,7 @@ import logging from geoh5py.ui_json.ui_json import BaseUIJson +from packaging.version import Version from pydantic import field_validator import simpeg_drivers @@ -29,17 +30,41 @@ class SimPEGDriversUIJson(BaseUIJson): @field_validator("version", mode="before") @classmethod def verify_and_update_version(cls, value: str) -> str: - version = simpeg_drivers.__version__ - if value != version: + package_version = cls.comparable_version(simpeg_drivers.__version__) + input_version = cls.comparable_version(value) + if input_version != package_version: logger.warning( - "Provided ui.json file version %s does not match the the current" - "simpeg-drivers version %s. This may lead to unpredictable" - "behavior.", + "Provided ui.json file version '%s' does not match the current " + "simpeg-drivers version '%s'. This may lead to unpredictable behavior.", value, - version, + simpeg_drivers.__version__, ) return value + @staticmethod + def comparable_version(value: str) -> str: + """Normalize the version string for comparison. + + Remove the post-release information, or the pre-release information if it is an rc version. + For example, if the version is "0.2.0.post1", it will return "0.2.0". + If the version is "0.2.0rc1", it will return "0.2.0". + + Then, it will return the public version of the version object. + For example, if the version is "0.2.0+local", it will return "0.2.0". + """ + version = Version(value) + + # Extract the base version (major.minor.patch) + base_version = version.base_version + + # If it's not an RC, keep any pre-release info (alpha/beta) + if version.pre is not None and version.pre[0] != "rc": # pylint: disable=unsubscriptable-object + # Recreate version with pre-release but no post or local + return f"{base_version}{version.pre[0]}{version.pre[1]}" + + # No pre-release info or it's an RC, return just the base version + return base_version + @classmethod def write_default(cls): """Write the default UIJson file to disk with updated version.""" diff --git a/tests/uijson_test.py b/tests/uijson_test.py index 8dce6281..44fedcfe 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -14,8 +14,10 @@ from typing import ClassVar import numpy as np +import pytest from geoh5py import Workspace from geoh5py.ui_json.annotations import Deprecated +from packaging.version import Version from pydantic import AliasChoices, Field import simpeg_drivers @@ -29,12 +31,28 @@ logger = logging.getLogger(__name__) -def test_version_warning(tmp_path, caplog): - workspace = Workspace.create(tmp_path / "test.geoh5") +def _current_version() -> Version: + """Get the package version.""" + return Version(simpeg_drivers.__version__) - with caplog.at_level(logging.WARNING): - _ = SimPEGDriversUIJson( - version="0.2.0", + +@pytest.fixture(name="workspace") +def workspace_fixture(tmp_path): + """Create a workspace for testing.""" + return Workspace.create(tmp_path / "test.geoh5") + + +@pytest.fixture(name="simpeg_uijson_factory") +def simpeg_uijson_factory_fixture(workspace): + """Create a SimPEGDriversUIJson object with configurable version.""" + + def _create_uijson(version: str | None = None, **kwargs): + """Create a SimPEGDriversUIJson with the given version and custom fields.""" + if version is None: + version = _current_version().public + + return SimPEGDriversUIJson( + version=version, title="My app", icon="", documentation="", @@ -43,8 +61,87 @@ def test_version_warning(tmp_path, caplog): monitoring_directory="", conda_environment="my-app", workspace_geoh5="", + **kwargs, ) + return _create_uijson + + +@pytest.mark.parametrize( + "version_input,expected", + [ + # Normal version + ("1.2.3", "1.2.3"), + # Post-release version + ("1.2.3.post1", "1.2.3"), + # RC pre-release version + ("1.2.3rc1", "1.2.3"), + # Alpha pre-release version (should not normalize) + ("1.2.3a1", "1.2.3a1"), + # Beta pre-release version (should not normalize) + ("1.2.3b1", "1.2.3b1"), + # Local version + ("1.2.3+local", "1.2.3"), + # Combined cases + ("1.2.3rc1.post2+local", "1.2.3"), + ], +) +def test_comparable_version(version_input, expected): + """Test the comparable_version method of SimPEGDriversUIJson.""" + assert SimPEGDriversUIJson.comparable_version(version_input) == expected + + +@pytest.mark.parametrize( + "version_input,package_version,should_warn", + [ + # Different version (should warn) + ("1.0.0", "2.0.0", True), + # Same version (should not warn) + ("2.0.0", "2.0.0", False), + # Post-release variant (should not warn) + ("2.0.0.post1", "2.0.0", False), + ("2.0.0", "2.0.0.post1", False), + # RC variant (should not warn) + ("2.0.0rc1", "2.0.0", False), + ("2.0.0", "2.0.0rc1", False), + ("2.0.0rc1", "2.0.0rc2", False), + # differ by the pre-release number, non RC (should warn) + ("2.0.0a1", "2.0.0a2", True), + ("2.0.0b1", "2.0.0b2", True), + ("2.0.0a1", "2.0.0", True), + ("2.0.0", "2.0.0a1", True), + ("2.0.0a1", "2.0.0b1", True), + ("2.0.0b1", "2.0.0a1", True), + ("2.0.0rc1", "2.0.0b1", True), + ("2.0.0b1", "2.0.0rc1", True), + # same normalized versions (should not warn) + ("2.0.0-beta.1", "2.0.0b1", False), + ("2.0.0b1", "2.0.0-beta.1", False), + ], +) +def test_version_warning( + monkeypatch, + caplog, + simpeg_uijson_factory, + version_input, + package_version, + should_warn, +): + """Test version warning behavior with mocked package version.""" + # Mock the package version + monkeypatch.setattr(simpeg_drivers, "__version__", package_version) + + with caplog.at_level(logging.WARNING): + caplog.clear() + _ = simpeg_uijson_factory(version=version_input) + + warning_message = f"version '{version_input}' does not match the current simpeg-drivers version" + warning_found = any( + warning_message in record.message for record in caplog.records + ) + + assert warning_found == should_warn + def test_write_default(tmp_path): default_path = tmp_path / "default.ui.json" @@ -69,70 +166,34 @@ class MyUIJson(SimPEGDriversUIJson): with open(default_path, encoding="utf-8") as f: data = json.load(f) - assert data["version"] == "0.3.0-alpha.1" - + # Use comparable_version for comparison to handle pre/post-release versions + assert SimPEGDriversUIJson.comparable_version( + data["version"] + ) == SimPEGDriversUIJson.comparable_version(simpeg_drivers.__version__) -def test_deprecations(tmp_path, caplog): - workspace = Workspace.create(tmp_path / "test.geoh5") +def test_deprecations(caplog, simpeg_uijson_factory): class MyUIJson(SimPEGDriversUIJson): my_param: Deprecated with caplog.at_level(logging.WARNING): - _ = MyUIJson( - version="0.3.0-alpha.1", - title="My app", - icon="", - documentation="", - geoh5=str(workspace.h5file), - run_command="myapp.driver", - monitoring_directory="", - conda_environment="my-app", - workspace_geoh5="", - my_param="whoopsie", - ) + _ = MyUIJson(**simpeg_uijson_factory().model_dump(), my_param="whoopsie") assert "Skipping deprecated field: my_param." in caplog.text -def test_pydantic_deprecation(tmp_path): - workspace = Workspace.create(tmp_path / "test.geoh5") - +def test_pydantic_deprecation(simpeg_uijson_factory): class MyUIJson(SimPEGDriversUIJson): my_param: str = Field(deprecated="Use my_param2 instead.", exclude=True) - uijson = MyUIJson( - version="0.3.0-alpha.1", - title="My app", - icon="", - documentation="", - geoh5=str(workspace.h5file), - run_command="myapp.driver", - monitoring_directory="", - conda_environment="my-app", - workspace_geoh5="", - my_param="whoopsie", - ) + uijson = MyUIJson(**simpeg_uijson_factory(my_param="whoopsie").model_dump()) assert "my_param" not in uijson.model_dump() -def test_alias(tmp_path): - workspace = Workspace.create(tmp_path / "test.geoh5") - +def test_alias(simpeg_uijson_factory): class MyUIJson(SimPEGDriversUIJson): my_param: str = Field(validation_alias=AliasChoices("my_param", "myParam")) - uijson = MyUIJson( - version="0.3.0-alpha.1", - title="My app", - icon="", - documentation="", - geoh5=str(workspace.h5file), - run_command="myapp.driver", - monitoring_directory="", - conda_environment="my-app", - workspace_geoh5="", - myParam="hello", - ) + uijson = MyUIJson(**simpeg_uijson_factory(myParam="hello").model_dump()) assert uijson.my_param == "hello" assert "myParam" not in uijson.model_fields_set assert "my_param" in uijson.model_dump() @@ -170,7 +231,7 @@ def test_gravity_uijson(tmp_path): uijson.write(uijson_path) with open(params_uijson_path, encoding="utf-8") as f: params_data = json.load(f) - assert params_data["version"] == simpeg_drivers.__version__ + assert Version(params_data["version"]) == Version(_current_version().public) with open(uijson_path, encoding="utf-8") as f: uijson_data = json.load(f)