From dc3ca63670f288dfba38d5d2b73bd918a2c23879 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Wed, 21 Jan 2015 06:49:02 -0600 Subject: [PATCH] switch to requireNamespace() also remove src/symbols.rds in cleanup --- ChangeLog | 3 +++ R/RcppArmadillo.package.skeleton.R | 2 +- R/unit.test.R | 4 ++-- cleanup | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6bc88d29..6dc2f049 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ * inst/include/*: Upgraded to release 4.600.4 of Armadillo + * R/unit.test.R (unit_test_setup): Use requireNamespace() + * R/RcppArmadillo.package.skeleton.R: Ditto + 2015-01-20 Dirk Eddelbuettel * DESCRIPTION: Release 0.4.600.3.0 [GitHub only] diff --git a/R/RcppArmadillo.package.skeleton.R b/R/RcppArmadillo.package.skeleton.R index 4b348eca..c2bf04a1 100644 --- a/R/RcppArmadillo.package.skeleton.R +++ b/R/RcppArmadillo.package.skeleton.R @@ -32,7 +32,7 @@ RcppArmadillo.package.skeleton <- function(name="anRpackage", list=character(), fake <- FALSE } - haveKitten <- require("pkgKitten", quietly=TRUE, character.only=TRUE) + haveKitten <- requireNamespace("pkgKitten", quietly=TRUE, character.only=TRUE) skelFunUsed <- ifelse(haveKitten, "kitten", "package.skeleton") message("\nCalling ", skelFunUsed, " to create basic package.") diff --git a/R/unit.test.R b/R/unit.test.R index 91a1442c..a6aa5f82 100644 --- a/R/unit.test.R +++ b/R/unit.test.R @@ -1,4 +1,4 @@ -# Copyright (C) 2010 - 2013 Dirk Eddelbuettel, Romain Francois and Douglas Bates +# Copyright (C) 2010 - 2015 Dirk Eddelbuettel, Romain Francois and Douglas Bates # # This file is part of RcppArmadillo. # @@ -31,7 +31,7 @@ unit_test_setup <- function(file = NULL, packages = NULL) { function(){ if (!is.null(packages)) { for (p in packages) { - suppressMessages(require(p, character.only = TRUE)) + suppressMessages(requireNamespace(p)) } } if (!is.null(file)) { diff --git a/cleanup b/cleanup index ef8ec180..eab3f01b 100755 --- a/cleanup +++ b/cleanup @@ -1,7 +1,7 @@ #!/bin/sh rm -f config.log config.status confdefs.h \ - src/*.o src/*.so \ + src/*.o src/*.so src/symbols.rds \ vignettes/RcppArmadillo-unitTests.out \ vignettes/RcppArmadillo-unitTests.aux \ vignettes/RcppArmadillo-unitTests.log \