From: Petr Viktorin Date: Tue, 18 Feb 2025 09:15:37 +0000 (+0100) Subject: [3.9] gh-129641: Docs GHA build: use upload-artifact@v4 (GH-129642) (#130114) X-Git-Tag: v3.9.22~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe6c43ec391c6d67cb726771e51660e6e675e54b;p=thirdparty%2FPython%2Fcpython.git [3.9] gh-129641: Docs GHA build: use upload-artifact@v4 (GH-129642) (#130114) Co-authored-by: shallow-beach <96891913+shallow-beach@users.noreply.github.com> fix (#128077) --- diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 0c2917854602..1f339f4542ec 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 diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst index f44cb0b4e905..a6a8211dec65 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