Skip to content

Commit 4fc7ed8

Browse files
authored
License update cleanup (#35)
* Add ORCIDS iDs to Authors@R in DESCRIPTION * Migrate liccense to 0BSD * UPDATE License field in DESCRIPTION for 0BSD * Remove LICENSE.note, superseded by 0BSD migration * Use dynamic version and year in CITATION * Move CONTRIBUTING.md to .github/ * Add Results/ to .gitignore * Add Results/ to .Rbuildignore * Fix Results/ entries in .gitignore and .Rbuildignore * Update rfaR-package.Rd via devtools::document()
1 parent 11b627f commit 4fc7ed8

8 files changed

Lines changed: 49 additions & 39 deletions

File tree

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
^pkgdown$
1111
^\.github$
1212
^vignettes/articles$
13+
^Results$
File renamed without changes.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ inst/doc
77
/full_uncert_testing/
88
dev
99
rfaR_results
10+
Results/

DESCRIPTION

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,30 @@ Package: rfaR
22
Title: RMC Reservoir Frequency Analysis in R
33
Version: 0.5.1
44
Authors@R: c(
5-
person("Daniel", "McGraw", , "daniel.e.mcgraw@usace.army.mil",
6-
role = c("aut", "cre"), comment = "P.E., USACE RMC"),
7-
person("Andrew", "Verdin", , "andrew.p.verdin@usace.army.mil",
8-
role = "aut", comment = "PhD, P.H., USACE RMC"),
9-
person("C. Haden", "Smith", , "cole.h.smith@usace.army.mil",
10-
role = "aut", comment = "P.E., USACE RMC"),
5+
person("Daniel", "McGraw", , "daniel.e.mcgraw@usace.army.mil",
6+
role = c("aut", "cre"),
7+
comment = c("P.E., USACE RMC", ORCID = "0009-0006-4859-0179")),
8+
person("Andrew", "Verdin", , "andrew.p.verdin@usace.army.mil",
9+
role = "aut",
10+
comment = c("PhD, P.H., USACE RMC", ORCID = "0000-0003-1967-9626")),
11+
person("C. Haden", "Smith", , "cole.h.smith@usace.army.mil",
12+
role = "aut",
13+
comment = c("P.E., USACE RMC", ORCID = "0000-0002-4651-9890")),
1114
person("Allen", "Avance", , "allen.avance@usace.army.mil",
1215
role = "ctb", comment = "P.E., USACE RMC"),
1316
person("Samantha", "Hartke", , "samantha.h.hartke@usace.army.mil",
14-
role = "ctb", comment = "PhD, USACE RMC"),
17+
role = "ctb",
18+
comment = c("PhD, USACE RMC", ORCID = "0000-0002-0239-4723")),
1519
person("Julian", "Gonzalez", , "julian.t.gonzalez@usace.army.mil",
16-
role = "ctb", comment = "USACE RMC"),
20+
role = "ctb",
21+
comment = c("USACE RMC", ORCID = "0009-0009-9058-7653")),
1722
person("Sadie", "Niblett", , "sadie.s.niblett@usace.army.mil",
18-
role = "rev", comment = "USACE RMC"),
23+
role = "rev",
24+
comment = c("USACE RMC", ORCID = "0009-0008-8588-4816")),
1925
person("Reuben", "Sasaki", , "reuben.a.sasaki@usace.army.mil",
20-
role = "rev", comment = "P.E.,USACE RMC"),
26+
role = "rev", comment = "P.E., USACE RMC"),
2127
person("Bryan", "Robinson", , "bryan.j.robinson@usace.army.mil",
22-
role = "rev", comment = "P.E.,USACE RMC"))
28+
role = "rev", comment = "P.E., USACE RMC"))
2329
Description: An R implementation of the U.S. Army Corps of Engineers (USACE)
2430
Risk Management Center-Reservoir Frequency Analysis (RMC-RFA) methodology/software.
2531
This package produces reservoir stage-frequency curves with uncertainty bounds
@@ -33,7 +39,7 @@ Description: An R implementation of the U.S. Army Corps of Engineers (USACE)
3339
parameters (stage, discharge, duration) and their associated annual exceedance
3440
probabilities.
3541
Nickname: Friday
36-
License: BSD_3_clause + file LICENSE
42+
License: file LICENSE
3743
URL: https://github.com/USACE-RMC/rfaR, https://usace-rmc.github.io/rfaR/
3844
BugReports: https://github.com/USACE-RMC/rfaR/issues
3945
Encoding: UTF-8

LICENSE

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1-
YEAR: 2024
2-
COPYRIGHT HOLDER: US Army Corps of Engineers - Risk Management Center
3-
ORGANIZATION: US Army Corps of Engineers - Risk Management Center
1+
Copyright (C) 2026 by U.S. Army Corps of Engineers - Risk Management Center
2+
3+
Permission to use, copy, modify, and/or distribute this software for any
4+
purpose with or without fee is hereby granted.
5+
6+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
7+
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
8+
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
9+
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
10+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
11+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
12+
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

LICENSE.note

Lines changed: 0 additions & 9 deletions
This file was deleted.

inst/CITATION

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1+
meta <- utils::packageDescription("rfaR")
2+
13
citHeader("To cite rfaR:")
24
bibentry(
3-
bibtype = "Manual",
4-
title = "rfaR: RMC Reservoir Frequency Analysis in R",
5-
author = c(
5+
bibtype = "Manual",
6+
title = "rfaR: RMC Reservoir Frequency Analysis in R",
7+
author = c(
68
person("Daniel", "McGraw"),
79
person("Andrew", "Verdin"),
810
person("C. Haden", "Smith")
911
),
1012
organization = "U.S. Army Corps of Engineers, Risk Management Center",
11-
address = "Lakewood, CO",
12-
year = "2026",
13-
version = "0.1.3",
14-
url = "https://github.com/USACE-RMC/rfaR"
13+
address = "Lakewood, CO",
14+
year = format(Sys.Date(), "%Y"),
15+
version = meta$Version,
16+
url = "https://github.com/USACE-RMC/rfaR"
1517
)

man/rfaR-package.Rd

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)