Merge pull request #128 from jayqi/feature/r6-methods

R6 Methods in FunctionReporter
uptake · Nov 30, 2018 · a329f56 · a329f56
2 parents d1e974d + 26a283f
commit a329f56
Show file tree

Hide file tree

Showing 23 changed files with 769 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-
 # Misc files
 .Rhistory
 *.Rproj
@@ -10,6 +9,9 @@ tests/testthat/Rplots.pdf
 **/*.rda
 **/*.csv
 
+# Keep data files in testdata
+!/tests/testthat/testdata/*.csv
+
 # build artifacts
 **/*.tar.gz
 pkgnet.Rcheck/*

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -35,5 +35,5 @@ License: BSD_3_clause + file LICENSE
 URL: https://github.com/UptakeOpenSource/pkgnet
 BugReports: https://github.com/UptakeOpenSource/pkgnet/issues
 LazyData: TRUE
-RoxygenNote: 6.1.0
+RoxygenNote: 6.1.1
 VignetteBuilder: knitr
diff --git a/NAMESPACE b/NAMESPACE
@@ -11,6 +11,7 @@ import(data.table)
 importFrom(DT,datatable)
 importFrom(DT,formatRound)
 importFrom(R6,R6Class)
+importFrom(R6,is.R6Class)
 importFrom(assertthat,assert_that)
 importFrom(assertthat,is.readable)
 importFrom(assertthat,is.string)