diff --git a/DESCRIPTION b/DESCRIPTION index 6239d015..4a140d6f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rsample Title: General Resampling Infrastructure -Version: 1.2.1.9000 +Version: 1.3.0 Authors@R: c( person("Hannah", "Frick", , "hannah@posit.co", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6049-5258")), diff --git a/NEWS.md b/NEWS.md index c17c2958..0c9b3d2e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,4 @@ -# rsample (development version) - -* The new `inner_split()` function and its methods for various resamples is for usage in tune to create a inner resample of the analysis set to fit the preprocessor and model on one part and the post-processor on the other part (#483, #488, #489). +# rsample 1.3.0 * Bootstrap intervals via `int_pctl()`, `int_t()`, and `int_bca()` now allow for more flexible grouping (#465). @@ -8,7 +6,7 @@ * `rolling_origin()` is now superseded by `sliding_window()`, `sliding_index()`, and `sliding_period()` which provide more flexibility and control (@nmercadeb, #524). -* `vfold_cv()` and `clustering_cv()` now error on implicit leave-one-out cross-validation (@seb09, #527). +* The deprecation of `validation_split()`, `validation_time_split()`, and `group_validation_split()` has been moved to the next level so that they now warn. ## Bug fixes @@ -18,6 +16,8 @@ ## Breaking changes +* `vfold_cv()` and `clustering_cv()` now error on implicit leave-one-out cross-validation (@seb09, #527). + * The class of grouped MC splits is now `group_mc_split` instead of `grouped_mc_split`, aligning it with the other grouped splits (#478). * The `rsplit` objects of an `apparent()` split now have the correct class inheritance structure. The order is now `apparent_split` and then `rsplit` rather than the other way around (#477). diff --git a/R/compat-vctrs-helpers.R b/R/compat-vctrs-helpers.R index 4a988dfc..f85f8bd0 100644 --- a/R/compat-vctrs-helpers.R +++ b/R/compat-vctrs-helpers.R @@ -122,26 +122,39 @@ delayedAssign("rset_subclasses", { withr::with_seed( 123, list( - bootstraps = bootstraps(test_data()), - group_bootstraps = group_bootstraps(test_data(), y), - vfold_cv = vfold_cv(test_data(), v = 10, repeats = 2), - group_vfold_cv = group_vfold_cv(test_data(), y), - loo_cv = loo_cv(test_data()), - mc_cv = mc_cv(test_data()), - group_mc_cv = group_mc_cv(test_data(), y), - nested_cv = nested_cv(test_data(), outside = vfold_cv(v = 3), inside = bootstraps(times = 5)), - validation_split = validation_split(test_data()), - validation_time_split = validation_time_split(test_data()), - group_validation_split = group_validation_split(test_data(), y), - rolling_origin = rolling_origin(test_data()), - sliding_window = sliding_window(test_data()), - sliding_index = sliding_index(test_data(), index), - sliding_period = sliding_period(test_data(), index, "week"), - manual_rset = manual_rset(list(initial_time_split(test_data()), initial_time_split(test_data())), c("ID1", "ID2")), - apparent = apparent(test_data()), - permutations = permutations(test_data(), y), - clustering_cv = clustering_cv(test_data(), y, repeats = 2), - validation_set = validation_set(initial_validation_split(test_data())) + bootstraps = bootstraps(test_data()), + group_bootstraps = group_bootstraps(test_data(), y), + vfold_cv = vfold_cv(test_data(), v = 10, repeats = 2), + group_vfold_cv = group_vfold_cv(test_data(), y), + loo_cv = loo_cv(test_data()), + mc_cv = mc_cv(test_data()), + group_mc_cv = group_mc_cv(test_data(), y), + nested_cv = nested_cv( + test_data(), + outside = vfold_cv(v = 3), + inside = bootstraps(times = 5) + ), + validation_split = suppressWarnings(validation_split(test_data())), + validation_time_split = suppressWarnings(validation_time_split(test_data())), + group_validation_split = suppressWarnings(group_validation_split( + test_data(), + y + )), + rolling_origin = rolling_origin(test_data()), + sliding_window = sliding_window(test_data()), + sliding_index = sliding_index(test_data(), index), + sliding_period = sliding_period(test_data(), index, "week"), + manual_rset = manual_rset( + list( + initial_time_split(test_data()), + initial_time_split(test_data()) + ), + c("ID1", "ID2") + ), + apparent = apparent(test_data()), + permutations = permutations(test_data(), y), + clustering_cv = clustering_cv(test_data(), y, repeats = 2), + validation_set = validation_set(initial_validation_split(test_data())) ) ) } else { diff --git a/R/validation_split.R b/R/validation_split.R index da97c2b1..63cefda6 100644 --- a/R/validation_split.R +++ b/R/validation_split.R @@ -52,7 +52,7 @@ #' validation_set(cars_split_3) validation_split <- function(data, prop = 3 / 4, strata = NULL, breaks = 4, pool = 0.1, ...) { - lifecycle::deprecate_soft( + lifecycle::deprecate_warn( "1.2.0", "validation_split()", "initial_validation_split()" @@ -107,7 +107,7 @@ validation_split <- function(data, prop = 3 / 4, #' @inheritParams initial_time_split #' @export validation_time_split <- function(data, prop = 3 / 4, lag = 0, ...) { - lifecycle::deprecate_soft( + lifecycle::deprecate_warn( "1.2.0", "validation_time_split()", "initial_validation_time_split()" @@ -148,7 +148,7 @@ validation_time_split <- function(data, prop = 3 / 4, lag = 0, ...) { #' @inheritParams group_initial_split #' @export group_validation_split <- function(data, group, prop = 3 / 4, ..., strata = NULL, pool = 0.1) { - lifecycle::deprecate_soft( + lifecycle::deprecate_warn( "1.2.0", "group_validation_split()", "group_initial_validation_split()" diff --git a/cran-comments.md b/cran-comments.md index e69de29b..06b81539 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -0,0 +1,3 @@ +This release newly breaks the trendeval package. I notified the maintainer and sent them a PR three weeks ago. +Issue: https://github.com/reconverse/trendeval/issues/1 +PR: https://github.com/reconverse/trendeval/pull/2 diff --git a/revdep/README.md b/revdep/README.md index 5d4cf814..90c5b01d 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -2,8 +2,14 @@ ## Failed to check (2) -|package |version |error |warning |note | -|:-------|:-------|:-----|:-------|:----| -|psfmi |1.4.0 |1 | | | -|tidyfit |? | | | | +|package |version |error |warning |note | +|:------------|:-------|:-----|:-------|:----| +|nestedmodels |? | | | | +|tabnet |? | | | | + +## New problems (1) + +|package |version |error |warning |note | +|:---------|:-------|:------|:-------|:----| +|[trendeval](problems.md#trendeval)|0.1.0 |__+1__ | | | diff --git a/revdep/cran.md b/revdep/cran.md index 4ae13e77..ef23033d 100644 --- a/revdep/cran.md +++ b/revdep/cran.md @@ -1,13 +1,15 @@ ## revdepcheck results -We checked 51 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. +We checked 64 reverse dependencies (62 from CRAN + 2 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package. - * We saw 0 new problems - * We failed to check 2 packages + * We saw 1 new problems + * We failed to check 0 packages Issues with CRAN packages are summarised below. -### Failed to check +### New problems +(This reports the first line of each new failure) + +* trendeval + checking examples ... ERROR -* psfmi (NA) -* tidyfit (NA) diff --git a/revdep/failures.md b/revdep/failures.md index 86ef2009..6fdee7b3 100644 --- a/revdep/failures.md +++ b/revdep/failures.md @@ -1,78 +1,48 @@ -# psfmi +# nestedmodels
-* Version: 1.4.0 -* GitHub: https://github.com/mwheymans/psfmi -* Source code: https://github.com/cran/psfmi -* Date/Publication: 2023-06-17 22:40:02 UTC -* Number of recursive dependencies: 159 +* Version: NA +* GitHub: NA +* Source code: https://github.com/cran/nestedmodels +* Number of recursive dependencies: 138 -Run `cloud_details(, "psfmi")` for more info +Run `revdepcheck::cloud_details(, "nestedmodels")` for more info
-## In both - -* checking whether package ‘psfmi’ can be installed ... ERROR - ``` - Installation failed. - See ‘/tmp/workdir/psfmi/new/psfmi.Rcheck/00install.out’ for details. - ``` - -## Installation +## Error before installation ### Devel ``` -* installing *source* package ‘psfmi’ ... -** package ‘psfmi’ successfully unpacked and MD5 sums checked -** using staged installation -** R -** data -*** moving datasets to lazyload DB -** inst -** byte-compile and prepare package for lazy loading -Error in loadNamespace(j <- i[[1L]], c(lib.loc, .libPaths()), versionCheck = vI[[j]]) : - namespace ‘Matrix’ 1.3-4 is already loaded, but >= 1.6.0 is required -Calls: ... namespaceImportFrom -> asNamespace -> loadNamespace -Execution halted -ERROR: lazy loading failed for package ‘psfmi’ -* removing ‘/tmp/workdir/psfmi/new/psfmi.Rcheck/psfmi’ + + + + ``` ### CRAN ``` -* installing *source* package ‘psfmi’ ... -** package ‘psfmi’ successfully unpacked and MD5 sums checked -** using staged installation -** R -** data -*** moving datasets to lazyload DB -** inst -** byte-compile and prepare package for lazy loading -Error in loadNamespace(j <- i[[1L]], c(lib.loc, .libPaths()), versionCheck = vI[[j]]) : - namespace ‘Matrix’ 1.3-4 is already loaded, but >= 1.6.0 is required -Calls: ... namespaceImportFrom -> asNamespace -> loadNamespace -Execution halted -ERROR: lazy loading failed for package ‘psfmi’ -* removing ‘/tmp/workdir/psfmi/old/psfmi.Rcheck/psfmi’ + + + + ``` -# tidyfit +# tabnet
-* Version: 0.7.1 -* GitHub: https://github.com/jpfitzinger/tidyfit -* Source code: https://github.com/cran/tidyfit -* Date/Publication: 2024-03-23 15:20:02 UTC -* Number of recursive dependencies: 186 +* Version: NA +* GitHub: NA +* Source code: https://github.com/cran/tabnet +* Number of recursive dependencies: 173 -Run `cloud_details(, "tidyfit")` for more info +Run `revdepcheck::cloud_details(, "tabnet")` for more info
@@ -81,27 +51,7 @@ Run `cloud_details(, "tidyfit")` for more info ### Devel ``` -* using log directory ‘/tmp/workdir/tidyfit/new/tidyfit.Rcheck’ -* using R version 4.1.1 (2021-08-10) -* using platform: x86_64-pc-linux-gnu (64-bit) -* using session charset: UTF-8 -* using option ‘--no-manual’ -* checking for file ‘tidyfit/DESCRIPTION’ ... OK -* checking extension type ... Package -* this is package ‘tidyfit’ version ‘0.7.1’ -* package encoding: UTF-8 -* checking package namespace information ... OK -... - ‘Flowchart.Rmd’ using ‘UTF-8’... OK - ‘Predicting_Boston_House_Prices.Rmd’ using ‘UTF-8’... OK - ‘Bootstrapping_Confidence_Intervals.Rmd’ using ‘UTF-8’... OK - ‘Feature_Selection.Rmd’ using ‘UTF-8’... failed - ‘Multinomial_Classification.Rmd’ using ‘UTF-8’... OK - ‘Rolling_Window_Time_Series_Regression.Rmd’ using ‘UTF-8’... OK - ‘Time-varying_parameters_vs_rolling_windows.Rmd’ using ‘UTF-8’... OK -* checking re-building of vignette outputs ... OK -* DONE -Status: 3 ERRORs, 1 NOTE + @@ -111,27 +61,7 @@ Status: 3 ERRORs, 1 NOTE ### CRAN ``` -* using log directory ‘/tmp/workdir/tidyfit/old/tidyfit.Rcheck’ -* using R version 4.1.1 (2021-08-10) -* using platform: x86_64-pc-linux-gnu (64-bit) -* using session charset: UTF-8 -* using option ‘--no-manual’ -* checking for file ‘tidyfit/DESCRIPTION’ ... OK -* checking extension type ... Package -* this is package ‘tidyfit’ version ‘0.7.1’ -* package encoding: UTF-8 -* checking package namespace information ... OK -... - ‘Flowchart.Rmd’ using ‘UTF-8’... OK - ‘Predicting_Boston_House_Prices.Rmd’ using ‘UTF-8’... OK - ‘Bootstrapping_Confidence_Intervals.Rmd’ using ‘UTF-8’... OK - ‘Feature_Selection.Rmd’ using ‘UTF-8’... failed - ‘Multinomial_Classification.Rmd’ using ‘UTF-8’... OK - ‘Rolling_Window_Time_Series_Regression.Rmd’ using ‘UTF-8’... OK - ‘Time-varying_parameters_vs_rolling_windows.Rmd’ using ‘UTF-8’... OK -* checking re-building of vignette outputs ... OK -* DONE -Status: 3 ERRORs, 1 NOTE + diff --git a/revdep/problems.md b/revdep/problems.md index 9a207363..3f3300ae 100644 --- a/revdep/problems.md +++ b/revdep/problems.md @@ -1 +1,41 @@ -*Wow, no problems at all. :)* \ No newline at end of file +# trendeval + +
+ +* Version: 0.1.0 +* GitHub: https://github.com/reconverse/trendeval +* Source code: https://github.com/cran/trendeval +* Date/Publication: 2023-04-11 20:30:02 UTC +* Number of recursive dependencies: 70 + +Run `revdepcheck::cloud_details(, "trendeval")` for more info + +
+ +## Newly broken + +* checking examples ... ERROR + ``` + Running examples in ‘trendeval-Ex.R’ failed + The error most likely occurred in: + + > ### Name: evaluate_resampling + > ### Title: Resampling approach for model evaluation + > ### Aliases: evaluate_resampling evaluate_resampling.default + > ### evaluate_resampling.trending_model evaluate_resampling.list + > + > ### ** Examples + > + ... + Backtrace: + ▆ + 1. ├─trendeval::evaluate_resampling(model, dat) + 2. └─trendeval:::evaluate_resampling.trending_model(model, dat) + 3. └─rsample::vfold_cv(data, v = v, repeats = repeats) + 4. └─rsample:::vfold_splits(...) + 5. └─rsample:::check_v(v, n, prevent_loo = prevent_loo, call = rlang::caller_env()) + 6. └─cli::cli_abort(...) + 7. └─rlang::abort(...) + Execution halted + ``` +