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

Make enable_cleanup_closed a NOOP for Python 3.12.7+ and 3.13.1+ #9726

Merged
merged 6 commits into from
Nov 9, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Nov 9, 2024

What do these changes do?

python/cpython#118960 has been fixed, and asyncio no longer leaks SSL connections which means enable_cleanup_closed is unnecessary for fixed Python versions

Are there changes in behavior for the user?

no

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

no

Related issue number

closes #9590

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Nov 9, 2024
aiohttp/connector.py Outdated Show resolved Hide resolved
docs/client_reference.rst Outdated Show resolved Hide resolved
@bdraco bdraco added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Nov 9, 2024
Copy link

codspeed-hq bot commented Nov 9, 2024

CodSpeed Performance Report

Merging #9726 will not alter performance

Comparing cleanup_closed (ec5eb34) with master (ab9b566)

Summary

✅ 14 untouched benchmarks

Copy link

codecov bot commented Nov 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.67%. Comparing base (ab9b566) to head (ec5eb34).
Report is 3 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9726   +/-   ##
=======================================
  Coverage   98.67%   98.67%           
=======================================
  Files         117      117           
  Lines       35787    35807   +20     
  Branches     4239     4250   +11     
=======================================
+ Hits        35313    35333   +20     
  Misses        319      319           
  Partials      155      155           
Flag Coverage Δ
CI-GHA 98.56% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.24% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.00% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.31% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.16% <100.00%> (+<0.01%) ⬆️
Py-3.10.15 97.72% <100.00%> (+<0.01%) ⬆️
Py-3.11.10 97.77% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.23% <100.00%> (+<0.01%) ⬆️
Py-3.12.7 98.26% <100.00%> (+<0.01%) ⬆️
Py-3.13.0 98.24% <100.00%> (-0.01%) ⬇️
Py-3.9.13 97.08% <100.00%> (+<0.01%) ⬆️
Py-3.9.20 97.63% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.25% <100.00%> (+<0.01%) ⬆️
VM-macos 97.31% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.24% <100.00%> (+<0.01%) ⬆️
VM-windows 96.00% <100.00%> (+<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 marked this pull request as ready for review November 9, 2024 13:04
@bdraco bdraco merged commit c3a9c3e into master Nov 9, 2024
40 of 41 checks passed
@bdraco bdraco deleted the cleanup_closed branch November 9, 2024 13:34
Copy link
Contributor

patchback bot commented Nov 9, 2024

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

❌ Failed to cleanly apply c3a9c3e on top of patchback/backports/3.10/c3a9c3e67b6ad39e28095fd478e86053b34a7e45/pr-9726

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

Copy link
Contributor

patchback bot commented Nov 9, 2024

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

❌ Failed to cleanly apply c3a9c3e on top of patchback/backports/3.11/c3a9c3e67b6ad39e28095fd478e86053b34a7e45/pr-9726

Backporting merged PR #9726 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.11/c3a9c3e67b6ad39e28095fd478e86053b34a7e45/pr-9726 upstream/3.11
  4. Now, cherry-pick PR Make enable_cleanup_closed a NOOP for Python 3.12.7+ and 3.13.1+ #9726 contents into that branch:
    $ git cherry-pick -x c3a9c3e67b6ad39e28095fd478e86053b34a7e45
    If it'll yell at you with something like fatal: Commit c3a9c3e67b6ad39e28095fd478e86053b34a7e45 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x c3a9c3e67b6ad39e28095fd478e86053b34a7e45
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Make enable_cleanup_closed a NOOP for Python 3.12.7+ and 3.13.1+ #9726 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/c3a9c3e67b6ad39e28095fd478e86053b34a7e45/pr-9726
  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 added a commit that referenced this pull request Nov 9, 2024
bdraco added a commit that referenced this pull request Nov 9, 2024
bdraco added a commit that referenced this pull request Nov 9, 2024
bdraco added a commit that referenced this pull request Nov 9, 2024
stefanor added a commit to stefanor/truststore that referenced this pull request Jan 8, 2025
We still need the argument for older Python releases, but newer releases
will emit a DeprecationWarning.

See: aio-libs/aiohttp#9726
sethmlarson pushed a commit to sethmlarson/truststore that referenced this pull request Jan 10, 2025
We still need the argument for older Python releases, but newer releases
will emit a DeprecationWarning.

See: aio-libs/aiohttp#9726
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 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.

Makecleanup_closed a noop with python 3.12.7+ and 3.13.1+
1 participant