Look for PyPI tokens in keyring when uploading #649
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I'm going to try this branch the next time I have a package to upload, before I merge it. |
takluyver
force-pushed
the
keyring-tokens
branch
from
61307b6
to
364209e
Compare
Carreau
approved these changes
Nov 7, 2023
flit/upload.py
Outdated
| url: str | ||
| username: Optional[str] = None | ||
| password: Optional[str] = None | ||
| is_warehouse: bool = True |
There was a problem hiding this comment.
Do you want to update that naming to is_legacy?
There was a problem hiding this comment.
is_pypi might be a better name now - it's distinguishing PyPI (the new site, aka Warehouse) from other servers like devpi, and originally from PyPI classic.
It's only used for the 'Package is at' log message, so it's not too important that it's always right.
|
I forgot about this for a long while, and then for a while longer I didn't upload any packages through Flit. Now I just have again, and putting a token in my keyring with username |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The username for keyring should look like
pypi_token:project:<project_name>(using the normalised name), orpypi_token:user:<username>. If neither are found, it falls back to looking for a password (but if you have 2FA enabled on PyPI, uploads have to use tokens now).I'd like to make some more tooling for conveniently creating tokens, but there isn't a PyPI API for it yet.
While I'm looking at this code, I've also simplified things a bit so that
FLIT_USERNAMEandFLIT_PASSWORDenvironment variables override details in.pypirceven if you use--repository, and it figures out the repository details before building the packages.