Merge branch 'dev' into startup-message

Author: alexcjohnson

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
 
   artifacts:
     docker:
-      - image: circleci/python:3.7-stretch-node-browsers
+      - image: circleci/python:3.7.6-stretch-node-browsers
         environment:
           PYVERSION: python37
     steps:
@@ -27,7 +27,7 @@ jobs:
   lint-unit-37: &lint-unit
     working_directory: ~/dash
     docker:
-      - image: circleci/python:3.7-stretch-node-browsers
+      - image: circleci/python:3.7.6-stretch-node-browsers
         environment:
           PYLINTRC: .pylintrc37
           PYVERSION: python37
@@ -64,7 +64,7 @@ jobs:
   lint-unit-36:
       <<: *lint-unit
       docker:
-        - image: circleci/python:3.6-stretch-node-browsers
+        - image: circleci/python:3.6.9-stretch-node-browsers
           environment:
             PYLINTRC: .pylintrc
             PYVERSION: python36
@@ -80,7 +80,7 @@ jobs:
   build-core-37: &build-core
     working_directory: ~/dash
     docker:
-      - image: circleci/python:3.7-stretch-node-browsers
+      - image: circleci/python:3.7.6-stretch-node-browsers
         environment:
           PYVERSION: python37
     steps:
@@ -115,7 +115,7 @@ jobs:
   build-core-36:
       <<: *build-core
       docker:
-        - image: circleci/python:3.6-stretch-node-browsers
+        - image: circleci/python:3.6.9-stretch-node-browsers
           environment:
             PYVERSION: python36
 
@@ -129,7 +129,7 @@ jobs:
   build-misc-37: &build-misc
     working_directory: ~/dash
     docker:
-      - image: circleci/python:3.7-stretch-node-browsers
+      - image: circleci/python:3.7.6-stretch-node-browsers
         environment:
           PYVERSION: python37
 
@@ -165,7 +165,7 @@ jobs:
   build-misc-36:
       <<: *build-misc
       docker:
-        - image: circleci/python:3.6-stretch-node-browsers
+        - image: circleci/python:3.6.9-stretch-node-browsers
           environment:
             PYVERSION: python36
 
@@ -230,8 +230,8 @@ jobs:
           command: |
             python -m venv venv
             . venv/bin/activate
-            git clone --depth 1 https://github.com/plotly/dash.git -b ${CIRCLE_BRANCH} dash-main
-            cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ..
+            npm ci
+            pip install --no-cache-dir --upgrade -e .[dev,testing] --progress-bar off
             git clone --depth 1 https://github.com/plotly/dashR.git -b dev dashR
             git clone --depth 1 https://github.com/plotly/dash-html-components.git
             git clone --depth 1 https://github.com/plotly/dash-core-components.git
@@ -240,7 +240,7 @@ jobs:
             cd dash-html-components; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build)
             cd ../dash-core-components; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build)
             cd ../dash-table; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build); cd ..
-            
+
       - run:
           name: 🔧fix up dash metadata
           command: |
@@ -286,7 +286,7 @@ jobs:
             Rscript -e "message(devtools::check_failures(path = '${DHC_CHECK_DIR}'))"
             Rscript -e "message(devtools::check_failures(path = '${DCC_CHECK_DIR}'))"
             Rscript -e "message(devtools::check_failures(path = '${DT_CHECK_DIR}'))"
-            Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"                                    
+            Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
             # warnings are errors; enable for stricter checks once CRAN submission finished
             # if grep -q -R "WARNING" "${DHC_CHECK_DIR}/00check.log"; then exit 1; fi
             # if grep -q -R "WARNING" "${DCC_CHECK_DIR}/00check.log"; then exit 1; fi
@@ -303,8 +303,7 @@ jobs:
           command: |
             python -m venv venv
             . venv/bin/activate
-            cd dash-main/\@plotly/dash-generator-test-component-nested && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
-            cd dash-main/\@plotly/dash-generator-test-component-standard && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
+            npm run setup-tests.R
             export PATH=$PATH:/home/circleci/.local/bin/
             pytest --nopercyfinalize --junitxml=test-reports/dashr.xml dashR/tests/integration/dopsa/
       - store_artifacts:
