From c03c4e4a22307034f64859abf18202995b62ad70 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Thu, 23 Nov 2023 16:20:56 +0100 Subject: [PATCH 1/5] Bump dev version number --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index f14853a..2c01665 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: n2khab Title: Providing Preprocessed Reference Data for Flemish Natura 2000 Habitat Analyses -Version: 0.9.0 +Version: 0.9.0.9000 Authors@R: c( person("Floris", "Vanderhaeghe", email = "floris.vanderhaeghe@inbo.be", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6378-6229")), person("Toon", "Westra", email = "toon.westra@inbo.be", role = c("aut"), comment = c(ORCID = "0000-0003-2478-9459")), diff --git a/NEWS.md b/NEWS.md index f15b1f1..fb0f7ab 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# n2khab (development version) + # n2khab 0.9.0 (2023-11-22) - `download_zenodo()` has been improved (#169): From d300e4a4bc05a600416eb93fd5ca12dd1661682c Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 24 Nov 2023 10:07:07 +0100 Subject: [PATCH 2/5] human_filesize(): avoid Note during pkg installation * The note was: 'Note: wrong number of arguments to 'floor' at filemanagement.R:258'. Introduced by 6a3b0ee, where '%>% floor' was replaced by '%>% floor()'. The Note can be regarded as a bug in R. Worked around by using '%>% floor(x = .)' --- R/filemanagement.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/filemanagement.R b/R/filemanagement.R index ffe5db7..8fdc93e 100644 --- a/R/filemanagement.R +++ b/R/filemanagement.R @@ -257,7 +257,7 @@ human_filesize <- function(x) { assert_that(all(x %% 1 == 0 & x >= 0)) magnitude <- log(x, base = 1024) %>% - floor() %>% + floor(x = .) %>% pmin(8) unit <- factor(magnitude, levels = 0:8, From 793e303a4bade7aef38625da615056d6d4e42e74 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 24 Nov 2023 10:14:47 +0100 Subject: [PATCH 3/5] Pkg startup: improve advised code to update n2khab --- R/n2khab.R | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/R/n2khab.R b/R/n2khab.R index d093795..b4d7457 100644 --- a/R/n2khab.R +++ b/R/n2khab.R @@ -42,10 +42,12 @@ utils::globalVariables(c(".")) rep("=", getOption("width")), "\nIt is advised to upgrade n2khab to its current version ", release, - ". Run:\n", + ". Run:\n\n", + 'detach("package:n2khab", unload = TRUE)\n', 'install.packages("n2khab", repos = c(inbo = "https://inbo.r-universe.dev", CRAN = "https://cloud.r-project.org"))', "\n", + "library(n2khab)\n", rep("=", getOption("width")) ) } From 6f611742e1b6ded0c95d01d75f4bf66c8f0357f9 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 24 Nov 2023 13:28:39 +0100 Subject: [PATCH 4/5] Update NEWS.md --- NEWS.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index fb0f7ab..e6effdf 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,7 @@ -# n2khab (development version) +# n2khab 0.9.1 (2023-11-24) + +- Added workaround for a note during package installation ([d300e4a](https://github.com/inbo/n2khab/commit/d300e4a)). +- Package startup message: improve recommended code to update package ([793e303](https://github.com/inbo/n2khab/commit/793e303)). # n2khab 0.9.0 (2023-11-22) From 36ff3053363b5e5b6e3ee4d33793b76248d8ed8c Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 24 Nov 2023 13:29:16 +0100 Subject: [PATCH 5/5] Version 0.9.1 --- .zenodo.json | 2 +- DESCRIPTION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 19b6fd2..5311e49 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -4,7 +4,7 @@ "license": "GPL-3.0", "upload_type": "software", "access_right": "open", - "version": "0.9.0", + "version": "0.9.1", "creators": [ { "name": "Vanderhaeghe, Floris", diff --git a/DESCRIPTION b/DESCRIPTION index 2c01665..e611abc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: n2khab Title: Providing Preprocessed Reference Data for Flemish Natura 2000 Habitat Analyses -Version: 0.9.0.9000 +Version: 0.9.1 Authors@R: c( person("Floris", "Vanderhaeghe", email = "floris.vanderhaeghe@inbo.be", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6378-6229")), person("Toon", "Westra", email = "toon.westra@inbo.be", role = c("aut"), comment = c(ORCID = "0000-0003-2478-9459")),