Merge branch 'master' into clients

Author: kujaku11

.github/workflows/bump-version.yml

@@ -10,6 +10,9 @@ permissions:
   contents: write
   pull-requests: write
 
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
+
 jobs:
   bump-version:
     # Run only when a release label is added to an open PR
@@ -23,23 +26,40 @@ jobs:
 
     steps:
       - name: Check out PR branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.2
         with:
           ref: ${{ github.head_ref }}
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6.2.0
         with:
           python-version: "3.13"
 
       - name: Install tools
         run: |
-          pip install bump-my-version pandoc
+          pip install bump-my-version
           sudo apt-get update
           sudo apt-get install -y pandoc
-          cargo install git-cliff
+
+      - name: Install git-cliff binary
+        run: |
+          GIT_CLIFF_VERSION="2.12.0"
+          ARCH="$(uname -m)"
+          if [ "$ARCH" = "x86_64" ]; then
+            TARGET="x86_64-unknown-linux-gnu"
+          elif [ "$ARCH" = "aarch64" ]; then
+            TARGET="aarch64-unknown-linux-gnu"
+          else
+            echo "Unsupported architecture: $ARCH"
+            exit 1
+          fi
+
+          curl -sSL -o git-cliff.tar.gz "https://github.com/orhun/git-cliff/releases/download/v${GIT_CLIFF_VERSION}/git-cliff-${GIT_CLIFF_VERSION}-${TARGET}.tar.gz"
+          tar -xzf git-cliff.tar.gz
+          sudo install -m 755 "git-cliff-${GIT_CLIFF_VERSION}/git-cliff" /usr/local/bin/git-cliff
+          git cliff --version
 
       - name: Set up Git user
         run: |
@@ -65,7 +85,7 @@ jobs:
       - name: Extract version
         id: version
         run: |
-          VERSION=$(bump-my-version show current)
+          VERSION=$(grep '^version = ' pyproject.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
           echo "Extracted version: $VERSION"
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
@@ -97,7 +117,7 @@ jobs:
           git push origin HEAD:${{ github.head_ref }}
 
       - name: Add comment to PR
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9.0.0
         with:
           script: |
             github.rest.issues.createComment({

.github/workflows/publish.yml

@@ -1,67 +1,111 @@
 name: Publish to PyPI
 
 on:
-  pull_request:
-    types: [closed]
+  push:
     branches:
       - master
 
 permissions:
   contents: write
   id-token: write
+  pull-requests: read
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
 
 jobs:
   publish:
-    # Run only after PR is merged with release labels
-    if: |
-      github.event.pull_request.merged == true && (
-        contains(github.event.pull_request.labels.*.name, 'release:major') ||
-        contains(github.event.pull_request.labels.*.name, 'release:minor') ||
-        contains(github.event.pull_request.labels.*.name, 'release:patch')
-      )
     runs-on: ubuntu-latest
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
 
+      - name: Check merged PR release label
+        id: release_label_check
+        uses: actions/github-script@v9.0.0
+        with:
+          script: |
+            const releaseLabels = ['release:major', 'release:minor', 'release:patch'];
+            const { owner, repo } = context.repo;
+            const commitSha = context.sha;
+
+            const prs = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+              owner,
+              repo,
+              commit_sha: commitSha,
+            });
+
+            const mergedPr = prs.data.find((pr) => pr.merged_at && pr.base?.ref === 'master');
+
+            if (!mergedPr) {
+              core.notice(`No merged PR associated with commit ${commitSha}. Skipping publish.`);
+              core.setOutput('should_publish', 'false');
+              return;
+            }
+
+            const labelNames = (mergedPr.labels || [])
+              .map((label) => label?.name)
+              .filter(Boolean);
+            const matchedLabel = releaseLabels.find((label) => labelNames.includes(label));
+
+            if (!matchedLabel) {
+              core.notice(
+                `Merged PR #${mergedPr.number} does not include a release label (${releaseLabels.join(', ')}). Skipping publish.`
+              );
+              core.setOutput('should_publish', 'false');
+              return;
+            }
+
+            core.info(`Merged PR #${mergedPr.number} has label ${matchedLabel}. Publishing enabled.`);
+            core.setOutput('should_publish', 'true');
+            core.setOutput('release_label', matchedLabel);
+            core.setOutput('pr_number', String(mergedPr.number));
+
       - name: Set up Python
-        uses: actions/setup-python@v5
+        if: steps.release_label_check.outputs.should_publish == 'true'
+        uses: actions/setup-python@v6.2.0
         with:
           python-version: "3.13"
 
       - name: Install tools
+        if: steps.release_label_check.outputs.should_publish == 'true'
         run: pip install bump-my-version build
 
       - name: Extract version
         id: version
+        if: steps.release_label_check.outputs.should_publish == 'true'
         run: |
           VERSION=$(bump-my-version show current_version)
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: v${{ steps.version.outputs.version }}
-          name: v${{ steps.version.outputs.version }}
-          body_path: CHANGELOG.md
-          generate_release_notes: false
-
       - name: Build package
+        if: steps.release_label_check.outputs.should_publish == 'true'
         run: python -m build
 
       - name: Publish to TestPyPI
         id: test-pypi
+        if: steps.release_label_check.outputs.should_publish == 'true'
         uses: pypa/gh-action-pypi-publish@v1.13.0
         with:
           repository-url: https://test.pypi.org/legacy/
           skip-existing: true
           attestations: false
 
       - name: Publish to PyPI
-        if: steps.test-pypi.outcome == 'success'
+        id: pypi
+        if: steps.release_label_check.outputs.should_publish == 'true' && steps.test-pypi.outcome == 'success'
         uses: pypa/gh-action-pypi-publish@v1.13.0
         with:
-          skip-existing: true
+          skip-existing: true
+
+      - name: Create GitHub Release
+        if: steps.release_label_check.outputs.should_publish == 'true' && steps.pypi.outcome == 'success'
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ steps.version.outputs.version }}
+          name: v${{ steps.version.outputs.version }}
+          body_path: CHANGELOG.md
+          generate_release_notes: false

