Skip to content

Commit 859172d

Browse files
cicdguydependabot-preview[bot]
authored andcommitted
feat: Reintroduce multiversion docs
1 parent 55220ef commit 859172d

File tree

21 files changed

+64
-57
lines changed

21 files changed

+64
-57
lines changed

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contribution to {admiral}
22

3-
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/).
3+
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/).
44

55
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.
66

@@ -59,15 +59,15 @@ If you decide to contribute with code and you're ready to make your first code c
5959
If so, remember to run `devtools::document()` and include the
6060
updated `NAMESPACE` and `.Rd` files in `man/`.
6161
e. Does your code update have any impact on the [ADaM
62-
template](https://pharmaverse.github.io/admiral/articles/admiral.html#starting-a-script)
62+
template](https://pharmaverse.github.io/admiral/cran-release/articles/admiral.html#starting-a-script)
6363
R scripts stored in `inst/templates`?
6464
f. Does your code update have any impact on the vignettes stored in
6565
vignettes?
6666
g. Did you update the Changelog `NEWS.md`?
6767
h. Did you build `{admiral}` site `pkgdown::build_site()` and check
6868
that all affected examples are displayed correctly and that all
6969
new functions occur on the
70-
"[Reference](https://pharmaverse.github.io/admiral/reference/)" page?
70+
"[Reference](https://pharmaverse.github.io/admiral/cran-release/reference/)" page?
7171
4. Once happy with all the updates, make a [pull
7272
request](https://pharmaverse.github.io/admiraldev/articles/git_usage.html#pull-request) to merge to the `main` branch
7373
and link the issue so that it closes after successful merging.

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
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.
1+
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.
22

33
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.
44

@@ -11,7 +11,7 @@ Please check off each taskbox as an acknowledgment that you completed the task o
1111
- [ ] Run `devtools::document()` so all `.Rd` files in the `man` folder and the `NAMESPACE` file in the project root are updated appropriately
1212
- [ ] Address any updates needed for vignettes and/or templates
1313
- [ ] 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.
14-
- [ ] 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.
14+
- [ ] 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.
1515
- [ ] Address or fix all lintr warnings and errors - `lintr::lint_package()`
1616
- [ ] Run `R CMD check` locally and address all errors and warnings - `devtools::check()`
1717
- [ ] Link the issue in the Development Section on the right hand side.

.github/workflows/common.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,14 @@ jobs:
8181
needs: get_r_version
8282
with:
8383
r-version: "release"
84-
skip-multiversion-docs: true
84+
# Whether to skip multiversion docs
85+
# Note that if you have multiple versions of docs,
86+
# your URL links are likely to break due to path changes
87+
skip-multiversion-docs: false
88+
latest-tag-alt-name: cran-release
89+
multiversion-docs-landing-page: cran-release
90+
branches-or-tags-to-list: >-
91+
^cran-release$|^v([0-9]+\\.)?([0-9]+\\.)?([0-9]+)$
8592
secrets:
8693
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
8794
linter:

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Description: A toolbox for programming Clinical Data Interchange Standards
3636
Analysis Data Model Team, 2021,
3737
<https://www.cdisc.org/standards/foundational/adam>).
3838
License: Apache License (>= 2)
39-
URL: https://pharmaverse.github.io/admiral/,
39+
URL: https://pharmaverse.github.io/admiral/cran-release/,
4040
https://github.com/pharmaverse/admiral
4141
BugReports: https://github.com/pharmaverse/admiral/issues
4242
Depends:

NEWS.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ updated to process additional parameter (#1125).
10921092
imputation functions themselves (#1299). I.e., if a derivation like last known alive
10931093
date is based on dates, DTC variables have to be converted to numeric date or
10941094
datetime variables in a preprocessing step. For examples see the [ADSL
1095-
vignette](https://pharmaverse.github.io/admiral/articles/adsl.html).
1095+
vignette](https://pharmaverse.github.io/admiral/cran-release/articles/adsl.html).
10961096
The following arguments were deprecated:
10971097

10981098
- `date_imputation`, `time_imputation`, and `preserve` in `date_source()`
@@ -1191,7 +1191,7 @@ empty (#1309)
11911191

11921192

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

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

@@ -1224,7 +1224,7 @@ first disease progression. (#1023)
12241224
### ADLB
12251225

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

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

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

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

13931393
- 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)
13941394

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

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

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

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

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

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

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

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

14341434
### Developer
@@ -1463,9 +1463,9 @@ to specify the unit of the input age (#569)
14631463

14641464
## Documentation
14651465

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

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

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

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

16611661
## Documentation
16621662

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

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

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

1669-
- [Creating an OCCDS ADaM](https://pharmaverse.github.io/admiral/articles/occds.html)
1669+
- [Creating an OCCDS ADaM](https://pharmaverse.github.io/admiral/cran-release/articles/occds.html)

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ devtools::install_github("pharmaverse/admiral")
3838

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

41-
* 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
41+
* 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
4242
* 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/).
4343

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

5757
## Main Goal
5858

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

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

162162
## References and Documentation
163163

164-
* Please go to [Get Started](https://pharmaverse.github.io/admiral/articles/admiral.html) section to start using `{admiral}`.
164+
* Please go to [Get Started](https://pharmaverse.github.io/admiral/cran-release/articles/admiral.html) section to start using `{admiral}`.
165165
* Please see the [pharmaverse YouTube channel](https://www.youtube.com/channel/UCxQFEv8HNqM01DXzdQLCy6Q) for videos related to `{admiral}`.
166166
* Please see the [Programming Strategy](https://pharmaverse.github.io/admiraldev/articles/programming_strategy.html) to understand how functions are created.
167-
* Please see the [FAQ](https://pharmaverse.github.io/admiral/articles/faq.html) for the most frequent questions.
168-
* Please see the [Contribution Model](https://pharmaverse.github.io/admiral/CONTRIBUTING.html) for how to get involved with making contributions.
169-
* 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.
167+
* Please see the [FAQ](https://pharmaverse.github.io/admiral/cran-release/articles/faq.html) for the most frequent questions.
168+
* Please see the [Contribution Model](https://pharmaverse.github.io/admiral/cran-release/CONTRIBUTING.html) for how to get involved with making contributions.
169+
* 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.
170170

171171
## Pharmaverse Blog
172172

_pkgdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ development:
2424
version_label: default
2525

2626
authors:
27-
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/)."
27+
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/)."
2828
footer:
2929
roles: [aut, ctb, cre, fnd]
3030
text: "Developed by"

inst/templates/ad_adae.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ex_single <- admiral::ex_single
2222
# When SAS datasets are imported into R using haven::read_sas(), missing
2323
# character values from SAS appear as "" characters in R, instead of appearing
2424
# as NA values. Further details can be obtained via the following link:
25-
# https://pharmaverse.github.io/admiral/articles/admiral.html#handling-of-missing-values # nolint
25+
# https://pharmaverse.github.io/admiral/cran-release/articles/admiral.html#handling-of-missing-values # nolint
2626

2727
ae <- convert_blanks_to_na(ae)
2828
ex <- convert_blanks_to_na(ex_single)

inst/templates/ad_adcm.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ adsl <- admiral::admiral_adsl
2020
# When SAS datasets are imported into R using haven::read_sas(), missing
2121
# character values from SAS appear as "" characters in R, instead of appearing
2222
# as NA values. Further details can be obtained via the following link:
23-
# https://pharmaverse.github.io/admiral/articles/admiral.html#handling-of-missing-values # nolint
23+
# https://pharmaverse.github.io/admiral/cran-release/articles/admiral.html#handling-of-missing-values # nolint
2424

2525
cm <- convert_blanks_to_na(cm)
2626

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

0 commit comments

Comments
 (0)