[libcamera-ci,v2,3/3] Add python3-sphinxcontrib.doxylink package to container images

24009 diff mbox series

libcamera will soon require python3-sphinxcontrib.doxylink to build the
documentation. Add it to the container images.

We also add python3-pyparsing to the list of runtime packages.
python3-pyparsing is a dependency of python3-sphinxcontrib.doxylink and
would get pulled in automatically, but it would also then get
automatically uninstalled if python3-sphinxcontrib.doxylink is replaced
by the PyPI version.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v1:

- Improve commit message
---
 .gitlab-ci/setup-container.sh | 3 +++
 gitlab-ci.yml                 | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

Hi

2025. 07. 28. 17:32 keltezéssel, Laurent Pinchart írta:
> libcamera will soon require python3-sphinxcontrib.doxylink to build the
> documentation. Add it to the container images.
> 
> We also add python3-pyparsing to the list of runtime packages.
> python3-pyparsing is a dependency of python3-sphinxcontrib.doxylink and
> would get pulled in automatically, but it would also then get
> automatically uninstalled if python3-sphinxcontrib.doxylink is replaced
> by the PyPI version.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>


> ---
> Changes since v1:
> 
> - Improve commit message
> ---
>   .gitlab-ci/setup-container.sh | 3 +++
>   gitlab-ci.yml                 | 6 +++---
>   2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> index 7fdac1f9fb66..7029919c509c 100755
> --- a/.gitlab-ci/setup-container.sh
> +++ b/.gitlab-ci/setup-container.sh
> @@ -49,8 +49,10 @@ PKGS_LIBCAMERA_RUNTIME=(
>   	python3-autopep8
>   	python3-dev
>   	python3-jinja2
> +	python3-pyparsing
>   	python3-ply
>   	python3-sphinx
> +	python3-sphinxcontrib.doxylink
>   	python3-yaml
>   	qt6-tools-dev-tools
>   	shellcheck
> @@ -109,6 +111,7 @@ PKGS_VIRTME_RUNTIME=(
>   PKGS_PIP_MIN_VERSIONS=(
>   	'meson meson 1.2.0 remove'
>   	'python3-pygments pygments 2.10.0 keep'
> +	'python3-sphinxcontrib.doxylink sphinxcontrib-doxylink 1.6.1 remove'
>   )
>   
>   archs=( amd64 )
> diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> index 03ea7795f3ff..57607dbfe7e4 100644
> --- a/gitlab-ci.yml
> +++ b/gitlab-ci.yml
> @@ -59,17 +59,17 @@ include:
>   .libcamera-ci.debian:11:
>     variables:
>       FDO_DISTRIBUTION_VERSION: 'bullseye'
> -    FDO_DISTRIBUTION_TAG: '2025-07-25.1'
> +    FDO_DISTRIBUTION_TAG: '2025-07-27.1'
>   
>   .libcamera-ci.debian:12:
>     variables:
>       FDO_DISTRIBUTION_VERSION: 'bookworm'
> -    FDO_DISTRIBUTION_TAG: '2025-02-27.1'
> +    FDO_DISTRIBUTION_TAG: '2025-07-27.1'
>   
>   .libcamera-ci.debian:13:
>     variables:
>       FDO_DISTRIBUTION_VERSION: 'trixie'
> -    FDO_DISTRIBUTION_TAG: '2025-07-25.1'
> +    FDO_DISTRIBUTION_TAG: '2025-07-27.1'
>   
>   .container-debian:
>     extends: