From 45d711279e20df6cc40aafa3af90f37e4b5f4396 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 13:58:33 +1000 Subject: [PATCH 01/12] Initial test --- .github/workflows/pytest.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index acdc89be..68c5b335 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -16,7 +16,12 @@ jobs: - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python_version }} - - uses: Gr1N/setup-poetry@v9 + - name: Install Poetry + uses: snok/install-poetry@v1 + with: + version: "1.8.3" # pin a known-good version instead of "latest" + virtualenvs-create: true + virtualenvs-in-project: true - name: Cache Python dependencies uses: actions/cache@v4 with: From 911ccac2560188e69d457b592330a5e847d6a297 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 14:05:40 +1000 Subject: [PATCH 02/12] Another test --- .github/workflows/pytest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 68c5b335..7bf423b4 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - python_version: ['3.8.12', '3.9', '3.10'] + python_version: ['3.8.12'] #, '3.9', '3.10'] steps: - uses: actions/checkout@v4 @@ -25,7 +25,7 @@ jobs: - name: Cache Python dependencies uses: actions/cache@v4 with: - path: ~/.cache/pypoetry/virtualenvs + path: .venv key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} - name: Install python dependencies From 3ff301bfc09d8e4139466d08e5dfafdb55a6de3c Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 15:29:46 +1000 Subject: [PATCH 03/12] More testing --- .github/workflows/ci-docs.yml | 9 +++++++-- .github/workflows/pytest.yml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index bd89d7fe..3ba11a11 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -17,11 +17,16 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.9 - - uses: Gr1N/setup-poetry@v8 + - name: Install Poetry + uses: snok/install-poetry@v1 + with: + version: "1.8.3" # pin a known-good version instead of "latest" + virtualenvs-create: true + virtualenvs-in-project: true - name: Cache Python dependencies uses: actions/cache@v3 with: - path: ~/.cache/pypoetry/virtualenvs + path: .venv key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} - name: Install python dependencies run: poetry install diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 7bf423b4..bfb07625 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - python_version: ['3.8.12'] #, '3.9', '3.10'] + python_version: ['3.8.12', '3.9', '3.10'] steps: - uses: actions/checkout@v4 From 2d7b1f1496005f4c67b1db7b59f28dc51af342eb Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 16:26:03 +1000 Subject: [PATCH 04/12] Test build --- .github/workflows/ci-docs.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 3ba11a11..f668ad66 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -1,10 +1,12 @@ name: ci docs -on: - push: - branches: - - master - - main +#on: +# push: +# branches: +# - master +# - main + +on: [pull_request] jobs: deploy: @@ -23,12 +25,9 @@ jobs: version: "1.8.3" # pin a known-good version instead of "latest" virtualenvs-create: true virtualenvs-in-project: true - - name: Cache Python dependencies - uses: actions/cache@v3 - with: - path: .venv - key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} - name: Install python dependencies run: poetry install - - name: Build and deploy docs - run: poetry run mkdocs gh-deploy -m 'github action deployment' --force +# - name: Build and deploy docs +# run: poetry run mkdocs gh-deploy -m 'github action deployment' --force + - name: Test build + run: poetry run mkdocs build From 803d9ce1403267b74ccd3d206f510cd528a5761c Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 16:31:01 +1000 Subject: [PATCH 05/12] update cidocs test job --- .github/workflows/ci-docs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index f668ad66..ac827795 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -9,7 +9,8 @@ name: ci docs on: [pull_request] jobs: - deploy: +# deploy: + test: runs-on: ubuntu-24.04 if: ${{ github.repository_owner == 'askap-vast' }} steps: From a00e87f3c8be2d327985990d0c5d06c5c0a5bf98 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 16:31:52 +1000 Subject: [PATCH 06/12] more fiddling --- .github/workflows/ci-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index ac827795..f47ac537 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -12,7 +12,7 @@ jobs: # deploy: test: runs-on: ubuntu-24.04 - if: ${{ github.repository_owner == 'askap-vast' }} +# if: ${{ github.repository_owner == 'askap-vast' }} steps: - uses: actions/checkout@v4 with: From 0ba3bdbe632ae232103b13ca69900a0e4cf00fc4 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 16:34:41 +1000 Subject: [PATCH 07/12] Add dedicated testing file --- .github/workflows/ci-docs-testing.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/ci-docs-testing.yml diff --git a/.github/workflows/ci-docs-testing.yml b/.github/workflows/ci-docs-testing.yml new file mode 100644 index 00000000..f7df61d8 --- /dev/null +++ b/.github/workflows/ci-docs-testing.yml @@ -0,0 +1,24 @@ +name: ci docs + +on: [pull_request] + +jobs: + test: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-python@v4 + with: + python-version: 3.9 + - name: Install Poetry + uses: snok/install-poetry@v1 + with: + version: "1.8.3" # pin a known-good version instead of "latest" + virtualenvs-create: true + virtualenvs-in-project: true + - name: Install python dependencies + run: poetry install + - name: Test build + run: poetry run mkdocs build From c687727453b333a2c3c5cf5ee780e08ffbd80c8b Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 16:37:16 +1000 Subject: [PATCH 08/12] Fix indents --- .github/workflows/ci-docs-testing.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-docs-testing.yml b/.github/workflows/ci-docs-testing.yml index f7df61d8..6d953c44 100644 --- a/.github/workflows/ci-docs-testing.yml +++ b/.github/workflows/ci-docs-testing.yml @@ -13,11 +13,11 @@ jobs: with: python-version: 3.9 - name: Install Poetry - uses: snok/install-poetry@v1 - with: - version: "1.8.3" # pin a known-good version instead of "latest" - virtualenvs-create: true - virtualenvs-in-project: true + uses: snok/install-poetry@v1 + with: + version: "1.8.3" # pin a known-good version instead of "latest" + virtualenvs-create: true + virtualenvs-in-project: true - name: Install python dependencies run: poetry install - name: Test build From 15d0a32f2b4becc015766b55863f595459189923 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 16:53:26 +1000 Subject: [PATCH 09/12] pin versions --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 6f9912fb..9f197a24 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,6 +37,7 @@ svgpath2mpl = "^1.0.0" setuptools = "^70.0.0" pydantic = "<2.0.0" jplephem = "^2.23" +mkdocs-material = "<9.6.10" [tool.poetry.group.dev.dependencies] ipdb = "^0.13.6" From 3369d3123390998cdf888c7561582e38c33972e3 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 16:58:43 +1000 Subject: [PATCH 10/12] update lock? --- poetry.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index e33180dc..10bef171 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3081,13 +3081,13 @@ pytz = ">=2025.1" [[package]] name = "mkdocs-material" -version = "9.6.10" +version = "9.6.9" description = "Documentation that simply works" optional = false python-versions = ">=3.8" files = [ - {file = "mkdocs_material-9.6.10-py3-none-any.whl", hash = "sha256:36168548df4e2ddeb9a334ddae4ab9c388ccfea4dd50ffee657d22b93dcb1c3e"}, - {file = "mkdocs_material-9.6.10.tar.gz", hash = "sha256:25a453c1f24f34fcf1f53680c03d2c1421b52ce5247f4468153c87a70cd5f1fc"}, + {file = "mkdocs_material-9.6.9-py3-none-any.whl", hash = "sha256:6e61b7fb623ce2aa4622056592b155a9eea56ff3487d0835075360be45a4c8d1"}, + {file = "mkdocs_material-9.6.9.tar.gz", hash = "sha256:a4872139715a1f27b2aa3f3dc31a9794b7bbf36333c0ba4607cf04786c94f89c"}, ] [package.dependencies] @@ -5603,4 +5603,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = ">=3.8.0,<3.11" -content-hash = "009a02ae96d40032edf2ed953c4f504cb7ef716542a5fdfa12644fb99e31979a" +content-hash = "29c409bdcc944ac8b0f95b722f82813c08f60c4f5608aab0d9d6aa962c6c13c2" From 0d2ea6edf1b630f0113943bbeff12af246ccc75d Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 17:07:05 +1000 Subject: [PATCH 11/12] Cleanup --- .github/workflows/ci-docs-testing.yml | 24 ------------------------ .github/workflows/ci-docs.yml | 21 +++++++++------------ 2 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 .github/workflows/ci-docs-testing.yml diff --git a/.github/workflows/ci-docs-testing.yml b/.github/workflows/ci-docs-testing.yml deleted file mode 100644 index 6d953c44..00000000 --- a/.github/workflows/ci-docs-testing.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: ci docs - -on: [pull_request] - -jobs: - test: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: actions/setup-python@v4 - with: - python-version: 3.9 - - name: Install Poetry - uses: snok/install-poetry@v1 - with: - version: "1.8.3" # pin a known-good version instead of "latest" - virtualenvs-create: true - virtualenvs-in-project: true - - name: Install python dependencies - run: poetry install - - name: Test build - run: poetry run mkdocs build diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index f47ac537..3a64a32f 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -1,18 +1,17 @@ name: ci docs -#on: -# push: -# branches: -# - master -# - main +on: + push: + branches: + - master + - main on: [pull_request] jobs: -# deploy: - test: + deploy: runs-on: ubuntu-24.04 -# if: ${{ github.repository_owner == 'askap-vast' }} + if: ${{ github.repository_owner == 'askap-vast' }} steps: - uses: actions/checkout@v4 with: @@ -28,7 +27,5 @@ jobs: virtualenvs-in-project: true - name: Install python dependencies run: poetry install -# - name: Build and deploy docs -# run: poetry run mkdocs gh-deploy -m 'github action deployment' --force - - name: Test build - run: poetry run mkdocs build + - name: Build and deploy docs + run: poetry run mkdocs gh-deploy -m 'github action deployment' --force From d139bf29b389cdf5a47ad942e9d21b1bc3b56fba Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 20 Jul 2026 17:12:45 +1000 Subject: [PATCH 12/12] Updated changelog --- .github/workflows/ci-docs.yml | 2 -- CHANGELOG.md | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 3a64a32f..a493a152 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -6,8 +6,6 @@ on: - master - main -on: [pull_request] - jobs: deploy: runs-on: ubuntu-24.04 diff --git a/CHANGELOG.md b/CHANGELOG.md index 482075af..22b4d02c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +10,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### Changed +- Update github actions installation procedures to use a maintained poetry installer [#623](https://github.com/askap-vast/vast-tools/pull/623) +- Pin mkdocs-material to a sensible version [#623](https://github.com/askap-vast/vast-tools/pull/623) + #### Fixed #### Removed #### List of PRs +- Update github actions installation procedures to use a maintained poetry installer and pin mkdocs-material to a sensible version: fix, docs: [#623](https://github.com/askap-vast/vast-tools/pull/623) ## [3.3.0](https://github.com/askap-vast/vast-tools/releases/v3.3.0) (2026-07-20)