fix changelog conflict

Author: cldougl

CHANGELOG.md

@@ -2,7 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.3.0] - 2018-01-19
+## [2.3.0] - 2018-01-22
+### Fixed
+- Merged [pull request](https://github.com/plotly/plotly.py/commit/a226e07393c158e01c34c050aaf492da9d77679a) that fixes `GraphWidget` for IPython > v6
 ### Updated
 - Updated `plotly.min.js` to version 1.33.0.
   - New plot types include a `violin` trace type.

README.md

@@ -1,8 +1,8 @@
 # plotly.py
 
-> 📢 Announcement!
-> Seats are still available for a 2 day, Dash master class in NYC, November 18-19. 
-> [Registration here](https://plotcon.plot.ly/workshops) 🎚 📈 🗽
+> 📢  Announcement!  
+> Registration is open for a 2 day, Dash master class in Montreal, February 17-18.  
+> [Register online here](https://plotcon.plot.ly/workshops) 🎚📈  🇨🇦
 
 ***
 

plotly/package_data/graphWidget.js

@@ -9,8 +9,8 @@
 from requests.compat import json as _json
 
 # TODO: protected imports?
-from IPython.html import widgets
-from IPython.utils.traitlets import Unicode
+import ipywidgets as widgets
+from traitlets import Unicode
 from IPython.display import Javascript, display
 
 import plotly.plotly.plotly as py
@@ -33,6 +33,7 @@ class GraphWidget(widgets.DOMWidget):
     Notebooks.
     """
     _view_name = Unicode('GraphView', sync=True)
+    _view_module = Unicode('graphWidget', sync=True)
     _message = Unicode(sync=True)
     _graph_url = Unicode(sync=True)
     _new_url = Unicode(sync=True)