Skip to content

Commit 308d737

Browse files
marthacryanmarthacryan
committed
Merge with dev
2 parents c72b3b0 + 2bd3258 commit 308d737

File tree

5 files changed

+67
-31
lines changed

5 files changed

+67
-31
lines changed

‎.circleci/config.yml

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
orbs:
44
win: circleci/[email protected]
55
percy: percy/[email protected]
6-
browser-tools: circleci/browser-tools@1.4.8
6+
browser-tools: circleci/browser-tools@1.5.1
77

88

99
jobs:
@@ -99,7 +99,11 @@ jobs:
9999

100100
steps:
101101
- checkout
102-
- run: sudo apt-get update
102+
- run:
103+
name: Add chrome keys & update.
104+
command: |
105+
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
106+
sudo apt-get update
103107
- run: echo $PYVERSION > ver.txt
104108
- run: cat requirements/*.txt > requirements-all.txt
105109
- restore_cache:
@@ -189,7 +193,11 @@ jobs:
189193
steps:
190194
- checkout:
191195
path: ~/dash
192-
- run: sudo apt-get update
196+
- run:
197+
name: Add chrome keys & update.
198+
command: |
199+
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
200+
sudo apt-get update
193201
- run: echo $PYVERSION > ver.txt
194202
- run: cat requirements/*.txt > requirements-all.txt
195203
- restore_cache:
@@ -306,7 +314,11 @@ jobs:
306314
steps:
307315
- checkout:
308316
path: ~/dash
309-
- run: sudo apt-get update
317+
- run:
318+
name: Add chrome keys & update.
319+
command: |
320+
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
321+
sudo apt-get update
310322
- run: echo $PYVERSION > ver.txt
311323
- run: cat requirements/*.txt > requirements-all.txt
312324
- restore_cache:
@@ -375,7 +387,11 @@ jobs:
375387
steps:
376388
- checkout:
377389
path: ~/dash
378-
- run: sudo apt-get update
390+
- run:
391+
name: Add chrome keys & update.
392+
command: |
393+
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
394+
sudo apt-get update
379395
- run: echo $PYVERSION > ver.txt
380396
- run: cat requirements/*.txt > requirements-all.txt
381397
- restore_cache:
@@ -451,7 +467,11 @@ jobs:
451467
steps:
452468
- checkout:
453469
path: ~/dash
454-
- run: sudo apt-get update
470+
- run:
471+
name: Add chrome keys & update.
472+
command: |
473+
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
474+
sudo apt-get update
455475
- run: echo $PYVERSION > ver.txt
456476
- run: cat requirements/*.txt > requirements-all.txt
457477
- restore_cache:
@@ -505,7 +525,11 @@ jobs:
505525
steps:
506526
- checkout:
507527
path: ~/dash
508-
- run: sudo apt-get update
528+
- run:
529+
name: Add chrome keys & update.
530+
command: |
531+
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
532+
sudo apt-get update
509533
- run: echo $PYVERSION > ver.txt
510534
- run: cat requirements/*.txt > requirements-all.txt
511535
- restore_cache:
@@ -547,7 +571,11 @@ jobs:
547571
steps:
548572
- checkout:
549573
path: ~/dash
550-
- run: sudo apt-get update
574+
- run:
575+
name: Add chrome keys & update.
576+
command: |
577+
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
578+
sudo apt-get update
551579
- restore_cache:
552580
key: dep-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}
553581
- browser-tools/install-browser-tools:

‎components/dash-core-components/tests/integration/graph/test_graph_basics.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ def update_graph(n_clicks):
167167
assert dash_dcc.get_logs() == []
168168

169169

170+
@pytest.mark.skip(reason="customdata has broken with plotly.py 6")
170171
def test_grbs005_graph_customdata(dash_dcc):
171172
app = Dash(__name__)
172173

‎dash/dash-renderer/src/components/error/CallbackGraph/CallbackGraphContainer.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
width: 80vw;
44
position: relative;
55
height: calc(100vh - 75px);
6-
overflow: auto;
6+
overflow: hidden;
77
box-sizing: border-box;
88
background: #ffffff;
99
display: inline-block;

‎dash/dash.py

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,25 +2009,26 @@ def delete_resource(resources):
20092009
# pylint: disable=protected-access
20102010
delete_resource(self.css._resources._resources)
20112011

2012+
# pylint: disable=too-many-branches
20122013
def run(
20132014
self,
2014-
host="127.0.0.1",
2015-
port="8050",
2016-
proxy=None,
2017-
debug=None,
2015+
host: Optional[str] = None,
2016+
port: Optional[Union[str, int]] = None,
2017+
proxy: Optional[str] = None,
2018+
debug: Optional[bool] = None,
20182019
jupyter_mode: Optional[JupyterDisplayMode] = None,
2019-
jupyter_width="100%",
2020-
jupyter_height=650,
2021-
jupyter_server_url=None,
2022-
dev_tools_ui=None,
2023-
dev_tools_props_check=None,
2024-
dev_tools_serve_dev_bundles=None,
2025-
dev_tools_hot_reload=None,
2026-
dev_tools_hot_reload_interval=None,
2027-
dev_tools_hot_reload_watch_interval=None,
2028-
dev_tools_hot_reload_max_retry=None,
2029-
dev_tools_silence_routes_logging=None,
2030-
dev_tools_prune_errors=None,
2020+
jupyter_width: str = "100%",
2021+
jupyter_height: int = 650,
2022+
jupyter_server_url: Optional[str] = None,
2023+
dev_tools_ui: Optional[bool] = None,
2024+
dev_tools_props_check: Optional[bool] = None,
2025+
dev_tools_serve_dev_bundles: Optional[bool] = None,
2026+
dev_tools_hot_reload: Optional[bool] = None,
2027+
dev_tools_hot_reload_interval: Optional[int] = None,
2028+
dev_tools_hot_reload_watch_interval: Optional[int] = None,
2029+
dev_tools_hot_reload_max_retry: Optional[int] = None,
2030+
dev_tools_silence_routes_logging: Optional[bool] = None,
2031+
dev_tools_prune_errors: Optional[bool] = None,
20312032
**flask_run_options,
20322033
):
20332034
"""Start the flask server in local mode, you should not run this on a
@@ -2036,11 +2037,11 @@ def run(
20362037
If a parameter can be set by an environment variable, that is listed
20372038
too. Values provided here take precedence over environment variables.
20382039
2039-
:param host: Host IP used to serve the application
2040+
:param host: Host IP used to serve the application, default to "127.0.0.1"
20402041
env: ``HOST``
20412042
:type host: string
20422043
2043-
:param port: Port used to serve the application
2044+
:param port: Port used to serve the application, default to "8050"
20442045
env: ``PORT``
20452046
:type port: int
20462047
@@ -2141,9 +2142,15 @@ def run(
21412142

21422143
# Evaluate the env variables at runtime
21432144

2144-
host = os.getenv("HOST", host)
2145-
port = os.getenv("PORT", port)
2146-
proxy = os.getenv("DASH_PROXY", proxy)
2145+
if "CONDA_PREFIX" in os.environ:
2146+
# Some conda systems has issue with setting the host environment
2147+
# to an invalid hostname.
2148+
# Related issue: https://github.com/plotly/dash/issues/3069
2149+
host = host or "127.0.0.1"
2150+
else:
2151+
host = host or os.getenv("HOST", "127.0.0.1")
2152+
port = port or os.getenv("PORT", "8050")
2153+
proxy = proxy or os.getenv("DASH_PROXY")
21472154

21482155
# Verify port value
21492156
try:

‎tests/integration/callbacks/test_layout_paths_with_callbacks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def check_chapter(chapter):
176176
+ "#{}-graph:not(.dash-graph--pending) .js-plotly-plot".format(
177177
chapter
178178
)
179-
+ '").layout.title.text'
179+
+ '").layout.title'
180180
)
181181
== value
182182
),

0 commit comments

Comments
 (0)