Updated after Rcpp update that protects calls to RF_error from macro extension

.github/workflows/R-CMD-check.yaml

@@ -5,8 +5,6 @@ on:
     branches: [main, master]
   pull_request:
     branches: [main, master]
-  schedule:
-    - cron: "5 2 5 * *"
   workflow_dispatch:
 
 name: R-CMD-check

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: miniPCH
 Type: Package
 Title: Survival Distributions with Piece-Wise Constant Hazards
-Version: 0.4.0
+Version: 0.4.1
 Authors@R: c(person("Tobias", "Fellinger", email="tobias.fellinger@ages.at", role=c("aut", "cre"), comment = c(ORCID = "0000-0001-9474-2731")),
             person("Florian", "Klinglmueller", role=c("aut"), comment = c(ORCID = "0000-0002-7346-3669")))
 License: GPL (>= 3)
@@ -13,18 +13,18 @@ Description: Density, distribution function, ... hazard function, cumulative
     <doi:10.25365/thesis.76098>.
 Encoding: UTF-8
 Imports:
-    Rcpp (>= 1.0.8),
+    Rcpp (>= 1.1.1),
     checkmate
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.3
 LinkingTo: 
     Rcpp,
     RcppArmadillo
 Suggests: 
     testthat (>= 3.0.0),
     covr,
     withr,
-    vdiffr,
+    vdiffr (>= 1.0.9),
     ggplot2
 Config/testthat/edition: 3
 URL: https://simnph.github.io/miniPCH/, https://github.com/SimNPH/miniPCH

NEWS.md

@@ -1,3 +1,7 @@
+# miniPCH 0.4.1
+
+* rebuilt package after changes in upstream package Rcpp
+
 # miniPCH 0.4.0
 
 * added S3 methods summary, print, plot and autoplot for miniPCH class

src/RcppExports.cpp

@@ -120,7 +120,7 @@ RcppExport SEXP _miniPCH_hazFunCpp(SEXP TintSEXP, SEXP lambdaSEXP, SEXP vSEXP) {
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
+        (Rf_error)("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;
@@ -156,7 +156,7 @@ RcppExport SEXP _miniPCH_cumhazFunCpp(SEXP TintSEXP, SEXP lambdaSEXP, SEXP vSEXP
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
+        (Rf_error)("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;
@@ -192,7 +192,7 @@ RcppExport SEXP _miniPCH_cdfFunCpp(SEXP TintSEXP, SEXP lambdaSEXP, SEXP vSEXP) {
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
+        (Rf_error)("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;
@@ -228,7 +228,7 @@ RcppExport SEXP _miniPCH_pdfFunCpp(SEXP TintSEXP, SEXP lambdaSEXP, SEXP vSEXP) {
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
+        (Rf_error)("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;
@@ -264,7 +264,7 @@ RcppExport SEXP _miniPCH_survFunCpp(SEXP TintSEXP, SEXP lambdaSEXP, SEXP vSEXP)
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
+        (Rf_error)("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;
@@ -300,7 +300,7 @@ RcppExport SEXP _miniPCH_quantFunCpp(SEXP TintSEXP, SEXP lambdaSEXP, SEXP vSEXP)
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
+        (Rf_error)("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;

tests/testthat/test-autoplot.R

@@ -21,9 +21,7 @@ test_that("autoplot method outputs the correct images", {
   gg <- ggplot2::autoplot(my_obj)
   gg2 <- ggplot2::autoplot(my_obj2)
 
-  vdiffr::expect_doppelganger("multistate-autoplot", gg)
   expect_error(ggplot2::autoplot(my_obj, what=c("q")))
-  vdiffr::expect_doppelganger("pch-autoplot", gg2)
   expect_error(ggplot2::autoplot(my_obj2, what=c("x")))
 
   with_mocked_bindings(
@@ -33,4 +31,11 @@ test_that("autoplot method outputs the correct images", {
     requireNamespace = function(package, ..., quietly=FALSE) FALSE,
     .package="base"
   )
+
+  # skip vdiffr checks on cran and gh-actions
+  skip_on_cran()
+  skip_on_ci()
+  vdiffr::expect_doppelganger("multistate-autoplot", gg)
+  vdiffr::expect_doppelganger("pch-autoplot", gg2)
+
 })

tests/testthat/test-plotting.R

@@ -26,8 +26,12 @@ test_that("plot method outputs the correct images", {
     plot(my_obj2)
   }
 
-  vdiffr::expect_doppelganger("multistate-plot", example_plot)
   expect_error(plot(my_obj, what=c("q")))
-  vdiffr::expect_doppelganger("pch-plot", example_plot2)
   expect_error(plot(my_obj2, what=c("x")))
+
+  # skip vdiffr checks on cran and gh-actions
+  skip_on_cran()
+  skip_on_ci()
+  vdiffr::expect_doppelganger("multistate-plot", example_plot)
+  vdiffr::expect_doppelganger("pch-plot", example_plot2)
 })