Skip to content

Commit

Permalink
Merge pull request #77 from pharmaverse/update_roxygen
Browse files Browse the repository at this point in the history
Update DESCRIPTION
  • Loading branch information
bms63 authored Feb 13, 2024
2 parents 0a5b1bd + 0842306 commit 83907c9
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 135 deletions.
19 changes: 6 additions & 13 deletions .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,6 @@ jobs:
needs: get_r_version
with:
r-version: "${{ needs.get_r_version.outputs.r-version }}"
readme:
name: Render README
uses: pharmaverse/admiralci/.github/workflows/readme-render.yml@main
if: github.event_name == 'push'
needs: get_r_version
with:
r-version: "${{ needs.get_r_version.outputs.r-version }}"
validation:
name: Validation
uses: pharmaverse/admiralci/.github/workflows/r-pkg-validation.yml@main
Expand Down Expand Up @@ -128,9 +121,9 @@ jobs:
needs: get_r_version
with:
r-version: "${{ needs.get_r_version.outputs.r-version }}"
vbump:
name: Version Bump 🤜🤛
if: github.event_name == 'push'
uses: insightsengineering/r.pkg.template/.github/workflows/version-bump.yaml@main
secrets:
REPO_GITHUB_TOKEN: ${{ secrets.PHARMAVERSE_BOT }}
# vbump:
# name: Version Bump 🤜🤛
# if: github.event_name == 'push'
# uses: insightsengineering/r.pkg.template/.github/workflows/version-bump.yaml@main
# secrets:
# REPO_GITHUB_TOKEN: ${{ secrets.PHARMAVERSE_BOT }}
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: admiraltemplate
Title: ADaM in R Asset Library - Extension
Version: 0.0.3.9001
Version: 0.0.3
Authors@R:
person("Open", "Source", , "[email protected]", role = c("aut", "cre"))
Description: A toolbox for programming Clinical Data Standards Interchange
Expand Down Expand Up @@ -54,4 +54,4 @@ Encoding: UTF-8
Language: en-US
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
13 changes: 11 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
# admiraltemplate 0.0.3.9001
# admiraltemplate 0.0.3

- Removed renv and related files (#70)

## Updates to site

- Package Extension guidance on the front page was updated and moved to [this location](https://pharmaverse.github.io/admiraldev/main/articles/package_extensions.html) in `{admiraldev}`, and a link was added to point to the new location (#61).
- Package Extension guidance on the front page was updated and moved to [this location](https://pharmaverse.github.io/admiraldev/articles/package_extensions.html) in `{admiraldev}`, and a link was added to point to the new location (#61).

## CI workflows

- [`admiralci` workflows](https://github.com/pharmaverse/admiralci) has been updated. Indeed, workflows are not anymore based on `renv` framework to manage dependencies (`devtools` is used instead). Moreover, we now use latest version of `R` for all workflows, and run `R CMD CHECKS` for following R release version (R latest stable version), R devel version (in development version), and R previous release. More details are available in [admiralci doc](https://pharmaverse.github.io/admiralci/index.html).
As a result, `.github/workflows/common.yml` file has been updated, and all `renv` configurations has been removed.

## admiral.test removed

- `admiral.test` package has been replaced by [`pharmaversesdtm`](https://github.com/pharmaverse/pharmaversesdtm)

# admiraltemplate 0.0.2

Expand Down
113 changes: 0 additions & 113 deletions README.Rmd

This file was deleted.

6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ to adhere to the following standards:
Conduct](https://pharmaverse.github.io/admiral/CODE_OF_CONDUCT.html)
- [Manifesto](https://pharmaverse.github.io/admiral/index.html?q=manifest#admiral-manifesto)
- [Programming
Strategy](https://pharmaverse.github.io/admiraldev/main/articles/programming_strategy.html)
- [Development
Process](https://pharmaverse.github.io/admiraldev/main/articles/development_process.html)
Strategy](https://pharmaverse.github.io/admiraldev/articles/programming_strategy.html)
- Follow consistent workflow checks
- A CRAN Release means 90% or greater test coverage

Expand Down Expand Up @@ -64,6 +62,6 @@ The repository template includes the following:
For detailed information regarding the ethos of `{admiral}` package
extensions and how to decide if you should set your own one up, please
see our [Package Extension
Guidance](https://pharmaverse.github.io/admiraldev/main/articles/package_extensions.html).
Guidance](https://pharmaverse.github.io/admiraldev/articles/package_extensions.html).
You will also find details about team setup, suggested workflow and
lessons learned from past package extensions.
1 change: 1 addition & 0 deletions inst/WORDLIST
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ADXX
ADaM
admiralci
Arancibia
Biologics
CDISC
Expand Down
2 changes: 1 addition & 1 deletion inst/templates/ad_adxx.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
#
# Input: xx, xx, xx
library(admiral)
library(admiral.test) # Contains example datasets from the CDISC pilot project
library(pharmaversesdtm) # Contains example datasets from the CDISC pilot project

# Add your template ADaM script code

0 comments on commit 83907c9

Please sign in to comment.