From 325d80430bcd663af028668cbf44f62489d2db3f Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 14 Oct 2024 20:17:28 +0200 Subject: [PATCH 1/2] Read the Docs should always source requirements.txt from "main" HTTP URI of doc/arm/requirements.txt on the "main" branch is the source of PyPI packages in CI base image. To make it consistent in all maintained CI branches on RTD, use the HTTP URI as well. This change is non-material on the "main" branch, but ensures the right packages on stable branches where for RTD we currently leverage outdated packages because we failed to update doc/arm/requirements.txt there. (cherry picked from commit 8fb61154923340eaeabd5d397af1f1149e7600a1) --- .readthedocs.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 5ea7be0600..010dc6e0c1 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,6 +6,9 @@ build: os: ubuntu-22.04 tools: python: "3.11" + jobs: + pre_build: + - python -m pip install -r https://gitlab.isc.org/isc-projects/bind9/-/raw/main/doc/arm/requirements.txt # Build documentation in doc/arm/ with Sphinx sphinx: @@ -13,8 +16,3 @@ sphinx: # Build all formats formats: all - -# Explicitly set the version of Python and its requirements -python: - install: - - requirements: doc/arm/requirements.txt From a43ed940cd1d79f9cc6f12adbad4dde385a87f28 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 17 Oct 2024 12:56:41 +0200 Subject: [PATCH 2/2] Drop doc/arm/requirements.txt doc/arm/requirements.txt is maintained only on the "main" branch. --- .reuse/dep5 | 1 - doc/arm/Makefile.am | 1 - doc/arm/requirements.txt | 3 --- 3 files changed, 5 deletions(-) delete mode 100644 doc/arm/requirements.txt diff --git a/.reuse/dep5 b/.reuse/dep5 index 26c7e8ac69..82abca75c4 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -119,7 +119,6 @@ Files: **/*.after* doc/arm/*.dia doc/arm/*.png doc/arm/isc-logo.pdf - doc/arm/requirements.txt doc/man/*.1in doc/man/*.5in doc/man/*.8in diff --git a/doc/arm/Makefile.am b/doc/arm/Makefile.am index 13e7ad1ca6..571b66be48 100644 --- a/doc/arm/Makefile.am +++ b/doc/arm/Makefile.am @@ -52,7 +52,6 @@ EXTRA_DIST = \ recursive-query.png \ reference.rst \ requirements.inc.rst \ - requirements.txt \ resolver-forward.dia \ resolver-forward.png \ rpz.inc.rst \ diff --git a/doc/arm/requirements.txt b/doc/arm/requirements.txt deleted file mode 100644 index f8b0d65d55..0000000000 --- a/doc/arm/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -Sphinx==8.1.3 -docutils==0.21.2 -sphinx_rtd_theme==3.0.1