From patchwork Mon Jul 28 15:32:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 24009 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E2531C3323 for ; Mon, 28 Jul 2025 15:32:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 15B07691BF; Mon, 28 Jul 2025 17:32:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="FrRwOj2P"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D0917691B9 for ; Mon, 28 Jul 2025 17:32:13 +0200 (CEST) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id B959542B for ; Mon, 28 Jul 2025 17:31:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1753716691; bh=bEqlKmJ1a9ntQSoH8eCoG7kZRJM0vWsjgxNxzwHyBjQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=FrRwOj2PNAdH5hvlGvvoWoKshOgna0uJXwbkbVxHLwLR2mNbeLK6ubVgu8vVMEnBO 2LKZhn1ji3gusnxWO64UdRAJTAihevfhPD2cJfNZDB0uyVzxTz5CL3+risHqYAf3j4 V869FMn4TuDUGpa0SzHR2eUT861p34MJSTxv+xkY= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [libcamera-ci] [PATCH v2 3/3] Add python3-sphinxcontrib.doxylink package to container images Date: Mon, 28 Jul 2025 18:32:01 +0300 Message-ID: <20250728153201.7843-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250728153201.7843-1-laurent.pinchart@ideasonboard.com> References: <20250728153201.7843-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 Reviewed-by: Barnabás Pőcze --- 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: