From 5944be424a7c2e75b5ef3650d2196bda72b6594e Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Fri, 16 Feb 2024 16:12:38 -0500 Subject: [PATCH 01/11] New code to better display issues with API calls and minor other minor documentation related improvements --- .github/workflows/R-CMD-check.yaml | 8 ++++---- DESCRIPTION | 5 +++-- MD5 | 22 +++++++++++----------- R/AQSAPI_helperfunctions.R | 10 +++++----- README.md | 5 ++--- man/RAQSAPI.Rd | 2 +- vignettes/Acknowledgements.Rmd | 2 +- vignettes/RAQSAPIFunctions-Long.R | 26 +++++++++++++------------- vignettes/RAQSAPIFunctions-Long.Rmd | 15 +++++++-------- vignettes/Troubleshooting.Rmd | 12 ++++++------ 10 files changed, 53 insertions(+), 54 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 26580fc..4d2f902 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -2,9 +2,9 @@ # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - branches: [main, httr2] + branches: [main, httr2, test_github_workflow] pull_request: - branches: [main, httr2] + branches: [main, httr2, test_github_workflow] name: R-CMD-check @@ -26,8 +26,8 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - RAQSAPIKEY: ${{ secrets.RAQSAPIKEY }} - RAQSAPIUSERNAME: ${{ secrets.RAQSAPIUSERNAME }} + RAQSAPIKEY: ${{ vars.RAQSAPIKEY }} + RAQSAPIUSERNAME: ${{ vars.RAQSAPIUSERNAME }} R_KEEP_PKG_SOURCE: yes steps: diff --git a/DESCRIPTION b/DESCRIPTION index 815e15d..709ae72 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -73,8 +73,9 @@ Suggests: testthat (>= 3.0.0), usethis, withr -SystemRequirements: package manual requires pandoc (>= 1.14) http://pandoc.org -RoxygenNote: 7.2.3 +SystemRequirements: package manual and Vignettes require pandoc + (>= 1.14) http://pandoc.org) +RoxygenNote: 7.3.1 VignetteBuilder: knitr BuildVignettes: true ByteCompile: true diff --git a/MD5 b/MD5 index 23e2ba5..f5ca16c 100644 --- a/MD5 +++ b/MD5 @@ -2,7 +2,7 @@ d3a7f7cc6aca27a043309d5bf9f32edc *codemeta.json bfa24dfc7e0f2f217163fa917e8d2392 *cran-comments.md bfa24dfc7e0f2f217163fa917e8d2392 *cran-comments.Rmd -7b3092d9d1ec246090f159fd55deeb57 *DESCRIPTION +32b197cb6b7fa3ce90996cf9cad52d01 *DESCRIPTION 1dc95961c4c280f8645a65d15662725f *dev/contributing.md 4fc13def6ec5d889261f1f22a13ba542 *dev/contributing.Rmd 74e297a0dc0b508ed18e3821264958d0 *dev/countlinesofcode.R @@ -116,10 +116,10 @@ f41ed996be135fb35afe00641621da61 *man/figures/lifecycle-questioning.svg 306bef67d1c636f209024cf2403846fd *man/figures/lifecycle-soft-deprecated.svg ed42e3fbd7cc30bc6ca8fa9b658e24a8 *man/figures/lifecycle-stable.svg bf2f1ad432ecccee3400afe533404113 *man/figures/lifecycle-superseded.svg -7ce4525010156c02adaf819a8c835134 *man/RAQSAPI.Rd +792c28b91a2c0b5e0b060a2f18a20464 *man/RAQSAPI.Rd 797940f405cb85557ee355e7eae5894d *NAMESPACE 904839971aff979c1716322c7d8bcdff *NEWS.md -b63d94a18d37de10925e09e6c3bb2eeb *R/AQSAPI_helperfunctions.R +d214f5204ba0d95601a92910109aad5e *R/AQSAPI_helperfunctions.R a3558975d0256839b174ab7868833075 *R/bybox.R bd8b36cc7325d4fc8b8ed894f0046678 *R/bycbsa.R 253ea551f88c65c1c49feff3cb33f552 *R/bycounty.R @@ -133,7 +133,7 @@ d82b1ff8ee144afca1879e5b8dc58840 *R/byma.R e6e3b87e48f4403642382987b0f40714 *R/setupfunctions.R 6e659bb3bbf313dc819d4c029f0b22d0 *R/zzz.R a69de5455537022556f014579766be59 *RAQSAPI.Rproj -feb8f6defa51349e6110273bedcc046b *README.md +4a756ab5cecfa9d56c075e6ed5353d6b *README.md b2370e0e3f63a29557cd8f74746d74f6 *README.Rmd 7ed08f3fb96a77ec01c95c2ad7964250 *revdep/data.sqlite 34952a5944548ea4fc132a9899f8e6ab *revdep/email.yml @@ -1329,8 +1329,8 @@ f7ea691da1baf266047ed7af4b0c4629 *tests/testthat/test-bypqao.R 051416af24d0386f084eb13a14053ce1 *tests/testthat/test-bystate.R 014b81fb9c8d2350e1347841f41b24a3 *tests/testthat/test-helperfunctions.R e897203bb026b43141e5bc00dfe3cecd *tests/testthat/test-RAQSAPlistfunctions.R -183ed69a443baffdf0454255cade3fcc *vignettes/Acknowledgements.html -18cea3348cace002e6c706d373beb524 *vignettes/Acknowledgements.Rmd +a55434f85eb9ec8d1c4706997b49cc10 *vignettes/Acknowledgements.html +1798121e142b3da718a2e54435a7ef9a *vignettes/Acknowledgements.Rmd 22d607e5d49e10047a911e5d42183c34 *vignettes/acs-nano.csl 0ec78b946a45069323acf54a24c77566 *vignettes/american-chemical-society.csl e1df58c4692ce8a6e9743bf9d594ff9e *vignettes/AQSAPI.bib @@ -1347,9 +1347,9 @@ ad142c2e81fca7371499f09e294c1dba *vignettes/pyaqsapi.R 733ccd06aa9a7988d1ea78f52c528e55 *vignettes/pyaqsapi.Rmd 8774f9c513ba8110c612b8ccfb9603e3 *vignettes/RAQSAPIFunctions-Brief.html 1dbae57a3f574ccd77b4d2af2c76e831 *vignettes/RAQSAPIFunctions-Brief.Rmd -9b96ebd481321226caedaa7ab4472d05 *vignettes/RAQSAPIFunctions-Long.html -d7c4cb348a250e4f40d1d510cec2df3d *vignettes/RAQSAPIFunctions-Long.R -e923e364682d337856051526b5b8b3a6 *vignettes/RAQSAPIFunctions-Long.Rmd +f1b8ea1d165c0d47b105678c37b32c57 *vignettes/RAQSAPIFunctions-Long.html +7146486d6cb6c29314f88f0e2bbb5ab2 *vignettes/RAQSAPIFunctions-Long.R +e845be67ff86dba758853123789979e5 *vignettes/RAQSAPIFunctions-Long.Rmd d375e86106c359f735a25d53764b7f8e *vignettes/RAQSAPIPurpose.html 2a912d01a36839facb5c2c6dff2d1c7f *vignettes/RAQSAPIPurpose.R 9d564369cb22e187ed61da9fafcac002 *vignettes/RAQSAPIPurpose.Rmd @@ -1360,7 +1360,7 @@ d375e86106c359f735a25d53764b7f8e *vignettes/RAQSAPIPurpose.html 95acca4cbbfe5ebbfcb4c0a3978038bf *vignettes/RAQSAPIvignette.Rmd 42a066ce73b20f2538877f8e4eac1d84 *vignettes/TimelinessofAQSData.html fddf2cec564191b24c0213f260c0f932 *vignettes/TimelinessofAQSData.Rmd -4a6f61ae81515d8b770f30841ef17fc1 *vignettes/Troubleshooting.html -1fee66dbee4d04b47a0b7747ea282a5b *vignettes/Troubleshooting.Rmd +3c09aefb6ebd2dd7f1e623f3eb341b6e *vignettes/Troubleshooting.html +9388c6af388ceb5b62fee3e414452c83 *vignettes/Troubleshooting.Rmd 2f01e9fde3b3c8b82aafc174e2b66833 *vignettes/UsingRAQSAPI.html 969189538d2ec6a0e10ea6d7350ab612 *vignettes/UsingRAQSAPI.Rmd diff --git a/R/AQSAPI_helperfunctions.R b/R/AQSAPI_helperfunctions.R index a065b84..e4d423d 100644 --- a/R/AQSAPI_helperfunctions.R +++ b/R/AQSAPI_helperfunctions.R @@ -346,11 +346,11 @@ RAQSAPI_error_msg <- function(AQSresponse) resp_body_json() msg <- glue("At server request time: {AQSresponse$headers$Date} - RAQSAPI experienced an error while processing the following url: - {AQSresponse$url}\n - with status_code: {AQSresponse$status_code} - and status message: {AQSresponse$status} - Server error message: {AQSerr$Header[[1]]$error}") + RAQSAPI experienced an error while processing the following url: + {gsub('(.)', '\\1 ', AQSresponse$url)}\n + with status_code: {AQSresponse$status_code} + and status message: {AQSresponse$status} + Server error message: {AQSerr$Header[[1]]$error}") return(msg) #nocov end diff --git a/README.md b/README.md index 92ca639..94d816c 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.or downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI) [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing) [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/) -“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--01--03-yellowgreen.svg)](/commits/master)” +“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--02--16-yellowgreen.svg)](/commits/master)” # EPA Disclaimer @@ -408,8 +408,7 @@ those sources with them RAQSAPI would not be possible. - README badges are provided by R package `badgecreator`5. - The R package `usethis`6 was used to generate GitHub actions for Continuous integration (CI). -- Code cleanup was assisted by the R package - `lintr`7 +- Code cleanup was assisted by the R package `lintr`7 - the function *install.packages* are provided by the R package `utils`8 - the function *install_github* are provided by the R package diff --git a/man/RAQSAPI.Rd b/man/RAQSAPI.Rd index 033a43a..184caa2 100644 --- a/man/RAQSAPI.Rd +++ b/man/RAQSAPI.Rd @@ -2,8 +2,8 @@ % Please edit documentation in R/RAQSAPI-package.R \docType{package} \name{RAQSAPI} -\alias{RAQSAPI} \alias{RAQSAPI-package} +\alias{RAQSAPI} \title{RAQSAPI: A R Interface to The United States Environmental Protection Agency's Air Quality System Data Mart RESTful API server.} \description{ diff --git a/vignettes/Acknowledgements.Rmd b/vignettes/Acknowledgements.Rmd index ef9d817..c7c4e5b 100644 --- a/vignettes/Acknowledgements.Rmd +++ b/vignettes/Acknowledgements.Rmd @@ -24,7 +24,7 @@ with them RAQSAPI would not be possible. * README badges are provided by R package `badgecreator`[@package:badgecreatr]. * The R package `usethis`[@package:usethis] was used to generate GitHub actions for Continuous integration (CI). -* Code cleanup was assisted by the R package `lintr`[@package:lintr]data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAWElEQVR42mNgGPTAxsZmJsVqQApgmGw1yApwKcQiT7phRBuCzzCSDSHGMKINIeDNmWQlA2IigKJwIssQkHdINgxfmBBtGDEBS3KCxBc7pMQgMYE5c/AXPwAwSX4lV3pTWwAAAABJRU5ErkJggg== +* Code cleanup was assisted by the R package `lintr`[@package:lintr] * the function *install.packages* are provided by the R package `utils`[@RBase] * the function *install_github* are provided by the R package `remotes`[ @package:remotes] diff --git a/vignettes/RAQSAPIFunctions-Long.R b/vignettes/RAQSAPIFunctions-Long.R index 136f2f5..7167f05 100644 --- a/vignettes/RAQSAPIFunctions-Long.R +++ b/vignettes/RAQSAPIFunctions-Long.R @@ -1,4 +1,4 @@ -## ----RAQSAPIfun_all, echo = FALSE, comment = NA---------------------------------------------------------------------------------------- +## ----RAQSAPIfun_all, echo = FALSE, comment = NA--------------------------------------------------------------------------------------------------------------------------------------------------------------------- knitr::opts_chunk$set(collapse = TRUE, comment = "#>" ) invisible(library(magrittr, warn.conflicts = FALSE, quietly = TRUE)) invisible(library(stringr, warn.conflicts = FALSE, quietly = TRUE)) @@ -106,21 +106,21 @@ RAQSAPI_functions <- c( RAQSAPI_functions %>% cat(sep = " \n") -## ----SIGNUPANDCREDENTIALS, echo = FALSE, comment = NA---------------------------------------------------------------------------------- +## ----SIGNUPANDCREDENTIALS, echo = FALSE, comment = NA--------------------------------------------------------------------------------------------------------------------------------------------------------------- signupandcredentials <- paste(".sign_up", ".credentials", sep = '|') str_subset(string = RAQSAPI_functions, pattern = signupandcredentials) %>% cat(sep = " \n") -## ----METADATAFUNCTIONS, echo = FALSE, comment = NA------------------------------------------------------------------------------------- +## ----METADATAFUNCTIONS, echo = FALSE, comment = NA------------------------------------------------------------------------------------------------------------------------------------------------------------------ metadatafunctions <- paste(".available", - ".field_by_service", + ".fields_by_service", ".knownissues", sep = '|') str_subset(string = RAQSAPI_functions, pattern = metadatafunctions) %>% cat(sep = " \n") -## ----LISTFUNCTIONS, echo = FALSE, comment = NA----------------------------------------------------------------------------------------- +## ----LISTFUNCTIONS, echo = FALSE, comment = NA---------------------------------------------------------------------------------------------------------------------------------------------------------------------- listfunctions <- paste(".states", ".counties_by_state", ".sites_by_county", @@ -134,49 +134,49 @@ listfunctions <- paste(".states", str_subset(string = RAQSAPI_functions, pattern = listfunctions) %>% cat(sep = " \n") -## ----_by_Sitefunctions, echo = FALSE, comment = NA------------------------------------------------------------------------------------- +## ----_by_Sitefunctions, echo = FALSE, comment = NA------------------------------------------------------------------------------------------------------------------------------------------------------------------ by_sitefunctions <- paste("_by_site", sep = '|') str_subset(string = RAQSAPI_functions, pattern = by_sitefunctions) %>% cat(sep = " \n") -## ----_by_countyfuncions, echo = FALSE, comment = NA------------------------------------------------------------------------------------ +## ----_by_countyfuncions, echo = FALSE, comment = NA----------------------------------------------------------------------------------------------------------------------------------------------------------------- by_countyfunctions <- paste("._by_county", sep = '|') str_subset(string = RAQSAPI_functions, pattern = by_countyfunctions) %>% cat(sep = " \n") -## ----_by_STATEfunctions, echo = FALSE, comment = NA------------------------------------------------------------------------------------ +## ----_by_STATEfunctions, echo = FALSE, comment = NA----------------------------------------------------------------------------------------------------------------------------------------------------------------- by_STATEfunctions <- paste("._by_state", sep = '|') str_subset(string = RAQSAPI_functions, pattern = by_STATEfunctions) %>% cat(sep = " \n") -## ----_by_MAfunctions, echo = FALSE, comment = NA--------------------------------------------------------------------------------------- +## ----_by_MAfunctions, echo = FALSE, comment = NA-------------------------------------------------------------------------------------------------------------------------------------------------------------------- by_MAfunctions <- paste("._by_MA", sep = '|') str_subset(string = RAQSAPI_functions, pattern = by_MAfunctions) %>% cat(sep = " \n") -## ----bycbsafunctions, echo = FALSE, comment = NA--------------------------------------------------------------------------------------- +## ----bycbsafunctions, echo = FALSE, comment = NA-------------------------------------------------------------------------------------------------------------------------------------------------------------------- by_cbsafunctions <- paste("._by_cbsa", sep = '|') str_subset(string = RAQSAPI_functions, pattern = by_cbsafunctions) %>% cat(sep = " \n") -## ----_by_pqaofunctions, echo = FALSE, comment = NA------------------------------------------------------------------------------------- +## ----_by_pqaofunctions, echo = FALSE, comment = NA------------------------------------------------------------------------------------------------------------------------------------------------------------------ by_pqaofunctions <- paste("._by_pqao", sep = '|') str_subset(string = RAQSAPI_functions, pattern = by_pqaofunctions) %>% cat(sep = " \n") -## ----_by_BOXfunctions, echo = FALSE, comment = NA-------------------------------------------------------------------------------------- +## ----_by_BOXfunctions, echo = FALSE, comment = NA------------------------------------------------------------------------------------------------------------------------------------------------------------------- by_BOXfunctions <- paste("._by_box", sep = '|') str_subset(string = RAQSAPI_functions, pattern = by_BOXfunctions) %>% cat(sep = " \n") -## ----misc, echo = FALSE, comment = NA-------------------------------------------------------------------------------------------------- +## ----misc, echo = FALSE, comment = NA------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- misc_functions <- paste("aqs_removeheader", sep = '|') str_subset(string = RAQSAPI_functions, pattern = misc_functions) %>% diff --git a/vignettes/RAQSAPIFunctions-Long.Rmd b/vignettes/RAQSAPIFunctions-Long.Rmd index 359e7c3..865949e 100644 --- a/vignettes/RAQSAPIFunctions-Long.Rmd +++ b/vignettes/RAQSAPIFunctions-Long.Rmd @@ -257,18 +257,19 @@ The RAQSAPI::aqs_credentials function takes two parameters: ## Data Mart API metadata functions ```{r METADATAFUNCTIONS, echo = FALSE, comment = NA} metadatafunctions <- paste(".available", - ".field_by_service", + ".fields_by_service", ".knownissues", sep = '|') str_subset(string = RAQSAPI_functions, pattern = metadatafunctions) %>% cat(sep = " \n") ``` -These functions return Data Mart meta data +These functions return the status of Data Mart API or metadata associated with + it. The RAQSAPI::aqs_isavailable function takes no parameters and returns a table which details the status of the AQS API. -The RAQSAPI::aqs_field_by_Service function takes one parameter, service, +The RAQSAPI::aqs_fields_by_service function takes one parameter, service, which is a R character object which represents the services provided by the AQS API. For a list of available services see [Air Quality System (AQS) API - Services Overview]( @@ -300,7 +301,7 @@ listfunctions <- paste(".states", str_subset(string = RAQSAPI_functions, pattern = listfunctions) %>% cat(sep = " \n") ``` -List functions return the status, API options or groupings that can be used in +List functions return the API options or groupings that can be used in conjunction with other API calls. By default each function in this category returns results as a tibble. If return_header parameter is set to TRUE a AQSAPI_v2 object is returned instead. @@ -580,8 +581,7 @@ functions in this family of functions aggregate data at the county level. * duration (optional): (This parameter is only used in conjunction with *\*sampledata_by_*\* functions). -### Data Mart aggregate functions by Monitoring agency (MA) - +### Data Mart aggregate functions _by_state ```{r _by_STATEfunctions, echo = FALSE, comment = NA} by_STATEfunctions <- paste("._by_state", sep = '|') @@ -607,6 +607,7 @@ functions in this family of functions aggregate data at the state level. * duration (optional): (This parameter is only used in conjunction with *\*sampledata_by_*\* functions). +### Data Mart aggregate functions by Monitoring agency (MA) ```{r _by_MAfunctions, echo = FALSE, comment = NA} by_MAfunctions <- paste("._by_MA", sep = '|') @@ -707,8 +708,6 @@ Functions in this family of functions aggregate data by a * duration (optional): (This parameter is only used in conjunction with *\*sampledata_by_*\* functions). -### Data Mart aggregate functions _by_state - ### RAQSAPI Miscellaneous functions ```{r misc, echo = FALSE, comment = NA} misc_functions <- paste("aqs_removeheader", sep = '|') diff --git a/vignettes/Troubleshooting.Rmd b/vignettes/Troubleshooting.Rmd index 7cf6149..f538d92 100644 --- a/vignettes/Troubleshooting.Rmd +++ b/vignettes/Troubleshooting.Rmd @@ -13,7 +13,7 @@ vignette: > # Troubleshooting -parameters must be supplied exactly as they are specified, for example the +Parameters must be supplied exactly as they are specified, for example the stateFIPS for Alabama is "01", entering a value of "1" for the stateFIPS may lead to unexpected results. Do not omit leading zeros in parameters that expect them. @@ -22,8 +22,8 @@ In Functions that have the return_header=TRUE option set the returned object is an AQSAPI_v2 object, this is a 2 item list where the first object is a tibble with the label \$Header, the second, a tibble with the label \$Data. sampledata functions are limited by the API to one calendar year of data per API call so if -the user requests multiple years of data the sampledata call will return multiple -AQSAPI_v2 objects, one for each call to the API. The returned result is a list -of AQSAPI_v2 objects. In R to access the data in each item in the list the user -will need to use the "double bracket operator" ("[[", "]]") not the single -bracket operator ("[", "]"). +the user requests multiple years of data the sampledata call will return +multiple AQSAPI_v2 objects, one for each call to the API. The returned result is +a list of AQSAPI_v2 objects. In R to access the data in each item in the list +the user will need to use the "double bracket operator" ("[[", "]]") not the +single bracket operator ("[", "]"). From 0f4a8f55cdf8270e2e834da308d98bdbd21bab06 Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Fri, 16 Feb 2024 18:23:13 -0500 Subject: [PATCH 02/11] edit WORDLIST to include last names from AQSAPI.bib file that is causing build errors --- MD5 | 2 +- inst/WORDLIST | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/MD5 b/MD5 index f5ca16c..b2a50bd 100644 --- a/MD5 +++ b/MD5 @@ -10,7 +10,7 @@ bfa24dfc7e0f2f217163fa917e8d2392 *cran-comments.Rmd 3c41777493d242206848842b6ba74fde *inst/CITATION 3df907b50c4f00bc26ee6d988e0c849f *inst/codecov.yml dd65d70b425fb86f7c8b6d8841a837d8 *inst/schemaorg.json -f8856800f427562ecf965aa9c4899e8f *inst/WORDLIST +c249300fd572e8b3c57b98e3d3c8745b *inst/WORDLIST e5b82cf7f3c21891bc0643f662a3f1ba *LICENSE 9b3dc9e54281bcaa0a530371869f506c *LICENSE.md e7ec2b281fcab3d1b34b26031438438a *man/aqs_annualsummary_by_box.Rd diff --git a/inst/WORDLIST b/inst/WORDLIST index 63427c4..9d53a9c 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,3 +1,4 @@ +Pérez APIv AQS AQSAPI @@ -9,15 +10,21 @@ Angly annualpeferomanceeval annualperformance Badgecreatr +Bliven CBSA CFR +cff +Chue CMD Csárdi DATAMART Datamart +Druskat Github +Haines Hogervorst JSON +Konovalov Lintr Müller ODBC @@ -125,3 +132,6 @@ verifications importFrom annualperformanceeval annualperformanceevaltransaction +Spaaks +Suárez +Willighagen From cac3265c9eb49176fabf93a9a924c4a42a5f411f Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Thu, 22 Feb 2024 14:21:19 -0500 Subject: [PATCH 03/11] debug output added to RAQSAPI_error_msg --- MD5 | 8 ++++---- R/AQSAPI_helperfunctions.R | 3 ++- README.md | 2 +- tests/testthat/helper.R | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/MD5 b/MD5 index b2a50bd..738b94a 100644 --- a/MD5 +++ b/MD5 @@ -119,7 +119,7 @@ bf2f1ad432ecccee3400afe533404113 *man/figures/lifecycle-superseded.svg 792c28b91a2c0b5e0b060a2f18a20464 *man/RAQSAPI.Rd 797940f405cb85557ee355e7eae5894d *NAMESPACE 904839971aff979c1716322c7d8bcdff *NEWS.md -d214f5204ba0d95601a92910109aad5e *R/AQSAPI_helperfunctions.R +f2b0589a8087331e39aaa983561329aa *R/AQSAPI_helperfunctions.R a3558975d0256839b174ab7868833075 *R/bybox.R bd8b36cc7325d4fc8b8ed894f0046678 *R/bycbsa.R 253ea551f88c65c1c49feff3cb33f552 *R/bycounty.R @@ -133,7 +133,7 @@ d82b1ff8ee144afca1879e5b8dc58840 *R/byma.R e6e3b87e48f4403642382987b0f40714 *R/setupfunctions.R 6e659bb3bbf313dc819d4c029f0b22d0 *R/zzz.R a69de5455537022556f014579766be59 *RAQSAPI.Rproj -4a756ab5cecfa9d56c075e6ed5353d6b *README.md +5680d12ac8564134755c8f3889d17dd8 *README.md b2370e0e3f63a29557cd8f74746d74f6 *README.Rmd 7ed08f3fb96a77ec01c95c2ad7964250 *revdep/data.sqlite 34952a5944548ea4fc132a9899f8e6ab *revdep/email.yml @@ -1318,8 +1318,8 @@ b2d403f29050e86e8efa021931ef8649 *revdep/README.md 9566921a96ff55c1a51b6eb898d25884 *tests/spelling.R 846f989b5f8b7a32fa520e52b4675635 *tests/test-RAQSAPI.R.blob 84732d71bac50c96565c4894a24ecc59 *tests/testthat.R -56891c92989166a785013a8953da96a3 *tests/testthat/helper.R -00b1828926ec94b2537bb2343df723d5 *tests/testthat/local.R +89ff48b08754c7fc927acb5b6691bdb1 *tests/testthat/helper.R +d5348436deb0b02017a3f7227ae8e5ab *tests/testthat/local.R 522ea3f8b07f6f4d206ce3fe38f1fbd8 *tests/testthat/test-bybox.R c883634140b22f5fb97c08f909ce377e *tests/testthat/test-byCBSA.R 50d37429e9bf99ad5be17e09d92e16e8 *tests/testthat/test-bycounty.R diff --git a/R/AQSAPI_helperfunctions.R b/R/AQSAPI_helperfunctions.R index e4d423d..40cd2d5 100644 --- a/R/AQSAPI_helperfunctions.R +++ b/R/AQSAPI_helperfunctions.R @@ -345,9 +345,10 @@ RAQSAPI_error_msg <- function(AQSresponse) AQSerr <- last_response() %>% resp_body_json() + #debug msg <- glue("At server request time: {AQSresponse$headers$Date} RAQSAPI experienced an error while processing the following url: - {gsub('(.)', '\\1 ', AQSresponse$url)}\n + {str_replace_all(AQSresponse$url, pattern='(.)', '\\1_')}\n #debug {AQSresponse$url} with status_code: {AQSresponse$status_code} and status message: {AQSresponse$status} Server error message: {AQSerr$Header[[1]]$error}") diff --git a/README.md b/README.md index 94d816c..29b2ba5 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.or downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI) [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing) [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/) -“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--02--16-yellowgreen.svg)](/commits/master)” +“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--02--22-yellowgreen.svg)](/commits/master)” # EPA Disclaimer diff --git a/tests/testthat/helper.R b/tests/testthat/helper.R index c984b9d..e2bde8b 100644 --- a/tests/testthat/helper.R +++ b/tests/testthat/helper.R @@ -13,5 +13,5 @@ RAQSAPItestsetup_helper <- function() AQScredentials <- list(datamartAPI_user = datamartAPI_user, datamartAPI_key = datamartAPI_key) return(AQScredentials) - } else {print("did not go into if satement")} #debug + } } From d7a71b619451a864a704ed02abe442c53a61aae7 Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Mon, 1 Apr 2024 12:49:00 -0400 Subject: [PATCH 04/11] minor change in error output --- MD5 | 6 +++--- R/AQSAPI_helperfunctions.R | 2 +- README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MD5 b/MD5 index 738b94a..d9eba91 100644 --- a/MD5 +++ b/MD5 @@ -6,7 +6,7 @@ bfa24dfc7e0f2f217163fa917e8d2392 *cran-comments.Rmd 1dc95961c4c280f8645a65d15662725f *dev/contributing.md 4fc13def6ec5d889261f1f22a13ba542 *dev/contributing.Rmd 74e297a0dc0b508ed18e3821264958d0 *dev/countlinesofcode.R -6ff6ae2460202c94a0dab25c4cc178de *dev/install_RAQSAPI.R +f6d9a7f697a65fba336f96fa8db1e24b *dev/install_RAQSAPI.R 3c41777493d242206848842b6ba74fde *inst/CITATION 3df907b50c4f00bc26ee6d988e0c849f *inst/codecov.yml dd65d70b425fb86f7c8b6d8841a837d8 *inst/schemaorg.json @@ -119,7 +119,7 @@ bf2f1ad432ecccee3400afe533404113 *man/figures/lifecycle-superseded.svg 792c28b91a2c0b5e0b060a2f18a20464 *man/RAQSAPI.Rd 797940f405cb85557ee355e7eae5894d *NAMESPACE 904839971aff979c1716322c7d8bcdff *NEWS.md -f2b0589a8087331e39aaa983561329aa *R/AQSAPI_helperfunctions.R +f031417051ac3339f2600928ed3b9a29 *R/AQSAPI_helperfunctions.R a3558975d0256839b174ab7868833075 *R/bybox.R bd8b36cc7325d4fc8b8ed894f0046678 *R/bycbsa.R 253ea551f88c65c1c49feff3cb33f552 *R/bycounty.R @@ -133,7 +133,7 @@ d82b1ff8ee144afca1879e5b8dc58840 *R/byma.R e6e3b87e48f4403642382987b0f40714 *R/setupfunctions.R 6e659bb3bbf313dc819d4c029f0b22d0 *R/zzz.R a69de5455537022556f014579766be59 *RAQSAPI.Rproj -5680d12ac8564134755c8f3889d17dd8 *README.md +b11756666f31f1f757cc2303dce419a5 *README.md b2370e0e3f63a29557cd8f74746d74f6 *README.Rmd 7ed08f3fb96a77ec01c95c2ad7964250 *revdep/data.sqlite 34952a5944548ea4fc132a9899f8e6ab *revdep/email.yml diff --git a/R/AQSAPI_helperfunctions.R b/R/AQSAPI_helperfunctions.R index 40cd2d5..c5d2e92 100644 --- a/R/AQSAPI_helperfunctions.R +++ b/R/AQSAPI_helperfunctions.R @@ -348,7 +348,7 @@ RAQSAPI_error_msg <- function(AQSresponse) #debug msg <- glue("At server request time: {AQSresponse$headers$Date} RAQSAPI experienced an error while processing the following url: - {str_replace_all(AQSresponse$url, pattern='(.)', '\\1_')}\n #debug {AQSresponse$url} + {str_replace_all(AQSresponse$url, pattern='(.)', '\\1_')}\n with status_code: {AQSresponse$status_code} and status message: {AQSresponse$status} Server error message: {AQSerr$Header[[1]]$error}") diff --git a/README.md b/README.md index 29b2ba5..1a8554b 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.or downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI) [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing) [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/) -“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--02--22-yellowgreen.svg)](/commits/master)” +“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--04--01-yellowgreen.svg)](/commits/master)” # EPA Disclaimer From 784bb8d8638340eb8a629669244c57ea11f45d52 Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Tue, 2 Apr 2024 10:37:33 -0400 Subject: [PATCH 05/11] edit github workflow to correct secret name --- .github/workflows/R-CMD-check.yaml | 4 ++-- MD5 | 2 +- README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 4d2f902..3460010 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -26,8 +26,8 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - RAQSAPIKEY: ${{ vars.RAQSAPIKEY }} - RAQSAPIUSERNAME: ${{ vars.RAQSAPIUSERNAME }} + RAQSAPIKEY: ${{ secrets.RAQSAPIKEY }} + RAQSAPIUSERNAME: ${{ secrets.RAQSAPIUSERNAME }} R_KEEP_PKG_SOURCE: yes steps: diff --git a/MD5 b/MD5 index d9eba91..285de3b 100644 --- a/MD5 +++ b/MD5 @@ -133,7 +133,7 @@ d82b1ff8ee144afca1879e5b8dc58840 *R/byma.R e6e3b87e48f4403642382987b0f40714 *R/setupfunctions.R 6e659bb3bbf313dc819d4c029f0b22d0 *R/zzz.R a69de5455537022556f014579766be59 *RAQSAPI.Rproj -b11756666f31f1f757cc2303dce419a5 *README.md +18f76ebd36736b286f12114b4d1a75b1 *README.md b2370e0e3f63a29557cd8f74746d74f6 *README.Rmd 7ed08f3fb96a77ec01c95c2ad7964250 *revdep/data.sqlite 34952a5944548ea4fc132a9899f8e6ab *revdep/email.yml diff --git a/README.md b/README.md index 1a8554b..e22e76c 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.or downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI) [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing) [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/) -“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--04--01-yellowgreen.svg)](/commits/master)” +“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--04--02-yellowgreen.svg)](/commits/master)” # EPA Disclaimer From e4eba0bbd092012dac7bba5c56ea88006d951d97 Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Fri, 5 Apr 2024 09:44:16 -0400 Subject: [PATCH 06/11] add missing importFrom to format_multiple_params_for_api and correct testname in test-byCBSA --- MD5 | 8 ++++---- NAMESPACE | 1 + README.md | 2 +- tests/testthat/test-byCBSA.R | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MD5 b/MD5 index 285de3b..4fb50fe 100644 --- a/MD5 +++ b/MD5 @@ -117,9 +117,9 @@ f41ed996be135fb35afe00641621da61 *man/figures/lifecycle-questioning.svg ed42e3fbd7cc30bc6ca8fa9b658e24a8 *man/figures/lifecycle-stable.svg bf2f1ad432ecccee3400afe533404113 *man/figures/lifecycle-superseded.svg 792c28b91a2c0b5e0b060a2f18a20464 *man/RAQSAPI.Rd -797940f405cb85557ee355e7eae5894d *NAMESPACE +eef9bd75f39b496fcfd63a36be7fb5a8 *NAMESPACE 904839971aff979c1716322c7d8bcdff *NEWS.md -f031417051ac3339f2600928ed3b9a29 *R/AQSAPI_helperfunctions.R +f5bb0087a67a6d8912e802b5e53e025a *R/AQSAPI_helperfunctions.R a3558975d0256839b174ab7868833075 *R/bybox.R bd8b36cc7325d4fc8b8ed894f0046678 *R/bycbsa.R 253ea551f88c65c1c49feff3cb33f552 *R/bycounty.R @@ -133,7 +133,7 @@ d82b1ff8ee144afca1879e5b8dc58840 *R/byma.R e6e3b87e48f4403642382987b0f40714 *R/setupfunctions.R 6e659bb3bbf313dc819d4c029f0b22d0 *R/zzz.R a69de5455537022556f014579766be59 *RAQSAPI.Rproj -18f76ebd36736b286f12114b4d1a75b1 *README.md +0a09f7b01761cf3c04560c3dd27ba89a *README.md b2370e0e3f63a29557cd8f74746d74f6 *README.Rmd 7ed08f3fb96a77ec01c95c2ad7964250 *revdep/data.sqlite 34952a5944548ea4fc132a9899f8e6ab *revdep/email.yml @@ -1321,7 +1321,7 @@ b2d403f29050e86e8efa021931ef8649 *revdep/README.md 89ff48b08754c7fc927acb5b6691bdb1 *tests/testthat/helper.R d5348436deb0b02017a3f7227ae8e5ab *tests/testthat/local.R 522ea3f8b07f6f4d206ce3fe38f1fbd8 *tests/testthat/test-bybox.R -c883634140b22f5fb97c08f909ce377e *tests/testthat/test-byCBSA.R +67192eeb2606380b3c349f08851ef9e6 *tests/testthat/test-byCBSA.R 50d37429e9bf99ad5be17e09d92e16e8 *tests/testthat/test-bycounty.R 19a199f8020db0329fe289a41aa71598 *tests/testthat/test-byMA.R f7ea691da1baf266047ed7af4b0c4629 *tests/testthat/test-bypqao.R diff --git a/NAMESPACE b/NAMESPACE index ababe67..d47ac66 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -139,6 +139,7 @@ importFrom(rlang,format_error_bullets) importFrom(rlang,is_character) importFrom(stringr,str_c) importFrom(stringr,str_detect) +importFrom(stringr,str_replace_all) importFrom(tibble,as_tibble) importFrom(tibble,tibble) importFrom(utils,tail) diff --git a/README.md b/README.md index e22e76c..7d726e2 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.or downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI) [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing) [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/) -“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--04--02-yellowgreen.svg)](/commits/master)” +“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--04--05-yellowgreen.svg)](/commits/master)” # EPA Disclaimer diff --git a/tests/testthat/test-byCBSA.R b/tests/testthat/test-byCBSA.R index e5f9b29..94a45c7 100644 --- a/tests/testthat/test-byCBSA.R +++ b/tests/testthat/test-byCBSA.R @@ -1,6 +1,6 @@ #' @importFrom magrittr `%>%`() #' @import testthat -test_that("bybox functions", { +test_that("byCBSA functions", { testthat::skip_on_cran() testthat::skip_if_offline() From 38c6786da91ad0dc675b6400eeb927d4ebc7bd70 Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Fri, 5 Apr 2024 09:48:31 -0400 Subject: [PATCH 07/11] add missing importFrom to format_multiple_params_for_api --- R/AQSAPI_helperfunctions.R | 1 + 1 file changed, 1 insertion(+) diff --git a/R/AQSAPI_helperfunctions.R b/R/AQSAPI_helperfunctions.R index c5d2e92..e034720 100644 --- a/R/AQSAPI_helperfunctions.R +++ b/R/AQSAPI_helperfunctions.R @@ -327,6 +327,7 @@ format_multiple_params_for_api <- function(x, separator=",") #' @importFrom glue glue #' @importFrom httr2 last_response resp_body_json #' @importFrom magrittr `%<>%` +#' @importFrom stringr str_replace_all #' #' @description A helper function that is called by httr2::req_error when an #' error is encountered performing a request. This function returns From 1e5880c3cfb79e986eead188f66875855aa6872c Mon Sep 17 00:00:00 2001 From: McCrowey Date: Wed, 15 May 2024 11:52:36 -0400 Subject: [PATCH 08/11] remove dependency on depricated package:goodpractice, very minor change to roxygen2 documentation for aqs_sampledurations --- .Rbuildignore | 1 + .github/workflows/R-CMD-check.yaml | 4 ++-- .gitignore | 1 + CITATION.cff | 27 +-------------------------- DESCRIPTION | 1 - MD5 | 23 ++++++++++++----------- R/RAQSAPIlistfunctions.R | 2 +- README.md | 4 ++-- codemeta.json | 12 ------------ cran-comments.Rmd | 1 + cran-comments.md | 1 + man/aqs_sampledurations.Rd | 2 +- 12 files changed, 23 insertions(+), 56 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 0af9392..6662fd1 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -46,3 +46,4 @@ codemeta.json ^.tar.gz ^.zip ^CITATION\.cff$ +^RAQSAPI\.code-workspace$ diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 3460010..49a3d77 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -26,8 +26,8 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - RAQSAPIKEY: ${{ secrets.RAQSAPIKEY }} - RAQSAPIUSERNAME: ${{ secrets.RAQSAPIUSERNAME }} + RAQSAPIKEY: "${{ secrets.RAQSAPIKEY }}" + RAQSAPIUSERNAME: "${{ secrets.RAQSAPIUSERNAME }}" R_KEEP_PKG_SOURCE: yes steps: diff --git a/.gitignore b/.gitignore index c719412..4d471d9 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ dev/.experimental.R # RAQSAPI package files *.tar.gz *.zip +RAQSAPI.code-workspace diff --git a/CITATION.cff b/CITATION.cff index c0844b6..8829566 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ # CITATION file created with {cffr} R package, v0.5.0 # See also: https://docs.ropensci.org/cffr/ # ----------------------------------------------------------- - + cff-version: 1.2.0 message: 'To cite package "RAQSAPI" in publications use:' type: software @@ -274,31 +274,6 @@ references: email: jenny@rstudio.com orcid: https://orcid.org/0000-0002-6983-2759 year: '2023' -- type: software - title: goodpractice - abstract: 'goodpractice: Advice on R Package Building' - notes: Suggests - url: https://github.com/mangothecat/goodpractice - repository: https://CRAN.R-project.org/package=goodpractice - authors: - - family-names: Marks - given-names: Karina - email: karina.marks@ascent.io - - family-names: de Bortoli - given-names: Daniel - - family-names: Csardi - given-names: Gabor - email: csardi.gabor@gmail.com - - family-names: Frick - given-names: Hannah - email: hannah.frick@gmail.com - - family-names: Jones - given-names: Owen - email: owenjonesuob@gmail.com - - family-names: Alexander - given-names: Hannah - email: halexander@mango-solutions.com - year: '2023' - type: software title: keyring abstract: 'keyring: Access the System Credential Store from R' diff --git a/DESCRIPTION b/DESCRIPTION index 709ae72..b63f0ad 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -63,7 +63,6 @@ Imports: Suggests: covr, devtools, - goodpractice, keyring, knitr, markdown, diff --git a/MD5 b/MD5 index 4fb50fe..09ac774 100644 --- a/MD5 +++ b/MD5 @@ -1,12 +1,12 @@ -2d3e0e574783202b33c52d6feba58dd3 *CITATION.cff -d3a7f7cc6aca27a043309d5bf9f32edc *codemeta.json -bfa24dfc7e0f2f217163fa917e8d2392 *cran-comments.md -bfa24dfc7e0f2f217163fa917e8d2392 *cran-comments.Rmd -32b197cb6b7fa3ce90996cf9cad52d01 *DESCRIPTION +3fe0b2d4c41b6a7ddea1fcc2dc0742a0 *CITATION.cff +f4ff2345ea66f98028bea8e07bb9b6fa *codemeta.json +6e5839d0c24939143566d26d7f427fce *cran-comments.md +6e5839d0c24939143566d26d7f427fce *cran-comments.Rmd +d4d029fe53e81834a1917cfedb301963 *DESCRIPTION 1dc95961c4c280f8645a65d15662725f *dev/contributing.md 4fc13def6ec5d889261f1f22a13ba542 *dev/contributing.Rmd 74e297a0dc0b508ed18e3821264958d0 *dev/countlinesofcode.R -f6d9a7f697a65fba336f96fa8db1e24b *dev/install_RAQSAPI.R +c7475d24c66f403e4d930e4d99750f66 *dev/install_RAQSAPI.R 3c41777493d242206848842b6ba74fde *inst/CITATION 3df907b50c4f00bc26ee6d988e0c849f *inst/codecov.yml dd65d70b425fb86f7c8b6d8841a837d8 *inst/schemaorg.json @@ -91,7 +91,7 @@ a8f79ece8b275d2f60fc09a58239e661 *man/aqs_quarterlysummary_by_site.Rd 4232385c24cb5041c7ad57ec9279a798 *man/aqs_sampledata_by_county.Rd d6bccf166ae844172cf9b241c89093e2 *man/aqs_sampledata_by_site.Rd a10c5684e68d35cebb418f849c058609 *man/aqs_sampledata_by_state.Rd -0557bd694ffc18246eda85f4813fc2d1 *man/aqs_sampledurations.Rd +e18bec0d4aa22d14a5c796adc3998d91 *man/aqs_sampledurations.Rd f9d84d9671e9c011e40dcf3567f3aa47 *man/aqs_services_by_box.Rd 9291322a3bd3a17248904a0bfcf32d2f *man/aqs_services_by_cbsa.Rd 9ca1f01ed3c413b5c8cd1f9f2bec9f3d *man/aqs_services_by_county.Rd @@ -129,11 +129,12 @@ d82b1ff8ee144afca1879e5b8dc58840 *R/byma.R 2e6e59d801dc3b6bd5e415ada7268469 *R/bystate.R 5b01d32e630b9b68041a139e4ae6f748 *R/deprecated.R 87275ab3c5bd1af63ecfbd835ea8f53b *R/RAQSAPI-package.R -8bf50a551dbb3798f968436f95e3c343 *R/RAQSAPIlistfunctions.R +cebed24e7ab755d8642a74c7e9b80fd5 *R/RAQSAPIlistfunctions.R e6e3b87e48f4403642382987b0f40714 *R/setupfunctions.R 6e659bb3bbf313dc819d4c029f0b22d0 *R/zzz.R +25bf50b0ec79d01de8b83b7b5801b4ac *RAQSAPI.code-workspace a69de5455537022556f014579766be59 *RAQSAPI.Rproj -0a09f7b01761cf3c04560c3dd27ba89a *README.md +f6cb61c1475f001928bd1c27d5d1fcc7 *README.md b2370e0e3f63a29557cd8f74746d74f6 *README.Rmd 7ed08f3fb96a77ec01c95c2ad7964250 *revdep/data.sqlite 34952a5944548ea4fc132a9899f8e6ab *revdep/email.yml @@ -890,7 +891,7 @@ d6c68f1fe41ced6e98a766a3757313da *revdep/library/RAQSAPI/old/R6/R/R6 9a2c1961edcf2968e9e17856ed21f7ce *revdep/library/RAQSAPI/old/R6/R/R6.rdx 5f3c708ae9a7e3610961d99f3375e60f *revdep/library/RAQSAPI/old/RAQSAPI/CITATION 3df907b50c4f00bc26ee6d988e0c849f *revdep/library/RAQSAPI/old/RAQSAPI/codecov.yml -70e30c409e2788090f475bef50b5022f *revdep/library/RAQSAPI/old/RAQSAPI/DESCRIPTION +ee3578e05ac28d372c75425e260fcecb *revdep/library/RAQSAPI/old/RAQSAPI/DESCRIPTION cf125d5812045cd97093aee831e5c5f5 *revdep/library/RAQSAPI/old/RAQSAPI/doc/Acknowledgements.html 49025d261826350f3050e677eab9dbac *revdep/library/RAQSAPI/old/RAQSAPI/doc/Acknowledgements.Rmd 4b9af1f3b9da96988881ddf1c8d9ee9d *revdep/library/RAQSAPI/old/RAQSAPI/doc/EPA_Disclaimer.html @@ -1319,7 +1320,7 @@ b2d403f29050e86e8efa021931ef8649 *revdep/README.md 846f989b5f8b7a32fa520e52b4675635 *tests/test-RAQSAPI.R.blob 84732d71bac50c96565c4894a24ecc59 *tests/testthat.R 89ff48b08754c7fc927acb5b6691bdb1 *tests/testthat/helper.R -d5348436deb0b02017a3f7227ae8e5ab *tests/testthat/local.R +2a4012f9bf99ddc63f745bd8e4f845dc *tests/testthat/local.R 522ea3f8b07f6f4d206ce3fe38f1fbd8 *tests/testthat/test-bybox.R 67192eeb2606380b3c349f08851ef9e6 *tests/testthat/test-byCBSA.R 50d37429e9bf99ad5be17e09d92e16e8 *tests/testthat/test-bycounty.R diff --git a/R/RAQSAPIlistfunctions.R b/R/RAQSAPIlistfunctions.R index 7b8113a..97e4fe7 100644 --- a/R/RAQSAPIlistfunctions.R +++ b/R/RAQSAPIlistfunctions.R @@ -415,7 +415,7 @@ aqs_fields_by_service <- function(service, return_header = FALSE) #' @description \lifecycle{stable} #' Returns a table of sample durations and their #' associated duration codes. Returned values are not calculated -#' durations such as 8 hour CO or O${_3}$ rolling averages, 3/6 +#' durations such as 8 hour CO or O$_3$ rolling averages, 3/6 #' day PM averages or Pb 3 month rolling averages. #' @importFrom magrittr `%<>%` #' @param return_header If FALSE (default) only returns data requested. diff --git a/README.md b/README.md index 7d726e2..47a1d4b 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.or downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI) [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing) [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/) -“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--04--05-yellowgreen.svg)](/commits/master)” +“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--05--15-yellowgreen.svg)](/commits/master)” # EPA Disclaimer @@ -419,7 +419,7 @@ those sources with them RAQSAPI would not be possible. # References -
+
diff --git a/codemeta.json b/codemeta.json index a54a043..47a9e53 100644 --- a/codemeta.json +++ b/codemeta.json @@ -105,18 +105,6 @@ }, "sameAs": "https://CRAN.R-project.org/package=devtools" }, - { - "@type": "SoftwareApplication", - "identifier": "goodpractice", - "name": "goodpractice", - "provider": { - "@id": "https://cran.r-project.org", - "@type": "Organization", - "name": "Comprehensive R Archive Network (CRAN)", - "url": "https://cran.r-project.org" - }, - "sameAs": "https://CRAN.R-project.org/package=goodpractice" - }, { "@type": "SoftwareApplication", "identifier": "keyring", diff --git a/cran-comments.Rmd b/cran-comments.Rmd index aa4665b..3f02685 100644 --- a/cran-comments.Rmd +++ b/cran-comments.Rmd @@ -7,6 +7,7 @@ output: md_document # cran-comments for RAQSAPI ## RAQSAPI 2.0.5 + - remove depricated package:goodpractice from SUGGESTS - Added the ability to display server side messages for errors in API calls. - Added a new CITATION.cff for thanks to R package cffr. - New hexstciker. diff --git a/cran-comments.md b/cran-comments.md index aa4665b..3f02685 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -7,6 +7,7 @@ output: md_document # cran-comments for RAQSAPI ## RAQSAPI 2.0.5 + - remove depricated package:goodpractice from SUGGESTS - Added the ability to display server side messages for errors in API calls. - Added a new CITATION.cff for thanks to R package cffr. - New hexstciker. diff --git a/man/aqs_sampledurations.Rd b/man/aqs_sampledurations.Rd index 19dc7fd..a92ad10 100644 --- a/man/aqs_sampledurations.Rd +++ b/man/aqs_sampledurations.Rd @@ -22,7 +22,7 @@ their associated duration codes \lifecycle{stable} Returns a table of sample durations and their associated duration codes. Returned values are not calculated -durations such as 8 hour CO or O${_3}$ rolling averages, 3/6 +durations such as 8 hour CO or O$_3$ rolling averages, 3/6 day PM averages or Pb 3 month rolling averages. } \note{ From d0ae7b6846906addbbde29771e39f97e89efee7a Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Wed, 15 May 2024 12:50:11 -0400 Subject: [PATCH 09/11] remove news.md from package --- MD5 | 3 +-- NEWS.md | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 NEWS.md diff --git a/MD5 b/MD5 index 09ac774..29b6c6f 100644 --- a/MD5 +++ b/MD5 @@ -6,7 +6,7 @@ d4d029fe53e81834a1917cfedb301963 *DESCRIPTION 1dc95961c4c280f8645a65d15662725f *dev/contributing.md 4fc13def6ec5d889261f1f22a13ba542 *dev/contributing.Rmd 74e297a0dc0b508ed18e3821264958d0 *dev/countlinesofcode.R -c7475d24c66f403e4d930e4d99750f66 *dev/install_RAQSAPI.R +f0746c194aa05f99068a1c8c86ce56f2 *dev/install_RAQSAPI.R 3c41777493d242206848842b6ba74fde *inst/CITATION 3df907b50c4f00bc26ee6d988e0c849f *inst/codecov.yml dd65d70b425fb86f7c8b6d8841a837d8 *inst/schemaorg.json @@ -118,7 +118,6 @@ ed42e3fbd7cc30bc6ca8fa9b658e24a8 *man/figures/lifecycle-stable.svg bf2f1ad432ecccee3400afe533404113 *man/figures/lifecycle-superseded.svg 792c28b91a2c0b5e0b060a2f18a20464 *man/RAQSAPI.Rd eef9bd75f39b496fcfd63a36be7fb5a8 *NAMESPACE -904839971aff979c1716322c7d8bcdff *NEWS.md f5bb0087a67a6d8912e802b5e53e025a *R/AQSAPI_helperfunctions.R a3558975d0256839b174ab7868833075 *R/bybox.R bd8b36cc7325d4fc8b8ed894f0046678 *R/bycbsa.R diff --git a/NEWS.md b/NEWS.md deleted file mode 100644 index 12e9278..0000000 --- a/NEWS.md +++ /dev/null @@ -1,8 +0,0 @@ -% News.md for RAQSAPI -% Clinton Mccrowey Physical Scientist - EPA Region 3 - Air and Radiation Division - Air Quality Analysis Branch - - -# Please see the cran-comments.md document. From 23f4cd725a335460d15d59b8f5d8bcfce11a6f2b Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Thu, 23 May 2024 16:46:47 -0400 Subject: [PATCH 10/11] fix testing credentials in unit tests --- MD5 | 22 +++++++++++----------- R/AQSAPI_helperfunctions.R | 2 +- README.md | 2 +- tests/testthat/test-RAQSAPlistfunctions.R | 4 ++-- tests/testthat/test-byCBSA.R | 4 ++-- tests/testthat/test-byMA.R | 4 ++-- tests/testthat/test-bybox.R | 4 ++-- tests/testthat/test-bycounty.R | 4 ++-- tests/testthat/test-bypqao.R | 4 ++-- tests/testthat/test-bysite.R | 4 ++-- tests/testthat/test-bystate.R | 4 ++-- tests/testthat/test-helperfunctions.R | 4 ++-- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/MD5 b/MD5 index 29b6c6f..ab259a2 100644 --- a/MD5 +++ b/MD5 @@ -118,7 +118,7 @@ ed42e3fbd7cc30bc6ca8fa9b658e24a8 *man/figures/lifecycle-stable.svg bf2f1ad432ecccee3400afe533404113 *man/figures/lifecycle-superseded.svg 792c28b91a2c0b5e0b060a2f18a20464 *man/RAQSAPI.Rd eef9bd75f39b496fcfd63a36be7fb5a8 *NAMESPACE -f5bb0087a67a6d8912e802b5e53e025a *R/AQSAPI_helperfunctions.R +68f4c551ed9b572bb7c6a3ab9228b75c *R/AQSAPI_helperfunctions.R a3558975d0256839b174ab7868833075 *R/bybox.R bd8b36cc7325d4fc8b8ed894f0046678 *R/bycbsa.R 253ea551f88c65c1c49feff3cb33f552 *R/bycounty.R @@ -133,7 +133,7 @@ e6e3b87e48f4403642382987b0f40714 *R/setupfunctions.R 6e659bb3bbf313dc819d4c029f0b22d0 *R/zzz.R 25bf50b0ec79d01de8b83b7b5801b4ac *RAQSAPI.code-workspace a69de5455537022556f014579766be59 *RAQSAPI.Rproj -f6cb61c1475f001928bd1c27d5d1fcc7 *README.md +9f1bd2ef6f1343108dfae0fa0d6d9cac *README.md b2370e0e3f63a29557cd8f74746d74f6 *README.Rmd 7ed08f3fb96a77ec01c95c2ad7964250 *revdep/data.sqlite 34952a5944548ea4fc132a9899f8e6ab *revdep/email.yml @@ -1320,15 +1320,15 @@ b2d403f29050e86e8efa021931ef8649 *revdep/README.md 84732d71bac50c96565c4894a24ecc59 *tests/testthat.R 89ff48b08754c7fc927acb5b6691bdb1 *tests/testthat/helper.R 2a4012f9bf99ddc63f745bd8e4f845dc *tests/testthat/local.R -522ea3f8b07f6f4d206ce3fe38f1fbd8 *tests/testthat/test-bybox.R -67192eeb2606380b3c349f08851ef9e6 *tests/testthat/test-byCBSA.R -50d37429e9bf99ad5be17e09d92e16e8 *tests/testthat/test-bycounty.R -19a199f8020db0329fe289a41aa71598 *tests/testthat/test-byMA.R -f7ea691da1baf266047ed7af4b0c4629 *tests/testthat/test-bypqao.R -41e407548ac72ec4f41e678d23a566dd *tests/testthat/test-bysite.R -051416af24d0386f084eb13a14053ce1 *tests/testthat/test-bystate.R -014b81fb9c8d2350e1347841f41b24a3 *tests/testthat/test-helperfunctions.R -e897203bb026b43141e5bc00dfe3cecd *tests/testthat/test-RAQSAPlistfunctions.R +309a8c9de99e4f0c0d5c280cb7583dd6 *tests/testthat/test-bybox.R +635cfa38957358d566d9e5d17057df7b *tests/testthat/test-byCBSA.R +61e14922bc589edf93a461a7fe4112cc *tests/testthat/test-bycounty.R +bfcb21038f480e4e9638486f99b45efa *tests/testthat/test-byMA.R +16213bfccb07c9052826097a6b24407c *tests/testthat/test-bypqao.R +257512f5b5e206aa789cf85fd3f616dd *tests/testthat/test-bysite.R +273dda836db047478bc65a94c7e0a05d *tests/testthat/test-bystate.R +9ac730cce5b9a3d7b4b877512bc4de25 *tests/testthat/test-helperfunctions.R +2391f6b331d4bc3e5e9e6a0b73980eba *tests/testthat/test-RAQSAPlistfunctions.R a55434f85eb9ec8d1c4706997b49cc10 *vignettes/Acknowledgements.html 1798121e142b3da718a2e54435a7ef9a *vignettes/Acknowledgements.Rmd 22d607e5d49e10047a911e5d42183c34 *vignettes/acs-nano.csl diff --git a/R/AQSAPI_helperfunctions.R b/R/AQSAPI_helperfunctions.R index e034720..176a3a9 100644 --- a/R/AQSAPI_helperfunctions.R +++ b/R/AQSAPI_helperfunctions.R @@ -349,7 +349,7 @@ RAQSAPI_error_msg <- function(AQSresponse) #debug msg <- glue("At server request time: {AQSresponse$headers$Date} RAQSAPI experienced an error while processing the following url: - {str_replace_all(AQSresponse$url, pattern='(.)', '\\1_')}\n + {AQSresponse$url} with status_code: {AQSresponse$status_code} and status message: {AQSresponse$status} Server error message: {AQSerr$Header[[1]]$error}") diff --git a/README.md b/README.md index 47a1d4b..bea07e4 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.or downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI) [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing) [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/) -“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--05--15-yellowgreen.svg)](/commits/master)” +“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--05--23-yellowgreen.svg)](/commits/master)” # EPA Disclaimer diff --git a/tests/testthat/test-RAQSAPlistfunctions.R b/tests/testthat/test-RAQSAPlistfunctions.R index 52e7483..e7ca0ac 100644 --- a/tests/testthat/test-RAQSAPlistfunctions.R +++ b/tests/testthat/test-RAQSAPlistfunctions.R @@ -12,8 +12,8 @@ test_that("list functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-byCBSA.R b/tests/testthat/test-byCBSA.R index 94a45c7..383109f 100644 --- a/tests/testthat/test-byCBSA.R +++ b/tests/testthat/test-byCBSA.R @@ -11,8 +11,8 @@ test_that("byCBSA functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-byMA.R b/tests/testthat/test-byMA.R index 47cb27e..e0e5f2c 100644 --- a/tests/testthat/test-byMA.R +++ b/tests/testthat/test-byMA.R @@ -11,8 +11,8 @@ test_that("byMA functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-bybox.R b/tests/testthat/test-bybox.R index 445206a..61f173c 100644 --- a/tests/testthat/test-bybox.R +++ b/tests/testthat/test-bybox.R @@ -11,8 +11,8 @@ testthat::skip_if_offline() datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-bycounty.R b/tests/testthat/test-bycounty.R index 74c8a7e..300297b 100644 --- a/tests/testthat/test-bycounty.R +++ b/tests/testthat/test-bycounty.R @@ -11,8 +11,8 @@ test_that("bycounty functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-bypqao.R b/tests/testthat/test-bypqao.R index 352469f..9662f77 100644 --- a/tests/testthat/test-bypqao.R +++ b/tests/testthat/test-bypqao.R @@ -11,8 +11,8 @@ test_that("bypqao functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-bysite.R b/tests/testthat/test-bysite.R index 9f2c556..23b5d2f 100644 --- a/tests/testthat/test-bysite.R +++ b/tests/testthat/test-bysite.R @@ -11,8 +11,8 @@ test_that("bysite functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-bystate.R b/tests/testthat/test-bystate.R index a9a9383..23212a7 100644 --- a/tests/testthat/test-bystate.R +++ b/tests/testthat/test-bystate.R @@ -12,8 +12,8 @@ test_that("bystate functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-helperfunctions.R b/tests/testthat/test-helperfunctions.R index f5e0f9c..0d49c0c 100644 --- a/tests/testthat/test-helperfunctions.R +++ b/tests/testthat/test-helperfunctions.R @@ -13,8 +13,8 @@ if(file.exists("local.R")) datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key From c2b0d71d5925e88fb921d40e2559dc36a17d1e37 Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Mon, 10 Jun 2024 15:57:27 -0400 Subject: [PATCH 11/11] fixed urls, minor changes to biblography --- DESCRIPTION | 4 ++-- MD5 | 18 +++++++++--------- R/RAQSAPI-package.R | 2 +- README.Rmd | 2 +- README.md | 14 ++++++++++++-- man/RAQSAPI.Rd | 6 +++--- vignettes/AQSAPI.bib | 8 +++++++- vignettes/Acknowledgements.Rmd | 2 ++ 8 files changed, 37 insertions(+), 19 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b63f0ad..2ab9ed2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -45,8 +45,8 @@ Authors@R: c(person(given="Clinton", family="Mccrowey", comment = "West Virginia Department of Environmental Protection, Division of Air Quality" ) ) -URL: , - +URL: https://github.com/USEPA/RAQSAPI/, + https://aqs.epa.gov/aqsweb/documents/data_api.html BugReports: https://github.com/USEPA/RAQSAPI/issues Depends: R (>= 4.0.0) Imports: diff --git a/MD5 b/MD5 index ab259a2..a4be22a 100644 --- a/MD5 +++ b/MD5 @@ -2,11 +2,11 @@ f4ff2345ea66f98028bea8e07bb9b6fa *codemeta.json 6e5839d0c24939143566d26d7f427fce *cran-comments.md 6e5839d0c24939143566d26d7f427fce *cran-comments.Rmd -d4d029fe53e81834a1917cfedb301963 *DESCRIPTION +8d3b9fa84140908686c8837fa1056041 *DESCRIPTION 1dc95961c4c280f8645a65d15662725f *dev/contributing.md 4fc13def6ec5d889261f1f22a13ba542 *dev/contributing.Rmd 74e297a0dc0b508ed18e3821264958d0 *dev/countlinesofcode.R -f0746c194aa05f99068a1c8c86ce56f2 *dev/install_RAQSAPI.R +ed21caa73378a9cdf8de4df12cc848c0 *dev/install_RAQSAPI.R 3c41777493d242206848842b6ba74fde *inst/CITATION 3df907b50c4f00bc26ee6d988e0c849f *inst/codecov.yml dd65d70b425fb86f7c8b6d8841a837d8 *inst/schemaorg.json @@ -116,7 +116,7 @@ f41ed996be135fb35afe00641621da61 *man/figures/lifecycle-questioning.svg 306bef67d1c636f209024cf2403846fd *man/figures/lifecycle-soft-deprecated.svg ed42e3fbd7cc30bc6ca8fa9b658e24a8 *man/figures/lifecycle-stable.svg bf2f1ad432ecccee3400afe533404113 *man/figures/lifecycle-superseded.svg -792c28b91a2c0b5e0b060a2f18a20464 *man/RAQSAPI.Rd +14dea302d2901ec5384577249f059654 *man/RAQSAPI.Rd eef9bd75f39b496fcfd63a36be7fb5a8 *NAMESPACE 68f4c551ed9b572bb7c6a3ab9228b75c *R/AQSAPI_helperfunctions.R a3558975d0256839b174ab7868833075 *R/bybox.R @@ -127,14 +127,14 @@ d82b1ff8ee144afca1879e5b8dc58840 *R/byma.R 6acae078848030131e628154099e5f53 *R/bysite.R 2e6e59d801dc3b6bd5e415ada7268469 *R/bystate.R 5b01d32e630b9b68041a139e4ae6f748 *R/deprecated.R -87275ab3c5bd1af63ecfbd835ea8f53b *R/RAQSAPI-package.R +6fb9bc5a422698bef6bdd147006c0439 *R/RAQSAPI-package.R cebed24e7ab755d8642a74c7e9b80fd5 *R/RAQSAPIlistfunctions.R e6e3b87e48f4403642382987b0f40714 *R/setupfunctions.R 6e659bb3bbf313dc819d4c029f0b22d0 *R/zzz.R 25bf50b0ec79d01de8b83b7b5801b4ac *RAQSAPI.code-workspace a69de5455537022556f014579766be59 *RAQSAPI.Rproj -9f1bd2ef6f1343108dfae0fa0d6d9cac *README.md -b2370e0e3f63a29557cd8f74746d74f6 *README.Rmd +1ef6fd253bab1a2805a72a3777e9eff2 *README.md +9e80ce935498c732a40296459634eb91 *README.Rmd 7ed08f3fb96a77ec01c95c2ad7964250 *revdep/data.sqlite 34952a5944548ea4fc132a9899f8e6ab *revdep/email.yml b7715aa47f5635cfb52f34937886aedf *revdep/library/RAQSAPI/old/askpass/DESCRIPTION @@ -1329,11 +1329,11 @@ bfcb21038f480e4e9638486f99b45efa *tests/testthat/test-byMA.R 273dda836db047478bc65a94c7e0a05d *tests/testthat/test-bystate.R 9ac730cce5b9a3d7b4b877512bc4de25 *tests/testthat/test-helperfunctions.R 2391f6b331d4bc3e5e9e6a0b73980eba *tests/testthat/test-RAQSAPlistfunctions.R -a55434f85eb9ec8d1c4706997b49cc10 *vignettes/Acknowledgements.html -1798121e142b3da718a2e54435a7ef9a *vignettes/Acknowledgements.Rmd +ce44f2334218eff76881442d89ebdee0 *vignettes/Acknowledgements.html +36ae3777b8fd72d52f8a4a6bfa756207 *vignettes/Acknowledgements.Rmd 22d607e5d49e10047a911e5d42183c34 *vignettes/acs-nano.csl 0ec78b946a45069323acf54a24c77566 *vignettes/american-chemical-society.csl -e1df58c4692ce8a6e9743bf9d594ff9e *vignettes/AQSAPI.bib +847af4aba6af007f68c8173be0275e23 *vignettes/AQSAPI.bib de323c3deb36e066a7583c5b756ae49b *vignettes/EPA_Disclaimer.html a79d926b2ab509e6a9e575539b205280 *vignettes/EPA_Disclaimer.Rmd 9f8f6638c5178a9bec62665b4cef5e1d *vignettes/figures/AQS_LOGO.png diff --git a/R/RAQSAPI-package.R b/R/RAQSAPI-package.R index 16292f1..68c9a96 100644 --- a/R/RAQSAPI-package.R +++ b/R/RAQSAPI-package.R @@ -3,7 +3,7 @@ #' @title RAQSAPI: A R Interface to The United States Environmental Protection -#' Agency's Air Quality System Data Mart RESTful API server. +#' Agency's Air Quality System Data Mart RESTful API server #' #' @description RAQSAPI is a package for R that connects the R programming #' environment to the United State's Environmental protection agency's diff --git a/README.Rmd b/README.Rmd index 68ecf85..aa1653c 100644 --- a/README.Rmd +++ b/README.Rmd @@ -36,7 +36,7 @@ knitr::opts_chunk$set( [![metacran downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)]( https://cran.r-project.org/package=RAQSAPI) [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)]( - https://www.tidyverse.org/lifecycle/#maturing) + https://lifecycle.r-lib.org/articles/stages.html) [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)]( https://choosealicense.com/) "[![Last-changedate](https://img.shields.io/badge/last%20change- diff --git a/README.md b/README.md index bea07e4..55a30cd 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,9 @@ developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.re status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.org/package=RAQSAPI) [![metacran downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI) -[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing) +[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/) -“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--05--23-yellowgreen.svg)](/commits/master)” +“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--06--10-yellowgreen.svg)](/commits/master)” # EPA Disclaimer @@ -416,6 +416,8 @@ those sources with them RAQSAPI would not be possible. - .gitignore file borrowed examples from - . CITATION.cff file was generated by the R package `cffr`10 +- R package `urlchecker`11 was used to check urls in RAQSAPI + documentation # References @@ -512,6 +514,14 @@ Pérez-Suárez, D.; Konovalov, A. Citation File Format, 2021.
+
+ +(11) +R-Lib/Urlchecker on Github. + (accessed 2023-11-30). + +
+
[^1]: RAQSAPI’s rate limit does not guarantee that the user will not go diff --git a/man/RAQSAPI.Rd b/man/RAQSAPI.Rd index 184caa2..c3470e4 100644 --- a/man/RAQSAPI.Rd +++ b/man/RAQSAPI.Rd @@ -5,7 +5,7 @@ \alias{RAQSAPI-package} \alias{RAQSAPI} \title{RAQSAPI: A R Interface to The United States Environmental Protection -Agency's Air Quality System Data Mart RESTful API server.} +Agency's Air Quality System Data Mart RESTful API server} \description{ RAQSAPI is a package for R that connects the R programming environment to the United State's Environmental protection agency's @@ -37,8 +37,8 @@ activity by the USEPA or the United States Government. \seealso{ Useful links: \itemize{ - \item \url{} - \item \url{} + \item \url{https://github.com/USEPA/RAQSAPI/} + \item \url{https://aqs.epa.gov/aqsweb/documents/data_api.html} \item Report bugs at \url{https://github.com/USEPA/RAQSAPI/issues} } diff --git a/vignettes/AQSAPI.bib b/vignettes/AQSAPI.bib index ea66f79..d6ced58 100644 --- a/vignettes/AQSAPI.bib +++ b/vignettes/AQSAPI.bib @@ -147,7 +147,13 @@ @Misc{package:cffr doi = {10.5281/zenodo.5171937}, url = {https://github.com/citation-file-format/citation-file-format}, urldate = {2021-11-07}, - copyright = {CC-BY-4.0}, date = {2021-08}, abstract = {The Citation File Format lets you provide citation metadata for software or datasets in plaintext files that are easy to read by both humans and machines.}, } + +@Misc{package:urlchecker, + title = {r-lib/urlchecker on github}, + authors = {R Core team, Jim Hester, Gábor Csárdi, Posit Software, PBC}, + urldate = {2023-11-30}, + url = {https://github.com/r-lib/urlchecker}, + } diff --git a/vignettes/Acknowledgements.Rmd b/vignettes/Acknowledgements.Rmd index c7c4e5b..e920444 100644 --- a/vignettes/Acknowledgements.Rmd +++ b/vignettes/Acknowledgements.Rmd @@ -31,3 +31,5 @@ with them RAQSAPI would not be possible. * .gitignore file borrowed examples from https://github.com/github/gitignore/blob/master/R.gitignore * . CITATION.cff file was generated by the R package `cffr` [@package:cffr] +* R package `urlchecker` [@package:urlchecker] was used to check urls in RAQSAPI + documentation