@@ -317,13 +316,13 @@ jobs:
       - run:
           name: 🦔 percy finalize
           command: npx percy finalize --all
-          when: on_fail 
+          when: on_fail
 
 
   test-37: &test
     working_directory: ~/dash
     docker:
-      - image: circleci/python:3.7-stretch-node-browsers
+      - image: circleci/python:3.7.6-stretch-node-browsers
         environment:
           PERCY_PARALLEL_TOTAL: -1
           PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: True
@@ -365,7 +364,7 @@ jobs:
   test-36:
       <<: *test
       docker:
-        - image: circleci/python:3.6-stretch-node-browsers
+        - image: circleci/python:3.6.9-stretch-node-browsers
           environment:
             PERCY_ENABLE: 0
             PYVERSION: python36

CHANGELOG.md

@@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [#1249](https://github.com/plotly/dash/pull/1249) Fixes [#919](https://github.com/plotly/dash/issues/919) so `dash.testing` is compatible with more `pytest` plugins, particularly `pytest-flake8` and `pytest-black`.
 - [#1248](https://github.com/plotly/dash/pull/1248) Fixes [#1245](https://github.com/plotly/dash/issues/1245), so you can use prop persistence with components that have dict IDs, ie for pattern-matching callbacks.
 - [#1185](https://github.com/plotly/dash/pull/1185) Sort asset directories, same as we sort files inside those directories. This way if you need your assets loaded in a certain order, you can add prefixes to subdirectory names and enforce that order.
+- [#1288](https://github.com/plotly/dash/pull/1288) Closes [#1285](https://github.com/plotly/dash/issues/1285): Debug=True should work in the __main__ module.
 
 ## [1.12.0] - 2020-05-05
 ### Added

dash/dash.py

@@ -1338,14 +1338,19 @@ def enable_dev_tools(
             _reload = self._hot_reload
             _reload.hash = generate_hash()
 
+            # find_loader should return None on __main__ but doesn't
+            # on some python versions https://bugs.python.org/issue14710
+            packages = [
+                pkgutil.find_loader(x)
+                for x in list(ComponentRegistry.registry) + ["dash_renderer"]
+                if x != "__main__"
+            ]
+
             component_packages_dist = [
                 os.path.dirname(package.path)
                 if hasattr(package, "path")
                 else package.filename
-                for package in (
-                    pkgutil.find_loader(x)
-                    for x in list(ComponentRegistry.registry) + ["dash_renderer"]
-                )
+                for package in packages
             ]
 
             _reload.watch_thread = threading.Thread(

dash/testing/application_runners.py

@@ -222,8 +222,7 @@ def stop(self):
                 logger.info("proc.terminate with pid %s", self.proc.pid)
                 self.proc.terminate()
                 if self.tmp_app_path and os.path.exists(self.tmp_app_path):
-                    logger.debug("removing temporary app path %s",
-                                 self.tmp_app_path)
+                    logger.debug("removing temporary app path %s", self.tmp_app_path)
                     shutil.rmtree(self.tmp_app_path)
                 if utils.PY3:
                     # pylint:disable=no-member
@@ -343,7 +342,9 @@ def start(self, app, start_timeout=2, cwd=None):
 
 class JuliaRunner(ProcessRunner):
     def __init__(self, keep_open=False, stop_timeout=3):
-        super(JuliaRunner, self).__init__(keep_open=keep_open, stop_timeout=stop_timeout)
+        super(JuliaRunner, self).__init__(
+            keep_open=keep_open, stop_timeout=stop_timeout
+        )
         self.proc = None
 
     # pylint: disable=arguments-differ
@@ -385,7 +386,9 @@ def start(self, app, start_timeout=30, cwd=None):
                         logger.warning("get cwd from inspect => %s", cwd)
                         break
             if cwd:
-                logger.info("JuliaRunner inferred cwd from the Python call stack: %s", cwd)
+                logger.info(
+                    "JuliaRunner inferred cwd from the Python call stack: %s", cwd
+                )
 
                 # try copying all valid sub folders (i.e. assets) in cwd to tmp
                 # 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):
         logger.info("Run Dash.jl app with julia => %s", app)
 
         args = shlex.split(
-            "julia {}".format(os.path.realpath(app)),
-            posix=not self.is_windows,
+            "julia {}".format(os.path.realpath(app)), posix=not self.is_windows,
         )
         logger.debug("start Dash.jl process with %s", args)
 

dash/testing/plugin.py

@@ -4,7 +4,12 @@
 
 
 try:
-    from dash.testing.application_runners import ThreadedRunner, ProcessRunner, RRunner, JuliaRunner
+    from dash.testing.application_runners import (
+        ThreadedRunner,
+        ProcessRunner,
+        RRunner,
+        JuliaRunner,
+    )
     from dash.testing.browser import Browser
     from dash.testing.composite import DashComposite, DashRComposite, DashJuliaComposite
 except ImportError:

package.json

@@ -10,16 +10,21 @@
     "private::lint.pylint-dash": "PYLINTRC=${PYLINTRC:=.pylintrc37} && pylint dash setup.py --rcfile=$PYLINTRC",
     "private::lint.pylint-tests": "PYLINTRC=${PYLINTRC:=.pylintrc37} && pylint tests/unit tests/integration -d all --rcfile=$PYLINTRC",
     "private::lint.renderer": "cd dash-renderer && npm run lint",
-    "private::test.setup-nested": "cd \\@plotly/dash-generator-test-component-nested && npm ci && npm run build && pip install -e .",
-    "private::test.setup-standard": "cd \\@plotly/dash-generator-test-component-standard && npm ci && npm run build && pip install -e .",
+    "private::test.setup-nested": "cd \\@plotly/dash-generator-test-component-nested && npm ci && npm run build",
+    "private::test.setup-standard": "cd \\@plotly/dash-generator-test-component-standard && npm ci && npm run build",
+    "private::test.py.deploy-nested": "npm run private::test.setup-nested && cd \\@plotly/dash-generator-test-component-nested && pip install -e .",
+    "private::test.py.deploy-standard": "npm run private::test.setup-standard && cd \\@plotly/dash-generator-test-component-standard && pip install -e .",
+    "private::test.R.deploy-nested": "npm run private::test.setup-nested && cd \\@plotly/dash-generator-test-component-nested && sudo R CMD INSTALL .",
+    "private::test.R.deploy-standard": "npm run private::test.setup-standard && cd \\@plotly/dash-generator-test-component-standard && sudo R CMD INSTALL .",
     "private::test.unit-dash": "PYTHONPATH=~/dash/tests/assets pytest tests/unit",
     "private::test.unit-renderer": "cd dash-renderer && npm run test",
     "private::test.integration-dash": "TESTFILES=$(circleci tests glob \"tests/integration/**/test_*.py\" | circleci tests split --split-by=timings) && pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml ${TESTFILES}",
     "format": "run-s private::format.*",
     "initialize": "run-s private::initialize.*",
     "lint": "run-s private::lint.*",
-    "setup-tests": "run-s private::test.setup-*",
-    "test.integration": "run-s setup-tests private::test.integration-*",
+    "setup-tests.py": "run-s private::test.py.deploy-*",
+    "setup-tests.R": "run-s private::test.R.deploy-*",
+    "test.integration": "run-s setup-tests.py private::test.integration-*",
     "test.unit": "run-s private::test.unit-**"
   },
   "devDependencies": {

tests/integration/devtools/test_hot_reload.py

@@ -20,9 +20,7 @@
 
 
 def replace_file(filename, new_content):
-    path = os.path.join(
-        os.path.dirname(__file__), "hr_assets", filename
-    )
+    path = os.path.join(os.path.dirname(__file__), "hr_assets", filename)
     with open(path, "r+") as fp:
         sleep(1)  # ensure a new mod time
         old_content = fp.read()
@@ -92,7 +90,7 @@ def new_text(n):
     try:
         until(
             lambda: dash_duo.driver.execute_script("return window.cheese") == "gouda",
-            timeout=3
+            timeout=3,
         )
     finally:
         sleep(1)  # ensure a new mod time
@@ -101,7 +99,7 @@ def new_text(n):
 
     until(
         lambda: dash_duo.driver.execute_script("return window.cheese") == "roquefort",
-        timeout=3
+        timeout=3,
     )
 
     # we've done a hard reload so someVar is gone