Merge tag 'v0.21.2.1b2+mira' into develop

MiraGeoscience · Nov 16, 2024 · 93c899f · 93c899f
2 parents 6ea9a45 + e50c6ae
commit 93c899f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 12 deletions.
diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml
@@ -5,14 +5,18 @@ 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
     uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_conda_package.yml@main
     with:
       package-name: 'mira-simpeg'
       python-version: '3.10'
-      virtual-repo-nameS: '["public-conda-dev"]'
+      virtual-repo-names: '["public-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
@@ -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: 'mira-simpeg'
-      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 (JFrog Artifactory and PyPI)
-    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: 'setuptools'
       package-name: 'mira-simpeg'
-      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
@@ -1,5 +1,8 @@
 default_language_version:
   python: python3
+default_stages: [pre-commit,pre-push]
+fail_fast: false
+
 repos:
   - repo: https://github.com/psf/black-pre-commit-mirror
     rev: 24.3.0