Skip to content

Commit b4dd8df

Browse files
committed
happy linter
Signed-off-by: Itay Dafna <[email protected]>
1 parent fb6b9d6 commit b4dd8df

File tree

2 files changed

+47
-20
lines changed

2 files changed

+47
-20
lines changed

ipydatagrid/datagrid.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ def all_values(self):
110110
Returns values for all selected cells as a list.
111111
"""
112112
return [
113-
DataGrid._get_cell_value_by_numerical_index(self._data, cell["c"], cell["r"])
113+
DataGrid._get_cell_value_by_numerical_index(
114+
self._data, cell["c"], cell["r"]
115+
)
114116
for cell in self
115117
]
116118

@@ -290,7 +292,9 @@ def __init__(self, dataframe, **kwargs):
290292
def __handle_custom_msg(self, _, content, buffers): # noqa: U101,U100
291293
if content["event_type"] == "cell-changed":
292294
row = content["row"]
293-
column = DataGrid._column_index_to_name(self._data, content["column_index"])
295+
column = DataGrid._column_index_to_name(
296+
self._data, content["column_index"]
297+
)
294298
value = content["value"]
295299
# update data on kernel
296300
self._data["data"][row][column] = value
@@ -359,7 +363,6 @@ def generate_data_object(dataframe, guid_key="ipydguuid"):
359363

360364
schema["primaryKeyUuid"] = guid_key
361365

362-
363366
return {
364367
"data": data,
365368
"schema": schema,
@@ -524,7 +527,9 @@ def selected_cells(self):
524527
List of selected cells. Each cell is represented as a dictionary
525528
with keys 'r': row and 'c': column
526529
"""
527-
return SelectionHelper(self._data, self.selections, self.selection_mode).all()
530+
return SelectionHelper(
531+
self._data, self.selections, self.selection_mode
532+
).all()
528533

529534
@property
530535
def selected_cell_values(self):
@@ -537,7 +542,9 @@ def selected_cell_values(self):
537542
# Serielize to JSON table schema
538543
view_data_object = DataGrid.generate_data_object(view_data, "ipydguuid")
539544

540-
return SelectionHelper(view_data_object, self.selections, self.selection_mode).all_values()
545+
return SelectionHelper(
546+
view_data_object, self.selections, self.selection_mode
547+
).all_values()
541548

542549
@property
543550
def selected_cell_iterator(self):

tests/test_datagrid.py

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def dataframe() -> None:
1515
def datagrid(dataframe) -> None:
1616
return DataGrid(dataframe)
1717

18+
1819
@pytest.fixture
1920
def data_object(dataframe) -> None:
2021
return DataGrid.generate_data_object(dataframe, "ipydguuid")
@@ -103,33 +104,52 @@ def test_get_cell_value_by_numerical_index(
103104
invalid_coords: bool, data_object: dict
104105
) -> None:
105106
if invalid_coords:
106-
assert DataGrid._get_cell_value_by_numerical_index(data_object, 2, 2) is None
107+
assert (
108+
DataGrid._get_cell_value_by_numerical_index(data_object, 2, 2)
109+
is None
110+
)
107111
else:
108-
assert DataGrid._get_cell_value_by_numerical_index(data_object, 1, 0) == 4
112+
assert (
113+
DataGrid._get_cell_value_by_numerical_index(data_object, 1, 0) == 4
114+
)
115+
109116

110117
def test_data_object_generation(dataframe: pd.DataFrame) -> None:
111118
data_object = DataGrid.generate_data_object(dataframe, "ipydguuid")
112119
expected_output = {
113-
'data': [{'index': 'One', 'A': 1, 'B': 4, 'ipydguuid': 0},
114-
{'index': 'Two', 'A': 2, 'B': 5, 'ipydguuid': 1},
115-
{'index': 'Three', 'A': 3, 'B': 6, 'ipydguuid': 2}],
116-
'schema': {'fields': [{'name': 'index', 'type': 'string'},
117-
{'name': 'A', 'type': 'integer'},
118-
{'name': 'B', 'type': 'integer'},
119-
{'name': 'ipydguuid', 'type': 'integer'}],
120-
'primaryKey': ['index', 'ipydguuid'],
121-
'pandas_version': '0.20.0',
122-
'primaryKeyUuid': 'ipydguuid'},
123-
'fields': [{'index': None}, {'A': None}, {'B': None}, {'ipydguuid': None}]}
120+
"data": [
121+
{"index": "One", "A": 1, "B": 4, "ipydguuid": 0},
122+
{"index": "Two", "A": 2, "B": 5, "ipydguuid": 1},
123+
{"index": "Three", "A": 3, "B": 6, "ipydguuid": 2},
124+
],
125+
"schema": {
126+
"fields": [
127+
{"name": "index", "type": "string"},
128+
{"name": "A", "type": "integer"},
129+
{"name": "B", "type": "integer"},
130+
{"name": "ipydguuid", "type": "integer"},
131+
],
132+
"primaryKey": ["index", "ipydguuid"],
133+
"pandas_version": "0.20.0",
134+
"primaryKeyUuid": "ipydguuid",
135+
},
136+
"fields": [
137+
{"index": None},
138+
{"A": None},
139+
{"B": None},
140+
{"ipydguuid": None},
141+
],
142+
}
124143

125144
assert data_object == expected_output
126145

146+
127147
def test_selected_cell_values(monkeypatch, datagrid, dataframe):
128148
# Mocking data returned from front-end
129149
def mock_get_visible_data():
130150
return dataframe
131-
151+
132152
monkeypatch.setattr(datagrid, "get_visible_data", mock_get_visible_data)
133153
datagrid.select(1, 0, 2, 1) # Select 1A to 2B
134154

135-
assert datagrid.selected_cell_values == [2, 5, 3, 6]
155+
assert datagrid.selected_cell_values == [2, 5, 3, 6]

0 commit comments

Comments
 (0)