Merge b3f0d04 into 8efe914

forestgeo · Feb 7, 2019 · e3fff4c · e3fff4c
2 parents 8efe914 + b3f0d04
commit e3fff4c
Show file tree

Hide file tree

Showing 7 changed files with 907 additions and 5 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,3 +1,5 @@
+^ca\.sh$
+^cm\.sh$
 ^revdep$
 ^cran-comments\.md$
 ^tmp\.sh$

diff --git a/vignettes/siteonly/eda.Rmd → .buildignore/eda.Rmd b/vignettes/siteonly/eda.Rmd → .buildignore/eda.Rmd
diff --git a/.buildignore/eda.html b/.buildignore/eda.html
diff --git a/.travis.yml b/.travis.yml
@@ -6,15 +6,13 @@ cache: packages
 
 matrix:
   include:
-  - os: osx
   - r: devel
   - r: release
     after_success: Rscript -e 'covr::coveralls()'
     before_deploy:
     - Rscript -e 'remotes::install_cran("pkgdown")'
     - Rscript -e 'remotes::install_github("maurolepore/pkgdoc")'
-    - Rscript -e 'install.packages(c("tidyverse", "ggstance", "lvplot"))'
-    - Rscript -e 'install.packages(c("ggbeeswarm", "modelr", "kableExtra", "DT"))'
+    - Rscript -e 'install.packages("DT")'
     deploy:
       provider: script
       script: Rscript -e 'pkgdown::deploy_site_github()'
@@ -23,6 +21,5 @@ matrix:
   - r: 3.3
   - r: 3.2
   allow_failures:
-  - os: osx
   - r: 3.2
 
diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -14,7 +14,7 @@ navbar:
     - text: "Isolating data with dplyr"
       href: https://fgeocomm.shinyapps.io/transform-isolating/
     - text: "Exploratory data analysis"
-      href: articles/siteonly/eda.html
+      href: https://bookdown.org/fgeocomm/eda/
 
   right:
   - text: "Community"

diff --git a/ca.sh b/ca.sh
@@ -0,0 +1,2 @@
+git add .
+git commit --amend
diff --git a/cm.sh b/cm.sh
@@ -0,0 +1,2 @@
+git add .
+git commit -a