Skip to content

Commit

Permalink
Merge branch 'main' into test_examples@main
Browse files Browse the repository at this point in the history
  • Loading branch information
averissimo authored Dec 16, 2024
2 parents 5319f0c + 1599608 commit 926d4d0
Show file tree
Hide file tree
Showing 60 changed files with 284 additions and 290 deletions.
64 changes: 64 additions & 0 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,22 @@ jobs:
checking top-level files .* NOTE
unit-test-report-brand: >-
https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/teal.png
deps-installation-method: setup-r-dependencies
lookup-refs: |
insightsengineering/roxy.shinylive
insightsengineering/teal
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/teal.slice
insightsengineering/tern
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
insightsengineering/nestcolor
r-cmd-non-cran:
name: R CMD Check (non-CRAN) 🧬
uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main
Expand All @@ -64,6 +80,22 @@ jobs:
checking Rd .usage sections .* NOTE
checking for unstated dependencies in vignettes .* NOTE
checking top-level files .* NOTE
deps-installation-method: setup-r-dependencies
lookup-refs: |
insightsengineering/roxy.shinylive
insightsengineering/teal
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/teal.slice
insightsengineering/tern
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
insightsengineering/nestcolor
coverage:
name: Coverage 📔
uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main
Expand All @@ -72,6 +104,22 @@ jobs:
with:
additional-env-vars: |
NOT_CRAN=true
deps-installation-method: setup-r-dependencies
lookup-refs: |
insightsengineering/roxy.shinylive
insightsengineering/teal
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/teal.slice
insightsengineering/tern
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
insightsengineering/nestcolor
linter:
if: github.event_name != 'push'
name: SuperLinter 🦸‍♀️
Expand All @@ -83,6 +131,22 @@ jobs:
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
with:
auto-update: true
deps-installation-method: setup-r-dependencies
lookup-refs: |
insightsengineering/roxy.shinylive
insightsengineering/teal
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/teal.slice
insightsengineering/tern
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
insightsengineering/nestcolor
gitleaks:
name: gitleaks 💧
uses: insightsengineering/r.pkg.template/.github/workflows/gitleaks.yaml@main
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,19 @@ jobs:
with:
default-landing-page: latest-tag
additional-unit-test-report-directories: unit-test-report-non-cran
deps-installation-method: setup-r-dependencies
lookup-refs: |
insightsengineering/roxy.shinylive
insightsengineering/teal
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/teal.slice
insightsengineering/tern
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
insightsengineering/nestcolor
62 changes: 62 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,43 @@ jobs:
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
with:
default-landing-page: latest-tag
deps-installation-method: setup-r-dependencies
lookup-refs: |
insightsengineering/teal
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/tern
insightsengineering/nestcolor
insightsengineering/roxy.shinylive
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
validation:
name: R Package Validation report 📃
needs: release
uses: insightsengineering/r.pkg.template/.github/workflows/validation.yaml@main
secrets:
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
with:
deps-installation-method: setup-r-dependencies
lookup-refs: |
insightsengineering/teal
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/tern
insightsengineering/nestcolor
insightsengineering/roxy.shinylive
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
release:
name: Create release 🎉
uses: insightsengineering/r.pkg.template/.github/workflows/release.yaml@main
Expand All @@ -46,6 +77,21 @@ jobs:
checking top-level files .* NOTE
unit-test-report-brand: >-
https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/teal.png
deps-installation-method: setup-r-dependencies
lookup-refs: |
insightsengineering/roxy.shinylive
insightsengineering/teal
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/tern
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
insightsengineering/nestcolor
coverage:
name: Coverage 📔
needs: [release, docs]
Expand All @@ -55,6 +101,22 @@ jobs:
with:
additional-env-vars: |
NOT_CRAN=true
deps-installation-method: setup-r-dependencies
lookup-refs: |
insightsengineering/roxy.shinylive
insightsengineering/teal
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/teal.slice
insightsengineering/tern
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
insightsengineering/nestcolor
wasm:
name: Build WASM packages 🧑‍🏭
needs: release
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/scheduled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Scheduled 🕰️

