GEOPY-2049: environment for coming pre-release

.github/workflows/python_deploy_dev.yml

@@ -6,7 +6,7 @@ on:
       - 'v*' # Push events to every version tag (eg. v1.0.0)
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -16,20 +16,21 @@ jobs:
     with:
       package-name: 'grid-apps'
       python-version: '3.10'
-      source-repo-names: '["public-conda-dev-local", "geophysics-conda-dev-local", "geology-conda-dev-local", "conda-forge-dev-remote", "conda-pytorch-dev-remote"]'
-      publish-repo-names: '["geophysics-conda-dev", "geology-conda-dev"]'
+      source-repo-names: '["public-noremote-conda-dev"]'
+      conda-channels: '["conda-forge"]'
+      publish-repo-names: '["geology-noremote-conda-dev", "geophysics-noremote-conda-dev"]'
     secrets:
       JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
       JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
   call-workflow-pypi-publish:
-    name: Publish development pypi package on JFrog Artifactory
+    name: Publish development pypi package (JFrog Artifactory)
     uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main
     with:
       package-manager: 'poetry'
       package-name: 'grid-apps'
       version-tag: ${{ github.ref_name }}
       python-version: '3.10'
-      virtual-repo-names: '["geophysics-pypi-dev", "geology-pypi-dev"]'
+      virtual-repo-names: '["geology-pypi-dev", "geophysics-pypi-dev"]'
     secrets:
       JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
       JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}

.github/workflows/python_deploy_prod.yml

@@ -2,32 +2,46 @@ name: Deploy python package in production
 
 on:
   release:
-    types: [published] # Trigger for draft release
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      release-tag:
+        description: 'Tag for the existing (draft) release to publish assets from'
+        required: true
+      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:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.release.tag_name || github.event.inputs.release-tag || github.run_id }}
   cancel-in-progress: true
 
 jobs:
-  call-workflow-conda-publish:
-    name: Publish production conda package on JFrog Artifactory
-    uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_conda_package.yml@main
+  call-workflow-conda-release:
+    name: Publish production Conda package on JFrog Artifactory
+    uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
+    if: ${{ github.event_name == 'release' || github.event.inputs.publish-conda == 'true' }}
     with:
-      package-name: 'grid-apps'
-      python-version: '3.10'
-      virtual-repo-names: '["geophysics-conda-prod", "geology-conda-prod"]'
+      virtual-repo-names: '["geology-conda-prod", "geophysics-conda-prod"]'
+      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 }}
-  call-workflow-pypi-publish:
-    name: Publish production pypi package on JFrog Artifactory
-    uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main
+  call-workflow-pypi-release:
+    name: Publish production PyPI package (JFrog Artifactory)
+    if: ${{ github.event_name == 'release' || github.event.inputs.publish-pypi == 'true' }}
+    uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_pypi_assets.yml@main
     with:
-      package-manager: 'poetry'
       package-name: 'grid-apps'
-      version-tag: ${{ github.ref_name }}
-      python-version: '3.10'
-      virtual-repo-names: '["geophysics-pypi-prod", "geology-pypi-prod"]'
+      virtual-repo-names: '["geology-pypi-prod", "geophysics-pypi-prod"]'
+      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 }}

environments/py-3.10-linux-64-dev.conda.lock.yml

@@ -1,116 +1,107 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 46ee90b76372faf8198a3f05e3d53f8302a3db73f9e628cd9ce875fbb6d952e9
+# input_hash: bed4971fd5a3b9adbf1be868bda27827d72ba59e242bdc7f2398b76058f72226
 
 channels:
   - conda-forge
   - nodefaults
 dependencies:
   - _libgcc_mutex=0.1=conda_forge
-  - _openmp_mutex=4.5=2_kmp_llvm
+  - _openmp_mutex=4.5=2_gnu
   - annotated-types=0.7.0=pyhd8ed1ab_1
-  - astroid=3.3.8=py310hff52083_0
+  - astroid=3.3.9=py310hff52083_0
   - bzip2=1.0.8=h4bc722e_7
