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

pipx: use global in state=latest #9623

Merged

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Jan 25, 2025

SUMMARY

Honour global parameter when state=latest.

Fixes #9619

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

pipx

@ansibullbot ansibullbot added bug This issue/PR relates to a bug integration tests/integration module module plugins plugin (any type) tests tests labels Jan 25, 2025
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch labels Jan 25, 2025
@felixfontein
Copy link
Collaborator

If there's no feedback, I'll merge this for the 10.3.0 release.

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Jan 27, 2025
@felixfontein felixfontein merged commit 03dfed4 into ansible-collections:main Jan 27, 2025
138 checks passed
Copy link

patchback bot commented Jan 27, 2025

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

❌ Failed to cleanly apply 03dfed4 on top of patchback/backports/stable-9/03dfed4c351abbb1a64d070da3a608b5848e7003/pr-9623

Backporting merged PR #9623 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/ansible-collections/community.general.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-9/03dfed4c351abbb1a64d070da3a608b5848e7003/pr-9623 upstream/stable-9
  4. Now, cherry-pick PR pipx: use global in state=latest #9623 contents into that branch:
    $ git cherry-pick -x 03dfed4c351abbb1a64d070da3a608b5848e7003
    If it'll yell at you with something like fatal: Commit 03dfed4c351abbb1a64d070da3a608b5848e7003 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 03dfed4c351abbb1a64d070da3a608b5848e7003
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR pipx: use global in state=latest #9623 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-9/03dfed4c351abbb1a64d070da3a608b5848e7003/pr-9623
  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.

Copy link

patchback bot commented Jan 27, 2025

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

❌ Failed to cleanly apply 03dfed4 on top of patchback/backports/stable-10/03dfed4c351abbb1a64d070da3a608b5848e7003/pr-9623

Backporting merged PR #9623 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/ansible-collections/community.general.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-10/03dfed4c351abbb1a64d070da3a608b5848e7003/pr-9623 upstream/stable-10
  4. Now, cherry-pick PR pipx: use global in state=latest #9623 contents into that branch:
    $ git cherry-pick -x 03dfed4c351abbb1a64d070da3a608b5848e7003
    If it'll yell at you with something like fatal: Commit 03dfed4c351abbb1a64d070da3a608b5848e7003 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 03dfed4c351abbb1a64d070da3a608b5848e7003
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR pipx: use global in state=latest #9623 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-10/03dfed4c351abbb1a64d070da3a608b5848e7003/pr-9623
  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.

@felixfontein
Copy link
Collaborator

@russoz thanks for your contribution!

@felixfontein felixfontein added backport-10 Automatically create a backport for the stable-10 branch and removed backport-10 Automatically create a backport for the stable-10 branch labels Jan 27, 2025
Copy link

patchback bot commented Jan 27, 2025

Backport to stable-10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-10/03dfed4c351abbb1a64d070da3a608b5848e7003/pr-9623

Backported as #9638

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Jan 27, 2025
* pipx: use global in state=latest

* add changelog frag

(cherry picked from commit 03dfed4)
@felixfontein
Copy link
Collaborator

The backport to stable-10 didn't work because #9170 wasn't backported. That's fixed in #9637.

@felixfontein
Copy link
Collaborator

If you want this backported to stable-9, that requires some manual work.

felixfontein pushed a commit that referenced this pull request Jan 27, 2025
…est (#9638)

pipx: use global in state=latest (#9623)

* pipx: use global in state=latest

* add changelog frag

(cherry picked from commit 03dfed4)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
@russoz russoz deleted the 9619-pipx-global-latest branch January 27, 2025 05:01
Massl123 pushed a commit to Massl123/community.general that referenced this pull request Feb 7, 2025
* pipx: use global in state=latest

* add changelog frag
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch bug This issue/PR relates to a bug integration tests/integration module module plugins plugin (any type) tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

community.general.pipx does not respect --global with state:latest
3 participants