From 3fcecf965f9a352c540d7f158436ef631f07ea57 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 29 Jul 2024 09:54:25 +1000 Subject: [PATCH 1/6] Generated test(ish) docs workflow --- .github/workflows/ci-docs-test.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/ci-docs-test.yml diff --git a/.github/workflows/ci-docs-test.yml b/.github/workflows/ci-docs-test.yml new file mode 100644 index 00000000..8ed9875d --- /dev/null +++ b/.github/workflows/ci-docs-test.yml @@ -0,0 +1,23 @@ +name: ci docs + +on: [pull_request] + +jobs: + deploy: + runs-on: ubuntu-20.04 + if: ${{ github.repository_owner == 'askap-vast' }} + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-python@v4 + with: + python-version: 3.9 + - uses: Gr1N/setup-poetry@v8 + - name: Cache Python dependencies + uses: actions/cache@v3 + with: + path: ~/.cache/pypoetry/virtualenvs + key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} + - name: Install python dependencies + run: poetry install From 6935909b25b7c0b91e86d46671797e01610aaa34 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 29 Jul 2024 10:00:08 +1000 Subject: [PATCH 2/6] Remove cache --- .github/workflows/ci-docs-test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-docs-test.yml b/.github/workflows/ci-docs-test.yml index 8ed9875d..dd4a575e 100644 --- a/.github/workflows/ci-docs-test.yml +++ b/.github/workflows/ci-docs-test.yml @@ -14,10 +14,10 @@ jobs: with: python-version: 3.9 - uses: Gr1N/setup-poetry@v8 - - name: Cache Python dependencies - uses: actions/cache@v3 - with: - path: ~/.cache/pypoetry/virtualenvs - key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} + #- name: Cache Python dependencies + # uses: actions/cache@v3 + # with: + # path: ~/.cache/pypoetry/virtualenvs + # key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} - name: Install python dependencies run: poetry install From 6bc355282ade088653b6dff693be54bd6fbcbd0d Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 29 Jul 2024 10:09:52 +1000 Subject: [PATCH 3/6] Removed test workflow --- .github/workflows/ci-docs-test.yml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 .github/workflows/ci-docs-test.yml diff --git a/.github/workflows/ci-docs-test.yml b/.github/workflows/ci-docs-test.yml deleted file mode 100644 index dd4a575e..00000000 --- a/.github/workflows/ci-docs-test.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: ci docs - -on: [pull_request] - -jobs: - deploy: - runs-on: ubuntu-20.04 - if: ${{ github.repository_owner == 'askap-vast' }} - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: actions/setup-python@v4 - with: - python-version: 3.9 - - uses: Gr1N/setup-poetry@v8 - #- name: Cache Python dependencies - # uses: actions/cache@v3 - # with: - # path: ~/.cache/pypoetry/virtualenvs - # key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} - - name: Install python dependencies - run: poetry install From be5d52c342a69b5c9e944310d7f278c1cc418ee5 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 29 Jul 2024 10:10:23 +1000 Subject: [PATCH 4/6] Downgrade jinja2 to 3.0.3 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e7b54e39..40839e69 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,7 @@ pytest-mock = "^3.6.1" autopep8 = "^1.5.7" pytest-cov = "^2.12.1" flake8 = "^4.0.1" -jinja2 = "3.1.4" +jinja2 = "3.0.3" [tool.poetry.scripts] build_lightcurves = "vasttools.bin.build_lightcurves:main" From cdd886ee9e4ecd79c5ed425a0a136567e1fd615f Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 29 Jul 2024 10:14:23 +1000 Subject: [PATCH 5/6] Updated poetry.lock --- poetry.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 7906122e..450fa5b4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. [[package]] name = "aiofiles" @@ -1391,13 +1391,13 @@ trio = ["async_generator", "trio"] [[package]] name = "jinja2" -version = "3.1.4" +version = "3.0.3" description = "A very fast and expressive template engine." optional = false -python-versions = ">=3.7" +python-versions = ">=3.6" files = [ - {file = "jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"}, - {file = "jinja2-3.1.4.tar.gz", hash = "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"}, + {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"}, + {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"}, ] [package.dependencies] @@ -4324,4 +4324,4 @@ test = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-it [metadata] lock-version = "2.0" python-versions = "^3.8.0" -content-hash = "34a7a3b2f0af9a367987819c87b67fbd34df59a507c3652fe85df402c3dab2ca" +content-hash = "fdebab27876e1cb562fc41868655eb0c4ba154bd870cc2be5b17d98df8eaf900" From f935e99d139c1c89c09039e7161280adecbdb4d1 Mon Sep 17 00:00:00 2001 From: Dougal Dobie Date: Mon, 29 Jul 2024 11:41:42 +1000 Subject: [PATCH 6/6] Updated changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00a713ce..382adc16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,12 +12,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### Changed +- Force jinja2==3.0.3 [#551](https://github.com/askap-vast/vast-tools/pull/551) + #### Fixed +- Downgraded jinja2 to fix bug in docs deployment [#551](https://github.com/askap-vast/vast-tools/pull/551) + #### Removed #### List of PRs +- [#551](https://github.com/askap-vast/vast-tools/pull/551): fix: Downgrade jinja2 to fix bug in docs deployment - [#552](https://github.com/askap-vast/vast-tools/pull/552): feat: Add 2023 workshop notebook to docs ## [3.1.0](https://github.com/askap-vast/vast-tools/releases/v3.1.0) (2024-07-26)