From 001a096fd69b7828178b0471efc1de548abe6355 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:06:19 +0100 Subject: [PATCH 1/5] reintroduce rmarkdown; vbump formatters; fix typo in gh ref --- DESCRIPTION | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 4f4151007..7dc49c283 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,7 +29,7 @@ URL: https://github.com/insightsengineering/rtables, https://insightsengineering.github.io/rtables/ BugReports: https://github.com/insightsengineering/rtables/issues Depends: - formatters (>= 0.5.5), + formatters (>= 0.5.5.9005), magrittr (>= 1.5), methods, R (>= 2.10) @@ -46,6 +46,7 @@ Suggests: knitr (>= 1.42), officer (>= 0.5.0), r2rtf (>= 0.3.2), + rmarkdown (>= 2.19), survival (>= 3.3-1), testthat (>= 3.0.4), tibble (>= 3.2.1), @@ -56,9 +57,9 @@ VignetteBuilder: knitr Config/Needs/verdepcheck: insightsengineering/formatters, tidyverse/magrittr, mllg/checkmate, rstudio/htmltools, - gogolewski/stringi, tidymodels/broom, cran/car, tidyverse/dplyr, + gagolews/stringi, tidymodels/broom, cran/car, tidyverse/dplyr, davidgohel/flextable, yihui/knitr, davidgohel/officer, Merck/r2rtf, - r-lib/testthat, tidyverse/tibble, tidyverse/tidyr, r-lib/withr, + rstudio/rmarkdown, r-lib/testthat, tidyverse/tibble, tidyverse/tidyr, r-lib/withr, r-lib/xml2 Encoding: UTF-8 Language: en-US From 9dfd96692af72643dc8d1080094f7446722c0162 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:07:54 +0100 Subject: [PATCH 2/5] test Signed-off-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> --- .github/workflows/scheduled.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index ce87ab445..65210a6d0 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -2,6 +2,9 @@ name: Scheduled 🕰️ on: + push: + branches: + - main schedule: - cron: '45 3 * * 0' workflow_dispatch: From 3bed62c400c7c50db9336b183b71d561b2253578 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:09:31 +0100 Subject: [PATCH 3/5] Update .github/workflows/scheduled.yaml Signed-off-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> --- .github/workflows/scheduled.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 65210a6d0..21c3ce67c 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -4,7 +4,7 @@ name: Scheduled 🕰️ on: push: branches: - - main + - fix_verdepcheck schedule: - cron: '45 3 * * 0' workflow_dispatch: From 4d68871852b60ea85f238384658c8fe9599bd302 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:41:10 +0100 Subject: [PATCH 4/5] mv image file used in vignette --- inst/WORDLIST | 59 +++++++++--------- .../images}/rtables-basics.png | Bin vignettes/introduction.Rmd | 2 +- 3 files changed, 31 insertions(+), 30 deletions(-) rename {man/figures => vignettes/images}/rtables-basics.png (100%) diff --git a/inst/WORDLIST b/inst/WORDLIST index b64fd5939..ece47f93b 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,37 +1,11 @@ +amongst Arg -CRAN's Carreras +charset Cheatsheet Chohan -FFFL -Godwin -Heng -Kelkhoff -Layouting -Lewandowski -Maximo -Modelling -NSE -Paszty -Pharma -Phuse -Postprocessing -Pre -Qi -RStudio -Resync -STUDYID -Saibah -Stoilova -Subtable -Subtables -TableTree -Tadeusz -Unstratified -Yung -amongst -charset combinatorial +CRAN's customizations decrementing dimensioned @@ -39,44 +13,71 @@ dplyr emph facetted facetting +FFFL formatter getter getters +Godwin +Heng ing initializer integerish iteratively +Kelkhoff labelled +Layouting layouting +Lewandowski mandatorily +Maximo +Modelling multivariable +NSE orderable +Paszty pathing +Pharma +Phuse postfix +Postprocessing postprocessing +Pre pre priori programmatically +Qi quartiles reindexed repo repped responder +Resync reusability roadmap +RStudio +rtables +Saibah sortable spl +Stoilova +STUDYID +Subtable subtable subtable's +Subtables subtables summarization tableone +TableTree +Tadeusz todo unaggregated unicode univariable unnested unpruned +Unstratified unstratified useR xtable +Yung diff --git a/man/figures/rtables-basics.png b/vignettes/images/rtables-basics.png similarity index 100% rename from man/figures/rtables-basics.png rename to vignettes/images/rtables-basics.png diff --git a/vignettes/introduction.Rmd b/vignettes/introduction.Rmd index d5d11712b..681ce562d 100644 --- a/vignettes/introduction.Rmd +++ b/vignettes/introduction.Rmd @@ -51,7 +51,7 @@ table object, a formatted table can be printed in ASCII format, or exported to a variety of other formats (`.txt`, `.pdf`, `.docx`, etc.). ```{r echo=FALSE, fig.align='center'} -knitr::include_graphics("../man/figures/rtables-basics.png") +knitr::include_graphics("./images/rtables-basics.png") ``` ## Data From e3259238d86e257017124de30648629ff7998fa4 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Fri, 15 Mar 2024 15:26:42 +0100 Subject: [PATCH 5/5] rm test Signed-off-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> --- .github/workflows/scheduled.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 21c3ce67c..ce87ab445 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -2,9 +2,6 @@ name: Scheduled 🕰️ on: - push: - branches: - - fix_verdepcheck schedule: - cron: '45 3 * * 0' workflow_dispatch: