From 052ed8e119d8c0c4096e18d96cce3a9dcb93ad88 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 29 Aug 2024 10:45:15 +0100 Subject: [PATCH] Bump minimum Sphinx version This is a little more realistic. Sphinx 6.0.0 was released in December 2022 [1]. In the absence of a lower-constraints job, I manually tested that our own docs still build with this version. [1] https://pypi.org/project/Sphinx/6.0.0/ Change-Id: I62dcc47b7053deb46139ca1f46c0d8e6fc2720d6 Signed-off-by: Stephen Finucane --- openstackdocstheme/ext.py | 6 +----- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/openstackdocstheme/ext.py b/openstackdocstheme/ext.py index 82102dfe..6621be2f 100644 --- a/openstackdocstheme/ext.py +++ b/openstackdocstheme/ext.py @@ -19,7 +19,6 @@ import textwrap import dulwich.repo from pbr import packaging -import sphinx from sphinx.ext import extlinks from sphinx.util import logging @@ -330,10 +329,7 @@ def _setup_link_roles(app): url, ) - if sphinx.version_info >= (4, 0, 0): - role = extlinks.make_link_role(project_name, url, project_name) - else: - role = extlinks.make_link_role(url, project_name) + role = extlinks.make_link_role(project_name, url, project_name) app.add_role(role_name, role) diff --git a/requirements.txt b/requirements.txt index 6063175b..7effca43 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 dulwich>=0.15.0 # Apache-2.0 -sphinx>=2.0.0,!=2.1.0 # BSD +sphinx>=6.0.0 # BSD