Merge pull request #68 from OHDSI/develop

Corrected PR for v2.0.3
OHDSI · May 16, 2023 · 90cd223 · 90cd223
2 parents 2219e85 + 22a1442
commit 90cd223
Show file tree

Hide file tree

Showing 113 changed files with 250 additions and 109 deletions.
diff --git a/.github/workflows/R_CMD_check_Hades.yaml b/.github/workflows/R_CMD_check_Hades.yaml
@@ -46,15 +46,15 @@ jobs:
       CDM5_SQL_SERVER_USER: ${{ secrets.CDM5_SQL_SERVER_USER }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
 
-      - uses: r-lib/actions/setup-tinytex@v1
+      - uses: r-lib/actions/setup-tinytex@v2
 
-      - uses: r-lib/actions/setup-pandoc@v1
+      - uses: r-lib/actions/setup-pandoc@v2
 
       - name: Query dependencies
         run: |
@@ -138,7 +138,7 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -164,7 +164,7 @@ jobs:
           draft: false
           prerelease: false
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         if: ${{ env.new_version != '' }}
 
       - name: Install drat

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: Capr
 Title: Cohort Definition Application Programming
-Version: 2.0.2
+Version: 2.0.3
 Authors@R: c(
     person("Martin", "Lavallee", , "[email protected]", role = c("aut", "cre")),
     person("Adam", "Black", , "[email protected]", role = "aut")
@@ -23,7 +23,7 @@ Imports:
     magrittr (>= 1.5.0),
     jsonlite,
     methods,
-    purrr,
+    purrr (>= 1.0.1),
     rlang,
     dplyr,
     tidyr,

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,12 @@
+Capr 2.0.3
+==========
+- add opAttribute super class
+- add version dependency for purrr v1.0.1 for list_flatten
+
+Capr 2.0.2
+==========
+- fix issue with first exposure
+
 Capr 2.0.1
 ==========
 - additions and corrections to vignettes and documentation

diff --git a/R/conceptSet.R b/R/conceptSet.R
@@ -524,7 +524,9 @@ readConceptSet <- function(path, name, id = NULL) {
 #'
 #' @param x A concept set created by `cs`
 #' @param con A connection to an OMOP CDM database
-#' @template VocabularyDatabaseSchema
+#' @param vocabularyDatabaseSchema   Schema name where your OMOP vocabulary format resides. Note that
+#'                                   for SQL Server, this should include both the database and schema
+#'                                   name, for example 'vocabulary.dbo'.
 #' @return A modified version of the input concept set with concept details filled in.
 #'
 #' @importFrom methods slot<-

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/articles/Capr-conceptSets.html b/docs/articles/Capr-conceptSets.html
diff --git a/docs/articles/Examples.html b/docs/articles/Examples.html
diff --git a/docs/articles/Using-Capr.html b/docs/articles/Using-Capr.html
diff --git a/docs/articles/capr_design.html b/docs/articles/capr_design.html
diff --git a/docs/articles/capr_templates.html b/docs/articles/capr_templates.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -7,5 +7,5 @@ articles:
   capr_templates: capr_templates.html
   Examples: Examples.html
   Using-Capr: Using-Capr.html
-last_built: 2023-04-04T12:49Z
+last_built: 2023-05-16T16:57Z
 
diff --git a/docs/reference/Capr-package.html b/docs/reference/Capr-package.html
diff --git a/docs/reference/CensoringCriteria-class.html b/docs/reference/CensoringCriteria-class.html
diff --git a/docs/reference/Concept-class.html b/docs/reference/Concept-class.html
diff --git a/docs/reference/ConceptAttribute-class.html b/docs/reference/ConceptAttribute-class.html
diff --git a/docs/reference/ConceptSet-class.html b/docs/reference/ConceptSet-class.html
diff --git a/docs/reference/ConceptSetItem-class.html b/docs/reference/ConceptSetItem-class.html
diff --git a/docs/reference/Criteria-class.html b/docs/reference/Criteria-class.html
diff --git a/docs/reference/DrugExposureExit-class.html b/docs/reference/DrugExposureExit-class.html
diff --git a/docs/reference/Endpoint-class.html b/docs/reference/Endpoint-class.html
diff --git a/docs/reference/EventAperture-class.html b/docs/reference/EventAperture-class.html
diff --git a/docs/reference/EventWindow-class.html b/docs/reference/EventWindow-class.html
diff --git a/docs/reference/FixedDurationExit-class.html b/docs/reference/FixedDurationExit-class.html
diff --git a/docs/reference/Group-class.html b/docs/reference/Group-class.html
diff --git a/docs/reference/LogicAttribute-class.html b/docs/reference/LogicAttribute-class.html
diff --git a/docs/reference/ObservationExit-class.html b/docs/reference/ObservationExit-class.html
diff --git a/docs/reference/ObservationWindow-class.html b/docs/reference/ObservationWindow-class.html
diff --git a/docs/reference/Occurrence-class.html b/docs/reference/Occurrence-class.html
diff --git a/docs/reference/Query-class.html b/docs/reference/Query-class.html
diff --git a/docs/reference/age.html b/docs/reference/age.html
diff --git a/docs/reference/as.data.frame-ConceptSet-method.html b/docs/reference/as.data.frame-ConceptSet-method.html
diff --git a/docs/reference/as.json.html b/docs/reference/as.json.html
diff --git a/docs/reference/atLeast.html b/docs/reference/atLeast.html