diff --git a/.github/workflows/docs-github-pages-cli.yml b/.github/workflows/docs-github-pages-cli.yml index 1016a5ed..6944d162 100644 --- a/.github/workflows/docs-github-pages-cli.yml +++ b/.github/workflows/docs-github-pages-cli.yml @@ -13,7 +13,8 @@ jobs: name: Build the DDS CLI Documentation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - name: Make dependencies available to Docker container run: | cat requirements.txt requirements-dev.txt > ./docs/requirements.txt diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 54ac8fe4..5cd56edc 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 name: Check out source-code repository - name: Set up Python 3.12 @@ -92,7 +92,7 @@ jobs: OUT_FILE_NAME: dds_cli_ubuntu-latest_x86_64 ASSET_MIME: application/x-elf steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Python 3.9 setup uses: actions/setup-python@v4 with: @@ -124,7 +124,7 @@ jobs: needs: build-n-publish runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Make dependencies available to Docker container run: | cat requirements.txt requirements-dev.txt > ./docs/requirements.txt diff --git a/SPRINTLOG.md b/SPRINTLOG.md index f8af4dd0..57832ad2 100644 --- a/SPRINTLOG.md +++ b/SPRINTLOG.md @@ -397,3 +397,4 @@ _Empty sprint_ # 2024-12-16 - 2024-12-20 - New version: 2.9.0 ([#728](https://github.com/ScilifelabDataCentre/dds_cli/pull/728)) +- Include legacy packages (removed in Python 3.13) in development requirements to fix documentation on GitHub Pages ([#730](https://github.com/ScilifelabDataCentre/dds_cli/pull/730)) diff --git a/requirements-dev.txt b/requirements-dev.txt index 670a73ee..bfb675c5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,4 +5,6 @@ sphinx-click==4.0.0 pyinstaller # version not pinned due to latest used by release procedure pylint==2.17.3 sphinx-copybutton==0.5.1 -sphinxcontrib-svg2pdfconverter==1.2.2 \ No newline at end of file +sphinxcontrib-svg2pdfconverter==1.2.2 +standard-imghdr==3.13.0 # removed in python 3.13, needed for sphinx (until more stable fix) +legacy-cgi==2.6.1 # removed in python 3.13, needed for sphinx (until more stable fix) diff --git a/requirements.txt b/requirements.txt index ca4f94e2..b4f401db 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,4 +16,4 @@ rich==13.6.0 rich-click==1.5.2 simplejson==3.17.6 tzlocal==4.2 -zstandard==0.22.0 +zstandard==0.23.0