Merge fb619b3 into 8efe914

forestgeo · Feb 7, 2019 · d7885fb · d7885fb
2 parents 8efe914 + fb619b3
commit d7885fb
Show file tree

Hide file tree

Showing 8 changed files with 912 additions and 9 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
@@ -3,18 +3,17 @@
 language: R
 sudo: false
 cache: packages
+latex: false
 
 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 +22,5 @@ matrix:
   - r: 3.3
   - r: 3.2
   allow_failures:
-  - os: osx
   - r: 3.2
 
diff --git a/NEWS.md b/NEWS.md
@@ -3,21 +3,21 @@
 * Work in progress.
 * Add reviewers  (forestgeo/forum#19).
 
-# fgeo 1.1.1 (GitHub and drat release)
+# fgeo 1.1.1 ([GitHub](https://github.com/forestgeo/fgeo/releases) and [drat](https://forestgeo.github.io/drat/))
 
 * Meet CRAN standards.
 * Use tidy versions.
 
-# fgeo 1.1.0 (GitHub and drat release)
+# fgeo 1.1.0 ([GitHub](https://github.com/forestgeo/fgeo/releases) and [drat](https://forestgeo.github.io/drat/))
 
 * Import fgeo packages via `Additional_repositories` served at <https://forestgeo.github.io/drat/>
 
-# fgeo 1.0.1 (GitHub and drat release)
+# fgeo 1.0.1 ([GitHub](https://github.com/forestgeo/fgeo/releases) and [drat](https://forestgeo.github.io/drat/))
 
 * Style.
 
 * Tidy dependencies.
 
-# fgeo 1.0.0 (GitHub release)
+# fgeo 1.0.0 ([GitHub](https://github.com/forestgeo/fgeo/releases) release)
 
 * Internal release.
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