Skip to content

Commit a7e7957

Browse files
3.6.9 | 3.7.6 (#1290)
1 parent 316b662 commit a7e7957

File tree

4 files changed

+29
-24
lines changed

4 files changed

+29
-24
lines changed

.circleci/config.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
artifacts:
1212
docker:
13-
- image: circleci/python:3.7-stretch-node-browsers
13+
- image: circleci/python:3.7.6-stretch-node-browsers
1414
environment:
1515
PYVERSION: python37
1616
steps:
@@ -27,7 +27,7 @@ jobs:
2727
lint-unit-37: &lint-unit
2828
working_directory: ~/dash
2929
docker:
30-
- image: circleci/python:3.7-stretch-node-browsers
30+
- image: circleci/python:3.7.6-stretch-node-browsers
3131
environment:
3232
PYLINTRC: .pylintrc37
3333
PYVERSION: python37
@@ -64,7 +64,7 @@ jobs:
6464
lint-unit-36:
6565
<<: *lint-unit
6666
docker:
67-
- image: circleci/python:3.6-stretch-node-browsers
67+
- image: circleci/python:3.6.9-stretch-node-browsers
6868
environment:
6969
PYLINTRC: .pylintrc
7070
PYVERSION: python36
@@ -80,7 +80,7 @@ jobs:
8080
build-core-37: &build-core
8181
working_directory: ~/dash
8282
docker:
83-
- image: circleci/python:3.7-stretch-node-browsers
83+
- image: circleci/python:3.7.6-stretch-node-browsers
8484
environment:
8585
PYVERSION: python37
8686
steps:
@@ -115,7 +115,7 @@ jobs:
115115
build-core-36:
116116
<<: *build-core
117117
docker:
118-
- image: circleci/python:3.6-stretch-node-browsers
118+
- image: circleci/python:3.6.9-stretch-node-browsers
119119
environment:
120120
PYVERSION: python36
121121

@@ -129,7 +129,7 @@ jobs:
129129
build-misc-37: &build-misc
130130
working_directory: ~/dash
131131
docker:
132-
- image: circleci/python:3.7-stretch-node-browsers
132+
- image: circleci/python:3.7.6-stretch-node-browsers
133133
environment:
134134
PYVERSION: python37
135135

@@ -165,7 +165,7 @@ jobs:
165165
build-misc-36:
166166
<<: *build-misc
167167
docker:
168-
- image: circleci/python:3.6-stretch-node-browsers
168+
- image: circleci/python:3.6.9-stretch-node-browsers
169169
environment:
170170
PYVERSION: python36
171171

@@ -240,7 +240,7 @@ jobs:
240240
cd dash-html-components; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build)
241241
cd ../dash-core-components; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build)
242242
cd ../dash-table; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build); cd ..
243-
243+
244244
- run:
245245
name: 🔧fix up dash metadata
246246
command: |
@@ -286,7 +286,7 @@ jobs:
286286
Rscript -e "message(devtools::check_failures(path = '${DHC_CHECK_DIR}'))"
287287
Rscript -e "message(devtools::check_failures(path = '${DCC_CHECK_DIR}'))"
288288
Rscript -e "message(devtools::check_failures(path = '${DT_CHECK_DIR}'))"
289-
Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
289+
Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
290290
# warnings are errors; enable for stricter checks once CRAN submission finished
291291
# if grep -q -R "WARNING" "${DHC_CHECK_DIR}/00check.log"; then exit 1; fi
292292
# if grep -q -R "WARNING" "${DCC_CHECK_DIR}/00check.log"; then exit 1; fi
@@ -317,13 +317,13 @@ jobs:
317317
- run:
318318
name: 🦔 percy finalize
319319
command: npx percy finalize --all
320-
when: on_fail
320+
when: on_fail
321321

322322

