diff --git a/packages/dash-table/README.md b/packages/dash-table/README.md index f930b1e9fe..2db9adb7cb 100644 --- a/packages/dash-table/README.md +++ b/packages/dash-table/README.md @@ -22,7 +22,7 @@ app = dash.Dash(__name__) app.layout = dash_table.DataTable( id='table', columns=[{"name": i, "id": i} for i in df.columns], - data=df.to_dict("rows"), + data=df.to_dict('records'), ) if __name__ == '__main__': diff --git a/packages/dash-table/dash_table_base/__init__.py b/packages/dash-table/dash_table_base/__init__.py index 56e6ef0076..ce414e9a03 100644 --- a/packages/dash-table/dash_table_base/__init__.py +++ b/packages/dash-table/dash_table_base/__init__.py @@ -1,4 +1,4 @@ -from __future__ import print_function as _ +from __future__ import print_function import os as _os import sys as _sys @@ -6,7 +6,7 @@ import dash as _dash -if not hasattr(_dash, '__plotly_dash') and not hasattr(_dash, 'development'): +if not hasattr(_dash, "__plotly_dash") and not hasattr(_dash, "development"): print( "Dash was not successfully imported. " "Make sure you don't have a file " diff --git a/packages/dash-table/package.json b/packages/dash-table/package.json index a1a4e1d9f0..4e61da81de 100644 --- a/packages/dash-table/package.json +++ b/packages/dash-table/package.json @@ -24,11 +24,11 @@ "private::build:backends": "dash-generate-components src/dash-table/dash/DataTable.js dash_table -p package-info.json && cp dash_table_base/** dash_table/ && dash-generate-components src/dash-table/dash/DataTable.js dash_table -p package-info.json --r-prefix 'dash' --r-suggests 'dash' --jl-prefix 'dash'", "private::format.ts": "npm run private::lint.ts -- --fix", "private::format.prettier": "prettier --config .prettierrc --write \"src/**/*.{js,ts,tsx}\"", - "private::format.black": "black --exclude dash_table .", + "private::format.black": "black dash_table_base tests", "private::host_js": "http-server ./dash_table -c-1 --silent", "private::lint.ts": "tslint --project tsconfig.json --config tslint.json", - "private::lint.flake": "flake8 --exclude=dash_table,node_modules,venv", - "private::lint.black": "black --check --exclude dash_table .", + "private::lint.flake": "flake8 dash_table_base tests", + "private::lint.black": "black --check dash_table_base tests", "private::lint.prettier": "prettier --config .prettierrc \"src/**/*.{js,ts,tsx}\" --list-different", "private::wait_js": "wait-on http://localhost:8080", "private::opentests": "cypress open", diff --git a/packages/dash-table/tests/selenium/test_basic_copy_paste.py b/packages/dash-table/tests/selenium/test_basic_copy_paste.py index 6d7817e324..cab6a348a8 100644 --- a/packages/dash-table/tests/selenium/test_basic_copy_paste.py +++ b/packages/dash-table/tests/selenium/test_basic_copy_paste.py @@ -13,7 +13,7 @@ url = "https://github.com/plotly/datasets/raw/master/" "26k-consumer-complaints.csv" rawDf = pd.read_csv(url) -df = rawDf.to_dict("rows") +df = rawDf.to_dict("records") def get_app(): diff --git a/packages/dash-table/tests/selenium/test_basic_operations.py b/packages/dash-table/tests/selenium/test_basic_operations.py index b9f8aaea64..d6c0be1edc 100644 --- a/packages/dash-table/tests/selenium/test_basic_operations.py +++ b/packages/dash-table/tests/selenium/test_basic_operations.py @@ -10,7 +10,7 @@ url = "https://github.com/plotly/datasets/raw/master/" "26k-consumer-complaints.csv" rawDf = pd.read_csv(url) -df = rawDf.to_dict("rows") +df = rawDf.to_dict("records") def get_app(): diff --git a/packages/dash-table/tests/selenium/test_bootstrap.py b/packages/dash-table/tests/selenium/test_bootstrap.py index c38f0bb9c8..15a2ba5d0f 100644 --- a/packages/dash-table/tests/selenium/test_bootstrap.py +++ b/packages/dash-table/tests/selenium/test_bootstrap.py @@ -9,7 +9,7 @@ url = "https://github.com/plotly/datasets/raw/master/" "26k-consumer-complaints.csv" rawDf = pd.read_csv(url) -df = rawDf.to_dict("rows") +df = rawDf.to_dict("records") def get_app(fixed_rows, fixed_columns, ops): diff --git a/packages/dash-table/tests/selenium/test_derived_props.py b/packages/dash-table/tests/selenium/test_derived_props.py index 58d3c95e3f..ab545e952a 100644 --- a/packages/dash-table/tests/selenium/test_derived_props.py +++ b/packages/dash-table/tests/selenium/test_derived_props.py @@ -13,7 +13,7 @@ rawDf = pd.read_csv(url, nrows=100) rawDf["id"] = rawDf.index + 3000 -df = rawDf.to_dict("rows") +df = rawDf.to_dict("records") props = [ "active_cell", @@ -57,7 +57,7 @@ def get_app(): ) @app.callback( - Output("props_container", "children"), [Input("table", prop) for prop in props], + Output("props_container", "children"), [Input("table", prop) for prop in props] ) def show_props(*args): # return 'Something yet!' @@ -68,7 +68,7 @@ def show_props(*args): [ html.Td(prop), html.Td( - json.dumps(val) if val is not None else "None", id=prop, + json.dumps(val) if val is not None else "None", id=prop ), ] ) @@ -212,10 +212,7 @@ def test_tdrp003_select_cells(test): for col in range(3): selected.append( dict( - row=row, - column=col, - column_id=rawDf.columns[col], - row_id=row + 3000, + row=row, column=col, column_id=rawDf.columns[col], row_id=row + 3000 ) ) @@ -275,10 +272,7 @@ def test_tdrp003_select_cells(test): for col in range(2): selected.append( dict( - row=row, - column=col, - column_id=rawDf.columns[col], - row_id=row + 3000, + row=row, column=col, column_id=rawDf.columns[col], row_id=row + 3000 ) ) @@ -345,17 +339,14 @@ def test_tdrp004_navigate_selected_cells(test): for col in range(3): selected.append( dict( - row=row, - column=col, - column_id=rawDf.columns[col], - row_id=row + 3000, + row=row, column=col, column_id=rawDf.columns[col], row_id=row + 3000 ) ) for row in range(3): for col in range(3): active = dict( - row=row, column=col, column_id=rawDf.columns[col], row_id=row + 3000, + row=row, column=col, column_id=rawDf.columns[col], row_id=row + 3000 ) assert test.find_element("#active_cell").get_attribute( diff --git a/packages/dash-table/tests/selenium/test_editable.py b/packages/dash-table/tests/selenium/test_editable.py index cd6b6a8066..5d5fe6864c 100644 --- a/packages/dash-table/tests/selenium/test_editable.py +++ b/packages/dash-table/tests/selenium/test_editable.py @@ -13,7 +13,7 @@ url = "https://github.com/plotly/datasets/raw/master/" "26k-consumer-complaints.csv" rawDf = pd.read_csv(url) -df = rawDf.to_dict("rows") +df = rawDf.to_dict("records") def get_app_and_locks(): @@ -44,7 +44,7 @@ def get_app_and_locks(): non_blocking_lock = Lock() @app.callback( - Output("table", "style_cell_conditional"), [Input("non-blocking", "n_clicks")], + Output("table", "style_cell_conditional"), [Input("non-blocking", "n_clicks")] ) def non_blocking_callback(clicks): if clicks is None: diff --git a/packages/dash-table/tests/selenium/test_markdown_copy_paste.py b/packages/dash-table/tests/selenium/test_markdown_copy_paste.py index e763f9b911..d0664a599d 100644 --- a/packages/dash-table/tests/selenium/test_markdown_copy_paste.py +++ b/packages/dash-table/tests/selenium/test_markdown_copy_paste.py @@ -11,7 +11,7 @@ rawDf["Issue"] = rawDf["Issue"].map(lambda x: "![" + str(x) + "](assets/logo.png)") rawDf["State"] = rawDf["State"].map(lambda x: '```python\n"{}"\n```'.format(x)) -df = rawDf.to_dict("rows") +df = rawDf.to_dict("records") def get_app(): diff --git a/packages/dash-table/tests/selenium/test_markdown_link.py b/packages/dash-table/tests/selenium/test_markdown_link.py index fd7f4f0488..caaa49040b 100644 --- a/packages/dash-table/tests/selenium/test_markdown_link.py +++ b/packages/dash-table/tests/selenium/test_markdown_link.py @@ -6,10 +6,7 @@ def get_app(cell_selectable, markdown_options): md = "[Click me](https://www.google.com)" - data = [ - dict(a=md, b=md), - dict(a=md, b=md), - ] + data = [dict(a=md, b=md), dict(a=md, b=md)] app = dash.Dash(__name__) diff --git a/packages/dash-table/tests/selenium/test_pagination.py b/packages/dash-table/tests/selenium/test_pagination.py index 94154abfdd..9c45c217a5 100644 --- a/packages/dash-table/tests/selenium/test_pagination.py +++ b/packages/dash-table/tests/selenium/test_pagination.py @@ -12,7 +12,7 @@ url = "https://github.com/plotly/datasets/raw/master/" "26k-consumer-complaints.csv" rawDf = pd.read_csv(url) -df = rawDf.to_dict("rows") +df = rawDf.to_dict("records") PAGE_SIZE = 5 pages = math.ceil(len(df) / PAGE_SIZE) diff --git a/packages/dash-table/tests/selenium/test_scrolling.py b/packages/dash-table/tests/selenium/test_scrolling.py index f70da7a4c1..e8befbf857 100644 --- a/packages/dash-table/tests/selenium/test_scrolling.py +++ b/packages/dash-table/tests/selenium/test_scrolling.py @@ -75,15 +75,11 @@ def test_scrol001_fixed_alignment(test, fixed_rows, fixed_columns, ops): scroll_by(test, 200) - wait.until( - lambda: -get_margin(test) == fixed_width + 200, 3, - ) + wait.until(lambda: -get_margin(test) == fixed_width + 200, 3) scroll_by(test, -200) - wait.until( - lambda: -get_margin(test) == fixed_width, 3, - ) + wait.until(lambda: -get_margin(test) == fixed_width, 3) assert test.get_log_errors() == [] @@ -131,7 +127,5 @@ def test_scrol002_edit_navigate(test, fixed_rows, fixed_columns, ops): test.send_keys(Keys.ARROW_RIGHT) wait.until(lambda: target.cell(2, 4).is_selected(), 3) - wait.until( - lambda: -get_margin(test) == fixed_width + get_scroll(test), 3, - ) + wait.until(lambda: -get_margin(test) == fixed_width + get_scroll(test), 3) assert test.get_log_errors() == []