Merge pull request #321 from ldecicco-USGS/master

Final CRAN updates

.Rbuildignore

@@ -19,6 +19,8 @@ code.json
 hexSticker.R
 ^docs$
 EGRET.Rcheck
+vignettes/*.html
+vignettes/*.R
 vignettes/References_WRTDS.Rmd
 vignettes/References_Extend.Rmd
 vignettes/References_Region.Rmd
@@ -30,8 +32,16 @@ vignettes/data_prep.Rmd
 vignettes/Conwingo.PO4.RData
 vignettes/plotOne.R
 vignettes/runPairsMonths.R
-vignettes/TrendByMonth.Rmd
+vignettes/TrendsByMonth.Rmd
+vignettes/Conowingo.PO4.RData
+vignettes/Annual_Hydrograph_Timing.Rmd
 vignettes/AlternativeQMethod.Rmd
+vignettes/Enhancements.Rmd
+vignettes/eListOut.rds
+vignettes/pairResults.rds
+vignettes/pairResults2.rds
+vignettes/WRTDSK.Rmd
+vignettes/ChainBridge.TP.RData
 vignettes/functionsForK.R
 _pkgdown.yml
 pkgdown/favicon/*

README.md

@@ -1,13 +1,4 @@
-# EGRET <img src="man/figures/egret-02.png" alt="EGRET" height="150px" align="right" />
-
-[![R build
-status](https://github.com/USGS-R/EGRET/workflows/R-CMD-check/badge.svg)](https://github.com/USGS-R/EGRET/actions)
-[![codecov](https://codecov.io/gh/USGS-R/EGRET/branch/master/graph/badge.svg)](https://codecov.io/gh/USGS-R/EGRET)
-[![status](https://img.shields.io/badge/USGS-Research-blue.svg)](https://owi.usgs.gov/R/packages.html#research)
-[![CRAN
-version](http://www.r-pkg.org/badges/version/EGRET)](https://cran.r-project.org/package=EGRET)
-[![](http://cranlogs.r-pkg.org/badges/EGRET)](https://cran.r-project.org/package=EGRET)
-[![](http://cranlogs.r-pkg.org/badges/grand-total/EGRET)](https://cran.r-project.org/package=EGRET)
+# EGRET 
 
 Exploration and Graphics for RivEr Trends (`EGRET`): An R-package for
 the analysis of long-term changes in water quality and streamflow,
@@ -16,7 +7,7 @@ Discharge, and Season (WRTDS).
 
 The link for the official USGS publication user guide is here:
 
-<https://pubs.usgs.gov/tm/04/a10/>
+[https://pubs.usgs.gov/tm/04/a10/](https://pubs.usgs.gov/tm/04/a10/)
 
 A companion package [`EGRETci`](https://usgs-r.github.io/EGRETci/)
 implements a set of approaches to the analysis of uncertainty associated

code.json

@@ -3,7 +3,7 @@
     "name": "EGRET",
     "organization": "U.S. Geological Survey",
     "description": "An R-package for the analysis of long-term changes in water quality and streamflow, including the water-quality method Weighted Regressions on Time, Discharge, and Season (WRTDS)",
-    "version": "2.6.0",
+    "version": "3.0.5",
     "status": "Production",
     "permissions": {
       "usageType": "openSource",
@@ -16,11 +16,11 @@
         ]
     },
     "homepageURL": "https://code.usgs.gov/water/EGRET",
-    "downloadURL": "https://code.usgs.gov/water/EGRET/-/archive/v2.6.0/EGRET-v2.6.0.zip",
+    "downloadURL": "https://code.usgs.gov/water/EGRET/-/archive/v3.0.5/EGRET-v3.0.5.zip",
     "disclaimerURL": "https://code.usgs.gov/water/EGRET/blob/master/DISCLAIMER.md",
     "repositoryURL": "https://code.usgs.gov/water/EGRET.git",
     "vcs": "git",
-    "laborHours": 500,
+    "laborHours": 700,
 
     "tags": [
       "R",
@@ -38,7 +38,7 @@
       "email": "[email protected]"
     },
     "date": {
-      "metadataLastUpdated": "2018-06-08"
+      "metadataLastUpdated": "2021-04-09"
     }
   }
 ]