diff --git a/DESCRIPTION b/DESCRIPTION index 9b1b43c..ff0edaa 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -18,7 +18,7 @@ Authors@R: role = c("ctb"), email = "katie.barnas@noaa.gov") ) -License: CC0 + file LICENSE +License: GPL-3 | file LICENSE_ADDENDUM URL: https://github.com/nwfsc-cb/rCAX BugReports: https://github.com/nwfsc-cb/rCAX/issues Encoding: UTF-8 diff --git a/LICENSE_ADDENDUM.md b/LICENSE_ADDENDUM.md new file mode 100644 index 0000000..3ecc94c --- /dev/null +++ b/LICENSE_ADDENDUM.md @@ -0,0 +1,8 @@ +# License + +The rCAX package as a whole is distributed under [GNU GENERAL PUBLIC +LICENSE version 3](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) (GPL-3). + +In addition this software has the following license addendum: + +This project is work of the [United States government](https://www.usa.gov/) by US federal employees in the Department of Commerce as part of their official duties. Software code created by U.S. Government employees is not subject to copyright in the United States (17 U.S.C. §105). The United States/Department of Commerce reserves all rights to seek and obtain copyright protection in countries other than the United States for Software authored in its entirety by the Department of Commerce. To this end, the Department of Commerce hereby grants to Recipient a royalty-free, nonexclusive license to use, copy, and create derivative works of the Software outside of the United States. diff --git a/NEWS.md b/NEWS.md index 85f9af6..bc4f5fa 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +rCAX 1.0.3 +=================== + +* updated urls to nwfsc-cb from nwfsc-math-bio when Math Bio GitHub was merged into the CB org. +* updated the license to GPL-3 + rCAX 1.0.2 =================== @@ -22,7 +28,7 @@ rCAX 0.10.0 rCAX 0.9.0 =================== -https://github.com/nwfsc-math-bio/rCAX/releases/tag/v0.9.0 +https://github.com/nwfsc-cb/rCAX/releases/tag/v0.9.0 * Removed API key info as rCAX now includes an internal read-only key * Add plot to `basics.Rmd` @@ -30,7 +36,7 @@ https://github.com/nwfsc-math-bio/rCAX/releases/tag/v0.9.0 rCAX 0.8.0 =================== -https://github.com/nwfsc-math-bio/rCAX/releases/tag/v0.8.0 +https://github.com/nwfsc-cb/rCAX/releases/tag/v0.8.0 * Condensed all the `_xport` functions into one function `rcax_hli_xport()` with argument `hli` to specify which HLI. * Condensed all the individual HLI functions into one function `rcax_hli()` with argument `hli` to specify which HLI. @@ -42,7 +48,7 @@ https://github.com/nwfsc-math-bio/rCAX/releases/tag/v0.8.0 rCAX 0.7.0 =================== -https://github.com/nwfsc-math-bio/rCAX/releases/tag/v0.7.0 +https://github.com/nwfsc-cb/rCAX/releases/tag/v0.7.0 * Added a setup vignette for how to download and install the package. * Removed `rcax_key()`. Not needed. Cleaned up some {rredlist} refs. @@ -54,7 +60,7 @@ https://github.com/nwfsc-math-bio/rCAX/releases/tag/v0.7.0 rCAX 0.6.0 =================== -https://github.com/nwfsc-math-bio/rCAX/releases/tag/v0.6.0 +https://github.com/nwfsc-cb/rCAX/releases/tag/v0.6.0 * Added `rcax_pni_xport()`, `rcax_rpers_xport()`, `rcax_juvout_xport()`, `rcax_presmolt_xport()`, `rcax_presmolt()`, `rcax_pni()`, `rcax_sar()`, `rcax_rpers()`, `rcax_presmolt()` * Added template roxygen for all XPort and base table functions. Now details and description elements are identical. diff --git a/R/rcax-package.R b/R/rcax-package.R index 9b19168..72cafbf 100644 --- a/R/rcax-package.R +++ b/R/rcax-package.R @@ -1,7 +1,7 @@ #' @title rCAX #' @description This package is an R client for the StreamNet Coordinated Assessments HLI REST API. #' -#' Documentation: https://nwfsc-math-bio.github.io/rCAX/ +#' Documentation: https://nwfsc-cb.github.io/rCAX/ #' #' @section Authentication: #' The rCAX R package includes a pull key so that you can query the CAX database. Should you diff --git a/R/rcax_version.R b/R/rcax_version.R index fc9b817..82c9d18 100644 --- a/R/rcax_version.R +++ b/R/rcax_version.R @@ -9,7 +9,7 @@ #' rcax_version <- function(){ cli <- crul::HttpClient$new( - url = "https://api.github.com/repos/nwfsc-math-bio/rCAX/releases/latest", + url = "https://api.github.com/repos/nwfsc-cb/rCAX/releases/latest", opts = list(useragent = rcax_ua()) ) temp <- cli$get() diff --git a/README.md b/README.md index 0db1d0f..1e342b7 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ rCAX ======== -`rCAX` is an R client for the [Coordinated Assessments API](https://www.streamnet.org/resources/exchange-tools/rest-api-documentation/). Coordinated Assessments data eXchange (CAX) is developed by the Coordinated Assessments Partnership (CAP). CAP is a collaborative process to efficiently share and provide access to standardized derived information, such as fish population-scale high-level indicators (HLIs) and supporting metrics. Participants in CAP include state fish and wildlife management agencies, tribes, federal agencies such as National Oceanic and Atmospheric Administration Fisheries (NOAA Fisheries) and Bonneville Power Administration (BPA), and others. CAP is co-sponsored by StreamNet and Pacific Northwest Aquatic Monitoring Partnership (PNAMP). Make sure to review the [StreamNet Terms of Use](https://nwfsc-math-bio.github.io/rCAX/articles/terms.html) for these data, the [StreamNet Data Policy](https://www.streamnet.org/resources/exchange-tools/data-agreements/) and the citation information from [StreamNet](https://www.streamnet.org/resources/citing-sn/) and [PNAMP](https://www.pnamp.org/project/data-citation-and-attribution) for database queries. *rCAX authors: Eli Holmes and Mari Williams, Northwest Fisheries Science Center, NOAA Fisheries.* +`rCAX` is an R client for the [Coordinated Assessments API](https://www.streamnet.org/resources/exchange-tools/rest-api-documentation/). Coordinated Assessments data eXchange (CAX) is developed by the Coordinated Assessments Partnership (CAP). CAP is a collaborative process to efficiently share and provide access to standardized derived information, such as fish population-scale high-level indicators (HLIs) and supporting metrics. Participants in CAP include state fish and wildlife management agencies, tribes, federal agencies such as National Oceanic and Atmospheric Administration Fisheries (NOAA Fisheries) and Bonneville Power Administration (BPA), and others. CAP is co-sponsored by StreamNet and Pacific Northwest Aquatic Monitoring Partnership (PNAMP). Make sure to review the [StreamNet Terms of Use](https://nwfsc-cb.github.io/rCAX/articles/terms.html) for these data, the [StreamNet Data Policy](https://www.streamnet.org/resources/exchange-tools/data-agreements/) and the citation information from [StreamNet](https://www.streamnet.org/resources/citing-sn/) and [PNAMP](https://www.pnamp.org/project/data-citation-and-attribution) for database queries. *rCAX authors: Eli Holmes and Mari Williams, Northwest Fisheries Science Center, NOAA Fisheries.* ## Installation @@ -34,11 +34,11 @@ You can check your installed version versus that on GitHub at any time using `rc ## Contributing -Fork and put in a pull request! +Fork and put in a pull request! The documentation is provided via a pkgdown site. After changing files run `pkgdown::build_site()`. ## Contributors -[![Contributors](https://contrib.rocks/image?repo=nwfsc-math-bio/rCAX)](https://github.com/nwfsc-cb/rCAX/graphs/contributors) +[![Contributors](https://contrib.rocks/image?repo=nwfsc-cb/rCAX)](https://github.com/nwfsc-cb/rCAX/graphs/contributors)
diff --git a/docs/404.html b/docs/404.html index 5f7fd3f..440b049 100644 --- a/docs/404.html +++ b/docs/404.html @@ -6,20 +6,20 @@ Page not found (404) • rCAX - - - - - - + + + + + + - - + + - - + + - + License • rCAXLicense • rCAX @@ -17,7 +17,7 @@ rCAX - 1.0.1 + 1.0.3 @@ -36,14 +36,14 @@
  • - + Source Code
  • - + Issues @@ -60,7 +60,7 @@ Changelog