.github/workflows/tests.yml

@@ -23,15 +23,19 @@ jobs:
         python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
     defaults:
       run:
-        shell: bash -el {0}
+        shell: bash -e {0}
 
     steps:
     - uses: actions/checkout@v4
-    - uses: conda-incubator/setup-miniconda@v3
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
       with:
-        auto-update-conda: true
         python-version: ${{ matrix.python-version }}
 
+    - name: Set up uv
+      uses: astral-sh/setup-uv@v5
+
     - name: Cache MTH5 Test Fixtures
       uses: actions/cache@v3
       with:
@@ -46,18 +50,21 @@ jobs:
     - name: Install Env
       run: |
         python --version
-        conda install pytest
-        conda install pytest-cov
-        conda install pytest-subtests
-        conda install pytest-xdist[psutil]
-        conda install pytest-benchmark
-        conda install setuptools
-        pip install mt_metadata[obspy]
-        pip install git+https://github.com/kujaku11/mth5_test_data.git
+        uv pip install --system \
+          pytest \
+          pytest-cov \
+          pytest-subtests \
+          "pytest-xdist[psutil]" \
+          pytest-benchmark \
+          setuptools \
+          "mt_metadata[obspy]" \
+          "git+https://github.com/kujaku11/mt-io.git@develop" \
+          "git+https://github.com/kujaku11/mth5_test_data.git"
+
     - name: Install Our Package
       run: |
-        pip install -e .
-        conda list
+        uv pip install --system -e .
+        pip list
 
     #- name: Install Jupyter and dependencies
     #  run: |

.vscode/settings.json

@@ -8,5 +8,12 @@
         "tests"
     ],
     "python.testing.autoTestDiscoverOnSaveEnabled": true,
-    "python.testing.cwd": "${workspaceFolder}"
+    "python.testing.cwd": "${workspaceFolder}",
+    "python-envs.pythonProjects": [
+        {
+            "path": ".",
+            "envManager": "ms-python.python:conda",
+            "packageManager": "ms-python.python:conda"
+        }
+    ]
 }

HISTORY.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+All notable changes to this project will be documented in this file.
+Changelog
+=========
+
+All notable changes to this project will be documented in this file.
+Changelog
+=========
+
 All notable changes to this project will be documented in this file.
 History
 =========