Merge branch 'dev'

helseprofil · Sep 8, 2023 · 4c3840a · 4c3840a
2 parents 5628559 + 806b381
commit 4c3840a
Show file tree

Hide file tree

Showing 99 changed files with 144 additions and 130 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: orgdata
 Title: Aggregating Original Data
-Version: 1.4.4
+Version: 1.4.5
 Authors@R:
     c(person(given = "Yusman",
              family = "Kamaleri",
@@ -34,13 +34,13 @@ Imports:
     rex (>= 1.2.0),
     listenv (>= 0.8.0),
     withr (>= 2.5.0),
-    remotes (>= 2.4.2),
     haven (>= 2.5.1),
     yaml (>= 2.3.5),
     methods,
     praise (>= 1.0.0),
     duckdb (>= 0.7.0),
-    cli (>= 3.4.0)
+    cli (>= 3.4.0),
+    pak (>= 0.6.0)
 Remotes: 
     ybkamaleri/praise,
     hadley/emo,

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,6 @@
-# orgdata 1.4.3
-- Have access to future data from API (#316)
+# orgdata 1.4.5
+- Have access to future data from API (#316).
+- Use `pak` package for upgrade.
 
 # orgdata 1.4.2
 - Display output when called.

diff --git a/R/utils-misc.R b/R/utils-misc.R
@@ -88,17 +88,23 @@ emoji <- function(x = c("mark", "thumb", "write",
 
 #' @title Update package
 #' @description Update orgdata directly with Github repo. Default is `main` branch.
-#' @param ... Other arguments to `remotes::install_github()`
+#' @param branch The branch in Github to install from
+#' @param force Use the laterst version(s) of all dependencies. Default is FALSE
 #' @examples
 #' \dontrun{
-#' update_orgdata() #use default
-#' update_orgdata(ref = "dev") #to upgrade with dev branch
+#' update_orgdata(branch = "main") #default
+#' update_orgdata(branch = "dev") #to upgrade with dev branch
 #' }
 #' @export
-update_orgdata <- function(...){
+update_orgdata <- function(branch = c("main", "dev"), force = FALSE){
+  branch <- match.arg(branch)
   unloadNamespace("orgdata")
-  suppressWarnings(remotes::install_github("helseprofil/orgdata", force = TRUE, ...))
+  switch(branch,
+         main = pak::pkg_install("helseprofil/orgdata", upgrade = force),
+         dev = pak::pkg_install("helseprofil/orgdata@dev", upgrade = force)
+         )
   attachNamespace("orgdata")
+  invisible()
 }
 
 #' @export

diff --git a/README.Rmd b/README.Rmd
@@ -69,7 +69,7 @@ via `orgdata`.
 orgdata::update_orgdata()
 
 # install development versjon
-orgdata::update_orgdata(ref = "dev")
+orgdata::update_orgdata(branch = "dev")
 ```
 
 ## Usage 

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ version via `orgdata`.
 orgdata::update_orgdata()
 
 # install development versjon
-orgdata::update_orgdata(ref = "dev")
+orgdata::update_orgdata(branch = "dev")
 ```
 
 ## Usage
@@ -74,12 +74,12 @@ make_filegroups(BEFOLKNING, LESEFERD, NEET)
 
 ## Resources
 
-  - [Config
-    file](https://github.com/helseprofil/config/blob/main/config-orgdata.yml)
-  - [Get
-    started](https://helseprofil.github.io/orgdata/articles/get-started.html)
-  - [Functions
-    overview](https://helseprofil.github.io/orgdata/reference/index.html)
-  - [General guide](https://helseprofil.github.io)
-  - [Conventions](https://helseprofil.github.io/orgdata/articles/standard.html)
-  - [Video guide](https://youtu.be/PhEQq4iWJCY)
+- [Config
+  file](https://github.com/helseprofil/config/blob/main/config-orgdata.yml)
+- [Get
+  started](https://helseprofil.github.io/orgdata/articles/get-started.html)
+- [Functions
+  overview](https://helseprofil.github.io/orgdata/reference/index.html)
+- [General guide](https://helseprofil.github.io)
+- [Conventions](https://helseprofil.github.io/orgdata/articles/standard.html)
+- [Video guide](https://youtu.be/PhEQq4iWJCY)
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/articles/debugging.html b/docs/articles/debugging.html
diff --git a/docs/articles/geo-recode.html b/docs/articles/geo-recode.html
diff --git a/docs/articles/get-started.html b/docs/articles/get-started.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/sepaafil.html b/docs/articles/sepaafil.html
diff --git a/docs/articles/standard.html b/docs/articles/standard.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,7 +7,7 @@ articles:
   get-started: get-started.html
   sepaafil: sepaafil.html
   standard: standard.html
-last_built: 2023-09-07T14:13Z
+last_built: 2023-09-08T08:33Z
 urls:
   reference: https://helseprofil.github.io/orgdata/reference
   article: https://helseprofil.github.io/orgdata/articles

diff --git a/docs/reference/KHelse.html b/docs/reference/KHelse.html
diff --git a/docs/reference/debug_opt.html b/docs/reference/debug_opt.html
diff --git a/docs/reference/do_aggregate.html b/docs/reference/do_aggregate.html
diff --git a/docs/reference/do_colname.html b/docs/reference/do_colname.html
diff --git a/docs/reference/do_column_standard.html b/docs/reference/do_column_standard.html
diff --git a/docs/reference/do_delete_row.html b/docs/reference/do_delete_row.html
diff --git a/docs/reference/do_extra_args.html b/docs/reference/do_extra_args.html
diff --git a/docs/reference/do_extra_args_group.html b/docs/reference/do_extra_args_group.html
diff --git a/docs/reference/do_geo_recode.html b/docs/reference/do_geo_recode.html
diff --git a/docs/reference/do_implicit_null.html b/docs/reference/do_implicit_null.html
diff --git a/docs/reference/do_make_file_each.html b/docs/reference/do_make_file_each.html
diff --git a/docs/reference/do_manheader.html b/docs/reference/do_manheader.html
diff --git a/docs/reference/do_mutate.html b/docs/reference/do_mutate.html
diff --git a/docs/reference/do_recode.html b/docs/reference/do_recode.html
diff --git a/docs/reference/do_recode_aggregate.html b/docs/reference/do_recode_aggregate.html