Skip to content

Switch PyPy testing to 3.12 - #13840

Merged
Dreamsorcerer merged 10 commits into
masterfrom
Dreamsorcerer-patch-3
Sep 28, 2026
Merged

Dreamsorcerer merged 10 commits into
masterfrom
Dreamsorcerer-patch-3

Conversation

@Dreamsorcerer

Copy link
Copy Markdown
Member

There's a new release that should support 3.12. The 3.11 version is causing flaky tests due to race conditions only present on Python 3.11.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.15 Trigger automatic backporting to the 3.15 release branch by Patchback robot labels Sep 27, 2026
@codecov

codecov Bot commented Sep 27, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 99.04%. Comparing base (e07684e) to head (4bd8a51).
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #13840   +/-   ##
=======================================
  Coverage   99.03%   99.04%           
=======================================
  Files         135      135           
  Lines       51541    51562   +21     
  Branches     2696     2696           
=======================================
+ Hits        51046    51068   +22     
+ Misses        372      371    -1     
  Partials      123      123           
Flag Coverage Δ
Autobahn 21.89% <13.33%> (-0.01%) ⬇️
CI-GHA 98.87% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.66% <100.00%> (+<0.01%) ⬆️
OS-Windows 97.29% <100.00%> (+<0.01%) ⬆️
OS-macOS 98.15% <100.00%> (+<0.01%) ⬆️
Py-3.10 98.09% <100.00%> (+<0.01%) ⬆️
Py-3.11 98.31% <93.33%> (+<0.01%) ⬆️
Py-3.12 98.40% <100.00%> (-0.01%) ⬇️
Py-3.13 98.40% <100.00%> (+<0.01%) ⬆️
Py-3.14 98.42% <100.00%> (+<0.01%) ⬆️
Py-3.15 98.43% <100.00%> (+0.01%) ⬆️
Py-3.15t 97.80% <100.00%> (+<0.01%) ⬆️
Py-pypy-3.11 ?
Py-pypy-3.12 96.51% <100.00%> (?)
VM-macos 98.15% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.66% <100.00%> (+<0.01%) ⬆️
VM-windows 97.29% <100.00%> (+<0.01%) ⬆️
cython-coverage 83.29% <88.88%> (-0.01%) ⬇️

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

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

@greptile-apps

greptile-apps Bot commented Sep 27, 2026 •

Copy link
Copy Markdown

RetriggerConfidence Score: 5/5

[High risk] Updates PyPy test version and adjusts transport type handling.

No outstanding findings block merging.

Reviews (8) · Last reviewed commit: "Better test"

Comment thread .github/workflows/ci-cd.yml
@greptile-apps

This comment has been minimized.

@codspeed

codspeed Bot commented Sep 27, 2026 •

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 97 untouched benchmarks
⏩ 83 skipped benchmarks1


Comparing Dreamsorcerer-patch-3 (4bd8a51) with master (e07684e)

Open in CodSpeed

Footnotes

  1. 83 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩

Comment thread aiohttp/payload.py Outdated
@Dreamsorcerer Dreamsorcerer changed the title Switch Pypy testing to 3.12 Switch PyPy testing to 3.12 Sep 28, 2026
@Dreamsorcerer
Dreamsorcerer merged commit 60bffb4 into master Sep 28, 2026
57 checks passed
@Dreamsorcerer
Dreamsorcerer deleted the Dreamsorcerer-patch-3 branch September 28, 2026 03:48
@patchback

patchback Bot commented Sep 28, 2026 •

Copy link
Copy Markdown
Contributor

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

❌ Failed to cleanly apply 60bffb4 on top of patchback/backports/3.15/60bffb410dcdd46ec96d843854edec44e8c05557/pr-13840

Backporting merged PR #13840 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.15/60bffb410dcdd46ec96d843854edec44e8c05557/pr-13840 upstream/3.15
    
  4. Now, cherry-pick PR Switch PyPy testing to 3.12 #13840 contents into that branch:
    git cherry-pick -x 60bffb410dcdd46ec96d843854edec44e8c05557
    
    If it'll yell at you with something like fatal: Commit 60bffb410dcdd46ec96d843854edec44e8c05557 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x 60bffb410dcdd46ec96d843854edec44e8c05557
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR Switch PyPy testing to 3.12 #13840 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/3.15/60bffb410dcdd46ec96d843854edec44e8c05557/pr-13840
    
  8. 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.

@Dreamsorcerer Dreamsorcerer added the backport-3.14 Trigger automatic backporting to the 3.14 release branch by Patchback robot label Sep 28, 2026
@patchback

patchback Bot commented Sep 28, 2026 •

Copy link
Copy Markdown
Contributor

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

❌ Failed to cleanly apply 60bffb4 on top of patchback/backports/3.14/60bffb410dcdd46ec96d843854edec44e8c05557/pr-13840

Backporting merged PR #13840 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.14/60bffb410dcdd46ec96d843854edec44e8c05557/pr-13840 upstream/3.14
    
  4. Now, cherry-pick PR Switch PyPy testing to 3.12 #13840 contents into that branch:
    git cherry-pick -x 60bffb410dcdd46ec96d843854edec44e8c05557
    
    If it'll yell at you with something like fatal: Commit 60bffb410dcdd46ec96d843854edec44e8c05557 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x 60bffb410dcdd46ec96d843854edec44e8c05557
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR Switch PyPy testing to 3.12 #13840 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/3.14/60bffb410dcdd46ec96d843854edec44e8c05557/pr-13840
    
  8. 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.

Dreamsorcerer added a commit that referenced this pull request Sep 28, 2026
Dreamsorcerer added a commit that referenced this pull request Sep 28, 2026
(cherry picked from commit 60bffb4)
(cherry picked from commit df20c7c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

1 participant