qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>, qemu-stable@nongnu.org
Subject: [PULL 21/22] readthodocs: fully specify a build environment
Date: Fri, 12 Jan 2024 11:04:34 +0000	[thread overview]
Message-ID: <20240112110435.3801068-22-alex.bennee@linaro.org> (raw)
In-Reply-To: <20240112110435.3801068-1-alex.bennee@linaro.org>

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:  <qemu-stable@nongnu.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231221174200.2693694-1-alex.bennee@linaro.org>

diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 00000000000..691e5218ec7
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,2 @@
+sphinx==5.3.0
+sphinx_rtd_theme==1.1.1
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 7fb7b8dd61a..0b262469ce6 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
-- 
2.39.2



  parent reply	other threads:[~2024-01-12 11:10 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-12 11:04 [PULL 00/22] testing and misc updates Alex Bennée
2024-01-12 11:04 ` [PULL 01/22] tests/avocado: Add a test for a little-endian microblaze machine Alex Bennée
2024-01-12 11:04 ` [PULL 02/22] tests/avocado: use snapshot=on in kvm_xen_guest Alex Bennée
2024-08-01  9:48   ` David Woodhouse
2024-01-12 11:04 ` [PULL 03/22] gitlab: include microblazeel in testing Alex Bennée
2024-01-12 11:04 ` [PULL 04/22] chardev: use bool for fe_is_open Alex Bennée
2024-01-12 11:04 ` [PULL 05/22] qtest: bump min meson timeout to 60 seconds Alex Bennée
2024-01-12 11:04 ` [PULL 06/22] qtest: bump migration-test timeout to 8 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 07/22] qtest: bump qom-test timeout to 15 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 08/22] qtest: bump npcm7xx_pwm-test timeout to 5 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 09/22] qtest: bump test-hmp timeout to 4 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 10/22] qtest: bump pxe-test timeout to 10 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 11/22] qtest: bump prom-env-test timeout to 6 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 12/22] qtest: bump boot-serial-test timeout to 3 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 13/22] qtest: bump qos-test timeout to 2 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 14/22] qtest: bump aspeed_smc-test timeout to 6 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 15/22] qtest: bump bios-table-test timeout to 9 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 16/22] tests/qtest: Bump the device-introspect-test timeout to 12 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 17/22] tests/unit: Bump test-aio-multithread test timeout to 2 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 18/22] tests/unit: Bump test-crypto-block test timeout to 5 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 19/22] tests/fp: Bump fp-test-mulAdd test timeout to 3 minutes Alex Bennée
2024-01-12 11:04 ` [PULL 20/22] mtest2make: stop disabling meson test timeouts Alex Bennée
2024-01-12 11:04 ` Alex Bennée [this message]
2024-01-12 11:04 ` [PULL 22/22] Revert "tests/avocado: remove skips from replay_kernel" Alex Bennée
2024-01-12 11:13   ` Peter Maydell
2024-01-12 13:11     ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240112110435.3801068-22-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).