Skip to content

Commit

Permalink
Merge pull request #330 from jread-usgs/master
Browse files Browse the repository at this point in the history
CRAN patch for missing local image in README
  • Loading branch information
Jordan S Read committed Mar 14, 2017
2 parents dc84b1e + 97776ba commit 5232eef
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
@@ -1,8 +1,8 @@
Package: geoknife
Type: Package
Title: Web-Processing of Large Gridded Datasets
Version: 1.5.3
Date: 2017-03-03
Version: 1.5.4
Date: 2017-03-15
Authors@R: c( person("Jordan", "Read", role = c("aut","cre"),
email = "jread@usgs.gov"),
person("Jordan", "Walker", role = c("aut"),
Expand Down
5 changes: 5 additions & 0 deletions README.Rmd
Expand Up @@ -27,6 +27,11 @@ To install the `geoknife` from CRAN:
install.packages("geoknife")
```

```{r setup}
library(knitr)
opts_chunk$set(fig.path = "inst/", dev='png')
```

To install the stable version of `geoknife` package with dependencies:
```{r, eval=FALSE}
install.packages("geoknife",
Expand Down
11 changes: 8 additions & 3 deletions README.md
@@ -1,4 +1,4 @@
`geoknife` package version 1.5.2
`geoknife` package version 1.5.4
================================

[![Build status](https://ci.appveyor.com/api/projects/status/0iacmg82mp50426o/branch/master)](https://ci.appveyor.com/project/jread-usgs/geoknife/branch/master) [![Build Status](https://travis-ci.org/USGS-R/geoknife.svg)](https://travis-ci.org/USGS-R/geoknife) [![Coverage Status](https://coveralls.io/repos/USGS-R/geoknife/badge.svg)](https://coveralls.io/r/USGS-R/geoknife) [![Download Count](http://cranlogs.r-pkg.org/badges/geoknife)](https://cran.r-project.org/package=geoknife)
Expand All @@ -14,6 +14,11 @@ To install the `geoknife` from CRAN:
install.packages("geoknife")
```

``` r
library(knitr)
opts_chunk$set(fig.path = "inst/", dev='png')
```

To install the stable version of `geoknife` package with dependencies:

``` r
Expand Down Expand Up @@ -87,7 +92,7 @@ check(job)
## [1] "Process successful"
##
## $URL
## [1] "https://cida.usgs.gov:443/gdp/process/RetrieveResultServlet?id=289eb8f9-858a-4234-b19c-cf0d6a6ba505OUTPUT"
## [1] "https://cida.usgs.gov:443/gdp/process/RetrieveResultServlet?id=4ee0f066-54de-45c0-b37c-0a2bc30b0ad9OUTPUT"
##
## $statusType
## [1] "ProcessSucceeded"
Expand All @@ -107,7 +112,7 @@ data <- result(job)
plot(data[,1:2], ylab = variables(fabric))
```

![](README_files/figure-markdown_github/unnamed-chunk-7-1.png)
![](inst/unnamed-chunk-7-1.png)

##### use an email to listen for process completion

Expand Down
2 changes: 2 additions & 0 deletions cran-comments.md
Expand Up @@ -2,4 +2,6 @@
This is a resubmission. In this version I have:

* added the ability to download, check, and load results based on job id (in addition to the geojob object)
* added 'local' images used in README.md to the package source


File renamed without changes

0 comments on commit 5232eef

Please sign in to comment.