Skip to content

Pin click to z-streams#1189

Merged
mdellweg merged 1 commit into
pulp:mainfrom
mdellweg:fix_click_dependency
May 12, 2025
Merged

Pin click to z-streams#1189
mdellweg merged 1 commit into
pulp:mainfrom
mdellweg:fix_click_dependency

Conversation

@mdellweg
Copy link
Copy Markdown
Member

It turns out the click library introduces breaking changes with y-releases.

It turns out the click library introduces breaking changes with
y-releases.
@mdellweg mdellweg merged commit 6d643dd into pulp:main May 12, 2025
19 checks passed
@mdellweg mdellweg deleted the fix_click_dependency branch May 12, 2025 11:38
@patchback
Copy link
Copy Markdown

patchback Bot commented May 12, 2025

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

❌ Failed to cleanly apply 6d643dd on top of patchback/backports/0.27/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189

Backporting merged PR #1189 into main

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

patchback Bot commented May 12, 2025

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

❌ Failed to cleanly apply 6d643dd on top of patchback/backports/0.28/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189

Backporting merged PR #1189 into main

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

patchback Bot commented May 12, 2025

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

❌ Failed to cleanly apply 6d643dd on top of patchback/backports/0.29/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189

Backporting merged PR #1189 into main

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

patchback Bot commented May 12, 2025

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

❌ Failed to cleanly apply 6d643dd on top of patchback/backports/0.30/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189

Backporting merged PR #1189 into main

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

patchback Bot commented May 12, 2025

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

❌ Failed to cleanly apply 6d643dd on top of patchback/backports/0.31/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189

Backporting merged PR #1189 into main

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

patchback Bot commented May 12, 2025

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

❌ Failed to cleanly apply 6d643dd on top of patchback/backports/0.32/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189

Backporting merged PR #1189 into main

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