-  - c-ares=1.34.4=hb9d3cd8_0
+  - c-ares=1.34.5=hb9d3cd8_0
   - ca-certificates=2025.1.31=hbcca054_0
   - cached-property=1.5.2=hd8ed1ab_1
   - cached_property=1.5.2=pyha770c72_1
   - colorama=0.4.6=pyhd8ed1ab_1
-  - coverage=7.6.12=py310h89163eb_0
-  - dill=0.3.9=pyhd8ed1ab_1
-  - discretize=0.10.0=py310hcb52e73_1
+  - coverage=7.8.0=py310h89163eb_0
+  - dill=0.4.0=pyhd8ed1ab_0
+  - discretize=0.11.2=py310ha2bacc8_1
   - exceptiongroup=1.2.2=pyhd8ed1ab_1
-  - freetype=2.12.1=h267a509_2
+  - freetype=2.13.3=h48d6fc4_0
   - h5py=3.13.0=nompi_py310h60e0fe6_100
   - hdf5=1.14.3=nompi_h2d575fe_109
-  - icu=75.1=he02047a_0
   - iniconfig=2.0.0=pyhd8ed1ab_1
-  - isort=6.0.0=pyhd8ed1ab_0
-  - jinja2=3.1.5=pyhd8ed1ab_0
+  - isort=6.0.1=pyhd8ed1ab_0
+  - jinja2=3.1.6=pyhd8ed1ab_0
   - keyutils=1.6.1=h166bdaf_0
   - krb5=1.21.3=h659f571_0
   - lcms2=2.17=h717163a_0
-  - ld_impl_linux-64=2.43=h712a8e2_2
+  - ld_impl_linux-64=2.43=h712a8e2_4
   - lerc=4.0.0=h27087fc_0
   - libaec=1.1.3=h59595ed_0
-  - libblas=3.9.0=30_h59b9bed_openblas
-  - libcblas=3.9.0=30_he106b2a_openblas
-  - libcurl=8.12.1=h332b0f4_0
+  - libblas=3.9.0=31_h59b9bed_openblas
+  - libcblas=3.9.0=31_he106b2a_openblas
+  - libcurl=8.13.0=h332b0f4_0
   - libdeflate=1.23=h4ddbbb0_0
   - libedit=3.1.20250104=pl5321h7949ede_0
   - libev=4.33=hd590300_2
-  - libffi=3.4.6=h2dba641_0
-  - libgcc=14.2.0=h77fa898_1
-  - libgcc-ng=14.2.0=h69a702a_1
-  - libgfortran=14.2.0=h69a702a_1
-  - libgfortran5=14.2.0=hd5240d6_1
-  - libhwloc=2.11.2=default_h0d58e46_1001
-  - libiconv=1.18=h4ce23a2_0
+  - libexpat=2.7.0=h5888daf_0
+  - libffi=3.4.6=h2dba641_1
+  - libgcc=14.2.0=h767d61c_2
+  - libgcc-ng=14.2.0=h69a702a_2
+  - libgfortran=14.2.0=h69a702a_2
+  - libgfortran5=14.2.0=hf1ad2bd_2
+  - libgomp=14.2.0=h767d61c_2
   - libjpeg-turbo=3.0.0=hd590300_1
-  - liblapack=3.9.0=30_h7ac8fdf_openblas
-  - liblzma=5.6.4=hb9d3cd8_0
+  - liblapack=3.9.0=31_h7ac8fdf_openblas
+  - liblzma=5.8.1=hb9d3cd8_0
   - libnghttp2=1.64.0=h161d5f1_0
   - libnsl=2.0.1=hd590300_0
   - libopenblas=0.3.29=pthreads_h94d23a6_0
   - libpng=1.6.47=h943b412_0
-  - libsqlite=3.49.1=hee588c1_1
+  - libsqlite=3.49.1=hee588c1_2
   - libssh2=1.11.1=hf672d98_0
-  - libstdcxx=14.2.0=hc0a3c3a_1
-  - libstdcxx-ng=14.2.0=h4852527_1
+  - libstdcxx=14.2.0=h8f9b012_2
+  - libstdcxx-ng=14.2.0=h4852527_2
   - libtiff=4.7.0=hd9ff511_3
   - libuuid=2.38.1=h0b41bf4_0
   - libwebp-base=1.5.0=h851e524_0
   - libxcb=1.17.0=h8a09558_0
   - libxcrypt=4.4.36=hd590300_1
-  - libxml2=2.13.6=h8d12d68_0
   - libzlib=1.3.1=hb9d3cd8_2
-  - llvm-openmp=19.1.7=h024ca30_0
   - markupsafe=3.0.2=py310h89163eb_1
   - mccabe=0.7.0=pyhd8ed1ab_1
-  - mkl=2024.2.2=ha957f24_16
   - ncurses=6.5=h2d0b736_3
   - numpy=1.26.4=py310hb13e2d6_0
   - openjpeg=2.5.3=h5fbd93e_0
-  - openssl=3.4.1=h7b32b05_0
+  - openssl=3.5.0=h7b32b05_0
   - packaging=24.2=pyhd8ed1ab_2
-  - pandas=2.2.3=py310h5eaa309_1
   - pillow=10.3.0=py310hebfe307_1
   - pip=25.0.1=pyh8b19718_0
-  - platformdirs=4.3.6=pyhd8ed1ab_1
+  - platformdirs=4.3.7=pyh29332c3_0
   - pluggy=1.5.0=pyhd8ed1ab_1
   - pthread-stubs=0.4=hb9d3cd8_1002
-  - pydantic=2.5.3=pyhd8ed1ab_0
-  - pydantic-core=2.14.6=py310hcb5633a_1
+  - pydantic=2.11.3=pyh3cfb1c2_0
+  - pydantic-core=2.33.1=py310hc1293b2_0
   - pygments=2.19.1=pyhd8ed1ab_0
-  - pylint=3.3.4=pyh29332c3_0
-  - pytest=8.3.4=pyhd8ed1ab_1
-  - pytest-cov=6.0.0=pyhd8ed1ab_1
-  - python=3.10.16=he725a3c_1_cpython
-  - python-dateutil=2.9.0.post0=pyhff2d567_1
-  - python-tzdata=2025.1=pyhd8ed1ab_0
-  - python_abi=3.10=5_cp310
-  - pytz=2024.1=pyhd8ed1ab_0
+  - pylint=3.3.6=pyh29332c3_0
+  - pytest=8.3.5=pyhd8ed1ab_0
+  - pytest-cov=6.1.1=pyhd8ed1ab_0
+  - python=3.10.17=hd6af730_0_cpython
+  - python_abi=3.10=6_cp310
   - pyyaml=6.0.2=py310h89163eb_2
-  - readline=8.2=h8228510_1
+  - readline=8.2=h8c095d6_2
   - scipy=1.14.1=py310hfcf56fc_2
-  - setuptools=75.8.0=pyhff2d567_0
-  - six=1.17.0=pyhd8ed1ab_0
-  - tbb=2021.13.0=hceb3a55_1
+  - setuptools=78.1.0=pyhff2d567_0
   - tk=8.6.13=noxft_h4845f30_101
   - toml=0.10.2=pyhd8ed1ab_1
   - tomli=2.2.1=pyhd8ed1ab_1
   - tomlkit=0.13.2=pyha770c72_1
-  - typing-extensions=4.12.2=hd8ed1ab_1
-  - typing_extensions=4.12.2=pyha770c72_1
-  - tzdata=2025a=h78e105d_0
+  - typing-extensions=4.13.2=h0e9735f_0
+  - typing-inspection=0.4.0=pyhd8ed1ab_0
+  - typing_extensions=4.13.2=pyh29332c3_0
+  - tzdata=2025b=h78e105d_0
   - wheel=0.45.1=pyhd8ed1ab_1
   - xorg-libxau=1.0.12=hb9d3cd8_0
   - xorg-libxdmcp=1.1.5=hb9d3cd8_0
   - yaml=0.2.5=h7f98852_2
