Skip to content

Conversation

@cdce8p
Copy link
Contributor

@cdce8p cdce8p commented Oct 13, 2025

What do these changes do?

Followup to #9951. Move dependencies and optional dependencies from setup.cfg to pyproject.toml.

Are there changes in behavior for the user?

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

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 Oct 13, 2025
@cdce8p cdce8p added 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 Oct 13, 2025
@cdce8p cdce8p force-pushed the move-dependencies branch from a0fe9f7 to f638514 Compare October 13, 2025 15:23
@codspeed-hq
Copy link

codspeed-hq bot commented Oct 13, 2025

CodSpeed Performance Report

Merging #11643 will not alter performance

Comparing cdce8p:move-dependencies (88664dc) with master (b1bd65d)

Summary

✅ 59 untouched

@codecov
Copy link

codecov bot commented Oct 13, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.74%. Comparing base (6b5d8e7) to head (88664dc).
⚠️ Report is 87 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #11643   +/-   ##
=======================================
  Coverage   98.74%   98.74%           
=======================================
  Files         127      127           
  Lines       43448    43449    +1     
  Branches     2326     2326           
=======================================
+ Hits        42903    42904    +1     
  Misses        389      389           
  Partials      156      156           
Flag Coverage Δ
CI-GHA 98.63% <ø> (+<0.01%) ⬆️
OS-Linux 98.36% <ø> (+<0.01%) ⬆️
OS-Windows 96.69% <ø> (+<0.01%) ⬆️
OS-macOS 97.59% <ø> (+<0.01%) ⬆️
Py-3.10.11 97.15% <ø> (+<0.01%) ⬆️
Py-3.10.18 97.64% <ø> (-0.01%) ⬇️
Py-3.11.13 97.84% <ø> (+<0.01%) ⬆️
Py-3.11.9 97.35% <ø> (+<0.01%) ⬆️
Py-3.12.10 97.45% <ø> (+<0.01%) ⬆️
Py-3.12.11 97.95% <ø> (+<0.01%) ⬆️
Py-3.13.7 98.21% <ø> (+0.01%) ⬆️
Py-3.14.0 98.15% <ø> (-0.01%) ⬇️
Py-3.14.0t 97.21% <ø> (-0.02%) ⬇️
Py-pypy3.10.16-7.3.19 88.16% <ø> (-6.02%) ⬇️
VM-macos 97.59% <ø> (+<0.01%) ⬆️
VM-ubuntu 98.36% <ø> (+<0.01%) ⬆️
VM-windows 96.69% <ø> (+<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.

@cdce8p cdce8p force-pushed the move-dependencies branch from 4294978 to 88664dc Compare October 14, 2025 13:50
Copy link
Member

@webknjaz webknjaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@webknjaz webknjaz merged commit e1aec0a into aio-libs:master Oct 28, 2025
41 checks passed
@patchback
Copy link
Contributor

patchback bot commented Oct 28, 2025

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

❌ Failed to cleanly apply e1aec0a on top of patchback/backports/3.13/e1aec0ac94277a8b67092293aeac3c19e17fdd86/pr-11643

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

patchback bot commented Oct 28, 2025

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

❌ Failed to cleanly apply e1aec0a on top of patchback/backports/3.14/e1aec0ac94277a8b67092293aeac3c19e17fdd86/pr-11643

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

@webknjaz
Copy link
Member

@cdce8p could you send those backports in?

@cdce8p
Copy link
Contributor Author

cdce8p commented Oct 28, 2025

@cdce8p could you send those backports in?

Looking at it now.

@cdce8p
Copy link
Contributor Author

cdce8p commented Oct 28, 2025

@webknjaz If you've some spare time while I do the backports, this one is has also been waiting for your review for some time now aio-libs/frozenlist#644.

cdce8p added a commit to cdce8p/aiohttp that referenced this pull request Oct 28, 2025
PR aio-libs#11643. This is a follow-up to aio-libs#9951 implementing PEP 621.

(cherry picked from commit e1aec0a)
cdce8p added a commit to cdce8p/aiohttp that referenced this pull request Oct 28, 2025
PR aio-libs#11643. This is a follow-up to aio-libs#9951 implementing PEP 621.

(cherry picked from commit e1aec0a)
@cdce8p cdce8p deleted the move-dependencies branch October 28, 2025 22:18
webknjaz pushed a commit that referenced this pull request Oct 28, 2025
…to `pyproject.toml` (#11736)

This is a backport of PR #11643
as merged into master
(e1aec0a).

Modified the backport to include `attrs` again as present on the 3.14
branch.
webknjaz pushed a commit that referenced this pull request Oct 28, 2025
…to `pyproject.toml` (#11735)

This is a backport of PR #11643
as merged into master
(e1aec0a).

Modified the backport to include `attrs` again as present on the 3.13
branch.
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:provided There is a change note present in this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants