From 3b43b31c771c743e5283ec94febad77e360b7cfb Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Tue, 11 Nov 2025 09:48:48 +0200 Subject: [PATCH] Merge pull request #13919 from bluetech/doc-syntax-fix doc: a rendering fix & update RTD to Python 3.13 (cherry picked from commit d587e0cf84bd815f4545a5091ab26f992580ac37) --- .readthedocs.yaml | 2 +- doc/en/explanation/goodpractices.rst | 4 ++-- tox.ini | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index f7370f1bb98..6380b34adec 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -17,7 +17,7 @@ build: os: ubuntu-24.04 tools: python: >- - 3.12 + 3.13 apt_packages: - inkscape jobs: diff --git a/doc/en/explanation/goodpractices.rst b/doc/en/explanation/goodpractices.rst index d97dda06417..4920309b9d6 100644 --- a/doc/en/explanation/goodpractices.rst +++ b/doc/en/explanation/goodpractices.rst @@ -354,7 +354,7 @@ See the :confval:`strict` documentation for the options it enables and their eff If pytest adds new strictness options in the future, they will also be enabled in strict mode. Therefore, you should only enable strict mode if you use a pinned/locked version of pytest, or if you want to proactively adopt new strictness options as they are added. -If you don't want to automatically pick up new options, you can enable options individually:: +If you don't want to automatically pick up new options, you can enable options individually: .. tab:: toml @@ -376,7 +376,7 @@ If you don't want to automatically pick up new options, you can enable options i strict_parametrization_ids = true strict_xfail = true -If you want to use strict mode but having trouble with a specific option, you can turn it off individually:: +If you want to use strict mode but having trouble with a specific option, you can turn it off individually: .. tab:: toml diff --git a/tox.ini b/tox.ini index b6fcecc886a..5c2106ee5b4 100644 --- a/tox.ini +++ b/tox.ini @@ -111,7 +111,7 @@ setenv = description = build the documentation site under \ `{toxinidir}{/}doc{/}en{/}_build{/}html` with `{basepython}` -basepython = python3.12 # sync with rtd to get errors +basepython = python3.13 # Sync with .readthedocs.yaml to get errors. usedevelop = True deps = -r{toxinidir}/doc/en/requirements.txt