Skip to content

Fix package name normalization for package pypi json view - #717

Merged
gerrod3 merged 1 commit into
pulp:mainfrom
gerrod3:normalize-name-pypi
Aug 13, 2024
Merged

Fix package name normalization for package pypi json view#717
gerrod3 merged 1 commit into
pulp:mainfrom
gerrod3:normalize-name-pypi

Fix package name normalization for package pypi json view

4880949
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 3.11 completed Aug 13, 2024 in 2s

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

❌ Failed to cleanly apply fc43b4b on top of patchback/backports/3.11/fc43b4b253dbec5931d6a230296942e4ba52ec3e/pr-717

Details

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