Skip to content

Commit

Permalink
Merge branch '2481-bug-the-result-of-derive_param_tte-depends-on-the-…
Browse files Browse the repository at this point in the history
…sort-order-of-the-input' of https://github.com/pharmaverse/admiral into 2481-bug-the-result-of-derive_param_tte-depends-on-the-sort-order-of-the-input
  • Loading branch information
ProfessorP-beep committed Nov 19, 2024
2 parents dccdbe1 + 020c9d7 commit 8006891
Show file tree
Hide file tree
Showing 124 changed files with 3,065 additions and 1,543 deletions.
3 changes: 2 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
^\.lycheeignore$
^staged_dependencies.yaml$
^inst/dev_dependencies.R$
^\.devcontainer$
^vignettes/articles$
^inst/cheatsheet$
^data-raw$
^doc$
76 changes: 0 additions & 76 deletions .devcontainer/4.1/devcontainer.json

This file was deleted.

76 changes: 0 additions & 76 deletions .devcontainer/4.2/devcontainer.json

This file was deleted.

76 changes: 0 additions & 76 deletions .devcontainer/devcontainer.json

This file was deleted.

11 changes: 0 additions & 11 deletions .devcontainer/postCreateCommand.sh

This file was deleted.

8 changes: 0 additions & 8 deletions .devcontainer/rstudio-prefs.json

This file was deleted.

5 changes: 0 additions & 5 deletions .devcontainer/rstudio.sh

This file was deleted.

4 changes: 2 additions & 2 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be repor
opening an issue or contacting one or more of the project maintainers.

This Code of Conduct is adapted from the Contributor Covenant
(http://contributor-covenant.org), version 1.0.0, available at
http://contributor-covenant.org/version/1/0/0/
(http://www.contributor-covenant.org), version 1.0.0, available at
http://www.contributor-covenant.org/version/1/0/0/
61 changes: 61 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: R-CMD-check for Snapshot Testing

permissions: read-all

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'release'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- name: Install Development Versions of Dependencies
if: |
!(contains(github.event.commits[0].message, '[skip vbump]') ||
contains(github.event.head_commit.message, '[skip vbump]') ||
github.ref == 'refs/heads/patch'
)
run: |
install.packages("remotes")
remotes::install_github("pharmaverse/admiraldev", ref = "main")
shell: Rscript {0}

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,5 @@ admiral*.tgz
._.DS_Store

.Rprofile
/doc/
/Meta/
1 change: 1 addition & 0 deletions .lycheeignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ https://raw.githubusercontent.com/pharmaverse/admiral/main/inst/cheatsheet/cheat
https://rsc.niaid.nih.gov/clinical-research-sites/daids-adverse-event-grading-tables
https://rsc.niaid.nih.gov/sites/default/files/daidsgradingcorrectedv21.pdf
https://www.fda.gov/media/116737/download

4 changes: 3 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: admiral
Title: ADaM in R Asset Library
Version: 1.1.1.9008
Version: 1.1.1.9028
Authors@R: c(
person("Ben", "Straub", , "[email protected]", role = c("aut", "cre")),
person("Stefan", "Bundfuss", role = "aut",
Expand Down Expand Up @@ -70,6 +70,8 @@ Suggests:
tibble
VignetteBuilder:
knitr
Remotes:
pharmaverse/admiraldev
Config/Needs/website: gert
Config/testthat/edition: 3
Encoding: UTF-8
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export(derive_var_trtdurd)
export(derive_var_trtemfl)
export(derive_vars_aage)
export(derive_vars_atc)
export(derive_vars_cat)
export(derive_vars_computed)
export(derive_vars_crit_flag)
export(derive_vars_dt)
Expand Down Expand Up @@ -253,6 +254,7 @@ importFrom(rlang,as_string)
importFrom(rlang,call2)
importFrom(rlang,call_name)
importFrom(rlang,caller_env)
importFrom(rlang,cnd_muffle)
importFrom(rlang,current_env)
importFrom(rlang,enexpr)
importFrom(rlang,enexprs)
Expand Down
Loading

0 comments on commit 8006891

Please sign in to comment.