Skip to content

Commit 7e26b88

Browse files
authored
Merge branch 'main' into fix-142252
2 parents 028cc24 + b38be2e commit 7e26b88

3,704 files changed

Lines changed: 323908 additions & 148874 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.

.azure-pipelines/windows-layout-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
displayName: Show layout info (${{ parameters.kind }})
1313

1414
- ${{ if eq(parameters.fulltest, 'true') }}:
15-
- script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)" -i test_launcher
15+
- script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)"
1616
workingDirectory: $(Build.BinariesDirectory)\layout-${{ parameters.kind }}-$(arch)
1717
displayName: ${{ parameters.kind }} Tests
1818
env:

.claude/CLAUDE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../AGENTS.md

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
root = true
22

3-
[*.{py,c,cpp,h,js,rst,md,yml,yaml,gram}]
3+
[*.{py,c,cpp,h,js,rst,md,yml,yaml,toml,gram}]
44
trim_trailing_whitespace = true
55
insert_final_newline = true
66
indent_style = space
77

8-
[*.{py,c,cpp,h,gram}]
8+
[*.{py,c,cpp,h,toml,gram}]
99
indent_size = 4
1010

1111
[*.rst]

.gitattributes

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*.zip binary
2020

2121
# Specific binary files
22-
PC/classicAppCompat.* binary
22+
# -- None right now --
2323

2424
# Text files that should not be subject to eol conversion
2525
[attr]noeol -text
@@ -34,6 +34,9 @@ Lib/test/xmltestdata/* noeol
3434
Lib/venv/scripts/common/activate text eol=lf
3535
Lib/venv/scripts/posix/* text eol=lf
3636

37+
# Prevent GitHub's web conflict editor from converting LF to CRLF
38+
*.rst text eol=lf
39+
3740
# CRLF files
3841
[attr]dos text eol=crlf
3942

@@ -77,11 +80,12 @@ Include/internal/pycore_ast_state.h generated
7780
Include/internal/pycore_opcode.h generated
7881
Include/internal/pycore_opcode_metadata.h generated
7982
Include/internal/pycore_*_generated.h generated
83+
Include/internal/pycore_token.h generated
8084
Include/internal/pycore_uop_ids.h generated
8185
Include/internal/pycore_uop_metadata.h generated
8286
Include/opcode.h generated
8387
Include/opcode_ids.h generated
84-
Include/token.h generated
88+
Include/slots_generated.h generated
8589
Lib/_opcode_metadata.py generated
8690
Lib/idlelib/help.html generated
8791
Lib/keyword.py generated
@@ -94,7 +98,8 @@ Lib/test/test_stable_abi_ctypes.py generated
9498
Lib/test/test_zoneinfo/data/*.json generated
9599
Lib/token.py generated
96100
Misc/sbom.spdx.json generated
97-
Objects/typeslots.inc generated
101+
Modules/_testinternalcapi/test_cases.c.h generated
102+
Modules/_testinternalcapi/test_targets.h generated
98103
PC/python3dll.c generated
99104
Parser/parser.c generated
100105
Parser/token.c generated
@@ -104,8 +109,11 @@ Python/executor_cases.c.h generated
104109
Python/generated_cases.c.h generated
105110
Python/optimizer_cases.c.h generated
106111
Python/opcode_targets.h generated
112+
Python/record_functions.c.h generated
113+
Python/slots_generated.c generated
107114
Python/stdlib_module_names.h generated
108115
Tools/peg_generator/pegen/grammar_parser.py generated
109116
aclocal.m4 generated
110117
configure generated
111118
*.min.js generated
119+
package-lock.json generated

0 commit comments

Comments
 (0)