Skip to content

Commit

Permalink
update prepr + ggmap deps (#53)
Browse files Browse the repository at this point in the history
- Update _prepr_ and _ggmap_ package dependencies.
  • Loading branch information
jeffreyhanson authored Apr 27, 2024
1 parent 34ae091 commit 0be917b
Show file tree
Hide file tree
Showing 74 changed files with 347 additions and 352 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
install.packages("sf")
install.packages("terra")
install.packages("lwgeom")
remotes::install_github("dickoa/prepr")
remotes::install_github("prioritizr/prepr")
remotes::install_github("r-spatial/link2GI")
shell: Rscript {0}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
install.packages("link2GI")
install.packages("rgrass")
install.packages("smoothr")
remotes::install_github("dickoa/prepr")
remotes::install_github("prioritizr/prepr")
shell: Rscript {0}

- name: Session information
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
install.packages("sf")
install.packages("terra")
install.packages("lwgeom")
remotes::install_github("dickoa/prepr")
remotes::install_github("prioritizr/prepr")
shell: Rscript {0}

- name: Session information
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
install.packages("lwgeom")
install.packages("link2GI")
install.packages("rgrass")
remotes::install_github("dickoa/prepr")
remotes::install_github("prioritizr/prepr")
shell: Rscript {0}

- name: Session information
Expand Down
15 changes: 7 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: aoh
Type: Package
Version: 0.0.2.9
Version: 0.0.2.10
Title: Create Area of Habitat Data
Description: Create Area of Habitat data to characterize species distributions.
Data are produced following procedures outlined by Brooks et al. (2019)
Expand All @@ -15,7 +15,7 @@ Description: Create Area of Habitat data to characterize species distributions.
processing time.
To augment data cleaning procedures, users can also install the
'prepr' R package
(available at <https://github.com/dickoa/prepr>).
(available at <https://github.com/prioritizr/prepr>).
Authors@R:
c(person(c('Jeffrey', 'O'), 'Hanson',
email='[email protected]', role = c('aut','cre'),
Expand Down Expand Up @@ -51,15 +51,15 @@ Suggests:
roxygen2 (>= 6.1.1),
rmarkdown (>= 1.10),
pingr (>= 1.1.2),
ggmap (>= 3.0.2.9002),
ggmap (>= 4.0.0),
fields (>= 14.0),
smoothr (>= 0.2.2),
rnaturalearth (>= 0.3.3),
gdalUtilities (>= 1.2.1),
archive (>= 1.1.2),
link2GI (>= 0.5-0),
rgrass (>= 0.3-8),
prepr (>= 0.1.9000),
prepr (>= 0.3.0),
vcr (>= 0.6.0)
Depends:
R (>= 4.1.0),
Expand All @@ -73,7 +73,7 @@ SystemRequirements: GDAL (>= 3.0.2) (optional), PROJ (>= 7.2.0) (optional)
URL: https://prioritizr.github.io/aoh/, https://github.com/prioritizr/aoh
BugReports: https://github.com/prioritizr/aoh/issues
VignetteBuilder: knitr
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
Collate:
'internal.R'
'calc_spp_frc_data.R'
Expand Down Expand Up @@ -131,6 +131,5 @@ Collate:
'zzz.R'
Roxygen: list(markdown = TRUE)
Remotes:
dickoa/prepr,
r-spatial/link2GI,
dkahle/ggmap
prioritizr/prepr,
r-spatial/link2GI
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# aoh 0.0.2.10

- Update _prepr_ and _ggmap_ package dependencies.

# aoh 0.0.2.9

- Remove _rgdal_ package dependency.
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The _aoh R_ package can leverage the _prepr R_ package to augment data cleaning

```{r, eval = FALSE}
if (!require(remotes)) install.packages("remotes")
remotes::install_github("dickoa/prepr")
remotes::install_github("prioritizr/prepr")
```

The package can also leverage the [Geospatial Data Abstraction Library (GDAL)](https://gdal.org/) and [Geographic Resources Analysis Support System (GRASS)](https://grass.osgeo.org/) to help reduce processing time. Although use of these software is optional, they can help improve computational performance when processing data across large spatial extents. Below we provide platform-specific instructions to install dependencies for the _prepr R_ package, GDAL, and GRASS.
Expand Down
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ installed (see below for platform-specific instructions).

``` r
if (!require(remotes)) install.packages("remotes")
remotes::install_github("dickoa/prepr")
remotes::install_github("prioritizr/prepr")
```

The package can also leverage the [Geospatial Data Abstraction Library
Expand Down Expand Up @@ -349,11 +349,7 @@ map <-
strip.text = element_text(color = "white"),
strip.background = element_rect(fill = "black", color = "black")
)
```

## |---------|---------|---------|---------|========================================= |---------|---------|---------|---------|=========================================

``` r
# display maps
print(map)
```
Expand All @@ -369,8 +365,8 @@ produce Area of Habitat data.
Depending on which datasets are used, please cite the aoh package and
relevant data using:

Hanson JO (2023) aoh: Create Area of Habitat Data. R package version
0.0.2.9. Available at https://github.com/prioritizr/aoh.
Hanson JO (2024) aoh: Create Area of Habitat Data. R package version
0.0.2.10. Available at https://github.com/prioritizr/aoh.

IUCN [insert year] IUCN Red List of Threatened Species. Version
[insert version]. Available at www.iucnredlist.org.
Expand Down
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.

50 changes: 14 additions & 36 deletions docs/articles/aoh.html

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

Binary file modified docs/articles/aoh_files/figure-html/unnamed-chunk-10-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0be917b

Please sign in to comment.