Merge tag 'v0.2.0-beta.1' into develop

# Conflicts: # .github/workflows/python_deploy_dev.yml # .github/workflows/python_deploy_prod.yml # meta.yaml # param_sweeps/__init__.py # poetry.lock # pyproject.toml
MiraGeoscience · Nov 16, 2024 · 4c7cea3 · 4c7cea3
2 parents b875829 + 6b82b8e
commit 4c7cea3
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 102 deletions.
diff --git a/.github/workflows/python_analysis.yml b/.github/workflows/python_analysis.yml
@@ -38,6 +38,6 @@ jobs:
       os: '["ubuntu-latest", "windows-latest"]'
       cache-number: 1
       codecov-reference-python-version: '3.10'
-      codecov-reference-os: '["ubuntu-latest", "windows-latest"]'
+      codecov-reference-os: '["windows-latest"]'
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml
@@ -5,6 +5,10 @@ on:
     tags:
       - 'v*' # Push events to every version tag (eg. v1.0.0)
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   call-workflow-conda-publish:
     name: Publish development conda package on JFrog Artifactory
@@ -17,14 +21,14 @@ jobs:
       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 and TestPyPI)
     uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main
     with:
       package-manager: 'poetry'
       package-name: 'param-sweeps'
       version-tag: ${{ github.ref_name }}
       python-version: '3.10'
-      virtual-repo-names: '["public-pypi-dev", "pypi-test"]'
+      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
@@ -3,27 +3,43 @@ name: Deploy python package in production
 on:
   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
+        default: true
+      publish-pypi:
+        description: 'Publish PyPI package'
+        required: false
+        default: true
+
+concurrency:
+  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: 'param-sweeps'
-      python-version: '3.10'
       virtual-repo-names: '["public-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 and PyPI)
+    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: 'param-sweeps'
-      version-tag: ${{ github.ref_name }}
-      python-version: '3.10'
       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 }}
       JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -79,7 +79,7 @@ repos:
     -   id: check-toml
     -   id: check-yaml
         exclude: ^meta.yaml$
-#    -   id: check-added-large-files # crashing on some configuration. To be investigated
+    -   id: check-added-large-files
     -   id: check-case-conflict
     -   id: check-merge-conflict
     -   id: debug-statements

diff --git a/meta.yaml b/meta.yaml
@@ -24,7 +24,7 @@ requirements:
   run:
     - python >=3.10.0,<4
     - numpy >=1.26.0,<1.27.0
-    - geoh5py >=0.9.1,<0.11.0a0.dev0
+    - geoh5py >=0.10.0a1,<0.11.0a0.dev0
 
 test:
   imports: