diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-05-17 12:13:57 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-05-17 12:13:57 -0700 |
| commit | 76ec63282cbf2b74343c9f613fd0ca10225636cd (patch) | |
| tree | fea60e62d57c74e1b6a86a05067dd77b972e93c8 /docs/conf.py | |
| parent | d27e7c359330ba7020bdbed7ed2316cb4cf6ffc1 (diff) | |
| parent | b98d6272e33a2ca8bab4c8087e8809e98400d2c5 (diff) | |
| download | qemu-staging.tar.gz | |
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into stagingstaging
* kvm: enable dirty ring for arm64
* target/i386: new features
* target/i386: AVX fixes
* configure: create a python venv unconditionally
* meson: bump to 0.63.0 and move tests from configure
* meson: Pass -j option to sphinx
* drop support for Python 3.6
* fix check-python-tox
* fix "make clean" in the source directory
# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmRk7qwUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroPHOggAhDX4KSbXILCGiPlJLQHtLWQfHQpl
# bfpDz2ReHyCEPUoUL3ZZqqftEw3EalJllTtv//ooSYvjQZVg4UaJRBNPRAbcOXqw
# lSdJZJigP+OU4/E8kX1e/cIcJaaEI28gLR/+ArPGOZrmajxdy6wLg8PghZSP/2x7
# 28a5hrkHQoXmpdYESluiE47MvRuiuaolHQ1IHI07iOwM6v63nI6+qcnHsjVVtec2
# iNXmQwFliuw7lIM4Rtd+R8an7hLcCfA4EoWEMkjzLVdPaQaEGsYnTHmaVNGgPJc3
# xKkNjZiTu4YBpWbu5jgvCjux/WLN04CXakKxImqjg50DeldRYEl3TcCiDw==
# =K1DA
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 17 May 2023 08:11:40 AM PDT
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [undefined]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* tag 'for-upstream' of https://gitlab.com/bonzini/qemu: (68 commits)
docs/devel: update build system docs
configure: remove unnecessary check
configure: reorder option parsing code
configure: remove unnecessary mkdir
configure: do not rerun the tests with -Werror
configure: remove compiler sanity check
build: move --disable-debug-info to meson
build: move compiler version check to meson
build: move remaining compiler flag tests to meson
build: move warning flag selection to meson
build: move stack protector flag selection to meson
build: move coroutine backend selection to meson
build: move SafeStack tests to meson
build: move sanitizer tests to meson
meson: prepare move of QEMU_CFLAGS to meson
configure, meson: move --enable-modules to Meson
configure: remove pkg-config functions
build: move glib detection and workarounds to meson
meson: drop unnecessary declare_dependency()
meson: add more version numbers to the summary
...
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/docs/conf.py b/docs/conf.py index 00767b0e24..c687ff2663 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -32,15 +32,6 @@ import sphinx from distutils.version import LooseVersion from sphinx.errors import ConfigError -# Make Sphinx fail cleanly if using an old Python, rather than obscurely -# failing because some code in one of our extensions doesn't work there. -# In newer versions of Sphinx this will display nicely; in older versions -# Sphinx will also produce a Python backtrace but at least the information -# gets printed... -if sys.version_info < (3,6): - raise ConfigError( - "QEMU requires a Sphinx that uses Python 3.6 or better\n") - # The per-manual conf.py will set qemu_docdir for a single-manual build; # otherwise set it here if this is an entire-manual-set build. # This is always the absolute path of the docs/ directory in the source tree. |