From 4460c7a20f190908483ce2c5f71974991a8fb161 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:20:59 +0200 Subject: [PATCH 1/7] docs: add minimal version of deps --- .github/workflows/scheduled.yaml | 29 +++++++++++++++++++++++++++++ DESCRIPTION | 31 +++++++++++++++++++++---------- NEWS.md | 1 + 3 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/scheduled.yaml diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml new file mode 100644 index 00000000..ec7d23ff --- /dev/null +++ b/.github/workflows/scheduled.yaml @@ -0,0 +1,29 @@ +--- +name: Scheduled 🕰️ + +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_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 }} + GCHAT_WEBHOOK: ${{ secrets.GCHAT_WEBHOOK }} + with: + strategy: ${{ matrix.test-strategy }} + additional-env-vars: | + PKG_SYSREQS_DRY_RUN=true diff --git a/DESCRIPTION b/DESCRIPTION index 492ac46a..3f3ef80a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -18,23 +18,34 @@ License: Apache License 2.0 | file LICENSE Depends: R (>= 4.0) Imports: - checkmate, + checkmate (>= 2.1.0), + lifecycle (>= 0.2.0), grDevices, - lifecycle, methods, - rlang, - shiny, - styler + rlang (>= 1.1.0), + shiny (>= 1.6.0), + styler (>= 1.0.0) Suggests: - cli, - knitr, - magrittr, - rmarkdown, - testthat (>= 2.0) + cli (>= 3.4.0), + knitr (>= 1.34), + magrittr (>= 1.5), + rmarkdown (>= 2.19), + testthat (>= 3.0.4) VignetteBuilder: knitr RdMacros: lifecycle +Config/Needs/verdepcheck: + mllg/checkmate, + r-lib/lifecycle, + r-lib/rlang, + rstudio/shiny, + r-lib/styler, + r-lib/cli, + yihui/knitr, + tidyverse/magrittr, + r-studio/rmarkdown, + r-lib/testthat Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 Language: en-US diff --git a/NEWS.md b/NEWS.md index 8f38e02d..a9c2fbb6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -7,6 +7,7 @@ ### Breaking Change * `chunks` have been removed. The new `qenv` object should be used instead. See the new `qenv` vignette in the package for further details. +* Specify minimal version of dependent packages. ### Miscellaneous * `dev_suppress` has been added to suppress rendering of plots on IDE. From 1d8fd2eb65ed6bd2613114dd12976e1e409d5644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Thu, 27 Jul 2023 00:17:49 +0200 Subject: [PATCH 2/7] fix: typo and styler needs to be bumped higher due to a dependency {enc} needs to be >= 0.2.1 in R 4.3 --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3f3ef80a..1617c604 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -24,7 +24,7 @@ Imports: methods, rlang (>= 1.1.0), shiny (>= 1.6.0), - styler (>= 1.0.0) + styler (>= 1.2.0) Suggests: cli (>= 3.4.0), knitr (>= 1.34), @@ -44,7 +44,7 @@ Config/Needs/verdepcheck: r-lib/cli, yihui/knitr, tidyverse/magrittr, - r-studio/rmarkdown, + rstudio/rmarkdown, r-lib/testthat Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 From c1e821ee5e4551f8b6ebb21274fa896f5affb3fb 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 17:44:23 +0200 Subject: [PATCH 3/7] revert: back to use main branch --- .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 ec7d23ff..2c545584 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 }} From 120ef4483015e5357623d291f08829dc70178d23 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 17:46:29 +0200 Subject: [PATCH 4/7] docs: remove rmarkdown and fix NEWS after rebase --- DESCRIPTION | 4 +--- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 1617c604..711aa1b2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -27,9 +27,8 @@ Imports: styler (>= 1.2.0) Suggests: cli (>= 3.4.0), - knitr (>= 1.34), + knitr (>= 1.42), magrittr (>= 1.5), - rmarkdown (>= 2.19), testthat (>= 3.0.4) VignetteBuilder: knitr @@ -44,7 +43,6 @@ Config/Needs/verdepcheck: r-lib/cli, yihui/knitr, tidyverse/magrittr, - rstudio/rmarkdown, r-lib/testthat Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 diff --git a/NEWS.md b/NEWS.md index a9c2fbb6..a38b77c4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,12 +2,12 @@ ### Miscellaneous * Fix NEWS +* Specify minimal version of dependent packages. # teal.code 0.4.0 ### Breaking Change * `chunks` have been removed. The new `qenv` object should be used instead. See the new `qenv` vignette in the package for further details. -* Specify minimal version of dependent packages. ### Miscellaneous * `dev_suppress` has been added to suppress rendering of plots on IDE. From f6b84c77f2e3a2cc53cdab68a000c2314e65cb19 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 13:54:04 +0200 Subject: [PATCH 5/7] docs: bump testhat due to expect_no_error function --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 711aa1b2..41b47975 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,7 +29,7 @@ Suggests: cli (>= 3.4.0), knitr (>= 1.42), magrittr (>= 1.5), - testthat (>= 3.0.4) + testthat (>= 3.1.5) VignetteBuilder: knitr RdMacros: From ced36c6d3d9e47192984a15a2423f4a5005184eb 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:43:18 +0200 Subject: [PATCH 6/7] ci: remove push on branch to prepare merge --- .github/workflows/scheduled.yaml | 6 ------ DESCRIPTION | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 2c545584..6b66a892 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: diff --git a/DESCRIPTION b/DESCRIPTION index 41b47975..2e96f7bd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,6 +29,7 @@ Suggests: cli (>= 3.4.0), knitr (>= 1.42), magrittr (>= 1.5), + rmarkdown (>= 2.19), testthat (>= 3.1.5) VignetteBuilder: knitr @@ -43,6 +44,7 @@ Config/Needs/verdepcheck: r-lib/cli, yihui/knitr, tidyverse/magrittr, + rstudio/rmarkdown, r-lib/testthat Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 From a12ea226325196d5aec4364723274e552a1028de 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 10:01:31 +0200 Subject: [PATCH 7/7] Update NEWS.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Aleksander Chlebowski <114988527+chlebowa@users.noreply.github.com> Signed-off-by: André Veríssimo <211358+averissimo@users.noreply.github.com> --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index a38b77c4..65543c9e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ### Miscellaneous * Fix NEWS -* Specify minimal version of dependent packages. +* Specified minimal version of package dependencies. # teal.code 0.4.0