Skip to content

Conversation

oraNod
Copy link
Contributor

@oraNod oraNod commented Mar 25, 2025

resolves #2356

@oraNod oraNod added dependency_update PR to update pinned dependencies backport-2.18 Automatically create a backport for the stable-2.18 branch labels Mar 25, 2025
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Copy link
Collaborator

@gotmax23 gotmax23 left a comment

Choose a reason for hiding this comment

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

LGTM, but we should also probably update the lockfiles (nox -e pip-compile -- --upgrade-package resolvelib) here.

@gotmax23 gotmax23 merged commit d1e36ec into ansible:devel Mar 26, 2025
12 checks passed
Copy link

patchback bot commented Mar 26, 2025

Backport to stable-2.18: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply d1e36ec on top of patchback/backports/stable-2.18/d1e36eca12e56527dd9c6f398938fb2b9c4b4e35/pr-2471

Backporting merged PR #2471 into devel

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

@oraNod
Copy link
Contributor Author

oraNod commented Mar 26, 2025

This was my error. The change does not need to be backported to stable-2.18 after all.

https://github.com/ansible/ansible-documentation/blob/stable-2.18/tests/constraints.in // https://github.com/ansible/ansible/blob/stable-2.18/requirements.txt

Thanks for merging @gotmax23

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2.18 Automatically create a backport for the stable-2.18 branch dependency_update PR to update pinned dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bump upper limit for resolvelib to 2.0.0
3 participants