From 124b5680b2fc9d9bc03feb02e94a6743ccff6acd Mon Sep 17 00:00:00 2001 From: Fanwang Meng Date: Sat, 13 Dec 2025 11:26:31 -0500 Subject: [PATCH 1/5] Enable website building check when making a pull request Also updated the GitHub Actions version numbers --- .github/workflows/website.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml index d78d06f64..1ee105d20 100644 --- a/.github/workflows/website.yaml +++ b/.github/workflows/website.yaml @@ -10,7 +10,7 @@ on: types: [opened, synchronize, reopened, closed] branches: - main - + - master permissions: contents: write @@ -27,12 +27,12 @@ jobs: pages: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Install development and distributions version run: | pip install --upgrade pip - pip install .[doc] + pip install ".[doc]" pip install pypandoc_binary - name: Setup pandoc @@ -45,13 +45,13 @@ jobs: - name: Building documentation run: | sphinx-apidoc -a -o ./doc/pyapi/ ./src/grid ./src/grid/tests/ ./src/grid/test/ ./src/grid/data/ --separate - sphinx-build -M html doc _build + sphinx-build -M html doc _build # still need to build and set the PAT to get a rebuild on the pages job, # apart from that quite clean and nice - name: GitHub Pages Action - #if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} - uses: peaceiris/actions-gh-pages@v3 + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: _build/html From fe60f5917f2db0feb385f64c0db6c361fc776799 Mon Sep 17 00:00:00 2001 From: Fanwang Meng Date: Sat, 13 Dec 2025 11:32:44 -0500 Subject: [PATCH 2/5] Update GitHub Actions for jupyter.yaml --- .github/workflows/jupyter.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/jupyter.yaml b/.github/workflows/jupyter.yaml index a0f6b2fb3..c2d068e92 100644 --- a/.github/workflows/jupyter.yaml +++ b/.github/workflows/jupyter.yaml @@ -14,19 +14,19 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - - name: Setup python for notebook testing 3.9 + - name: Setup python for notebook testing 3.12 # gbasis requires python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install dependencies for executing notebook run: | pip install --upgrade pip pip install pytest pytest-md pytest-emoji - # Install jupyter + # Install jupyter pip install jupyterlab nbclient matplotlib # Install iodata pip install qc-iodata From 06b82a1fd3860e2ad7c00a90b5226e79c5c5c26a Mon Sep 17 00:00:00 2001 From: Fanwang Meng Date: Sat, 13 Dec 2025 11:33:01 -0500 Subject: [PATCH 3/5] Update GitHub Actions for pypi_release.yaml --- .github/workflows/pypi_release.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pypi_release.yaml b/.github/workflows/pypi_release.yaml index 591a588eb..694318534 100644 --- a/.github/workflows/pypi_release.yaml +++ b/.github/workflows/pypi_release.yaml @@ -26,13 +26,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.12" - name: Install pypa/build run: >- python -m pip install build @@ -40,7 +40,7 @@ jobs: run: >- python -m build - name: Store the distribution packages - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: python-package-distributions path: dist/ @@ -60,7 +60,7 @@ jobs: steps: - name: Download all the dists - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v7 with: name: python-package-distributions path: dist/ @@ -87,7 +87,7 @@ jobs: name: python-package-distributions path: dist/ - name: Sign the dists with Sigstore - uses: sigstore/gh-action-sigstore-python@v3.0.0 + uses: sigstore/gh-action-sigstore-python@v3.2.0 with: inputs: >- ./dist/*.tar.gz From 957051d81a1e0b802951521efce65023bc8ac3ea Mon Sep 17 00:00:00 2001 From: Fanwang Meng Date: Sat, 13 Dec 2025 11:33:20 -0500 Subject: [PATCH 4/5] Update GitHub Actions for pytest.yaml --- .github/workflows/pytest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index 9eaa3d72a..24b92067d 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -21,7 +21,7 @@ jobs: py: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - - uses: "actions/checkout@v4" + - uses: "actions/checkout@v6" - name: Setup python for test ${{ matrix.py }} uses: actions/setup-python@v5 with: From 5eaf8c3f50c7865956cd7dd2d570a15a1e582b52 Mon Sep 17 00:00:00 2001 From: Fanwang Meng Date: Sat, 13 Dec 2025 11:35:22 -0500 Subject: [PATCH 5/5] Enable the website pushing when pushed to main or master branch --- .github/workflows/website.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml index 1ee105d20..4a6e6fd72 100644 --- a/.github/workflows/website.yaml +++ b/.github/workflows/website.yaml @@ -50,7 +50,7 @@ jobs: # still need to build and set the PAT to get a rebuild on the pages job, # apart from that quite clean and nice - name: GitHub Pages Action - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') }} uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }}