Skip to content

Commit 7b0351c

Browse files
[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: 5a584c8 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>
1 parent 2bd9f9b commit 7b0351c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/doc.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,20 @@ jobs:
3838
- name: 'Set up Python'
3939
uses: actions/setup-python@v4
4040
with:
41-
python-version: '3'
41+
python-version: '3.12'
4242
cache: 'pip'
4343
cache-dependency-path: 'Doc/requirements.txt'
4444
- name: 'Install build dependencies'
4545
run: make -C Doc/ venv
4646
- name: 'Build HTML documentation'
4747
run: make -C Doc/ SPHINXOPTS="-q" SPHINXERRORHANDLING="-W --keep-going" html
4848
- name: 'Upload'
49-
uses: actions/upload-artifact@v3
49+
uses: actions/upload-artifact@v4
5050
with:
5151
name: doc-html
5252
path: Doc/build/html
53+
include-hidden-files: true
54+
overwrite: true
5355

5456
# Run "doctest" on HEAD as new syntax doesn't exist in the latest stable release
5557
doctest:

Doc/tutorial/classes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ Now what can we do with instance objects? The only operations understood by
325325
instance objects are attribute references. There are two kinds of valid
326326
attribute names: data attributes and methods.
327327

328-
*data attributes* correspond to "instance variables" in Smalltalk, and to "data
328+
*Data attributes* correspond to "instance variables" in Smalltalk, and to "data
329329
members" in C++. Data attributes need not be declared; like local variables,
330330
they spring into existence when they are first assigned to. For example, if
331331
``x`` is the instance of :class:`MyClass` created above, the following piece of

0 commit comments

Comments
 (0)