From 96d0deb4224c007a8c9094270d47674072912ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Sat, 12 Apr 2025 01:22:19 -0400 Subject: [PATCH 1/5] [GEOPY-2049] update github pipelines --- .github/workflows/python_deploy_dev.yml | 5 +++-- .github/workflows/python_deploy_prod.yml | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml index 8c8d1a27..f20cf4b8 100644 --- a/.github/workflows/python_deploy_dev.yml +++ b/.github/workflows/python_deploy_dev.yml @@ -16,8 +16,9 @@ jobs: with: package-name: 'simpeg-drivers' python-version: '3.10' - source-repo-names: '["public-conda-dev-local", "conda-forge-dev-remote"]' - publish-repo-names: '["public-conda-dev"]' + source-repo-names: '["public-noremote-conda-dev"]' + conda-channels: '["conda-forge"]' + publish-repo-names: '["public-noremote-conda-dev"]' secrets: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }} diff --git a/.github/workflows/python_deploy_prod.yml b/.github/workflows/python_deploy_prod.yml index 64a5cda1..84c76f2c 100644 --- a/.github/workflows/python_deploy_prod.yml +++ b/.github/workflows/python_deploy_prod.yml @@ -11,10 +11,12 @@ on: publish-conda: description: 'Publish Conda package' required: false + type: boolean default: true publish-pypi: description: 'Publish PyPI package' required: false + type: boolean default: true concurrency: From 288824b7812412fff62f34b3e52a162a285e6073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Sat, 12 Apr 2025 01:28:11 -0400 Subject: [PATCH 2/5] [GEOPY-2049] fix version of discretize in conda recipe --- recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe.yaml b/recipe.yaml index 8e40cd01..fe2adf03 100644 --- a/recipe.yaml +++ b/recipe.yaml @@ -33,7 +33,7 @@ requirements: - param-sweeps >=0.2.1a1, <0.3.dev # direct dependencies - dask-core >=2025.3, <2025.4.dev - - discretize >=0.10.0, <0.11.dev + - discretize >=0.11.0, <0.12.dev - distributed >=2025.3, <2025.4.dev - numpy >=1.26.0, <1.27.dev - pydantic >=2.5.2, <3.0.dev From 5e1d1eb7cd128ad0ba11935bf6cc4bfa888c5d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Sat, 12 Apr 2025 01:54:27 -0400 Subject: [PATCH 3/5] [GEOPY-2049] cannot use pip check because of dask-core --- recipe.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipe.yaml b/recipe.yaml index fe2adf03..c7c7dfc6 100644 --- a/recipe.yaml +++ b/recipe.yaml @@ -56,10 +56,18 @@ tests: - python: imports: - simpeg_drivers + - simpeg + - geoh5py + - dask + - distributed + pip_check: false # pip checks fails on missing dask-core because it only sees name 'dask' + - script: - pytest --ignore=tests/version_test.py + - pip list requirements: run: + - pip - pytest files: source: From f412630b8b4c976c38ff34878a6fc716f59cfd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Sat, 12 Apr 2025 01:33:40 -0400 Subject: [PATCH 4/5] [GEOPY-2049] bump version to alpha.2 --- 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 5b445e6c..4d8775dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "simpeg-drivers" -version = "0.3.0-alpha.1" +version = "0.3.0-alpha.2" 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 c7c7dfc6..0cf0c14c 100644 --- a/recipe.yaml +++ b/recipe.yaml @@ -2,7 +2,7 @@ schema_version: 1 context: name: "simpeg-drivers" - version: "0.3.0a1" + version: "0.3.0a2" python_min: "3.10" package: diff --git a/simpeg_drivers/__init__.py b/simpeg_drivers/__init__.py index c29ec416..eb923430 100644 --- a/simpeg_drivers/__init__.py +++ b/simpeg_drivers/__init__.py @@ -12,7 +12,7 @@ from __future__ import annotations -__version__ = "0.3.0-alpha.1" +__version__ = "0.3.0-alpha.2" import logging From adcedf4db86cef71b6bb13f3781804fa7c17ffaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Sat, 12 Apr 2025 01:34:17 -0400 Subject: [PATCH 5/5] [GEOPY-2049] relock on release branches of git dependencies --- .../py-3.10-linux-64-dev.conda.lock.yml | 17 +- environments/py-3.10-linux-64.conda.lock.yml | 17 +- .../py-3.10-win-64-dev.conda.lock.yml | 13 +- environments/py-3.10-win-64.conda.lock.yml | 13 +- .../py-3.11-linux-64-dev.conda.lock.yml | 17 +- environments/py-3.11-linux-64.conda.lock.yml | 17 +- .../py-3.11-win-64-dev.conda.lock.yml | 13 +- environments/py-3.11-win-64.conda.lock.yml | 13 +- .../py-3.12-linux-64-dev.conda.lock.yml | 17 +- environments/py-3.12-linux-64.conda.lock.yml | 17 +- .../py-3.12-win-64-dev.conda.lock.yml | 17 +- environments/py-3.12-win-64.conda.lock.yml | 17 +- py-3.10.conda-lock.yml | 170 ++++++++-------- py-3.11.conda-lock.yml | 170 ++++++++-------- py-3.12.conda-lock.yml | 190 +++++++++--------- pyproject.toml | 20 +- 16 files changed, 346 insertions(+), 392 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 4eb267e0..4e74fb80 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: 1531d079f4d385faa28bec701b6ba4a190bb8caf1e1b7b550e7b5a81fc674fb5 +# input_hash: 80b90d1dac6dd53ca8599208996488fde55264cf5f6f13d3981ae3e667ee4a82 channels: - conda-forge @@ -181,7 +181,7 @@ dependencies: - openssl=3.5.0=h7b32b05_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - - pandas=2.2.3=py310h5eaa309_1 + - pandas=2.2.3=py310h5eaa309_3 - pandoc=3.6.4=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 @@ -220,7 +220,7 @@ dependencies: - python-mumps=0.0.3=py310h6410a28_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=py310h89163eb_2 - pyzmq=26.4.0=py310h71f11fc_0 - readline=8.2=h8c095d6_2 @@ -299,12 +299,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 7835d623..0f4d51d5 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: 1531d079f4d385faa28bec701b6ba4a190bb8caf1e1b7b550e7b5a81fc674fb5 +# input_hash: 80b90d1dac6dd53ca8599208996488fde55264cf5f6f13d3981ae3e667ee4a82 channels: - conda-forge @@ -101,7 +101,7 @@ dependencies: - openjpeg=2.5.3=h5fbd93e_0 - openssl=3.5.0=h7b32b05_0 - packaging=24.2=pyhd8ed1ab_2 - - pandas=2.2.3=py310h5eaa309_1 + - pandas=2.2.3=py310h5eaa309_3 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py310hebfe307_1 - pip=25.0.1=pyh8b19718_0 @@ -119,7 +119,7 @@ dependencies: - python-mumps=0.0.3=py310h6410a28_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=py310h89163eb_2 - readline=8.2=h8c095d6_2 - scikit-learn=1.4.2=py310h981052a_1 @@ -151,12 +151,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 272c212f..726b370b 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: 0ce5c47c4e697c04f47e625e86dfaa02f5dfd7778d2d6607e732da19302d3f2c +# input_hash: da13aca8b655e002cd330dad17edc06eb03e6e817d3fccc293d1e3bee477c615 channels: - conda-forge @@ -290,12 +290,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 3e510a6e..1a37b3b3 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: 0ce5c47c4e697c04f47e625e86dfaa02f5dfd7778d2d6607e732da19302d3f2c +# input_hash: da13aca8b655e002cd330dad17edc06eb03e6e817d3fccc293d1e3bee477c615 channels: - conda-forge @@ -140,12 +140,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 80921007..c5cea1ff 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: 4cd649f559b6f17b0da6c86889dfbe811d4019ccddcef431bed245afd7d288ba +# input_hash: eb982334c3fa092fa3598f8b286ac1625273bca7a4363256b1ca4191cb9abc12 channels: - conda-forge @@ -183,7 +183,7 @@ dependencies: - openssl=3.5.0=h7b32b05_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - - pandas=2.2.3=py311h7db5c69_1 + - pandas=2.2.3=py311h7db5c69_3 - pandoc=3.6.4=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 @@ -222,7 +222,7 @@ dependencies: - python-mumps=0.0.3=py311h4b558b0_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=py311h2dc5d0c_2 - pyzmq=26.4.0=py311h7deb3e3_0 - readline=8.2=h8c095d6_2 @@ -302,12 +302,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 632710c6..ccbf3689 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: 4cd649f559b6f17b0da6c86889dfbe811d4019ccddcef431bed245afd7d288ba +# input_hash: eb982334c3fa092fa3598f8b286ac1625273bca7a4363256b1ca4191cb9abc12 channels: - conda-forge @@ -102,7 +102,7 @@ dependencies: - openjpeg=2.5.3=h5fbd93e_0 - openssl=3.5.0=h7b32b05_0 - packaging=24.2=pyhd8ed1ab_2 - - pandas=2.2.3=py311h7db5c69_1 + - pandas=2.2.3=py311h7db5c69_3 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py311h82a398c_1 - pip=25.0.1=pyh8b19718_0 @@ -120,7 +120,7 @@ dependencies: - python-mumps=0.0.3=py311h4b558b0_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=py311h2dc5d0c_2 - readline=8.2=h8c095d6_2 - scikit-learn=1.4.2=py311he08f58d_1 @@ -153,12 +153,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 c27caaad..ccdd57e3 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: ada12c2cb49c2137430c13aad89b2e906ff7280a3454d97b4d71b88c47ce6ada +# input_hash: 0fe35ae24ea2ec604ddabfcd3988350722f278e2b91783946c9b2dba4d43b717 channels: - conda-forge @@ -293,12 +293,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 2df51afd..b5fcad30 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: ada12c2cb49c2137430c13aad89b2e906ff7280a3454d97b4d71b88c47ce6ada +# input_hash: 0fe35ae24ea2ec604ddabfcd3988350722f278e2b91783946c9b2dba4d43b717 channels: - conda-forge @@ -142,12 +142,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 9be391ac..486d9442 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: abe8d97ee069c2f1f2d3975d63af0770073d79856f5722f2385ef5035af5f5c9 +# input_hash: bcbc4f1192606dfa8ea0ccc5cd64af77eb60f30a3e3559f22cfd750e7fd6fd1d channels: - conda-forge @@ -183,7 +183,7 @@ dependencies: - openssl=3.5.0=h7b32b05_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - - pandas=2.2.3=py312hf9745cd_1 + - pandas=2.2.3=py312hf9745cd_3 - pandoc=3.6.4=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 @@ -222,7 +222,7 @@ dependencies: - python-mumps=0.0.3=py312h6ad3ee3_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.12=6_cp312 - - pytz=2024.1=pyhd8ed1ab_0 + - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h178313f_2 - pyzmq=26.4.0=py312hbf22597_0 - readline=8.2=h8c095d6_2 @@ -302,12 +302,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 55598b51..0ee4fa3b 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: abe8d97ee069c2f1f2d3975d63af0770073d79856f5722f2385ef5035af5f5c9 +# input_hash: bcbc4f1192606dfa8ea0ccc5cd64af77eb60f30a3e3559f22cfd750e7fd6fd1d channels: - conda-forge @@ -102,7 +102,7 @@ dependencies: - openjpeg=2.5.3=h5fbd93e_0 - openssl=3.5.0=h7b32b05_0 - packaging=24.2=pyhd8ed1ab_2 - - pandas=2.2.3=py312hf9745cd_1 + - pandas=2.2.3=py312hf9745cd_3 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py312h287a98d_1 - pip=25.0.1=pyh8b19718_0 @@ -120,7 +120,7 @@ dependencies: - python-mumps=0.0.3=py312h6ad3ee3_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.12=6_cp312 - - pytz=2024.1=pyhd8ed1ab_0 + - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h178313f_2 - readline=8.2=h8c095d6_2 - scikit-learn=1.4.2=py312h1fcc3ea_1 @@ -153,12 +153,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 bed0c30b..c840c3f5 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: d980172660f4b7aa71ac489ed60b64e878363453b89402fc9fab34cecec21087 +# input_hash: a549693d2d92dc963ee6106297eedc7867ef6d890603dbaf37bb4cec69a82191 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=py312h72972c8_1 + - pandas=2.2.3=py312h72972c8_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=py312h8095395_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.12=6_cp312 - - pytz=2024.1=pyhd8ed1ab_0 + - pytz=2025.2=pyhd8ed1ab_0 - pywin32=307=py312h275cf98_3 - pywinpty=2.0.15=py312h275cf98_0 - pyyaml=6.0.2=py312h31fea79_2 @@ -293,12 +293,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 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 0de52828..996835ec 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: d980172660f4b7aa71ac489ed60b64e878363453b89402fc9fab34cecec21087 +# input_hash: a549693d2d92dc963ee6106297eedc7867ef6d890603dbaf37bb4cec69a82191 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=py312h72972c8_1 + - pandas=2.2.3=py312h72972c8_3 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py312h381445a_1 - pip=25.0.1=pyh8b19718_0 @@ -105,7 +105,7 @@ dependencies: - python-mumps=0.0.3=py312h8095395_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.12=6_cp312 - - pytz=2024.1=pyhd8ed1ab_0 + - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h31fea79_2 - scikit-learn=1.4.2=py312h816cc57_1 - scipy=1.14.1=py312h337df96_2 @@ -142,12 +142,11 @@ 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.0a3 --hash=sha256:ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 - - mira-simpeg == 0.23.0.1a1 --hash=sha256:d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b - - octree-creation-app == 0.3.0a1 --hash=sha256:379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 - - param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + - 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 variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 1e32ca43..0e522feb 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: 0ce5c47c4e697c04f47e625e86dfaa02f5dfd7778d2d6607e732da19302d3f2c - linux-64: 1531d079f4d385faa28bec701b6ba4a190bb8caf1e1b7b550e7b5a81fc674fb5 + win-64: da13aca8b655e002cd330dad17edc06eb03e6e817d3fccc293d1e3bee477c615 + linux-64: 80b90d1dac6dd53ca8599208996488fde55264cf5f6f13d3981ae3e667ee4a82 channels: - url: conda-forge used_env_vars: [] @@ -5041,14 +5041,14 @@ package: libstdcxx: '>=13' 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' - url: https://packages.prefix.dev/conda-forge/linux-64/pandas-2.2.3-py310h5eaa309_1.conda + pytz: '>=2020.1' + url: https://packages.prefix.dev/conda-forge/linux-64/pandas-2.2.3-py310h5eaa309_3.conda hash: - md5: e67778e1cac3bca3b3300f6164f7ffb9 - sha256: d772223fd1ca882717ec6db55a13a6be9439c64ca3532231855ce7834599b8a5 + md5: 07697a584fab513ce895c4511f7a2403 + sha256: 43fd80e57ebc9e0c00d169aafce533c49359174dea327a7fa8ca7454628a56f7 category: main optional: false - name: pandas @@ -6156,15 +6156,15 @@ package: category: main optional: false - name: pytz - version: '2024.1' + version: '2025.2' manager: conda platform: linux-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: pytz @@ -8389,72 +8389,42 @@ 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 + version: 0.5.0-alpha.4 manager: pip platform: linux-64 dependencies: - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: 0.11.0-alpha.3 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/geoapps-utils/0.5.0-alpha.3/geoapps_utils-0.5.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b hash: - sha256: a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c + sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b category: main optional: false - name: geoapps-utils - version: 0.5.0a3 + version: 0.5.0-alpha.4 manager: pip platform: win-64 dependencies: - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: 0.11.0-alpha.3 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/geoapps-utils/0.5.0-alpha.3/geoapps_utils-0.5.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b hash: - sha256: a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c + sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b category: main optional: false - name: geoh5py - version: 0.11.0a3 + version: 0.11.0-alpha.3 manager: pip platform: linux-64 dependencies: @@ -8462,13 +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: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.11.0-alpha.3/geoh5py-0.11.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 hash: - sha256: ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 + sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 category: main optional: false - name: geoh5py - version: 0.11.0a3 + version: 0.11.0-alpha.3 manager: pip platform: win-64 dependencies: @@ -8476,9 +8449,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.11.0-alpha.3/geoh5py-0.11.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 hash: - sha256: ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 + sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 category: main optional: false - name: mira-simpeg @@ -8486,9 +8462,7 @@ package: manager: pip platform: linux-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.11.0a1,<0.12.dev' libdlf: '*' @@ -8496,10 +8470,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.1a1+mira/mira_simpeg-0.23.0.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: mira-simpeg @@ -8507,9 +8483,7 @@ package: manager: pip platform: win-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.11.0a1,<0.12.dev' libdlf: '*' @@ -8517,65 +8491,79 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.1a1+mira/mira_simpeg-0.23.0.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0-alpha.2 manager: pip platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 - geoh5py: '>=0.11.0a3,<0.12.dev' + geoapps-utils: 0.5.0-alpha.4 + geoh5py: 0.11.0-alpha.3 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: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + source: + type: url + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0-alpha.2 manager: pip platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 - geoh5py: '>=0.11.0a3,<0.12.dev' + geoapps-utils: 0.5.0-alpha.4 + geoh5py: 0.11.0-alpha.3 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: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + source: + type: url + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf category: main optional: false - name: param-sweeps - version: 0.2.1a1 + version: 0.2.1-alpha.2 manager: pip platform: linux-64 dependencies: - geoh5py: '>=0.11.0a3,<0.12.dev' + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/param-sweeps/0.2.1-alpha.1/param_sweeps-0.2.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 hash: - sha256: 777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + source: + type: url + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 category: main optional: false - name: param-sweeps - version: 0.2.1a1 + version: 0.2.1-alpha.2 manager: pip platform: win-64 dependencies: - geoh5py: '>=0.11.0a3,<0.12.dev' + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/param-sweeps/0.2.1-alpha.1/param_sweeps-0.2.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 hash: - sha256: 777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + source: + type: url + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 category: main optional: false diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 4845ccd0..b1ecebec 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: ada12c2cb49c2137430c13aad89b2e906ff7280a3454d97b4d71b88c47ce6ada - linux-64: 4cd649f559b6f17b0da6c86889dfbe811d4019ccddcef431bed245afd7d288ba + win-64: 0fe35ae24ea2ec604ddabfcd3988350722f278e2b91783946c9b2dba4d43b717 + linux-64: eb982334c3fa092fa3598f8b286ac1625273bca7a4363256b1ca4191cb9abc12 channels: - url: conda-forge used_env_vars: [] @@ -5095,14 +5095,14 @@ package: libstdcxx: '>=13' 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' - url: https://packages.prefix.dev/conda-forge/linux-64/pandas-2.2.3-py311h7db5c69_1.conda + pytz: '>=2020.1' + url: https://packages.prefix.dev/conda-forge/linux-64/pandas-2.2.3-py311h7db5c69_3.conda hash: - md5: 643f8cb35133eb1be4919fb953f0a25f - sha256: dce121d3838996b77b810ca9097cc17068552075c761408a9b2eb788cf8fd1b0 + md5: c9f8fe78840d5c04e61666474bd739b2 + sha256: 98cd49bfc4b803d950f9dbc4799793903aec1eaacd388c244a0b46d644159831 category: main optional: false - name: pandas @@ -6210,15 +6210,15 @@ package: category: main optional: false - name: pytz - version: '2024.1' + version: '2025.2' manager: conda platform: linux-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: pytz @@ -8474,72 +8474,42 @@ 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 + version: 0.5.0-alpha.4 manager: pip platform: linux-64 dependencies: - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: 0.11.0-alpha.3 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/geoapps-utils/0.5.0-alpha.3/geoapps_utils-0.5.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b hash: - sha256: a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c + sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b category: main optional: false - name: geoapps-utils - version: 0.5.0a3 + version: 0.5.0-alpha.4 manager: pip platform: win-64 dependencies: - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: 0.11.0-alpha.3 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/geoapps-utils/0.5.0-alpha.3/geoapps_utils-0.5.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b hash: - sha256: a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c + sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b category: main optional: false - name: geoh5py - version: 0.11.0a3 + version: 0.11.0-alpha.3 manager: pip platform: linux-64 dependencies: @@ -8547,13 +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: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.11.0-alpha.3/geoh5py-0.11.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 hash: - sha256: ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 + sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 category: main optional: false - name: geoh5py - version: 0.11.0a3 + version: 0.11.0-alpha.3 manager: pip platform: win-64 dependencies: @@ -8561,9 +8534,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.11.0-alpha.3/geoh5py-0.11.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 hash: - sha256: ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 + sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 category: main optional: false - name: mira-simpeg @@ -8571,9 +8547,7 @@ package: manager: pip platform: linux-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.11.0a1,<0.12.dev' libdlf: '*' @@ -8581,10 +8555,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.1a1+mira/mira_simpeg-0.23.0.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: mira-simpeg @@ -8592,9 +8568,7 @@ package: manager: pip platform: win-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.11.0a1,<0.12.dev' libdlf: '*' @@ -8602,65 +8576,79 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.1a1+mira/mira_simpeg-0.23.0.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0-alpha.2 manager: pip platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 - geoh5py: '>=0.11.0a3,<0.12.dev' + geoapps-utils: 0.5.0-alpha.4 + geoh5py: 0.11.0-alpha.3 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: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + source: + type: url + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0-alpha.2 manager: pip platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 - geoh5py: '>=0.11.0a3,<0.12.dev' + geoapps-utils: 0.5.0-alpha.4 + geoh5py: 0.11.0-alpha.3 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: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + source: + type: url + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf category: main optional: false - name: param-sweeps - version: 0.2.1a1 + version: 0.2.1-alpha.2 manager: pip platform: linux-64 dependencies: - geoh5py: '>=0.11.0a3,<0.12.dev' + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/param-sweeps/0.2.1-alpha.1/param_sweeps-0.2.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 hash: - sha256: 777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + source: + type: url + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 category: main optional: false - name: param-sweeps - version: 0.2.1a1 + version: 0.2.1-alpha.2 manager: pip platform: win-64 dependencies: - geoh5py: '>=0.11.0a3,<0.12.dev' + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/param-sweeps/0.2.1-alpha.1/param_sweeps-0.2.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 hash: - sha256: 777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + source: + type: url + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 category: main optional: false diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index ff70867b..c8bf0978 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: d980172660f4b7aa71ac489ed60b64e878363453b89402fc9fab34cecec21087 - linux-64: abe8d97ee069c2f1f2d3975d63af0770073d79856f5722f2385ef5035af5f5c9 + win-64: a549693d2d92dc963ee6106297eedc7867ef6d890603dbaf37bb4cec69a82191 + linux-64: bcbc4f1192606dfa8ea0ccc5cd64af77eb60f30a3e3559f22cfd750e7fd6fd1d channels: - url: conda-forge used_env_vars: [] @@ -5095,14 +5095,14 @@ package: libstdcxx: '>=13' numpy: '>=1.22.4' python: '>=3.12,<3.13.0a0' - python-dateutil: '>=2.8.1' - python-tzdata: '>=2022a' + python-dateutil: '>=2.8.2' + python-tzdata: '>=2022.7' python_abi: 3.12.* - pytz: '>=2020.1,<2024.2' - url: https://packages.prefix.dev/conda-forge/linux-64/pandas-2.2.3-py312hf9745cd_1.conda + pytz: '>=2020.1' + url: https://packages.prefix.dev/conda-forge/linux-64/pandas-2.2.3-py312hf9745cd_3.conda hash: - md5: 8bce4f6caaf8c5448c7ac86d87e26b4b - sha256: ad275a83bfebfa8a8fee9b0569aaf6f513ada6a246b2f5d5b85903d8ca61887e + md5: 2979458c23c7755683a0598fb33e7666 + sha256: b0bed36b95757bbd269d30b2367536b802158bdf7947800ee7ae55089cfa8b9c category: main optional: false - name: pandas @@ -5112,17 +5112,17 @@ package: dependencies: numpy: '>=1.22.4' python: '>=3.12,<3.13.0a0' - python-dateutil: '>=2.8.1' - python-tzdata: '>=2022a' + python-dateutil: '>=2.8.2' + python-tzdata: '>=2022.7' python_abi: 3.12.* - 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-py312h72972c8_1.conda + url: https://packages.prefix.dev/conda-forge/win-64/pandas-2.2.3-py312h72972c8_3.conda hash: - md5: bf6f01c03e0688523d4b5cff8fe8c977 - sha256: dfd30e665b1ced1b783ca303799e250d8acc40943bcefb3a9b2bb13c3b17911c + md5: 08b4650b022c9f3233d45f231fb9471f + sha256: 86fe04c5f0dcae3644e3d2d892ddf6760d89eeb8fe1a31ef30290ac5a6a9f125 category: main optional: false - name: pandoc @@ -6210,27 +6210,27 @@ package: category: main optional: false - name: pytz - version: '2024.1' + version: '2025.2' manager: conda platform: linux-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: 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 @@ -8474,70 +8474,42 @@ 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 + version: 0.5.0-alpha.4 manager: pip platform: linux-64 dependencies: - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: 0.11.0-alpha.3 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/geoapps-utils/0.5.0-alpha.3/geoapps_utils-0.5.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b hash: - sha256: a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c + sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b category: main optional: false - name: geoapps-utils - version: 0.5.0a3 + version: 0.5.0-alpha.4 manager: pip platform: win-64 dependencies: - geoh5py: '>=0.11.0a1,<0.12.dev' + geoh5py: 0.11.0-alpha.3 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/geoapps-utils/0.5.0-alpha.3/geoapps_utils-0.5.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b hash: - sha256: a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c + sha256: 7a04b6e280309e649b2811d47168de3fd6ddf61b + source: + type: url + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@7a04b6e280309e649b2811d47168de3fd6ddf61b category: main optional: false - name: geoh5py - version: 0.11.0a3 + version: 0.11.0-alpha.3 manager: pip platform: linux-64 dependencies: @@ -8545,13 +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: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.11.0-alpha.3/geoh5py-0.11.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 hash: - sha256: ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 + sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 category: main optional: false - name: geoh5py - version: 0.11.0a3 + version: 0.11.0-alpha.3 manager: pip platform: win-64 dependencies: @@ -8559,9 +8534,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.11.0-alpha.3/geoh5py-0.11.0a3-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 hash: - sha256: ad6137f0f0829b3e75f8ca44483f6f38730ae985efe67968743c2ee39c86d273 + sha256: adfe3987a9637b148c440234e67df9c16315a8d6 + source: + type: url + url: git+https://github.com/MiraGeoscience/geoh5py.git@adfe3987a9637b148c440234e67df9c16315a8d6 category: main optional: false - name: mira-simpeg @@ -8569,9 +8547,7 @@ package: manager: pip platform: linux-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.11.0a1,<0.12.dev' libdlf: '*' @@ -8579,10 +8555,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.1a1+mira/mira_simpeg-0.23.0.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: mira-simpeg @@ -8590,9 +8568,7 @@ package: manager: pip platform: win-64 dependencies: - dask: '*' discretize: '>=0.11' - fsspec: '>=0.3.3' geoana: '>=0.7.0' geoh5py: '>=0.11.0a1,<0.12.dev' libdlf: '*' @@ -8600,65 +8576,79 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - zarr: '*' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/mira-simpeg/0.23.0.1a1+mira/mira_simpeg-0.23.0.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: d47becd73401e295eea7caf00a54f96fcaeeea22988d6f2267ddc58741d9d11b + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b + source: + type: url + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0-alpha.2 manager: pip platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 - geoh5py: '>=0.11.0a3,<0.12.dev' + geoapps-utils: 0.5.0-alpha.4 + geoh5py: 0.11.0-alpha.3 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: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + source: + type: url + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf category: main optional: false - name: octree-creation-app - version: 0.3.0a1 + version: 0.3.0-alpha.2 manager: pip platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0a3 - geoh5py: '>=0.11.0a3,<0.12.dev' + geoapps-utils: 0.5.0-alpha.4 + geoh5py: 0.11.0-alpha.3 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: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf hash: - sha256: 379dc607aca96db07af2ea8fbacadc9d0ca086e91d2508f5720b87e6e8d778a1 + sha256: 45472488f4c20cc2b6fcbf36149cec938e1b0ebf + source: + type: url + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@45472488f4c20cc2b6fcbf36149cec938e1b0ebf category: main optional: false - name: param-sweeps - version: 0.2.1a1 + version: 0.2.1-alpha.2 manager: pip platform: linux-64 dependencies: - geoh5py: '>=0.11.0a3,<0.12.dev' + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/param-sweeps/0.2.1-alpha.1/param_sweeps-0.2.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 hash: - sha256: 777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + source: + type: url + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 category: main optional: false - name: param-sweeps - version: 0.2.1a1 + version: 0.2.1-alpha.2 manager: pip platform: win-64 dependencies: - geoh5py: '>=0.11.0a3,<0.12.dev' + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/param-sweeps/0.2.1-alpha.1/param_sweeps-0.2.1a1-py3-none-any.whl + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 hash: - sha256: 777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c + sha256: 4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 + source: + type: url + url: git+https://github.com/MiraGeoscience/param-sweeps.git@4d0f8262ebb21c803c745fe85583d5cc5ce7d3e6 category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index 4d8775dc..4ebb573e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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.11.0a3, <0.12.dev", source = "pypi", allow-prereleases = true} +geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "release/0.11.0"} -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.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"} -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.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"} -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.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"]} -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.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"} ## about pip dependencies # to be specified to work with conda-lock