From 669c1725ecff6c770f0e28ccb8a1418a6fe59507 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, 22 Nov 2023 17:12:22 +0100 Subject: [PATCH] Adds min package version (#912) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WIP :: parent issue: https://github.com/insightsengineering/nestdevs-tasks/issues/7 ### 🔴 Checklist for PR Reviewer [![Scheduled 🕰️](https://github.com/insightsengineering/teal/actions/workflows/scheduled.yaml/badge.svg?branch=verdepcheck_action)](https://github.com/insightsengineering/teal/actions/workflows/scheduled.yaml?query=branch%3Averdepcheck_action) _(`max` and `release` strategies are expected to fail... see below)_ - [ ] Tag yourself next to this repo on https://github.com/insightsengineering/nestdevs-tasks/issues/7 - [ ] Package versions are the same or higher than `main` - [ ] Package list is the same - Only exception is `rmarkdown` (may have been removed on `Suggests`) - [ ] All packages in `Imports`, `Depends` & `Suggests` are in new section `Config/Needs/verdepcheck` - [ ] Added entry to `NEWS.md` - [ ] Last `scheduled.yaml` action was run succesfully _(all 4 strategies)_ - important: it's not the last commit, it's the one that runs 4 `Scheduled 🕰️ / Dependency` actions - [ ] `scheduled.yaml` SHOULD NOT have any push on any branches ### 🔴 What's needed before merging? This PR depends on some upstream changes that need to be finalized/merged before being ready to review. #### Change in code * `verdepcheck.yml` action (see comments) - [x] Remove `on: push` section - [x] Change branch to main #### PRS - [x] verdepcheck * https://github.com/insightsengineering/verdepcheck/pull/24 * https://github.com/insightsengineering/verdepcheck/pull/26 - [x] verdepcheck-action * https://github.com/insightsengineering/r-verdepcheck-action/pull/16 ### Changes description * Adds minimum version for packages `DESCRIPTION` * Adds `Config/Need/verdepcheck` section in `DESCRIPTION` * Updates verdepcheck action --- .github/workflows/scheduled.yaml | 2 +- DESCRIPTION | 45 +++++++++++++++++++++++++------- NEWS.md | 1 + 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index b752a49b1c..f2ddf68626 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - test-strategy: ["min", "release", "max"] + test-strategy: ["min_cohort", "min_isolated", "release", "max"] uses: insightsengineering/r.pkg.template/.github/workflows/verdepcheck.yaml@main name: Dependency Test - ${{ matrix.test-strategy }} 🔢 secrets: diff --git a/DESCRIPTION b/DESCRIPTION index 1ae1b43168..2bf9a784c9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -35,12 +35,12 @@ Depends: teal.slice (>= 0.4.0.9023), teal.transform (>= 0.4.0.9007) Imports: - checkmate, + checkmate (>= 2.1.0), jsonlite, - lifecycle, + lifecycle (>= 0.2.0), logger (>= 0.2.0), - magrittr, - rlang, + magrittr (>= 1.5), + rlang (>= 1.0.0), shinyjs, stats, teal.logger (>= 0.1.1), @@ -50,20 +50,47 @@ Imports: Suggests: bslib, covr, - dplyr, - knitr, + dplyr (>= 1.0.5), + knitr (>= 1.42), MultiAssayExperiment, R6, - rmarkdown, + rmarkdown (>= 2.19), shinyvalidate, teal.code (>= 0.3.0.9009), testthat (>= 3.1.5), - withr, - yaml + withr (>= 2.1.0), + yaml (>= 1.1.0) VignetteBuilder: knitr RdMacros: lifecycle +Config/Needs/verdepcheck: + rstudio/shiny, + insightsengineering/teal.data, + insightsengineering/teal.slice, + insightsengineering/teal.transform, + mllg/checkmate, + jeroen/jsonlite, + r-lib/lifecycle, + daroczig/logger, + tidyverse/magrittr, + r-lib/rlang, + daattali/shinyjs, + insightsengineering/teal.logger, + insightsengineering/teal.reporter, + insightsengineering/teal.widgets, + rstudio/bslib, + r-lib/covr, + tidyverse/dplyr, + yihui/knitr, + bioc::MultiAssayExperiment, + r-lib/R6, + rstudio/rmarkdown, + rstudio/shinyvalidate, + insightsengineering/teal.code, + r-lib/testthat, + r-lib/withr, + yaml=vubiostat/r-yaml Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 Language: en-US diff --git a/NEWS.md b/NEWS.md index ced36d9dd7..d49897a69b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -15,6 +15,7 @@ ### Bug fixes * Removed `Report previewer` module from mapping matrix display in filter manager. +* Specified minimal version of package dependencies. # teal 0.14.0