[3.10] gh-129641: Docs GHA build: use upload-artifact@v4 & Python 3.12 (#129642)

* [3.10] gh-129641: Switch Docs GHA build to actions/upload-artifact@v4

Add options for backwards compatibility, from the docs at:
https://github.com/actions/upload-artifact?tab=readme-ov-file#breaking-changes

* Python Tutorial typo fix (#128077)

Backported form commit: 5a584c8f54bbeceae7ffa501291e29b7ddc8a0b9

This is a trivial change meant to trigger a Docs build.

* Use Python 3.12 for the 3.10 docs build

The pinned version of Sphinx requires `imghdr`, removed in Python 3.13.

---------

Co-authored-by: shallow-beach <96891913+shallow-beach@users.noreply.github.com>

diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
index ee02848417c2e7c7d53ed0e12aa4c4b577bd700c..dd3a26775d92880069a96e9f1c076f28132d6ddb 100644 (file)
--- a/.github/workflows/doc.yml
+++ b/.github/workflows/doc.yml
@@ -38,7 +38,7 @@ jobs:
     - name: 'Set up Python'
       uses: actions/setup-python@v4
       with:
-        python-version: '3'
+        python-version: '3.12'
         cache: 'pip'
         cache-dependency-path: 'Doc/requirements.txt'
     - name: 'Install build dependencies'
@@ -46,10 +46,12 @@ jobs:
     - name: 'Build HTML documentation'
       run: make -C Doc/ SPHINXOPTS="-q" SPHINXERRORHANDLING="-W --keep-going" html
     - name: 'Upload'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: doc-html
         path: Doc/build/html
+        include-hidden-files: true
+        overwrite: true
 
   # Run "doctest" on HEAD as new syntax doesn't exist in the latest stable release
   doctest:

diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 30450c70f3e8e9f669e51357160b71bc02045efd..71d081cb6fa4e7b678fd07ec7c23fcd643bdfb74 100644 (file)
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -325,7 +325,7 @@ Now what can we do with instance objects?  The only operations understood by
 instance objects are attribute references.  There are two kinds of valid
 attribute names: data attributes and methods.
 
-*data attributes* correspond to "instance variables" in Smalltalk, and to "data
+*Data attributes* correspond to "instance variables" in Smalltalk, and to "data
 members" in C++.  Data attributes need not be declared; like local variables,
 they spring into existence when they are first assigned to.  For example, if
 ``x`` is the instance of :class:`MyClass` created above, the following piece of