Skip to content

Conversation

kumaraditya303
Copy link
Contributor

@kumaraditya303 kumaraditya303 commented Sep 4, 2025

What do these changes do?

This adds free-threading for CPython 3.14.

Are there changes in behavior for the user?

No

Is it a substantial burden for the maintainers to support this?

No

Related issue number

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES/ folder
    • name it <issue_or_pr_num>.<type>.rst (e.g. 588.bugfix.rst)

    • if you don't have an issue number, change it to the pull request
      number after creating the PR

      • .bugfix: A bug fix for something the maintainers deemed an
        improper undesired behavior that got corrected to match
        pre-agreed expectations.
      • .feature: A new behavior, public APIs. That sort of stuff.
      • .deprecation: A declaration of future API removals and breaking
        changes in behavior.
      • .breaking: When something public is removed in a breaking way.
        Could be deprecated in an earlier release.
      • .doc: Notable updates to the documentation structure or build
        process.
      • .packaging: Notes for downstreams about unobvious side effects
        and tooling. Changes in the test invocation considerations and
        runtime assumptions.
      • .contrib: Stuff that affects the contributor experience. e.g.
        Running tests, building the docs, setting up the development
        environment.
      • .misc: Changes that are hard to assign to any of the above
        categories.
    • Make sure to use full sentences with correct case and punctuation,
      for example:

      Fixed issue with non-ascii contents in doctest text files
      -- by :user:`contributor-gh-handle`.

      Use the past tense or the present tense a non-imperative mood,
      referring to what's changed compared to the last released version
      of this project.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 4, 2025
Copy link

codspeed-hq bot commented Sep 4, 2025

CodSpeed Performance Report

Merging #11466 will not alter performance

Comparing kumaraditya303:ft2 (359fbc5) with master (a9f248a)1

Summary

✅ 59 untouched

Footnotes

  1. No successful run was found on master (a3f033a) during the generation of this report, so a9f248a was used instead as the comparison base. There might be some changes unrelated to this pull request in this report.

Copy link

codecov bot commented Sep 4, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.75%. Comparing base (40a9dd8) to head (359fbc5).
⚠️ Report is 4 commits behind head on master.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #11466   +/-   ##
=======================================
  Coverage   98.75%   98.75%           
=======================================
  Files         127      127           
  Lines       43355    43355           
  Branches     2325     2325           
=======================================
  Hits        42815    42815           
  Misses        385      385           
  Partials      155      155           
Flag Coverage Δ
CI-GHA 98.63% <ø> (ø)
OS-Linux 98.37% <ø> (ø)
OS-Windows 96.69% <ø> (ø)
OS-macOS 97.56% <ø> (ø)
Py-3.10.11 97.21% <ø> (+<0.01%) ⬆️
Py-3.10.18 97.71% <ø> (+<0.01%) ⬆️
Py-3.11.13 97.90% <ø> (-0.01%) ⬇️
Py-3.11.9 97.41% <ø> (+<0.01%) ⬆️
Py-3.12.10 97.51% <ø> (ø)
Py-3.12.11 98.02% <ø> (+<0.01%) ⬆️
Py-3.13.7 98.26% <ø> (ø)
Py-3.9.13 97.10% <ø> (ø)
Py-3.9.23 97.61% <ø> (+<0.01%) ⬆️
Py-pypy3.9.19-7.3.16 82.60% <ø> (-12.38%) ⬇️
VM-macos 97.56% <ø> (ø)
VM-ubuntu 98.37% <ø> (ø)
VM-windows 96.69% <ø> (ø)

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 the backport-3.13 Trigger automatic backporting to the 3.13 release branch by Patchback robot label Sep 4, 2025
@webknjaz
Copy link
Member

webknjaz commented Sep 9, 2025

FTR, CFFI v2.0.0 is in the deps now: #11488.

@kumaraditya303
Copy link
Contributor Author

I am waiting for a cryptography release with free-threading support pyca/cryptography#12555

@kumaraditya303 kumaraditya303 marked this pull request as ready for review September 17, 2025 09:27
@kumaraditya303 kumaraditya303 changed the title add free-threading CI add free-threading CI for Python 3.14 Sep 17, 2025
@bdraco
Copy link
Member

bdraco commented Sep 17, 2025

I think we backported the free threading support to 3.12 as well. Let me take a look

@bdraco
Copy link
Member

bdraco commented Sep 17, 2025

#11468 was trivial so it did go back to 3.12 so we can take for 3.12 as well. Its unlikely we would start shipping 3.13 before CPython 3.14 anyways

@bdraco bdraco added the backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot label Sep 17, 2025
@bdraco
Copy link
Member

bdraco commented Sep 17, 2025

tests/test_cookiejar.py::test_pickle_format is failing, but I think thats expected as it likely changed in 3.14

@kumaraditya303
Copy link
Contributor Author

tests/test_cookiejar.py::test_pickle_format is failing, but I think thats expected as it likely changed in 3.14

Yes, it is unrelated #11503

@bdraco
Copy link
Member

bdraco commented Sep 17, 2025

Thanks @kumaraditya303

@bdraco bdraco merged commit d9a4714 into aio-libs:master Sep 17, 2025
41 of 43 checks passed
Copy link
Contributor

patchback bot commented Sep 17, 2025

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

❌ Failed to cleanly apply d9a4714 on top of patchback/backports/3.12/d9a4714d5ab4d7084975e6067654cdb85f9f61d1/pr-11466

Backporting merged PR #11466 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.12/d9a4714d5ab4d7084975e6067654cdb85f9f61d1/pr-11466 upstream/3.12
  4. Now, cherry-pick PR add free-threading CI for Python 3.14 #11466 contents into that branch:
    $ git cherry-pick -x d9a4714d5ab4d7084975e6067654cdb85f9f61d1
    If it'll yell at you with something like fatal: Commit d9a4714d5ab4d7084975e6067654cdb85f9f61d1 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x d9a4714d5ab4d7084975e6067654cdb85f9f61d1
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR add free-threading CI for Python 3.14 #11466 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/d9a4714d5ab4d7084975e6067654cdb85f9f61d1/pr-11466
  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.

@kumaraditya303 kumaraditya303 deleted the ft2 branch September 17, 2025 14:13
Copy link
Contributor

patchback bot commented Sep 17, 2025

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

❌ Failed to cleanly apply d9a4714 on top of patchback/backports/3.13/d9a4714d5ab4d7084975e6067654cdb85f9f61d1/pr-11466

Backporting merged PR #11466 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/d9a4714d5ab4d7084975e6067654cdb85f9f61d1/pr-11466 upstream/3.13
  4. Now, cherry-pick PR add free-threading CI for Python 3.14 #11466 contents into that branch:
    $ git cherry-pick -x d9a4714d5ab4d7084975e6067654cdb85f9f61d1
    If it'll yell at you with something like fatal: Commit d9a4714d5ab4d7084975e6067654cdb85f9f61d1 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x d9a4714d5ab4d7084975e6067654cdb85f9f61d1
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR add free-threading CI for Python 3.14 #11466 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.13/d9a4714d5ab4d7084975e6067654cdb85f9f61d1/pr-11466
  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.

@bdraco
Copy link
Member

bdraco commented Sep 17, 2025

I'll take care of the backports

bdraco added a commit that referenced this pull request Sep 17, 2025
Co-authored-by: J. Nick Koston <[email protected]>
(cherry picked from commit d9a4714)
bdraco added a commit that referenced this pull request Sep 17, 2025
Co-authored-by: J. Nick Koston <[email protected]>
(cherry picked from commit d9a4714)
@bdraco bdraco removed the backport-3.13 Trigger automatic backporting to the 3.13 release branch by Patchback robot label Sep 17, 2025
@bdraco
Copy link
Member

bdraco commented Sep 17, 2025

Backport to 3.12 isn't going well. Looks like we will try to release 3.13 soon instead.

bdraco added a commit that referenced this pull request Sep 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants