merged master offline.py to local - changed call signature in one func

Author: Kully

CHANGELOG.md

@@ -2,6 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Updated
+- `FF.create_violin` and `FF.create_scatterplotmatrix` now by default do not print subplot grid information in output
+
+### Added
+- Plot configuration options for offline plots. See the list of [configuration options](https://github.com/Rikorose/plotly.py/blob/master/plotly/offline/offline.py#L189) and [examples](https://plot.ly/javascript/configuration-options/) for more information. 
+	- Please note that these configuration options are for offline plots ONLY. For configuration options when embedding online plots please see our [embed tutorial](http://help.plot.ly/embed-graphs-in-websites/#step-8-customize-the-iframe).
+- `colors.py` file which contains functions for manipulating and validating colors and arrays of colors
+- 'scale' param in `FF.create_trisurf` which now can set the interpolation on the colorscales
+
+### Fixed
+- Trisurf now uses correct `Plotly Colorscales` when called
+
 ## [1.12.9] - 2016-08-22
 ### Fixed
 - the colorbar in `.create_trisurf` now displays properly in `offline mode`.

bld.bat

@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install 
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.

build.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install 
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.

build_for_conda.md

@@ -0,0 +1,19 @@
+Initial setup was done using:
+
+`conda skeleton pypi plotly --version 1.12.4`
+
+To test all imports, manually added following dependencies at runtime:
+```
+- matplotlib
+- numpy
+- ipython
+- ipywidgets
+```
+
+I also had to change all `module/submodule` in the test imports to `module.submodule`.
+
+Finally, build and test the created version:
+
+`conda build plotly`
+
+Currently, the updated (version 1.12.4) conda package sits at https://anaconda.org/chohner/plotly. There seems to be an old offial package at https://anaconda.org/plotly/plotly.

meta.yaml

@@ -0,0 +1,80 @@
+package:
+  name: plotly
+  version: "1.12.4"
+
+source:
+  fn: plotly-1.12.4.tar.gz
+  url: https://files.pythonhosted.org/packages/02/e0/5b739403c3180298ebe277cbc9f5ee99e546ab24768b1732a2d6b381091b/plotly-1.12.4.tar.gz
+  md5: f1ff6b1b18554258aab50449ab571ee2
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  # noarch_python: True
+  # preserve_egg_dir: True
+  # entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - plotly = plotly:main
+    #
+    # Would create an entry point called plotly that calls plotly.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+    - setuptools
+    - requests
+    - six
+    - pytz
+
+  run:
+    - python
+    - requests
+    - six
+    - pytz
+    - matplotlib
+    - numpy
+    - ipython
+    - ipywidgets
+
+test:
+  # Python imports
+  imports:
+    - plotly
+    - plotly.graph_objs
+    - plotly.grid_objs
+    - plotly.matplotlylib
+    - plotly.matplotlylib.mplexporter
+    - plotly.matplotlylib.mplexporter.renderers
+    - plotly.offline
+    - plotly.plotly
+    - plotly.plotly.chunked_requests
+    - plotly.widgets
+
+  # commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: https://plot.ly/python/
+  license: MIT
+  summary: 'Python plotting library for collaborative, interactive, publication-quality graphs.'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml

plotly/offline/offline.py

@@ -160,8 +160,8 @@ def init_notebook_mode(connected=False):
     __PLOTLY_OFFLINE_INITIALIZED = True
 
 
-def _plot_html(figure_or_data, show_link, link_text, validate,
-               default_width, default_height, global_requirejs):
+def _plot_html(figure_or_data, config, validate, default_width,
+               default_height, global_requirejs):
     # force no validation if frames is in the call
     if 'frames' in figure_or_data:
         figure = tools.return_figure_from_figure_or_data(
@@ -195,10 +195,30 @@ def _plot_html(figure_or_data, show_link, link_text, validate,
     if 'frames' in figure_or_data:
         jframes = json.dumps(figure.get('frames', {}), cls=utils.PlotlyJSONEncoder)
 
-    config = {}
-    config['showLink'] = show_link
-    config['linkText'] = link_text
-    jconfig = json.dumps(config)
+    configkeys = (
+    'editable',
+    'autosizable',
+    'fillFrame',
+    'frameMargins',
+    'scrollZoom',
+    'doubleClick',
+    'showTips',
+    'showLink',
+    'sendData',
+    'linkText',
+    'showSources',
+    'displayModeBar',
+    'modeBarButtonsToRemove',
+    'modeBarButtonsToAdd',
+    'modeBarButtons',
+    'displaylogo',
+    'plotGlPixelRatio',
+    'setBackground',
+    'topojsonURL')
+
+    config_clean = dict((k,config[k]) for k in configkeys if k in config)
+
+    jconfig = json.dumps(config_clean)
 
     # TODO: The get_config 'source of truth' should
     # really be somewhere other than plotly.plotly

plotly/plotly/plotly.py

@@ -453,7 +453,6 @@ def __init__(self, stream_id):
 
         """
         self.stream_id = stream_id
-        self.connected = False
         self._stream = None
 
     def get_streaming_specs(self):
@@ -499,6 +498,13 @@ def heartbeat(self, reconnect_on=(200, '', 408)):
                 "cannot write to a closed connection. "
                 "Call `open()` on the stream to open the stream."
             )
+   
+    @property
+    def connected(self):
+        if self._stream is None:
+            return False
+
+        return self._stream._isconnected()
 
     def open(self):
         """
@@ -1289,10 +1295,11 @@ def response_handler(cls, response):
                     != tools.get_config_defaults()['plotly_api_domain']):
                 raise exceptions.PlotlyError(
                     "This endpoint is unavailable at {url}. If you are using "
-                    "Plotly Enterprise, you may need to upgrade your Plotly "
-                    "Enterprise server to request against this endpoint or "
+                    "Plotly On-Premise, you may need to upgrade your Plotly "
+                    "Plotly On-Premise server to request against this endpoint or "
                     "this endpoint may not be available yet.\nQuestions? "
-                    "[email protected] or your plotly administrator."
+                    "Visit community.plot.ly, contact your plotly administrator "
+                    "or upgrade to a Pro account for 1-1 help: https://goo.gl/1YUVu9 " 
                     .format(url=get_config()['plotly_api_domain'])
                 )
             else: