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

Fix pulp_file package name in status #4723

Merged
merged 1 commit into from
Nov 16, 2023
Merged

Conversation

mdellweg
Copy link
Member

@mdellweg mdellweg commented Nov 15, 2023

Status report of the pulp_file python_package must be pulp-file.
Technically this is still wrong, because it should be pulpcore, but we
will need another field to present the python module in order to be able
to generate the bindings.

[noissue]

@mdellweg mdellweg changed the title Experiment: Fix pulp_file package name in status Fix pulp_file package name in status Nov 15, 2023
@mdellweg mdellweg marked this pull request as ready for review November 15, 2023 15:39
Status report of the pulp_file python_package must be pulp-file.
Technically this is still wrong, because it should be pulpcore, but we
will need another field to present the python module in order to be able
to generate the bindings.

fixes pulp#4724
@dralley dralley merged commit 822e2be into pulp:main Nov 16, 2023
15 checks passed
Copy link

patchback bot commented Nov 16, 2023

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

❌ Failed to cleanly apply 822e2be on top of patchback/backports/3.41/822e2be3a246f71939250c0c94a7820c2667e70f/pr-4723

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

@mdellweg mdellweg linked an issue Nov 16, 2023 that may be closed by this pull request
@mdellweg mdellweg deleted the plugin_package branch November 16, 2023 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pulp file python package reporting wrongly
4 participants