Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions CRAN-SUBMISSION

This file was deleted.

4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: estimatr
Type: Package
Title: Fast Estimators for Design-Based Inference
Version: 1.0.2
Version: 1.0.4
Authors@R: c(person("Graeme", "Blair", email = "graeme.blair@gmail.com", 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")),
Expand All @@ -23,7 +23,7 @@ Imports:
rlang (>= 0.2.0)
LinkingTo: Rcpp, RcppEigen
Encoding: UTF-8
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
LazyData: true
Suggests:
fabricatr (>= 0.10.0),
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# estimatr 1.0.4

* Test suite changes for M1 mac stay current on CRAN.

# estimatr 1.0.2

* Minor documentation changes to stay current on CRAN.
Expand Down
2 changes: 1 addition & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Submission

Small changes to update based on Kurt's 8/19/23 email and also address C++ warning in R CMD CHECK.
Fixes M1 Mac errors.

There are no changes to worse in reverse depends.

Expand Down
2 changes: 1 addition & 1 deletion man/estimatr.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions man/horvitz_thompson.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tests/testthat/helper-lm-robust-se.R
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,4 @@ BMlmSE <- function(model, clustervar=NULL, ell=NULL, IK=TRUE) {
se = se, se.Stata = se.Stata
)
}

2 changes: 1 addition & 1 deletion tests/testthat/test-lm-cluster.R
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ test_that("lm cluster se", {
for (se_type in cr_se_types) {
lmr_rd <- lm_robust(Y ~ X + Z + X2, data = dat, clusters = J, se_type = se_type)
lmr_full <- lm_robust(Y ~ X + Z, data = dat, clusters = J, se_type = se_type)
expect_identical(
expect_equal(
tidy(lmr_rd)[1:3, ],
tidy(lmr_full)
)
Expand Down
12 changes: 7 additions & 5 deletions tests/testthat/test-modelsummary.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@
context("S3 - modelsummary works")

test_that("modelsummary works with glance", {
# skip_if_not_installed("modelsummary")
skip("modelsummary non reproducible errors")
skip_if_not_installed("modelsummary")

library(modelsummary)

set.seed(5)

model1 <- lm_robust(mpg ~ am, mtcars)
model2 <- lm_robust(mpg ~ am, mtcars, clusters = cyl)
model3 <- lm_lin(mpg ~ am, ~ cyl, mtcars)

mso <- modelsummary(list(model1, model2, model3), output = "data.frame")

expect_equal(colnames(mso), c("part", "term", "statistic",
"Model 1", "Model 2", "Model 3"))
"(1)", "(2)", "(3)"))

expect_equal(nrow(mso), 12L)
expect_equal(nrow(mso), 15L)

expect_equal(ncol(mso), 6L)

Expand All @@ -28,7 +30,7 @@ test_that("modelsummary works with glance", {
gof_omit = c("N|[sS]tatistic|p.value|p{1}"),
output = "data.frame")

expect_equal(nrow(mso), 6)
expect_equal(nrow(mso), 10)

expect_equal(ncol(mso), 5)

Expand Down
13 changes: 0 additions & 13 deletions tests/testthat/test-zzzbroom.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,6 @@
# isn't a SUGGESTed package
context("zzzbroom.R - .onAttach")


test_that(".onLoad does not message if new version of 'broom' is loaded", {
skip_if_not_installed("broom", minimum_version = "0.5.0.9000")
library(broom)
expect_silent(.onLoad("estimatr", "estimatr"))

expect_is(
tidy(lm_robust(mpg ~ hp, mtcars)),
"data.frame"
)
})


test_that(".onLoad message if old version of 'broom' is installed", {
skip_if_not_installed("broom")
skip_if(packageVersion("broom") > "0.5.0")
Expand Down
Loading