resolved conflict. Second conflict was not that straight forward :/

Author: Christian Fufezan

.gitignore

@@ -8,10 +8,12 @@
 
 *.coverage
 
+*.tox
+
 build
 
 dist
 
 debug_script.py
 
-test_output.txt
+test_output.txt

CHANGELOG.md

@@ -3,10 +3,255 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- Support for rendering plots in [nteract](https://nteract.io/)!
+  See [https://github.com/nteract/nteract/pull/662](https://github.com/nteract/nteract/pull/662)
+  for the associated PR in nteract.
+
+### Added
+- `memoize` decorator added to `plotly.utils`
+
+### Changed
+- a `Grid` from `plotly.grid_objs` now accepts a `pandas.Dataframe` as its argument.
+- computationally-intensive `graph_reference` functions are memoized.
+
+## [2.0.0] - 2017-01-25
+
+### Changed
+- `plotly.exceptions.PlotlyRequestException` is *always* raised for network
+failures. Previously either a `PlotlyError`, `PlotlyRequestException`, or a
+`requests.exceptions.ReqestException` could be raised. In particular, scripts
+which depend on `try-except` blocks containing network requests should be
+revisited.
+- `plotly.py:sign_in` now validates to the plotly server specified in your
+  config. If it cannot make a successful request, it raises a `PlotlyError`.
+- `plotly.figure_factory` will raise an `ImportError` if `numpy` is not
+  installed.
+- `plotly.figure_factory.create_violin()` now has a `rugplot` parameter which
+  determines whether or not a rugplot is draw beside each violin plot.
+
+### Deprecated
+- `plotly.tools.FigureFactory`. Use `plotly.figure_factory.*`.
+- (optional imports) `plotly.tools._*_imported` It was private anyhow, but now
+it's gone. (e.g., `_numpy_imported`)
+- (plotly v2 helper) `plotly.py._api_v2` It was private anyhow, but now it's
+gone.
+
+## [1.13.0] - 2016-12-17
+### Added
+- Python 3.5 has been added as a tested environment for this package.
+
+### Updated
+- `plotly.plotly.create_animations` and `plotly.plotly.icreate_animations` now return appropriate error messages if the response is not successful.
+- `frames` are now integrated into GRAPH_REFERENCE and figure validation.
+
+### Changed
+- The plot-schema from `https://api.plot.ly/plot-schema` is no longer updated on import.
+
+## [1.12.12] - 2016-12-06
+### Updated
+- Updated `plotly.min.js` to version 1.20.5 for `plotly.offline`.
+	- See [the plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md) for additional information regarding the updates
+- `FF.create_scatterplotmatrix` now by default does not show the trace labels for the box plots, only if `diag=box` is selected for the diagonal subplot type.
+
+## [1.12.11] - 2016-12-01
+### Fixed
+- The `link text` in the bottom right corner of the offline plots now properly displays `Export to [Domain Name]` for the given ___domain name set in the users' `.config` file.
+
+## [1.12.10] - 2016-11-28
+### Updated
+- `FF.create_violin` and `FF.create_scatterplotmatrix` now by default do not print subplot grid information in output
+- Removed alert that occured when downloading plot images offline. Please note: for higher resolution images and more export options, consider making requests to our image servers. See: `help(py.image)` for more details.
+
+### 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
+- animations now work in offline mode. By running `plotly.offline.plot()` and `plotly.offline.iplot()` with a `fig` with `frames`, the resulting plot will cycle through the figures defined in `frames` either in the browser or in an ipython notebook respectively. Here's an example:
+```
+import IPython.display
+from IPython.display import display, HTML
+from plotly.offline import download_plotlyjs, init_notebook_mode, plot, iplot
+init_notebook_mode(connected=True)
+
+figure_or_data = {'data': [{'x': [1, 2], 'y': [0, 1]}],
+                  'layout': {'xaxis': {'range': [0, 3], 'autorange': False},
+                             'yaxis': {'range': [0, 20], 'autorange': False},
+                  'title': 'First Title'},
+                  'frames': [{'data': [{'x': [1, 2], 'y': [5, 7]}]},
+                             {'data': [{'x': [-1, 3], 'y': [3, 9]}]},
+                             {'data': [{'x': [2, 2.6], 'y': [7, 5]}]},
+                             {'data': [{'x': [1.5, 3], 'y': [7.5, 4]}]},
+                             {'data': [{'x': [1, 2], 'y': [0, 1]}],
+                              'layout': {'title': 'End Title'}}]}
+iplot(figure_or_data)
+```
+More examples can be found at https://plot.ly/python/animations/.
+- animations now work in online mode: use `plotly.plotly.create_animations` and `plotly.plotly.icreate_animations` which animate a figure with the `frames` argument. Here is a simple example:
+```
+import plotly.plotly as py
+from plotly.grid_objs import Grid, Column
+
+column_1 = Column([0.5], 'x')
+column_2 = Column([0.5], 'y')
+column_3 = Column([1.5], 'x2')
+column_4 = Column([1.5], 'y2')
+
+grid = Grid([column_1, column_2, column_3, column_4])
+py.grid_ops.upload(grid, 'ping_pong_grid', auto_open=False)
+
+# create figure
+figure = {
+    'data': [
+        {
+            'xsrc': grid.get_column_reference('x'),
+            'ysrc': grid.get_column_reference('y'),
+            'mode': 'markers',
+        }
+    ],
+    'layout': {'title': 'Ping Pong Animation',
+               'xaxis': {'range': [0, 2], 'autorange': False},
+               'yaxis': {'range': [0, 2], 'autorange': False},
+               'updatemenus': [{
+                   'buttons': [
+                       {'args': [None],
+                        'label': u'Play',
+                        'method': u'animate'}
+               ],
+               'pad': {'r': 10, 't': 87},
+               'showactive': False,
+               'type': 'buttons'
+                }]},
+    'frames': [
+        {
+            'data': [
+                {
+                    'xsrc': grid.get_column_reference('x2'),
+                    'ysrc': grid.get_column_reference('y2'),
+                    'mode': 'markers',
+                }
+            ]
+        },
+        {
+            'data': [
+                {
+                    'xsrc': grid.get_column_reference('x'),
+                    'ysrc': grid.get_column_reference('y'),
+                    'mode': 'markers',
+                }
+            ]
+        }
+    ]
+}
+
+py.create_animations(figure, 'ping_pong')
+```
+
+### Fixed
+- Trisurf now uses correct `Plotly Colorscales` when called
+- Fixed a bug in the format of unique-identifiers in columns of grids that are uploaded to plotly via `plotly.plotly.upload`. See https://github.com/plotly/plotly.py/pull/599 for details. In particular, creating plots that are based off of plotly grids is no longer broken. Here is an example:
+
+```
+import plotly.plotly as py
+from plotly.grid_objs import Grid, Column
+
+c1 = Column([6, 6, 6, 5], 'column 1')
+c2 = Column(['a', 'b', 'c', 'd'], 'column 2')
+g = Grid([c1, c2])
+
+# Upload the grid
+py.grid_ops.upload(g, 'my-grid', auto_open=False)
+
+# Make a graph that with data that is referenced from that grid
+trace = Scatter(xsrc=g[0], ysrc=g[1])
+url = py.plot([trace], filename='my-plot')
+```
+Then, whenever you update the data in `'my-grid'`, the associated plot will update too. See https://plot.ly/python/data-api for more details on usage and examples.
+
+## [1.12.9] - 2016-08-22
+### Fixed
+- the colorbar in `.create_trisurf` now displays properly in `offline mode`.
+
+### Updated
+- the colorbar in `.create_trisurf` now displays the appropriate max and min values on the ends of the bar which corresponding to the coloring metric of the figure
+- `edges_color` is now a param in `.create_trisurf` which only takes `rgb` values at the moment
+
+## [1.12.8] - 2016-08-18
+### Fixed
+- Fixed color bug with trisurf plots where certain triangles were colored strangely. The coordinates of `rgb(...)` are now rounded to their nearest integer (using Python3 method of rounding), then placed in the color string to fix the issue.
+
+## [1.12.7] - 2016-08-17
+### Fixed
+- Edited `plotly.min.js` due to issue using `iplot` to plot offline in Jupyter Notebooks
+	- Please note that `plotly.min.js` may be cached in your Jupyter Notebook. Therefore, if you continue to experience this issue after upgrading the Plotly package please open a new notebook or clear the cache to ensure the correct `plotly.min.js` is referenced.
+
+## [1.12.6] - 2016-08-09
+### Updated
+- Updated `plotly.min.js` from 1.14.1 to 1.16.2
+	- Trace type scattermapbox is now part of the main bundle
+	- Add updatemenus (aka dropdowns) layout components
+	- See [the plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md) for additional information regarding the updates
+
+## [1.12.5] - 2016-08-03
+### Updated
+- `.create_trisurf` now supports a visible colorbar for the trisurf plots. Check out the docs for help:
+```
+import plotly.tools as tls
+help(tls.FigureFactory.create_trisurf)
+```
+
+## [1.12.4] - 2016-07-14
+### Added
+- The FigureFactory can now create 2D-density charts with `.create_2D_density`. Check it out with:
+```
+import plotly.tools as tls
+help(tls.FigureFactory.create_2D_density)
+```
+
+## [1.12.3] - 2016-06-30
+### Updated
+- Updated `plotly.min.js` from 1.13.0 to 1.14.1
+	- Numerous additions and changes where made to the mapbox layout layers attributes
+	- Attribute line.color in scatter3d traces now support color scales
+	- Layout shapes can now be moved and resized (except for 'path' shapes) in editable contexts
+	- See [the plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#1141----2016-06-28) for additional information regarding the updates
+- Updated `default-schema`
+
+### Added
+- Added `update_plotlyjs_for_offline` in makefile in order to automate updating `plotly.min.js` for offline mode
+
+## [1.12.2] - 2016-06-20
+### Updated
+- Updated plotly.min.js so the offline mode is using plotly.js v1.13.0
+	- Fix `Plotly.toImage` and `Plotly.downloadImage` bug specific to Chrome 51 on OSX
+	- Beta version of the scattermapbox trace type - which allows users to create mapbox-gl maps using the plotly.js API. Note that scattermapbox is only available through custom bundling in this release.
+	- See [the plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#1130----2016-05-26) for additional additions and updates.
+
+### Added
+- The FigureFactory can now create gantt charts with `.create_gantt`. Check it out with:
+```
+import plotly.tools as tls
+help(tls.FigureFactory.create_gantt)
+```
+- Ability to download images in offline mode. By providing an extra keyword `image` to the existing plot calls, you can now download the images of the plots you make in offline mode.
+
+### Fixed
+- Fixed check for the height parameter passed to `_plot_html`, and now sets the correct `link text` for plots
+generated in offline mode.
+
+
+## [1.12.1] - 2016-06-19
+### Added
+- The FigureFactory can now create violin plots with `.create_violin`. Check it out with:
+```
+import plotly.tools as tls
+help(tls.FigureFactory.create_violin)
+```
 
 ## [1.12.0] - 2016-06-06
 ### Added
-- Added ability to enable/disable SSL certificate verification for streaming. Disabling SSL certification verification requires Python v2.7.9 / v3.4.3 (or above). This feature can be toggled via the `plotly_ssl_verification` configuration setting. 
+- Added ability to enable/disable SSL certificate verification for streaming. Disabling SSL certification verification requires Python v2.7.9 / v3.4.3 (or above). This feature can be toggled via the `plotly_ssl_verification` configuration setting.
 
 ## [1.11.0] - 2016-05-27
 ### Updated
@@ -26,7 +271,7 @@ Note: This is a backwards incompatible change.
 
 - In `create_trisurf`, the parameter `dist_func` has been replaced by `color_func`. Users can now:
 	- Input a list of different color types (hex, tuple, rgb) to `colormap` to map colors divergently
-	- Input a list|array of hex and rgb colors to `color_func` to assign each simplex to a color 
+	- Input a list|array of hex and rgb colors to `color_func` to assign each simplex to a color
 
 ### Added
 - Added the option to load plotly.js from a CDN by setting the parameter `connected=True`
@@ -37,7 +282,7 @@ import plotly.tools as tls
 help(tls.FigureFactory.create_trisurf)
 ```
 
- 
+
 
 ## [1.10.0] - 2016-05-19
 ### Fixed

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.