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

Skip to content

Commit bba0bdf

Browse files
rhettingerrhettinger
committed
Merge branch 'main' into kde_rand
2 parents 3ac42df + 8b56d82 commit bba0bdf

212 files changed

Lines changed: 6030 additions & 4290 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/jit.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- true
4242
- false
4343
llvm:
44-
- 16
44+
- 18
4545
include:
4646
- target: i686-pc-windows-msvc/msvc
4747
architecture: Win32
@@ -76,13 +76,13 @@ jobs:
7676
runner: ubuntu-latest
7777
compiler: gcc
7878
# These fail because of emulation, not because of the JIT:
79-
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
8080
- target: aarch64-unknown-linux-gnu/clang
8181
architecture: aarch64
8282
runner: ubuntu-latest
8383
compiler: clang
8484
# These fail because of emulation, not because of the JIT:
85-
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
8686
env:
8787
CC: ${{ matrix.compiler }}
8888
steps:
@@ -94,6 +94,7 @@ jobs:
9494
- name: Native Windows
9595
if: runner.os == 'Windows' && matrix.architecture != 'ARM64'
9696
run: |
97+
choco upgrade llvm -y
9798
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}
9899
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '--pgo' }} -p ${{ matrix.architecture }}
99100
./PCbuild/rt.bat ${{ matrix.debug && '-d' }} -p ${{ matrix.architecture }} -q --exclude ${{ matrix.exclude }} --multiprocess 0 --timeout 4500 --verbose2 --verbose3
@@ -102,27 +103,31 @@ jobs:
102103
- name: Emulated Windows
103104
if: runner.os == 'Windows' && matrix.architecture == 'ARM64'
104105
run: |
106+
choco upgrade llvm -y
105107
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}
106108
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
107109
108110
- name: Native macOS
109111
if: runner.os == 'macOS'
110112
run: |
113+
brew update
111114
brew install llvm@${{ matrix.llvm }}
112115
SDKROOT="$(xcrun --show-sdk-path)" \
113116
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
114117
make all --jobs 4
115118
./python.exe -m test --exclude ${{ matrix.exclude }} --multiprocess 0 --timeout 4500 --verbose2 --verbose3
116119
120+
# --with-lto has been removed temporarily as a result of an open issue in LLVM 18 (see https://github.com/llvm/llvm-project/issues/87553)
117121
- name: Native Linux
118122
if: runner.os == 'Linux' && matrix.architecture == 'x86_64'
119123
run: |
120124
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }}
121125
export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH"
122-
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
126+
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations' }}
123127
make all --jobs 4
124128
./python -m test --exclude ${{ matrix.exclude }} --multiprocess 0 --timeout 4500 --verbose2 --verbose3
125129
130+
# --with-lto has been removed temporarily as a result of an open issue in LLVM 18 (see https://github.com/llvm/llvm-project/issues/87553)
126131
- name: Emulated Linux
127132
if: runner.os == 'Linux' && matrix.architecture != 'x86_64'
128133
run: |
@@ -139,6 +144,6 @@ jobs:
139144
CC="${{ matrix.compiler == 'clang' && 'clang --target=$HOST' || '$HOST-gcc' }}" \
140145
CPP="$CC --preprocess" \
141146
HOSTRUNNER=qemu-${{ matrix.architecture }} \
142-
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }} --build=x86_64-linux-gnu --host="$HOST" --with-build-python=../build/bin/python3 --with-pkg-config=no ac_cv_buggy_getaddrinfo=no ac_cv_file__dev_ptc=no ac_cv_file__dev_ptmx=yes
147+
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations ' }} --build=x86_64-linux-gnu --host="$HOST" --with-build-python=../build/bin/python3 --with-pkg-config=no ac_cv_buggy_getaddrinfo=no ac_cv_file__dev_ptc=no ac_cv_file__dev_ptmx=yes
143148
make all --jobs 4
144149
./python -m test --exclude ${{ matrix.exclude }} --multiprocess 0 --timeout 4500 --verbose2 --verbose3

‎.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:

‎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)