Skip to content

Commit

Permalink
Merge pull request #389 from wdwatkins/master
Browse files Browse the repository at this point in the history
misc updates for CRAN release
  • Loading branch information
Jordan S Read authored May 29, 2020
2 parents 86948b1 + 3ffa14b commit 42823eb
Show file tree
Hide file tree
Showing 41 changed files with 33 additions and 2,009 deletions.
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
^CRAN-RELEASE$
^.*\.Rproj$
^\.Rproj\.user$
.travis.yml
Expand All @@ -8,3 +9,5 @@ CONDUCT.md
LICENSE.note
DISCLAIMER.md
code.json
^doc$
^Meta$
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
geoknife.Rproj
nbproject/

doc
Meta
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

language: r
sudo: required
dist: trusty
dist: bionic
warnings_are_errors: true

r_build_args: --no-build-vignettes --no-manual
r_check_args: --no-build-vignettes --no-manual --as-cran
r_build_args: --no-manual
r_check_args: --no-manual --as-cran

repos:
CRAN: https://cran.rstudio.com
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Description: Processes gridded datasets found on the U.S. Geological Survey
Geo Data Portal web application or elsewhere, using a web-enabled workflow
that eliminates the need to download and store large datasets that are reliably
hosted on the Internet. The package provides access to several data subset and
summarization algorithms that are available on remote web processing servers.
summarization algorithms that are available on remote web processing servers (Read et al. (2015) <https://doi.org/10.1111/ecog.01880>).
License: CC0
URL: https://github.com/USGS-R/geoknife
BugReports: https://github.com/USGS-R/geoknife/issues
Expand Down Expand Up @@ -53,4 +53,4 @@ Suggests:
rgdal,
maps
VignetteBuilder: knitr
RoxygenNote: 6.1.1
RoxygenNote: 7.1.0
7 changes: 3 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
geoknife 1.6.1
geoknife 1.6.4
==========
* Added progress bar to wait() function
* Updated URL for daymet dataset
* Dropped XML dependency in favor of xml2
* Improved error handling for failed processing jobs
* Fixed bug with supported CRS
2 changes: 1 addition & 1 deletion R/bufferPoint.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#'@param point A vector of longitude and latitude values
#'@return A linear ring (with closure) as a numeric vector
#'
#'@keywords methods, internal
#'@keywords methods internal
#'@description Buffer ring creation from point
#'@title Create linear ring from point
#'@author Jordan S. Read
Expand Down
10 changes: 4 additions & 6 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
## Test environments
* local OS X install, R 3.5.1
* travis (Ubuntu 14.04.5 LTS, R 3.5.0)
* win-builder (R-devel)
* local OS X install, R 3.6.3
* travis (Ubuntu)
* win-builder (R-release)

## R CMD check results

No ERRORS, WARNINGS or NOTES

## Downstream dependencies
All checks passed with devtools::revdep_check()


51 changes: 0 additions & 51 deletions inst/doc/custom_data_sources.R

This file was deleted.

81 changes: 0 additions & 81 deletions inst/doc/custom_data_sources.Rmd

This file was deleted.

Loading

0 comments on commit 42823eb

Please sign in to comment.