test: fix type hinting on test_jujuversion tests#1011
Merged
benhoyt merged 6 commits intocanonical:mainfrom Sep 22, 2023
Merged
test: fix type hinting on test_jujuversion tests#1011benhoyt merged 6 commits intocanonical:mainfrom
benhoyt merged 6 commits intocanonical:mainfrom
Conversation
If a string is passed, we'll convert it to a JujuVersion, so the correct type is JujuVersion|str.
This is a dict(str, str) but it's not worth defining that and making the decorator call messy in this specific test case.
benhoyt
approved these changes
Sep 22, 2023
Collaborator
benhoyt
left a comment
There was a problem hiding this comment.
LGTM. Agreed the typing for patch/new is messy! new={'': ''} is shorter but confusing. So I think type: ignore is reasonable here.
Let's just do the thing I mentioned in the other PR about adding the files to pyproject.toml as we go so that's up to date. When we finish, we can replace the individual names with test/*.py.
Maybe break include onto multiple lines to avoid so many conflicts.
benhoyt
approved these changes
Sep 22, 2023
This file contains hidden or 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
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.
JujuVersion's comparisons can be done against strings as well as other JujuVersions, so the type hints should reflect that.
For mocking the os.environ response, the type is dict(str, str) but I think to declare that we would need to define the dict, e.g:
And that looks considerably messier to my eyes and doesn't seem to really add value (so I've ignored the warning).
Partially addresses #1007