diff --git a/.Rbuildignore b/.Rbuildignore index 06d895a..030f263 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -11,3 +11,4 @@ DISCLAIMER.md code.json ^doc$ ^Meta$ +.github \ No newline at end of file diff --git a/DESCRIPTION b/DESCRIPTION index cea505d..358df2b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: geoknife Type: Package Title: Web-Processing of Large Gridded Datasets -Version: 1.6.4 -Date: 2020-05-20 +Version: 1.6.5 +Date: 2021-04-26 Authors@R: c( person("Jordan", "Read", role = c("aut","cre"), email = "jread@usgs.gov"), person("Jordan", "Walker", role = c("aut"), diff --git a/NEWS.md b/NEWS.md index cde3ab8..52f3571 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +geoknife 1.6.5 +========== +* Updated schema for jobs that use geoknife generated geometry +* Migrated package to use github actions for CI + geoknife 1.6.4 ========== * Improved error handling for failed processing jobs diff --git a/code.json b/code.json index 103097d..748ab29 100644 --- a/code.json +++ b/code.json @@ -3,7 +3,7 @@ "name": "geoknife", "organization": "U.S. Geological Survey", "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.", - "version": "1.6.1", + "version": "1.6.5", "status": "Production", "permissions": { @@ -17,7 +17,7 @@ }, "homepageURL": "https://code.usgs.gov/water/geoknife", - "downloadURL": "https://code.usgs.gov/water/geoknife/tags/v1.6.1", + "downloadURL": "https://code.usgs.gov/water/geoknife/tags/v1.6.5", "disclaimerURL": "https://code.usgs.gov/water/geoknife/blob/master/DISCLAIMER.md", "repositoryURL": "https://code.usgs.gov/water/geoknife.git", "vcs": "git", @@ -42,7 +42,7 @@ }, "date": { - "metadataLastUpdated": "2018-08-07" + "metadataLastUpdated": "2021-04-27" } } ] \ No newline at end of file diff --git a/cran-comments.md b/cran-comments.md index 7a39cfd..8258bfd 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,16 +1,9 @@ ## Test environments -* local OS X install, R 3.6.3 -* travis (Ubuntu) -* win-builder (R-release) +* local windows and ubuntu +* rhub windows and ubuntu ## R CMD check results No ERRORS, WARNINGS or NOTES ## Resubmission -Removed comma from keywords in bufferPoint.Rd as requested, and added publication reference to description - -Fixed DOI formatting - -Note the original contents of this submission fix the CRAN check fail from 2020-06-01 - - +Applied URL redirect for citation \ No newline at end of file diff --git a/inst/CITATION b/inst/CITATION index bd53afa..16dcdc9 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -11,5 +11,5 @@ citEntry(entry = "Article", journal = "Ecography", year = "2015", doi = "10.1111/ecog.01880", - url = "http://onlinelibrary.wiley.com/doi/10.1111/ecog.01880/abstract", + url = "https://onlinelibrary.wiley.com/doi/full/10.1111/ecog.01880", textVersion = paste("Read JS, JI Walker, A Appling, DL Blodgett, EK Read, LA Winslow. 2015. geoknife: Reproducible web-processing of large gridded datasets. Ecography. doi:10.1111/ecog.01880")) \ No newline at end of file diff --git a/vignettes/custom_data_sources.Rmd b/vignettes/custom_data_sources.Rmd index c35ad67..775db47 100644 --- a/vignettes/custom_data_sources.Rmd +++ b/vignettes/custom_data_sources.Rmd @@ -42,7 +42,7 @@ attribute(stencil) <- stencil_attributes[2] print(query(stencil, 'values')) ``` -Now we'll set up our webdata with an OPeNDAP service as its url. Note that this can be any OPeNDAP service compatible with `geoknife` and the Geo Data Portal. What datasets are compatible is beyond the scope of this vignette, but is documented [here](https://my.usgs.gov/confluence/display/GeoDataPortal/Custom+Dataset+Use+Guidlines). The OPeNDAP dataset used here is from the [main USGS THREDDS archive](https://cida.usgs.gov/thredds) and is one included in `geoknife` but many other OPeNDAP datasets could be used by entering their OPeNDAP service base URL in the same way. +Now we'll set up our webdata with an OPeNDAP service as its url. Note that this can be any OPeNDAP service compatible with `geoknife` and the Geo Data Portal. What datasets are compatible is beyond the scope of this vignette, but is documented [here](https://my.usgs.gov/confluence/display/GeoDataPortal/Custom+Dataset+Use+Guidlines). The OPeNDAP dataset used here is from the [main USGS THREDDS archive](https://cida.usgs.gov/thredds/) and is one included in `geoknife` but many other OPeNDAP datasets could be used by entering their OPeNDAP service base URL in the same way. ```{r fabric, echo=T} fabric <- webdata(url = 'https://cida.usgs.gov/thredds/dodsC/prism_v2', diff --git a/vignettes/geoknife.Rmd b/vignettes/geoknife.Rmd index 784f8aa..2febb59 100644 --- a/vignettes/geoknife.Rmd +++ b/vignettes/geoknife.Rmd @@ -572,5 +572,5 @@ cancel() geoknife outsources all major geospatial processing tasks to a remote server. Because of this, users must have an active internet connection. Problems with connections to datasets or the processing resources are rare, but they do happen. When experiencing a connectivity problem, the best approach is often to try again later or email gdp@usgs.gov with any questions. The various web dependencies are described below. ### Geo Data Portal -The U.S. Geological Survey's "Geo Data Portal" (GDP) provides the data access and processing services that are leveraged by the `geoknife` package. See [cida.usgs.gov/gdp](https://cida.usgs.gov/gdp) for the GDP user interface. +The U.S. Geological Survey's "Geo Data Portal" (GDP) provides the data access and processing services that are leveraged by the `geoknife` package. See [cida.usgs.gov/gdp](https://cida.usgs.gov/gdp/) for the GDP user interface.