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{