From 4b2421b3fdb25e9f00bdf2f4da225e14d394e736 Mon Sep 17 00:00:00 2001 From: Graeme Blair Date: Fri, 4 Sep 2020 19:54:03 -0700 Subject: [PATCH 1/3] patch - CRAN errors --- tests/testthat/test-modelsummary.R | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/testthat/test-modelsummary.R b/tests/testthat/test-modelsummary.R index f909e0fa..7036d4dc 100644 --- a/tests/testthat/test-modelsummary.R +++ b/tests/testthat/test-modelsummary.R @@ -10,9 +10,9 @@ test_that("modelsummary works with glance", { model2 <- lm_robust(mpg ~ am, mtcars, clusters = cyl) model3 <- lm_lin(mpg ~ am, ~ cyl, mtcars) - mso <- modelsummary::extract(list(model1, model2, model3)) + mso <- modelsummary::modelsummary(list(model1, model2, model3), output = "data.frame") - expect_equal(colnames(mso), c("group", "term", "statistic", + expect_equal(colnames(mso), c("group", "term", "statistic", "Model 1", "Model 2", "Model 3")) expect_equal(nrow(mso), 12L) @@ -23,8 +23,9 @@ test_that("modelsummary works with glance", { model1 <- iv_robust(mpg ~ am | gear, mtcars) model2 <- iv_robust(mpg ~ am | gear, mtcars, clusters = cyl, diagnostics = TRUE) - mso <- modelsummary::extract(list(model1, model2), - gof_omit = c("N|[sS]tatistic|p.value|p{1}")) + mso <- modelsummary::modelsummary(list(model1, model2), + gof_omit = c("N|[sS]tatistic|p.value|p{1}"), + output = "data.frame") expect_equal(nrow(mso), 6) @@ -33,14 +34,14 @@ test_that("modelsummary works with glance", { # difference_in_means model1 <- difference_in_means(mpg ~ am, mtcars) model2 <- difference_in_means(mpg ~ am, mtcars, blocks = vs) - mso <- modelsummary::extract(list(model1, model2)) + mso <- modelsummary:::extract_models(list(model1, model2)) # horvitz_thompson model1 <- horvitz_thompson(mpg ~ am, mtcars) model2 <- horvitz_thompson(mpg ~ am, mtcars, blocks = vs) - mso <- modelsummary::extract(list(model1, model2)) + mso <- modelsummary::modelsummary(list(model1, model2), output = "data.frame") expect_equal(nrow(mso), 6) From 6405256a77a21700a58f37f145eca654f1a12dc2 Mon Sep 17 00:00:00 2001 From: Graeme Blair Date: Fri, 4 Sep 2020 20:40:10 -0700 Subject: [PATCH 2/3] v 0.26.0 --- DESCRIPTION | 2 +- NEWS.md | 4 ++++ cran-comments.md | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a37f862b..c330d1ca 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: estimatr Type: Package Title: Fast Estimators for Design-Based Inference -Version: 0.24.0 +Version: 0.26.0 Authors@R: c(person("Graeme", "Blair", email = "graeme.blair@ucla.edu", role = c("aut", "cre")), person("Jasper", "Cooper", email = "jjc2247@columbia.edu", role = c("aut")), person("Alexander", "Coppock", email = "alex.coppock@yale.edu", role = c("aut")), diff --git a/NEWS.md b/NEWS.md index b8183a2e..92506fe4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# estimatr 0.26.0 + +* Test suite changes + # estimatr 0.24.0 * tidy: rename nobs, nclusters, nblocks diff --git a/cran-comments.md b/cran-comments.md index b740c0ba..4e87f06a 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,3 +1,3 @@ ## Submission -We sincerely apologize for the delay in sending this update. This small patch mostly contains bugfixes, but also removes a dependency on `clubSandwich.` We now suggest the package and skip the test unless it is installed. We have also fixed small bugs due to the most recent version of clubSandwich posted yesterday. +Thank you for accepting this patch, which addressses a change to the API for the modelsummry package pushed to CRAN on 9/4. From 5cb5786621ff39812e5204e4edce742eb6e6192a Mon Sep 17 00:00:00 2001 From: Graeme Blair Date: Fri, 4 Sep 2020 20:42:00 -0700 Subject: [PATCH 3/3] cran submission --- CRAN-RELEASE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRAN-RELEASE b/CRAN-RELEASE index 27a14792..f0a4c313 100644 --- a/CRAN-RELEASE +++ b/CRAN-RELEASE @@ -1,2 +1,2 @@ -This package was submitted to CRAN on 2020-09-01. -Once it is accepted, delete this file and tag the release (commit c9eb598). +This package was submitted to CRAN on 2020-09-04. +Once it is accepted, delete this file and tag the release (commit 6405256).