323323
test-37: &test
324324
working_directory: ~/dash
325325
docker:
326-
- image: circleci/python:3.7-stretch-node-browsers
326+
- image: circleci/python:3.7.6-stretch-node-browsers
327327
environment:
328328
PERCY_PARALLEL_TOTAL: -1
329329
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: True
@@ -365,7 +365,7 @@ jobs:
365365
test-36:
366366
<<: *test
367367
docker:
368-
- image: circleci/python:3.6-stretch-node-browsers
368+
- image: circleci/python:3.6.9-stretch-node-browsers
369369
environment:
370370
PERCY_ENABLE: 0
371371
PYVERSION: python36

dash/testing/application_runners.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,7 @@ def stop(self):
222222
logger.info("proc.terminate with pid %s", self.proc.pid)
223223
self.proc.terminate()
224224
if self.tmp_app_path and os.path.exists(self.tmp_app_path):
225-
logger.debug("removing temporary app path %s",
226-
self.tmp_app_path)
225+
logger.debug("removing temporary app path %s", self.tmp_app_path)
227226
shutil.rmtree(self.tmp_app_path)
228227
if utils.PY3:
229228
# pylint:disable=no-member
@@ -343,7 +342,9 @@ def start(self, app, start_timeout=2, cwd=None):
343342

344343
class JuliaRunner(ProcessRunner):
345344
def __init__(self, keep_open=False, stop_timeout=3):
346-
super(JuliaRunner, self).__init__(keep_open=keep_open, stop_timeout=stop_timeout)
345+
super(JuliaRunner, self).__init__(
346+
keep_open=keep_open, stop_timeout=stop_timeout
347+
)
347348
self.proc = None
348349

349350
# pylint: disable=arguments-differ
@@ -385,7 +386,9 @@ def start(self, app, start_timeout=30, cwd=None):
385386
logger.warning("get cwd from inspect => %s", cwd)
386387
break
387388
if cwd:
388-
logger.info("JuliaRunner inferred cwd from the Python call stack: %s", cwd)
389+
logger.info(
390+
"JuliaRunner inferred cwd from the Python call stack: %s", cwd
391+
)
389392

390393
# try copying all valid sub folders (i.e. assets) in cwd to tmp
391394
# note that the R assets folder name can be any valid folder name
@@ -415,8 +418,7 @@ def start(self, app, start_timeout=30, cwd=None):
415418
logger.info("Run Dash.jl app with julia => %s", app)
416419

417420
args = shlex.split(
418-
"julia {}".format(os.path.realpath(app)),
419-
posix=not self.is_windows,
421+
"julia {}".format(os.path.realpath(app)), posix=not self.is_windows,
420422
)
421423
logger.debug("start Dash.jl process with %s", args)
422424

dash/testing/plugin.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44

55

66
try:
7-
from dash.testing.application_runners import ThreadedRunner, ProcessRunner, RRunner, JuliaRunner
7+
from dash.testing.application_runners import (
8+
ThreadedRunner,
9+
ProcessRunner,
10+
RRunner,
11+
JuliaRunner,
12+
)
813
from dash.testing.browser import Browser
914
from dash.testing.composite import DashComposite, DashRComposite, DashJuliaComposite
1015
except ImportError:

tests/integration/devtools/test_hot_reload.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020

2121

2222
def replace_file(filename, new_content):
23-
path = os.path.join(
24-
os.path.dirname(__file__), "hr_assets", filename
25-
)
23+
path = os.path.join(os.path.dirname(__file__), "hr_assets", filename)
2624
with open(path, "r+") as fp:
2725
sleep(1) # ensure a new mod time
2826
old_content = fp.read()
@@ -92,7 +90,7 @@ def new_text(n):
9290
try:
9391
until(
9492
lambda: dash_duo.driver.execute_script("return window.cheese") == "gouda",
95-
timeout=3
93+
timeout=3,
9694
)
9795
finally:
9896
sleep(1) # ensure a new mod time
@@ -101,7 +99,7 @@ def new_text(n):
10199

102100
until(
103101
lambda: dash_duo.driver.execute_script("return window.cheese") == "roquefort",
104-
timeout=3
102+
timeout=3,
105103
)
106104

107105
# we've done a hard reload so someVar is gone

0 commit comments

Comments
 (0)