Skip to content

Commit 8484c82

Browse files
committed
Merge branch 'main' into 518-pkgs_imports@main
* main: (42 commits) [skip actions] Bump version to 0.3.0.9061 Stop R process if AppDriver fails in `test-examples` (#820) [skip actions] Bump version to 0.3.0.9060 87 remove datasets - decrease package size (#818) [skip actions] Bump version to 0.3.0.9059 Fix documentation note about links on r-devel (#817) [skip actions] Bump version to 0.3.0.9058 get back staged deps config (#816) [skip actions] Bump version to 0.3.0.9057 add setup-r-dependencies (#815) [skip actions] Bump version to 0.3.0.9056 Teal version bump (#814) [skip actions] Bump version to 0.3.0.9055 🗃️ `decorators` feature branch (#795) [skip actions] Bump version to 0.3.0.9054 `teal.data::datanames()` is deprecated in favor of dot-prefix and `names()` (#794) [skip actions] Bump version to 0.3.0.9053 Adds `roxy.shinylive` to pre-commit configuration (#793) [skip actions] Bump version to 0.3.0.9052 add rmarkdown to VignetteBuilder (#792) ...
2 parents 4590f44 + 9d193d3 commit 8484c82

File tree

84 files changed

+3023
-1573
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+3023
-1573
lines changed

.github/workflows/check.yaml

Lines changed: 69 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,22 @@ jobs:
4242
checking top-level files .* NOTE
4343
unit-test-report-brand: >-
4444
https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/teal.png
45+
deps-installation-method: setup-r-dependencies
46+
lookup-refs: |
47+
insightsengineering/roxy.shinylive
48+
insightsengineering/teal
49+
insightsengineering/teal.transform
50+
insightsengineering/teal.code
51+
insightsengineering/teal.data
52+
insightsengineering/teal.logger
53+
insightsengineering/teal.reporter
54+
insightsengineering/teal.widgets
55+
insightsengineering/teal.slice
56+
insightsengineering/tern
57+
insightsengineering/formatters
58+
insightsengineering/rtables
59+
insightsengineering/rtables.officer
60+
insightsengineering/nestcolor
4561
r-cmd-non-cran:
4662
name: R CMD Check (non-CRAN) 🧬
4763
uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main
@@ -51,12 +67,10 @@ jobs:
5167
additional-env-vars: |
5268
_R_CHECK_EXAMPLE_TIMING_THRESHOLD_=11
5369
TESTING_DEPTH=5
70+
NOT_CRAN=true
5471
enforce-note-blocklist: true
55-
publish-unit-test-report-gh-pages: false
56-
junit-xml-comparison: false
5772
concurrency-group: non-cran
58-
disable-unit-test-reports: true
59-
skip-r-cmd-install: true
73+
unit-test-report-directory: unit-test-report-non-cran
6074
note-blocklist: |
6175
checking dependencies in R code .* NOTE
6276
checking R code for possible problems .* NOTE
@@ -66,11 +80,46 @@ jobs:
6680
checking Rd .usage sections .* NOTE
6781
checking for unstated dependencies in vignettes .* NOTE
6882
checking top-level files .* NOTE
83+
deps-installation-method: setup-r-dependencies
84+
lookup-refs: |
85+
insightsengineering/roxy.shinylive
86+
insightsengineering/teal
87+
insightsengineering/teal.transform
88+
insightsengineering/teal.code
89+
insightsengineering/teal.data
90+
insightsengineering/teal.logger
91+
insightsengineering/teal.reporter
92+
insightsengineering/teal.widgets
93+
insightsengineering/teal.slice
94+
insightsengineering/tern
95+
insightsengineering/formatters
96+
insightsengineering/rtables
97+
insightsengineering/rtables.officer
98+
insightsengineering/nestcolor
6999
coverage:
70100
name: Coverage 📔
71101
uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main
72102
secrets:
73103
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
104+
with:
105+
additional-env-vars: |
106+
NOT_CRAN=true
107+
deps-installation-method: setup-r-dependencies
108+
lookup-refs: |
109+
insightsengineering/roxy.shinylive
110+
insightsengineering/teal
111+
insightsengineering/teal.transform
112+
insightsengineering/teal.code
113+
insightsengineering/teal.data
114+
insightsengineering/teal.logger
115+
insightsengineering/teal.reporter
116+
insightsengineering/teal.widgets
117+
insightsengineering/teal.slice
118+
insightsengineering/tern
119+
insightsengineering/formatters
120+
insightsengineering/rtables
121+
insightsengineering/rtables.officer
122+
insightsengineering/nestcolor
74123
linter:
75124
if: github.event_name != 'push'
76125
name: SuperLinter 🦸‍♀️
@@ -82,6 +131,22 @@ jobs:
82131
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
83132
with:
84133
auto-update: true
134+
deps-installation-method: setup-r-dependencies
135+
lookup-refs: |
136+
insightsengineering/roxy.shinylive
137+
insightsengineering/teal
138+
insightsengineering/teal.transform
139+
insightsengineering/teal.code
140+
insightsengineering/teal.data
141+
insightsengineering/teal.logger
142+
insightsengineering/teal.reporter
143+
insightsengineering/teal.widgets
144+
insightsengineering/teal.slice
145+
insightsengineering/tern
146+
insightsengineering/formatters
147+
insightsengineering/rtables
148+
insightsengineering/rtables.officer
149+
insightsengineering/nestcolor
85150
gitleaks:
86151
name: gitleaks 💧
87152
uses: insightsengineering/r.pkg.template/.github/workflows/gitleaks.yaml@main

.github/workflows/docs.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,20 @@ jobs:
4141
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
4242
with:
4343
default-landing-page: latest-tag
44+
additional-unit-test-report-directories: unit-test-report-non-cran
45+
deps-installation-method: setup-r-dependencies
46+
lookup-refs: |
47+
insightsengineering/roxy.shinylive
48+
insightsengineering/teal
49+
insightsengineering/teal.transform
50+
insightsengineering/teal.code
51+
insightsengineering/teal.data
52+
insightsengineering/teal.logger
53+
insightsengineering/teal.reporter
54+
insightsengineering/teal.widgets
55+
insightsengineering/teal.slice
56+
insightsengineering/tern
57+
insightsengineering/formatters
58+
insightsengineering/rtables
59+
insightsengineering/rtables.officer
60+
insightsengineering/nestcolor

.github/workflows/on-demand.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/workflows/release.yaml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,43 @@ jobs:
1616
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
1717
with:
1818
default-landing-page: latest-tag
19+
deps-installation-method: setup-r-dependencies
20+
lookup-refs: |
21+
insightsengineering/teal
22+
insightsengineering/teal.transform
23+
insightsengineering/teal.code
24+
insightsengineering/teal.data
25+
insightsengineering/teal.logger
26+
insightsengineering/teal.reporter
27+
insightsengineering/teal.widgets
28+
insightsengineering/tern
29+
insightsengineering/nestcolor
30+
insightsengineering/roxy.shinylive
31+
insightsengineering/formatters
32+
insightsengineering/rtables
33+
insightsengineering/rtables.officer
1934
validation:
2035
name: R Package Validation report 📃
2136
needs: release
2237
uses: insightsengineering/r.pkg.template/.github/workflows/validation.yaml@main
2338
secrets:
2439
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
40+
with:
41+
deps-installation-method: setup-r-dependencies
42+
lookup-refs: |
43+
insightsengineering/teal
44+
insightsengineering/teal.transform
45+
insightsengineering/teal.code
46+
insightsengineering/teal.data
47+
insightsengineering/teal.logger
48+
insightsengineering/teal.reporter
49+
insightsengineering/teal.widgets
50+
insightsengineering/tern
51+
insightsengineering/nestcolor
52+
insightsengineering/roxy.shinylive
53+
insightsengineering/formatters
54+
insightsengineering/rtables
55+
insightsengineering/rtables.officer
2556
release:
2657
name: Create release 🎉
2758
uses: insightsengineering/r.pkg.template/.github/workflows/release.yaml@main
@@ -46,9 +77,47 @@ jobs:
4677
checking top-level files .* NOTE
4778
unit-test-report-brand: >-
4879
https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/teal.png
80+
deps-installation-method: setup-r-dependencies
81+
lookup-refs: |
82+
insightsengineering/roxy.shinylive
83+
insightsengineering/teal
84+
insightsengineering/teal.transform
85+
insightsengineering/teal.code
86+
insightsengineering/teal.data
87+
insightsengineering/teal.logger
88+
insightsengineering/teal.reporter
89+
insightsengineering/teal.widgets
90+
insightsengineering/tern
91+
insightsengineering/formatters
92+
insightsengineering/rtables
93+
insightsengineering/rtables.officer
94+
insightsengineering/nestcolor
4995
coverage:
5096
name: Coverage 📔
5197
needs: [release, docs]
5298
uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main
5399
secrets:
54100
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
101+
with:
102+
additional-env-vars: |
103+
NOT_CRAN=true
104+
deps-installation-method: setup-r-dependencies
105+
lookup-refs: |
106+
insightsengineering/roxy.shinylive
107+
insightsengineering/teal
108+
insightsengineering/teal.transform
109+
insightsengineering/teal.code
110+
insightsengineering/teal.data
111+
insightsengineering/teal.logger
112+
insightsengineering/teal.reporter
113+
insightsengineering/teal.widgets
114+
insightsengineering/teal.slice
115+
insightsengineering/tern
116+
insightsengineering/formatters
117+
insightsengineering/rtables
118+
insightsengineering/rtables.officer
119+
insightsengineering/nestcolor
120+
wasm:
121+
name: Build WASM packages 🧑‍🏭
122+
needs: release
123+
uses: insightsengineering/r.pkg.template/.github/workflows/wasm.yaml@main

.github/workflows/scheduled.yaml

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,28 @@ name: Scheduled 🕰️
33

44
on:
55
schedule:
6-
- cron: '45 3 * * 0'
6+
- cron: "45 3 * * 0"
77
workflow_dispatch:
8+
inputs:
9+
chosen-workflow:
10+
description: |
11+
Select which workflow you'd like to run
12+
required: true
13+
type: choice
14+
default: rhub
15+
options:
16+
- rhub
17+
- dependency-test
18+
- branch-cleanup
19+
- revdepcheck
820

921
jobs:
1022
dependency-test:
23+
if: >
24+
github.event_name == 'schedule' || (
25+
github.event_name == 'workflow_dispatch' &&
26+
inputs.chosen-workflow == 'dependency-test'
27+
)
1128
strategy:
1229
fail-fast: false
1330
matrix:
@@ -22,7 +39,60 @@ jobs:
2239
additional-env-vars: |
2340
PKG_SYSREQS_DRY_RUN=true
2441
branch-cleanup:
42+
if: >
43+
github.event_name == 'schedule' || (
44+
github.event_name == 'workflow_dispatch' &&
45+
inputs.chosen-workflow == 'branch-cleanup'
46+
)
2547
name: Branch Cleanup 🧹
2648
uses: insightsengineering/r.pkg.template/.github/workflows/branch-cleanup.yaml@main
2749
secrets:
2850
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
51+
revdepcheck:
52+
if: >
53+
github.event_name == 'schedule' || (
54+
github.event_name == 'workflow_dispatch' &&
55+
inputs.chosen-workflow == 'revdepcheck'
56+
)
57+
name: revdepcheck ↩️
58+
uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main
59+
with:
60+
lookup-refs: |
61+
insightsengineering/roxy.shinylive
62+
insightsengineering/teal
63+
insightsengineering/teal.transform
64+
insightsengineering/teal.code
65+
insightsengineering/teal.data
66+
insightsengineering/teal.logger
67+
insightsengineering/teal.reporter
68+
insightsengineering/teal.widgets
69+
insightsengineering/teal.slice
70+
insightsengineering/tern
71+
insightsengineering/formatters
72+
insightsengineering/rtables
73+
insightsengineering/rtables.officer
74+
insightsengineering/nestcolor
75+
rhub:
76+
if: >
77+
github.event_name == 'schedule' || (
78+
github.event_name == 'workflow_dispatch' &&
79+
inputs.chosen-workflow == 'rhub'
80+
)
81+
name: R-hub 🌐
82+
uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main
83+
with:
84+
lookup-refs: |
85+
insightsengineering/roxy.shinylive
86+
insightsengineering/teal
87+
insightsengineering/teal.transform
88+
insightsengineering/teal.code
89+
insightsengineering/teal.data
90+
insightsengineering/teal.logger
91+
insightsengineering/teal.reporter
92+
insightsengineering/teal.widgets
93+
insightsengineering/teal.slice
94+
insightsengineering/tern
95+
insightsengineering/formatters
96+
insightsengineering/rtables
97+
insightsengineering/rtables.officer
98+
insightsengineering/nestcolor

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ vignettes/*.R
2929
coverage.*
3030
tests/testthat/_snaps/**/*.new.md
3131
tests/testthat/_snaps/**/*.new.svg
32+
/doc/
33+
/Meta/

.pre-commit-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
# All available hooks: https://pre-commit.com/hooks.html
33
# R specific hooks: https://github.com/lorenzwalthert/precommit
4-
default_stages: [commit]
4+
default_stages: [pre-commit]
55
default_language_version:
66
python: python3
77
repos:
88
- repo: https://github.com/lorenzwalthert/precommit
9-
rev: v0.4.3
9+
rev: v0.4.3.9003
1010
hooks:
1111
- id: style-files
1212
name: Style code with `styler`
@@ -18,8 +18,6 @@ repos:
1818
- ggmosaic
1919
- ggplot2
2020
- shiny
21-
- teal
22-
- teal.transform
2321
- checkmate
2422
- dplyr
2523
- DT
@@ -33,6 +31,9 @@ repos:
3331
- shinyWidgets
3432
- stats
3533
- stringr
34+
- insightsengineering/roxy.shinylive
35+
- insightsengineering/teal
36+
- insightsengineering/teal.transform
3637
- insightsengineering/teal.code
3738
- insightsengineering/teal.data
3839
- insightsengineering/teal.logger

0 commit comments

Comments
 (0)