Merge branch 'dev' into update-docstrings

alexcjohnson · web-flow · commit 4db380cd97f4 · 2021-01-29T09:19:32.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [UNRELEASED]
+## [4.11.2] - 2021-01-19
 ### Fixed
 - [#854](https://github.com/plotly/dash-table/pull/854) - part of fixing dash import bug https://github.com/plotly/dash/issues/1143
 
diff --git a/README.md b/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/dash_table_base/__init__.py b/dash_table_base/__init__.py
@@ -1,12 +1,12 @@
-from __future__ import print_function as _
+from __future__ import print_function
 
 import os as _os
 import sys as _sys
 import json
 
 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/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dash-table",
-  "version": "4.11.1",
+  "version": "4.11.2",
   "description": "Dash table",
   "repository": {
     "type": "git",
@@ -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/tests/selenium/test_basic_copy_paste.py b/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/tests/selenium/test_basic_operations.py b/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/tests/selenium/test_bootstrap.py b/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/tests/selenium/test_derived_props.py b/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/tests/selenium/test_editable.py b/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/tests/selenium/test_markdown_copy_paste.py b/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/tests/selenium/test_markdown_link.py b/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/tests/selenium/test_pagination.py b/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/tests/selenium/test_scrolling.py b/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() == []

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ app = dash.Dash(__name__)`
`22`	`22`	`app.layout = dash_table.DataTable(`
`23`	`23`	`id='table',`
`24`	`24`	`columns=[{"name": i, "id": i} for i in df.columns],`
`25`		`- data=df.to_dict("rows"),`
	`25`	`+ data=df.to_dict('records'),`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`if __name__ == '__main__':`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`rawDf = pd.read_csv(url, nrows=100)`
`14`	`14`	`rawDf["id"] = rawDf.index + 3000`
`15`	`15`
`16`		`-df = rawDf.to_dict("rows")`
	`16`	`+df = rawDf.to_dict("records")`
`17`	`17`
`18`	`18`	`props = [`
`19`	`19`	`"active_cell",`
`@@ -57,7 +57,7 @@ def get_app():`
`57`	`57`	`)`
`58`	`58`
`59`	`59`	`@app.callback(`
`60`		`- Output("props_container", "children"), [Input("table", prop) for prop in props],`
	`60`	`+ Output("props_container", "children"), [Input("table", prop) for prop in props]`
`61`	`61`	`)`
`62`	`62`	`def show_props(*args):`
`63`	`63`	`# return 'Something yet!'`
`@@ -68,7 +68,7 @@ def show_props(*args):`
`68`	`68`	`[`
`69`	`69`	`html.Td(prop),`
`70`	`70`	`html.Td(`
`71`		`- json.dumps(val) if val is not None else "None", id=prop,`
	`71`	`+ json.dumps(val) if val is not None else "None", id=prop`
`72`	`72`	`),`
`73`	`73`	`]`
`74`	`74`	`)`
`@@ -212,10 +212,7 @@ def test_tdrp003_select_cells(test):`
`212`	`212`	`for col in range(3):`
`213`	`213`	`selected.append(`
`214`	`214`	`dict(`
`215`		`- row=row,`
`216`		`- column=col,`
`217`		`- column_id=rawDf.columns[col],`
`218`		`- row_id=row + 3000,`
	`215`	`+ row=row, column=col, column_id=rawDf.columns[col], row_id=row + 3000`
`219`	`216`	`)`
`220`	`217`	`)`
`221`	`218`
`@@ -275,10 +272,7 @@ def test_tdrp003_select_cells(test):`
`275`	`272`	`for col in range(2):`
`276`	`273`	`selected.append(`
`277`	`274`	`dict(`
`278`		`- row=row,`
`279`		`- column=col,`
`280`		`- column_id=rawDf.columns[col],`
`281`		`- row_id=row + 3000,`
	`275`	`+ row=row, column=col, column_id=rawDf.columns[col], row_id=row + 3000`
`282`	`276`	`)`
`283`	`277`	`)`
`284`	`278`
`@@ -345,17 +339,14 @@ def test_tdrp004_navigate_selected_cells(test):`
`345`	`339`	`for col in range(3):`
`346`	`340`	`selected.append(`
`347`	`341`	`dict(`
`348`		`- row=row,`
`349`		`- column=col,`
`350`		`- column_id=rawDf.columns[col],`
`351`		`- row_id=row + 3000,`
	`342`	`+ row=row, column=col, column_id=rawDf.columns[col], row_id=row + 3000`
`352`	`343`	`)`
`353`	`344`	`)`
`354`	`345`
`355`	`346`	`for row in range(3):`
`356`	`347`	`for col in range(3):`
`357`	`348`	`active = dict(`
`358`		`- row=row, column=col, column_id=rawDf.columns[col], row_id=row + 3000,`
	`349`	`+ row=row, column=col, column_id=rawDf.columns[col], row_id=row + 3000`
`359`	`350`	`)`
`360`	`351`
`361`	`352`	`assert test.find_element("#active_cell").get_attribute(`