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

Make keyring integration opt-in (closes #8719, #6773) #11215

Closed
wants to merge 11 commits into from

Conversation

SnoopJ
Copy link
Contributor

@SnoopJ SnoopJ commented Jun 29, 2022

This PR adds the --enable-keyring flag to requirement commands, as laid out in #8719. This also implicitly fixes #6773 and possibly some related issues by making keyring an opt-in feature.

I've tested this locally (including environment variable and config file specification) by sticking breakpoints around the retrieval of credentials from the keyring, and it seems to be right. I haven't added any test here because 1) the existing tests are kind of abstract, and 2) I'm not sure if the internal plumbing is quite right anyway. Happy to make changes as desired by the maintainers.

@SnoopJ
Copy link
Contributor Author

SnoopJ commented Jun 29, 2022

Test failures fixed by aba9e96 can also be fixed by adding the keyring option to cmdoptions.general_group, but it seems more appropriate to me to keep this option associated with Requirement commands. turns out many more tests were broken by leaving this option out of general_group, see 239b3d3

@github-actions github-actions bot added the needs rebase or merge PR has conflicts with current master label Nov 10, 2022
@pypa-bot pypa-bot removed the needs rebase or merge PR has conflicts with current master label Nov 15, 2022
@SnoopJ
Copy link
Contributor Author

SnoopJ commented Nov 15, 2022

Changes from #11589 are now incorporated, there were some relatively small conflicts but nothing too bad.

I didn't note this before, but the main change of this PR is to make allow_keyring part of the state of MultiDomainBasicAuth rather than an argument at credential retrieval time, so the preference for keyring can be expressed at instance creation time.

This is once again ready for review assuming CI doesn't produce any surprises.

@SnoopJ
Copy link
Contributor Author

SnoopJ commented Dec 11, 2022

CI failure is not related to this changeset, see #11643

@uranusjr
Copy link
Member

uranusjr commented Jan 5, 2023

See recent discussions in #8719 (comment)

@SnoopJ
Copy link
Contributor Author

SnoopJ commented Mar 15, 2023

Closing in favor of #11698

@SnoopJ SnoopJ closed this Mar 15, 2023
@SnoopJ SnoopJ deleted the feature/opt-in-keyring branch March 15, 2023 13:37
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Document how to disable keyring for users who might want to
4 participants