Merge branch 'dev' into master

DESCRIPTION

@@ -1,8 +1,9 @@
 Package: isorunN2O
 Type: Package
 Title: Process IRMS runs of N2O analyses.
-Version: 0.2.5
-Authors@R: person("Sebastian", "Kopf", email = "sebastian.kopf@colorado.edu", role = c("aut", "cre"))
+Version: 0.3.0.9000
+Authors@R: person("Sebastian", "Kopf", email = "sebastian.kopf@colorado.edu",
+    role = c("aut", "cre"))
 Description: This package facilitates the reading, processing and visualization
     of N2O isotope data including drift correction, 17O correction and standards
     calibration.
@@ -11,17 +12,16 @@ Roxygen: list(wrap = FALSE)
 URL: https://github.com/sebkopf/isorunN2O
 BugReports: https://github.com/sebkopf/isorunN2O/issues
 Depends:
-    dplyr,
-    plotly (>= 3.3.1),
-    ggplot2 (>= 2.1.0)
+    R (>= 3.1)
 Imports:
     methods,
     stats,
+    dplyr,
+    plotly (>= 4.7.1),
+    ggplot2 (>= 2.2.1),
     R.utils,
-    plyr,
     lazyeval,
     tidyr,
-    isoread,
     cowplot,
     gtools
 Suggests:
@@ -36,6 +36,7 @@ Suggests:
     grid,
     gridExtra,
     scales
+Encoding: UTF-8
+LazyData: true
 VignetteBuilder: knitr
 RoxygenNote: 6.0.1
-

Makefile

@@ -11,5 +11,22 @@ document:
 	Rscript -e "devtools::document(roclets=c('rd', 'collate', 'namespace'))"
 	Rscript -e "pkgdown::build_site()"
 
+build:
+	cd ..;\
+	R CMD build --no-manual $(PKGSRC)
+
+install: build
+	cd ..;\
+	R CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz
+
+check: build
+	cd ..;\
+	R CMD check $(PKGNAME)_$(PKGVERS).tar.gz --as-cran
+
+local-install:
+	rm -rf .local
+	mkdir .local
+	R CMD Install --library=.local .
+
 auto_test:
 	R -q -e "rm(list = ls()); testthat::auto_test_package()"

NAMESPACE

@@ -23,9 +23,14 @@ export(select_columns)
 export(set_background)
 export(set_oxidation_blank)
 export(set_run_size)
-import(dplyr)
 import(ggplot2)
 import(lazyeval)
+importFrom(dplyr,"%>%")
+importFrom(dplyr,arrange)
+importFrom(dplyr,filter)
+importFrom(dplyr,mutate)
+importFrom(dplyr,rename)
+importFrom(dplyr,select)
 importFrom(methods,is)
 importFrom(stats,setNames)
 importFrom(tidyr,extract)

R/package.R

@@ -1,7 +1,7 @@
 #' @keywords internal
 "_PACKAGE"
 
-#' @import dplyr
+#' @importFrom dplyr select rename arrange mutate filter %>%
 #' @importFrom tidyr gather gather_ extract extract_ spread spread_
 #' @import lazyeval
 #' @import ggplot2