Skip to content

Commit

Permalink
Merge pull request plotly#861 from plotly/fix-pandas-orient-arg
Browse files Browse the repository at this point in the history
Fix pandas orient arg (to_dict("rows") -> to_dict("records"))
  • Loading branch information
wbrgss committed Jan 5, 2021
1 parent c9e4c35 commit 94d62d3
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 42 deletions.
2 changes: 1 addition & 1 deletion packages/dash-table/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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__':
Expand Down
4 changes: 2 additions & 2 deletions packages/dash-table/dash_table_base/__init__.py
Original file line number Diff line number Diff line change
@@ -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 "
Expand Down
6 changes: 3 additions & 3 deletions packages/dash-table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion packages/dash-table/tests/selenium/test_bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
23 changes: 7 additions & 16 deletions packages/dash-table/tests/selenium/test_derived_props.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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!'
Expand All @@ -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
),
]
)
Expand Down Expand Up @@ -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
)
)

Expand Down Expand Up @@ -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
)
)

Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions packages/dash-table/tests/selenium/test_editable.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions packages/dash-table/tests/selenium/test_markdown_link.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
2 changes: 1 addition & 1 deletion packages/dash-table/tests/selenium/test_pagination.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 3 additions & 9 deletions packages/dash-table/tests/selenium/test_scrolling.py
Original file line number Diff line number Diff line change
Expand Up @@ -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() == []


Expand Down Expand Up @@ -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() == []

0 comments on commit 94d62d3

Please sign in to comment.