Merge branch 'master' into 0.39.0-issue591

Author: rpkyle

Diff for: .circleci/requirements/dev-requirements-py37.txt

@@ -6,8 +6,8 @@ mock
 tox
 tox-pyenv
 six
-plotly==3.6.1
+plotly==3.7.1
 requests[security]
 flake8
-pylint==2.2.2
-astroid==2.1.0
+pylint==2.3.1
+astroid==2.2.5

Diff for: .circleci/requirements/dev-requirements.txt

@@ -6,7 +6,7 @@ mock
 tox
 tox-pyenv
 six
-plotly==3.6.1
+plotly==3.7.1
 requests[security]
 flake8
 pylint==1.9.4

Diff for: CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.40.0] - 2019-03-25
+### Changed
+- Bumped dash-core-components version from 0.44.0 to [0.45.0](https://github.com/plotly/dash-core-components/blob/master/CHANGELOG.md#0450---2019-03-25)
+- Bumped dash-html-components version from 0.14.0 to [0.15.0](https://github.com/plotly/dash-html-components/blob/master/CHANGELOG.md#0150---2019-03-25)
+- Bumped dash-renderer version from 0.20.0 to [0.21.0](https://github.com/plotly/dash-renderer/blob/master/CHANGELOG.md#0210---2019-03-25)
+
 ## [0.39.0] - 2019-03-04
 ## Added
 - Allow multiple outputs from a single callback. [#436](https://github.com/plotly/dash/pull/436)

Diff for: dash/_configs.py

@@ -79,13 +79,15 @@ def pathname_configs(url_base_pathname=None,
                 '`requests_pathname_prefix`.'
             )
         )
-    elif url_base_pathname is not None and routes_pathname_prefix is not None:
+
+    if url_base_pathname is not None and routes_pathname_prefix is not None:
         raise exceptions.InvalidConfig(
             _pathname_config_error_message.format(
                 'You supplied `url_base_pathname` and '
                 '`routes_pathname_prefix`.')
         )
-    elif url_base_pathname is not None and routes_pathname_prefix is None:
+
+    if url_base_pathname is not None and routes_pathname_prefix is None:
         routes_pathname_prefix = url_base_pathname
     elif routes_pathname_prefix is None:
         routes_pathname_prefix = '/'

Diff for: dash/dash.py

@@ -496,7 +496,7 @@ def serve_component_suites(self, package_name, path_in_package_dist):
                 'Registered libraries are: {}'
                 .format(package_name, list(self.registered_paths.keys())))
 
-        elif path_in_package_dist not in self.registered_paths[package_name]:
+        if path_in_package_dist not in self.registered_paths[package_name]:
             raise exceptions.DependencyException(
                 '"{}" is registered but the path requested is not valid.\n'
                 'The path requested: "{}"\n'

Diff for: dash/development/_py_components_generation.py

@@ -1,4 +1,4 @@
-import collections
+from collections import OrderedDict
 import copy
 import os
 
@@ -310,9 +310,10 @@ def reorder_props(props):
         Dictionary with {propName: propMetadata} structure
     """
     if 'children' in props:
-        props = collections.OrderedDict(
-            [('children', props.pop('children'),)] +
-            list(zip(list(props.keys()), list(props.values()))))
+        # Constructing an OrderedDict with duplicate keys, you get the order
+        # from the first one but the value from the last.
+        # Doing this to avoid mutating props, which can cause confusion.
+        props = OrderedDict([('children', '')] + list(props.items()))
 
     return props
 

Diff for: dash/version.py

@@ -1 +1 @@
-__version__ = '0.39.0'
+__version__ = '0.40.0'

Diff for: setup.py

@@ -20,9 +20,9 @@
         'Flask>=0.12',
         'flask-compress',
         'plotly',
-        'dash_renderer==0.20.0',
-        'dash-core-components==0.44.0',
-        'dash-html-components==0.14.0',
+        'dash_renderer==0.21.0',
+        'dash-core-components==0.45.0',
+        'dash-html-components==0.15.0',
         'dash-table==3.6.0'
     ],
     entry_points={