version 0.2.1

cran · Feb 7, 2024 · 28e27da · 28e27da
1 parent 084a6a9
commit 28e27da
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 18 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -11,7 +11,7 @@ Description: Similar to 'rstantools' for 'rstan',
   migrate from 'rstan' to the more modern 'cmdstanr'.
   Packages 'rstantools', 'cmdstanr', 'stannis', and
   'stanapi' are similar Stan clients with different objectives.
-Version: 0.2.0
+Version: 0.2.1
 License: MIT + file LICENSE
 URL: https://wlandau.github.io/instantiate/,
         https://github.com/wlandau/instantiate
@@ -29,18 +29,18 @@ Authors@R: c(
     role = c("cph", "fnd")
   ))
 Depends: R (>= 4.0.0)
-Imports: fs, rlang, utils
+Imports: callr, fs, rlang, utils
 Suggests: knitr (>= 1.30), markdown (>= 1.1), rmarkdown (>= 2.4),
         testthat (>= 3.0.0), withr
 Encoding: UTF-8
 Language: en-US
 Config/testthat/edition: 3
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 NeedsCompilation: yes
-Packaged: 2024-01-09 15:40:24 UTC; C240390
+Packaged: 2024-02-06 20:53:49 UTC; C240390
 Author: William Michael Landau [aut, cre]
     (<https://orcid.org/0000-0003-1878-3253>),
   Eli Lilly and Company [cph, fnd]
 Maintainer: William Michael Landau <will.landau.oss@gmail.com>
 Repository: CRAN
-Date/Publication: 2024-01-09 22:33:21 UTC
+Date/Publication: 2024-02-06 21:10:02 UTC
diff --git a/MD5 b/MD5
@@ -1,14 +1,14 @@
-6b436f30d1503fe3f4bf5a01cc0a7acc *DESCRIPTION
+a8b2ee1b71d55e3baf740798962ddf5d *DESCRIPTION
 251996587bac8db01533ad7011f0c4f5 *LICENSE
-500edf9a014381847bf9312201ba9bbb *NAMESPACE
-6ac387c4e85d9cc5f9088f1d61d69660 *NEWS.md
+bd9fd53ea4db1db82dc9608914ecf63e *NAMESPACE
+4db49db829c3c75c3d5243e94fa6e7ce *NEWS.md
 2bef7698ac8415315bc135a49e578fd7 *R/stan_cmdstan_exists.R
 fbbc28ba2a7f1db7e2cbfdd60ded45ea *R/stan_cmdstan_path.R
 41567ca03c5d51725a8df8671a85df29 *R/stan_cmdstan_version.R
-f1089690180d58f2274a2c019b7eefde *R/stan_package.R
+e1d9578869b1865488b143d5c3aa0bc2 *R/stan_package.R
 5e5c02177f5a1f2dbddda85f123e2bd5 *R/stan_package_clean.R
 fea8c1c0b7a797b3cefb80464f6c3eed *R/stan_package_compile.R
-5fb7e19eb46ea6eccad90776e9062d35 *R/stan_package_configure.R
+f871241ef51cd7a6c263abe471017fdc *R/stan_package_configure.R
 5910f1ddb7d6b74b26f5d053fd49b7ab *R/stan_package_create.R
 5a18040af8f27b9d1863d4b06ec872a0 *R/stan_package_model.R
 2d07bee7c202862603b17c252f572b9e *R/stan_package_model_files.R
@@ -23,7 +23,7 @@ c9e3f54962da09c419801231e6d93af6 *configure
 2f9b7e68130c000bb936834add088476 *inst/WORDLIST
 4f52065b21254d58b115bd70fdacee30 *inst/configuration/cleanup
 e2e64968e7947d94a4ab5c5effe6e918 *inst/configuration/cleanup.win
-9919e70bfb6fb150ab345f949e40fcaa *inst/configuration/install.libs.R
+1fb99680b570e9089a8d95a3376bd434 *inst/configuration/install.libs.R
 ad95a0ead03f3750c14185d1208ea057 *inst/example/DESCRIPTION
 637acb3d8af3a4f654eaccfdeb0bbba1 *inst/example/NAMESPACE
 b30634283cd20ed38b6245815bb00dd1 *inst/example/NOTICE
@@ -35,7 +35,7 @@ efcd2d3a39a16be5c2796bac59ed06ba *inst/example/man/example-package.Rd
 93cd10609b8ddf6d25b150b746970730 *inst/example/man/run_bernoulli_model.Rd
 f13db28d34167ce65e17c6c733508fe4 *inst/example/rbuildignore
 582f942393b9f2ed2560e1a24541fa7b *inst/example/src/stan/bernoulli.stan
-867227809d4b31babcb17c9c70bf7e14 *man/instantiate-package.Rd
+ec6ad4967c8b67750a5a10621c3b0fcb *man/instantiate-package.Rd
 64ebab7d5f327033219e9ade16493fff *man/stan_cmdstan_exists.Rd
 b5fbdd1a1c893ac907b542dc9b7735b6 *man/stan_cmdstan_path.Rd
 d17ec289db35821bdbf72eae7c692df4 *man/stan_cmdstan_version.Rd

diff --git a/NAMESPACE b/NAMESPACE
@@ -9,6 +9,7 @@ export(stan_package_configure)
 export(stan_package_create)
 export(stan_package_model)
 export(stan_package_model_files)
+importFrom(callr,r)
 importFrom(fs,dir_copy)
 importFrom(rlang,abort)
 importFrom(rlang,check_installed)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# instantiate 0.2.1
+
+* Address CRAN warnings in generated packages about non-portable compilation flags (#19, @xinxinc476).
+
 # instantiate 0.2.0
 
 * Remove "internal" installation (#16).

diff --git a/R/stan_package.R b/R/stan_package.R
@@ -1,5 +1,4 @@
 #' instantiate: pre-compiled CmdStan models in R packages
-#' @docType package
 #' @name instantiate-package
 #' @family help
 #' @description Similar to [`rstantools`](https://mc-stan.org/rstantools/)
@@ -16,6 +15,7 @@
 #'   migrate from [`rstan`](https://mc-stan.org/rstan/)
 #'   to the more modern [`CmdStanR`](https://mc-stan.org/cmdstanr/).
 #' @useDynLib instantiate, .registration = TRUE
+#' @importFrom callr r
 #' @importFrom fs dir_copy
 #' @importFrom rlang abort check_installed inform is_installed warn
 #' @importFrom utils capture.output globalVariables install.packages

diff --git a/R/stan_package_configure.R b/R/stan_package_configure.R
@@ -70,10 +70,10 @@ stan_package_configure <- function(path = getwd(), overwrite = FALSE) {
     copy.mode = TRUE
   )
   if (!file.exists(out_makevars)) {
-    file.create(out_makevars)
+    writeLines("", out_makevars)
   }
   if (!file.exists(out_makevars_win)) {
-    file.create(out_makevars_win)
+    writeLines("", out_makevars_win)
   }
   invisible()
 }
diff --git a/inst/configuration/install.libs.R b/inst/configuration/install.libs.R
@@ -24,6 +24,11 @@ if (!file.exists(bin)) {
 }
 bin_stan <- file.path(bin, "stan")
 fs::dir_copy(path = "stan", new_path = bin_stan)
-instantiate::stan_package_compile(
-  models = instantiate::stan_package_model_files(path = bin_stan)
+callr::r(
+  func = function(bin_stan) {
+    instantiate::stan_package_compile(
+      models = instantiate::stan_package_model_files(path = bin_stan)
+    )
+  },
+  args = list(bin_stan = bin_stan)
 )
diff --git a/man/instantiate-package.Rd b/man/instantiate-package.Rd