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 sync with tls_validation=False #656

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Fix sync with tls_validation=False #656

merged 1 commit into from
Apr 11, 2024

Conversation

gerrod3
Copy link
Contributor

@gerrod3 gerrod3 commented Apr 9, 2024

fixes: #653

@@ -1,6 +1,8 @@
import logging
import tempfile
from typing import Optional, Any, AsyncGenerator
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This turned out to become a rather hot line...
I adopted the version import typing as t with positive experience.

Copy link
Member

@mdellweg mdellweg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gerrod3 gerrod3 merged commit 6644673 into pulp:main Apr 11, 2024
16 checks passed
Copy link

patchback bot commented Apr 11, 2024

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

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

Backporting merged PR #656 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/6644673ff04a3ad5775f2e4995edf18e054e0758/pr-656 upstream/3.11
  4. Now, cherry-pick PR Fix sync with tls_validation=False #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
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix sync with tls_validation=False #656 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/6644673ff04a3ad5775f2e4995edf18e054e0758/pr-656
  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.

@gerrod3 gerrod3 deleted the tls-false branch April 11, 2024 19:59
Copy link

patchback bot commented Apr 11, 2024

Backport to 3.11: 💚 backport PR created

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

Backported as #660

🤖 @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 Apr 11, 2024
Fix sync with tls_validation=False

(cherry picked from commit 6644673)
gerrod3 added a commit that referenced this pull request Apr 11, 2024
…4a3ad5775f2e4995edf18e054e0758/pr-656

[PR #656/6644673f backport][3.11] Fix sync with tls_validation=False
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.

pulp_python does not disable tls_validation when it is set to false on the remote
3 participants