From 4a2a2a0f2685c97df51078f56f96c172f7bab762 Mon Sep 17 00:00:00 2001 From: Grant McDermott Date: Mon, 4 Nov 2024 17:09:12 -0800 Subject: [PATCH 1/5] drop ggpubr dependency --- DESCRIPTION | 1 - NAMESPACE | 1 - R/gplot.R | 8 ++++---- R/imports.R | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3fa39b55..ddb3aedc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -14,7 +14,6 @@ Imports: Matrix, pbapply, ggplot2, - ggpubr, DRDID (>= 1.1.0), generics, methods, diff --git a/NAMESPACE b/NAMESPACE index f3781ea3..eb7393f4 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -38,7 +38,6 @@ export(trimmer) import(BMisc) import(data.table) import(ggplot2) -import(ggpubr) import(stats) import(utils) importFrom(generics,glance) diff --git a/R/gplot.R b/R/gplot.R index f76f8774..7442e5a9 100644 --- a/R/gplot.R +++ b/R/gplot.R @@ -34,7 +34,7 @@ gplot <- function(ssresults, ylim=NULL, xlab=NULL, ylab=NULL, title="Group", xga p <- p + geom_hline(aes(yintercept = ref_line), linetype = 'dashed') } if (theming) { - p <- p + ggpubr::theme_pubr() + + p <- p + theme_classic() + theme(plot.title = element_text(color="darkgray", face="bold", size=12), axis.title = element_text(color="darkgray", face="bold", size=12), strip.background = element_rect(fill = 'white', color = 'white'), @@ -42,7 +42,7 @@ gplot <- function(ssresults, ylim=NULL, xlab=NULL, ylab=NULL, title="Group", xga legend.position = 'bottom') } if (!legend) { - p <- p + ggpubr::rremove("legend") + p <- p + theme(legend.position = "none") } p @@ -94,14 +94,14 @@ splot <- function(ssresults, ylim=NULL, xlab=NULL, ylab=NULL, title="Group", p <- p + geom_vline(aes(xintercept = ref_line), linetype = 'dashed') } if (theming) { - p <- p + ggpubr::theme_pubr() + + p <- p + theme_classic() + theme(plot.title = element_text(color="darkgray", face="bold", size=12), axis.title = element_text(color="darkgray", face="bold", size=12), legend.position = 'none') } if (!legend) { - p <- p + ggpubr::rremove("legend") + p <- p + theme(legend.position = "none") } p diff --git a/R/imports.R b/R/imports.R index 4d620707..bd872c47 100644 --- a/R/imports.R +++ b/R/imports.R @@ -9,7 +9,6 @@ #' @import stats #' @import utils #' @import ggplot2 -#' @import ggpubr #' @import BMisc #' @import data.table #' @importFrom tidyr gather From 5ee7c2484c32c5a770f25f39111b41105302dea5 Mon Sep 17 00:00:00 2001 From: Grant McDermott Date: Mon, 4 Nov 2024 17:19:32 -0800 Subject: [PATCH 2/5] news --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 126916d0..180da77e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,6 +6,8 @@ * Check if data is balanced if `panel = TRUE` and `allow_unbalanced_panel = TRUE`. If it is, disable `allow_unbalanced_panel` and proceed with panel data setup. This is different from the previous behavior, which would always proceed as if `panel = FALSE`. + * Significantly reduced the number of recursive package dependencies, enabling faster installation times and a smaller build footprint. + # did 2.1.2 * Added wrapper function for HonestDiD package From fbc4f95161f161955b5f9821698c71b9eb92eca0 Mon Sep 17 00:00:00 2001 From: Grant McDermott Date: Mon, 4 Nov 2024 17:20:12 -0800 Subject: [PATCH 3/5] dev --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 180da77e..33d215c6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# did 2.2.0 +# did 2.2.0 (development version) * Code improvements that made the package much faster and memory efficient From 07f2717f31a6b8fa873e91ebd5eee48de2fa5209 Mon Sep 17 00:00:00 2001 From: Grant McDermott Date: Wed, 13 Nov 2024 07:48:30 -0800 Subject: [PATCH 4/5] Add backports --- DESCRIPTION | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DESCRIPTION b/DESCRIPTION index ddb3aedc..b8a5dfad 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -19,6 +19,8 @@ Imports: methods, tidyr, data.table (>= 1.15.4) +Suggests: + backports Roxygen: list(markdown = TRUE) RoxygenNote: 7.3.2 VignetteBuilder: knitr From fb7888b43f7dbf9508a508a4a94551a4ee635f86 Mon Sep 17 00:00:00 2001 From: pedrohcgs Date: Wed, 13 Nov 2024 11:00:58 -0500 Subject: [PATCH 5/5] Avoid duplication of Suggests --- DESCRIPTION | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 29995a83..a7c73f0e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,8 +21,6 @@ Imports: parglm (>= 0.1.7), data.table (>= 1.15.4), dreamerr (>= 1.4.0) -Suggests: - backports Roxygen: list(markdown = TRUE) RoxygenNote: 7.3.2 VignetteBuilder: knitr @@ -31,4 +29,5 @@ Suggests: plm, here, knitr, - covr + covr, + backports