Merge branch 'develop' into dbplyr-2.5.0

OHDSI · Mar 22, 2024 · 63294a9 · 63294a9
2 parents 869eb43 + f6199aa
commit 63294a9
Show file tree

Hide file tree

Showing 45 changed files with 207 additions and 145 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 0.6.4
-Date: 2023-11-24 10:36:39 UTC
-SHA: 2c42830d52006622adbdf9e0301045a502eb7b33
+Version: 0.6.6
+Date: 2024-03-21 10:32:35 UTC
+SHA: 9b6c87149990290a635496adfff7d10ad21e303c
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,16 +1,16 @@
 Package: Andromeda
 Type: Package
 Title: Asynchronous Disk-Based Representation of Massive Data
-Version: 0.6.4
-Date: 2023-11-24
+Version: 0.6.6
+Date: 2024-03-21
 Authors@R: c(
-  person("Adam", "Black", , "[email protected]", role = c("aut", "cre")),
+  person("Adam", "Black", , "[email protected]", role = c("aut")),
   person("Egill", "Fridgeirsson", , "[email protected]", role = c("aut")),
-  person("Martijn", "Schuemie", , "[email protected]", role = c("aut")),
+  person("Martijn", "Schuemie", , "[email protected]", role = c("aut", "cre")),
   person("Marc A.", "Suchard", , "[email protected]", role = c("aut")),
   person("Observational Health Data Science and Informatics", role = c("cph"))
   )
-Maintainer: Adam Black <black@ohdsi.org>
+Maintainer: Martijn Schuemie <schuemie@ohdsi.org>
 Description: Storing very large data objects on a local drive, while still making it possible to manipulate the data in an efficient manner.
 License: Apache License 2.0
 VignetteBuilder: knitr

diff --git a/NEWS.md b/NEWS.md
@@ -1,20 +1,43 @@
+Andromeda 0.6.6
+===============
+
+Bugfixes
+
+- Fix error when calling `groupApply()` with `dbplyr` >= 2.5.0.
+
+Andromeda 0.6.5
+===============
+
+Bugfixes
+
+- Ensuring package passes R check even when `arrow` is not installed. Required to stay in CRAN.
+
 Andromeda 0.6.4
 ===============
+
+Bugfixes
+
 - Fix a bug causing Andromeda saving not to respect andromeda temp folder
 
 Andromeda 0.6.3
 ===============
+
+Bugfixes
+
 - Fix workflow
 
 Andromeda 0.6.2
 ===============
-- add isAndromedaTable
-- update docs
-- add weekly r check yaml
+
+Changes
+
+- Added  `isAndromedaTable()` function.
 
 Andromeda 0.6.1
 ===============
 
+Bugfixes
+
 - Fix compatibility with dbplyr.
 
 

diff --git a/R/Andromeda.R b/R/Andromeda.R
@@ -1,4 +1,4 @@
-# Copyright 2020 Observational Health Data Sciences and Informatics
+# Copyright 2024 Observational Health Data Sciences and Informatics
 #
 # This file is part of Andromeda
 # 

diff --git a/R/Indices.R b/R/Indices.R
@@ -1,4 +1,4 @@
-# Copyright 2020 Observational Health Data Sciences and Informatics
+# Copyright 2024 Observational Health Data Sciences and Informatics
 #
 # This file is part of Andromeda
 # 
@@ -188,4 +188,4 @@ removeIndex <- function(tbl, columnNames = NULL, indexName = NULL) {
 
   RSQLite::dbExecute(conn = dbplyr::remote_con(tbl), statement = statement)
   invisible(tbl)
-}
+}
diff --git a/R/LoadingSaving.R b/R/LoadingSaving.R
@@ -1,4 +1,4 @@
-# Copyright 2020 Observational Health Data Sciences and Informatics
+# Copyright 2024 Observational Health Data Sciences and Informatics
 #
 # This file is part of Andromeda
 # 

diff --git a/R/Object.R b/R/Object.R
@@ -1,4 +1,4 @@
-# Copyright 2020 Observational Health Data Sciences and Informatics
+# Copyright 2024 Observational Health Data Sciences and Informatics
 #
 # This file is part of Andromeda
 # 

diff --git a/R/Operations.R b/R/Operations.R
@@ -1,4 +1,4 @@
-# Copyright 2020 Observational Health Data Sciences and Informatics
+# Copyright 2024 Observational Health Data Sciences and Informatics
 #
 # This file is part of Andromeda
 # 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,7 +1,7 @@
-Andromeda v0.6.4
+Andromeda v0.6.6
 ---
 
-This is a patch release.
+This is a patch release that fixes the error observed on various CRAN testing instances following the release of dbplyr 2.5.0.
 
 ## Test environments
 * Windows-latest, R-release (Github Actions)
@@ -15,4 +15,6 @@ This is a patch release.
 
 There were no ERRORs or WARNINGs on any platform.
 
+## Downstream dependencies
 
+DatabaseConnector is used by Cyclops, TreatmentPatterns, CohortAlgebra, DatabaseConnector, which were tested with this new version. No issues were found.
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/articles/UsingAndromeda.html b/docs/articles/UsingAndromeda.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