Merge pull request tdhopper#7 from tdhopper/richard-muir-plotly

tdhopper · web-flow · commit d561039d9b2a · 2017-07-25T15:25:18.000-04:00
Add Richard Muir's plotly examples
diff --git a/.travis/authenticate_plotly.py b/.travis/authenticate_plotly.py
@@ -0,0 +1,3 @@
+import plotly
+import os
+plotly.tools.set_credentials_file(username=os.environ.get('PLOTLY_USER'), api_key=os.environ.get('PLOTLY_API_KEY'))
diff --git a/Examples.ipynb b/Examples.ipynb
diff --git a/Makefile b/Makefile
@@ -10,7 +10,10 @@ clean:
 	rm -f *.pyc
 	rm -f  .Rhistory
 
-travis: test render
+travis: plotly_auth test render
+
+plotly_auth:
+	python ./.travis/authenticate_plotly.py
 
 test:
 	python -m pytest tests/
@@ -34,4 +37,4 @@ dev_environment:
 cloudfront_invalidate:
 	python .travis/invalidate_cloudfront.py
 
-.PHONY: all qrender render s3_upload run_nb travis clean cloudfront_invalidate test dev_environment
+.PHONY: all qrender render s3_upload run_nb travis clean cloudfront_invalidate test dev_environment plotly_auth
diff --git a/environment.yml b/environment.yml
@@ -6,4 +6,4 @@ dependencies:
   - python>=3.6
   - pip
   - r-essentials
-  - r:rpy2
+  - rpy2
diff --git a/render.py b/render.py
@@ -23,6 +23,7 @@
     "plotnine": "plotnine",
     "ggplot": "ggplot2 (R)",
     "bokeh": "Bokeh",
+    "plotly": "plotly",
 }
 
 names = {
diff --git a/requirements.txt b/requirements.txt
@@ -11,4 +11,6 @@ jinja2-highlight
 markdown
 scikit-misc
 boto3
-pytest
+pytest
+plotly
+statsmodels
diff --git a/tests/test_plots.py b/tests/test_plots.py
@@ -1,22 +1,22 @@
 import render
 
-defined_plots = {'bar-counts': ['pandas', 'plotnine', 'ggplot', ],
-                 'dodged-bar-chart': ['pandas', 'plotnine', 'ggplot', ],
-                 'scatter-plot': ['pandas', 'plotnine', 'ggplot', ],
+defined_plots = {'bar-counts': ['pandas', 'plotnine', 'ggplot', 'plotly', ],
+                 'dodged-bar-chart': ['pandas', 'plotnine', 'ggplot', 'plotly', ],
+                 'scatter-plot': ['pandas', 'plotnine', 'ggplot', 'plotly', ],
                  'scatter-plot-with-colors': ['matplotlib',
                                               'seaborn',
                                               'plotnine',
                                               'ggplot',
-                                              ],
-                 'scatter-plot-with-facet': ['seaborn', 'plotnine', 'ggplot', ],
-                 'scatter-plot-with-facets': ['seaborn', 'plotnine', 'ggplot', ],
-                 'scatter-plot-with-size': ['pandas', 'plotnine', 'ggplot', ],
-                 'scatter-with-regression': ['seaborn', 'plotnine', 'ggplot', ],
-                 'simple-histogram': ['pandas', 'matplotlib', 'plotnine', 'ggplot', ],
-                 'stacked-bar-chart': ['pandas', 'plotnine', 'ggplot', ],
-                 'stacked-kde': ['pandas', 'seaborn', 'plotnine', 'ggplot', ],
-                 'stacked-smooth-line-and-scatter': ['plotnine', 'ggplot', ],
-                 'timeseries': ['pandas', 'plotnine', 'ggplot', ]}
+                                              'plotly', ],
+                 'scatter-plot-with-facet': ['seaborn', 'plotnine', 'ggplot', 'plotly', ],
+                 'scatter-plot-with-facets': ['seaborn', 'plotnine', 'ggplot', 'plotly', ],
+                 'scatter-plot-with-size': ['pandas', 'plotnine', 'ggplot', 'plotly', ],
+                 'scatter-with-regression': ['seaborn', 'plotnine', 'ggplot', 'plotly', ],
+                 'simple-histogram': ['pandas', 'matplotlib', 'plotnine', 'ggplot', 'plotly', ],
+                 'stacked-bar-chart': ['pandas', 'plotnine', 'ggplot', 'plotly', ],
+                 'stacked-kde': ['pandas', 'seaborn', 'plotnine', 'ggplot', 'plotly', ],
+                 'stacked-smooth-line-and-scatter': ['plotnine', 'ggplot', 'plotly', ],
+                 'timeseries': ['pandas', 'plotnine', 'ggplot', 'plotly', ]}
 
 
 def test_exist():

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import plotly`
	`2`	`+import os`
	`3`	`+plotly.tools.set_credentials_file(username=os.environ.get('PLOTLY_USER'), api_key=os.environ.get('PLOTLY_API_KEY'))`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`"plotnine": "plotnine",`
`24`	`24`	`"ggplot": "ggplot2 (R)",`
`25`	`25`	`"bokeh": "Bokeh",`
	`26`	`+ "plotly": "plotly",`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`names = {`