Skip to content

Commit

Permalink
Merge branch 'main' into teal_refactor@main
Browse files Browse the repository at this point in the history
  • Loading branch information
gogonzo committed Sep 8, 2022
2 parents 2285af7 + ba13bb2 commit a5c454a
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 38 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ on:
- ready_for_review
branches:
- main
- pre-release
push:
branches:
- main
- pre-release
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -72,3 +70,7 @@ jobs:
uses: insightsengineering/r.pkg.template/.github/workflows/style.yaml@main
with:
auto-update: true
grammar:
if: github.event_name == 'pull_request'
name: Grammar Check 🔤
uses: insightsengineering/r.pkg.template/.github/workflows/grammar.yaml@main
1 change: 0 additions & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ on:
- ready_for_review
branches:
- main
- pre-release
paths:
- "inst/templates/**"
- "_pkgdown.y[a]ml"
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/validate.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .lintr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
linters: with_defaults(
linters: linters_with_defaults(
line_length_linter = line_length_linter(120),
cyclocomp_linter = NULL,
object_usage_linter = NULL
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: teal.code
Title: Code storage and execution class for teal applications
Version: 0.1.1.9006
Date: 2022-06-09
Version: 0.1.1.9007
Date: 2022-09-06
Authors@R: c(
person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")),
person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"),
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.code 0.1.1.9006
# teal.code 0.1.1.9007

### Miscellaneous
* Removed the `%<chunk%` operator. Please use `chunks_push` instead.
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,17 @@ A stable release of all `NEST` packages from June 2022 is also available [here](

You might need to manually install all of the package dependencies before installing this package as without
the `dependencies = FALSE` argument to `install_github` it may produce an error.

## Stargazers and Forkers

### Stargazers over time

[![Stargazers over time](https://starchart.cc/insightsengineering/teal.code.svg)](https://starchart.cc/insightsengineering/teal.code)

### Stargazers

[![Stargazers repo roster for @insightsengineering/teal.code](https://reporoster.com/stars/insightsengineering/teal.code)](https://github.com/insightsengineering/teal.code/stargazers)

### Forkers

[![Forkers repo roster for @insightsengineering/teal.code](https://reporoster.com/forks/insightsengineering/teal.code)](https://github.com/insightsengineering/teal.code/network/members)
2 changes: 2 additions & 0 deletions inst/WORDLIST
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ Reproducibility
UI
funder
reproducibility
repo
Forkers
17 changes: 2 additions & 15 deletions tests/testthat.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
pkg_name <- "teal.code"
if (requireNamespace("testthat", quietly = TRUE)) {
library(testthat)
is_on_ci <- isTRUE(as.logical(Sys.getenv("CI")))
if (is_on_ci) {
reporter <- MultiReporter$new(list(
CheckReporter$new(),
JunitReporter$new(file = "junit-result.xml")
))
test_results <- test_check(pkg_name, reporter = reporter)
saveRDS(test_results, "unit_testing_results.rds")
} else {
reporter <- ParallelProgressReporter$new()
test_check(pkg_name, reporter = reporter)
}
}
library(pkg_name, character.only = TRUE)
testthat::test_check(pkg_name)
1 change: 0 additions & 1 deletion vignettes/teal-code.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ The reproducible code displayed for outputs in `teal` is always made from three
- Checking data reproducibility

3. Teal Module Analysis Code which includes:
- [Data merging](https://insightsengineering.github.io/teal.transform/articles/transforming-teal-data) (optional)
- Filtering and encodings
- Data analysis/visualization

Expand Down

0 comments on commit a5c454a

Please sign in to comment.