Merge 656c3d9 into d78cf4a

.travis.yml

@@ -13,14 +13,11 @@ matrix:
     before_deploy:
     - Rscript -e 'remotes::install_cran("pkgdown")'
     - Rscript -e 'remotes::install_github("maurolepore/pkgdoc")'
-    - Rscript -e 'install.packages("DT")'
     deploy:
       provider: script
       script: Rscript -e 'pkgdown::deploy_site_github()'
       skip_cleanup: true
   - r: oldrel
   - r: 3.3
   - r: 3.2
-  allow_failures:
-  - r: 3.2
 

DESCRIPTION

@@ -104,10 +104,10 @@ Imports:
     cli (>= 1.0.1),
     crayon (>= 1.3.4),
     dplyr (>= 0.7.8),
-    fgeo.analyze (>= 1.1.2),
-    fgeo.plot (>= 1.1.1),
-    fgeo.tool (>= 1.2.1),
-    fgeo.x (>= 1.1.0),
+    fgeo.analyze (>= 1.1.3),
+    fgeo.plot (>= 1.1.3),
+    fgeo.tool (>= 1.2.2),
+    fgeo.x (>= 1.1.2),
     glue (>= 1.3.0),
     magrittr (>= 1.5),
     purrr (>= 0.3.0),
@@ -117,12 +117,12 @@ Imports:
 Suggests: 
     covr (>= 3.2.1),
     DT (>= 0.5),
+    kableExtra (>= 1.0.1),
     knitr (>= 1.21),
     rmarkdown (>= 1.11),
     spelling (>= 2.0),
     testthat (>= 2.0.1)
-Additional_repositories: https://cran.rstudio.com/,
-    https://forestgeo.github.io/drat/
+Additional_repositories: https://forestgeo.github.io/drat/
 Encoding: UTF-8
 Language: en-US
 LazyData: true

NEWS.md

@@ -18,6 +18,6 @@
 
 * Tidy dependencies.
 
-# fgeo 1.0.0 ([GitHub](https://github.com/forestgeo/fgeo/releases) release)
+# fgeo 1.0.0 ([GitHub](https://github.com/forestgeo/fgeo/releases))
 
 * Internal release.

ru.sh

@@ -0,0 +1,4 @@
+git checkout master
+git fetch upstream
+git reset --hard upstream/master
+git remote prune origin