Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b6f7117

Browse files
encukouencukou
committed
Merge in the main branch
2 parents 0da36ad + 44f57a9 commit b6f7117

220 files changed

Lines changed: 6882 additions & 4548 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/library/fedora:37
1+
FROM docker.io/library/fedora:40
22

33
ENV CC=clang
44

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ jobs:
137137
uses: actions/cache@v4
138138
with:
139139
path: config.cache
140+
# Include env.pythonLocation in key to avoid changes in environment when setup-python updates Python
140141
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }}
141142
- name: Install Dependencies
142143
run: sudo ./.github/workflows/posix-deps-apt.sh

‎.github/workflows/jit.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
- 'Python/optimizer*.c'
1313
workflow_dispatch:
1414

15+
permissions:
16+
contents: read
17+
1518
concurrency:
1619
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1720
cancel-in-progress: true
@@ -73,13 +76,13 @@ jobs:
7376
runner: ubuntu-latest
7477
compiler: gcc
7578
# These fail because of emulation, not because of the JIT:
76-
exclude: test_unix_events test_init test_process_pool test_shutdown test_multiprocessing_fork test_cmd_line test_faulthandler test_os test_perf_profiler test_posix test_signal test_socket test_subprocess test_threading test_venv test_external_inspection
79+
exclude: test_pathlib test_posixpath test_unix_events test_init test_process_pool test_shutdown test_multiprocessing_fork test_cmd_line test_faulthandler test_os test_perf_profiler test_posix test_signal test_socket test_subprocess test_threading test_venv test_external_inspection
7780
- target: aarch64-unknown-linux-gnu/clang
7881
architecture: aarch64
7982
runner: ubuntu-latest
8083
compiler: clang
8184
# These fail because of emulation, not because of the JIT:
82-
exclude: test_unix_events test_init test_process_pool test_shutdown test_multiprocessing_fork test_cmd_line test_faulthandler test_os test_perf_profiler test_posix test_signal test_socket test_subprocess test_threading test_venv test_external_inspection
85+
exclude: test_pathlib test_posixpath test_unix_events test_init test_process_pool test_shutdown test_multiprocessing_fork test_cmd_line test_faulthandler test_os test_perf_profiler test_posix test_signal test_socket test_subprocess test_threading test_venv test_external_inspection
8386
env:
8487
CC: ${{ matrix.compiler }}
8588
steps:

‎.github/workflows/reusable-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- name: 'Set up Python'
7575
uses: actions/setup-python@v5
7676
with:
77-
python-version: '3.11' # known to work with Sphinx 4.2
77+
python-version: '3.12' # known to work with Sphinx 6.2.1
7878
cache: 'pip'
7979
cache-dependency-path: 'Doc/requirements-oldest-sphinx.txt'
8080
- name: 'Install build dependencies'

‎.github/workflows/reusable-ubuntu.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
timeout-minutes: 60
1515
runs-on: ubuntu-20.04
1616
env:
17+
FORCE_COLOR: 1
1718
OPENSSL_VER: 3.0.13
1819
PYTHONSTRICTEXTENSIONBUILD: 1
1920
steps:

‎.github/workflows/reusable-wasi.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ jobs:
5050
uses: actions/cache@v4
5151
with:
5252
path: ${{ env.CROSS_BUILD_PYTHON }}/config.cache
53-
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
53+
# Include env.pythonLocation in key to avoid changes in environment when setup-python updates Python
54+
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}-${{ env.pythonLocation }}
5455
- name: "Configure build Python"
5556
run: python3 Tools/wasm/wasi.py configure-build-python -- --config-cache --with-pydebug
5657
- name: "Make build Python"
@@ -59,7 +60,8 @@ jobs:
5960
uses: actions/cache@v4
6061
with:
6162
path: ${{ env.CROSS_BUILD_WASI }}/config.cache
62-
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-wasi-sdk-${{ env.WASI_SDK_VERSION }}-${{ inputs.config_hash }}
63+
# Include env.pythonLocation in key to avoid changes in environment when setup-python updates Python
64+
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-wasi-sdk-${{ env.WASI_SDK_VERSION }}-${{ inputs.config_hash }}-${{ env.pythonLocation }}
6365
- name: "Configure host"
6466
# `--with-pydebug` inferred from configure-build-python
6567
run: python3 Tools/wasm/wasi.py configure-host -- --config-cache

‎Doc/c-api/exceptions.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Printing and clearing
104104
Similar to :c:func:`PyErr_WriteUnraisable`, but the *format* and subsequent
105105
parameters help format the warning message; they have the same meaning and
106106
values as in :c:func:`PyUnicode_FromFormat`.
107-
``PyErr_WriteUnraisable(obj)`` is roughtly equivalent to
107+
``PyErr_WriteUnraisable(obj)`` is roughly equivalent to
108108
``PyErr_FormatUnraisable("Exception ignored in: %R", obj)``.
109109
If *format* is ``NULL``, only the traceback is printed.
110110

‎Doc/c-api/typeobj.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@ and :c:data:`PyType_Type` effectively act as defaults.)
13811381
Py_VISIT(Py_TYPE(self));
13821382

13831383
It is only needed since Python 3.9. To support Python 3.8 and older, this
1384-
line must be conditionnal::
1384+
line must be conditional::
13851385

13861386
#if PY_VERSION_HEX >= 0x03090000
13871387
Py_VISIT(Py_TYPE(self));

‎Doc/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@
298298
'languages': ['ja', 'fr', 'zh_TW', 'zh_CN'], 'builders': ['man', 'text'],
299299
}
300300

301-
# Avoid a warning with Sphinx >= 2.0
302-
master_doc = 'contents'
301+
# Avoid a warning with Sphinx >= 4.0
302+
root_doc = 'contents'
303303

304304
# Allow translation of index directives
305305
gettext_additional_targets = [

‎Doc/howto/timerfd.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ descriptors to wait until the file descriptor is ready for reading:
108108
# In 1.5 seconds, 1st timer, 2nd timer and 3rd timer fires at once.
109109
#
110110
# If a timer file descriptor is signaled more than once since
111-
# the last os.read() call, os.read() returns the nubmer of signaled
111+
# the last os.read() call, os.read() returns the number of signaled
112112
# as host order of class bytes.
113113
print(f"Signaled events={events}")
114114
for fd, event in events:

0 commit comments

Comments
 (0)