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

DRAFT - DO NOT MERGE ⚠️ feat: Reintroduce multiversion docs #2622

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contribution to {admiral}

This outlines how to propose a change to the admiral package. For more detailed info about contributing to {admiral}, and other [pharmaverse packages](https://pharmaverse.org/), please see the [Contribution Guide](https://pharmaverse.github.io/admiral/CONTRIBUTING.html) as well as other Developer Guides in the Articles section of the [{admiraldev} website](https://pharmaverse.github.io/admiraldev/).
This outlines how to propose a change to the admiral package. For more detailed info about contributing to {admiral}, and other [pharmaverse packages](https://pharmaverse.org/), please see the [Contribution Guide](https://pharmaverse.github.io/admiral/cran-release/CONTRIBUTING.html) as well as other Developer Guides in the Articles section of the [{admiraldev} website](https://pharmaverse.github.io/admiraldev/).

Please note that we try to align to best practices used in other R packages' development processes - so veteran developers should be familiar with our processes. However, we do deviate slightly from some best practices and we advise all new contributors to review our package documentation accordingly.

Expand Down Expand Up @@ -59,15 +59,15 @@ If you decide to contribute with code and you're ready to make your first code c
If so, remember to run `devtools::document()` and include the
updated `NAMESPACE` and `.Rd` files in `man/`.
e. Does your code update have any impact on the [ADaM
template](https://pharmaverse.github.io/admiral/articles/admiral.html#starting-a-script)
template](https://pharmaverse.github.io/admiral/cran-release/articles/admiral.html#starting-a-script)
R scripts stored in `inst/templates`?
f. Does your code update have any impact on the vignettes stored in
vignettes?
g. Did you update the Changelog `NEWS.md`?
h. Did you build `{admiral}` site `pkgdown::build_site()` and check
that all affected examples are displayed correctly and that all
new functions occur on the
"[Reference](https://pharmaverse.github.io/admiral/reference/)" page?
"[Reference](https://pharmaverse.github.io/admiral/cran-release/reference/)" page?
4. Once happy with all the updates, make a [pull
request](https://pharmaverse.github.io/admiraldev/articles/git_usage.html#pull-request) to merge to the `main` branch
and link the issue so that it closes after successful merging.
Expand Down
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Thank you for your Pull Request! We have developed this task checklist from the [Development Process Guide](https://pharmaverse.github.io/admiral/CONTRIBUTING.html#detailed-development-process) to help with the final steps of the process. Completing the below tasks helps to ensure our reviewers can maximize their time on your code as well as making sure the admiral codebase remains robust and consistent.
Thank you for your Pull Request! We have developed this task checklist from the [Development Process Guide](https://pharmaverse.github.io/admiral/cran-release/CONTRIBUTING.html#detailed-development-process) to help with the final steps of the process. Completing the below tasks helps to ensure our reviewers can maximize their time on your code as well as making sure the admiral codebase remains robust and consistent.

Please check off each taskbox as an acknowledgment that you completed the task or check off that it is not relevant to your Pull Request. This checklist is part of the Github Action workflows and the Pull Request will not be merged into the `main` branch until you have checked off each task.

Expand All @@ -11,7 +11,7 @@ Please check off each taskbox as an acknowledgment that you completed the task o
- [ ] Run `devtools::document()` so all `.Rd` files in the `man` folder and the `NAMESPACE` file in the project root are updated appropriately
- [ ] Address any updates needed for vignettes and/or templates
- [ ] Update `NEWS.md` under the header `# admiral (development version)` if the changes pertain to a user-facing function (i.e. it has an `@export` tag) or documentation aimed at users (rather than developers). A Developer Notes section is available in `NEWS.md` for tracking developer-facing issues.
- [ ] Build admiral site `pkgdown::build_site()` and check that all affected examples are displayed correctly and that all new functions occur on the "[Reference](https://pharmaverse.github.io/admiral/reference/index.html)" page.
- [ ] Build admiral site `pkgdown::build_site()` and check that all affected examples are displayed correctly and that all new functions occur on the "[Reference](https://pharmaverse.github.io/admiral/cran-release/reference/index.html)" page.
- [ ] Address or fix all lintr warnings and errors - `lintr::lint_package()`
- [ ] Run `R CMD check` locally and address all errors and warnings - `devtools::check()`
- [ ] Link the issue in the Development Section on the right hand side.
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,14 @@ jobs:
needs: get_r_version
with:
r-version: "release"
skip-multiversion-docs: true
# Whether to skip multiversion docs
# Note that if you have multiple versions of docs,
# your URL links are likely to break due to path changes
skip-multiversion-docs: false
latest-tag-alt-name: cran-release
multiversion-docs-landing-page: cran-release
branches-or-tags-to-list: >-
^cran-release$|^v([0-9]+\\.)?([0-9]+\\.)?([0-9]+)$
secrets:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
linter:
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Description: A toolbox for programming Clinical Data Interchange Standards
Analysis Data Model Team, 2021,
<https://www.cdisc.org/standards/foundational/adam>).
License: Apache License (>= 2)
URL: https://pharmaverse.github.io/admiral/,
URL: https://pharmaverse.github.io/admiral/cran-release/,
https://github.com/pharmaverse/admiral
BugReports: https://github.com/pharmaverse/admiral/issues
Depends:
Expand Down
26 changes: 13 additions & 13 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ updated to process additional parameter (#1125).
imputation functions themselves (#1299). I.e., if a derivation like last known alive
date is based on dates, DTC variables have to be converted to numeric date or
datetime variables in a preprocessing step. For examples see the [ADSL
vignette](https://pharmaverse.github.io/admiral/articles/adsl.html).
vignette](https://pharmaverse.github.io/admiral/cran-release/articles/adsl.html).
The following arguments were deprecated:

- `date_imputation`, `time_imputation`, and `preserve` in `date_source()`
Expand Down Expand Up @@ -1191,7 +1191,7 @@ empty (#1309)


- `create_query_data()` is provided to create the [queries
dataset](https://pharmaverse.github.io/admiral/articles/queries_dataset.html) required as input for `derive_vars_query()` (#606)
dataset](https://pharmaverse.github.io/admiral/cran-release/articles/queries_dataset.html) required as input for `derive_vars_query()` (#606)

- `create_single_dose_dataset()` - Derives dataset of single dose from aggregate dose information (#660)

Expand Down Expand Up @@ -1224,7 +1224,7 @@ first disease progression. (#1023)
### ADLB

- New ADLB template script available `ad_adlb.R`, specific ADLB functions developed and
[BDS Finding vignette](https://pharmaverse.github.io/admiral/articles/bds_finding.html) has examples enhanced with ADLB functions. (#1122)
[BDS Finding vignette](https://pharmaverse.github.io/admiral/cran-release/articles/bds_finding.html) has examples enhanced with ADLB functions. (#1122)

- `derive_var_shift()` - Derives a character shift variable containing concatenated shift in values based on user-defined pairing (#944)
- `derive_var_analysis_ratio()` - Derives a ratio variable based on user-supplied variables from a BDS dataset, e.g. ADLB. (#943)
Expand Down Expand Up @@ -1306,7 +1306,7 @@ specific for admiral. Derivations like this can be implemented calling
- Updated `derive_var_worst_flag()` and `derive_var_extreme_flag()` vignettes to clarify their purpose (#691)

- Added example of ASEQ derivation in ADCM to
[OCCDS vignette](https://pharmaverse.github.io/admiral/articles/occds.html#aseq)
[OCCDS vignette](https://pharmaverse.github.io/admiral/cran-release/articles/occds.html#aseq)
(#720)

- Examples have been added for `format_reason_default()`, `format_eoxxstt_default()`, `extend_source_datasets()` and `filter_date_sources()` (#745)
Expand Down Expand Up @@ -1392,7 +1392,7 @@ this case the day is imputed as `15` (#592)

- README and site homepage has been updated with important new section around expectations of {admiral}, as well as other useful references such as links to conference talks (#868 & #802)

- New vignette [Development Process](https://pharmaverse.github.io/admiral/CONTRIBUTING.html) and improvements made to contribution vignettes (#765 & #758)
- New vignette [Development Process](https://pharmaverse.github.io/admiral/cran-release/CONTRIBUTING.html) and improvements made to contribution vignettes (#765 & #758)

- Updated [Pull Request Review Guidance](https://pharmaverse.github.io/admiraldev/articles/pr_review_guidance.html) on using `task-list-completed` workflow (#817)

Expand All @@ -1406,7 +1406,7 @@ this case the day is imputed as `15` (#592)

- The first truly open source release licensed under Apache 2.0 (#680)

- New vignette [Contributing to admiral](https://pharmaverse.github.io/admiral/CONTRIBUTING.html) (#679)
- New vignette [Contributing to admiral](https://pharmaverse.github.io/admiral/cran-release/CONTRIBUTING.html) (#679)

- New vignette [Unit Test Guidance](https://pharmaverse.github.io/admiraldev/articles/unit_test_guidance.html) (#679)

Expand All @@ -1428,7 +1428,7 @@ age in different units (#569)
- `derive_param_tte()` derives time-to-event-parameters (#546)

- For common time-to-event endpoints [event and censoring source
objects](https://pharmaverse.github.io/admiral/reference/index.html#section-pre-defined-time-to-event-sources) are
objects](https://pharmaverse.github.io/admiral/cran-release/reference/index.html#section-pre-defined-time-to-event-sources) are
provided (#612)

### Developer
Expand Down Expand Up @@ -1463,9 +1463,9 @@ to specify the unit of the input age (#569)

## Documentation

- New vignette [Creating a BDS Time-to-Event ADaM](https://pharmaverse.github.io/admiral/articles/bds_tte.html) (#549)
- New vignette [Creating a BDS Time-to-Event ADaM](https://pharmaverse.github.io/admiral/cran-release/articles/bds_tte.html) (#549)

- New vignette [Queries Dataset Documentation](https://pharmaverse.github.io/admiral/articles/queries_dataset.html) (#561)
- New vignette [Queries Dataset Documentation](https://pharmaverse.github.io/admiral/cran-release/articles/queries_dataset.html) (#561)

- New vignette [Writing Vignettes](https://pharmaverse.github.io/admiraldev/articles/writing_vignettes.html) (#334)

Expand Down Expand Up @@ -1660,10 +1660,10 @@ to specify the unit of the input age (#569)

## Documentation

- [Frequently Asked Questions](https://pharmaverse.github.io/admiral/articles/faq.html)
- [Frequently Asked Questions](https://pharmaverse.github.io/admiral/cran-release/articles/faq.html)

- [Creating ADSL](https://pharmaverse.github.io/admiral/articles/adsl.html)
- [Creating ADSL](https://pharmaverse.github.io/admiral/cran-release/articles/adsl.html)

- [Creating a BDS Finding ADaM](https://pharmaverse.github.io/admiral/articles/bds_finding.html)
- [Creating a BDS Finding ADaM](https://pharmaverse.github.io/admiral/cran-release/articles/bds_finding.html)

- [Creating an OCCDS ADaM](https://pharmaverse.github.io/admiral/articles/occds.html)
- [Creating an OCCDS ADaM](https://pharmaverse.github.io/admiral/cran-release/articles/occds.html)
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ devtools::install_github("pharmaverse/admiral")

The `{admiral}` family has several downstream and upstream dependencies and so releases are done in two Phases:

* Phase 1 release is for [{admiraldev}](https://pharmaverse.github.io/admiraldev/), [{pharmaversesdtm}](https://pharmaverse.github.io/pharmaversesdtm/), and [{admiral}](https://pharmaverse.github.io/admiral/) core
* Phase 1 release is for [{admiraldev}](https://pharmaverse.github.io/admiraldev/), [{pharmaversesdtm}](https://pharmaverse.github.io/pharmaversesdtm/), and [{admiral}](https://pharmaverse.github.io/admiral/cran-release/) core
* Phase 2 release is extension packages, e.g. [{admiralonco}](https://pharmaverse.github.io/admiralonco/), [{admiralophtha}](https://pharmaverse.github.io/admiralophtha/), [{admiralvaccine}](https://pharmaverse.github.io/admiralvaccine/) and [{pharmaverseadam}](https://pharmaverse.github.io/pharmaverseadam/).

| Release Schedule | Phase 1- Date and Packages | Phase 2- Date and Packages |
Expand All @@ -47,12 +47,12 @@ The `{admiral}` family has several downstream and upstream dependencies and so r
| Q4-2024 | December 2nd | December 9th |
| | [{pharmaversesdtm}](https://pharmaverse.github.io/pharmaversesdtm/) | [{admiralonco}](https://pharmaverse.github.io/admiralonco/) |
| | [{admiraldev}](https://pharmaverse.github.io/admiraldev/) | [{admiralophtha}](https://pharmaverse.github.io/admiralophtha/) |
| | [{admiral}](https://pharmaverse.github.io/admiral/) | [{admiralvaccine}](https://pharmaverse.github.io/admiralvaccine/) | | | | [{pharmaverseadam}](https://pharmaverse.github.io/pharmaverseadam/) |
| | [{admiral}](https://pharmaverse.github.io/admiral/cran-release/) | [{admiralvaccine}](https://pharmaverse.github.io/admiralvaccine/) | | | | [{pharmaverseadam}](https://pharmaverse.github.io/pharmaverseadam/) |
| | | |
| Q2-2025 | June 2nd | June 10th |
| | [{pharmaversesdtm}](https://pharmaverse.github.io/pharmaversesdtm/) | [{admiralonco}](https://pharmaverse.github.io/admiralonco/) |
| | [{admiraldev}](https://pharmaverse.github.io/admiraldev/) | [{admiralophtha}](https://pharmaverse.github.io/admiralophtha/) |
| | [{admiral}](https://pharmaverse.github.io/admiral/) | [{admiralvaccine}](https://pharmaverse.github.io/admiralvaccine/) | | | | [{pharmaverseadam}](https://pharmaverse.github.io/pharmaverseadam/) |
| | [{admiral}](https://pharmaverse.github.io/admiral/cran-release/) | [{admiralvaccine}](https://pharmaverse.github.io/admiralvaccine/) | | | | [{pharmaverseadam}](https://pharmaverse.github.io/pharmaverseadam/) |

## Main Goal

Expand All @@ -79,7 +79,7 @@ We will provide:
* Pharmaceutical communities and companies are encouraged to contribute to `{admiral}` following
the provided programming strategy and modular approach
* Functions that are comprehensively documented and tested, including example calls---these are
all listed in the [Reference section](https://pharmaverse.github.io/admiral/reference/index.html).
all listed in the [Reference section](https://pharmaverse.github.io/admiral/cran-release/reference/index.html).
* Vignettes on how to create ADSL, BDS and OCCDS datasets, including example scripts.
* Vignettes for ADaM dataset specific functionality (i.e. dictionary coding, date imputation, SMQs ...).

Expand Down Expand Up @@ -161,12 +161,12 @@ that all our developers and contributors must follow, so that all our code has a

## References and Documentation

* Please go to [Get Started](https://pharmaverse.github.io/admiral/articles/admiral.html) section to start using `{admiral}`.
* Please go to [Get Started](https://pharmaverse.github.io/admiral/cran-release/articles/admiral.html) section to start using `{admiral}`.
* Please see the [pharmaverse YouTube channel](https://www.youtube.com/channel/UCxQFEv8HNqM01DXzdQLCy6Q) for videos related to `{admiral}`.
* Please see the [Programming Strategy](https://pharmaverse.github.io/admiraldev/articles/programming_strategy.html) to understand how functions are created.
* Please see the [FAQ](https://pharmaverse.github.io/admiral/articles/faq.html) for the most frequent questions.
* Please see the [Contribution Model](https://pharmaverse.github.io/admiral/CONTRIBUTING.html) for how to get involved with making contributions.
* Please see [FAQ: R and Package Versions](https://pharmaverse.github.io/admiral/articles/faq.html#why-do-we-use-a-certain-r-version-and-package-versions-for-development) for why we develop with certain R and package versions.
* Please see the [FAQ](https://pharmaverse.github.io/admiral/cran-release/articles/faq.html) for the most frequent questions.
* Please see the [Contribution Model](https://pharmaverse.github.io/admiral/cran-release/CONTRIBUTING.html) for how to get involved with making contributions.
* Please see [FAQ: R and Package Versions](https://pharmaverse.github.io/admiral/cran-release/articles/faq.html#why-do-we-use-a-certain-r-version-and-package-versions-for-development) for why we develop with certain R and package versions.

## Pharmaverse Blog

Expand Down
2 changes: 1 addition & 1 deletion _pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ development:
version_label: default

authors:
before: "We define *authors* as those who are actively maintaining the code base, and *contributors* as those who made a significant contribution in the past. For all acknowledgements, see the eponymous section in the [Home Page](https://pharmaverse.github.io/admiral/)."
before: "We define *authors* as those who are actively maintaining the code base, and *contributors* as those who made a significant contribution in the past. For all acknowledgements, see the eponymous section in the [Home Page](https://pharmaverse.github.io/admiral/cran-release/)."
footer:
roles: [aut, ctb, cre, fnd]
text: "Developed by"
Expand Down
2 changes: 1 addition & 1 deletion inst/templates/ad_adae.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ex_single <- admiral::ex_single
# When SAS datasets are imported into R using haven::read_sas(), missing
# character values from SAS appear as "" characters in R, instead of appearing
# as NA values. Further details can be obtained via the following link:
# https://pharmaverse.github.io/admiral/articles/admiral.html#handling-of-missing-values # nolint
# https://pharmaverse.github.io/admiral/cran-release/articles/admiral.html#handling-of-missing-values # nolint

ae <- convert_blanks_to_na(ae)
ex <- convert_blanks_to_na(ex_single)
Expand Down
4 changes: 2 additions & 2 deletions inst/templates/ad_adcm.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ adsl <- admiral::admiral_adsl
# When SAS datasets are imported into R using haven::read_sas(), missing
# character values from SAS appear as "" characters in R, instead of appearing
# as NA values. Further details can be obtained via the following link:
# https://pharmaverse.github.io/admiral/articles/admiral.html#handling-of-missing-values # nolint
# https://pharmaverse.github.io/admiral/cran-release/articles/admiral.html#handling-of-missing-values # nolint

cm <- convert_blanks_to_na(cm)

Expand Down Expand Up @@ -106,7 +106,7 @@ adcm <- adcm %>%
## Derive APHASE and APHASEN Variable ----
# Other timing variable can be derived similarly.
# See also the "Visit and Period Variables" vignette
# (https://pharmaverse.github.io/admiral/articles/visits_periods.html)
# (https://pharmaverse.github.io/admiral/cran-release/articles/visits_periods.html)
adcm <- adcm %>%
mutate(
APHASE = case_when(
Expand Down
Loading
Loading