Skip to content

Commit 0ff0951

Browse files
itamarofacebook-github-bot
itamaro
authored and
facebook-github-bot
committed
Merge upstream 3.13.6 release
Summary: https://www.python.org/downloads/release/python-3136/ https://discuss.python.org/t/python-3-13-6-has-been-released/101482 This applies all upstream changes from upstream git commit `6cb20a219a860eaf687b2d968b41c480c7461909` to `4e665351082c50018fb31d80db25b4693057393e` upstream commit: python/cpython@4e66535 Reviewed By: DinoV Differential Revision: D79783596 fbshipit-source-id: 98ddf0ff157d1aeb93284030dae220f581d43a00
1 parent d849361 commit 0ff0951

318 files changed

Lines changed: 13910 additions & 10122 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.

‎.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}]
3+
[*.{py,c,cpp,h,js,rst,md,yml,yaml,gram}]
44
trim_trailing_whitespace = true
55
insert_final_newline = true
66
indent_style = space
77

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

1111
[*.rst]

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.github/** @ezio-melotti @hugovk
99

1010
# pre-commit
11-
.pre-commit-config.yaml @hugovk @AlexWaygood
11+
.pre-commit-config.yaml @hugovk
1212
.ruff.toml @hugovk @AlexWaygood
1313

1414
# Build system

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -545,20 +545,24 @@ jobs:
545545
- name: Tests
546546
run: xvfb-run make test
547547

548-
build-tsan:
549-
name: >-
550-
Thread sanitizer
551-
${{ fromJSON(matrix.free-threading) && '(free-threading)' || '' }}
548+
build-san:
549+
name: >- # ${{ '' } is a hack to nest jobs under the same sidebar category
550+
Sanitizers${{ '' }}
552551
needs: build-context
553552
if: needs.build-context.outputs.run-tests == 'true'
554553
strategy:
555554
fail-fast: false
556555
matrix:
556+
check-name:
557+
- Thread
557558
free-threading:
558559
- false
559560
- true
560-
uses: ./.github/workflows/reusable-tsan.yml
561+
sanitizer:
562+
- TSan
563+
uses: ./.github/workflows/reusable-san.yml
561564
with:
565+
sanitizer: ${{ matrix.sanitizer }}
562566
config_hash: ${{ needs.build-context.outputs.config-hash }}
563567
free-threading: ${{ matrix.free-threading }}
564568

@@ -619,7 +623,7 @@ jobs:
619623
- build-wasi
620624
- test-hypothesis
621625
- build-asan
622-
- build-tsan
626+
- build-san
623627
- cifuzz
624628
if: always()
625629

@@ -651,7 +655,7 @@ jobs:
651655
build-wasi,
652656
test-hypothesis,
653657
build-asan,
654-
build-tsan,
658+
build-san,
655659
'
656660
|| ''
657661
}}

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

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
name: Reusable Sanitizer
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
sanitizer:
7+
required: true
8+
type: string
9+
config_hash:
10+
required: true
11+
type: string
12+
free-threading:
13+
description: Whether to use free-threaded mode
14+
required: false
15+
type: boolean
16+
default: false
17+
18+
env:
19+
FORCE_COLOR: 1
20+
21+
jobs:
22+
build-san-reusable:
23+
name: >-
24+
${{ inputs.sanitizer }}${{
25+
inputs.free-threading
26+
&& ' (free-threading)'
27+
|| ''
28+
}}
29+
runs-on: ubuntu-24.04
30+
timeout-minutes: 60
31+
steps:
32+
- uses: actions/checkout@v4
33+
with:
34+
persist-credentials: false
35+
- name: Runner image version
36+
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
37+
- name: Restore config.cache
38+
uses: actions/cache@v4
39+
with:
40+
path: config.cache
41+
key: ${{ github.job }}-${{ env.IMAGE_OS_VERSION }}-${{ inputs.sanitizer }}-${{ inputs.config_hash }}
42+
- name: Install dependencies
43+
run: |
44+
sudo ./.github/workflows/posix-deps-apt.sh
45+
# Install clang
46+
wget https://apt.llvm.org/llvm.sh
47+
chmod +x llvm.sh
48+
49+
if [ "${SANITIZER}" = "TSan" ]; then
50+
sudo ./llvm.sh 17 # gh-121946: llvm-18 package is temporarily broken
51+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 100
52+
sudo update-alternatives --set clang /usr/bin/clang-17
53+
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 100
54+
sudo update-alternatives --set clang++ /usr/bin/clang++-17
55+
# Reduce ASLR to avoid TSan crashing
56+
sudo sysctl -w vm.mmap_rnd_bits=28
57+
else
58+
sudo ./llvm.sh 20
59+
fi
60+
61+
- name: Sanitizer option setup
62+
run: |
63+
if [ "${SANITIZER}" = "TSan" ]; then
64+
echo "TSAN_OPTIONS=${SAN_LOG_OPTION} suppressions=${GITHUB_WORKSPACE}/Tools/tsan/suppressions${{
65+
fromJSON(inputs.free-threading)
66+
&& '_free_threading'
67+
|| ''
68+
}}.txt handle_segv=0" >> "$GITHUB_ENV"
69+
else
70+
echo "UBSAN_OPTIONS=${SAN_LOG_OPTION}" >> "$GITHUB_ENV"
71+
fi
72+
echo "CC=clang" >> "$GITHUB_ENV"
73+
echo "CXX=clang++" >> "$GITHUB_ENV"
74+
env:
75+
SANITIZER: ${{ inputs.sanitizer }}
76+
SAN_LOG_OPTION: log_path=${{ github.workspace }}/san_log
77+
- name: Add ccache to PATH
78+
run: |
79+
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
80+
- name: Configure ccache action
81+
uses: hendrikmuhs/ccache-action@v1.2
82+
with:
83+
save: ${{ github.event_name == 'push' }}
84+
max-size: "200M"
85+
- name: Configure CPython
86+
run: >-
87+
./configure
88+
--config-cache
89+
${{
90+
inputs.sanitizer == 'TSan'
91+
&& '--with-thread-sanitizer'
92+
|| '--with-undefined-behavior-sanitizer'
93+
}}
94+
--with-pydebug
95+
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
96+
- name: Build CPython
97+
run: make -j4
98+
- name: Display build info
99+
run: make pythoninfo
100+
- name: Tests
101+
run: >-
102+
./python -m test
103+
${{ inputs.sanitizer == 'TSan' && '--tsan' || '' }}
104+
-j4
105+
- name: Display logs
106+
if: always()
107+
run: find "${GITHUB_WORKSPACE}" -name 'san_log.*' | xargs head -n 1000
108+
- name: Archive logs
109+
if: always()
110+
uses: actions/upload-artifact@v4
111+
with:
112+
name: >-
113+
${{ inputs.sanitizer }}-logs-${{
114+
fromJSON(inputs.free-threading)
115+
&& 'free-threading'
116+
|| 'default'
117+
}}
118+
path: san_log.*
119+
if-no-files-found: ignore

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

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎.pre-commit-config.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ repos:
2626
name: Run Black on Tools/jit/
2727
files: ^Tools/jit/
2828

29+
- repo: https://github.com/Lucas-C/pre-commit-hooks
30+
rev: v1.5.5
31+
hooks:
32+
- id: remove-tabs
33+
types: [python]
34+
exclude: ^Tools/c-analyzer/cpython/_parser.py
35+
2936
- repo: https://github.com/pre-commit/pre-commit-hooks
3037
rev: v5.0.0
3138
hooks:

0 commit comments

Comments
 (0)