From patchwork Sun Jan 28 17:47:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 767239 Delivered-To: patch@linaro.org Received: by 2002:adf:ee41:0:b0:33a:e5bd:fedd with SMTP id w1csp558067wro; Sun, 28 Jan 2024 09:49:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IHIS+qAMZdyPsPYNSZxVaapt0tKM+7gfZFBeBcXMi1fAaWLf8IO700lCJDgvFbKWF4crOGo X-Received: by 2002:a05:6214:252c:b0:686:aa9a:25ea with SMTP id gg12-20020a056214252c00b00686aa9a25eamr4598740qvb.113.1706464179295; Sun, 28 Jan 2024 09:49:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706464179; cv=none; d=google.com; s=arc-20160816; b=ONMsQ9vIW70rTIninhhOEQSIVTNZBrF4+UwZymq4PlfRrCm3ekib5lTP+1EhLKbl/P tfvbzESg+WPYMJoIbWYdE4PyxnzM/JAZVcm9zJ7BQqKEadOL5VW3yqgKFjGeNHJ5csRp O9MetyCyMlCnlEkhnHo3rfnGkLsEZDNqAsPcaTgBik8vzCx4VnP5iBiis01Guk16yMrk C+rUtSnTVIR7tR/pBPwL6brdKLEQfQfofCP8SwV78l5Ohu0mkIN0NRq+RakodADqq1RW 6CLoKXOKXfhthwkjJCLnRWmKbcC37cjjdH/Q14nFk0hYYBYNQfFSfjX4e/msz8CzL4T5 59eA== 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=P94Jo2bhwRxk97eaBTC17wijGxCgyXTL/WrnKJ/4NZfmba9pYU06eoFUuCMV8DwjMe 73fU2Psyi22jD/MW1aG6ULSZbHWlw7vXD697Tp/PjoYPZ1TV2/6Q4xSHzKvrdrED/4vI NWDsEuPIZm5rKXAATepoJEzWyzWJ+pWu8rurxnj19oowS5CcD3SxpY1CZasSLAGDlmYD 7sfBNO7Ac6nZP81Mtzgl2GL3ZnXOi21G4ShSkPF0lqT4EAHjMIz41R9lq4J/kk3UWpip 82FUQoh5pw/nCwz7ZJtEUgBLWzHQnaOmfOdDXw1kGEiOuFwgxzjNFWiKOwqWijcuFCpL ELBw== 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 gc3-20020a056214230300b006887550e585si5767624qvb.487.2024.01.28.09.49.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 28 Jan 2024 09:49:39 -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 1rU9G8-0005oG-R9; Sun, 28 Jan 2024 12:47:57 -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 1rU9G7-0005nq-7C; Sun, 28 Jan 2024 12:47:55 -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 1rU9G5-0000EJ-6w; Sun, 28 Jan 2024 12:47:54 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0532A480DB; Sun, 28 Jan 2024 20:48:40 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 87A076D4D4; Sun, 28 Jan 2024 20:47:48 +0300 (MSK) Received: (nullmailer pid 811302 invoked by uid 1000); Sun, 28 Jan 2024 17:47:47 -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-7.2.9 21/30] readthodocs: fully specify a build environment Date: Sun, 28 Jan 2024 20:47:34 +0300 Message-Id: <20240128174747.811264-1-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