Skip to content
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.

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

[3.11] Fix duplicate cancelling check in TimerContext due to merge conflict resolution error #9417

Merged
merged 1 commit into from
Oct 4, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Oct 4, 2024

No description provided.

@bdraco bdraco requested a review from asvetlov as a code owner October 4, 2024 18:52
@bdraco bdraco added bot:chronographer:skip This PR does not need to include a change note backport:skip Skip backport bot labels Oct 4, 2024
@bdraco bdraco enabled auto-merge (squash) October 4, 2024 18:52
Copy link

codecov bot commented Oct 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.81%. Comparing base (cfe9c0a) to head (62f840b).
Report is 1 commits behind head on 3.11.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##             3.11    #9417      +/-   ##
==========================================
- Coverage   97.81%   97.81%   -0.01%     
==========================================
  Files         108      108              
  Lines       35149    35147       -2     
  Branches     4194     4193       -1     
==========================================
- Hits        34380    34378       -2     
  Misses        573      573              
  Partials      196      196              
Flag Coverage Δ
CI-GHA 97.69% <ø> (+<0.01%) ⬆️
OS-Linux 97.37% <ø> (+<0.01%) ⬆️
OS-Windows 94.89% <ø> (+<0.01%) ⬆️
OS-macOS 97.08% <ø> (+0.01%) ⬆️
Py-3.10.11 96.93% <ø> (+<0.01%) ⬆️
Py-3.10.15 96.87% <ø> (+<0.01%) ⬆️
Py-3.11.10 96.95% <ø> (+0.01%) ⬆️
Py-3.11.9 97.03% <ø> (+0.01%) ⬆️
Py-3.12.6 97.41% <ø> (+<0.01%) ⬆️
Py-3.13.0-rc.3 97.40% <ø> (+<0.01%) ⬆️
Py-3.9.13 96.84% <ø> (+<0.01%) ⬆️
Py-3.9.20 96.79% <ø> (+<0.01%) ⬆️
Py-pypy7.3.16 96.39% <ø> (+<0.01%) ⬆️
VM-macos 97.08% <ø> (+0.01%) ⬆️
VM-ubuntu 97.37% <ø> (+<0.01%) ⬆️
VM-windows 94.89% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bdraco bdraco merged commit cd54f11 into 3.11 Oct 4, 2024
31 of 32 checks passed
@bdraco bdraco deleted the merge_error_fix branch October 4, 2024 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:skip Skip backport bot bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant