Merge pull request #21 from jfisher-usgs/master

Merge with upstream
USGS-R · Nov 9, 2018 · f50af9c · f50af9c
2 parents 5bfc684 + f7a33b8
commit f50af9c
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: wrv
 Title: Wood River Valley Groundwater-Flow Model
-Version: 1.1.5.9000
+Version: 1.1.6
 Authors@R: c(
     person(given=c("Jason", "C."), family="Fisher", role=c("aut", "cre"), email="jfisher@usgs.gov", comment=c(ORCID="0000-0001-9032-8912")),
     person(given=c("Allan", "H."), family="Wylie", role="ctb", email="Allan.Wylie@idwr.idaho.gov"),
@@ -43,4 +43,4 @@ ByteCompile: true
 LazyData: true
 LazyDataCompression: xz
 VignetteBuilder: knitr
-RoxygenNote: 6.1.0
+RoxygenNote: 6.1.1
diff --git a/Makefile b/Makefile
@@ -15,8 +15,7 @@ APPXC   := sir20165080_AppendixC
 all: docs rd2tex install check clean
 
 docs:
-	R -q -e 'devtools::document()';\
-	R -q -e 'devtools::clean_dll()';\
+	R -q -e 'pkgload::load_all();roxygen2::roxygenize();pkgbuild::clean_dll()';\
 
 build:
 	cd ..;\
@@ -38,8 +37,7 @@ rd2tex:
 	$(RM) -r .Rd2pdf*;\
 
 vignettes:
-	R -q -e 'devtools::build_vignettes()';\
-	R -q -e 'tools::compactPDF(paths='\''inst/doc'\'', gs_quality='\''ebook'\'')';\
+	R -q -e 'inlmisc::BuildVignettes(gs_quality='\''ebook'\'')';\
 
 datasets:
 	cd ..;\

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# wrv 1.1.5.9000
+# wrv 1.1.6
 
 - Fix bug in appendix D that was droping `"flow.sum"` column name when aggregating flows.
 

diff --git a/inst/doc/sir20165080_AppendixA.pdf b/inst/doc/sir20165080_AppendixA.pdf
diff --git a/inst/doc/sir20165080_AppendixB.pdf b/inst/doc/sir20165080_AppendixB.pdf
diff --git a/inst/doc/sir20165080_AppendixC.pdf b/inst/doc/sir20165080_AppendixC.pdf
diff --git a/inst/doc/sir20165080_AppendixD.pdf b/inst/doc/sir20165080_AppendixD.pdf
diff --git a/inst/doc/sir20165080_AppendixE.pdf b/inst/doc/sir20165080_AppendixE.pdf
diff --git a/inst/doc/sir20165080_AppendixF.pdf b/inst/doc/sir20165080_AppendixF.pdf
diff --git a/inst/doc/sir20165080_AppendixG.pdf b/inst/doc/sir20165080_AppendixG.pdf
diff --git a/inst/doc/sir20165080_AppendixH.pdf b/inst/doc/sir20165080_AppendixH.pdf
diff --git a/inst/misc/Rd2.tex b/inst/misc/Rd2.tex
@@ -14,7 +14,7 @@ \chapter*{}
 \raggedright{}
 \inputencoding{utf8}
 \item[Title]\AsIs{Wood River Valley Groundwater-Flow Model}
-\item[Version]\AsIs{1.1.5.9000}
+\item[Version]\AsIs{1.1.6}
 \item[Description]\AsIs{A processing program for the groundwater-flow model of the Wood
 River Valley aquifer system, south-central Idaho. Included in the package is
 MODFLOW-USG version 1.3, a U.S. Geological Survey groundwater-flow model.}
@@ -50,7 +50,7 @@ \chapter*{}
 \item[LazyData]\AsIs{true}
 \item[LazyDataCompression]\AsIs{xz}
 \item[VignetteBuilder]\AsIs{knitr}
-\item[RoxygenNote]\AsIs{6.1.0}
+\item[RoxygenNote]\AsIs{6.1.1}
 \end{description}
 \Rdcontents{\R{} topics documented:}
 \inputencoding{utf8}