Skip to content

Commit

Permalink
fix #14 (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffreyhanson authored Aug 21, 2023
1 parent 4952558 commit 987317c
Show file tree
Hide file tree
Showing 42 changed files with 38 additions and 26 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: prioritizrdata
Type: Package
Version: 0.3.2
Version: 0.3.2.1
Title: Conservation Planning Datasets
Description: Conservation planning datasets for learning how to use the
'prioritizr' package <https://CRAN.R-project.org/package=prioritizr>.
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# prioritizrdata 0.3.2.1

- Fix aliasing for package manual entry (#14).

# prioritizrdata 0.3.2

- Release candidate for CRAN.
Expand Down
2 changes: 1 addition & 1 deletion R/package.R
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#' }
#'
#' @name prioritizrdata
#'
#' @docType package
#' @aliases prioritizrdata-package
NULL

# avoid false positive NOTES
Expand Down
2 changes: 1 addition & 1 deletion R/tas_data.R
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ NULL
#' @rdname tas_data
#' @export
get_tas_pu <- function() {
# find zip file
# find zip file with data
f <- system.file("extdata", "tas_pu.gpkg.zip", package = "prioritizrdata")
# unzip zip file to temporary directory
td <- tempfile()
Expand Down
10 changes: 7 additions & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,12 @@ package_version_year <- function(x) {
live_package_version_year <- function(x) {
# fetch data
d <- versions::available.versions(x)[[1]]
d <- d[which(d$version == max(d$version)), , drop = FALSE]
c(as.character(d$version), as.character(format(as.POSIXct(d$date), "%Y")))
d <- paste0("http://cran.r-project.org/web/packages/", x, "/DESCRIPTION")
d <- read.dcf(url(d))
c(
as.character(d[, "Version"]),
as.character(format(as.POSIXct(d[, "Date/Publication"]), "%Y"))
)
}
archive_package_version_year <- function(x) {
Expand All @@ -91,6 +94,7 @@ archive_package_version_year <- function(x) {
c(rel_version, rel_year)
}
# get version numbers and years
dev_version_year <- c(
as.character(packageDescription("prioritizrdata")$Version),
format(Sys.time(), "%Y")
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ Alternatively, to cite the latest development version, please use:

> Hanson JO, Schuster R, Morrell N, Strimas-Mackey M, Watts ME, Arcese
> P, Bennett J, Possingham HP (2023). prioritizrdata: Conservation
> Planning Datasets. R package version 0.3.2. Available at
> Planning Datasets. R package version 0.3.2.1. Available at
> <https://github.com/prioritizr/prioritizrdata>.
2 changes: 1 addition & 1 deletion docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/deps/bootstrap-5.2.2/bootstrap.min.css

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified docs/deps/bootstrap-5.2.2/fonts/CSR64z1Qlv-GDxkbKVQ_fOAKSw.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pandoc: '2.13'
pkgdown: 2.0.7
pkgdown_sha: ~
articles: {}
last_built: 2023-04-05T00:26Z
last_built: 2023-08-21T22:31Z
urls:
reference: http://prioritizr.github.io/prioritizrdata/reference
article: http://prioritizr.github.io/prioritizrdata/articles
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/prioritizrdata.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/reference/salt_data.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified docs/reference/tas_data-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions docs/reference/tas_data.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/reference/wa_data.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/search.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions man/prioritizrdata.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 987317c

Please sign in to comment.