Fix sync with tls_validation=False

gerrod3 commented 3 months ago

fixes: #653

patchback[bot] commented 3 months ago

❌ Failed to cleanly apply 6644673ff04a3ad5775f2e4995edf18e054e0758 on top of patchback/backports/3.11/6644673ff04a3ad5775f2e4995edf18e054e0758/pr-656

Ensure you have a local repo clone of your fork. Unless you cloned it from the upstream, this would be your origin remote.
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
```

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/6644673ff04a3ad5775f2e4995edf18e054e0758/pr-656 upstream/3.11

Now, cherry-pick PR #656 contents into that branch:
```
$ git cherry-pick -x 6644673ff04a3ad5775f2e4995edf18e054e0758
```
If it'll yell at you with something like fatal: Commit 6644673ff04a3ad5775f2e4995edf18e054e0758 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x 6644673ff04a3ad5775f2e4995edf18e054e0758
```
At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #656 as close to the original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.11/6644673ff04a3ad5775f2e4995edf18e054e0758/pr-656

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[bot] commented 3 months ago

✅ Backport PR branch: patchback/backports/3.11/6644673ff04a3ad5775f2e4995edf18e054e0758/pr-656

pulp / pulp_python