From 891819101a4c16632bd753512ea87ef7ef5e3cb2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 13 Aug 2023 23:13:14 -0600 Subject: [PATCH 01/10] Revert "Use correct block, enable built-in slash keypress" --- python_docs_theme/layout.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python_docs_theme/layout.html b/python_docs_theme/layout.html index f8304917..b4502ba4 100644 --- a/python_docs_theme/layout.html +++ b/python_docs_theme/layout.html @@ -82,7 +82,12 @@

{{ _('Navigation') }}

{{ super() }} {%- endblock -%} -{%- block document %} +{%- block css -%} + + {{ super() }} +{%- endblock -%} + +{%- block body_tag %} {{ super() }} {%- if builder != 'htmlhelp' %}
From fc8a8bd0d389aaa8696f3dca6f4a3b118ee5e01f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Mon, 14 Aug 2023 08:35:45 +0300 Subject: [PATCH 02/10] Bump version to allow CI conflict resolution due to https://github.com/python/cpython/pull/107666 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b4179d1f..4042fd5b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "flit_core.buildapi" # project metadata [project] name = "python-docs-theme" -version = "2023.7" +version = "2023.8" description = "The Sphinx theme for the CPython docs and related projects" readme = "README.rst" urls.Code = "https://github.com/python/python-docs-theme" From d766a12d3269ab3624178f07cc4493133345da12 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 20 Aug 2023 13:22:35 +0300 Subject: [PATCH 03/10] Add Python 3.12 classifier --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index b4179d1f..9461479a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,6 +30,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] [[project.authors]] From 14201581d8fe396d270defa93599f133841b379c Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 20 Aug 2023 04:27:19 -0600 Subject: [PATCH 04/10] Add Python 3.13 classifier Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 9461479a..949cb254 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ] [[project.authors]] From 1ea6d1e6fe1c21b1fb1e16671dc6775cf0e018f2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Mon, 14 Aug 2023 08:35:45 +0300 Subject: [PATCH 05/10] Bump version to allow CI conflict resolution due to https://github.com/python/cpython/pull/107666 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 949cb254..9be4a241 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "flit_core.buildapi" # project metadata [project] name = "python-docs-theme" -version = "2023.7" +version = "2023.8" description = "The Sphinx theme for the CPython docs and related projects" readme = "README.rst" urls.Code = "https://github.com/python/python-docs-theme" From c39a9f14456cfe2caabe676ef0863913773da358 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 24 Aug 2023 21:20:16 +0300 Subject: [PATCH 06/10] Dark mode: Also give aside.topic a dark background --- python_docs_theme/static/pydoctheme_dark.css | 1 + 1 file changed, 1 insertion(+) diff --git a/python_docs_theme/static/pydoctheme_dark.css b/python_docs_theme/static/pydoctheme_dark.css index 49a29e3d..46a2c7aa 100644 --- a/python_docs_theme/static/pydoctheme_dark.css +++ b/python_docs_theme/static/pydoctheme_dark.css @@ -103,6 +103,7 @@ div.warning { background-color: rgba(255, 0, 0, 0.5); } +aside.topic, div.topic, div.note, nav.contents { From c72797c54576273c17144d5c7364498f6b828b1e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 25 Aug 2023 09:05:09 +0300 Subject: [PATCH 07/10] Prepare 2023.8 release --- CHANGELOG.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b275b762..cbf71ce7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,16 @@ Changelog ========= +`2023.8 `_ +---------------------------------------------------------------------------- + +- Add Python 3.12 and 3.13 classifiers (#147) + Contributed by Hugo van Kemenade +- Dark mode: Also give aside.topic a dark background (#150) + Contributed by Hugo van Kemenade +- Revert "Enable the slash keypress to focus the search field (#141)" (#146) + Contributed by Hugo van Kemenade + `2023.7 `_ ---------------------------------------------------------------------------- From a36aa936add2de3d763d561af52c834184a0ea9c Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 25 Aug 2023 00:23:47 -0600 Subject: [PATCH 08/10] Fix whitespace Co-authored-by: Ezio Melotti --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cbf71ce7..5f6181fb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,7 +6,7 @@ Changelog ---------------------------------------------------------------------------- - Add Python 3.12 and 3.13 classifiers (#147) - Contributed by Hugo van Kemenade + Contributed by Hugo van Kemenade - Dark mode: Also give aside.topic a dark background (#150) Contributed by Hugo van Kemenade - Revert "Enable the slash keypress to focus the search field (#141)" (#146) From 8afde74e973b22b06849ea3b46cccf2f7ee5359d Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 25 Aug 2023 10:21:01 -0600 Subject: [PATCH 09/10] Improve wording Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5f6181fb..ae953096 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,7 +9,7 @@ Changelog Contributed by Hugo van Kemenade - Dark mode: Also give aside.topic a dark background (#150) Contributed by Hugo van Kemenade -- Revert "Enable the slash keypress to focus the search field (#141)" (#146) +- Restore the menu on mobile devices (inadvertently broken in 2023.7) (#146) Contributed by Hugo van Kemenade `2023.7 `_ From f498f5548bdd5f6ea5f7b9fbd4ce17742c4c3a65 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 25 Aug 2023 19:22:07 +0300 Subject: [PATCH 10/10] Fix whitespace --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ae953096..cbf57d4d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -22,7 +22,7 @@ Changelog - Sphinx 6.2 fix: add ``nav.contents`` where ``div.topic`` is used (#138) Contributed by Hugo van Kemenade - Dark mode: fix contrast for C++ specific styling (#133) - Contributed by Hugo van Kemenade + Contributed by Hugo van Kemenade - Don't let long code literals extend beyond the right side of the screen (#139) Contributed by Hugo van Kemenade - Test with Python 3.12 (#140)