From aa2428437e030dd485676cdf4c46e283a69bac37 Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 26 Apr 2026 19:09:55 +0100 Subject: [PATCH 1/2] Fixup: typo in `alabaster.css_t` template filename --- docs/customization.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/customization.rst b/docs/customization.rst index fa2a844..6522905 100644 --- a/docs/customization.rst +++ b/docs/customization.rst @@ -37,7 +37,7 @@ stylesheet as follows: * Create a file named ``custom.css`` anywhere you prefer (typically ``_static/``, but this is solely convention) containing your desired - overrides to the CSS found in Alabaster's ``static/alabaster_css_t``. + overrides to the CSS found in Alabaster's ``static/alabaster.css_t``. * Set the core Sphinx option `html_static_path `_ to either that file's path, or the directory it lives within. From 450f81f1020e8afbb2c8e50817a60949bd813b4f Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 26 Apr 2026 19:10:35 +0100 Subject: [PATCH 2/2] Use recommended ``.jinja`` suffix for Jinja templates Requires Sphinx>=7.4 --- .github/workflows/test.yml | 3 +-- alabaster/__init__.py | 2 +- alabaster/static/{alabaster.css_t => alabaster.css.jinja} | 0 docs/changelog.rst | 3 +++ docs/customization.rst | 4 ++-- docs/installation.rst | 2 +- docs/requirements.txt | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) rename alabaster/static/{alabaster.css_t => alabaster.css.jinja} (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3bf0bd4..a850b20 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,6 @@ jobs: fail-fast: false matrix: sphinx-version: - - "6.2" - "7.4" steps: - uses: actions/checkout@v4 @@ -90,7 +89,7 @@ jobs: - name: Install Sphinx run: | python -m pip install -U pip - python -m pip install "sphinx~=6.2.0" + python -m pip install "sphinx~=7.4.0" python -m pip install . - name: Run Sphinx diff --git a/alabaster/__init__.py b/alabaster/__init__.py index f58fe27..a7740aa 100644 --- a/alabaster/__init__.py +++ b/alabaster/__init__.py @@ -28,7 +28,7 @@ def update_context(app, pagename, templatename, context, doctree): def setup(app): - app.require_sphinx("6.2") + app.require_sphinx("7.4") theme_path = os.path.abspath(os.path.dirname(__file__)) app.add_html_theme("alabaster", theme_path) app.connect("html-page-context", update_context) diff --git a/alabaster/static/alabaster.css_t b/alabaster/static/alabaster.css.jinja similarity index 100% rename from alabaster/static/alabaster.css_t rename to alabaster/static/alabaster.css.jinja diff --git a/docs/changelog.rst b/docs/changelog.rst index 401b51b..1d0b778 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,9 @@ Changelog Next release (in development) ----------------------------- +- Dropped support for Sphinx 7.3 and earlier. +- Use recommended ``.jinja`` suffix for Jinja templates + :git_tag:`1.0.0` -- 2024-07-26 ------------------------------ diff --git a/docs/customization.rst b/docs/customization.rst index 6522905..e91c06c 100644 --- a/docs/customization.rst +++ b/docs/customization.rst @@ -21,7 +21,7 @@ Alabaster's behavior & style can be customized in multiple ways: whenever possible, even if an option is present below. * When in doubt, simply check `the built-in stylesheet's template - `_ + `_ to see whether the option you're looking at is a basic variable insertion or something more complicated.) @@ -37,7 +37,7 @@ stylesheet as follows: * Create a file named ``custom.css`` anywhere you prefer (typically ``_static/``, but this is solely convention) containing your desired - overrides to the CSS found in Alabaster's ``static/alabaster.css_t``. + overrides to the CSS found in Alabaster's ``static/alabaster.css.jinja``. * Set the core Sphinx option `html_static_path `_ to either that file's path, or the directory it lives within. diff --git a/docs/installation.rst b/docs/installation.rst index fb472e2..5ca0ffe 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -2,7 +2,7 @@ Installation ============ -Alabaster requires **Sphinx 6.2 or newer**, and is included as the default +Alabaster requires **Sphinx 7.4 or newer**, and is included as the default theme. .. note:: diff --git a/docs/requirements.txt b/docs/requirements.txt index e6b4848..05c1ab5 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1 +1 @@ -Sphinx>=6.2 +Sphinx>=7.4.0