From 18d47e1aad5e9b60537440d094d8abc12d76a171 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 30 Aug 2025 13:06:26 +0200 Subject: [PATCH 1/3] Prepare CRAN release --- DESCRIPTION | 12 ++++++------ NEWS.md | 2 +- R/format.R | 2 +- R/get_marginalcontrasts.R | 2 +- R/get_marginaleffects_type.R | 2 +- R/get_marginalmeans.R | 2 +- R/get_marginaltrends.R | 2 +- R/p_adjust.R | 2 +- tests/testthat/test-attributes_estimatefun.R | 2 +- tests/testthat/test-backtransform_invlink.R | 2 +- tests/testthat/test-betareg.R | 2 +- tests/testthat/test-bias_correction.R | 2 +- tests/testthat/test-brms-marginaleffects.R | 2 +- tests/testthat/test-brms.R | 2 +- tests/testthat/test-estimate_contrasts-average.R | 2 +- tests/testthat/test-estimate_contrasts.R | 2 +- .../testthat/test-estimate_contrasts_bookexamples.R | 2 +- tests/testthat/test-estimate_contrasts_effectsize.R | 2 +- tests/testthat/test-estimate_contrasts_inequality.R | 2 +- tests/testthat/test-estimate_expectation.R | 4 ++-- tests/testthat/test-estimate_filter.R | 2 +- tests/testthat/test-estimate_means-average.R | 2 +- tests/testthat/test-estimate_means.R | 4 ++-- tests/testthat/test-estimate_means_ci.R | 2 +- tests/testthat/test-estimate_means_counterfactuals.R | 2 +- tests/testthat/test-estimate_means_dotargs.R | 2 +- tests/testthat/test-estimate_means_marginalization.R | 2 +- tests/testthat/test-estimate_means_mixed.R | 2 +- tests/testthat/test-estimate_predicted.R | 2 +- tests/testthat/test-estimate_slopes.R | 2 +- tests/testthat/test-g_computation.R | 2 +- tests/testthat/test-get_marginaltrends.R | 2 +- tests/testthat/test-glmmTMB.R | 2 +- tests/testthat/test-joint_test.R | 2 +- tests/testthat/test-keep_iterations.R | 2 +- tests/testthat/test-mgcv.R | 2 +- tests/testthat/test-mice.R | 2 +- tests/testthat/test-multivariate_response.R | 2 +- tests/testthat/test-offset.R | 2 +- tests/testthat/test-ordinal.R | 2 +- tests/testthat/test-plot-facet.R | 2 +- tests/testthat/test-plot-flexible_numeric.R | 2 +- tests/testthat/test-plot-ordinal.R | 2 +- tests/testthat/test-plot-slopes.R | 2 +- tests/testthat/test-plot.R | 2 +- tests/testthat/test-predict-dpar.R | 2 +- tests/testthat/test-print.R | 2 +- tests/testthat/test-residualize_over_grid.R | 2 +- tests/testthat/test-scoping_issues.R | 2 +- tests/testthat/test-standardize.R | 2 +- tests/testthat/test-summary_estimate_slopes.R | 2 +- tests/testthat/test-table_footer.R | 2 +- tests/testthat/test-transform_response.R | 2 +- tests/testthat/test-vcov.R | 2 +- tests/testthat/test-verbose.R | 2 +- tests/testthat/test-visualisation_recipe.R | 2 +- tests/testthat/test-zeroinfl.R | 2 +- 57 files changed, 64 insertions(+), 64 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 83bc16937..b098bcd7d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: modelbased Title: Estimation of Model-Based Predictions, Contrasts and Means -Version: 0.12.0.22 +Version: 0.13.0 Authors@R: c(person(given = "Dominique", family = "Makowski", @@ -39,10 +39,10 @@ BugReports: https://github.com/easystats/modelbased/issues Depends: R (>= 3.6) Imports: - bayestestR (>= 0.16.1), + bayestestR (>= 0.17.0), datawizard (>= 1.2.0), - insight (>= 1.3.1), - parameters (>= 0.27.0), + insight (>= 1.4.1), + parameters (>= 0.28.1), graphics, stats, tools, @@ -76,7 +76,7 @@ Suggests: logspline, MASS, Matrix, - marginaleffects (>= 0.26.0), + marginaleffects (>= 0.29.0), mice, mgcv, mvtnorm, @@ -115,4 +115,4 @@ Roxygen: list(markdown = TRUE) Config/Needs/check: stan-dev/cmdstanr Config/Needs/website: easystats/easystatstemplate LazyData: true -Remotes: easystats/insight, easystats/parameters, easystats/bayestestR, vincentarelbundock/marginaleffects +Remotes: easystats/parameters#1164 diff --git a/NEWS.md b/NEWS.md index ac8422dd1..99a880326 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# modelbased (devel) +# modelbased 0.13.0 ## Changes diff --git a/R/format.R b/R/format.R index 05ef35e99..7ce95e9c4 100644 --- a/R/format.R +++ b/R/format.R @@ -684,7 +684,7 @@ format.marginaleffects_contrasts <- function(x, model = NULL, p_adjust = NULL, c params <- data.frame(datawizard::data_restoretype(params, model_data)) # add posterior draws? - insight::check_if_installed("marginaleffects", minimum_version = "0.28.0.22") + insight::check_if_installed("marginaleffects", minimum_version = "0.29.0") posterior_draws <- suppressWarnings(as.data.frame(marginaleffects::get_draws( x, shape = "PxD" diff --git a/R/get_marginalcontrasts.R b/R/get_marginalcontrasts.R index b07d51309..6af7598e6 100644 --- a/R/get_marginalcontrasts.R +++ b/R/get_marginalcontrasts.R @@ -15,7 +15,7 @@ get_marginalcontrasts <- function( ... ) { # check if available - insight::check_if_installed("marginaleffects", minimum_version = "0.25.0") + insight::check_if_installed("marginaleffects", minimum_version = "0.29.0") # temporarily overwrite settings that error on "too many" rows me_option <- getOption("marginaleffects_safe") diff --git a/R/get_marginaleffects_type.R b/R/get_marginaleffects_type.R index d5d3fe5c1..939aacedf 100644 --- a/R/get_marginaleffects_type.R +++ b/R/get_marginaleffects_type.R @@ -122,7 +122,7 @@ # check if marginaleffects objects has posterior draws and thus is Bayesian .is_bayesian_marginaleffects <- function(model) { - insight::check_if_installed("marginaleffects", minimum_version = "0.28.0.22") + insight::check_if_installed("marginaleffects", minimum_version = "0.29.0") !is.null(suppressWarnings(marginaleffects::get_draws(model, "PxD"))) } diff --git a/R/get_marginalmeans.R b/R/get_marginalmeans.R index 637c7d7db..cb409f35e 100644 --- a/R/get_marginalmeans.R +++ b/R/get_marginalmeans.R @@ -31,7 +31,7 @@ get_marginalmeans <- function(model, verbose = TRUE, ...) { # check if available - insight::check_if_installed("marginaleffects") + insight::check_if_installed("marginaleffects", minimum_version = "0.29.0") # First step: process arguments -------------------------------------------- # -------------------------------------------------------------------------- diff --git a/R/get_marginaltrends.R b/R/get_marginaltrends.R index 5371c2532..29b75d1ca 100644 --- a/R/get_marginaltrends.R +++ b/R/get_marginaltrends.R @@ -19,7 +19,7 @@ get_marginaltrends <- function(model, verbose = TRUE, ...) { # check if available - insight::check_if_installed("marginaleffects") + insight::check_if_installed("marginaleffects", minimum_version = "0.29.0") dots <- list(...) # set defaults diff --git a/R/p_adjust.R b/R/p_adjust.R index e96aa074f..415c29e69 100644 --- a/R/p_adjust.R +++ b/R/p_adjust.R @@ -158,7 +158,7 @@ int <- paste0(pred, ":", mod) if (inherits(x, c("marginaleffects_slopes", "slopes", "marginaleffects"))) { - insight::check_if_installed("marginaleffects", minimum_version = "0.28.0.22") + insight::check_if_installed("marginaleffects", minimum_version = "0.29.0") model <- marginaleffects::components(x, "model") } else { model <- attributes(x)$model diff --git a/tests/testthat/test-attributes_estimatefun.R b/tests/testthat/test-attributes_estimatefun.R index 764afcdb8..8f9f78883 100644 --- a/tests/testthat/test-attributes_estimatefun.R +++ b/tests/testthat/test-attributes_estimatefun.R @@ -1,5 +1,5 @@ skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("attributes_means", { data(iris) diff --git a/tests/testthat/test-backtransform_invlink.R b/tests/testthat/test-backtransform_invlink.R index bef5e22aa..6c730c05b 100644 --- a/tests/testthat/test-backtransform_invlink.R +++ b/tests/testthat/test-backtransform_invlink.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("glmmTMB") test_that("estimate_means correct inverse link for glmmTMB", { diff --git a/tests/testthat/test-betareg.R b/tests/testthat/test-betareg.R index ca78e7bac..2eb01a761 100644 --- a/tests/testthat/test-betareg.R +++ b/tests/testthat/test-betareg.R @@ -1,7 +1,7 @@ skip_on_cran() skip_if_not_installed("curl") skip_if_offline() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("betareg") test_that("estimate_means for betareg", { diff --git a/tests/testthat/test-bias_correction.R b/tests/testthat/test-bias_correction.R index 08f6137b6..92a5adbf0 100644 --- a/tests/testthat/test-bias_correction.R +++ b/tests/testthat/test-bias_correction.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("emmeans") skip_if_not_installed("lme4") diff --git a/tests/testthat/test-brms-marginaleffects.R b/tests/testthat/test-brms-marginaleffects.R index db4634bca..4d11d2558 100644 --- a/tests/testthat/test-brms-marginaleffects.R +++ b/tests/testthat/test-brms-marginaleffects.R @@ -4,7 +4,7 @@ skip_if_offline() skip_if_not_installed("brms") skip_if_not_installed("BH") skip_if_not_installed("RcppEigen") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("httr2") skip_if_not_installed("withr") diff --git a/tests/testthat/test-brms.R b/tests/testthat/test-brms.R index 6037dc606..06c75f30a 100644 --- a/tests/testthat/test-brms.R +++ b/tests/testthat/test-brms.R @@ -4,7 +4,7 @@ skip_if_not_installed("brms") skip_if_not_installed("BH") skip_if_not_installed("RcppEigen") skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("estimate_means - brms", { model <- brms::brm(Sepal.Length ~ Species * Sepal.Width, data = iris, refresh = 0, iter = 1000) diff --git a/tests/testthat/test-estimate_contrasts-average.R b/tests/testthat/test-estimate_contrasts-average.R index d9a7ec19f..e8ca97841 100644 --- a/tests/testthat/test-estimate_contrasts-average.R +++ b/tests/testthat/test-estimate_contrasts-average.R @@ -1,6 +1,6 @@ skip_on_cran() skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_os("mac") diff --git a/tests/testthat/test-estimate_contrasts.R b/tests/testthat/test-estimate_contrasts.R index 55a543670..2358bef75 100644 --- a/tests/testthat/test-estimate_contrasts.R +++ b/tests/testthat/test-estimate_contrasts.R @@ -1,6 +1,6 @@ skip_on_cran() skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_os("mac") test_that("estimate_contrasts - Frequentist, one factor", { diff --git a/tests/testthat/test-estimate_contrasts_bookexamples.R b/tests/testthat/test-estimate_contrasts_bookexamples.R index 22dcacbe5..b3b009889 100644 --- a/tests/testthat/test-estimate_contrasts_bookexamples.R +++ b/tests/testthat/test-estimate_contrasts_bookexamples.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_os("mac") test_that("estimate_contrasts - book examples 1", { diff --git a/tests/testthat/test-estimate_contrasts_effectsize.R b/tests/testthat/test-estimate_contrasts_effectsize.R index c3975ee93..52346c495 100644 --- a/tests/testthat/test-estimate_contrasts_effectsize.R +++ b/tests/testthat/test-estimate_contrasts_effectsize.R @@ -1,6 +1,6 @@ skip_on_cran() skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("bootES") skip_if_not_installed("lme4") skip_on_os("mac") diff --git a/tests/testthat/test-estimate_contrasts_inequality.R b/tests/testthat/test-estimate_contrasts_inequality.R index 06c619f27..e5ec7c033 100644 --- a/tests/testthat/test-estimate_contrasts_inequality.R +++ b/tests/testthat/test-estimate_contrasts_inequality.R @@ -1,6 +1,6 @@ skip_on_cran() skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_os("mac") skip_if(getRversion() < "4.5.0") skip_if_not_installed("datawizard") diff --git a/tests/testthat/test-estimate_expectation.R b/tests/testthat/test-estimate_expectation.R index 245180439..a53abb3cd 100644 --- a/tests/testthat/test-estimate_expectation.R +++ b/tests/testthat/test-estimate_expectation.R @@ -1,4 +1,4 @@ -skip_if_not_installed("insight", minimum_version = "1.1.0") +skip_if_not_installed("insight", minimum_version = "1.4.1") test_that("estimate_expectation", { skip_if_not_installed("lme4") @@ -77,7 +77,7 @@ test_that("estimate_expectation - error", { test_that("estimate_relation and estimate specific", { - skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") + skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") data(efc, package = "modelbased") efc <- datawizard::to_factor(efc, c("c161sex", "c172code", "e16sex", "e42dep")) fit <- lm(neg_c_7 ~ c12hour + barthtot + c161sex + e42dep + c172code, data = efc) diff --git a/tests/testthat/test-estimate_filter.R b/tests/testthat/test-estimate_filter.R index 39d3a1a8d..624dba302 100644 --- a/tests/testthat/test-estimate_filter.R +++ b/tests/testthat/test-estimate_filter.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_os("mac") test_that("filtering for by and contrast works for different estimate options", { diff --git a/tests/testthat/test-estimate_means-average.R b/tests/testthat/test-estimate_means-average.R index 68538779d..5ce345930 100644 --- a/tests/testthat/test-estimate_means-average.R +++ b/tests/testthat/test-estimate_means-average.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_os("mac") diff --git a/tests/testthat/test-estimate_means.R b/tests/testthat/test-estimate_means.R index d83720a7c..b634f6bc2 100644 --- a/tests/testthat/test-estimate_means.R +++ b/tests/testthat/test-estimate_means.R @@ -1,6 +1,6 @@ skip_on_cran() skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("estimate_means() - lm", { data(mtcars) @@ -327,7 +327,7 @@ test_that("estimate_means() - glm", { test_that("get_marginaleffects, overall mean", { - skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") + skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("emmeans") model <- lm(Sepal.Width ~ Species * Petal.Length, data = iris) diff --git a/tests/testthat/test-estimate_means_ci.R b/tests/testthat/test-estimate_means_ci.R index 3f1d38d55..4e613179c 100644 --- a/tests/testthat/test-estimate_means_ci.R +++ b/tests/testthat/test-estimate_means_ci.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("estimate_means() - ci frequentist", { data(iris) diff --git a/tests/testthat/test-estimate_means_counterfactuals.R b/tests/testthat/test-estimate_means_counterfactuals.R index 839696f09..b5584e464 100644 --- a/tests/testthat/test-estimate_means_counterfactuals.R +++ b/tests/testthat/test-estimate_means_counterfactuals.R @@ -1,6 +1,6 @@ skip_on_cran() skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("glmmTMB") skip_if_not_installed("lme4") diff --git a/tests/testthat/test-estimate_means_dotargs.R b/tests/testthat/test-estimate_means_dotargs.R index e2c35c6bb..184321571 100644 --- a/tests/testthat/test-estimate_means_dotargs.R +++ b/tests/testthat/test-estimate_means_dotargs.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("estimate_means() - estimate = average", { data(mtcars) diff --git a/tests/testthat/test-estimate_means_marginalization.R b/tests/testthat/test-estimate_means_marginalization.R index 661b4bd9f..6b2691113 100644 --- a/tests/testthat/test-estimate_means_marginalization.R +++ b/tests/testthat/test-estimate_means_marginalization.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("estimate_means() - estimate options", { data(efc, package = "modelbased") diff --git a/tests/testthat/test-estimate_means_mixed.R b/tests/testthat/test-estimate_means_mixed.R index b300ec602..2c7f44c79 100644 --- a/tests/testthat/test-estimate_means_mixed.R +++ b/tests/testthat/test-estimate_means_mixed.R @@ -1,6 +1,6 @@ skip_on_cran() skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("estimate_means() - mixed models", { skip_if_not_installed("lme4") diff --git a/tests/testthat/test-estimate_predicted.R b/tests/testthat/test-estimate_predicted.R index 2c67301be..d01d802ef 100644 --- a/tests/testthat/test-estimate_predicted.R +++ b/tests/testthat/test-estimate_predicted.R @@ -1,4 +1,4 @@ -skip_if_not_installed("insight", minimum_version = "1.1.0") +skip_if_not_installed("insight", minimum_version = "1.4.1") test_that("estimate_relation - shape", { skip_if_not_installed("gamm4") diff --git a/tests/testthat/test-estimate_slopes.R b/tests/testthat/test-estimate_slopes.R index cffc3232f..08f5eace5 100644 --- a/tests/testthat/test-estimate_slopes.R +++ b/tests/testthat/test-estimate_slopes.R @@ -1,5 +1,5 @@ skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("estimate_slopes", { data(iris) diff --git a/tests/testthat/test-g_computation.R b/tests/testthat/test-g_computation.R index cf8372b3e..80743cbfd 100644 --- a/tests/testthat/test-g_computation.R +++ b/tests/testthat/test-g_computation.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("nanoparquet") skip_on_os("mac") diff --git a/tests/testthat/test-get_marginaltrends.R b/tests/testthat/test-get_marginaltrends.R index 20f6de83b..172fe2894 100644 --- a/tests/testthat/test-get_marginaltrends.R +++ b/tests/testthat/test-get_marginaltrends.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("emmeans") test_that("get_marginaltrends", { diff --git a/tests/testthat/test-glmmTMB.R b/tests/testthat/test-glmmTMB.R index 4f32f681d..0882114ca 100644 --- a/tests/testthat/test-glmmTMB.R +++ b/tests/testthat/test-glmmTMB.R @@ -1,7 +1,7 @@ skip_on_cran() skip_if_not_installed("glmmTMB") skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") data <- glmmTMB::Salamanders model <- suppressWarnings(glmmTMB::glmmTMB( diff --git a/tests/testthat/test-joint_test.R b/tests/testthat/test-joint_test.R index 7f6f7c1de..becd52168 100644 --- a/tests/testthat/test-joint_test.R +++ b/tests/testthat/test-joint_test.R @@ -1,6 +1,6 @@ skip_on_cran() skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_os("mac") test_that("estimate_contrasts - joint test, 2-way", { diff --git a/tests/testthat/test-keep_iterations.R b/tests/testthat/test-keep_iterations.R index 89d972cdb..5c56843cd 100644 --- a/tests/testthat/test-keep_iterations.R +++ b/tests/testthat/test-keep_iterations.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("emmeans") skip_if_not_installed("brms") skip_if_not_installed("curl") diff --git a/tests/testthat/test-mgcv.R b/tests/testthat/test-mgcv.R index c86df0b70..b6902c118 100644 --- a/tests/testthat/test-mgcv.R +++ b/tests/testthat/test-mgcv.R @@ -1,5 +1,5 @@ skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("mgcv") skip_if_not_installed("gamm4") diff --git a/tests/testthat/test-mice.R b/tests/testthat/test-mice.R index c228810cd..67d6fe92d 100644 --- a/tests/testthat/test-mice.R +++ b/tests/testthat/test-mice.R @@ -1,6 +1,6 @@ skip_on_cran() skip_if_not_installed("mice") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("pool_predictions", { set.seed(123) diff --git a/tests/testthat/test-multivariate_response.R b/tests/testthat/test-multivariate_response.R index 09ba7a1c4..c35c57616 100644 --- a/tests/testthat/test-multivariate_response.R +++ b/tests/testthat/test-multivariate_response.R @@ -1,4 +1,4 @@ -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("lme4") test_that("multivariate response", { diff --git a/tests/testthat/test-offset.R b/tests/testthat/test-offset.R index 479f5af7c..c855d311d 100644 --- a/tests/testthat/test-offset.R +++ b/tests/testthat/test-offset.R @@ -1,4 +1,4 @@ -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("MASS") test_that("verbose", { diff --git a/tests/testthat/test-ordinal.R b/tests/testthat/test-ordinal.R index 133861a72..c95bef83f 100644 --- a/tests/testthat/test-ordinal.R +++ b/tests/testthat/test-ordinal.R @@ -4,7 +4,7 @@ skip_if_offline() skip_if_not_installed("brms") skip_if_not_installed("BH") skip_if_not_installed("RcppEigen") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("httr2") skip_if_not_installed("MASS") diff --git a/tests/testthat/test-plot-facet.R b/tests/testthat/test-plot-facet.R index ec18a35a9..4f22891ce 100644 --- a/tests/testthat/test-plot-facet.R +++ b/tests/testthat/test-plot-facet.R @@ -3,7 +3,7 @@ skip_if_not_installed("ggplot2") skip_if_not_installed("see") skip_if_not_installed("vdiffr") skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_cran() test_that("plots facets", { diff --git a/tests/testthat/test-plot-flexible_numeric.R b/tests/testthat/test-plot-flexible_numeric.R index 249b00849..9ae349f99 100644 --- a/tests/testthat/test-plot-flexible_numeric.R +++ b/tests/testthat/test-plot-flexible_numeric.R @@ -2,7 +2,7 @@ skip_on_os(c("mac", "solaris", "linux")) skip_if_not_installed("ggplot2") skip_if_not_installed("see") skip_if_not_installed("vdiffr") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_cran() test_that("plot 2nd by is numeric", { diff --git a/tests/testthat/test-plot-ordinal.R b/tests/testthat/test-plot-ordinal.R index 28fb9a0b8..45706078b 100644 --- a/tests/testthat/test-plot-ordinal.R +++ b/tests/testthat/test-plot-ordinal.R @@ -2,7 +2,7 @@ skip_on_os(c("mac", "solaris", "linux")) skip_if_not_installed("ggplot2") skip_if_not_installed("see") skip_if_not_installed("vdiffr") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("MASS") skip_if_not_installed("ordinal") skip_on_cran() diff --git a/tests/testthat/test-plot-slopes.R b/tests/testthat/test-plot-slopes.R index 3110f6c48..bc49d7b18 100644 --- a/tests/testthat/test-plot-slopes.R +++ b/tests/testthat/test-plot-slopes.R @@ -2,7 +2,7 @@ skip_on_os(c("mac", "solaris", "linux")) skip_if_not_installed("ggplot2") skip_if_not_installed("see") skip_if_not_installed("vdiffr") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_cran() test_that("plot slopes, correct y axis labels", { diff --git a/tests/testthat/test-plot.R b/tests/testthat/test-plot.R index f52d80997..7ddc1478b 100644 --- a/tests/testthat/test-plot.R +++ b/tests/testthat/test-plot.R @@ -3,7 +3,7 @@ skip_if_not_installed("ggplot2") skip_if_not_installed("see") skip_if_not_installed("vdiffr") skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_cran() test_that("plots emmeans", { diff --git a/tests/testthat/test-predict-dpar.R b/tests/testthat/test-predict-dpar.R index 5e4879f3b..345f6db1b 100644 --- a/tests/testthat/test-predict-dpar.R +++ b/tests/testthat/test-predict-dpar.R @@ -2,7 +2,7 @@ skip_on_cran() test_that("estimate_means and estimate_relation - dpar", { skip_if_not_installed("brms") - skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") + skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("datawizard") skip_if_not_installed("httr2") skip_if_not_installed("collapse") diff --git a/tests/testthat/test-print.R b/tests/testthat/test-print.R index fb8e8d355..3e7a7fed3 100644 --- a/tests/testthat/test-print.R +++ b/tests/testthat/test-print.R @@ -1,6 +1,6 @@ skip_on_os(c("mac", "linux")) skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("withr") test_that("estimate_slopes - print summary", { diff --git a/tests/testthat/test-residualize_over_grid.R b/tests/testthat/test-residualize_over_grid.R index 6a80c6e96..3c2ba9fd9 100644 --- a/tests/testthat/test-residualize_over_grid.R +++ b/tests/testthat/test-residualize_over_grid.R @@ -2,7 +2,7 @@ skip_on_os(c("mac", "solaris", "linux")) skip_if_not_installed("ggplot2") skip_if_not_installed("see") skip_if_not_installed("vdiffr") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_on_cran() diff --git a/tests/testthat/test-scoping_issues.R b/tests/testthat/test-scoping_issues.R index 1ce860bcc..87b83a5e1 100644 --- a/tests/testthat/test-scoping_issues.R +++ b/tests/testthat/test-scoping_issues.R @@ -1,5 +1,5 @@ skip_on_os(c("mac", "linux")) -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("withr") withr::with_environment( diff --git a/tests/testthat/test-standardize.R b/tests/testthat/test-standardize.R index 705196bbd..e95df2ef0 100644 --- a/tests/testthat/test-standardize.R +++ b/tests/testthat/test-standardize.R @@ -1,6 +1,6 @@ skip_on_cran() skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("standardize() - estimate_means()", { data(mtcars) diff --git a/tests/testthat/test-summary_estimate_slopes.R b/tests/testthat/test-summary_estimate_slopes.R index 5f7ecc400..e0249b8e7 100644 --- a/tests/testthat/test-summary_estimate_slopes.R +++ b/tests/testthat/test-summary_estimate_slopes.R @@ -1,4 +1,4 @@ -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("mgcv") skip_on_cran() diff --git a/tests/testthat/test-table_footer.R b/tests/testthat/test-table_footer.R index 4d1787827..581f85bd4 100644 --- a/tests/testthat/test-table_footer.R +++ b/tests/testthat/test-table_footer.R @@ -1,4 +1,4 @@ -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("emmeans") test_that("table_footer", { diff --git a/tests/testthat/test-transform_response.R b/tests/testthat/test-transform_response.R index 77778903f..6aab384ab 100644 --- a/tests/testthat/test-transform_response.R +++ b/tests/testthat/test-transform_response.R @@ -1,4 +1,4 @@ -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("estimate_means, transform", { data(cars) diff --git a/tests/testthat/test-vcov.R b/tests/testthat/test-vcov.R index 80e05b987..a43b2167e 100644 --- a/tests/testthat/test-vcov.R +++ b/tests/testthat/test-vcov.R @@ -1,5 +1,5 @@ skip_on_cran() -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("nanoparquet") skip_if_not_installed("sandwich") skip_on_os("mac") diff --git a/tests/testthat/test-verbose.R b/tests/testthat/test-verbose.R index 3497b668f..47cebe28a 100644 --- a/tests/testthat/test-verbose.R +++ b/tests/testthat/test-verbose.R @@ -1,4 +1,4 @@ -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") skip_if_not_installed("emmeans") test_that("verbose", { diff --git a/tests/testthat/test-visualisation_recipe.R b/tests/testthat/test-visualisation_recipe.R index 32fd7abe2..f7d9eb207 100644 --- a/tests/testthat/test-visualisation_recipe.R +++ b/tests/testthat/test-visualisation_recipe.R @@ -1,6 +1,6 @@ test_that("visualization_recipe", { skip_if_not_installed("emmeans") - skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") + skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") data <- iris data$fac <- rep_len(c("A", "B"), 150) diff --git a/tests/testthat/test-zeroinfl.R b/tests/testthat/test-zeroinfl.R index cd6d4237a..9d42495ff 100644 --- a/tests/testthat/test-zeroinfl.R +++ b/tests/testthat/test-zeroinfl.R @@ -2,7 +2,7 @@ skip_on_cran() skip_if_not_installed("pscl") skip_if_not_installed("glmmTMB") skip_if_not_installed("emmeans") -skip_if_not_installed("marginaleffects", minimum_version = "0.28.0.22") +skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("estimate_means - pscl zeroinfl", { From 58802499836492373dff458f617c71fa9f69c0a1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 30 Aug 2025 13:56:21 +0200 Subject: [PATCH 2/3] styler, remove remotes --- DESCRIPTION | 1 - tests/testthat/test-brms.R | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b098bcd7d..b65aec483 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -115,4 +115,3 @@ Roxygen: list(markdown = TRUE) Config/Needs/check: stan-dev/cmdstanr Config/Needs/website: easystats/easystatstemplate LazyData: true -Remotes: easystats/parameters#1164 diff --git a/tests/testthat/test-brms.R b/tests/testthat/test-brms.R index 06c75f30a..7da3bf51e 100644 --- a/tests/testthat/test-brms.R +++ b/tests/testthat/test-brms.R @@ -7,7 +7,12 @@ skip_if_not_installed("emmeans") skip_if_not_installed("marginaleffects", minimum_version = "0.29.0") test_that("estimate_means - brms", { - model <- brms::brm(Sepal.Length ~ Species * Sepal.Width, data = iris, refresh = 0, iter = 1000) + model <- brms::brm( + Sepal.Length ~ Species * Sepal.Width, + data = iris, + refresh = 0, + iter = 1000 + ) estim <- estimate_means(model, backend = "emmeans") expect_identical(dim(estim), c(3L, 5L)) }) From 6622d4ca22176c6e9cb14c3ca7a51530db8d8630 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 30 Aug 2025 13:58:10 +0200 Subject: [PATCH 3/3] styler --- R/get_marginaltrends.R | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/R/get_marginaltrends.R b/R/get_marginaltrends.R index 29b75d1ca..594b122e3 100644 --- a/R/get_marginaltrends.R +++ b/R/get_marginaltrends.R @@ -7,17 +7,19 @@ #' get_marginaltrends(model, trend = "Petal.Length", by = "Petal.Length") #' get_marginaltrends(model, trend = "Petal.Length", by = c("Species", "Petal.Length")) #' @export -get_marginaltrends <- function(model, - trend = NULL, - by = NULL, - predict = NULL, - ci = 0.95, - estimate = NULL, - transform = NULL, - p_adjust = "none", - keep_iterations = FALSE, - verbose = TRUE, - ...) { +get_marginaltrends <- function( + model, + trend = NULL, + by = NULL, + predict = NULL, + ci = 0.95, + estimate = NULL, + transform = NULL, + p_adjust = "none", + keep_iterations = FALSE, + verbose = TRUE, + ... +) { # check if available insight::check_if_installed("marginaleffects", minimum_version = "0.29.0") dots <- list(...) @@ -107,12 +109,7 @@ get_marginaltrends <- function(model, # setup arguments again fun_args <- insight::compact_list(c( - list( - model, - variables = myargs$trend, - by = myargs$by, - conf_level = ci - ), + list(model, variables = myargs$trend, by = myargs$by, conf_level = ci), dots )) @@ -124,6 +121,7 @@ get_marginaltrends <- function(model, fun_args$newdata <- datagrid } + # fmt: skip # handle distributional parameters if (!is.null(predict) && inherits(model, "brmsfit") && predict %in% .brms_aux_elements(model)) { fun_args$dpar <- predict