Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5028dce

Browse files
authored
Merge branch 'main' into issue115911
2 parentsbe73efd +09aebb1 commit5028dce

File tree

423 files changed

+9099
-3128
lines changed

Some content is hidden

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

423 files changed

+9099
-3128
lines changed

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ Objects/frameobject.c @markshannon
3333
Objects/call.c@markshannon
3434
Python/ceval*.c@markshannon
3535
Python/ceval*.h@markshannon
36+
Python/codegen.c@markshannon@iritkatriel
3637
Python/compile.c@markshannon@iritkatriel
3738
Python/assemble.c@markshannon@iritkatriel
3839
Python/flowgraph.c@markshannon@iritkatriel
3940
Python/instruction_sequence.c@iritkatriel
40-
Python/ast_opt.c@isidentical
4141
Python/bytecodes.c@markshannon
4242
Python/optimizer*.c@markshannon
4343
Python/optimizer_analysis.c@Fidget-Spinner
@@ -157,10 +157,12 @@ Include/internal/pycore_time.h @pganssle @abalkin
157157
/Tools/cases_generator/@markshannon
158158

159159
# AST
160-
Python/ast.c@isidentical@JelleZijlstra
161-
Parser/asdl.py@isidentical@JelleZijlstra
162-
Parser/asdl_c.py@isidentical@JelleZijlstra
163-
Lib/ast.py@isidentical@JelleZijlstra
160+
Python/ast.c@isidentical@JelleZijlstra@eclips4
161+
Python/ast_opt.c@isidentical@eclips4
162+
Parser/asdl.py@isidentical@JelleZijlstra@eclips4
163+
Parser/asdl_c.py@isidentical@JelleZijlstra@eclips4
164+
Lib/ast.py@isidentical@JelleZijlstra@eclips4
165+
Lib/test/test_ast/@eclips4
164166

165167
# Mock
166168
/Lib/unittest/mock.py@cjw296

‎.github/ISSUE_TEMPLATE/crash.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ body:
3232
-"3.10"
3333
-"3.11"
3434
-"3.12"
35+
-"3.13"
3536
-"CPython main branch"
3637
validations:
3738
required:true

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,14 @@ jobs:
195195

