Merge pull request #63 from appling/master

work on #53
DOI-USGS · Nov 13, 2015 · 5babaa8 · 5babaa8
2 parents c8b4776 + c8d03df
commit 5babaa8
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,19 +2,25 @@ language: r
 sudo: required
 warnings_are_errors: true
 
+before_install:
+  echo "options(repos = c(CRAN='http://cran.r-project.org'))" > .Rprofile
+
 r_github_packages:
- - jimhester/covr
- - appling/unitted
- - USGS-R/smwrData
- - USGS-R/smwrBase
- - USGS-R/smwrGraphs
- - USGS-R/smwrStats
- - USGS-R/smwrQW
- - USGS-R/rloadest
+  - jimhester/covr
+  - appling/unitted@v0.2.5
+  - USGS-R/smwrData@v1.1.0
+  - USGS-R/smwrBase@v1.1.0
+  - USGS-R/smwrGraphs@v1.1.0
+  - USGS-R/smwrStats@v0.7.2
+  - USGS-R/smwrQW@v0.7.5
+  - USGS-R/rloadest@v0.4.2
 
 after_success:
   - Rscript -e 'covr::codecov(); covr::coveralls()'
 
+after_failure:
+  - ./travis-tool.sh dump_logs
+
 notifications:
   email:
     on_success: change

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: loadflex
 Type: Package
 Title: Models and Tools for Watershed Flux Estimates
-Version: 1.0.0
-Date: 2015-06-04
+Version: 1.0.1
+Date: 2015-11-12
 Author: Alison Appling, Miguel Leon
 Maintainer: Alison Appling <alison.appling@gmail.com>
 Description: Implements several of the most common methods for

diff --git a/R/loadflex.R b/R/loadflex.R
@@ -30,14 +30,14 @@
 #' @section Installation:
 #'   
 #'   loadflex makes use of packages that are currently only available from 
-#'   GitHub. To install these packages, run the following lines:
+#'   GitHub or the USGS R package repository. To install these packages, run the
+#'   following lines:
 #'   
 #'   install.packages(c("smwrData", "smwrBase", "smwrGraphs", "smwrStats", 
-#'   "smwrQW"), repos=c("http://owi.usgs.gov/R", "http://usgs-r.github.com", 
+#'   "smwrQW", "rloadest"), repos=c("http://owi.usgs.gov/R", 
 #'   "http://cran.us.r-project.org"), dependencies=TRUE, type="both")
 #'   
-#'   devtools::install_github(c("USGS-R/rloadest", "appling/unitted",
-#'   "mcdowelllab/loadflex"))
+#'   devtools::install_github(c("appling/unitted", "mcdowelllab/loadflex"))
 #'   
 #' @name loadflex
 #' @docType package

diff --git a/README.md b/README.md
@@ -27,12 +27,14 @@ To see how to cite this package, type `citation("loadflex")`.
 
 # Installation
 
-loadflex makes use of packages that are currently only available from
-GitHub. To install these packages, run the following lines:
-
+loadflex makes use of packages that are currently only available from 
+GitHub or the USGS R package repository. To install these packages, 
+run the following lines:
+
 ```{r}
-install.packages(c("smwrData", "smwrBase", "smwrGraphs", "smwrStats", "smwrQW"), 
-repos=c("http://owi.usgs.gov/R","http://usgs-r.github.com","http://cran.us.r-project.org"), dependencies=TRUE, type="both")
-   
-devtools::install_github(c("USGS-R/rloadest", "appling/unitted", "mcdowelllab/loadflex"))
+install.packages(c("smwrData", "smwrBase", "smwrGraphs", "smwrStats", 
+"smwrQW", "rloadest"), repos=c("http://owi.usgs.gov/R", 
+"http://cran.us.r-project.org"), dependencies=TRUE, type="both")
+
+devtools::install_github(c("appling/unitted", "mcdowelllab/loadflex"))
 ```
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,15 +8,16 @@ environment:
 init:
   ps: |
         $ErrorActionPreference = "Stop"
-        Invoke-WebRequest http://raw.github.com/jread-usgs/r-appveyor/master/scripts/appveyor-tool.ps1 -OutFile "..\appveyor-tool.ps1"
+        Invoke-WebRequest http://raw.github.com/krlmlr/r-appveyor/master/scripts/appveyor-tool.ps1 -OutFile "..\appveyor-tool.ps1"
         Import-Module '..\appveyor-tool.ps1'
+  cmd: echo "options(repos = c(CRAN='http://cran.r-project.org'))" > .Rprofile
 
 install:
   ps: Bootstrap
 
 build_script:
   - R --version
-  - travis-tool.sh install_github appling/unitted USGS-R/smwrData USGS-R/smwrBase USGS-R/smwrGraphs USGS-R/smwrStats USGS-R/smwrQW USGS-R/rloadest
+  - travis-tool.sh install_github appling/unitted@v0.2.5 USGS-R/smwrData@v1.1.0 USGS-R/smwrBase@v1.1.0 USGS-R/smwrGraphs@v1.1.0 USGS-R/smwrStats@v0.7.2 USGS-R/smwrQW@v0.7.5 USGS-R/rloadest@v0.4.2
   - travis-tool.sh install_deps
 
 test_script:

diff --git a/man/loadflex.Rd b/man/loadflex.Rd
@@ -43,13 +43,13 @@ Models and Tools for Watershed Flux Estimates
 
 
   loadflex makes use of packages that are currently only available from
-  GitHub. To install these packages, run the following lines:
+  GitHub or the USGS R package repository. To install these packages, run the
+  following lines:
 
   install.packages(c("smwrData", "smwrBase", "smwrGraphs", "smwrStats",
-  "smwrQW"), repos=c("http://owi.usgs.gov/R", "http://usgs-r.github.com",
+  "smwrQW", "rloadest"), repos=c("http://owi.usgs.gov/R",
   "http://cran.us.r-project.org"), dependencies=TRUE, type="both")
 
-  devtools::install_github(c("USGS-R/rloadest", "appling/unitted",
-  "mcdowelllab/loadflex"))
+  devtools::install_github(c("appling/unitted", "mcdowelllab/loadflex"))
 }