Skip to content

Commit

Permalink
CRAN submission changes (#189)
Browse files Browse the repository at this point in the history
* Add cran-comments.md

* Fix CRAN check errors

* Additional checks for tests

* Address CRAN submission feedback

* Regenerate site documentation

* Bump upload-artifact

* Add CRAN badge & regenerate site documentation
  • Loading branch information
anthonysena authored Sep 16, 2024
1 parent 78c7463 commit bf65599
Show file tree
Hide file tree
Showing 80 changed files with 134 additions and 98 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ deploy.sh
docs
extras
man-roxygen
^cran-comments\.md$
^CRAN-SUBMISSION$
4 changes: 2 additions & 2 deletions .github/workflows/R_CMD_check_Hades.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,14 @@ jobs:

- name: Upload check results
if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check

- name: Upload source package
if: success() && runner.os == 'macOS' && github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: package_tarball
path: check/*.tar.gz
Expand Down
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.11.0
Date: 2024-09-09 13:18:20 UTC
SHA: 39c45bae218f8ffd983b9bc9a6a5914ad4f7f9df
11 changes: 7 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: CohortGenerator
Type: Package
Title: An R Package for Cohort Generation Against the OMOP CDM
Version: 0.11.0
Date: 2024-08-31
Title: Cohort Generation for the OMOP Common Data Model
Version: 0.11.1
Date: 2024-09-12
Authors@R: c(
person("Anthony", "Sena", email = "[email protected]", role = c("aut", "cre")),
person("Jamie", "Gilbert", role = c("aut")),
Expand All @@ -11,7 +11,10 @@ Authors@R: c(
person("Observational Health Data Science and Informatics", role = c("cph"))
)
Maintainer: Anthony Sena <[email protected]>
Description: An R package for that encapsulates the functions for generating cohorts against the OMOP CDM.
Description: Generate cohorts and subsets using an Observational
Medical Outcomes Partnership (OMOP) Common Data Model (CDM) Database.
Cohorts are defined using 'CIRCE' (<https://github.com/ohdsi/circe-be>) or
SQL compatible with 'SqlRender' (<https://github.com/OHDSI/SqlRender>).
Depends:
DatabaseConnector (>= 5.0.0),
R (>= 3.6.0),
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# CohortGenerator

[![Build Status](https://github.com/OHDSI/CohortGenerator/workflows/R-CMD-check/badge.svg)](https://github.com/OHDSI/CohortGenerator/actions?query=workflow%3AR-CMD-check) [![codecov.io](https://codecov.io/github/OHDSI/CohortGenerator/coverage.svg?branch=main)](https://codecov.io/github/OHDSI/CohortGenerator?branch=main)
[![CRAN status](https://www.r-pkg.org/badges/version/CohortGenerator)](https://CRAN.R-project.org/package=CohortGenerator)
[![Build Status](https://github.com/OHDSI/CohortGenerator/workflows/R-CMD-check/badge.svg)](https://github.com/OHDSI/CohortGenerator/actions?query=workflow%3AR-CMD-check) [![codecov.io](https://codecov.io/github/OHDSI/CohortGenerator/coverage.svg?branch=main)](https://app.codecov.io/github/OHDSI/CohortGenerator?branch=main)

CohortGenerator is part of [HADES](https://ohdsi.github.io/Hades/).

Expand Down
5 changes: 5 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## R CMD check results

0 errors | 0 warnings | 1 note

* This is a new release.
2 changes: 1 addition & 1 deletion docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions docs/articles/CreatingCohortSubsetDefinitions.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions docs/articles/GeneratingCohorts.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions docs/articles/SamplingCohorts.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified docs/deps/bootstrap-5.3.1/fonts/1Ptug8zYS_SKggPNyC0ITw.woff2
Binary file not shown.
Binary file modified docs/deps/bootstrap-5.3.1/fonts/1Ptug8zYS_SKggPNyCAIT5lu.woff2
Binary file not shown.
Binary file modified docs/deps/bootstrap-5.3.1/fonts/1Ptug8zYS_SKggPNyCIIT5lu.woff2
Binary file not shown.
Binary file modified docs/deps/bootstrap-5.3.1/fonts/1Ptug8zYS_SKggPNyCMIT5lu.woff2
Binary file not shown.
Binary file modified docs/deps/bootstrap-5.3.1/fonts/1Ptug8zYS_SKggPNyCkIT5lu.woff2
Binary file not shown.
13 changes: 7 additions & 6 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
pandoc: 3.1.1
pandoc: 3.1.11
pkgdown: 2.1.0
pkgdown_sha: ~
articles:
CreatingCohortSubsetDefinitions: CreatingCohortSubsetDefinitions.html
GeneratingCohorts: GeneratingCohorts.html
SamplingCohorts: SamplingCohorts.html
last_built: 2024-09-01T14:46Z
last_built: 2024-09-16T13:44Z
urls:
reference: https://ohdsi.github.io/CohortGenerator/reference
article: https://ohdsi.github.io/CohortGenerator/articles
Loading

0 comments on commit bf65599

Please sign in to comment.