Skip to content

Bump blockbuster to 1.5.26#11804

Merged
Dreamsorcerer merged 1 commit intoaio-libs:masterfrom
cbornet:blockbuster-1.5.26
Dec 5, 2025
Merged

Bump blockbuster to 1.5.26#11804
Dreamsorcerer merged 1 commit intoaio-libs:masterfrom
cbornet:blockbuster-1.5.26

Conversation

@cbornet
Copy link
Copy Markdown
Contributor

@cbornet cbornet commented Dec 5, 2025

What do these changes do?

Bump blockbuster to 1.5.26.
Needed because of false positives with Python 3.14.1t

Are there changes in behavior for the user?

No

@codspeed-hq
Copy link
Copy Markdown

codspeed-hq Bot commented Dec 5, 2025

CodSpeed Performance Report

Merging #11804 will not alter performance

Comparing cbornet:blockbuster-1.5.26 (68103b6) with master (cfdafac)

Summary

✅ 59 untouched

@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 5, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.73%. Comparing base (cfdafac) to head (68103b6).
⚠️ Report is 238 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #11804      +/-   ##
==========================================
+ Coverage   97.64%   98.73%   +1.09%     
==========================================
  Files         127      127              
  Lines       43845    43845              
  Branches     2332     2332              
==========================================
+ Hits        42811    43292     +481     
+ Misses        849      392     -457     
+ Partials      185      161      -24     
Flag Coverage Δ
CI-GHA 98.60% <ø> (+1.06%) ⬆️
OS-Linux 98.33% <ø> (+0.80%) ⬆️
OS-Windows 96.68% <ø> (?)
OS-macOS 97.57% <ø> (?)
Py-3.10.11 97.10% <ø> (?)
Py-3.10.19 97.60% <ø> (+0.67%) ⬆️
Py-3.11.14 97.80% <ø> (+0.67%) ⬆️
Py-3.11.9 97.31% <ø> (?)
Py-3.12.10 97.41% <ø> (?)
Py-3.12.12 97.90% <ø> (+0.67%) ⬆️
Py-3.13.9 98.15% <ø> (+0.92%) ⬆️
Py-3.14.0 98.11% <ø> (?)
Py-3.14.1t 97.18% <ø> (?)
Py-pypy3.11.13-7.3.20 97.40% <ø> (?)
VM-macos 97.57% <ø> (?)
VM-ubuntu 98.33% <ø> (+0.80%) ⬆️
VM-windows 96.68% <ø> (?)

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.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.13 Trigger automatic backporting to the 3.13 release branch by Patchback robot backport-3.14 Trigger automatic backporting to the 3.14 release branch by Patchback robot labels Dec 5, 2025
@Dreamsorcerer
Copy link
Copy Markdown
Member

Perfect, thanks!

@Dreamsorcerer Dreamsorcerer merged commit bffff8c into aio-libs:master Dec 5, 2025
71 of 74 checks passed
@patchback
Copy link
Copy Markdown
Contributor

patchback Bot commented Dec 5, 2025

Backport to 3.13: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply bffff8c on top of patchback/backports/3.13/bffff8cfd3e9f1d078a4781912fc863c4d230a69/pr-11804

Backporting merged PR #11804 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.13/bffff8cfd3e9f1d078a4781912fc863c4d230a69/pr-11804 upstream/3.13
  4. Now, cherry-pick PR Bump blockbuster to 1.5.26 #11804 contents into that branch:
    $ git cherry-pick -x bffff8cfd3e9f1d078a4781912fc863c4d230a69
    If it'll yell at you with something like fatal: Commit bffff8cfd3e9f1d078a4781912fc863c4d230a69 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x bffff8cfd3e9f1d078a4781912fc863c4d230a69
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Bump blockbuster to 1.5.26 #11804 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.13/bffff8cfd3e9f1d078a4781912fc863c4d230a69/pr-11804
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback
Copy link
Copy Markdown
Contributor

patchback Bot commented Dec 5, 2025

Backport to 3.14: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.14/bffff8cfd3e9f1d078a4781912fc863c4d230a69/pr-11804

Backported as #11805

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback Bot pushed a commit that referenced this pull request Dec 5, 2025
(cherry picked from commit bffff8c)
Dreamsorcerer pushed a commit that referenced this pull request Dec 5, 2025
(cherry picked from commit bffff8c)
Dreamsorcerer pushed a commit that referenced this pull request Dec 5, 2025
**This is a backport of PR #11804 as merged into master
(bffff8c).**

Co-authored-by: Christophe Bornet <[email protected]>
Dreamsorcerer added a commit that referenced this pull request Dec 5, 2025
(cherry picked from commit bffff8c)

Co-authored-by: Christophe Bornet <[email protected]>
@cbornet cbornet deleted the blockbuster-1.5.26 branch December 6, 2025 01:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-3.13 Trigger automatic backporting to the 3.13 release branch by Patchback robot backport-3.14 Trigger automatic backporting to the 3.14 release branch by Patchback robot 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.

2 participants