From 70b2f0368a066bbaea3ce6c9db1f781be985be6e 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, 10 Jul 2023 17:39:09 +0200 Subject: [PATCH 01/12] feat: adds minimal versions for packages --- DESCRIPTION | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5b5d4197..cb57c614 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,21 +17,21 @@ License: Apache License 2.0 | file LICENSE Depends: R (>= 3.6) Imports: - checkmate, - dplyr (>= 1.1.2), - lifecycle, - lubridate, - magrittr, - rlang, - stringr, - tibble, - tidyr, - yaml + checkmate (>= 2.1.0), + dplyr (>= 1.1.1), + lifecycle (>= 1.0.3), + lubridate (>= 1.7.10), + magrittr (>= 1.5), + rlang (>= 1.1.0), + stringr (>= 1.4.1), + tibble (>= 3.2.0), + tidyr (>= 1.1.4), + yaml (>= 2.1.19) Suggests: diffdf, - knitr, - rmarkdown, - testthat (>= 3.0) + knitr (>= 1.34), + rmarkdown (>= 2.19), + testthat (>= 3.0.4) VignetteBuilder: knitr RdMacros: @@ -43,3 +43,18 @@ Language: en-US LazyData: true Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.3 +Config/Needs/verdepcheck: + mllg/checkmate, + tidyverse/dplyr, + r-lib/lifecycle, + tidyverse/lubridate, + tidyverse/magrittr, + r-lib/rlang, + tidyverse/stringr, + tidyverse/tibble, + tidyverse/tidyr, + yaml=vubiostat/r-yaml, + gowerc/diffdf, + yihui/knitr, + rstudio/rmarkdown, + r-lib/testthat From 8198631cdd04990319f82635c7afa98064ab045e 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, 10 Jul 2023 17:39:55 +0200 Subject: [PATCH 02/12] tmp: adds temporary paths and run action on push to branch --- .github/workflows/scheduled.yaml | 2 +- .github/workflows/verdepcheck_tmp.yml | 37 +++++++++++++++++++++++++++ DESCRIPTION | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/verdepcheck_tmp.yml diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index b752a49b..ff4ae896 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/.github/workflows/verdepcheck_tmp.yml b/.github/workflows/verdepcheck_tmp.yml new file mode 100644 index 00000000..4399da6c --- /dev/null +++ b/.github/workflows/verdepcheck_tmp.yml @@ -0,0 +1,37 @@ +# ######################################################### +# +# _ +# | | +# _ __ ___ _ __ ___ _____ _____ _ __ ___ ___| | +# | '__/ _ \ '_ ` _ \ / _ \ \ / / _ \ | '_ ` _ \ / _ \ | +# | | | __/ | | | | | (_) \ V / __/ | | | | | | __/_| +# |_| \___|_| |_| |_|\___/ \_/ \___| |_| |_| |_|\___(_) +# +# +# +# Remove me! This file should be removed before merging +# This works for testing purposes only +# ######################################################## +--- +name: Scheduled 🕰️ + +on: + push: + branches: + - verdepcheck_action + +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@main + 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 cb57c614..741a0260 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -24,7 +24,7 @@ Imports: magrittr (>= 1.5), rlang (>= 1.1.0), stringr (>= 1.4.1), - tibble (>= 3.2.0), + tibble (>= 3.2.1), tidyr (>= 1.1.4), yaml (>= 2.1.19) Suggests: From cefbd5e293220df531ca83d5d290a76342a77cf7 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, 10 Jul 2023 18:18:52 +0200 Subject: [PATCH 03/12] fix: typos on strategy and using previous verdepcheck --- .github/workflows/verdepcheck_tmp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verdepcheck_tmp.yml b/.github/workflows/verdepcheck_tmp.yml index 4399da6c..42fde7b2 100644 --- a/.github/workflows/verdepcheck_tmp.yml +++ b/.github/workflows/verdepcheck_tmp.yml @@ -25,8 +25,8 @@ jobs: strategy: fail-fast: false matrix: - test-strategy: ["min_cohort", "min_isolated_", "release", "max"] - uses: insightsengineering/r.pkg.template/.github/workflows/verdepcheck.yaml@main + test-strategy: ["min_cohort", "min_isolated", "release", "max"] + uses: averissimo/r.pkg.template/.github/workflows/verdepcheck.yaml@training-improvements name: Dependency Test - ${{ matrix.test-strategy }} 🔢 secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} From 6f94c33b2ed5a6070f18b9e9254b61939c47fccd 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, 11 Jul 2023 10:36:46 +0200 Subject: [PATCH 04/12] rever back to insightsengineering action with custom branch --- .github/workflows/verdepcheck_tmp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verdepcheck_tmp.yml b/.github/workflows/verdepcheck_tmp.yml index 42fde7b2..c318d2e5 100644 --- a/.github/workflows/verdepcheck_tmp.yml +++ b/.github/workflows/verdepcheck_tmp.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: test-strategy: ["min_cohort", "min_isolated", "release", "max"] - uses: averissimo/r.pkg.template/.github/workflows/verdepcheck.yaml@training-improvements + 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 }} From efd79dccb884dafdd52a4b60ea0a5cea371a09ab 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, 18 Jul 2023 12:22:01 +0200 Subject: [PATCH 05/12] chore: update NEWS and moves temporary action to main one --- .github/workflows/scheduled.yaml | 8 +++++- .github/workflows/verdepcheck_tmp.yml | 37 --------------------------- NEWS.md | 24 ++++++++++++----- 3 files changed, 24 insertions(+), 45 deletions(-) delete mode 100644 .github/workflows/verdepcheck_tmp.yml diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index ff4ae896..e3a6a44b 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -5,13 +5,19 @@ 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"] + 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/.github/workflows/verdepcheck_tmp.yml b/.github/workflows/verdepcheck_tmp.yml deleted file mode 100644 index c318d2e5..00000000 --- a/.github/workflows/verdepcheck_tmp.yml +++ /dev/null @@ -1,37 +0,0 @@ -# ######################################################### -# -# _ -# | | -# _ __ ___ _ __ ___ _____ _____ _ __ ___ ___| | -# | '__/ _ \ '_ ` _ \ / _ \ \ / / _ \ | '_ ` _ \ / _ \ | -# | | | __/ | | | | | (_) \ V / __/ | | | | | | __/_| -# |_| \___|_| |_| |_|\___/ \_/ \___| |_| |_| |_|\___(_) -# -# -# -# Remove me! This file should be removed before merging -# This works for testing purposes only -# ######################################################## ---- -name: Scheduled 🕰️ - -on: - push: - branches: - - verdepcheck_action - -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/NEWS.md b/NEWS.md index 65c49f8d..21beed1b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,9 @@ ### New features * Asynchronous cached data updates in `rebuild_cached_data` vignette - data is only updated if its (or its dependency's) source file has been updated. +### Miscellaneous +* Specify minimal version of dependent packages. + # random.cdisc.data 0.3.14 ### Breaking changes @@ -13,10 +16,17 @@ ### New features * Added new random dataset generator: Anti-Drug Antibody Analysis Dataset (`radab`). -* Added new random dataset generator: EORTC QLQ-C30 V3 Analysis Dataset (`radqlqc`). + +### Bug fixes +* Updated all the `ANL01FL` `NA` values to `""` in `adae`. +* Updated `DVDECOD` and `DVSCAT` values in `addv`. +* Fixed `adtm` calculations so that records with same `AVISIT` have the same `ADTM` for each patient. +* Fixed checks for `na_percentage` argument that is in most datasets. +* Updated package for breaking changes in `tidyselect`. +* Updated `adtte` so that the events, analysis values and censor values make logical sense. ### Enhancements -* Added variables `ASTDY`, `AENDY`, `EXDOSFRQ`, `EXROUTE`, `VISIT`, `VISITDY`, `EXSTDTC`, `EXENDTC`, `EXSTDY`, +* Added variables `ASTDY`, `AENDY`, `EXDOSFRQ`, `EXROUTE`, `VISIT`, `VISITDY`, `EXSTDTC`, `EXENDTC`, `EXSTDY`, `EXENDY`, `TRTSDT`, and `TRTEDT` to `adex`. * Added more default `PARAM`s and new variables `PPSTINT`, `PPENINT`, `REGIMEN`, and `PKARMCD` to `adpp`. * Added `TNE` to `PARAMCD`, `Total Number of Exacerbations` to `PARAM`, and new variable `lgTMATRSK` to `adtte`. @@ -26,13 +36,13 @@ * Added variable `ATIREL` to `admh`. * Added variables `CMSTRTPT`, `CMENRTPT`, `ADURN`, and `ADURU` to `adcm`. * Added variables `AESCONG`, `AESDISAB`, `AESHOSP`, `AESLIFE`, `AESMIE`, and `LDOSEDTM` to `adae`. -* Added parameter `with_trt02` to `radsl` to make the second treatment period available. When `with_trt02 = TRUE` - (default), add variables `TRT02A`, `TRT02P`, `TRT02SDTM`, `TRT02EDTM`, `AP02SDTM`, `AP02EDTM`, `TRT01SDTM`, +* Added parameter `with_trt02` to `radsl` to make the second treatment period available. When `with_trt02 = TRUE` + (default), add variables `TRT02A`, `TRT02P`, `TRT02SDTM`, `TRT02EDTM`, `AP02SDTM`, `AP02EDTM`, `TRT01SDTM`, `TRT01EDTM`, `AP01SDTM`, and `AP01EDTM` to `adsl`, and set `TRTSDTM` as `TRT01SDTM`, `TRTEDTM` as `TRT02EDTM`. * Added variable `LDRELTM` to `adae`. -* Aligned logic for `ADTM`, `ADY`, and `ONTRTFL` variables with `AVISIT` where applicable within `adeg`, `adlb`, +* Aligned logic for `ADTM`, `ADY`, and `ONTRTFL` variables with `AVISIT` where applicable within `adeg`, `adlb`, `adqs`, `adsub`, `adtr`, and `advs`. -* Made `AVAL` values more realistic and updated derivations of `ANRIND`, `*STRESC`, and `LOQFL` to depend on value +* Made `AVAL` values more realistic and updated derivations of `ANRIND`, `*STRESC`, and `LOQFL` to depend on value of `PARAMCD` in `adlb` and `advs`. * Added tests to increase package test coverage. * Added "datetime" and "date" as valid variable types to apply in `apply_metadata`. @@ -58,7 +68,7 @@ * Refactor `adpc` and `adab` following the new CDISC standard. * Refactor `abab` parameters and visits to align with `adpc`. * Skipping examples in `h_adqlqc` documentation. -* Changed example in `apply_metadata` to reduce example run time. +* Changed example in `apply_metadata` to reduce example run time. # random.cdisc.data 0.3.13 From fc3a0dbfb511830f9d8e56bfc94947c4decb6e90 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, 18 Jul 2023 12:26:57 +0200 Subject: [PATCH 06/12] chore: rebased against origin/main --- NEWS.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/NEWS.md b/NEWS.md index 21beed1b..c743ce73 100644 --- a/NEWS.md +++ b/NEWS.md @@ -16,14 +16,7 @@ ### New features * Added new random dataset generator: Anti-Drug Antibody Analysis Dataset (`radab`). - -### Bug fixes -* Updated all the `ANL01FL` `NA` values to `""` in `adae`. -* Updated `DVDECOD` and `DVSCAT` values in `addv`. -* Fixed `adtm` calculations so that records with same `AVISIT` have the same `ADTM` for each patient. -* Fixed checks for `na_percentage` argument that is in most datasets. -* Updated package for breaking changes in `tidyselect`. -* Updated `adtte` so that the events, analysis values and censor values make logical sense. +* Added new random dataset generator: EORTC QLQ-C30 V3 Analysis Dataset (`radqlqc`). ### Enhancements * Added variables `ASTDY`, `AENDY`, `EXDOSFRQ`, `EXROUTE`, `VISIT`, `VISITDY`, `EXSTDTC`, `EXENDTC`, `EXSTDY`, From 099f0d9176a4ea25bdc600779497ef3973a526ad 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, 18 Jul 2023 12:27:59 +0200 Subject: [PATCH 07/12] fix: typo on branch name --- .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 e3a6a44b..e5174e1b 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@main + 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 }} From 84777ea6b0e2961e8da69978ed5df869c300c052 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, 18 Jul 2023 12:39:46 +0200 Subject: [PATCH 08/12] chore: re-adds some extra spaces on older NEWS items --- NEWS.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/NEWS.md b/NEWS.md index c743ce73..25546350 100644 --- a/NEWS.md +++ b/NEWS.md @@ -19,7 +19,7 @@ * Added new random dataset generator: EORTC QLQ-C30 V3 Analysis Dataset (`radqlqc`). ### Enhancements -* Added variables `ASTDY`, `AENDY`, `EXDOSFRQ`, `EXROUTE`, `VISIT`, `VISITDY`, `EXSTDTC`, `EXENDTC`, `EXSTDY`, +* Added variables `ASTDY`, `AENDY`, `EXDOSFRQ`, `EXROUTE`, `VISIT`, `VISITDY`, `EXSTDTC`, `EXENDTC`, `EXSTDY`, `EXENDY`, `TRTSDT`, and `TRTEDT` to `adex`. * Added more default `PARAM`s and new variables `PPSTINT`, `PPENINT`, `REGIMEN`, and `PKARMCD` to `adpp`. * Added `TNE` to `PARAMCD`, `Total Number of Exacerbations` to `PARAM`, and new variable `lgTMATRSK` to `adtte`. @@ -29,13 +29,13 @@ * Added variable `ATIREL` to `admh`. * Added variables `CMSTRTPT`, `CMENRTPT`, `ADURN`, and `ADURU` to `adcm`. * Added variables `AESCONG`, `AESDISAB`, `AESHOSP`, `AESLIFE`, `AESMIE`, and `LDOSEDTM` to `adae`. -* Added parameter `with_trt02` to `radsl` to make the second treatment period available. When `with_trt02 = TRUE` - (default), add variables `TRT02A`, `TRT02P`, `TRT02SDTM`, `TRT02EDTM`, `AP02SDTM`, `AP02EDTM`, `TRT01SDTM`, +* Added parameter `with_trt02` to `radsl` to make the second treatment period available. When `with_trt02 = TRUE` + (default), add variables `TRT02A`, `TRT02P`, `TRT02SDTM`, `TRT02EDTM`, `AP02SDTM`, `AP02EDTM`, `TRT01SDTM`, `TRT01EDTM`, `AP01SDTM`, and `AP01EDTM` to `adsl`, and set `TRTSDTM` as `TRT01SDTM`, `TRTEDTM` as `TRT02EDTM`. * Added variable `LDRELTM` to `adae`. -* Aligned logic for `ADTM`, `ADY`, and `ONTRTFL` variables with `AVISIT` where applicable within `adeg`, `adlb`, +* Aligned logic for `ADTM`, `ADY`, and `ONTRTFL` variables with `AVISIT` where applicable within `adeg`, `adlb`, `adqs`, `adsub`, `adtr`, and `advs`. -* Made `AVAL` values more realistic and updated derivations of `ANRIND`, `*STRESC`, and `LOQFL` to depend on value +* Made `AVAL` values more realistic and updated derivations of `ANRIND`, `*STRESC`, and `LOQFL` to depend on value of `PARAMCD` in `adlb` and `advs`. * Added tests to increase package test coverage. * Added "datetime" and "date" as valid variable types to apply in `apply_metadata`. @@ -61,7 +61,7 @@ * Refactor `adpc` and `adab` following the new CDISC standard. * Refactor `abab` parameters and visits to align with `adpc`. * Skipping examples in `h_adqlqc` documentation. -* Changed example in `apply_metadata` to reduce example run time. +* Changed example in `apply_metadata` to reduce example run time. # random.cdisc.data 0.3.13 From c1d01b28fe9217f482e4114cc39a7d6efaaa3104 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:10:34 +0200 Subject: [PATCH 09/12] ci: revert action to main branch and update DESCRIPTION --- .github/workflows/scheduled.yaml | 3 +-- DESCRIPTION | 16 +++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index e5174e1b..f9ef1fe6 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -6,7 +6,6 @@ on: - 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 @@ -18,7 +17,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 741a0260..1f27a468 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,20 +29,13 @@ Imports: yaml (>= 2.1.19) Suggests: diffdf, - knitr (>= 1.34), - rmarkdown (>= 2.19), + knitr (>= 1.42), testthat (>= 3.0.4) VignetteBuilder: knitr RdMacros: lifecycle Config/Needs/website: insightsengineering/nesttemplate -Config/testthat/edition: 3 -Encoding: UTF-8 -Language: en-US -LazyData: true -Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.3 Config/Needs/verdepcheck: mllg/checkmate, tidyverse/dplyr, @@ -56,5 +49,10 @@ Config/Needs/verdepcheck: yaml=vubiostat/r-yaml, gowerc/diffdf, yihui/knitr, - rstudio/rmarkdown, r-lib/testthat +Config/testthat/edition: 3 +Encoding: UTF-8 +Language: en-US +LazyData: true +Roxygen: list(markdown = TRUE) +RoxygenNote: 7.2.3 From 65bab867db92ff19ef9c3b0760c80f49c1aa6d3d 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:41:55 +0200 Subject: [PATCH 10/12] ci: remove push on branch to prepare merge --- .github/workflows/scheduled.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index f9ef1fe6..f2ddf686 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -5,11 +5,6 @@ on: schedule: - cron: '45 3 * * 0' workflow_dispatch: - # Section to be removed before action is merged - push: - branches: - - verdepcheck_action - # end of section to be removed jobs: dependency-test: From b952bfd9186ef261709ffb9fb62f6af8c9716819 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:18:45 +0200 Subject: [PATCH 11/12] docs: revert to dplyr 1.1.2 version --- DESCRIPTION | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 1f27a468..1df0bb02 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -18,7 +18,7 @@ Depends: R (>= 3.6) Imports: checkmate (>= 2.1.0), - dplyr (>= 1.1.1), + dplyr (>= 1.1.2), lifecycle (>= 1.0.3), lubridate (>= 1.7.10), magrittr (>= 1.5), @@ -30,6 +30,7 @@ Imports: Suggests: diffdf, knitr (>= 1.42), + rmarkdown (>= 2.19), testthat (>= 3.0.4) VignetteBuilder: knitr @@ -49,6 +50,7 @@ Config/Needs/verdepcheck: yaml=vubiostat/r-yaml, gowerc/diffdf, yihui/knitr, + rstudio/rmarkdown, r-lib/testthat Config/testthat/edition: 3 Encoding: UTF-8 From b3e8d2059af55ea240bd75d54f068369c6c51289 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:20 +0200 Subject: [PATCH 12/12] docs: typo on NEWS.md --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 25546350..d29a37ea 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ * Asynchronous cached data updates in `rebuild_cached_data` vignette - data is only updated if its (or its dependency's) source file has been updated. ### Miscellaneous -* Specify minimal version of dependent packages. +* Specified minimal version of package dependencies. # random.cdisc.data 0.3.14