From c907e8f013047425fd307cb93a1b04588b302106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Mon, 3 Nov 2025 17:17:51 -0500 Subject: [PATCH 1/4] [DEVOPS-922] lock on published Mira dependencies --- .../py-3.10-linux-64-dev.conda.lock.yml | 6 +-- environments/py-3.10-linux-64.conda.lock.yml | 6 +-- .../py-3.10-win-64-dev.conda.lock.yml | 6 +-- environments/py-3.10-win-64.conda.lock.yml | 6 +-- .../py-3.11-linux-64-dev.conda.lock.yml | 6 +-- environments/py-3.11-linux-64.conda.lock.yml | 6 +-- .../py-3.11-win-64-dev.conda.lock.yml | 6 +-- environments/py-3.11-win-64.conda.lock.yml | 6 +-- .../py-3.12-linux-64-dev.conda.lock.yml | 6 +-- environments/py-3.12-linux-64.conda.lock.yml | 6 +-- .../py-3.12-win-64-dev.conda.lock.yml | 6 +-- environments/py-3.12-win-64.conda.lock.yml | 6 +-- py-3.10.conda-lock.yml | 44 +++++++------------ py-3.11.conda-lock.yml | 44 +++++++------------ py-3.12.conda-lock.yml | 44 +++++++------------ pyproject.toml | 8 ++-- recipe.yaml | 4 +- 17 files changed, 90 insertions(+), 126 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 b2bdcc1..a475418 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: 21713b32d9b6a132c84bea08c5a63fb7b87ec20cad1b4004d523bc6d659a7123 +# input_hash: 2e4829c8a8f03b3a85cd7e111d71a925ceda9fd119f51cb6e4c41de6a0dfff24 channels: - conda-forge @@ -133,8 +133,8 @@ dependencies: - zstandard=0.25.0=py310h139afa4_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 48a6d2e..1263763 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: 21713b32d9b6a132c84bea08c5a63fb7b87ec20cad1b4004d523bc6d659a7123 +# input_hash: 2e4829c8a8f03b3a85cd7e111d71a925ceda9fd119f51cb6e4c41de6a0dfff24 channels: - conda-forge @@ -80,8 +80,8 @@ dependencies: - xorg-libxdmcp=1.1.5=hb9d3cd8_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 f560751..d93542f 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: a2b9351305467e6cb62a07400307bc385ea7c08b7f3c124fffb58c0f92563d4a +# input_hash: d8fcabfe9873f54eac44c16be8327ef810066aa7a88050ae1175bf175728fae7 channels: - conda-forge @@ -128,8 +128,8 @@ dependencies: - zstandard=0.25.0=py310h1637853_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 9f41d0f..84321c0 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: a2b9351305467e6cb62a07400307bc385ea7c08b7f3c124fffb58c0f92563d4a +# input_hash: d8fcabfe9873f54eac44c16be8327ef810066aa7a88050ae1175bf175728fae7 channels: - conda-forge @@ -74,8 +74,8 @@ dependencies: - xorg-libxdmcp=1.1.5=h0e40799_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 b763f4b..6cc4d1e 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: 76669666f27ffbf8001180886fe7f2a6c8f397db6e65b031aa87a286d2c1af00 +# input_hash: 944e4f6279ecc4c07a9da28a0bb2711026807bc795d4ca6ec30c9c668001c7d1 channels: - conda-forge @@ -134,8 +134,8 @@ dependencies: - zstandard=0.25.0=py311haee01d2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 9c2416e..c792bca 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: 76669666f27ffbf8001180886fe7f2a6c8f397db6e65b031aa87a286d2c1af00 +# input_hash: 944e4f6279ecc4c07a9da28a0bb2711026807bc795d4ca6ec30c9c668001c7d1 channels: - conda-forge @@ -80,8 +80,8 @@ dependencies: - xorg-libxdmcp=1.1.5=hb9d3cd8_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 2fc3562..1126baf 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: 720756f513c3ee0064ca3fc3b5eb5ba6b68d6d5f0ab031681dc7a88b737bf616 +# input_hash: 330a4d4a5f20d5f34f3b852ac78f5afbd320a92dd3de8bae008112f72102cf8c channels: - conda-forge @@ -129,8 +129,8 @@ dependencies: - zstandard=0.25.0=py311hf893f09_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 3e4ece7..edb412c 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: 720756f513c3ee0064ca3fc3b5eb5ba6b68d6d5f0ab031681dc7a88b737bf616 +# input_hash: 330a4d4a5f20d5f34f3b852ac78f5afbd320a92dd3de8bae008112f72102cf8c channels: - conda-forge @@ -74,8 +74,8 @@ dependencies: - xorg-libxdmcp=1.1.5=h0e40799_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 fa2cc17..3445e75 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: 2c743c080251efc142d0caf104e20c73f41215f1bd635773342c75b9227a161e +# input_hash: ae9096dfc5e8f9bc801f56c79f4b12dfa2cb25592a902a005bdca035d83b35bc channels: - conda-forge @@ -134,8 +134,8 @@ dependencies: - zstandard=0.25.0=py312h5253ce2_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 b4b6287..0ab3a87 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: 2c743c080251efc142d0caf104e20c73f41215f1bd635773342c75b9227a161e +# input_hash: ae9096dfc5e8f9bc801f56c79f4b12dfa2cb25592a902a005bdca035d83b35bc channels: - conda-forge @@ -80,8 +80,8 @@ dependencies: - xorg-libxdmcp=1.1.5=hb9d3cd8_0 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 cb44b1b..e52ec1f 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: 946f0895b20903ce484acee71c156b53a062e6b5859b25c5bbd28ba78a76d1a3 +# input_hash: 985521c60627571636518fe4f4d8a2a847616ef66b70de5bf3a736261c230b73 channels: - conda-forge @@ -129,8 +129,8 @@ dependencies: - zstandard=0.25.0=py312he5662c2_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 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 dbbfdd1..396ddad 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: 946f0895b20903ce484acee71c156b53a062e6b5859b25c5bbd28ba78a76d1a3 +# input_hash: 985521c60627571636518fe4f4d8a2a847616ef66b70de5bf3a736261c230b73 channels: - conda-forge @@ -74,8 +74,8 @@ dependencies: - xorg-libxdmcp=1.1.5=h0e40799_0 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + - geoapps-utils == 0.6.0b1 --hash=sha256:51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 + - geoh5py == 0.12.0b3 --hash=sha256:59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 0e08b8c..20536df 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: a2b9351305467e6cb62a07400307bc385ea7c08b7f3c124fffb58c0f92563d4a - linux-64: 21713b32d9b6a132c84bea08c5a63fb7b87ec20cad1b4004d523bc6d659a7123 + win-64: d8fcabfe9873f54eac44c16be8327ef810066aa7a88050ae1175bf175728fae7 + linux-64: 2e4829c8a8f03b3a85cd7e111d71a925ceda9fd119f51cb6e4c41de6a0dfff24 channels: - url: conda-forge used_env_vars: [] @@ -3518,41 +3518,35 @@ package: category: main optional: false - name: geoapps-utils - version: 0.7.0a0 + version: 0.6.0b1 manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0b4.dev8+a9f57210 + geoh5py: '>=0.12.0b1,<0.13.dev' 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@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl hash: - sha256: b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoapps-utils - version: 0.7.0a0 + version: 0.6.0b1 manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0b4.dev8+a9f57210 + geoh5py: '>=0.12.0b1,<0.13.dev' 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@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl hash: - sha256: b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoh5py - version: 0.12.0b4.dev8+a9f57210 + version: 0.12.0b3 manager: pip platform: linux-64 dependencies: @@ -3560,16 +3554,13 @@ 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@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl hash: - sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c - source: - type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 category: main optional: false - name: geoh5py - version: 0.12.0b4.dev8+a9f57210 + version: 0.12.0b3 manager: pip platform: win-64 dependencies: @@ -3577,11 +3568,8 @@ 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@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl hash: - sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c - source: - type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 category: main optional: false diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 8b553a2..c2fbd6a 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: 720756f513c3ee0064ca3fc3b5eb5ba6b68d6d5f0ab031681dc7a88b737bf616 - linux-64: 76669666f27ffbf8001180886fe7f2a6c8f397db6e65b031aa87a286d2c1af00 + win-64: 330a4d4a5f20d5f34f3b852ac78f5afbd320a92dd3de8bae008112f72102cf8c + linux-64: 944e4f6279ecc4c07a9da28a0bb2711026807bc795d4ca6ec30c9c668001c7d1 channels: - url: conda-forge used_env_vars: [] @@ -3540,41 +3540,35 @@ package: category: main optional: false - name: geoapps-utils - version: 0.7.0a0 + version: 0.6.0b1 manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0b4.dev8+a9f57210 + geoh5py: '>=0.12.0b1,<0.13.dev' 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@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl hash: - sha256: b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoapps-utils - version: 0.7.0a0 + version: 0.6.0b1 manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0b4.dev8+a9f57210 + geoh5py: '>=0.12.0b1,<0.13.dev' 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@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl hash: - sha256: b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoh5py - version: 0.12.0b4.dev8+a9f57210 + version: 0.12.0b3 manager: pip platform: linux-64 dependencies: @@ -3582,16 +3576,13 @@ 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@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl hash: - sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c - source: - type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 category: main optional: false - name: geoh5py - version: 0.12.0b4.dev8+a9f57210 + version: 0.12.0b3 manager: pip platform: win-64 dependencies: @@ -3599,11 +3590,8 @@ 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@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl hash: - sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c - source: - type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 category: main optional: false diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index dfabed0..4c930ec 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: 946f0895b20903ce484acee71c156b53a062e6b5859b25c5bbd28ba78a76d1a3 - linux-64: 2c743c080251efc142d0caf104e20c73f41215f1bd635773342c75b9227a161e + win-64: 985521c60627571636518fe4f4d8a2a847616ef66b70de5bf3a736261c230b73 + linux-64: ae9096dfc5e8f9bc801f56c79f4b12dfa2cb25592a902a005bdca035d83b35bc channels: - url: conda-forge used_env_vars: [] @@ -3540,41 +3540,35 @@ package: category: main optional: false - name: geoapps-utils - version: 0.7.0a0 + version: 0.6.0b1 manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0b4.dev8+a9f57210 + geoh5py: '>=0.12.0b1,<0.13.dev' 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@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl hash: - sha256: b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoapps-utils - version: 0.7.0a0 + version: 0.6.0b1 manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0b4.dev8+a9f57210 + geoh5py: '>=0.12.0b1,<0.13.dev' 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@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoapps-utils/0.6.0b1/geoapps_utils-0.6.0b1-py3-none-any.whl hash: - sha256: b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 - source: - type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@b0b61f355dd536bbb3a77b0b4c2853e169c1e8c3 + sha256: 51278b061cb1a884c2609381c6189ac19ed84fc42a5bb81dd9a63f911a0f8d65 category: main optional: false - name: geoh5py - version: 0.12.0b4.dev8+a9f57210 + version: 0.12.0b3 manager: pip platform: linux-64 dependencies: @@ -3582,16 +3576,13 @@ 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@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl hash: - sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c - source: - type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 category: main optional: false - name: geoh5py - version: 0.12.0b4.dev8+a9f57210 + version: 0.12.0b3 manager: pip platform: win-64 dependencies: @@ -3599,11 +3590,8 @@ 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@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + url: https://mirageoscienceltd.jfrog.io/artifactory/api/pypi/geoplus-pypi-dev/geoh5py/0.12.0b3/geoh5py-0.12.0b3-py3-none-any.whl hash: - sha256: a9f5721079c097b1fa484ff8424146c6cd1a8c0c - source: - type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a9f5721079c097b1fa484ff8424146c6cd1a8c0c + sha256: 59932ee0ba044509c4389b547d50e381f62e32eea8c5e22d69526880a37489b5 category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index d4f5b15..e15a80d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,11 +70,11 @@ pydantic = "^2.5.2" scipy = "~1.14.0" ## pip dependencies -#geoh5py = { version = ">=0.12.0a, <0.13.dev", source = "pypi", allow-prereleases = true} -geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"} +geoh5py = { version = ">=0.12.0b1, <0.13.dev", source = "pypi", allow-prereleases = true} +#geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"} -#geoapps-utils = { version = ">=0.6.0a3, <0.7.dev", source = "pypi", allow-prereleases = true} -geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"} +geoapps-utils = { version = ">=0.6.0b1, <0.7.dev", source = "pypi", allow-prereleases = true} +#geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"} ## about pip dependencies # to be specified to work with conda-lock diff --git a/recipe.yaml b/recipe.yaml index f629b5f..571ee13 100644 --- a/recipe.yaml +++ b/recipe.yaml @@ -27,8 +27,8 @@ requirements: run: - python >=${{ python_min }} # Mira packages - - geoh5py >=0.12.0a3, <0.13.dev - - geoapps-utils >=0.6.0a3,<0.7.dev + - geoh5py >=0.12.0b1, <0.13.dev + - geoapps-utils >=0.6.0b1,<0.7.dev # other direct dependencies - discretize >=0.11.0, <0.12.dev - numpy >=1.26.0, <1.27.dev From f8b59e379eadac4beae7ef961685e96362944045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:58:02 -0500 Subject: [PATCH 2/4] [DEVOPS-922] also publish to pypi (public package) --- .github/workflows/python_deploy_dev.yml | 6 ++++-- .github/workflows/python_deploy_prod.yml | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml index dce45cc..4fc2e8b 100644 --- a/.github/workflows/python_deploy_dev.yml +++ b/.github/workflows/python_deploy_dev.yml @@ -28,16 +28,18 @@ jobs: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }} call-workflow-pypi-publish: - name: Publish development pypi package (JFrog Artifactory) + name: Publish development pypi package (JFrog Artifactory, TestPyPI) uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@v2 permissions: + id-token: write contents: write with: package-manager: 'poetry' package-name: 'grid-apps' version-tag: ${{ github.ref_name }} python-version: '3.10' - virtual-repo-names: '["geology-pypi-dev", "geophysics-pypi-dev"]' + virtual-repo-names: '["geology-pypi-dev", "geophysics-pypi-dev", "test-pypi"]' secrets: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }} + PYPI_TOKEN: ${{ secrets.TEST_PYPI_TOKEN }} diff --git a/.github/workflows/python_deploy_prod.yml b/.github/workflows/python_deploy_prod.yml index 41d51f7..af0c4bb 100644 --- a/.github/workflows/python_deploy_prod.yml +++ b/.github/workflows/python_deploy_prod.yml @@ -40,7 +40,7 @@ jobs: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }} call-workflow-pypi-release: - name: Publish production PyPI package (JFrog Artifactory) + name: Publish production PyPI package (JFrog Artifactory, PyPI) if: ${{ github.event_name == 'release' || github.event.inputs.publish-pypi == 'true' }} uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_pypi_assets.yml@v2 permissions: @@ -48,8 +48,9 @@ jobs: contents: write with: package-name: 'grid-apps' - virtual-repo-names: '["geology-pypi-prod", "geophysics-pypi-prod"]' + virtual-repo-names: '["geology-pypi-prod", "geophysics-pypi-prod", "pypi"]' release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }} secrets: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }} + PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} From 9096a63bc4edb91a8286b9dde19ddbd9abe78691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Mon, 3 Nov 2025 17:47:59 -0500 Subject: [PATCH 3/4] [DEVOPS-922] publish to public Artifactory channels --- .github/workflows/python_deploy_dev.yml | 4 ++-- .github/workflows/python_deploy_prod.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml index 4fc2e8b..1ac90f5 100644 --- a/.github/workflows/python_deploy_dev.yml +++ b/.github/workflows/python_deploy_dev.yml @@ -23,7 +23,7 @@ jobs: python-version: '3.10' source-repo-names: '["public-noremote-conda-dev"]' conda-channels: '["conda-forge"]' - publish-repo-names: '["geology-noremote-conda-dev", "geophysics-noremote-conda-dev"]' + publish-repo-names: '["public-noremote-conda-dev"]' secrets: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }} @@ -38,7 +38,7 @@ jobs: package-name: 'grid-apps' version-tag: ${{ github.ref_name }} python-version: '3.10' - virtual-repo-names: '["geology-pypi-dev", "geophysics-pypi-dev", "test-pypi"]' + virtual-repo-names: '["public-pypi-dev", "test-pypi"]' 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 af0c4bb..e23028f 100644 --- a/.github/workflows/python_deploy_prod.yml +++ b/.github/workflows/python_deploy_prod.yml @@ -34,7 +34,7 @@ jobs: id-token: write contents: write with: - virtual-repo-names: '["geology-noremote-conda-prod", "geophysics-noremote-conda-prod"]' + virtual-repo-names: '["public-noremote-conda-prod"]' release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }} secrets: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} @@ -48,7 +48,7 @@ jobs: contents: write with: package-name: 'grid-apps' - virtual-repo-names: '["geology-pypi-prod", "geophysics-pypi-prod", "pypi"]' + virtual-repo-names: '["public-pypi-prod", "pypi"]' release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }} secrets: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} From 86b7826353d511fe13dc2241ecfbe262ab333a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Mon, 3 Nov 2025 17:50:08 -0500 Subject: [PATCH 4/4] [DEVOPS-922] disable poetry check for now --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 233860e..cd732a4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,11 +11,11 @@ ci: autoupdate_schedule: monthly repos: -- repo: https://github.com/python-poetry/poetry - rev: 2.2.1 - hooks: - - id: poetry-check - args: [ --no-plugins ] +# - repo: https://github.com/python-poetry/poetry # TODO: re-enable with pixi (does not support source=pypi) +# rev: 2.2.1 +# hooks: +# - id: poetry-check +# args: [--no-plugins] - repo: https://github.com/hadialqattan/pycln rev: v2.6.0 hooks: