From 1f5b299d9820f2ade84e729ea24b87fcefdaa3c4 Mon Sep 17 00:00:00 2001 From: Nick Spaargaren Date: Wed, 18 Dec 2024 21:08:25 +0000 Subject: [PATCH 01/11] Update python from 3.8 to 3.9 --- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/validate_yaml.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- .python-version | 2 +- .readthedocs.yaml | 2 +- README.md | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e9cdea5967..0d7361c8da 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -19,10 +19,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.9 - name: Cache python env uses: actions/cache@v4 diff --git a/.github/workflows/validate_yaml.yml b/.github/workflows/validate_yaml.yml index 882606cf29..a862e30dce 100644 --- a/.github/workflows/validate_yaml.yml +++ b/.github/workflows/validate_yaml.yml @@ -17,10 +17,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.9 - name: Install dependencies run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f2d199889d..a604cea320 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.9 - name: Cache python env uses: actions/cache@v4 diff --git a/.python-version b/.python-version index eee6392d5c..3750557319 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.8.16 +3.9.21 \ No newline at end of file diff --git a/.readthedocs.yaml b/.readthedocs.yaml index d8d04ac04f..2871689c26 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,7 +3,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.9" python: diff --git a/README.md b/README.md index a7549f56fa..084d2dc14e 100644 --- a/README.md +++ b/README.md @@ -50,11 +50,11 @@ If you run into trouble with broken links to video files, have a look at `_ext/f ### Prerequisites for generating the docs locally -1. Install `python 3.8.x` using your package manager, if not installed already. You'll probably need `root` privileges to do this. +1. Install `python 3.9.x` using your package manager, if not installed already. You'll probably need `root` privileges to do this. 2. Generate a virtual environment for the WTD repo in the `venv` directory: - `virtualenv --python=/usr/bin/python3.8 venv` + `virtualenv --python=/usr/bin/python3.9 venv` ### Installing the project requirements From 968b406bdd5cf72aebfd55da7b0431a9bb3fc50f Mon Sep 17 00:00:00 2001 From: Nick Spaargaren Date: Wed, 18 Dec 2024 21:49:11 +0000 Subject: [PATCH 02/11] Update Sphinx and myst-parser --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8902766bd9..9de486b493 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -Sphinx==4.5.0 +Sphinx==5.3.0 # make livehtml support sphinx_autobuild==2021.3.14 # Markdown support -myst-parser==0.17.2 +myst-parser==3.0.0 # Blogging ablog==0.10.6 # pyup: ignore From 1c142a754286ce6629ac20c09bdcbafc836c0729 Mon Sep 17 00:00:00 2001 From: Nick Spaargaren Date: Wed, 18 Dec 2024 21:54:50 +0000 Subject: [PATCH 03/11] Update Sphinx and docutils --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9de486b493..76b6c2fa52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Sphinx==5.3.0 +Sphinx>=6,<8 # make livehtml support sphinx_autobuild==2021.3.14 @@ -10,7 +10,7 @@ myst-parser==3.0.0 ablog==0.10.6 # pyup: ignore # Sphinx (checked with 4.3) requires docutils=<0.18 -docutils==0.17.1 # pyup: <0.18 +docutils>=0.18,<0.20 # pyup: <0.18 PyYAML>=4.2b1 # Additional libraries From 56613cf12390bbb43cf85e98ceb54f12e3c7cec7 Mon Sep 17 00:00:00 2001 From: Nick Spaargaren Date: Wed, 18 Dec 2024 21:59:02 +0000 Subject: [PATCH 04/11] Add pytz module to requirements --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 76b6c2fa52..a6b562dcc2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,6 +12,7 @@ ablog==0.10.6 # pyup: ignore # Sphinx (checked with 4.3) requires docutils=<0.18 docutils>=0.18,<0.20 # pyup: <0.18 PyYAML>=4.2b1 +pytz==2024.2 # Additional libraries csvkit==1.0.7 From 7f562b559b859f84ae34bc228d3c99c457ccc54e Mon Sep 17 00:00:00 2001 From: Nick Spaargaren Date: Wed, 18 Dec 2024 22:28:58 +0000 Subject: [PATCH 05/11] Trying working versions --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index a6b562dcc2..3ae3b91be2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ -Sphinx>=6,<8 +Sphinx>=5,<6 # make livehtml support sphinx_autobuild==2021.3.14 # Markdown support -myst-parser==3.0.0 +myst-parser==0.18.0 # Blogging ablog==0.10.6 # pyup: ignore # Sphinx (checked with 4.3) requires docutils=<0.18 -docutils>=0.18,<0.20 # pyup: <0.18 +docutils==0.17.1 # pyup: <0.18 PyYAML>=4.2b1 pytz==2024.2 From a765608909a53c001946e2c39f342b301c0f7a84 Mon Sep 17 00:00:00 2001 From: Nick Spaargaren Date: Fri, 20 Dec 2024 09:05:20 +0000 Subject: [PATCH 06/11] Pin sphinx to 5.3.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3ae3b91be2..1c071bd883 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Sphinx>=5,<6 +Sphinx==5.3.0 # make livehtml support sphinx_autobuild==2021.3.14 From 22308e41ba50156314723ffbc17f845c7a1819c4 Mon Sep 17 00:00:00 2001 From: Nick Spaargaren Date: Fri, 20 Dec 2024 09:05:30 +0000 Subject: [PATCH 07/11] Update devcontainer to python 3.9 --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b9ee9e3f0b..bad37f504b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { "name": "Python 3", - "image": "mcr.microsoft.com/devcontainers/python:1-3.8-bookworm", + "image": "mcr.microsoft.com/devcontainers/python:1-3.9-bookworm", "postCreateCommand": "pip3 install --user -r requirements.txt" } From 9af24e0d088e202f73215cf6a2a088ec2be650c2 Mon Sep 17 00:00:00 2001 From: Nick Spaargaren Date: Fri, 20 Dec 2024 09:16:32 +0000 Subject: [PATCH 08/11] Update PyYAML --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1c071bd883..128ec43829 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ ablog==0.10.6 # pyup: ignore # Sphinx (checked with 4.3) requires docutils=<0.18 docutils==0.17.1 # pyup: <0.18 -PyYAML>=4.2b1 +PyYAML==6.0.2 pytz==2024.2 # Additional libraries From 61c954c42989d37fea6005bd17837bea5bfb73d5 Mon Sep 17 00:00:00 2001 From: Nick Spaargaren Date: Fri, 20 Dec 2024 16:33:19 +0000 Subject: [PATCH 09/11] Remove deprecated HTML 4 emitter --- docs/conf.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 73242edb01..a770adafff 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -75,8 +75,6 @@ def _load_data(self, env, data_source, encoding): 'videos/prague/2018/tackling-technical-debt-in-the-docs-louise-fahey.rst', ] -html4_writer = True - # We use these *local* environment variables for private info like free ticket links cfp_variables = {} From 27867050dca19b3b5531bc3d9bab610221c3a1d1 Mon Sep 17 00:00:00 2001 From: Nick Spaargaren Date: Sun, 22 Dec 2024 11:19:59 +0000 Subject: [PATCH 10/11] Update ablog to latest minor --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 128ec43829..c15dab828c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ sphinx_autobuild==2021.3.14 myst-parser==0.18.0 # Blogging -ablog==0.10.6 # pyup: ignore +ablog==0.10.31 # pyup: ignore # Sphinx (checked with 4.3) requires docutils=<0.18 docutils==0.17.1 # pyup: <0.18 From 8bf0fa76bb3192461f2a375111775eecd140c6ee Mon Sep 17 00:00:00 2001 From: Sam Wright Date: Thu, 2 Jan 2025 17:24:51 +0800 Subject: [PATCH 11/11] Ignore blog tag archive --- .github/workflows/ubuntu.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 0d7361c8da..d4e8f9a049 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -57,7 +57,8 @@ jobs: name: html path: html.tar.gz + # TODO: Look into why we need to ignore archive/tag/index - name: Check links if: success() run: | - htmlproofer --ignore-files "/404/,/2013/,/2014/,/2015/,/2016/,/2017/,/search\/index.html/" --allow-hash-href=true --enforce-https=false --ignore-missing-alt=true --disable-external=true docs/_build/html + htmlproofer --ignore-files "/404/,/2013/,/2014/,/2015/,/2016/,/2017/,/search\/index.html/,/archive\/tag\/index/" --allow-hash-href=true --enforce-https=false --ignore-missing-alt=true --disable-external=true docs/_build/html