From ed2e83e845aff23dd1b71ab819991ec86a8dc771 Mon Sep 17 00:00:00 2001 From: Fellinger Tobias Date: Fri, 6 Mar 2026 09:05:36 +0100 Subject: [PATCH 1/3] Updated after Rcpp update that protects calls to RF_error from macro extension --- .github/workflows/R-CMD-check.yaml | 2 -- DESCRIPTION | 4 ++-- NEWS.md | 4 ++++ src/RcppExports.cpp | 12 ++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 756a0dc..46a339c 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.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 diff --git a/DESCRIPTION b/DESCRIPTION index fd823f2..4278693 100644 --- a/DESCRIPTION +++ b/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,7 +13,7 @@ Description: Density, distribution function, ... hazard function, cumulative . Encoding: UTF-8 Imports: - Rcpp (>= 1.0.8), + Rcpp (>= 1.1.1), checkmate Roxygen: list(markdown = TRUE) RoxygenNote: 7.3.1 diff --git a/NEWS.md b/NEWS.md index 1e83764..ec91613 100644 --- a/NEWS.md +++ b/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 diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp index 842b49e..46f1b8c 100644 --- a/src/RcppExports.cpp +++ b/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; From b83e3fc43046417ef1bc7fcd1fd2096c244d885f Mon Sep 17 00:00:00 2001 From: Fellinger Tobias Date: Fri, 6 Mar 2026 09:47:24 +0100 Subject: [PATCH 2/3] Updated versions of build time deps --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 4278693..bdb05c8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -16,7 +16,7 @@ Imports: Rcpp (>= 1.1.1), checkmate Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.3 LinkingTo: Rcpp, RcppArmadillo @@ -24,7 +24,7 @@ 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 From 2231df825d65444206fc5101816da6978b8c7b88 Mon Sep 17 00:00:00 2001 From: Fellinger Tobias Date: Fri, 6 Mar 2026 10:06:06 +0100 Subject: [PATCH 3/3] skip vdiffr checks on cran an ci --- tests/testthat/test-autoplot.R | 9 +++++++-- tests/testthat/test-plotting.R | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/testthat/test-autoplot.R b/tests/testthat/test-autoplot.R index 3e5768e..d1ece97 100644 --- a/tests/testthat/test-autoplot.R +++ b/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) + }) diff --git a/tests/testthat/test-plotting.R b/tests/testthat/test-plotting.R index 70373aa..66523a8 100644 --- a/tests/testthat/test-plotting.R +++ b/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) })