[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-8.2.1 28/38] readthodocs: fully specify a build environment
From: |
Michael Tokarev |
Subject: |
[Stable-8.2.1 28/38] readthodocs: fully specify a build environment |
Date: |
Thu, 18 Jan 2024 10:52:55 +0300 |
From: Alex Bennée <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>
(cherry picked from commit b16a45bc5e0e329a16af8a2e020a6e7044f9afa2)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
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
--
2.39.2
- [Stable-8.2.1 18/38] util: fix build with musl libc on ppc64le, (continued)
- [Stable-8.2.1 18/38] util: fix build with musl libc on ppc64le, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 19/38] tests/acpi: allow tests/data/acpi/virt/SSDT.memhp changes, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 20/38] edk2: update to git snapshot, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 21/38] edk2: update build config, set PcdUninstallMemAttrProtocol = TRUE., Michael Tokarev, 2024/01/18
- [Stable-8.2.1 22/38] edk2: update binaries to git snapshot, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 23/38] tests/acpi: update expected data files, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 24/38] tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 26/38] target/s390x: Fix LAE setting a wrong access register, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 25/38] tests/qtest/virtio-ccw: Fix device presence checking, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 27/38] .gitlab-ci.d/buildtest.yml: Work around htags bug when environment is large, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 28/38] readthodocs: fully specify a build environment,
Michael Tokarev <=
- [Stable-8.2.1 29/38] hw/hppa/machine: Allow up to 3840 MB total memory, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 30/38] hw/hppa/machine: Disable default devices with --nodefaults option, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 32/38] target/hppa: Fix PDC address translation on PA2.0 with PSW.W=0, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 31/38] hw/pci-host/astro: Add missing astro & elroy registers for NetBSD, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 33/38] hw/hppa: Move software power button address back into PDC, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 34/38] target/hppa: Avoid accessing %gr0 when raising exception, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 36/38] target/hppa: Fix IOR and ISR on unaligned access trap, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 35/38] target/hppa: Export function hppa_set_ior_and_isr(), Michael Tokarev, 2024/01/18
- [Stable-8.2.1 37/38] target/hppa: Fix IOR and ISR on error in probe, Michael Tokarev, 2024/01/18
- [Stable-8.2.1 38/38] target/hppa: Update SeaBIOS-hppa to version 15, Michael Tokarev, 2024/01/18