Skip to content

Commit

Permalink
clean up math-bio to cb url
Browse files Browse the repository at this point in the history
Had to remove docs and rebuild completely
  • Loading branch information
eeholmes committed Nov 28, 2023
1 parent ae5aeec commit 98efc1e
Show file tree
Hide file tree
Showing 71 changed files with 1,405 additions and 4,584 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions LICENSE_ADDENDUM.md
Original file line number Diff line number Diff line change
@@ -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.
14 changes: 10 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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
===================

Expand All @@ -22,15 +28,15 @@ 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`
* Allow cols and sortcols in `rcax_table_query()` to be numbers, although the results might be non-intuitive for `rcax_hli_xport()` since the number will refer to the column order in the table before the columns are sorted into the order found in the downloaded Excel files.

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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion R/rcax-package.R
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion R/rcax_version.R
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
rCAX <img src="man/figures/logo2.png" align="right" width="20%" hspace="20" vspace="20"/>
========

`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

Expand Down Expand Up @@ -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)


<hr>
Expand Down
42 changes: 21 additions & 21 deletions docs/404.html

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

Loading

0 comments on commit 98efc1e

Please sign in to comment.