Merge branch 'dev' into fix-spelling

.pylintrc

@@ -61,7 +61,8 @@ disable=fixme,
         old-style-class,
         superfluous-parens,
         bad-continuation,
-        line-too-long
+        line-too-long,
+        bad-option-value
 
 
 # Enable the message, report, category or checker with the given id(s). You can

.pylintrc37

@@ -149,7 +149,10 @@ disable=invalid-name,
         too-many-lines,
         too-many-statements,
         bad-continuation,
-        line-too-long
+        line-too-long,
+        super-with-arguments,
+        raise-missing-from,
+        bad-option-value
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to `dash` will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [UNRELEASED]
+### Changed
+- [#1503](https://github.com/plotly/dash/pull/1506) Fix [#1466](https://github.com/plotly/dash/issues/1466): loosen `dash[testing]` requirements for easier integration in external projects. This PR also bumps many `dash[dev]` requirements.
+
+### Fixed
+- [#1493](https://github.com/plotly/dash/pull/1493) Fix [#1143](https://github.com/plotly/dash/issues/1143), a bug where having a file with one of several common names (test.py, code.py, org.py, etc) that imports a dash component package would make `import dash` fail with a cryptic error message asking whether you have a file named "dash.py"
+
+## [1.18.1] - 2020-12-09
+
 ## [1.18.0] - 2020-12-07
 
 ## [1.17.0] - 2020-10-29

dash/__init__.py

@@ -1,7 +1,11 @@
-from .dash import Dash, no_update  # noqa: F401
-from . import dependencies  # noqa: F401
-from . import development  # noqa: F401
-from . import exceptions  # noqa: F401
-from . import resources  # noqa: F401
-from .version import __version__  # noqa: F401
-from ._callback_context import callback_context  # noqa: F401
+# pylint: disable=C0413
+# __plotly_dash is for the "make sure you don't have a dash.py" check
+# must come before any other imports.
+__plotly_dash = True
+from .dash import Dash, no_update  # noqa: F401,E402
+from . import dependencies  # noqa: F401,E402
+from . import development  # noqa: F401,E402
+from . import exceptions  # noqa: F401,E402
+from . import resources  # noqa: F401,E402
+from .version import __version__  # noqa: F401,E402
+from ._callback_context import callback_context  # noqa: F401,E402

dash/testing/application_runners.py

@@ -125,7 +125,7 @@ def _stop_server():
         stopper()
         return "Flask server is shutting down"
 
-    # pylint: disable=arguments-differ,C0330
+    # pylint: disable=arguments-differ
     def start(self, app, **kwargs):
         """Start the app server in threading flavor."""
         app.server.add_url_rule(self.stop_route, self.stop_route, self._stop_server)

dash/testing/browser.py

@@ -358,9 +358,9 @@ def wait_for_page(self, url=None, timeout=10):
 
         if self._pause:
             try:
-                import pdb as pdb_
+                import pdb as pdb_  # pylint: disable=import-outside-toplevel
             except ImportError:
-                import ipdb as pdb_
+                import ipdb as pdb_  # pylint: disable=import-outside-toplevel
 
             pdb_.set_trace()
 

dash/testing/plugin.py

@@ -65,7 +65,7 @@ def pytest_addoption(parser):
 def pytest_addhooks(pluginmanager):
     # https://github.com/pytest-dev/pytest-xdist/blob/974bd566c599dc6a9ea291838c6f226197208b46/xdist/plugin.py#L67
     # avoid warnings with pytest-2.8
-    from dash.testing import newhooks
+    from dash.testing import newhooks  # pylint: disable=import-outside-toplevel
 
     method = getattr(pluginmanager, "add_hookspecs", None)
     if method is None:

dash/version.py

@@ -1 +1 @@
-__version__ = "1.18.0"
+__version__ = "1.18.1"

package.json

@@ -22,6 +22,7 @@
     "private::test.unit-dash": "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}",
+    "private::test.integration-dash-import": "cd tests/integration/dash && python dash_import_test.py",
     "format": "run-s private::format.*",
     "initialize": "run-s private::initialize.*",
     "lint": "run-s private::lint.*",

requires-dev.txt

@@ -1,14 +1,15 @@
 dash_flow_example==0.0.5
 dash-dangerously-set-inner-html
-isort==4.3.21
-mock==4.0.1;python_version>="3.0"
+isort==4.3.21;python_version<"3.7"
+mock==4.0.3;python_version>="3.0"
 mock==3.0.5;python_version=="2.7"
-flake8==3.7.9
-PyYAML==5.3
-pylint==1.9.4;python_version<"3.7"
-pylint==2.3.1;python_version=="3.7"
-astroid==2.2.5;python_version=="3.7"
+flake8==3.8.4
+PyYAML==5.3.1
+pylint==1.9.5;python_version<"3.7"
+pylint==2.6.0;python_version>="3.7"
+astroid==2.4.2;python_version>="3.7"
 black==19.10b0;python_version>="3.0"
-virtualenv==20.0.10;python_version=="2.7"
-fire==0.2.1
-coloredlogs==14.0
+virtualenv==20.2.2;python_version=="2.7"
+fire==0.3.1
+coloredlogs==15.0
+flask-talisman==0.7.0

requires-install.txt

@@ -1,8 +1,8 @@
-Flask>=1.0.2
+Flask>=1.0.4
 flask-compress
 plotly
 dash_renderer==1.8.3
-dash-core-components==1.14.0
+dash-core-components==1.14.1
 dash-html-components==1.1.1
 dash-table==4.11.1
 future

requires-testing.txt

@@ -1,13 +1,12 @@
-pytest==6.0.1;python_version>="3.0"
-pytest==4.6.9;python_version=="2.7"
-pytest-sugar==0.9.4
-pytest-mock==3.2.0;python_version>="3.0"
-pytest-mock==2.0.0;python_version=="2.7"
-lxml==4.6.1
-selenium==3.141.0
-percy==2.0.2
-cryptography==3.0
-requests[security]==2.21.0
-beautifulsoup4==4.8.2
-waitress==1.4.3
-flask-talisman==0.7.0
+pytest>=6.0.2;python_version>="3.0"
+pytest>=4.6,<5;python_version=="2.7"
+pytest-sugar>=0.9.4
+pytest-mock>=3.2.0;python_version>="3.0"
+pytest-mock>=2.0.0,<3;python_version=="2.7"
+lxml>=4.6.2
+selenium>=3.141.0
+percy>=2.0.2
+requests[security]>=2.21.0
+beautifulsoup4>=4.8.2,<=4.9.3;python_version=="2.7"
+beautifulsoup4>=4.8.2;python_version>="3.0"
+waitress>=1.4.4