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

Raise upperbound for pkginfo requirement [3.11] #801

Merged
merged 1 commit into from
Feb 20, 2025

Conversation

gerrod3
Copy link
Contributor

@gerrod3 gerrod3 commented Feb 19, 2025

No description provided.

@gerrod3 gerrod3 force-pushed the pkgi-3.11 branch 3 times, most recently from 0bc6d35 to 4338ede Compare February 19, 2025 23:04
@dralley dralley merged commit 0ba7fd6 into pulp:3.11 Feb 20, 2025
12 checks passed
@gerrod3 gerrod3 deleted the pkgi-3.11 branch February 20, 2025 16:42
Copy link

patchback bot commented Feb 25, 2025

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

❌ Failed to cleanly apply 0ba7fd6 on top of patchback/backports/3.12/0ba7fd6d38e5a184e2fa1124fe4cd817f15cd680/pr-801

Backporting merged PR #801 into 3.11

  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/pulp_python.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.12/0ba7fd6d38e5a184e2fa1124fe4cd817f15cd680/pr-801 upstream/3.12
  4. Now, cherry-pick PR Raise upperbound for pkginfo requirement [3.11] #801 contents into that branch:
    $ git cherry-pick -x 0ba7fd6d38e5a184e2fa1124fe4cd817f15cd680
    If it'll yell at you with something like fatal: Commit 0ba7fd6d38e5a184e2fa1124fe4cd817f15cd680 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 0ba7fd6d38e5a184e2fa1124fe4cd817f15cd680
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Raise upperbound for pkginfo requirement [3.11] #801 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/0ba7fd6d38e5a184e2fa1124fe4cd817f15cd680/pr-801
  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