From 1f9e51031b5227b5c59cb1dc1a5c69f92e8e2c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Sun, 17 Nov 2024 21:33:10 -0500 Subject: [PATCH 1/5] minor github workflow job renaming --- .github/workflows/python_deploy_dev.yml | 2 +- .github/workflows/python_deploy_prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml index ab1ae5843e..1850848ee4 100644 --- a/.github/workflows/python_deploy_dev.yml +++ b/.github/workflows/python_deploy_dev.yml @@ -21,7 +21,7 @@ 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 and TestPyPI) + name: Publish development pypi package (JFrog Artifactory, TestPyPI) uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main with: package-manager: 'setuptools' diff --git a/.github/workflows/python_deploy_prod.yml b/.github/workflows/python_deploy_prod.yml index b5d2853e52..d2a31fc63f 100644 --- a/.github/workflows/python_deploy_prod.yml +++ b/.github/workflows/python_deploy_prod.yml @@ -33,7 +33,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 and PyPI) + 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@main with: From 7564f80949966410f5b40433c2cddf0aaa46824a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Sun, 17 Nov 2024 22:32:45 -0500 Subject: [PATCH 2/5] fix version in conda recipe --- meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta.yaml b/meta.yaml index 6695ce1d11..ecbd953315 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,5 +1,5 @@ {% set name = "mira-simpeg" %} -{% set version = "0.21.2.1a0" %} +{% set version = "0.21.2.1b2" %} package: name: {{ name|lower }} @@ -25,7 +25,7 @@ requirements: - discretize >=0.10.0 - empymod >=2.0.0 - geoana >=0.5.0 - - geoh5py >=0.10.0a.1, <0.11 + - geoh5py >=0.10.0b1, <0.11.0a.dev - matplotlib-base - numpy >=1.20 - pandas From b0667e81242d79502826cf1a4ba01264f3ac6b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Sun, 17 Nov 2024 22:33:20 -0500 Subject: [PATCH 3/5] temporarily skip pypi-dev workflow --- .github/workflows/python_deploy_dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml index 1850848ee4..e9f85cf6af 100644 --- a/.github/workflows/python_deploy_dev.yml +++ b/.github/workflows/python_deploy_dev.yml @@ -23,6 +23,7 @@ jobs: call-workflow-pypi-publish: name: Publish development pypi package (JFrog Artifactory, TestPyPI) uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main + if: false with: package-manager: 'setuptools' package-name: 'mira-simpeg' From bfa265ed91aaab695d2ad27dba05ea35b94dc713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Sun, 17 Nov 2024 22:34:59 -0500 Subject: [PATCH 4/5] Revert "temporarily skip pypi-dev workflow" This reverts commit b0667e81242d79502826cf1a4ba01264f3ac6b6f. --- .github/workflows/python_deploy_dev.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml index e9f85cf6af..1850848ee4 100644 --- a/.github/workflows/python_deploy_dev.yml +++ b/.github/workflows/python_deploy_dev.yml @@ -23,7 +23,6 @@ jobs: call-workflow-pypi-publish: name: Publish development pypi package (JFrog Artifactory, TestPyPI) uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main - if: false with: package-manager: 'setuptools' package-name: 'mira-simpeg' From 2d6e87e1a14ab9e7c655fd59294689a498b29f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Sun, 17 Nov 2024 22:35:50 -0500 Subject: [PATCH 5/5] bump version to beta.3 in conda recipe --- meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta.yaml b/meta.yaml index ecbd953315..0efacff965 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,5 +1,5 @@ {% set name = "mira-simpeg" %} -{% set version = "0.21.2.1b2" %} +{% set version = "0.21.2.1b3" %} package: name: {{ name|lower }}