From f7687ae307f0e25b44c8bc6607c6fdd039aa398e Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 24 Aug 2023 00:04:32 +0100 Subject: [PATCH 1/5] Bump Sphinx to 7.2.3 --- conf.py | 12 +----------- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/conf.py b/conf.py index a9b0ec1a7d..32d46e5811 100644 --- a/conf.py +++ b/conf.py @@ -1,8 +1,6 @@ -import hashlib import os import sys import time -from pathlib import Path # Location of custom extensions. sys.path.insert(0, os.path.abspath(".") + "/_extensions") @@ -35,14 +33,6 @@ ] -def _asset_hash(path: os.PathLike[str]) -> str: - """Append a `?digest=` to an url based on the file content.""" - full_path = (Path(html_static_path[0]) / path).resolve() - digest = hashlib.sha1(full_path.read_bytes()).hexdigest() - - return f"{path}?digest={digest}" - - html_theme = 'furo' html_theme_options = { "source_repository": "https://github.com/python/devguide", @@ -50,7 +40,7 @@ def _asset_hash(path: os.PathLike[str]) -> str: } html_static_path = ['_static'] html_css_files = [ - _asset_hash('devguide_overrides.css'), + 'devguide_overrides.css', ] html_logo = "_static/python-logo.svg" html_favicon = "_static/favicon.png" diff --git a/requirements.txt b/requirements.txt index b5476b7e0a..7d845d3017 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Sphinx==7.1.1 +Sphinx==7.2.3 furo>=2022.6.4 jinja2 sphinx-lint==0.6.8 From 2635caaf4cb9fb5cdc5220e0d26045cf3cbedb53 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Fri, 25 Aug 2023 04:47:08 +0100 Subject: [PATCH 2/5] Test with sphinx-notfound-page 1.0.0rc1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7d845d3017..940e3b89b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ Sphinx==7.2.3 furo>=2022.6.4 jinja2 sphinx-lint==0.6.8 -sphinx-notfound-page +sphinx-notfound-page>=1.0.0rc1 sphinx_copybutton>=0.3.3 sphinxext-opengraph>=0.7.1 sphinxext-rediraffe From 32ce915cdce8cfccabc100d93ffdc4dcdad12c84 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:49:06 +0100 Subject: [PATCH 3/5] Bump notfound-page to 1.0 Co-authored-by: Hugo van Kemenade --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 940e3b89b3..0f1f116765 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ Sphinx==7.2.3 furo>=2022.6.4 jinja2 sphinx-lint==0.6.8 -sphinx-notfound-page>=1.0.0rc1 +sphinx-notfound-page>=1.0.0 sphinx_copybutton>=0.3.3 sphinxext-opengraph>=0.7.1 sphinxext-rediraffe From 92670d32760d511e94c479dcc57404088a977cb8 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:55:04 +0100 Subject: [PATCH 4/5] Use the latest Sphinx 7.2 release --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0f1f116765..b835ff4e91 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Sphinx==7.2.3 +Sphinx~=7.2.4 furo>=2022.6.4 jinja2 sphinx-lint==0.6.8 From 5dc61f766a5ed0813be167fd82df24900bce938a Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 31 Aug 2023 00:44:14 +0100 Subject: [PATCH 5/5] 7.2.5 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b835ff4e91..260c90752c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Sphinx~=7.2.4 +Sphinx~=7.2.5 furo>=2022.6.4 jinja2 sphinx-lint==0.6.8