Skip to content

Commit

Permalink
prep for cran release (#40)
Browse files Browse the repository at this point in the history
* prep for cran release
* version bump + site rebuild
* tweak cran comments
* update makefile examples cmd
  • Loading branch information
jeffreyhanson authored Dec 5, 2021
1 parent 63cd303 commit 5459789
Show file tree
Hide file tree
Showing 34 changed files with 1,121 additions and 2,169 deletions.
5 changes: 2 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: wdpar
Type: Package
Version: 1.3.1.6
Version: 1.3.2
Title: Interface to the World Database on Protected Areas
Description: Fetch and clean data from the World Database on Protected
Areas (WDPA) and the World Database on Other Effective Area-Based
Expand All @@ -24,8 +24,7 @@ Imports:
cli (>= 1.0.1),
lwgeom (>= 0.2-1),
tibble (>= 2.1.3),
rappdirs (>= 0.3.1),
withr (>= 2.4.1)
rappdirs (>= 0.3.1)
Suggests:
testthat (>= 2.0.1),
knitr (>= 1.2.0),
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ urlcheck:
R --slave -e "devtools::document();urlchecker::url_check()"

examples:
R --slave -e "devtools::run_examples(test = TRUE, run = TRUE);warnings()" >> examples.log
R --slave -e "devtools::run_examples(run_donttest = TRUE, run_dontrun = TRUE);warnings()" >> examples.log
rm -f Rplots.pdf

wdpa_global: install
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# wdpar 1.3.2

- CRAN release.
- Update `read_sf_n` to import data faster.
- Remove withr R package from DESCRIPTION because it is not used.

# wdpar 1.3.1.6

- Update `wdpa_clean` to format the `PA_DEF` column to indicate
Expand Down
2 changes: 1 addition & 1 deletion R/read_sf_n.R
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ read_sf_n <- function(dsn, layer = NULL, n = NULL) {
assertthat::noNA(layer))
# construct query
if (!is.null(n)) {
query <- paste0("SELECT * FROM \"", layer,"\" WHERE FID <= ", n)
query <- paste0("SELECT * FROM \"", layer, "\" LIMIT ", n)
} else {
query <- paste0("SELECT * FROM \"", layer, "\"")
}
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ head(mlt_pa_data)
## 1 194420 194420 PA Filf… Filfla Rise… Nature R… National Ia
## 2 194425 194425 PA Il-G… Il-Gżejj… Rise… Nature R… National Ia
## 3 555588631 555588631 PA Il-M… Il-Majji… Park… National… National II
## 4 174757 174757 PA Il-Ġ… Il-Ġonna… List… List Of … National III
## 5 174758 174758 PA Bidn… Bidnija,… List… List Of … National III
## 6 194415 194415 PA Il-Ġ… Il-Ġonna… List… List Of … National III
## 4 174757 174757 PA Il-Ġ… Il-Ġonna… List… List of … National III
## 5 174758 174758 PA Bidn… Bidnija,… List… List of … National III
## 6 194415 194415 PA Il-Ġ… Il-Ġonna… List… List of … National III
## # … with 24 more variables: INT_CRIT <chr>, MARINE <chr>, REP_M_AREA <dbl>,
## # GIS_M_AREA <dbl>, REP_AREA <dbl>, GIS_AREA <dbl>, NO_TAKE <chr>,
## # NO_TK_AREA <dbl>, STATUS <chr>, STATUS_YR <dbl>, GOV_TYPE <chr>,
Expand Down Expand Up @@ -240,13 +240,13 @@ publications.
To cite the latest official version, please use:

> Hanson JO (2021). wdpar: Interface to the World Database on Protected
> Areas. R package version 1.3.1. Available at
> Areas. R package version 1.3.2. Available at
> <https://CRAN.R-project.org/package=wdpar>.
To cite the latest development version, please use:

> Hanson JO (2021). wdpar: Interface to the World Database on Protected
> Areas. R package version 1.3.1.6. Available at
> Areas. R package version 1.3.2. Available at
> <https://github.com/prioritizr/wdpar>.
To cite the World Database on Protected Areas (WDPA), please use:
Expand Down
33 changes: 30 additions & 3 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Dear CRAN volunteers,

Thank you for reviewing this submission. This version contains the following updates: (i) data downloaded from the Protected Planet website are saved to a temporary directory by default, (ii) improved compatibility with package dependencies (e.g. sf R package), and (iii) fixed compatibility issues with updates made to the Protected Planet website.
Thank you for reviewing this submission. The main updates in this version include (i) fixing compatibility issues with the Protected Planet website to enable users to download data, (ii) improving data cleaning procedures, (iii) updating code and documentation to reflect the recent addition of the World Database on Other Effective Area-Based Conservation Measures (WDOECM) to the Protected Planet website, and (iv) removing unused package dependencies. The package now also includes the prepr R package as an optional dependency to augment data processing (https://github.com/dickoa/prepr).

Cheers,

Expand All @@ -11,9 +11,36 @@ Jeff
* [Ubuntu 20.04, R-release](https://github.com/prioritizr/wdpar/actions?query=workflow%3AUbuntu)
* [Ubuntu 20.04, R-devel](https://github.com/prioritizr/wdpar/actions?query=workflow%3AUbuntu)
* [Mac OSX 10.15, R-release](https://github.com/prioritizr/wdpar/actions?query=workflow%3A%22Mac+OSX%22)
* [macOS 11.5.2 (arm64), R-release (macOS builder)](https://mac.r-project.org/macbuilder/submit.html)
* [Windows Server 2019, R-release](https://github.com/prioritizr/wdpar/actions?query=workflow%3AWindows)
* Windows Server 2008 (x64), R-devel (win-builder)
* [Windows Server 2008 (x64), R-devel (Win-Builder)](https://win-builder.r-project.org/)

# R CMD check results

0 errors | 0 warnings | 0 note
0 errors | 0 warnings | 2 note

# CRAN check notes for new submission

* Possibly misspelled words in DESCRIPTION:
WDOECM (7:28)

**This term is an acronym for the World Database on Other Effective Area-Based Conservation Measures (as noted in the package Description).**

* Suggests or Enhances not in mainstream repositories:
prepr

**The prepr R package is an optional dependency that is available on GitHub (<https://github.com/dickoa/prepr>). Instructions for installing the prepr R package are provided in the DESCRIPTION file and the package README file.**

* Namespace in Imports field not imported from: ‘withr’
All declared Imports should be used.

# CRAN check notes for current version on CRAN

* Namespace in Imports field not imported from: ‘withr’
All declared Imports should be used.

**This note has been addressed by removing the withr R package from the Imports field.**

# Downstream dependencies

There are no existing packages that depend on this package.
6 changes: 3 additions & 3 deletions docs/404.html

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

109 changes: 17 additions & 92 deletions docs/articles/index.html

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

Loading

0 comments on commit 5459789

Please sign in to comment.