Skip to content

Commit e8c0eca

Browse files
committed
reverse when logic
1 parent 3df8378 commit e8c0eca

2 files changed

Lines changed: 4 additions & 13 deletions

File tree

holoviews/core/data/narwhals.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,17 +192,12 @@ def range(cls, dataset, dimension):
192192
return np.nan, np.nan
193193
return cmin.item(), cmax.item()
194194
else:
195+
col = nw.col(name)
195196
if dimension.nodata is not None:
196-
expr = (
197-
nw.when(nw.col(name) == dimension.nodata)
198-
.then(None)
199-
.otherwise(nw.col(name))
200-
.alias(name)
197+
df_column = df_column.select(
198+
nw.when(col != dimension.nodata).then(col)
201199
)
202-
df_column = df_column.select(expr)
203-
if dataset.data.implementation in _NO_DROP_NULL:
204-
col = nw.col(name)
205-
else:
200+
if dataset.data.implementation not in _NO_DROP_NULL:
206201
col = nw.col(name).drop_nulls()
207202
# NOTE: Some narwhals backends (duckdb) will return nan as
208203
# the max value

holoviews/tests/core/data/test_narwhalsinterface.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
from holoviews import Dataset, Dimension
99
from holoviews.core.data import NarwhalsInterface
10-
from holoviews.core.util.dependencies import PANDAS_GE_3_0_0
1110

1211
from .base import HeterogeneousColumnTests, InterfaceTests
1312

@@ -221,9 +220,6 @@ def frame(self, *args, **kwargs):
221220

222221
return dd.from_pandas(pd.DataFrame(*args, **kwargs), npartitions=2)
223222

224-
@pytest.mark.xfail(PANDAS_GE_3_0_0, reason="pandas 3.0")
225-
def test_dataset_nodata_range(self):
226-
return super().test_dataset_nodata_range()
227223

228224
class IbisNarwhalsLazyInterfaceTests(BaseNarwhalsLazyInterfaceTests):
229225
__test__ = True

0 commit comments

Comments
 (0)