196196
build_ubuntu_ssltests:
197197
name:'Ubuntu SSL tests with OpenSSL'
198-
runs-on:ubuntu-22.04
198+
runs-on:${{ matrix.os }}
199199
timeout-minutes:60
200200
needs:check_source
201201
if:needs.check_source.outputs.run_tests == 'true'
202202
strategy:
203203
fail-fast:false
204204
matrix:
205+
os:[ubuntu-22.04]
205206
openssl_ver:[3.0.15, 3.1.7, 3.2.3, 3.3.2]
206207
env:
207208
OPENSSL_VER:${{ matrix.openssl_ver }}
@@ -231,7 +232,7 @@ jobs:
231232
uses:actions/cache@v4
232233
with:
233234
path:./multissl/openssl/${{ env.OPENSSL_VER }}
234-
key:${{runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
235+
key:${{matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
235236
-name:Install OpenSSL
236237
if:steps.cache-openssl.outputs.cache-hit != 'true'
237238
run:python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux
@@ -410,7 +411,7 @@ jobs:
410411
uses:actions/cache@v4
411412
with:
412413
path:./multissl/openssl/${{ env.OPENSSL_VER }}
413-
key:${{runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
414+
key:${{matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
414415
-name:Install OpenSSL
415416
if:steps.cache-openssl.outputs.cache-hit != 'true'
416417
run:python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux

‎.github/workflows/jit.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,15 @@ jobs:
110110
-name:Native Windows
111111
if:runner.os == 'Windows' && matrix.architecture != 'ARM64'
112112
run:|
113-
choco upgrade llvm -y
114-
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}
113+
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
115114
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '--pgo' }} -p ${{ matrix.architecture }}
116115
./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
117116
118117
# No PGO or tests (yet):
119118
-name:Emulated Windows
120119
if:runner.os == 'Windows' && matrix.architecture == 'ARM64'
121120
run:|
122-
choco upgrade llvm -y
123-
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}
121+
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
124122
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
125123
126124
-name:Native macOS
@@ -159,7 +157,7 @@ jobs:
159157
CC="${{ matrix.compiler == 'clang' && 'clang --target=$HOST' || '$HOST-gcc' }}" \
160158
CPP="$CC --preprocess" \
161159
HOSTRUNNER=qemu-${{ matrix.architecture }} \
162-
./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
160+
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--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
163161
make all --jobs 4
164162
./python -m test --ignorefile=Tools/jit/ignore-tests-emulated-linux.txt --multiprocess 0 --timeout 4500 --verbose2 --verbose3
165163

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
path:config.cache
3636
key:${{ github.job }}-${{ inputs.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
3737
-name:Install Homebrew dependencies
38-
run:brew install pkg-config openssl@3.0 xz gdbm tcl-tk
38+
run:brew install pkg-config openssl@3.0 xz gdbm tcl-tk make
3939
-name:Configure CPython
4040
run:|
4141
GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \
@@ -44,14 +44,27 @@ jobs:
4444
--config-cache \
4545
--with-pydebug \
4646
--enable-slower-safety \
47+
--enable-safety \
4748
${{ inputs.free-threading && '--disable-gil' || '' }} \
4849
--prefix=/opt/python-dev \
4950
--with-openssl="$(brew --prefix openssl@3.0)"
5051
-name:Build CPython
51-
run:set -o pipefail; make -j8 2>&1 | tee compiler_output.txt
52+
if:${{ inputs.free-threading || inputs.os != 'macos-13' }}
53+
run:gmake -j8
54+
-name:Build CPython for compiler warning check
55+
if:${{ !inputs.free-threading && inputs.os == 'macos-13' }}
56+
run:set -o pipefail; gmake -j8 --output-sync 2>&1 | tee compiler_output_macos.txt
5257
-name:Display build info
5358
run:make pythoninfo
5459
-name:Check compiler warnings
55-
run:python3 Tools/build/check_warnings.py --compiler-output-file-path=compiler_output.txt --warning-ignore-file-path=Tools/build/.warningignore_macos --compiler-output-type=clang
60+
if:${{ !inputs.free-threading && inputs.os == 'macos-13' }}
61+
run:>-
62+
python3 Tools/build/check_warnings.py
63+
--compiler-output-file-path=compiler_output_macos.txt
64+
--warning-ignore-file-path=Tools/build/.warningignore_macos
65+
--compiler-output-type=clang
66+
--fail-on-regression
67+
--fail-on-improvement
68+
--path-prefix="./"
5669
-name:Tests
5770
run:make test

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

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ jobs:
1414
build_ubuntu_reusable:
1515
name:'build and test'
1616
timeout-minutes:60
17-
runs-on:ubuntu-22.04
17+
runs-on:${{ matrix.os }}
18+
strategy:
19+
fail-fast:false
20+
matrix:
21+
os:[ubuntu-22.04]
1822
env:
1923
FORCE_COLOR:1
2024
OPENSSL_VER:3.0.15
@@ -36,7 +40,7 @@ jobs:
3640
uses:actions/cache@v4
3741
with:
3842
path:./multissl/openssl/${{ env.OPENSSL_VER }}
39-
key:${{runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
43+
key:${{matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
4044
-name:Install OpenSSL
4145
if:steps.cache-openssl.outputs.cache-hit != 'true'
4246
run:python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux
@@ -67,20 +71,33 @@ jobs:
6771
working-directory:${{ env.CPYTHON_BUILDDIR }}
6872
run:>-
6973
../cpython-ro-srcdir/configure
70-
CFLAGS="-fdiagnostics-format=json"
7174
--config-cache
7275
--with-pydebug
7376
--enable-slower-safety
77+
--enable-safety
7478
--with-openssl=$OPENSSL_DIR
7579
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
7680
-name:Build CPython out-of-tree
81+
if:${{ inputs.free-threading }}
7782
working-directory:${{ env.CPYTHON_BUILDDIR }}
78-
run:set -o pipefail; make -j4 2>&1 | tee compiler_output.txt
83+
run:make -j4
84+
-name:Build CPython out-of-tree (for compiler warning check)
85+
if:${{ !inputs.free-threading}}
86+
working-directory:${{ env.CPYTHON_BUILDDIR }}
87+
run:set -o pipefail; make -j4 --output-sync 2>&1 | tee compiler_output_ubuntu.txt
7988
-name:Display build info
8089
working-directory:${{ env.CPYTHON_BUILDDIR }}
8190
run:make pythoninfo
8291
-name:Check compiler warnings
83-
run:python Tools/build/check_warnings.py --compiler-output-file-path=${{ env.CPYTHON_BUILDDIR }}/compiler_output.txt --warning-ignore-file-path ${GITHUB_WORKSPACE}/Tools/build/.warningignore_ubuntu --compiler-output-type=json
92+
if:${{ !inputs.free-threading }}
93+
run:>-
94+
python Tools/build/check_warnings.py
95+
--compiler-output-file-path=${{ env.CPYTHON_BUILDDIR }}/compiler_output_ubuntu.txt
96+
--warning-ignore-file-path ${GITHUB_WORKSPACE}/Tools/build/.warningignore_ubuntu
97+
--compiler-output-type=gcc
98+
--fail-on-regression
99+
--fail-on-improvement
100+
--path-prefix="../cpython-ro-srcdir/"
84101
-name:Remount sources writable for tests
85102
# some tests write to srcdir, lack of pyc files slows down testing
86103
run:sudo mount $CPYTHON_RO_SRCDIR -oremount,rw

‎.pre-commit-config.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
-repo:https://github.com/astral-sh/ruff-pre-commit
3-
rev:v0.4.10
3+
rev:v0.6.7
44
hooks:
55
-id:ruff
66
name:Run Ruff (lint) on Doc/
@@ -10,6 +10,10 @@ repos:
1010
name:Run Ruff (lint) on Lib/test/
1111
args:[--exit-non-zero-on-fix]
1212
files:^Lib/test/
13+
-id:ruff
14+
name:Run Ruff (lint) on Tools/build/check_warnings.py
15+
args:[--exit-non-zero-on-fix, --config=Tools/build/.ruff.toml]
16+
files:^Tools/build/check_warnings.py
1317
-id:ruff
1418
name:Run Ruff (lint) on Argument Clinic
1519
args:[--exit-non-zero-on-fix, --config=Tools/clinic/.ruff.toml]
@@ -22,6 +26,11 @@ repos:
2226
-repo:https://github.com/psf/black-pre-commit-mirror
2327
rev:24.8.0
2428
hooks:
29+
-id:black
30+
name:Run Black on Tools/build/check_warnings.py
31+
files:^Tools/build/check_warnings.py
32+
language_version:python3.12
33+
args:[--line-length=79]
2534
-id:black
2635
name:Run Black on Tools/jit/
2736
files:^Tools/jit/

‎Android/README.md‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
#Python for Android
22

33
These instructions are only needed if you're planning to compile Python for
4-
Android yourself. Most users should*not* need to do this. If you're looking to
5-
use Python on Android, one of the following tools will provide a much more
6-
approachable user experience:
7-
8-
*[Briefcase](https://briefcase.readthedocs.io), from the BeeWare project
9-
*[Buildozer](https://buildozer.readthedocs.io), from the Kivy project
10-
*[Chaquopy](https://chaquo.com/chaquopy/)
4+
Android yourself. Most users should*not* need to do this. Instead, use one of
5+
the tools listed in`Doc/using/android.rst`, which will provide a much easier
6+
experience.
117

128

139
##Prerequisites
@@ -89,10 +85,10 @@ The test suite can be run on Linux, macOS, or Windows:
8985
The test suite can usually be run on a device with 2 GB of RAM, but this is
9086
borderline, so you may need to increase it to 4 GB. As of Android
9187
Studio Koala, 2 GB is the default for all emulators, although the user interface
92-
may indicate otherwise.The effective setting is`hw.ramSize` in
93-
~/.android/avd/*.avd/hardware-qemu.ini, whereas Android Studio displays the
94-
value from config.ini. Changingthe value inAndroid Studiowill update both of
95-
these files.
88+
may indicate otherwise.Locate the emulator's directory under`~/.android/avd`,
89+
and find`hw.ramSize` in both config.ini andhardware-qemu.ini. Either set these
90+
manually tothesamevalue, or use theAndroid StudioDevice Manager, which will
91+
update both files.
9692

9793
Before running the test suite, follow the instructions in the previous section
9894
to build the architecture you want to test. Then run the test script in one of
@@ -133,3 +129,8 @@ Every time you run `android.py test`, changes in pure-Python files in the
133129
repository's`Lib` directory will be picked up immediately. Changes in C files,
134130
and architecture-specific files such as sysconfigdata, will not take effect
135131
until you re-run`android.py make-host` or`build`.
132+
133+
134+
##Using in your own app
135+
136+
See`Doc/using/android.rst`.

‎Doc/Makefile‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ htmlview: html
152152
$(PYTHON) -c"import os, webbrowser; webbrowser.open('file://' + os.path.realpath('build/html/index.html'))"
153153

154154
.PHONY: htmllive
155-
htmllive: SPHINXBUILD =$(VENVDIR)/bin/sphinx-autobuild
155+
htmllive: SPHINXBUILD =PATH=$(VENVDIR)/bin:$$PATHsphinx-autobuild
156156
htmllive: SPHINXOPTS = --re-ignore="/venv/" --open-browser --delay 0
157157
htmllive: _ensure-sphinx-autobuild html
158158

@@ -182,13 +182,26 @@ venv:
182182
echo"The venv has been created in the$(VENVDIR) directory";\
183183
fi
184184

185+
.PHONY: dist-no-html
186+
dist-no-html: dist-text dist-pdf dist-epub dist-texinfo
187+
185188
.PHONY: dist
186189
dist:
187190
rm -rf dist
188191
mkdir -p dist
189-
192+
$(MAKE) dist-html
193+
$(MAKE) dist-text
194+
$(MAKE) dist-pdf
195+
$(MAKE) dist-epub
196+
$(MAKE) dist-texinfo
197+
198+
.PHONY: dist-html
199+
dist-html:
190200
# archive the HTML
191201
@echo"Building HTML..."
202+
mkdir -p dist
203+
rm -rf build/html
204+
find dist -name'python-$(DISTVERSION)-docs-html*' -exec rm -rf {}\;
192205
$(MAKE) html
193206
cp -pPR build/html dist/python-$(DISTVERSION)-docs-html
194207
tar -C dist -cf dist/python-$(DISTVERSION)-docs-html.tar python-$(DISTVERSION)-docs-html
@@ -198,8 +211,13 @@ dist:
198211
rm dist/python-$(DISTVERSION)-docs-html.tar
199212
@echo"Build finished and archived!"
200213

214+
.PHONY: dist-text
215+
dist-text:
201216
# archive the text build
202217
@echo"Building text..."
218+
mkdir -p dist
219+
rm -rf build/text
220+
find dist -name'python-$(DISTVERSION)-docs-text*' -exec rm -rf {}\;
203221
$(MAKE) text
204222
cp -pPR build/text dist/python-$(DISTVERSION)-docs-text
205223
tar -C dist -cf dist/python-$(DISTVERSION)-docs-text.tar python-$(DISTVERSION)-docs-text
@@ -209,9 +227,13 @@ dist:
209227
rm dist/python-$(DISTVERSION)-docs-text.tar
210228
@echo"Build finished and archived!"
211229

230+
.PHONY: dist-pdf
231+
dist-pdf:
212232
# archive the A4 latex
213233
@echo"Building LaTeX (A4 paper)..."
234+
mkdir -p dist
214235
rm -rf build/latex
236+
find dist -name'python-$(DISTVERSION)-docs-pdf*' -exec rm -rf {}\;
215237
$(MAKE) latex PAPER=a4
216238
# remove zip & bz2 dependency on all-pdf,
217239
# as otherwise the full latexmk process is run twice.
@@ -222,16 +244,24 @@ dist:
222244
cp build/latex/docs-pdf.tar.bz2 dist/python-$(DISTVERSION)-docs-pdf-a4.tar.bz2
223245
@echo"Build finished and archived!"
224246

247+
.PHONY: dist-epub
248+
dist-epub:
225249
# copy the epub build
226250
@echo"Building EPUB..."
251+
mkdir -p dist
227252
rm -rf build/epub
253+
rm -f dist/python-$(DISTVERSION)-docs.epub
228254
$(MAKE) epub
229255
cp -pPR build/epub/Python.epub dist/python-$(DISTVERSION)-docs.epub
230256
@echo"Build finished and archived!"
231257

258+
.PHONY: dist-texinfo
259+
dist-texinfo:
232260
# archive the texinfo build
233261
@echo"Building Texinfo..."
262+
mkdir -p dist
234263
rm -rf build/texinfo
264+
find dist -name'python-$(DISTVERSION)-docs-texinfo*' -exec rm -rf {}\;
235265
$(MAKE) texinfo
236266
$(MAKE) info --directory=build/texinfo
237267
cp -pPR build/texinfo dist/python-$(DISTVERSION)-docs-texinfo

‎Doc/c-api/code.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ bound into a function.
9696
Return the line number of the instruction that occurs on or before ``byte_offset`` and ends after it.
9797
If you just need the line number of a frame, use:c:func:`PyFrame_GetLineNumber` instead.
9898
99-
For efficiently iterating over the line numbers in a code object, use `the API described in PEP 626
100-
<https://peps.python.org/pep-0626/#out-of-process-debuggers-and-profilers>`_.
99+
For efficiently iterating over the line numbers in a code object, use:pep:`the API described in PEP 626
100+
<0626#out-of-process-debuggers-and-profilers>`.
101101
102102
..c:function::intPyCode_Addr2Location(PyObject *co, int byte_offset, int *start_line, int *start_column, int *end_line, int *end_column)
103103

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp