[libcamera-ci] Add sphinx-book-theme package to container images
diff mbox series

Message ID 20250911230514.26202-1-laurent.pinchart@ideasonboard.com
State Superseded
Headers show
Series
  • [libcamera-ci] Add sphinx-book-theme package to container images
Related show

Commit Message

Laurent Pinchart Sept. 11, 2025, 11:05 p.m. UTC 
libcamera will soon switch to sphinx-book-theme for documentation. Add
the corresponding package to container images.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 .gitlab-ci/setup-container.sh | 5 +++++
 gitlab-ci.yml                 | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)


base-commit: d58b30ed21a5663c5c6fd19da158de01b186831e

Comments

Barnabás Pőcze Sept. 12, 2025, 9:12 a.m. UTC | #1 
2025. 09. 12. 1:05 keltezéssel, Laurent Pinchart írta:
> libcamera will soon switch to sphinx-book-theme for documentation. Add
> the corresponding package to container images.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>   .gitlab-ci/setup-container.sh | 5 +++++
>   gitlab-ci.yml                 | 6 +++---
>   2 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> index 7029919c509c..444b870a09d0 100755
> --- a/.gitlab-ci/setup-container.sh
> +++ b/.gitlab-ci/setup-container.sh
> @@ -111,6 +111,7 @@ PKGS_VIRTME_RUNTIME=(
>   PKGS_PIP_MIN_VERSIONS=(
>   	'meson meson 1.2.0 remove'
>   	'python3-pygments pygments 2.10.0 keep'
> +	'python3-sphinx-book-theme python3-sphinx-book-theme 0.1.7 remove'

Is it not `sphinx-book-theme`? `pip install python3-sphinx-book-theme` fails for me.


Regards,
Barnabás Pőcze

>   	'python3-sphinxcontrib.doxylink sphinxcontrib-doxylink 1.6.1 remove'
>   )
>   
> @@ -125,6 +126,8 @@ case $FDO_DISTRIBUTION_VERSION in
>   	PKGS_LIBCAMERA_RUNTIME+=( g++-9 )
>   	;;
>   'bookworm')
> +	# Sphinx theme for the documentation.
> +	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
>   	# libclang-rt-dev for the clang ASan runtime.
>   	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
>   	# For cam and lc-compliance
> @@ -134,6 +137,8 @@ case $FDO_DISTRIBUTION_VERSION in
>   'trixie')
>   	# gcc 13 to expand compilation testing coverage.
>   	PKGS_LIBCAMERA_RUNTIME+=( g++-13 )
> +	# Sphinx theme for the documentation.
> +	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
>   	# libclang-rt-dev for the clang ASan runtime.
>   	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
>   	;;
> diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> index 57607dbfe7e4..c8ec345f14d2 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-27.1'
> +    FDO_DISTRIBUTION_TAG: '2025-09-08.0'
>   
>   .libcamera-ci.debian:12:
>     variables:
>       FDO_DISTRIBUTION_VERSION: 'bookworm'
> -    FDO_DISTRIBUTION_TAG: '2025-07-27.1'
> +    FDO_DISTRIBUTION_TAG: '2025-09-08.0'
>   
>   .libcamera-ci.debian:13:
>     variables:
>       FDO_DISTRIBUTION_VERSION: 'trixie'
> -    FDO_DISTRIBUTION_TAG: '2025-07-27.1'
> +    FDO_DISTRIBUTION_TAG: '2025-09-08.0'
>   
>   .container-debian:
>     extends:
> 
> base-commit: d58b30ed21a5663c5c6fd19da158de01b186831e
Laurent Pinchart Sept. 12, 2025, 9:23 a.m. UTC | #2 
On Fri, Sep 12, 2025 at 11:12:02AM +0200, Barnabás Pőcze wrote:
> 2025. 09. 12. 1:05 keltezéssel, Laurent Pinchart írta:
> > libcamera will soon switch to sphinx-book-theme for documentation. Add
> > the corresponding package to container images.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >   .gitlab-ci/setup-container.sh | 5 +++++
> >   gitlab-ci.yml                 | 6 +++---
> >   2 files changed, 8 insertions(+), 3 deletions(-)
> > 
> > diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> > index 7029919c509c..444b870a09d0 100755
> > --- a/.gitlab-ci/setup-container.sh
> > +++ b/.gitlab-ci/setup-container.sh
> > @@ -111,6 +111,7 @@ PKGS_VIRTME_RUNTIME=(
> >   PKGS_PIP_MIN_VERSIONS=(
> >   	'meson meson 1.2.0 remove'
> >   	'python3-pygments pygments 2.10.0 keep'
> > +	'python3-sphinx-book-theme python3-sphinx-book-theme 0.1.7 remove'
> 
> Is it not `sphinx-book-theme`? `pip install python3-sphinx-book-theme` fails for me.

You're right, and there's another bug that hid this one. I'll send a v2.

> >   	'python3-sphinxcontrib.doxylink sphinxcontrib-doxylink 1.6.1 remove'
> >   )
> >   
> > @@ -125,6 +126,8 @@ case $FDO_DISTRIBUTION_VERSION in
> >   	PKGS_LIBCAMERA_RUNTIME+=( g++-9 )
> >   	;;
> >   'bookworm')
> > +	# Sphinx theme for the documentation.
> > +	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
> >   	# libclang-rt-dev for the clang ASan runtime.
> >   	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
> >   	# For cam and lc-compliance
> > @@ -134,6 +137,8 @@ case $FDO_DISTRIBUTION_VERSION in
> >   'trixie')
> >   	# gcc 13 to expand compilation testing coverage.
> >   	PKGS_LIBCAMERA_RUNTIME+=( g++-13 )
> > +	# Sphinx theme for the documentation.
> > +	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
> >   	# libclang-rt-dev for the clang ASan runtime.
> >   	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
> >   	;;
> > diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> > index 57607dbfe7e4..c8ec345f14d2 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-27.1'
> > +    FDO_DISTRIBUTION_TAG: '2025-09-08.0'
> >   
> >   .libcamera-ci.debian:12:
> >     variables:
> >       FDO_DISTRIBUTION_VERSION: 'bookworm'
> > -    FDO_DISTRIBUTION_TAG: '2025-07-27.1'
> > +    FDO_DISTRIBUTION_TAG: '2025-09-08.0'
> >   
> >   .libcamera-ci.debian:13:
> >     variables:
> >       FDO_DISTRIBUTION_VERSION: 'trixie'
> > -    FDO_DISTRIBUTION_TAG: '2025-07-27.1'
> > +    FDO_DISTRIBUTION_TAG: '2025-09-08.0'
> >   
> >   .container-debian:
> >     extends:
> > 
> > base-commit: d58b30ed21a5663c5c6fd19da158de01b186831e

Patch
diff mbox series 

diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
index 7029919c509c..444b870a09d0 100755
--- a/.gitlab-ci/setup-container.sh
+++ b/.gitlab-ci/setup-container.sh
@@ -111,6 +111,7 @@  PKGS_VIRTME_RUNTIME=(
 PKGS_PIP_MIN_VERSIONS=(
 	'meson meson 1.2.0 remove'
 	'python3-pygments pygments 2.10.0 keep'
+	'python3-sphinx-book-theme python3-sphinx-book-theme 0.1.7 remove'
 	'python3-sphinxcontrib.doxylink sphinxcontrib-doxylink 1.6.1 remove'
 )
 
@@ -125,6 +126,8 @@  case $FDO_DISTRIBUTION_VERSION in
 	PKGS_LIBCAMERA_RUNTIME+=( g++-9 )
 	;;
 'bookworm')
+	# Sphinx theme for the documentation.
+	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
 	# libclang-rt-dev for the clang ASan runtime.
 	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
 	# For cam and lc-compliance
@@ -134,6 +137,8 @@  case $FDO_DISTRIBUTION_VERSION in
 'trixie')
 	# gcc 13 to expand compilation testing coverage.
 	PKGS_LIBCAMERA_RUNTIME+=( g++-13 )
+	# Sphinx theme for the documentation.
+	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
 	# libclang-rt-dev for the clang ASan runtime.
 	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
 	;;
diff --git a/gitlab-ci.yml b/gitlab-ci.yml
index 57607dbfe7e4..c8ec345f14d2 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-27.1'
+    FDO_DISTRIBUTION_TAG: '2025-09-08.0'
 
 .libcamera-ci.debian:12:
   variables:
     FDO_DISTRIBUTION_VERSION: 'bookworm'
-    FDO_DISTRIBUTION_TAG: '2025-07-27.1'
+    FDO_DISTRIBUTION_TAG: '2025-09-08.0'
 
 .libcamera-ci.debian:13:
   variables:
     FDO_DISTRIBUTION_VERSION: 'trixie'
-    FDO_DISTRIBUTION_TAG: '2025-07-27.1'
+    FDO_DISTRIBUTION_TAG: '2025-09-08.0'
 
 .container-debian:
   extends: