-
Notifications
You must be signed in to change notification settings - Fork 4
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
Support 'oxford comma' format and non-string types in listing #690
Merged
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6d6e469
Support oxford comma and non-string types in listing
zwimer b4471cd
Merge branch 'staticdev:main' into support_oxford_comma
zwimer 82de558
Format with pre-commit
zwimer 092415f
Add listing oxford test case
zwimer fca339d
Add coveragerc file to exclude if TYPE_CHECKING statements
zwimer 11b4488
Merge branch 'main' into support_oxford_comma
staticdev 3d009cc
Merge branch 'main' into support_oxford_comma
staticdev 49bfd4e
Simplify imports
staticdev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
[report] | ||
exclude_lines = | ||
pragma: no cover | ||
if TYPE_CHECKING: |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,3 +38,22 @@ def test_listing_with_conjunction( | |
) -> None: | ||
"""Listing with separator and conjunction.""" | ||
assert lists.listing(*params) == expected | ||
|
||
|
||
@pytest.mark.parametrize( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would also be great to explain this in our examples documentation. |
||
"params, expected", | ||
[ | ||
(([], ";", "or"), ""), # empty list | ||
((["jorbas"], ";", "or"), "jorbas"), # one element | ||
((["jorbas", "maria"], ";", "or"), "jorbas or maria"), # two elements | ||
( | ||
(["jorbas", "maria", "gustavo"], ";", "or"), | ||
"jorbas; maria; or gustavo", | ||
), # three elements | ||
], | ||
) | ||
def test_listing_with_conjunction_oxford( | ||
params: tuple[list[str], str, str], expected: str | ||
) -> None: | ||
"""Listing with separator and conjunction.""" | ||
assert lists.listing(*params, oxford=True) == expected |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess it is much simpler to just remove this if statement and always import this. It is the standard approach.