From 02eae7d7af512068bcb138828c04f6ea37edfe1d Mon Sep 17 00:00:00 2001
From: Joseph Damiba <joseph.damiba@plot.ly>
Date: Fri, 21 Feb 2020 14:03:47 -0500
Subject: [PATCH 1/2] fix master by installing plotly from devtools

---
 .circleci/config.yml           | 6 +++---
 DESCRIPTION                    | 1 -
 r/2019-09-17-funnel-charts.Rmd | 5 -----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c687c0a3..772b30cd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - cache2
+            - cache3
       - run:
           name: Install container-level dependencies
           command: |
@@ -25,9 +25,9 @@ jobs:
           name: install application-level dependencies
           command: |
             sudo apt-get install -y pandoc libudunits2-dev libgdal-dev libxt-dev libglu1-mesa-dev
-            sudo R -e 'install.packages(c("curl", "devtools", "mvtnorm")); devtools::install_github("hypertidy/anglr"); devtools::install_github("johannesbjork/LaCroixColoR"); devtools::install_deps(dependencies = TRUE) '
+            sudo R -e 'install.packages(c("curl", "devtools", "mvtnorm")); devtools::install_github("hypertidy/anglr"); devtools::install_github("johannesbjork/LaCroixColoR"); devtools::install_github("ropensci/plotly"); devtools::install_deps(dependencies = TRUE) '
       - save_cache:
-          key: cache2
+          key: cache3
           paths:
             - "/usr/local/lib/R/site-library"
       - store_artifacts:
diff --git a/DESCRIPTION b/DESCRIPTION
index a136db61..488ad7e4 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,5 @@
 Package: Plotly's R graphing library. 
 Imports:
-    plotly,
     geomorph,
     maptools,
     rjson,
diff --git a/r/2019-09-17-funnel-charts.Rmd b/r/2019-09-17-funnel-charts.Rmd
index 98a58b15..b4a20f09 100644
--- a/r/2019-09-17-funnel-charts.Rmd
+++ b/r/2019-09-17-funnel-charts.Rmd
@@ -17,11 +17,6 @@ output:
 knitr::opts_chunk$set(message = FALSE, warning=FALSE)
 ```
 
-
-```{r, echo=FALSE, message=FALSE, results="hide"}
-# Install plotly from github for funnel plot
-devtools::install_github("ropensci/plotly")
-```
 ### Introduction
 Funnel charts are often used to represent data in different stages of a business process. It’s an important mechanism in Business Intelligence to identify potential problem areas of a process. For example, it’s used to observe the revenue or loss in a sales process for each stage, and displays values that are decreasing progressively. Each stage is illustrated as a percentage of the total of all values.
 

From 56a27b52f01acec27d222176d0774685af7631b2 Mon Sep 17 00:00:00 2001
From: Joseph Damiba <joseph.damiba@plot.ly>
Date: Fri, 21 Feb 2020 14:35:59 -0500
Subject: [PATCH 2/2] remove install instruction

---
 r/2019-09-17-funnel-charts.Rmd | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/r/2019-09-17-funnel-charts.Rmd b/r/2019-09-17-funnel-charts.Rmd
index b4a20f09..55e127f3 100644
--- a/r/2019-09-17-funnel-charts.Rmd
+++ b/r/2019-09-17-funnel-charts.Rmd
@@ -171,13 +171,6 @@ p <- plot_ly(
 p
 ```
 
-```{r, echo=FALSE, message=FALSE, results="hide"}
-# Remove plotly install from github
-remove.packages("plotly")
-# Install plotly from CRAN
-install.packages("plotly", repos = "http://cran.us.r-project.org")
-```
-
 #Reference
 
 See [https://plot.ly/r/reference/#funnel](https://plot.ly/r/reference/#funnel) and [https://plot.ly/r/reference/#funnelarea](https://plot.ly/r/reference/#funnelarea) for more information and chart attribute options!