Skip to content

Commit

Permalink
Merge pull request #177 from inbo/dev_nextrelease
Browse files Browse the repository at this point in the history
Release version 0.10.1
  • Loading branch information
florisvdh authored Dec 4, 2023
2 parents 504696e + 0158e56 commit 2c2af9b
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "GPL-3.0",
"upload_type": "software",
"access_right": "open",
"version": "0.10.0",
"version": "0.10.1",
"creators": [
{
"name": "Vanderhaeghe, Floris",
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: n2khab
Title: Providing Preprocessed Reference Data for Flemish Natura 2000 Habitat Analyses
Version: 0.10.0
Version: 0.10.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")),
Expand Down
12 changes: 8 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# n2khab 0.10.1 (2023-12-04)

- Silently ignore errors from package {remotes} during package loading ([56e9c06](https://github.com/inbo/n2khab/commit/56e9c06)).

# n2khab 0.10.0 (2023-12-01)

## Breaking change
Expand Down Expand Up @@ -150,7 +154,7 @@ Existing R code will continue to run normally if you complied with the recommend
## Internal changes

- Harden CRS representations (#84)
- Re-integrate `download_zenodo()` (from `inborutils`) (#89)
- Re-integrate `download_zenodo()` (from {inborutils}) (#89)
- Drop some package dependencies to speed up package loading (#89, #90)


Expand Down Expand Up @@ -194,13 +198,13 @@ Further, a number of smaller fixes and enhancements were made.
- Several built-in checklists (among which: `types` and `env_pressures`)
- Function documentation
- 4 tutorials (vignettes / articles)
- A reexport of `download_zenodo()` from `inborutils`
- A reexport of `download_zenodo()` from {inborutils}
- Website built with `pkgdown`

## Historical note

This package is the successor of the 'n2khabutils' package.
This package is the successor of the {n2khabutils} package.
Previous to commit `c8608d9`, the code was part of the [n2khab-monitoring](https://github.com/inbo/n2khab-monitoring) repo (formerly 'n2khab-inputs'), where the original version history remains stored.
At that time, the package was called 'n2khabutils'.
At that time, the package was called {n2khabutils}.
As a convenience, the {n2khab} repo still holds the rewritten (shrinked) package history from before commit `c8608d9`, as defined by the related files and folders.
See [this](https://github.com/inbo/n2khab-monitoring/issues/28) issue in the 'n2khab-monitoring' repo, where the migration is documented.
43 changes: 24 additions & 19 deletions R/n2khab.R
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,30 @@ utils::globalVariables(c("."))
)
}
if (!is.null(nslookup("api.github.com", error = FALSE))) {
ref <- remotes::github_remote(
"inbo/n2khab",
ref = remotes::github_release()
)$ref
release <- package_version(gsub("\\p{L}*", "", ref, perl = TRUE))
if (packageVersion("n2khab") < release) {
packageStartupMessage(
"\n",
rep("=", getOption("width")),
"\nIt is advised to upgrade n2khab to its current version ",
release,
". Run:\n\n",
'detach("package:n2khab", unload = TRUE)\n',
'install.packages("n2khab", repos = c(inbo = "https://inbo.r-universe.dev",
tryCatch(
{
ref <- remotes::github_remote(
"inbo/n2khab",
ref = remotes::github_release()
)$ref
release <- package_version(gsub("\\p{L}*", "", ref, perl = TRUE))
if (packageVersion("n2khab") < release) {
packageStartupMessage(
"\n",
rep("=", getOption("width")),
"\nIt is advised to upgrade n2khab to its current version ",
release,
". 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"))
)
}
"\n",
"library(n2khab)\n",
rep("=", getOption("width"))
)
}
},
error = function(e) {}
)
}
}

0 comments on commit 2c2af9b

Please sign in to comment.