From: Michal Nowak <mnowak@isc.org>
Date: Tue, 29 Aug 2023 08:44:18 +0000 (+0200)
Subject: Install Sphinx tools versions from BIND 9 repository
X-Git-Tag: v9.19.17~22^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=520e97e2fc71271db6504c85965ebdf65e9bb414;p=thirdparty%2Fbind9.git

Install Sphinx tools versions from BIND 9 repository

The doc/arm/requirements.txt file is the single source of truth when it
comes to Sphinx tools versions used to build documentation via
util/release-tarball-comparison.sh.
---

diff --git a/doc/arm/requirements.txt b/doc/arm/requirements.txt
index 4dd6796ea41..f18056d25b4 100644
--- a/doc/arm/requirements.txt
+++ b/doc/arm/requirements.txt
@@ -1,5 +1,5 @@
-# Make Read the Docs use the exact same package versions as in
-# registry.gitlab.isc.org/isc-projects/images/bind9:debian-bookworm-amd64
+# docutils < 0.19 are required for RHEL 8 and older (but we don't care about these)
+# and by the latest sphinx-rtd-theme (and we care about that one)
 Sphinx==6.2.1
 docutils==0.18.1
 sphinx_rtd_theme==1.2.2
diff --git a/util/release-tarball-comparison.sh b/util/release-tarball-comparison.sh
index cca8d288340..4fdb3544661 100755
--- a/util/release-tarball-comparison.sh
+++ b/util/release-tarball-comparison.sh
@@ -63,10 +63,6 @@ run_in_container "apt-get update &&			\
 		xz-utils				\
 "
 
-run_in_container "apt-get -y install --no-install-recommends python3-pip && \
-	rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED && \
-	pip3 install docutils==0.18.1 sphinx-rtd-theme==1.2.2 sphinx==6.2.1"
-
 # Retrieve the release-ready BIND 9 tarball.
 docker cp "${BIND_TARBALL}" "${CONTAINER_ID}:/usr/src"
 
@@ -76,6 +72,9 @@ BIND_DIRECTORY="bind-${BIND_VERSION}"
 # Prepare a temporary "release" tarball from upstream BIND 9 project.
 run_in_container "git -c advice.detachedHead=false clone --branch v${BIND_VERSION} --depth 1 https://${GITLAB_USER}:${GITLAB_TOKEN}@gitlab.isc.org/isc-private/bind9.git && \
 	cd bind9 && \
+	apt-get -y install --no-install-recommends python3-pip && \
+	rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED && \
+	pip3 install \$(awk '!/^#/ { printf \"%s \", \$0 }' doc/arm/requirements.txt) && \
 	if [ $(echo "${BIND_VERSION}" | cut -b 1-5) = 9.16. ]; then \
 		git archive --prefix=${BIND_DIRECTORY}/ --output=${BIND_DIRECTORY}.tar HEAD && \
 		mkdir ${BIND_DIRECTORY} && \