Merge branch 'dev' into single_input

Author: alexcjohnson

.circleci/config.yml

@@ -244,7 +244,7 @@ jobs:
       - run:
           name: 🔧fix up dash metadata
           command: |
-              sudo Rscript -e 'dash_desc <- read.dcf("dashR/DESCRIPTION"); dt_version <- read.dcf("dash-table/DESCRIPTION")[,"Version"]; dcc_version <- read.dcf("dash-core-components/DESCRIPTION")[,"Version"]; dhc_version <- read.dcf("dash-html-components/DESCRIPTION")[,"Version"]; imports <- dash_desc[,"Imports"][[1]]; imports <- gsub("((?<=dashHtmlComponents )(\\\\(.*?\\\\)))", paste0("(= ", dhc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashCoreComponents )(\\\\(.*?\\\\)))", paste0("(= ", dcc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashTable )(\\\\(.*?\\\\)))", paste0("(= ", dt_version, ")"), imports, perl = TRUE); dash_desc[,"Imports"][[1]] <- imports; dhc_hash <- system("cd dash-html-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dcc_hash <- system("cd dash-core-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dt_hash <- system("cd dash-table; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); remotes <- dash_desc[,"Remotes"][[1]];  remotes <- gsub("((?<=plotly\\\\/dash-html-components@)([a-zA-Z0-9]+))", dhc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-core-components@)([a-zA-Z0-9]+))", dcc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-table@)([a-zA-Z0-9]+))", dt_hash, remotes, perl=TRUE); dash_desc[,"Remotes"][[1]] <- remotes; write.dcf(dash_desc, "dashR/DESCRIPTION")'
+            sudo Rscript dashR/tests/circleci/fixup_metadata.R
 
       - run:
           name: 🎛 set environment variables
@@ -287,7 +287,7 @@ jobs:
             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}'))"
-            # warnings are errors; enable for stricter checks once CRAN submission finished
+            # warnings are errors; enabled for stricter CRAN checks, disable if noisy
             # 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
             # if grep -q -R "WARNING" "${DT_CHECK_DIR}/00check.log"; then exit 1; fi
@@ -296,6 +296,8 @@ jobs:
       - run:
           name: 🔎 run unit tests
           command: |
+              # unfortunately testthat does not and will not support returning a status
+              # code other than success, even when tests fail -- this is a workaround
               sudo Rscript -e 'res=devtools::test("dashR/tests/", reporter=default_reporter());df=as.data.frame(res);if(sum(df$failed) > 0 || any(df$error)) {q(status=1)}'
 
       - run:

@plotly/dash-component-plugins/package-lock.json

@@ -3,6 +3,9 @@ All notable changes to `dash` will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [UNRELEASED]
+### Added
+- [#1355](https://github.com/plotly/dash/pull/1355) Removed redundant log message and consolidated logger initialization. You can now control the log level - for example suppress informational messages from Dash with `app.logger.setLevel(logging.WARNING)`.
+
 ### Changed
 - [#1180](https://github.com/plotly/dash/pull/1180) `Input`, `Output`, and `State` in callback definitions don't need to be in lists. You still need to provide `Output` items first, then `Input` items, then `State`, and the list form is still supported. In particular, if you want to return a single output item wrapped in a length-1 list, you should still wrap the `Output` in a list. This can be useful for procedurally-generated callbacks.
 

@plotly/dash-generator-test-component-nested/package-lock.json

@@ -386,6 +386,8 @@ def __init__(
         if self.server is not None:
             self.init_app()
 
+        self.logger.setLevel(logging.INFO)
+
     def init_app(self, app=None):
         """Initialize the parts of Dash that require a flask app."""
         config = self.config
@@ -1355,8 +1357,6 @@ def enable_dev_tools(
         if dev_tools.silence_routes_logging:
             logging.getLogger("werkzeug").setLevel(logging.ERROR)
 
-        self.logger.setLevel(logging.INFO)
-
         if dev_tools.hot_reload:
             _reload = self._hot_reload
             _reload.hash = generate_hash()
@@ -1628,11 +1628,5 @@ def verify_url_part(served_part, url_part, part_name):
                 display_url = (protocol, host, ":{}".format(port), path)
 
             self.logger.info("Dash is running on %s://%s%s%s\n", *display_url)
-            self.logger.info(
-                " Warning: This is a development server. Do not use app.run_server"
-            )
-            self.logger.info(
-                " in production, use a production WSGI server like gunicorn instead.\n"
-            )
 
         self.server.run(host=host, port=port, debug=debug, **flask_run_options)

@plotly/dash-generator-test-component-standard/package-lock.json

@@ -1,4 +1,5 @@
 import os
+import logging
 
 import pytest
 from flask import Flask
@@ -256,15 +257,25 @@ def test_port_env_fail_range(empty_environ):
     )
 
 
-def test_no_proxy_success(mocker, caplog, empty_environ):
+@pytest.mark.parametrize(
+    "setlevel_warning", [False, True],
+)
+def test_no_proxy_success(mocker, caplog, empty_environ, setlevel_warning):
     app = Dash()
 
+    if setlevel_warning:
+        app.logger.setLevel(logging.WARNING)
+
     # mock out the run method so we don't actually start listening forever
     mocker.patch.object(app.server, "run")
 
     app.run_server(port=8787)
 
-    assert "Dash is running on http://127.0.0.1:8787/\n" in caplog.text
+    STARTUP_MESSAGE = "Dash is running on http://127.0.0.1:8787/\n"
+    if setlevel_warning:
+        assert caplog.text is None or STARTUP_MESSAGE not in caplog.text
+    else:
+        assert STARTUP_MESSAGE in caplog.text
 
 
 @pytest.mark.parametrize(