From 7944a62ab5963b8dafba8af962f487f7a5f6c85c Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Mon, 9 Oct 2023 22:58:33 -0400 Subject: [PATCH] Bump Python versions --- docs/user/build-customization.rst | 4 ++-- .../config-file/examples/mkdocs/.readthedocs.yaml | 2 +- .../config-file/examples/sphinx/.readthedocs.yaml | 2 +- docs/user/config-file/v2.rst | 7 ++++--- docs/user/environment-variables.rst | 2 +- docs/user/guides/reproducible-builds.rst | 2 +- readthedocs/builds/constants_docker.py | 11 ++++++----- readthedocs/rtd_tests/fixtures/spec/v2/schema.json | 1 + readthedocs/templates/projects/import_config.html | 2 +- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/docs/user/build-customization.rst b/docs/user/build-customization.rst index a7560fdfebf..8f8d0d6af8c 100644 --- a/docs/user/build-customization.rst +++ b/docs/user/build-customization.rst @@ -136,7 +136,7 @@ Here is an example that cancels builds from pull requests when there are no chan build: os: "ubuntu-22.04" tools: - python: "3.11" + python: "3.12" jobs: post_checkout: # Cancel building pull requests when there aren't changed in the docs directory or YAML file. @@ -161,7 +161,7 @@ This other example shows how to cancel a build if the commit message contains `` build: os: "ubuntu-22.04" tools: - python: "3.11" + python: "3.12" jobs: post_checkout: # Use `git log` to check if the latest commit contains "skip ci", diff --git a/docs/user/config-file/examples/mkdocs/.readthedocs.yaml b/docs/user/config-file/examples/mkdocs/.readthedocs.yaml index c5587fb24a4..015eb5de856 100644 --- a/docs/user/config-file/examples/mkdocs/.readthedocs.yaml +++ b/docs/user/config-file/examples/mkdocs/.readthedocs.yaml @@ -8,7 +8,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.11" + python: "3.12" mkdocs: configuration: mkdocs.yml diff --git a/docs/user/config-file/examples/sphinx/.readthedocs.yaml b/docs/user/config-file/examples/sphinx/.readthedocs.yaml index b468076c68e..4b2de59ea31 100644 --- a/docs/user/config-file/examples/sphinx/.readthedocs.yaml +++ b/docs/user/config-file/examples/sphinx/.readthedocs.yaml @@ -8,7 +8,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.11" + python: "3.12" # You can also specify other tool versions: # nodejs: "20" # rust: "1.70" diff --git a/docs/user/config-file/v2.rst b/docs/user/config-file/v2.rst index 30181e3cf29..2e40690b0e9 100644 --- a/docs/user/config-file/v2.rst +++ b/docs/user/config-file/v2.rst @@ -272,7 +272,7 @@ Python, Node.js, Rust, and Go. build: os: ubuntu-22.04 tools: - python: "3.11" + python: "3.12" nodejs: "18" rust: "1.64" golang: "1.19" @@ -322,6 +322,7 @@ You can use several interpreters and versions, from CPython, Miniconda, and Mamb - ``3.9`` - ``3.10`` - ``3.11`` + - ``3.12`` - ``miniconda3-4.7`` - ``mambaforge-4.10`` - ``mambaforge-22.9`` @@ -409,7 +410,7 @@ See :doc:`/build-customization` for more details. build: os: ubuntu-22.04 tools: - python: "3.11" + python: "3.12" jobs: pre_create_environment: - echo "Command run at 'pre_create_environment' step" @@ -454,7 +455,7 @@ The ``$READTHEDOCS_OUTPUT/html`` directory will be uploaded and hosted by Read t build: os: ubuntu-22.04 tools: - python: "3.11" + python: "3.12" commands: - pip install pelican - pelican --settings docs/pelicanconf.py --output $READTHEDOCS_OUTPUT/html/ docs/ diff --git a/docs/user/environment-variables.rst b/docs/user/environment-variables.rst index 5b523bf8346..55163abc37b 100644 --- a/docs/user/environment-variables.rst +++ b/docs/user/environment-variables.rst @@ -129,7 +129,7 @@ The following example shows how a non-secret single-purpose environment variable build: os: "ubuntu-22.04" tools: - python: "3.11" + python: "3.12" jobs: post_build: - EXAMPLE_ENVIRONMENT_VARIABLE=foobar command --flag diff --git a/docs/user/guides/reproducible-builds.rst b/docs/user/guides/reproducible-builds.rst index f4907f6e398..0ba61b6a80e 100644 --- a/docs/user/guides/reproducible-builds.rst +++ b/docs/user/guides/reproducible-builds.rst @@ -38,7 +38,7 @@ A configuration file with explicit dependencies looks like this: build: os: "ubuntu-22.04" tools: - python: "3.11" + python: "3.12" # Build from the docs/ directory with Sphinx sphinx: diff --git a/readthedocs/builds/constants_docker.py b/readthedocs/builds/constants_docker.py index 4612ca02822..daad082dd5b 100644 --- a/readthedocs/builds/constants_docker.py +++ b/readthedocs/builds/constants_docker.py @@ -32,12 +32,13 @@ "2.7": "2.7.18", "3.6": "3.6.15", "3.7": "3.7.17", - "3.8": "3.8.17", - "3.9": "3.9.17", - "3.10": "3.10.12", - "3.11": "3.11.4", + "3.8": "3.8.18", + "3.9": "3.9.18", + "3.10": "3.10.13", + "3.11": "3.11.6", + "3.12": "3.12.0", # Always point to the latest stable release. - "3": "3.11.4", + "3": "3.12.0", "miniconda3-4.7": "miniconda3-4.7.12", "mambaforge-4.10": "mambaforge-4.10.3-10", "mambaforge-22.9": "mambaforge-22.9.0-3", diff --git a/readthedocs/rtd_tests/fixtures/spec/v2/schema.json b/readthedocs/rtd_tests/fixtures/spec/v2/schema.json index 51cdcb3adda..095ecf7a8fe 100644 --- a/readthedocs/rtd_tests/fixtures/spec/v2/schema.json +++ b/readthedocs/rtd_tests/fixtures/spec/v2/schema.json @@ -176,6 +176,7 @@ "3.9", "3.10", "3.11", + "3.12", "miniconda3-4.7", "mambaforge-4.10", "mambaforge-22.9" diff --git a/readthedocs/templates/projects/import_config.html b/readthedocs/templates/projects/import_config.html index 36dc38083de..ca3bcdc2264 100644 --- a/readthedocs/templates/projects/import_config.html +++ b/readthedocs/templates/projects/import_config.html @@ -31,7 +31,7 @@

{% trans "Add a project configuration file" %}

build: os: ubuntu-22.04 tools: - python: "3.11" + python: "3.12" # You can also specify other tool versions: # nodejs: "19" # rust: "1.64"