From c1996066612a6bc908fb63144c7baa00ad6e8ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Wed, 26 Jul 2023 00:48:17 +0200 Subject: [PATCH 1/6] docs: add minimal version of deps --- .github/workflows/scheduled.yaml | 10 ++++- DESCRIPTION | 76 ++++++++++++++++++++++++++------ NEWS.md | 4 ++ 3 files changed, 74 insertions(+), 16 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index b752a49b1..e5174e1bd 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -5,14 +5,20 @@ on: schedule: - cron: '45 3 * * 0' workflow_dispatch: + # Section to be removed before action is merged + # note: branch below needs to point to main instead of new-verdepcheck-strategy + push: + branches: + - verdepcheck_action + # end of section to be removed jobs: dependency-test: strategy: fail-fast: false matrix: - test-strategy: ["min", "release", "max"] - uses: insightsengineering/r.pkg.template/.github/workflows/verdepcheck.yaml@main + test-strategy: ["min_cohort", "min_isolated", "release", "max"] + uses: insightsengineering/r.pkg.template/.github/workflows/verdepcheck.yaml@new-verdepcheck-strategy name: Dependency Test - ${{ matrix.test-strategy }} 🔢 secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} diff --git a/DESCRIPTION b/DESCRIPTION index b2c6e262b..c76e76c79 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -19,23 +19,23 @@ Depends: ggmosaic (>= 0.3.0), ggplot2, R (>= 3.6), - shiny, + shiny (>= 1.6.0), shinyTree, teal (>= 0.14.0) Imports: - checkmate, - dplyr, - DT, + checkmate (>= 2.1.0), + dplyr (>= 1.0.5), + DT (>= 0.13), forcats (>= 1.0.0), grid, logger (>= 0.2.0), - magrittr, + magrittr (>= 1.5), scales, shinyjs, shinyvalidate, shinyWidgets, stats, - stringr, + stringr (>= 1.4.1), teal.code (>= 0.4.0), teal.logger (>= 0.1.1), teal.reporter (>= 0.2.0), @@ -43,12 +43,12 @@ Imports: teal.transform (>= 0.4.0), teal.widgets (>= 0.4.0), tern (>= 0.7.10), - tibble, - tidyr, + tibble (>= 2.0.0), + tidyr (>= 0.8.3), tidyselect, utils Suggests: - broom, + broom (>= 0.7.10), colourpicker, ggExtra, ggpmisc (>= 0.4.3), @@ -57,19 +57,67 @@ Suggests: gridExtra, htmlwidgets, jsonlite, - knitr, - lattice, + knitr (>= 1.34), + lattice (>= 0.18-4), MASS, methods, nestcolor (>= 0.1.0), - rlang, - rmarkdown, + rlang (>= 1.0.0), + rmarkdown (>= 2.19), rtables (>= 0.5.1), sparkline, teal.data (>= 0.3.0), - testthat (>= 2.0) + testthat (>= 3.0.4) VignetteBuilder: knitr +Config/Needs/verdepcheck: + haleyjeppson/ggmosaic, + tidyverse/ggplot2, + rstudio/shiny, + shinyTree/shinyTree, + insightsengineering/teal, + mllg/checkmate, + tidyverse/dplyr, + rstudio/DT, + tidyverse/forcats, + daroczig/logger, + tidyverse/magrittr, + r-lib/scales, + daattali/shinyjs, + rstudio/shinyvalidate, + dreamRs/shinyWidgets, + tidyverse/stringr, + insightsengineering/teal.code, + insightsengineering/teal.logger, + insightsengineering/teal.reporter, + insightsengineering/teal.slice, + insightsengineering/teal.transform, + insightsengineering/teal.widgets, + insightsengineering/tern, + tidyverse/tibble, + tidyverse/tidyr, + r-lib/tidyselect, + tidymodels/broom, + daattali/colourpicker, + daattali/ggExtra, + aphalo/ggpmisc, + aphalo/ggpp, + baddstats/goftest, + gridExtra, + ramnathv/htmlwidgets, + jeroen/jsonlite, + yihui/knitr, + deepayan/lattice, + MASS, + insightsengineering/nestcolor, + r-lib/rlang, + rstudio/rmarkdown, + insightsengineering/rtables, + insightsengineering/scda, + insightsengineering/scda.2022, + sparkline, + insightsengineering/teal.data, + r-lib/testthat Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 Language: en-US diff --git a/NEWS.md b/NEWS.md index 70e870223..19e92bde3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,9 @@ # teal.modules.general 0.2.16.9007 +### Miscellaneous + +* Specify minimal version of dependent packages. + # teal.modules.general 0.2.16 ### Breaking changes From 626edc0467e484a1208cd9cc97aa0bbc07bc7ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Fri, 1 Sep 2023 15:50:30 +0200 Subject: [PATCH 2/6] docs: update versions --- .github/workflows/scheduled.yaml | 2 +- DESCRIPTION | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index e5174e1bd..e3a6a44b6 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: test-strategy: ["min_cohort", "min_isolated", "release", "max"] - uses: insightsengineering/r.pkg.template/.github/workflows/verdepcheck.yaml@new-verdepcheck-strategy + uses: insightsengineering/r.pkg.template/.github/workflows/verdepcheck.yaml@main name: Dependency Test - ${{ matrix.test-strategy }} 🔢 secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} diff --git a/DESCRIPTION b/DESCRIPTION index c76e76c79..67efe40e2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,7 +17,7 @@ Description: General Purpose Teal Modules. License: Apache License 2.0 | file LICENSE Depends: ggmosaic (>= 0.3.0), - ggplot2, + ggplot2 (>= 3.4.0), R (>= 3.6), shiny (>= 1.6.0), shinyTree, @@ -33,7 +33,7 @@ Imports: scales, shinyjs, shinyvalidate, - shinyWidgets, + shinyWidgets (>= 0.5.1), stats, stringr (>= 1.4.1), teal.code (>= 0.4.0), From 1414733e226ea5e9c8d61d10c43db6b23a576615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Fri, 1 Sep 2023 18:04:04 +0200 Subject: [PATCH 3/6] docs: remove rmarkdown and bump knitr to 1.42 --- DESCRIPTION | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 67efe40e2..85ac597f0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -57,13 +57,12 @@ Suggests: gridExtra, htmlwidgets, jsonlite, - knitr (>= 1.34), + knitr (>= 1.42), lattice (>= 0.18-4), MASS, methods, nestcolor (>= 0.1.0), rlang (>= 1.0.0), - rmarkdown (>= 2.19), rtables (>= 0.5.1), sparkline, teal.data (>= 0.3.0), @@ -111,7 +110,6 @@ Config/Needs/verdepcheck: MASS, insightsengineering/nestcolor, r-lib/rlang, - rstudio/rmarkdown, insightsengineering/rtables, insightsengineering/scda, insightsengineering/scda.2022, From 7e0c4150871e77dbdfdbf5081870dd7ba8a7dbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Mon, 4 Sep 2023 16:44:04 +0200 Subject: [PATCH 4/6] ci: remove push on branch to prepare merge --- .github/workflows/scheduled.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index e3a6a44b6..f2ddf6862 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -5,12 +5,6 @@ on: schedule: - cron: '45 3 * * 0' workflow_dispatch: - # Section to be removed before action is merged - # note: branch below needs to point to main instead of new-verdepcheck-strategy - push: - branches: - - verdepcheck_action - # end of section to be removed jobs: dependency-test: From 100f1878617249be5fd2bc99f02912af0d38cbf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Mon, 4 Sep 2023 17:28:46 +0200 Subject: [PATCH 5/6] docs: removed unused dependencies --- DESCRIPTION | 2 -- 1 file changed, 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 85ac597f0..01e5b1b67 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -111,8 +111,6 @@ Config/Needs/verdepcheck: insightsengineering/nestcolor, r-lib/rlang, insightsengineering/rtables, - insightsengineering/scda, - insightsengineering/scda.2022, sparkline, insightsengineering/teal.data, r-lib/testthat From f672eaddec02b3d78f8ea7697c778c1abe2a0702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Tue, 5 Sep 2023 13:32:38 +0200 Subject: [PATCH 6/6] docs: typo on NEWS.md --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 19e92bde3..ce8d15acb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ### Miscellaneous -* Specify minimal version of dependent packages. +* Specified minimal version of package dependencies. # teal.modules.general 0.2.16