-
Notifications
You must be signed in to change notification settings - Fork 118
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
feat: expressify lower_bound
and upper_bound
in is_between
#1672
Merged
MarcoGorelli
merged 6 commits into
narwhals-dev:main
from
MarcoGorelli:expressify-is-between
Dec 29, 2024
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5a97cf1
feat: expressify `lower_bound` and `upper_bound` in `is_between`
MarcoGorelli fb12579
docs
MarcoGorelli 73e2076
:fire:
MarcoGorelli 0d340c3
Merge remote-tracking branch 'upstream/main' into expressify-is-between
MarcoGorelli c460e28
add Series test, modify the expressions a little
MarcoGorelli 40a0151
better hints
MarcoGorelli 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
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
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
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
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
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 | ||||
---|---|---|---|---|---|---|
|
@@ -7,10 +7,6 @@ | |||||
from tests.utils import ConstructorEager | ||||||
from tests.utils import assert_equal_data | ||||||
|
||||||
data = { | ||||||
"a": [1, 4, 2, 5], | ||||||
} | ||||||
|
||||||
|
||||||
@pytest.mark.parametrize( | ||||||
("closed", "expected"), | ||||||
|
@@ -22,12 +18,21 @@ | |||||
], | ||||||
) | ||||||
def test_is_between(constructor: Constructor, closed: str, expected: list[bool]) -> None: | ||||||
data = {"a": [1, 4, 2, 5]} | ||||||
df = nw.from_native(constructor(data)) | ||||||
result = df.select(nw.col("a").is_between(1, 5, closed=closed)) | ||||||
expected_dict = {"a": expected} | ||||||
assert_equal_data(result, expected_dict) | ||||||
|
||||||
|
||||||
def test_is_between_expressified(constructor: Constructor) -> None: | ||||||
data = {"a": [1, 4, 2, 5], "b": [0, 5, 2, 4], "c": [9, 9, 9, 9]} | ||||||
df = nw.from_native(constructor(data)) | ||||||
result = df.select(nw.col("a").is_between(nw.col("b"), nw.col("c"))) | ||||||
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. Should we test with a generic expression instead of just
Suggested change
|
||||||
expected_dict = {"a": [True, False, True, True]} | ||||||
assert_equal_data(result, expected_dict) | ||||||
|
||||||
|
||||||
@pytest.mark.parametrize( | ||||||
("closed", "expected"), | ||||||
[ | ||||||
|
@@ -40,6 +45,7 @@ def test_is_between(constructor: Constructor, closed: str, expected: list[bool]) | |||||
def test_is_between_series( | ||||||
constructor_eager: ConstructorEager, closed: str, expected: list[bool] | ||||||
) -> None: | ||||||
data = {"a": [1, 4, 2, 5]} | ||||||
df = nw.from_native(constructor_eager(data), eager_only=True) | ||||||
result = df.with_columns(a=df["a"].is_between(1, 5, closed=closed)) | ||||||
expected_dict = {"a": 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.
drive-by - it's redundat to define all of these in the
CompliantExpr
sThere 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.
Nice one! I love to see net negative in PRs π