Skip to content

Bump aiohttp dependency#7304

Merged
mdellweg merged 1 commit intopulp:3.63from
mdellweg:bump_aiohttp
Feb 9, 2026
Merged

Bump aiohttp dependency#7304
mdellweg merged 1 commit intopulp:3.63from
mdellweg:bump_aiohttp

Conversation

@mdellweg
Copy link
Member

@mdellweg mdellweg commented Feb 9, 2026

📜 Checklist

  • Commits are cleanly separated with meaningful messages (simple features and bug fixes should be squashed to one commit)
  • A changelog entry or entries has been added for any significant changes
  • Follows the Pulp policy on AI Usage
  • (For new features) - User documentation and test coverage has been added

See: Pull Request Walkthrough

@mdellweg mdellweg merged commit ba83174 into pulp:3.63 Feb 9, 2026
13 checks passed
@mdellweg mdellweg deleted the bump_aiohttp branch February 9, 2026 14:26
@patchback
Copy link

patchback bot commented Feb 9, 2026

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

❌ Failed to cleanly apply ba83174 on top of patchback/backports/3.49/ba83174fcf0a11f5ae2a9df1a08a80ac8eaefcbe/pr-7304

Backporting merged PR #7304 into 3.63

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants