From f2497e5e56df24fd0c7939687b8432317ad8e84d Mon Sep 17 00:00:00 2001 From: akeeste Date: Fri, 17 Oct 2025 13:20:29 -0500 Subject: [PATCH 1/6] update python actions and python version for pypi.yml --- .github/workflows/pypi.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 99d9437c..7e4fc9dd 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -16,13 +16,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.10 - run: python -m pip install build --user - run: python -m build --sdist --wheel --outdir dist/ . From 9795c9d74ddd805d1b64dd53614c4312de2859c4 Mon Sep 17 00:00:00 2001 From: akeeste Date: Fri, 17 Oct 2025 13:25:59 -0500 Subject: [PATCH 2/6] add PRs into main as pypi.yml trigger for testing the local wheel build --- .github/workflows/pypi.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 7e4fc9dd..3d6c55c2 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -7,6 +7,9 @@ on: push: branches: - main + pull_request: + branches: + - main release: types: [published] @@ -36,8 +39,8 @@ jobs: pip install 'mhkit[all]' --find-links dist/ python -c "from mhkit import wave, river, tidal, dolfyn, power, loads, mooring, acoustics, qc, utils; print('All modules imported successfully')" - - name: Upload to Test PyPI - if: github.event_name != 'release' && github.repository_owner == 'MHKiT-Software' + - name: Upload to Test PyPI (commits to main only) + if: github.event_name == 'push' && github.repository_owner == 'MHKiT-Software' uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ From 4508d40349075c9bccb182f15af44a6dc863321d Mon Sep 17 00:00:00 2001 From: akeeste Date: Fri, 17 Oct 2025 13:48:33 -0500 Subject: [PATCH 3/6] Revert "add PRs into main as pypi.yml trigger for testing the local wheel build" This reverts commit 9795c9d74ddd805d1b64dd53614c4312de2859c4. --- .github/workflows/pypi.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 3d6c55c2..7e4fc9dd 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -7,9 +7,6 @@ on: push: branches: - main - pull_request: - branches: - - main release: types: [published] @@ -39,8 +36,8 @@ jobs: pip install 'mhkit[all]' --find-links dist/ python -c "from mhkit import wave, river, tidal, dolfyn, power, loads, mooring, acoustics, qc, utils; print('All modules imported successfully')" - - name: Upload to Test PyPI (commits to main only) - if: github.event_name == 'push' && github.repository_owner == 'MHKiT-Software' + - name: Upload to Test PyPI + if: github.event_name != 'release' && github.repository_owner == 'MHKiT-Software' uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ From be6e5cfd22ecb2c1ec040d01cec2b247ce8c7607 Mon Sep 17 00:00:00 2001 From: akeeste Date: Fri, 17 Oct 2025 13:48:59 -0500 Subject: [PATCH 4/6] fix float to string --- .github/workflows/pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 7e4fc9dd..da4d5936 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: '3.10' - run: python -m pip install build --user - run: python -m build --sdist --wheel --outdir dist/ . From ed9df8d36ac92e927d81decde1e3d0173b98a1ff Mon Sep 17 00:00:00 2001 From: akeeste Date: Fri, 17 Oct 2025 13:57:10 -0500 Subject: [PATCH 5/6] readd PR into main trigger to pypi.yml --- .github/workflows/pypi.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index da4d5936..9cc2d2e0 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -7,6 +7,9 @@ on: push: branches: - main + pull_request: + branches: + - main release: types: [published] @@ -36,8 +39,8 @@ jobs: pip install 'mhkit[all]' --find-links dist/ python -c "from mhkit import wave, river, tidal, dolfyn, power, loads, mooring, acoustics, qc, utils; print('All modules imported successfully')" - - name: Upload to Test PyPI - if: github.event_name != 'release' && github.repository_owner == 'MHKiT-Software' + - name: Upload to Test PyPI (commits to main only) + if: github.event_name == 'push' && github.repository_owner == 'MHKiT-Software' uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ From dc77a38a3c4019c7e6267238609a3538779ff819 Mon Sep 17 00:00:00 2001 From: akeeste Date: Fri, 17 Oct 2025 13:57:46 -0500 Subject: [PATCH 6/6] limit test-wheel-build.yml to 3.11-3.12; pypi.yml covers 3.10 --- .github/workflows/test-wheel-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-wheel-build.yml b/.github/workflows/test-wheel-build.yml index 59e316bc..8186eff5 100644 --- a/.github/workflows/test-wheel-build.yml +++ b/.github/workflows/test-wheel-build.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.10', '3.11', '3.12'] + python-version: ['3.11', '3.12'] steps: - uses: actions/checkout@v2