diff --git a/.Rbuildignore b/.Rbuildignore new file mode 100644 index 0000000000000000000000000000000000000000..7e70442af354c0d67ff2e431f4a07198375c819e --- /dev/null +++ b/.Rbuildignore @@ -0,0 +1,14 @@ +^.*\.Rproj$ +^\.Rproj\.user$ +^\.Rproj\inst\dataRetrieval.log +^\.Rproj\inst\dataRetrieval-concordance.tex +^\.Rproj\inst\dataRetrieval.toc +^\.Rproj\inst\dataRetrieval.tex +^\.travis\.yml$ +^\.Rproj\.gitignore +^\.Rproj\.RData +^\.Rproj\dataRetrieval.Rproj +^\.Rproj\.Rhistory +^\.Rproj\.travis.yml +^\.Rproj\appveyor.yml + diff --git a/.travis.yml b/.travis.yml index 81fe71d5b8248a6ed09570d3a76192f8b7767d10..8d6232076c5fe3d553587184c56bce8df8a7b4e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,19 +2,24 @@ language: c -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 +env: + global: + - CRAN: http://cran.rstudio.com + - R_BUILD_ARGS="--no-build-vignettes --no-manual" + - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran" + - BOOTSTRAP_LATEX="" -install: - - ./travis-tool.sh install_deps - - ./travis-tool.sh install_github USGS-R/EGRET +script: "./travis-tool.sh run_tests" -script: ./travis-tool.sh run_tests +before_script: + - 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 zoo XML RCurl dplyr reshape2 lubridate" + - "./travis-tool.sh install_github USGS-R/EGRET" on_failure: - - ./travis-tool.sh dump_logs + - "./travis-tool.sh dump_logs" notifications: email: diff --git a/NAMESPACE b/NAMESPACE index 1fe6705ee06665c1871c4050904834ee8b3aebb4..58f5d9eb6319b176da44d954e8f9de0db13474d7 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -30,7 +30,6 @@ export(getWQPSample) export(getWQPSites) export(getWQPqwData) export(getWaterML1Data) -export(getWaterML2Data) export(mergeReport) export(padVariable) export(populateConcentrations) diff --git a/README.md b/README.md index a813c346ccdd432b4569e80e4f9e2a42de2a37a2..30b2e26f2c72cef9174765d75cea23a777dd2f19 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ `dataRetrieval` ============= +Linux:  -[](https://ci.appveyor.com/project/USGS-R/dataretrieval) +Windows: [](https://ci.appveyor.com/project/USGS-R/dataretrieval) R package source for data retrieval specifically for the EGRET R package: