Using barry directly (#5)

* Using barry directly

* Adding barry to suggests

* Adding the extra package

* Cleaning

* Adding barryr to pkgdown build process

Author: gvegayon

.github/workflows/pkgdown.yaml

@@ -30,7 +30,10 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::pkgdown, local::.
+          extra-packages: |
+            github::USCbiostats/barryr
+            any::pkgdown
+            local::.
           needs: website
 
       - name: Build site

.github/workflows/r.yml

@@ -51,7 +51,9 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::rcmdcheck
+          extra-packages: |
+            any::rcmdcheck
+            github::USCBiostats/barryr
           needs: check
 
       - uses: r-lib/actions/check-r-package@v2

.gitignore

@@ -2,3 +2,8 @@
 .Rhistory
 .RData
 .Ruserdata
+.vscode
+*.tar.gz
+*.Rcheck
+config.log
+config.status

DESCRIPTION

@@ -19,12 +19,14 @@ Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.3.3
-LinkingTo: Rcpp
+LinkingTo: Rcpp, barry
 Imports: 
     Rcpp,
     stats
 Depends: 
     R (>= 4.1.0),
     stats4
 Suggests: 
-    texreg, tinytest
+    texreg, tinytest, barry
+Remotes:
+    USCBiostats/barryr

Makefile

@@ -1,17 +1,29 @@
+help:
+	@echo "Makefile for defm"
+	@echo ""
+	@echo "  make docs         Generate documentation"
+	@echo "  make build        Build package tarball"
+	@echo "  make install      Install package from tarball"
+	@echo "  make check        Check package from tarball"
+	@echo "  make update       Update barry include files"
+	@echo "  make debug        Install package with debug flags"
+	@echo "  make clean        Clean up generated files"
+	@echo "  make README.md    Generate README.md from README.Rmd"
+	@echo "  make inst/NEWS    Generate inst/NEWS from NEWS.md"
+	@echo "  make docker-run   Run a docker container with R and barry installed"
+	@echo "  make docker-check All checks inside a docker container"
+
 docs: 
 	Rscript -e 'devtools::document()'
 
 build:
 	R CMD build .
 
 install: 
-	R CMD INSTALL defm_*.tar.gz
+	Rscript --vanilla -e 'devtools::install()'
 
 check: 
-	R CMD check --as-cran defm_*.tar.gz
-
-update:
-	rsync --delete -avz ../barry/include/barry inst/include 
+	Rscript --vanilla -e 'devtools::check()'
 
 debug:
 	$(MAKE) clean && \