From f5428a8102d58803ead3ac8a6943c70029f45e89 Mon Sep 17 00:00:00 2001 From: Hannah Frick Date: Wed, 7 Dec 2022 15:17:19 +0000 Subject: [PATCH 1/7] polish NEWS --- NEWS.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/NEWS.md b/NEWS.md index 971b0177..7dd16c3c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,20 +1,20 @@ -# rsample (development version) +# rsample 1.1.1 -* Removed an overly strict test in preparation for dplyr 1.1.0 (#380). +* All grouped resampling functions (`group_vfold_cv()`, `group_mc_cv()`, `group_initial_split()` and `group_validation_split()`, and `group_bootstraps()`) now support stratification. Strata must be constant within each group (@mikemahoney218, #317, #360, #363, #364, #365). -* All grouped resampling functions (`group_vfold_cv()`, `group_mc_cv()`, `group_initial_split()` and `group_validation_split()`, and `group_bootstraps()`) now support stratification. Strata must be constant within each group (#317, #360, #363, #364, #365). +* Added a new function, `clustering_cv()`, for blocked cross-validation in various predictor spaces. This is a very flexible function, taking arguments to both `distance_function` and `cluster_function`, allowing it to be used for spatial clustering as well as potentially phylogenetic and other forms of clustering (@mikemahoney218, #351). -* `group_bootstraps()` now warns if resampling returns any empty assessment sets (previously had been an error) (#356) (#357). +* `bootstraps()` and `group_bootstraps()` now warn if resampling returns any empty assessment sets. Previously, `bootstraps()` was silent while `group_bootstraps()` errored (@mikemahoney218, #356, #357). -* `bootstraps()` now warns if resampling returns any empty assessment sets (previously had no message or warning) (#356) (#357). +* The assessment set of `validation_time_split()` now also contains the lagged observations (#376). -* Added a new function, `clustering_cv()`, for blocked cross-validation in various predictor spaces. This is a very flexible function, taking arguments to both `distance_function` and `cluster_function`, allowing it to be used for spatial clustering as well as potentially phylogenetic and other forms of clustering (#351). +* The new helper `get_rsplit()` lets you conveniently access the `rsplit` objects inside an `rset` objects (@mikemahoney218, #399). -* The assessment set of `validation_time_split()` now also contains the lagged observations (#376). +* The result of `initial_time_split()` now has its own subclass `"initial_time_split"`, in addition to existing classes (#397). * The dependency on the ellipsis package has been removed (#393). -* The result of `initial_time_split()` now has its own subclass `"initial_time_split"`, in addition to existing classes (#397). +* Removed an overly strict test in preparation for dplyr 1.1.0 (#380). # rsample 1.1.0 From 4211ce076b3cf4a8a83f2a9007c6a8b59c08e766 Mon Sep 17 00:00:00 2001 From: Hannah Frick Date: Wed, 7 Dec 2022 15:24:39 +0000 Subject: [PATCH 2/7] update to new email addresses >< --- DESCRIPTION | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index f9c20c79..42868be5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,18 +2,17 @@ Package: rsample Title: General Resampling Infrastructure Version: 1.1.0.9000 Authors@R: c( - person("Hannah", "Frick", , "hannah@rstudio.com", role = c("aut", "cre"), + person("Hannah", "Frick", , "hannah@posit.co", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6049-5258")), person("Fanny", "Chow", , "fannybchow@gmail.com", role = "aut"), - person("Max", "Kuhn", , "max@rstudio.com", role = "aut"), + person("Max", "Kuhn", , "max@posit.co", role = "aut"), person("Michael", "Mahoney", , "mike.mahoney.218@gmail.com", role = c("aut"), comment = c(ORCID = "0000-0003-2402-304X")), - person("Julia", "Silge", , "julia.silge@rstudio.com", role = c("aut"), + person("Julia", "Silge", , "julia.silge@posit.co", role = c("aut"), comment = c(ORCID = "0000-0002-3671-836X")), - person("Hadley", "Wickham", , "hadley@rstudio.com", role = "aut"), + person("Hadley", "Wickham", , "hadley@posit.co", role = "aut"), person("Posit Software, PBC", role = c("cph", "fnd")) ) -Maintainer: Hannah Frick Description: Classes and functions to create and summarize different types of resampling objects (e.g. bootstrap, cross-validation). License: MIT + file LICENSE From db16f263a764ec48667ef012c268b505b1257895 Mon Sep 17 00:00:00 2001 From: Hannah Frick Date: Wed, 7 Dec 2022 15:40:01 +0000 Subject: [PATCH 3/7] update `cran-comments.md` --- cran-comments.md | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index d7b9ef10..3f830087 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,15 +1,3 @@ -## Release Summary - -This is the 12th CRAN release of rsample. This release harmonizes object attributes and adds support for grouped resampling. - -## R CMD check results - -0 errors | 0 warnings | 0 notes - -## revdepcheck results - -We checked 44 reverse dependencies (43 from CRAN + 1 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package. - - * We saw 0 new problems - * We failed to check 0 packages +# v 1.1.1 +This version includes a maintainer change from Julia Silge to Hannah Frick. From b2fdcc19c7d986fc09a82116be651a58bd3731a5 Mon Sep 17 00:00:00 2001 From: Hannah Frick Date: Wed, 7 Dec 2022 16:25:40 +0000 Subject: [PATCH 4/7] Increment version number to 1.1.1 --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 42868be5..829d6257 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rsample Title: General Resampling Infrastructure -Version: 1.1.0.9000 +Version: 1.1.1 Authors@R: c( person("Hannah", "Frick", , "hannah@posit.co", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6049-5258")), From 256a7c886321befff7f0daeaa893c9b16a07eb52 Mon Sep 17 00:00:00 2001 From: Hannah Frick Date: Wed, 7 Dec 2022 17:02:23 +0000 Subject: [PATCH 5/7] update pkgdown action --- .github/workflows/pkgdown.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 0b260216..087f0b05 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -20,7 +20,7 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: r-lib/actions/setup-pandoc@v2 @@ -39,7 +39,7 @@ jobs: - name: Deploy to GitHub pages 🚀 if: github.event_name != 'pull_request' - uses: JamesIves/github-pages-deploy-action@4.1.4 + uses: JamesIves/github-pages-deploy-action@v4.4.1 with: clean: false branch: gh-pages From 555d878544e6703750f2421b019ac44795dc6e2c Mon Sep 17 00:00:00 2001 From: Hannah Frick Date: Wed, 7 Dec 2022 17:47:35 +0000 Subject: [PATCH 6/7] CRAN-SUBMISSION --- CRAN-SUBMISSION | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 CRAN-SUBMISSION diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION new file mode 100644 index 00000000..1d7e2d22 --- /dev/null +++ b/CRAN-SUBMISSION @@ -0,0 +1,3 @@ +Version: 1.1.1 +Date: 2022-12-07 17:29:38 UTC +SHA: 256a7c886321befff7f0daeaa893c9b16a07eb52 From 96ab53df315da1882e81aa8b3f2651426c807d04 Mon Sep 17 00:00:00 2001 From: Hannah Frick Date: Thu, 8 Dec 2022 10:32:58 +0000 Subject: [PATCH 7/7] Delete CRAN-SUBMISSION --- CRAN-SUBMISSION | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 CRAN-SUBMISSION diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION deleted file mode 100644 index 1d7e2d22..00000000 --- a/CRAN-SUBMISSION +++ /dev/null @@ -1,3 +0,0 @@ -Version: 1.1.1 -Date: 2022-12-07 17:29:38 UTC -SHA: 256a7c886321befff7f0daeaa893c9b16a07eb52