[9.18] chg: doc: 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.

Backport of MR !9630

Merge branch 'backport-mnowak/rtd-always-resource-requirements-txt-from-main-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!9661
This commit is contained in:
Michal Nowak
2024-10-17 11:23:12 +00:00
4 changed files with 3 additions and 10 deletions

View File

@@ -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

View File

@@ -105,7 +105,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

View File

@@ -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 \

View File

@@ -1,3 +0,0 @@
Sphinx==8.1.3
docutils==0.21.2
sphinx_rtd_theme==3.0.1