From patchwork Thu Jan 18 07:52:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 763613 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e5d:0:b0:337:62d3:c6d5 with SMTP id j29csp658811wrz; Wed, 17 Jan 2024 23:56:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IELL+BnO8qYVqFrIfnX4vR36F/fIaU9NWJQwIz7tsHYXcb6a8/Eu4MvCk1pz22D46a8I7OM X-Received: by 2002:ac8:5f13:0:b0:42a:1e82:9cfd with SMTP id x19-20020ac85f13000000b0042a1e829cfdmr13835qta.48.1705564597758; Wed, 17 Jan 2024 23:56:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705564597; cv=none; d=google.com; s=arc-20160816; b=iG45+TtsjQP/YgyDdCmXMmKTSsC2VvUMguLMt3kMWQgrxWHM+CKMbLWMQ918r3Qj+o udU+xUpqN+vT+iczJE6Pcz+Es0nSOYN3oEyPU+YOLRhJ6d2wP5uYPuSxYqKofZ/X81gE 3x+tTnCp8tfpMB+R9BmXq/KHeoH5utu5nFXvisc1RArkBTprbkGY+zvtBHIl/w0E30Op sAsll8V0x5GfnTQkCkwEAPH2RtRLitRq0OZBFShts7iWtSZiyHbGF98sA3+KDM3RAm3U /cAuXRIx21MKqS/+Rv/IlUAAp835PT1q3MvubzO9nSf/+hufF3+8pBl/RT08YBlRuRhc UOww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=eCTS4PH6AkRKunGpcyJL7wmYzasC2Mg1ZzUpYU9cZhI=; fh=1XiLD5f78faZJlkwpWWCXgPag3QjEy/bcGCMurGEfbo=; b=ncmIiAQlRrtZZ/aT1jgH1k6jnLPcixQg9LbbefISq/6uyghuqAp1PU75QWCexzUNSi 1ImRjc8flKMn8mZmSfvHVlTtQ2q3oa1ht0e6i4j3zyoCiQ7jIXMLXdnTQKtQNaBdtdxp C/w8VHXHlpD5c6tURSlzzlBfiAH7IfKDaH3S/wtcmavTn9lqtRDlr9FSpTUisjnB7CFy t+5B6c3g/utj1HvThf4wR8MoojwUpl7s18ybcoN3JQze3ZX2PsI33amIp0pdLkxm3EDh LDt6ZtbHDD/x0Wh0NcG/fvCPGEiWo8jBWYRos8b6KhcUxsWPfQWy3lDGJNVJOcr7gWAI 4CxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x17-20020ac85f11000000b004282544af7bsi13477638qta.203.2024.01.17.23.56.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jan 2024 23:56:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQNGF-0006CG-Jw; Thu, 18 Jan 2024 02:56:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQNG3-0005Qg-Ne; Thu, 18 Jan 2024 02:56:16 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQNG1-0007vX-Mw; Thu, 18 Jan 2024 02:56:15 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id A8B5A45047; Thu, 18 Jan 2024 10:54:36 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id D362A661AF; Thu, 18 Jan 2024 10:54:06 +0300 (MSK) Received: (nullmailer pid 2381713 invoked by uid 1000); Thu, 18 Jan 2024 07:54:05 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev Subject: [Stable-8.2.1 28/38] readthodocs: fully specify a build environment Date: Thu, 18 Jan 2024 10:52:55 +0300 Message-Id: <20240118075404.2381519-28-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Alex Bennée This is now expected by rtd so I've expanded using their example as 22.04 is one of our supported platforms. I tried to work out if there was an easy way to re-generate a requirements.txt from our pythondeps.toml but in the end went for the easier solution. Cc: Signed-off-by: Alex Bennée Message-Id: <20231221174200.2693694-1-alex.bennee@linaro.org> (cherry picked from commit b16a45bc5e0e329a16af8a2e020a6e7044f9afa2) Signed-off-by: Michael Tokarev diff --git a/.readthedocs.yml b/.readthedocs.yml index 7fb7b8dd61..0b262469ce 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -5,16 +5,21 @@ # Required version: 2 +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.11" + # Build documentation in the docs/ directory with Sphinx sphinx: configuration: docs/conf.py +# We recommend specifying your dependencies to enable reproducible builds: +# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html +python: + install: + - requirements: docs/requirements.txt + # We want all the document formats formats: all - -# For consistency, we require that QEMU's Sphinx extensions -# run with at least the same minimum version of Python that -# we require for other Python in our codebase (our conf.py -# enforces this, and some code needs it.) -python: - version: 3.6 diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000000..691e5218ec --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,2 @@ +sphinx==5.3.0 +sphinx_rtd_theme==1.1.1