Skip to content

[3.63] Pin pycares to avoid bug with aiodns combination#6697

Merged
mdellweg merged 1 commit into
pulp:3.63from
pedro-psb:pin-pycares-3.63
Jun 18, 2025
Merged

[3.63] Pin pycares to avoid bug with aiodns combination#6697
mdellweg merged 1 commit into
pulp:3.63from
pedro-psb:pin-pycares-3.63

Conversation

@pedro-psb

Copy link
Copy Markdown
Member

See for more context:
#6695

@pedro-psb

Copy link
Copy Markdown
Member Author

3.22 doesn't need the backport, as it has aiodns<3.2:

$ for version in 3.22 3.28 3.39 3.49 3.63 3.73 3.80; do git grep aiodns upstream/$version; done | grep =
upstream/3.22:requirements.txt:aiodns>=3.0,<=3.1.1
upstream/3.28:requirements.txt:aiodns>=3.0,<=3.2.0
upstream/3.39:requirements.txt:aiodns>=3.0,<=3.2.0
upstream/3.49:requirements.txt:aiodns>=3.0,<=3.2.0
upstream/3.63:requirements.txt:aiodns>=3.0,<=3.2.0
upstream/3.73:pyproject.toml:  "aiodns>=3.0,<=3.2.0",
upstream/3.80:pyproject.toml:  "aiodns>=3.0,<=3.4.0",

@mdellweg mdellweg merged commit b156030 into pulp:3.63 Jun 18, 2025
13 checks passed
@patchback

patchback Bot commented Jun 18, 2025

Copy link
Copy Markdown

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

❌ Failed to cleanly apply b156030 on top of patchback/backports/3.39/b1560306741816770ddafa3d51dadbef4c7b072a/pr-6697

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

patchback Bot commented Jun 18, 2025

Copy link
Copy Markdown

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

❌ Failed to cleanly apply b156030 on top of patchback/backports/3.28/b1560306741816770ddafa3d51dadbef4c7b072a/pr-6697

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

patchback Bot commented Jun 18, 2025

Copy link
Copy Markdown

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

❌ Failed to cleanly apply b156030 on top of patchback/backports/3.49/b1560306741816770ddafa3d51dadbef4c7b072a/pr-6697

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

@pedro-psb

Copy link
Copy Markdown
Member Author

The patchback bot dissapoints me... I took the time to make it easier for him.

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