on:
schedule:
- cron: '45 3 * * 0'
- cron: "45 3 * * 0"
workflow_dispatch:
inputs:
chosen-workflow:
Expand Down Expand Up @@ -63,12 +63,15 @@ jobs:
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.slice
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/teal.slice
insightsengineering/tern
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
insightsengineering/nestcolor
rhub:
if: >
github.event_name == 'schedule' || (
Expand All @@ -84,9 +87,12 @@ jobs:
insightsengineering/teal.transform
insightsengineering/teal.code
insightsengineering/teal.data
insightsengineering/teal.slice
insightsengineering/teal.logger
insightsengineering/teal.reporter
insightsengineering/teal.widgets
insightsengineering/teal.slice
insightsengineering/tern
insightsengineering/formatters
insightsengineering/rtables
insightsengineering/rtables.officer
insightsengineering/nestcolor
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: teal.modules.general
Title: General Modules for 'teal' Applications
Version: 0.3.0.9055
Date: 2024-11-29
Version: 0.3.0.9060
Date: 2024-12-16
Authors@R: c(
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
person("Pawel", "Rucki", , "[email protected]", role = "aut"),
Expand All @@ -27,7 +27,7 @@ Depends:
ggplot2 (>= 3.4.0),
R (>= 3.6),
shiny (>= 1.6.0),
teal (>= 0.15.2.9079),
teal (>= 0.15.2.9091),
teal.transform (>= 0.5.0.9015)
Imports:
checkmate (>= 2.1.0),
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# teal.modules.general 0.3.0.9055
# teal.modules.general 0.3.0.9060

* Removed `Show Warnings` modals from modules.

Expand Down
39 changes: 0 additions & 39 deletions R/data.R

This file was deleted.

4 changes: 2 additions & 2 deletions R/tm_a_pca.R
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#' ```
#'
#' For additional details and examples of decorators, refer to the vignette
#' `vignette("decorate-modules-output", package = "teal")` or the [`teal_transform_module()`] documentation.
#' `vignette("decorate-modules-output", package = "teal")` or the [`teal::teal_transform_module()`] documentation.
#'
#' @examplesShinylive
#' library(teal.modules.general)
Expand Down Expand Up @@ -93,7 +93,7 @@
#' data <- teal_data()
#' data <- within(data, {
#' require(nestcolor)
#' ADSL <- rADSL
#' ADSL <- teal.data::rADSL
#' })
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
#'
Expand Down
4 changes: 2 additions & 2 deletions R/tm_a_regression.R
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#' - `plot` (`ggplot2`)
#'
#' For additional details and examples of decorators, refer to the vignette
#' `vignette("decorate-modules-output", package = "teal")` or the [`teal_transform_module()`] documentation.
#' `vignette("decorate-modules-output", package = "teal")` or the [`teal::teal_transform_module()`] documentation.
#'
#' @examplesShinylive
#' library(teal.modules.general)
Expand Down Expand Up @@ -106,7 +106,7 @@
#' data <- teal_data()
#' data <- within(data, {
#' require(nestcolor)
#' ADSL <- rADSL
#' ADSL <- teal.data::rADSL
#' })
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
#'
Expand Down
4 changes: 2 additions & 2 deletions R/tm_data_table.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#' - `table` ([DT::datatable()])
#'
#' For additional details and examples of decorators, refer to the vignette
#' `vignette("decorate-modules-output", package = "teal")` or the [`teal_transform_module()`] documentation.
#' `vignette("decorate-modules-output", package = "teal")` or the [`teal::teal_transform_module()`] documentation.
#'
#' @examplesShinylive
#' library(teal.modules.general)
Expand Down Expand Up @@ -74,7 +74,7 @@
#' data <- teal_data()
#' data <- within(data, {
#' require(nestcolor)
#' ADSL <- rADSL
#' ADSL <- teal.data::rADSL
#' })
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
#'
Expand Down
2 changes: 1 addition & 1 deletion R/tm_front_page.R
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#' data <- teal_data()
#' data <- within(data, {
#' require(nestcolor)
#' ADSL <- rADSL
#' ADSL <- teal.data::rADSL
#' attr(ADSL, "metadata") <- list("Author" = "NEST team", "data_source" = "synthetic data")
#' })
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
Expand Down
4 changes: 2 additions & 2 deletions R/tm_g_association.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#' - `plot` (`grob` created with [ggplot2::ggplotGrob()])
#'
#' For additional details and examples of decorators, refer to the vignette
#' `vignette("decorate-modules-output", package = "teal")` or the [`teal_transform_module()`] documentation.
#' `vignette("decorate-modules-output", package = "teal")` or the [`teal::teal_transform_module()`] documentation.
#'
#' @examplesShinylive
#' library(teal.modules.general)
Expand Down Expand Up @@ -86,7 +86,7 @@
#' data <- teal_data()
#' data <- within(data, {
#' require(nestcolor)
#' ADSL <- rADSL
#' ADSL <- teal.data::rADSL
#' })
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
#'
Expand Down
Loading

0 comments on commit 926d4d0

Please sign in to comment.