Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
332f63e
Develop (#78)
jbousquin Sep 23, 2025
ebbeab2
Trying Jeff's epar package to generate code cov badge
mhweber Sep 23, 2025
f057869
incrementing dev version
mhweber Sep 24, 2025
b4cb12d
Metric categories (#79)
mhweber Oct 3, 2025
bdd7fed
Updating version
mhweber Oct 6, 2025
c37efca
changes to sc_get_params and lc_get_params
mhweber Oct 8, 2025
dee7c3f
fix to allow passing vectors of metric, state, county, region to both…
mhweber Oct 8, 2025
c57a9b7
remove global variables messages
michaeldumelle Oct 8, 2025
8e5e917
reconcile merge
michaeldumelle Oct 8, 2025
979ea71
couple more updates to get_params functions and adding Mike as contri…
mhweber Oct 8, 2025
7f53b7c
updated documentation
mhweber Oct 8, 2025
55dcb91
Merge branch 'master' into develop
mhweber Oct 9, 2025
49d5e23
Merge branch 'master' into develop
mhweber Oct 9, 2025
56f96cd
Increment develop branch
mhweber Oct 9, 2025
276494d
added try catch to functions to fail gracefully and fixed column sepa…
mhweber Oct 15, 2025
c867a2b
added new get_metric_names example to Vignettes and last fixes to try…
mhweber Oct 15, 2025
4a40067
document new functions
mhweber Oct 15, 2025
f70a186
updated CRAN comments
mhweber Oct 15, 2025
051c7b9
merge final CRANv0.9.0 material to develop
mhweber Oct 16, 2025
f6f3b78
Ordered vignettes in github pages
mhweber Oct 16, 2025
b5cb3ae
handling in vignettes for web service being down
mhweber Oct 20, 2025
f2110c1
updated CRAN comments
mhweber Oct 20, 2025
6279826
Updated NEWS and DESCRIPTION
mhweber Oct 20, 2025
e83eada
updated CRAN comments
mhweber Oct 20, 2025
60e4c31
Switched most vignettes to articles
mhweber Oct 24, 2025
8b9df9e
updated CRAN comments and NEWS
mhweber Oct 24, 2025
dcc6a4a
packagedown update
mhweber Nov 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: StreamCatTools
Type: Package
Title: 'StreamCatTools'
Version: 0.9.0
Version: 0.9.1
Authors@R: c(person(given = "Marc",
family = "Weber",
role = c("aut", "cre"),
Expand Down
14 changes: 10 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
# StreamCatTools 0.9.1

- Handles a web service being down in testing using `testthat::skip_on_cran()`
- Converts most vignettes to articles and adds one new `Start Here` vignette

# StreamCatTools 0.9.0
- Addresses CRAN error generated by tests that is
- Adds tryCatch handling for functions calling web services in order to fail
gracefully and not produce errors
- Adds documentation to vignettes for two new functions added to the package

- Addresses CRAN error generated by tests that is
- Adds tryCatch handling for functions calling web services in order to fail
gracefully and not produce errors
- Adds documentation to vignettes for two new functions added to the package

# StreamCatTools 0.8.0

Expand Down
20 changes: 11 additions & 9 deletions R/sc_get_params.R
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ sc_get_metric_names <- function(category = NULL,

filters <- list(INDICATOR_CATEGORY = category, AOI = aoi, YEAR = year,
DSNAME = dataset)

filter_data <- function(data, filters) {
# Filter the data frame for each non-null filter
filtered_data <- purrr::reduce(
Expand All @@ -197,14 +196,17 @@ sc_get_metric_names <- function(category = NULL,
)
return(filtered_data)
}
results <- filter_data(resp, filters)
names_keep <- c("INDICATOR_CATEGORY", "METRIC_NAME", "AOI", "YEAR",
"WEBTOOL_NAME", "METRIC_DESCRIPTION",
"METRIC_UNITS", "SOURCE_NAME", "DSNAME")
results <- results[, names_keep, drop = FALSE]
names_new <- c("Category", "Metric", "AOI", "Year", "Short_Name",
"Metric_Description", "Units", "Source", "Dataset")
names(results) <- names_new
if (exists('resp') & !is.null(resp)){
results <- filter_data(resp, filters)
names_keep <- c("INDICATOR_CATEGORY", "METRIC_NAME", "AOI", "YEAR",
"WEBTOOL_NAME", "METRIC_DESCRIPTION",
"METRIC_UNITS", "SOURCE_NAME", "DSNAME")
results <- results[, names_keep, drop = FALSE]
names_new <- c("Category", "Metric", "AOI", "Year", "Short_Name",
"Metric_Description", "Units", "Source", "Dataset")
names(results) <- names_new
} else
results <- 'the service appears to be down currently'

return(results)
}
7 changes: 4 additions & 3 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ articles:
- title: Articles
navbar: ~
contents:
- Introduction
- LakeCat
- Applications
- StartHere
- Articles/Introduction
- Articles/LakeCat
- Articles/Applications
34 changes: 14 additions & 20 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
This is a minor update that:

- Addresses CRAN error noted by Dr. Brian Ripley generated by tests that is
required to be fixed by 10/25/25
- Adds tryCatch handling for functions calling web services in order to fail
gracefully and not produce errors
- Adds documentation to vignettes for two new functions added to the package
This is a patch update that:

- Handles a web service being down in testing using `testthat::skip_on_cran()`
- Handles a web service being down in vignettes by converting most vignettes to
articles and leaving just one `Start Here` vignette
- Due to the lapse in government funding in federal agencies in the US,
the web service StreamCatTools is built around may be down for some time
- Because of the lapse in government funding in federal agencies in the US, I
may not be able to respond readily to any CRAN emails to my government
email account weber.marc@epa.gov but my personal email is mweber36@gmail.com


-------

Expand All @@ -14,19 +18,9 @@ This is a resubmission.

## R CMD check results

Here is the output from `devtools::check()` on R Version 4.4.1,
Here is the output from `devtools::check()` on R Version R version 4.5.0,
devtools version 2.4.6, and Windows 11 x64 operating system

0 errors ✔ | 0 warnings ✔ | 2 notes ✖

R CMD check succeeded

NOTES:

checking installed package size ... NOTE
installed size is 5.0Mb
sub-directories of 1Mb or more:
doc 4.4Mb
Duration: 2m 20.4s

checking for future file timestamps ... NOTE
unable to verify current time
0 errors ✔ | 0 warnings ✔ | 0 notes ✔
13 changes: 7 additions & 6 deletions docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions docs/LICENSE.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions docs/articles/Applications.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading