Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #2427 general issue adopt data and data raw conventions #2494

Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
11a337f
attempt zero
jimrothstein Aug 6, 2024
eaea9d6
2427_adopt_data_data_raw_conventions-FIrst
jimrothstein Aug 8, 2024
95b4eca
2427 ..DRAFT .. except for a few comments to be removed, this is alm…
jimrothstein Aug 16, 2024
2bd4290
Issue 2427 first serious attempt for example_qs.rda, see comments
jimrothstein Aug 23, 2024
f16131d
2427_ ran spelling, styler, lintr, but it dislikes use of source()
jimrothstein Aug 25, 2024
bd67872
Merge branch 'main' into 2427_general_issue_adopt_data_and_data_raw_c…
jimrothstein Aug 25, 2024
05d16aa
2427 removed data-raw/test.R and old_data/example_qs.rda. This means…
jimrothstein Aug 25, 2024
f70b75e
2427 EXPERIMENT ... data-raw/example_qs.R ... commented out library c…
jimrothstein Aug 26, 2024
6e41535
EXPERIMENT 2 - remove unnecessary commnets;
jimrothstein Aug 26, 2024
14e144b
EXPERIMENT 3 - hys_law.Rmd missing close paraenthesis at end of FDA url.
jimrothstein Aug 26, 2024
c1d6cc1
EXPERIMENT 4 (1) admiraldev is REQUIRED or vignette won't build (2)…
jimrothstein Aug 26, 2024
732febc
2427 Add URL: https://www.fda.gov/media/116737/download to .lycheeign…
jimrothstein Aug 28, 2024
b1c9ab5
2427 EXPERIMENT, remove fda from .lycheeignore; change title of fda link
jimrothstein Aug 28, 2024
4c75094
2427 EXPERIMENT restore fda link to .ycheeignore; it is essential
jimrothstein Aug 28, 2024
bd38b56
2427 ... add to WORDLIST
jimrothstein Aug 28, 2024
d50daa4
#2427 derive_single_dose should work.
jimrothstein Aug 29, 2024
dceaca3
Merge branch 'main' into 2427_general_issue_adopt_data_and_data_raw_c…
bms63 Sep 4, 2024
26e9313
Issue #2427 Code for atoxgr*.rda move to data-raw/
jimrothstein Sep 4, 2024
4a6ecdf
2427 git pull to keep my local branch up-to-date
jimrothstein Sep 4, 2024
8c7257d
Remove unnecessary comment.
jimrothstein Sep 4, 2024
aeaed83
EXPERIMENT: Is newly created dataset data/admiral_adlb.rda identica…
jimrothstein Sep 5, 2024
d79b080
EXPERIMENT ... Generate data/admiral_adlb.rda using template, tempora…
jimrothstein Sep 9, 2024
48f8934
Cleaned create_admiral_adlb.R code. Calls template, then script to …
jimrothstein Sep 10, 2024
dcf8719
correct spelling; add short note to helper script (create_admiral_adl…
jimrothstein Sep 13, 2024
1bcb848
experiment: 2 files (create_admiral_*.R) to create admiral_adlb.rda,…
jimrothstein Sep 17, 2024
f6aa82f
add diffdf and key to track differences
jimrothstein Sep 24, 2024
a5bb4f1
update my branch with latest main
jimrothstein Sep 24, 2024
d89ce0c
Ran styler::style_pkg()
jimrothstein Sep 27, 2024
ff67700
re-run roxygen
jimrothstein Sep 27, 2024
0076b24
Apply # nolint; NOTE: library(lintr) has many options. For example…
jimrothstein Sep 30, 2024
873f163
Apply # nolint; NOTE: library(lintr) has many options. For example…
jimrothstein Sep 30, 2024
1456d5e
fixing
jimrothstein Sep 30, 2024
cd5244b
manged to mangle git. Do not think need file with purl. (Delete it?…
jimrothstein Sep 30, 2024
678a46e
remove purl_adsl_vignette.R; added by error
jimrothstein Oct 1, 2024
1323f8c
merge local branch 2427 with upstream
jimrothstein Oct 2, 2024
392cdfe
chore: #2427 developer news
bms63 Oct 3, 2024
1850a8a
chore: #2427 spelling
bms63 Oct 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@
^\.devcontainer$
^vignettes/articles$
^inst/cheatsheet$
^data-raw$
^doc$
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need the data-raw here as it isn't part of R package structure.

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/
Comment on lines +57 to +58
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need these?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we can include, but why do we need them?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this goes with the doc folder being igrnore in the build. Can we just remove the doc one please? What is the Meta for?

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

Binary file added data-raw/adlb_grading/adlb_grading_spec.xlsx
Binary file not shown.
22 changes: 22 additions & 0 deletions data-raw/adlb_grading/atoxgr_sources.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
atoxgr_criteria <- system.file("adlb_grading/adlb_grading_spec.xlsx", package = "admiral")
# Contrary to our usual convention the use of `::` here is explicit. This way we
# avoid having to list {readxl} in "Imports" and instead get away with just
# listing it in "Depends".

atoxgr_criteria_ctcv4 <- atoxgr_criteria %>%
readxl::read_excel(sheet = "NCICTCAEv4") %>%
dplyr::mutate(GRADE_CRITERIA_CODE = gsub("[\r\n]", " ", GRADE_CRITERIA_CODE))

usethis::use_data(atoxgr_criteria_ctcv4, overwrite = TRUE)

atoxgr_criteria_ctcv5 <- atoxgr_criteria %>%
readxl::read_excel(sheet = "NCICTCAEv5") %>%
dplyr::mutate(GRADE_CRITERIA_CODE = gsub("[\r\n]", " ", GRADE_CRITERIA_CODE))

use_data(atoxgr_criteria_ctcv5, overwrite = TRUE)

atoxgr_criteria_daids <- atoxgr_criteria %>%
readxl::read_excel(sheet = "DAIDS") %>%
dplyr::mutate(GRADE_CRITERIA_CODE = gsub("[\r\n]", " ", GRADE_CRITERIA_CODE))

use_data(atoxgr_criteria_daids, overwrite = TRUE)
Loading
Loading