diff --git a/.travis.yml b/.travis.yml index 5b38136..ea7385c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,34 @@ -# Sample .travis.yml for R projects from https://github.com/craigcitro/r-travis +# Sample .travis.yml for R projects. +# +# See README.md for instructions, or for more configuration options, +# see the wiki: +# https://github.com/craigcitro/r-travis/wiki -language: c - -os: - - osx - - linux +language: objective-c +sudo: required env: global: - - CRAN: http://cran.rstudio.com + - R_LIBS="http://cran.rstudio.com" - R_BUILD_ARGS="--no-build-vignettes --no-manual" - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran" - BOOTSTRAP_LATEX="" - - NOT_CRAN="true" - -script: "./travis-tool.sh run_tests" + - NOT_CRAN="true" -before_script: +before_install: - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh - chmod 755 ./travis-tool.sh - - "./travis-tool.sh bootstrap" - - "./travis-tool.sh install_deps - ./travis-tool.sh install_r EGRET lubridate binom" + - ./travis-tool.sh bootstrap + +install: + - ./travis-tool.sh install_deps + +script: ./travis-tool.sh run_tests -after_script: - - "./travis-tool.sh dump_logs" +after_failure: + - ./travis-tool.sh dump_logs notifications: email: on_success: change - on_failure: change + on_failure: change \ No newline at end of file diff --git a/DESCRIPTION b/DESCRIPTION index d19055d..b9b8457 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,8 +6,7 @@ Authors@R: c( person("Robert", "Hirsch", role = c("aut"), email = "rhirsch@usgs.gov"), person("Laura", "DeCicco", role = c("aut","cre"), email = "ldecicco@usgs.gov")) -Description: Confidence interval calculations for Weighted - Regressions on Time, Discharge, and Season (WRTDS). +Description: Collection of functions to evaluate uncertainty of results from water quality analysis using the Weighted Regressions on Time Discharge and Season (WRTDS) method. This package is an add-on to the EGRET package that performs the WRTDS analysis. License: CC0 Depends: R (>= 3.0) diff --git a/R/wBTCode.R b/R/wBTCode.R index 63a50bb..cc21cad 100644 --- a/R/wBTCode.R +++ b/R/wBTCode.R @@ -12,8 +12,9 @@ #' LazyLoad: \tab yes\cr #' } #' -#' Collection of functions to do WRTDS and flowHistory analysis, and produce graphs and tables of data and results from these analysesevaluate uncertainty of results from water quality analysis using the WRTDS (Weighted Regressions on Time Discharge and Season) method. -#' This package is an add-on to the EGRET package that performs the WRTDS analysis. +#' Collection of functions to evaluate uncertainty of results from water quality analysis using +#' the Weighted Regressions on Time Discharge and Season (WRTDS) method. This package is an add-on +#' to the EGRET package that performs the WRTDS analysis. #' #' @name EGRETci-package #' @docType package diff --git a/README.md b/README.md index 0a7b647..7699204 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,8 @@ To install the `EGRETci` package you need to be using R 3.0 or greater. Then use "http://cran.us.r-project.org")) ``` -Linux: [![travis](https://api.travis-ci.org/ldecicco-USGS/EGRETci.svg?branch=master)](https://travis-ci.org/ldecicco-USGS/EGRETci) +Linux: +[![Build Status](https://travis-ci.org/USGS-R/EGRETci.svg)](https://travis-ci.org/USGS-R/EGRETci) [ diff --git a/man/EGRETci-package.Rd b/man/EGRETci-package.Rd index 0e93598..a489f62 100644 --- a/man/EGRETci-package.Rd +++ b/man/EGRETci-package.Rd @@ -18,8 +18,9 @@ LazyLoad: \tab yes\cr } } \details{ -Collection of functions to do WRTDS and flowHistory analysis, and produce graphs and tables of data and results from these analysesevaluate uncertainty of results from water quality analysis using the WRTDS (Weighted Regressions on Time Discharge and Season) method. -This package is an add-on to the EGRET package that performs the WRTDS analysis. +Collection of functions to evaluate uncertainty of results from water quality analysis using +the Weighted Regressions on Time Discharge and Season (WRTDS) method. This package is an add-on +to the EGRET package that performs the WRTDS analysis. } \author{ Robert M. Hirsch \email{rhirsch@usgs.gov}, Laura De Cicco \email{ldecicco@usgs.gov}