Skip to content

[pull] main from python:main #868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Mar 16, 2026
+48 −48
Merged

[pull] main from python:main #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae1b307
build(deps): bump hypothesis from 6.135.26 to 6.151.9 in /Tools (#145…
dependabot[bot] Mar 16, 2026
2a0fa50
gh-145870: Fix Format.SOURCE reference in get_annotations docstring (…
wavebyrd Mar 16, 2026
4e96282
Docs: remove unmatched parenthesis for `asyncio.TaskGroup` note (#146…
trag1c Mar 16, 2026
104cae0
gh-142927: Move hotspots up flamegraph sidebar (#145428)
hugovk Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Doc/library/asyncio-task.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ Running Tasks Concurrently
provides stronger safety guarantees than *gather* for scheduling a nesting of subtasks:
if a task (or a subtask, a task scheduled by a task)
raises an exception, *TaskGroup* will, while *gather* will not,
cancel the remaining scheduled tasks).
cancel the remaining scheduled tasks.

.. _asyncio_example_gather:

Expand Down
2 changes: 1 addition & 1 deletion Lib/annotationlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ def get_annotations(
does not exist, the __annotate__ function is called. The
FORWARDREF format uses __annotations__ if it exists and can be
evaluated, and otherwise falls back to calling the __annotate__ function.
The SOURCE format tries __annotate__ first, and falls back to
The STRING format tries __annotate__ first, and falls back to
using __annotations__, stringified using annotations_to_string().

This function handles several details for you:
Expand Down
90 changes: 45 additions & 45 deletions Lib/profiling/sampling/_flamegraph_assets/flamegraph_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,51 @@ <h3 class="section-title">Profile Summary</h3>
</div>
</section>

<!-- Hotspots Section -->
<section class="sidebar-section collapsible" id="hotspots-section">
<button class="section-header" onclick="toggleSection('hotspots-section')">
<h3 class="section-title">Hotspots</h3>
<svg class="section-chevron" width="12" height="12" viewBox="0 0 12 12" fill="none">
<path d="M3 4.5L6 7.5L9 4.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
</button>
<div class="section-content">
<div class="hotspot" id="hotspot-1">
<div class="hotspot-rank hotspot-rank--1">1</div>
<div class="hotspot-info">
<div class="hotspot-func" id="hotspot-func-1">--</div>
<div class="hotspot-file" id="hotspot-file-1">--</div>
<div class="hotspot-stats">
<span class="hotspot-percent" id="hotspot-percent-1">--</span>
<span id="hotspot-samples-1"></span>
</div>
</div>
</div>
<div class="hotspot" id="hotspot-2">
<div class="hotspot-rank hotspot-rank--2">2</div>
<div class="hotspot-info">
<div class="hotspot-func" id="hotspot-func-2">--</div>
<div class="hotspot-file" id="hotspot-file-2">--</div>
<div class="hotspot-stats">
<span class="hotspot-percent" id="hotspot-percent-2">--</span>
<span id="hotspot-samples-2"></span>
</div>
</div>
</div>
<div class="hotspot" id="hotspot-3">
<div class="hotspot-rank hotspot-rank--3">3</div>
<div class="hotspot-info">
<div class="hotspot-func" id="hotspot-func-3">--</div>
<div class="hotspot-file" id="hotspot-file-3">--</div>
<div class="hotspot-stats">
<span class="hotspot-percent" id="hotspot-percent-3">--</span>
<span id="hotspot-samples-3"></span>
</div>
</div>
</div>
</div>
</section>

<!-- Thread Stats Section (GIL/GC) -->
<section class="sidebar-section thread-stats-section collapsible" id="thread-stats-bar" style="display: none;">
<button class="section-header" onclick="toggleSection('thread-stats-bar')">
Expand Down Expand Up @@ -237,51 +282,6 @@ <h3 class="section-title">Runtime Stats</h3>
</div>
</section>

<!-- Hotspots Section -->
<section class="sidebar-section collapsible" id="hotspots-section">
<button class="section-header" onclick="toggleSection('hotspots-section')">
<h3 class="section-title">Hotspots</h3>
<svg class="section-chevron" width="12" height="12" viewBox="0 0 12 12" fill="none">
<path d="M3 4.5L6 7.5L9 4.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
</button>
<div class="section-content">
<div class="hotspot" id="hotspot-1">
<div class="hotspot-rank hotspot-rank--1">1</div>
<div class="hotspot-info">
<div class="hotspot-func" id="hotspot-func-1">--</div>
<div class="hotspot-file" id="hotspot-file-1">--</div>
<div class="hotspot-stats">
<span class="hotspot-percent" id="hotspot-percent-1">--</span>
<span id="hotspot-samples-1"></span>
</div>
</div>
</div>
<div class="hotspot" id="hotspot-2">
<div class="hotspot-rank hotspot-rank--2">2</div>
<div class="hotspot-info">
<div class="hotspot-func" id="hotspot-func-2">--</div>
<div class="hotspot-file" id="hotspot-file-2">--</div>
<div class="hotspot-stats">
<span class="hotspot-percent" id="hotspot-percent-2">--</span>
<span id="hotspot-samples-2"></span>
</div>
</div>
</div>
<div class="hotspot" id="hotspot-3">
<div class="hotspot-rank hotspot-rank--3">3</div>
<div class="hotspot-info">
<div class="hotspot-func" id="hotspot-func-3">--</div>
<div class="hotspot-file" id="hotspot-file-3">--</div>
<div class="hotspot-stats">
<span class="hotspot-percent" id="hotspot-percent-3">--</span>
<span id="hotspot-samples-3"></span>
</div>
</div>
</div>
</div>
</section>

<!-- Thread Filter Section -->
<section class="sidebar-section filter-section" id="thread-section" style="display: none;">
<label class="filter-label" for="thread-filter">Thread Filter</label>
Expand Down
2 changes: 1 addition & 1 deletion Tools/requirements-hypothesis.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Requirements file for hypothesis that
# we use to run our property-based tests in CI.

hypothesis==6.135.26
hypothesis==6.151.9
Loading