-  - zstd=1.5.7=hb8e6e7a_0
+  - zstd=1.5.7=hb8e6e7a_2
   - pip:
-      - geoapps-utils == 0.4.0 --hash=sha256:22baa6f49c09e02ab65efd07fbab1421982f17aefc98749febf858da2b47d6ef
-      - geoh5py == 0.10.1 --hash=sha256:6ad70a64f5d5ae25c84c1d75f8142a0b34204027041a3edaf1b036fa9e571cf2
+      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416
 
 variables:
   KMP_WARNINGS: 0

environments/py-3.10-linux-64.conda.lock.yml

@@ -1,94 +1,85 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 46ee90b76372faf8198a3f05e3d53f8302a3db73f9e628cd9ce875fbb6d952e9
+# input_hash: bed4971fd5a3b9adbf1be868bda27827d72ba59e242bdc7f2398b76058f72226
 
 channels:
   - conda-forge
   - nodefaults
 dependencies:
   - _libgcc_mutex=0.1=conda_forge
-  - _openmp_mutex=4.5=2_kmp_llvm
+  - _openmp_mutex=4.5=2_gnu
   - annotated-types=0.7.0=pyhd8ed1ab_1
   - bzip2=1.0.8=h4bc722e_7
-  - c-ares=1.34.4=hb9d3cd8_0
+  - c-ares=1.34.5=hb9d3cd8_0
   - ca-certificates=2025.1.31=hbcca054_0
   - cached-property=1.5.2=hd8ed1ab_1
   - cached_property=1.5.2=pyha770c72_1
-  - discretize=0.10.0=py310hcb52e73_1
-  - freetype=2.12.1=h267a509_2
+  - discretize=0.11.2=py310ha2bacc8_1
+  - freetype=2.13.3=h48d6fc4_0
   - h5py=3.13.0=nompi_py310h60e0fe6_100
   - hdf5=1.14.3=nompi_h2d575fe_109
-  - icu=75.1=he02047a_0
   - keyutils=1.6.1=h166bdaf_0
   - krb5=1.21.3=h659f571_0
   - lcms2=2.17=h717163a_0
-  - ld_impl_linux-64=2.43=h712a8e2_2
+  - ld_impl_linux-64=2.43=h712a8e2_4
   - lerc=4.0.0=h27087fc_0
   - libaec=1.1.3=h59595ed_0
-  - libblas=3.9.0=30_h59b9bed_openblas
-  - libcblas=3.9.0=30_he106b2a_openblas
-  - libcurl=8.12.1=h332b0f4_0
+  - libblas=3.9.0=31_h59b9bed_openblas
+  - libcblas=3.9.0=31_he106b2a_openblas
+  - libcurl=8.13.0=h332b0f4_0
   - libdeflate=1.23=h4ddbbb0_0
   - libedit=3.1.20250104=pl5321h7949ede_0
   - libev=4.33=hd590300_2
-  - libffi=3.4.6=h2dba641_0
-  - libgcc=14.2.0=h77fa898_1
-  - libgcc-ng=14.2.0=h69a702a_1
-  - libgfortran=14.2.0=h69a702a_1
-  - libgfortran5=14.2.0=hd5240d6_1
-  - libhwloc=2.11.2=default_h0d58e46_1001
-  - libiconv=1.18=h4ce23a2_0
+  - libexpat=2.7.0=h5888daf_0
+  - libffi=3.4.6=h2dba641_1
+  - libgcc=14.2.0=h767d61c_2
+  - libgcc-ng=14.2.0=h69a702a_2
+  - libgfortran=14.2.0=h69a702a_2
+  - libgfortran5=14.2.0=hf1ad2bd_2
+  - libgomp=14.2.0=h767d61c_2
   - libjpeg-turbo=3.0.0=hd590300_1
-  - liblapack=3.9.0=30_h7ac8fdf_openblas
-  - liblzma=5.6.4=hb9d3cd8_0
+  - liblapack=3.9.0=31_h7ac8fdf_openblas
+  - liblzma=5.8.1=hb9d3cd8_0
   - libnghttp2=1.64.0=h161d5f1_0
   - libnsl=2.0.1=hd590300_0
   - libopenblas=0.3.29=pthreads_h94d23a6_0
   - libpng=1.6.47=h943b412_0
-  - libsqlite=3.49.1=hee588c1_1
+  - libsqlite=3.49.1=hee588c1_2
   - libssh2=1.11.1=hf672d98_0
-  - libstdcxx=14.2.0=hc0a3c3a_1
-  - libstdcxx-ng=14.2.0=h4852527_1
+  - libstdcxx=14.2.0=h8f9b012_2
+  - libstdcxx-ng=14.2.0=h4852527_2
   - libtiff=4.7.0=hd9ff511_3
   - libuuid=2.38.1=h0b41bf4_0
   - libwebp-base=1.5.0=h851e524_0
   - libxcb=1.17.0=h8a09558_0
   - libxcrypt=4.4.36=hd590300_1
-  - libxml2=2.13.6=h8d12d68_0
   - libzlib=1.3.1=hb9d3cd8_2
-  - llvm-openmp=19.1.7=h024ca30_0
-  - mkl=2024.2.2=ha957f24_16
   - ncurses=6.5=h2d0b736_3
   - numpy=1.26.4=py310hb13e2d6_0
   - openjpeg=2.5.3=h5fbd93e_0
-  - openssl=3.4.1=h7b32b05_0
-  - pandas=2.2.3=py310h5eaa309_1
+  - openssl=3.5.0=h7b32b05_0
   - pillow=10.3.0=py310hebfe307_1
   - pip=25.0.1=pyh8b19718_0
   - pthread-stubs=0.4=hb9d3cd8_1002
-  - pydantic=2.5.3=pyhd8ed1ab_0
-  - pydantic-core=2.14.6=py310hcb5633a_1
-  - python=3.10.16=he725a3c_1_cpython
-  - python-dateutil=2.9.0.post0=pyhff2d567_1
-  - python-tzdata=2025.1=pyhd8ed1ab_0
-  - python_abi=3.10=5_cp310
-  - pytz=2024.1=pyhd8ed1ab_0
-  - readline=8.2=h8228510_1
+  - pydantic=2.11.3=pyh3cfb1c2_0
+  - pydantic-core=2.33.1=py310hc1293b2_0
+  - python=3.10.17=hd6af730_0_cpython
+  - python_abi=3.10=6_cp310
+  - readline=8.2=h8c095d6_2
   - scipy=1.14.1=py310hfcf56fc_2
-  - setuptools=75.8.0=pyhff2d567_0
-  - six=1.17.0=pyhd8ed1ab_0
-  - tbb=2021.13.0=hceb3a55_1
+  - setuptools=78.1.0=pyhff2d567_0
   - tk=8.6.13=noxft_h4845f30_101
-  - typing-extensions=4.12.2=hd8ed1ab_1
-  - typing_extensions=4.12.2=pyha770c72_1
-  - tzdata=2025a=h78e105d_0
+  - typing-extensions=4.13.2=h0e9735f_0
+  - typing-inspection=0.4.0=pyhd8ed1ab_0
+  - typing_extensions=4.13.2=pyh29332c3_0
+  - tzdata=2025b=h78e105d_0
   - wheel=0.45.1=pyhd8ed1ab_1
   - xorg-libxau=1.0.12=hb9d3cd8_0
   - xorg-libxdmcp=1.1.5=hb9d3cd8_0
-  - zstd=1.5.7=hb8e6e7a_0
+  - zstd=1.5.7=hb8e6e7a_2
   - pip:
-      - geoapps-utils == 0.4.0 --hash=sha256:22baa6f49c09e02ab65efd07fbab1421982f17aefc98749febf858da2b47d6ef
-      - geoh5py == 0.10.1 --hash=sha256:6ad70a64f5d5ae25c84c1d75f8142a0b34204027041a3edaf1b036fa9e571cf2
+      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4b9756b5c9e98c709a2b23e2e558edb29e5f3416
 
 variables:
   KMP_WARNINGS: 0