Merge branch 'master' into sphinxgallery

Author: emmanuelle

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://plot.ly/products/consulting-and-oem/

CHANGELOG.md

@@ -2,6 +2,49 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.10.0] - 2019-05-31
+
+### Updated
+ - Updated Plotly.js to version 1.48.1. See the
+ [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#1481----2019-05-30)
+ for more information.
+ 
+### Added
+ - Added funnel trace
+ ([plotly/plotly.js#3817](https://github.com/plotly/plotly.js/pull/3817),
+ [plotly/plotly.js#3911](https://github.com/plotly/plotly.js/pull/3911))
+ - Added funnelarea traces
+ ([#3876](https://github.com/plotly/plotly.js/pull/3876),
+ [#3912](https://github.com/plotly/plotly.js/pull/3912))
+ - Added support for shared color axes via coloraxis attributes in the layout
+ ([#3803](https://github.com/plotly/plotly.js/pull/3803),
+ [#3786](https://github.com/plotly/plotly.js/pull/3786),
+ [#3901](https://github.com/plotly/plotly.js/pull/3901),
+ [#3916](https://github.com/plotly/plotly.js/pull/3916))
+ - Added support for sorting categorical cartesian axes by value
+ ([#3864](https://github.com/plotly/plotly.js/pull/3864))
+ - Added `bingroup` to `histogram`, `histogram2d` and `histogram2dcontour`
+ to group traces to have compatible auto-bin values
+ ([#3845](https://github.com/plotly/plotly.js/pull/3845))
+ - Add legend `itemclick` and `itemdoubleclick` attributes to set or disable
+ the legend item click and double-click behavior
+ ([#3862](https://github.com/plotly/plotly.js/pull/3862))
+ - Added support for calling orca through [Xvfb](https://www.x.org/releases/X11R7.6/doc/man/man1/Xvfb.1.xhtml)
+ to support static image export on Linux when X11 is not available
+ ([#1523](https://github.com/plotly/plotly.py/pull/1523)).
+
+### Fixed
+ - Fixed `PlotlyJSONEncoder` encoding error when `simplejson` is installed
+ ([#1556](https://github.com/plotly/plotly.py/issues/1556),
+ [#1561](https://github.com/plotly/plotly.py/pull/1561))
+ - HTML export now honors the figure height specified in the figure template
+ ([#1560](https://github.com/plotly/plotly.py/issues/1560))
+ - Fixed display height of figure displayed in JupyterLab
+ ([#1572](https://github.com/plotly/plotly.py/issues/1572),
+ [#1571](https://github.com/plotly/plotly.py/pull/1571))
+ - Fixed honouring of the `validate=False` option for all renderer types
+ ([#1576](https://github.com/plotly/plotly.py/pull/1576))
+ 
 ## [3.9.0] - 2019-04-19
 
 ### Updated

README.md

@@ -78,12 +78,12 @@ Built on top of [plotly.js](https://github.com/plotly/plotly.js), `plotly.py` is
 
 plotly.py may be installed using pip...
 ```
-pip install plotly==3.9.0
+pip install plotly==3.10.0
 ```
 
 or conda.
 ```
-conda install -c plotly plotly=3.9.0
+conda install -c plotly plotly=3.10.0
 ```
 
 ### Jupyter Notebook Support
@@ -126,7 +126,7 @@ set NODE_OPTIONS=--max-old-space-size=4096
 jupyter labextension install @jupyter-widgets/[email protected] --no-build
 
 # FigureWidget support
-jupyter labextension install plotlywidget@0.10.0 --no-build
+jupyter labextension install plotlywidget@0.11.0 --no-build
 
 # offline iplot support
 jupyter labextension install @jupyterlab/[email protected] --no-build

_plotly_future_/orca_defaults.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import
+from _plotly_future_ import _future_flags, _assert_plotly_not_imported
+
+_assert_plotly_not_imported()
+_future_flags.add('orca_defaults')

_plotly_future_/timezones.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import
+from _plotly_future_ import _future_flags, _assert_plotly_not_imported
+
+_assert_plotly_not_imported()
+_future_flags.add('timezones')

_plotly_future_/trace_uids.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import
+from _plotly_future_ import _future_flags, _assert_plotly_not_imported
+
+_assert_plotly_not_imported()
+_future_flags.add('trace_uids')

_plotly_future_/v4.py

@@ -1,4 +1,12 @@
 from __future__ import absolute_import
 from _plotly_future_ import (
-    renderer_defaults, template_defaults, extract_chart_studio,
-    remove_deprecations, v4_subplots)
+    renderer_defaults,
+    template_defaults,
+    extract_chart_studio,
+    remove_deprecations,
+    v4_subplots,
+    orca_defaults,
+    timezones,
+    trace_uids,
+)
+

_plotly_utils/basevalidators.py

@@ -1454,14 +1454,9 @@ def __init__(self, plotly_name,
             self.base = dflt
         else:
             # e.g. regex == '/^y([2-9]|[1-9][0-9]+)?$/'
-            self.base = re.match('/\^(\w+)',
-                                 regex).group(1)
+            self.base = re.match('/\^(\w+)', regex).group(1)
 
-        if regex is not None:
-            # Remove leading/trailing '/' characters
-            self.regex = regex[1:-1]
-        else:
-            self.regex = dflt + "(\d*)"
+        self.regex = self.base + "(\d*)"
 
     def description(self):
 

_plotly_utils/utils.py

@@ -3,8 +3,8 @@
 import json as _json
 import sys
 import re
-
 import pytz
+from _plotly_future_ import _future_flags
 
 from _plotly_utils.optional_imports import get_module
 
@@ -104,7 +104,9 @@ def default(self, obj):
             self.encode_as_sage,
             self.encode_as_numpy,
             self.encode_as_pandas,
-            self.encode_as_datetime,
+            (self.encode_as_datetime_v4
+             if 'timezones' in _future_flags
+             else self.encode_as_datetime),
             self.encode_as_date,
             self.encode_as_list,  # because some values have `tolist` do last.
             self.encode_as_decimal
@@ -170,6 +172,14 @@ def encode_as_numpy(obj):
         else:
             raise NotEncodable
 
+    @staticmethod
+    def encode_as_datetime_v4(obj):
+        """Convert datetime objects to iso-format strings"""
+        try:
+            return obj.isoformat()
+        except AttributeError:
+            raise NotEncodable
+
     @staticmethod
     def encode_as_datetime(obj):
         """Attempt to convert to utc-iso time string using datetime methods."""

chart_studio/api/v1/clientresp.py

@@ -3,7 +3,7 @@
 
 import warnings
 
-from requests.compat import json as _json
+import json as _json
 
 
 from _plotly_utils.utils import PlotlyJSONEncoder

chart_studio/api/v2/utils.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 import requests
-from requests.compat import json as _json
+import json as _json
 from requests.exceptions import RequestException
 from retrying import retry
 

chart_studio/grid_objs/grid_objs.py

@@ -12,7 +12,7 @@
 except ImportError:
     from collections import MutableSequence
 
-from requests.compat import json as _json
+import json as _json
 
 from _plotly_utils.optional_imports import get_module
 from chart_studio import utils, exceptions

chart_studio/plotly/plotly.py

@@ -26,7 +26,7 @@
 
 import six
 import six.moves
-from requests.compat import json as _json
+import json as _json
 
 import _plotly_utils.utils
 import _plotly_utils.exceptions

chart_studio/tests/test_plot_ly/test_api/test_v1/test_utils.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from requests import Response
-from requests.compat import json as _json
+import json as _json
 from requests.exceptions import ConnectionError
 
 from chart_studio.api.utils import to_native_utf8_string

chart_studio/tests/test_plot_ly/test_api/test_v2/test_grids.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from requests.compat import json as _json
+import json as _json
 
 from chart_studio.api.v2 import grids
 from chart_studio.tests.test_plot_ly.test_api import PlotlyApiTestCase

chart_studio/tests/test_plot_ly/test_api/test_v2/test_images.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from requests.compat import json as _json
+import json as _json
 
 from chart_studio.api.v2 import images
 from chart_studio.tests.test_plot_ly.test_api import PlotlyApiTestCase

chart_studio/tests/test_plot_ly/test_api/test_v2/test_utils.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from requests.compat import json as _json
+import json as _json
 from requests.exceptions import ConnectionError
 
 from plotly import version

chart_studio/tests/test_plot_ly/test_get_requests/test_get_requests.py

@@ -10,7 +10,7 @@
 import requests
 import six
 from nose.plugins.attrib import attr
-from requests.compat import json as _json
+import json as _json
 
 from chart_studio.tests.utils import PlotlyTestCase
 

chart_studio/tests/test_plot_ly/test_plotly/test_plot.py

@@ -10,7 +10,7 @@
 import requests
 import six
 import sys
-from requests.compat import json as _json
+import json as _json
 import warnings
 
 from nose.plugins.attrib import attr

chart_studio/utils.py

@@ -12,7 +12,7 @@
 import threading
 import warnings
 
-from requests.compat import json as _json
+import json as _json
 
 from _plotly_utils.exceptions import PlotlyError
 from _plotly_utils.optional_imports import get_module

chart_studio/widgets/graph_widget.py

@@ -6,7 +6,7 @@
 from collections import deque
 import pkgutil
 
-from requests.compat import json as _json
+import json as _json
 
 # TODO: protected imports?
 import ipywidgets as widgets

codegen/datatypes.py

@@ -491,11 +491,16 @@ def add_docstring(buffer, node, header, prepend_extras=(), append_extras=()):
 
     # Write any append extras
     for p, v in append_extras:
-        v_wrapped = '\n'.join(textwrap.wrap(
-            v,
-            width=79-12,
-            initial_indent=' ' * 12,
-            subsequent_indent=' ' * 12))
+        if '\n' in v:
+            # If v contains newlines then assume it's already wrapped as
+            # desired
+            v_wrapped = v
+        else:
+            v_wrapped = '\n'.join(textwrap.wrap(
+                v,
+                width=79-12,
+                initial_indent=' ' * 12,
+                subsequent_indent=' ' * 12))
         buffer.write(f"""
         {p}
 {v_wrapped}""")