From 9004bc4707c631eccb5db389c2a7ae280c88cf52 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Mon, 9 Oct 2023 18:43:07 -0400 Subject: [PATCH 1/5] Attempt 1 --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 9fde00ef8f..90b656e129 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -8,7 +8,7 @@ formats: build: os: "ubuntu-22.04" tools: - python: "3.11" + python: "3.12" python: install: From 4ab8729cea748a717e0e30edfc809c6671da0a8a Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Mon, 9 Oct 2023 18:46:44 -0400 Subject: [PATCH 2/5] Use 3.11 Python intersphinx --- .readthedocs.yml | 2 +- docs/source/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 90b656e129..9fde00ef8f 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -8,7 +8,7 @@ formats: build: os: "ubuntu-22.04" tools: - python: "3.12" + python: "3.11" python: install: diff --git a/docs/source/conf.py b/docs/source/conf.py index ee23ce587f..cc79ffb708 100755 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -125,7 +125,7 @@ def setup(app): ] intersphinx_mapping = { - "python": ("https://docs.python.org/3", None), + "python": ("https://docs.python.org/3.11", None), "outcome": ("https://outcome.readthedocs.io/en/latest/", None), "pyopenssl": ("https://www.pyopenssl.org/en/stable/", None), "sniffio": ("https://sniffio.readthedocs.io/en/latest/", None), From 8f5dca15b0770e4e4ae4c7e6dd3d53be5a827c30 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Mon, 9 Oct 2023 18:49:22 -0400 Subject: [PATCH 3/5] Explanatory comments all around --- .readthedocs.yml | 1 + docs/source/conf.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 9fde00ef8f..ede60285f6 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -8,6 +8,7 @@ formats: build: os: "ubuntu-22.04" tools: + # make sure that this matches the intersphinx inventory we use for Python python: "3.11" python: diff --git a/docs/source/conf.py b/docs/source/conf.py index cc79ffb708..f83329d84c 100755 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +a#!/usr/bin/env python3 # # Trio documentation build configuration file, created by # sphinx-quickstart on Sat Jan 21 19:11:14 2017. @@ -125,6 +125,7 @@ def setup(app): ] intersphinx_mapping = { + # make sure that this matches the rtd build version "python": ("https://docs.python.org/3.11", None), "outcome": ("https://outcome.readthedocs.io/en/latest/", None), "pyopenssl": ("https://www.pyopenssl.org/en/stable/", None), From 0eeb371e1ff836316584b5a9f6873fdf3a1132b2 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Mon, 9 Oct 2023 18:51:29 -0400 Subject: [PATCH 4/5] Web editor typos... --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index f83329d84c..8fd7390625 100755 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -1,4 +1,4 @@ -a#!/usr/bin/env python3 +#!/usr/bin/env python3 # # Trio documentation build configuration file, created by # sphinx-quickstart on Sat Jan 21 19:11:14 2017. From 9ec853c37cf38131483a2e447ce32e8e8aaf1459 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Thu, 12 Oct 2023 02:51:49 -0400 Subject: [PATCH 5/5] Use 3.12 in RTD builder --- .readthedocs.yml | 3 +-- docs/source/conf.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index ede60285f6..70990b4244 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -8,8 +8,7 @@ formats: build: os: "ubuntu-22.04" tools: - # make sure that this matches the intersphinx inventory we use for Python - python: "3.11" + python: "3" python: install: diff --git a/docs/source/conf.py b/docs/source/conf.py index 8fd7390625..ee23ce587f 100755 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -125,8 +125,7 @@ def setup(app): ] intersphinx_mapping = { - # make sure that this matches the rtd build version - "python": ("https://docs.python.org/3.11", None), + "python": ("https://docs.python.org/3", None), "outcome": ("https://outcome.readthedocs.io/en/latest/", None), "pyopenssl": ("https://www.pyopenssl.org/en/stable/", None), "sniffio": ("https://sniffio.readthedocs.io/en/latest/", None),