From e3b25cdd2e52afc35a87af03d2e10c8af9171fdf Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 4 Feb 2025 13:10:26 +0100 Subject: [PATCH 1/2] [3.9] gh-129641: Switch Docs GHA build to actions/upload-artifact@v4 (GH-129642) Add options for backwards compatibility, from the docs at: https://github.com/actions/upload-artifact?tab=readme-ov-file#breaking-changes --- .github/workflows/doc.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 0c2917854602e1..1f339f4542ecf9 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -36,7 +36,9 @@ jobs: - name: 'Build documentation' run: xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W -j4" doctest suspicious 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 From f3b77948c7a9876f152048e7843325011d3304db Mon Sep 17 00:00:00 2001 From: shallow-beach <96891913+shallow-beach@users.noreply.github.com> Date: Fri, 20 Dec 2024 09:09:56 -0800 Subject: [PATCH 2/2] Python Tutorial typo fix (#128077) Backported form commit: 5a584c8f54bbeceae7ffa501291e29b7ddc8a0b9 This is a trivial change meant to trigger a Docs build. --- Doc/tutorial/classes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst index f44cb0b4e905a9..a6a8211dec65ed 100644 --- 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