From 80f0ed2e56ffc995a1f298b90cdd2c5ed72c0c94 Mon Sep 17 00:00:00 2001 From: Sam Schiano <125507018+Schiano-NOAA@users.noreply.github.com> Date: Mon, 18 May 2026 16:16:22 -0400 Subject: [PATCH 01/10] copy contrib and adjust from asar --- CONTRIBUTING.md | 74 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d322b3ab..14026fa0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,9 @@ -# Contributing to {stockplotr} +# Contributing to `stockplotr` -Do you have an idea that would improve {stockplotr}? *Consider making a contribution!* We welcome ideas for improving not only our code, but also our documentation, tutorial, and any other material associated with {stockplotr}. Here are some options and tips for doing so. +Do you have an idea that would improve `stockplotr`? *Consider making a contribution!* +We welcome ideas for improving not only our code, but also our documentation, +tutorial, and any other material associated with `stockplotr`. Here are some +options and tips for doing so. Note: To make any contribution, you must agree to abide by the [Code of Conduct](https://github.com/nmfs-ost/stockplotr/blob/main/CODE_OF_CONDUCT.md). @@ -8,19 +11,80 @@ Note: To make any contribution, you must agree to abide by the [Code of Conduct] ### Recommended workflow: fork & submit a pull request -The most efficient way to contribute an idea is to fork {stockplotr}, make your suggested changes on a local branch, and then submit a pull request. This will allow the developers to easily evaluate your suggested changes. Please see the [GitHub Docs' "Contributing to a project" page](https://docs.github.com/en/get-started/exploring-projects-on-github/contributing-to-a-project) for step-by-step guidance in using this workflow. +The most efficient way to contribute an idea is to fork `asar`, make your +suggested changes on a local branch, and then submit a pull request to the main branch. +This will allow the developers to easily evaluate your suggested changes. +Please see the [GitHub Docs' "Contributing to a project" page](https://docs.github.com/en/get-started/exploring-projects-on-github/contributing-to-a-project) +for step-by-step guidance in using this workflow. + +We also follow a few other practices that will help us expedite the review process. +After completing the bug fix or feature, please complete the following: + +1. Run `devtools::test()` to verify the package checks are passing (this includes tests). + +2. If including a feature, please add a test using the +[`{testthat}` package structure](https://testthat.r-lib.org/reference/test_that.html). +If you are unfamiliar with this approach, simply let us know :smile + +3. If including a feature that is a new function, please add documentation using +the [`{roxygen2}` package structure](https://roxygen2.r-lib.org/articles/roxygen2.html). + +4. Please increment the package version following our semantic versioning found in @sec-version. + +5. Add a short summary or title line in the NEWS.md file indicating the feature +or fix. This will be how we include recognition for your contribution in our +monthly release notes. ### Recommended practices - Write clear, succinct commit messages ([see some tips here](https://opensource.com/article/22/12/git-commit-message)) - Limit a commit to a few, rather than many, changes. Smaller commits means more commit messages, which is often helpful for documentation. -- Ensure your base branch is correct. +- Ensure your base branch is correct. We typically merge most PRs into "dev", then merge "dev" into "main" upon a new release. - Test that your contributed code will function as expected under different circumstances. - Add comments to the code if it's not immediately clear what the purpose of the code is, or how it works. +### Semantic Versioning {#sec-version} + +We use an approach to semantic versioning for our packages. This includes using +a typical structure for semantic versioning which follows: + +v.. + +where, + +- MAJOR = major release (not backwards compatible) +- MINOR = minor release (new features) +- PATCH = hot fixes and bug fixes (aka patches) + +A branch in v...9000 indicates development in main branch. + +Please use the following "release indicators" for a naming a branch or pull request: + +| Indicator | Description | +|-----------|-------------| +| feat | A new feature | +| fix | A bug fix | +| docs | Documentation only changes | +| style | Changes that do not affect the meaning of the code (i.e. white-space, formatting, missing semi-colons) | +| refactor | A code change that neither fixes a bug nor adds a feature | +| perf | A code change that improves performance | +| test | Adding missing or correcting existing tests | +| chore | changes to the build process or auxiliary tools and libraries such as documentation generation | + +#### Rules for Indicator Use + +- If the body contains the text "BREAKING CHANGE" then MAJOR version is incremented. +- If the type contains feat, then MINOR version is incremented. +- If the type contains a fix, then PATCH version is incremented. +- If the type contains refactor/style/perf/doc/test/chore, then nothing is incremented and no release will be made. + + +The above content is modeled after an article on ["Automating Versioning and Releases Using Semantic Release"](https://medium.com/agoda-engineering/automating-versioning-and-releases-using-semantic-release-6ed355ede742) +from Agoda Engineering. + ## Contributing bugs -Found a bug? Tell us about it on our [Issues page](https://github.com/nmfs-ost/stockplotr/issues). Before you create an issue, please check that it has not already been resolved (i.e., is a "closed" issue). +Found a bug? Tell us about it on our [Issues page](https://github.com/nmfs-ost/stockplotr/issues). Before you create an issue, please check that it has not already been resolved (i.e., is a "closed" issue) or documented in our [Frequently Asked Questions (FAQ) vignette](https://nmfs-ost.github.io/stockplotr/articles/faqs.html). If possible, please submit a reproducible example ([reprex](https://reprex.tidyverse.org/articles/reprex-dos-and-donts.html)) to help us understand the problem better and, ideally, allow us to reproduce your issue. From 7d7a8b9e2778c6666790a249bf12f60cb2bd3dea Mon Sep 17 00:00:00 2001 From: Sam Schiano <125507018+Schiano-NOAA@users.noreply.github.com> Date: Mon, 18 May 2026 16:17:42 -0400 Subject: [PATCH 02/10] add link to version section --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 14026fa0..e4380f85 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,7 @@ If you are unfamiliar with this approach, simply let us know :smile 3. If including a feature that is a new function, please add documentation using the [`{roxygen2}` package structure](https://roxygen2.r-lib.org/articles/roxygen2.html). -4. Please increment the package version following our semantic versioning found in @sec-version. +4. Please increment the package version following our [semantic versioning section](https://github.com/nmfs-ost/stockplotr/blob/doc-update-contrib/CONTRIBUTING.md#semantic-versioning-sec-version). 5. Add a short summary or title line in the NEWS.md file indicating the feature or fix. This will be how we include recognition for your contribution in our @@ -43,7 +43,7 @@ monthly release notes. - Test that your contributed code will function as expected under different circumstances. - Add comments to the code if it's not immediately clear what the purpose of the code is, or how it works. -### Semantic Versioning {#sec-version} +### Semantic Versioning We use an approach to semantic versioning for our packages. This includes using a typical structure for semantic versioning which follows: From 7c16edfd9ecf5978680ecd22f052ee1dbf23a5be Mon Sep 17 00:00:00 2001 From: Sam Schiano <125507018+Schiano-NOAA@users.noreply.github.com> Date: Mon, 18 May 2026 16:18:20 -0400 Subject: [PATCH 03/10] add code ticks around versioning --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e4380f85..9718165a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,7 +48,7 @@ monthly release notes. We use an approach to semantic versioning for our packages. This includes using a typical structure for semantic versioning which follows: -v.. +`v..` where, @@ -56,7 +56,7 @@ where, - MINOR = minor release (new features) - PATCH = hot fixes and bug fixes (aka patches) -A branch in v...9000 indicates development in main branch. +A branch in `v...9000` indicates development in main branch. Please use the following "release indicators" for a naming a branch or pull request: From 8ba48c82c29524bcde9dd6f78b127416980a2942 Mon Sep 17 00:00:00 2001 From: Sam Schiano <125507018+Schiano-NOAA@users.noreply.github.com> Date: Mon, 18 May 2026 16:43:03 -0400 Subject: [PATCH 04/10] update contributing, add NEWS.md file with help from the helper package Dschaykib/newsmd --- CONTRIBUTING.md | 4 ++-- NEWS.md | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 NEWS.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9718165a..007d3762 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -79,8 +79,8 @@ Please use the following "release indicators" for a naming a branch or pull requ - If the type contains refactor/style/perf/doc/test/chore, then nothing is incremented and no release will be made. -The above content is modeled after an article on ["Automating Versioning and Releases Using Semantic Release"](https://medium.com/agoda-engineering/automating-versioning-and-releases-using-semantic-release-6ed355ede742) -from Agoda Engineering. +**The above content is modeled after an article on ["Automating Versioning and Releases Using Semantic Release"](https://medium.com/agoda-engineering/automating-versioning-and-releases-using-semantic-release-6ed355ede742) +from Agoda Engineering.** ## Contributing bugs diff --git a/NEWS.md b/NEWS.md new file mode 100644 index 00000000..0db1a27b --- /dev/null +++ b/NEWS.md @@ -0,0 +1,21 @@ +## version v0.11.1 + +--- + + +### Features + + + +### Bugfixes + + + +## version 0.0.0.9000 + +--- + +### NEWS.md setup + +- added NEWS.md creation with [newsmd](https://github.com/Dschaykib/newsmd) + From 7d796c788926ef80b74368f99aa12cb2b9fe6025 Mon Sep 17 00:00:00 2001 From: Sam Schiano <125507018+Schiano-NOAA@users.noreply.github.com> Date: Mon, 18 May 2026 16:47:58 -0400 Subject: [PATCH 05/10] add link to NEWS file in main --- CONTRIBUTING.md | 4 ++-- NEWS.md | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 007d3762..179b77e8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,7 +31,7 @@ the [`{roxygen2}` package structure](https://roxygen2.r-lib.org/articles/roxygen 4. Please increment the package version following our [semantic versioning section](https://github.com/nmfs-ost/stockplotr/blob/doc-update-contrib/CONTRIBUTING.md#semantic-versioning-sec-version). -5. Add a short summary or title line in the NEWS.md file indicating the feature +5. Add a short summary or title line in the [NEWS.md](https://github.com/nmfs-ost/stockplotr/blob/main/NEWS) file indicating the feature or fix. This will be how we include recognition for your contribution in our monthly release notes. @@ -80,7 +80,7 @@ Please use the following "release indicators" for a naming a branch or pull requ **The above content is modeled after an article on ["Automating Versioning and Releases Using Semantic Release"](https://medium.com/agoda-engineering/automating-versioning-and-releases-using-semantic-release-6ed355ede742) -from Agoda Engineering.** +# from Agoda Engineering.** ## Contributing bugs diff --git a/NEWS.md b/NEWS.md index 0db1a27b..697c1425 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,9 +10,6 @@ ### Bugfixes - -## version 0.0.0.9000 - --- ### NEWS.md setup From c5980788b11b6fdbd0bdb70adc4beed0d19a7e32 Mon Sep 17 00:00:00 2001 From: Sam Schiano <125507018+Schiano-NOAA@users.noreply.github.com> Date: Mon, 18 May 2026 17:04:39 -0400 Subject: [PATCH 06/10] update WORDLIST --- inst/WORDLIST | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inst/WORDLIST b/inst/WORDLIST index 55b80a35..17ea4505 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,4 +1,5 @@ BAM +Bugfixes CPUE FIMS FIMSdiags @@ -41,8 +42,10 @@ kableExtra kobe kqs len +md msy natively +newsmd noaa nsim obsvpred From 3d2cfd0efb9e281f9d5aee6170042fb28e955977 Mon Sep 17 00:00:00 2001 From: Sam Schiano <125507018+Schiano-NOAA@users.noreply.github.com> Date: Tue, 19 May 2026 09:37:44 -0400 Subject: [PATCH 07/10] remove mention of using dev branch --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 179b77e8..e5b0eb7c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,7 +39,7 @@ monthly release notes. - Write clear, succinct commit messages ([see some tips here](https://opensource.com/article/22/12/git-commit-message)) - Limit a commit to a few, rather than many, changes. Smaller commits means more commit messages, which is often helpful for documentation. -- Ensure your base branch is correct. We typically merge most PRs into "dev", then merge "dev" into "main" upon a new release. +- Ensure your base branch is correct. We merge all branches into main. - Test that your contributed code will function as expected under different circumstances. - Add comments to the code if it's not immediately clear what the purpose of the code is, or how it works. From 7c0fcd4a8a370c674bf72d06361c3a6a133c0f50 Mon Sep 17 00:00:00 2001 From: Sam Schiano <125507018+Schiano-NOAA@users.noreply.github.com> Date: Wed, 27 May 2026 15:33:48 -0400 Subject: [PATCH 08/10] remove NEWS.md --- CONTRIBUTING.md | 24 ++---------------------- NEWS.md | 18 ------------------ 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 NEWS.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e5b0eb7c..64f247ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,12 +29,6 @@ If you are unfamiliar with this approach, simply let us know :smile 3. If including a feature that is a new function, please add documentation using the [`{roxygen2}` package structure](https://roxygen2.r-lib.org/articles/roxygen2.html). -4. Please increment the package version following our [semantic versioning section](https://github.com/nmfs-ost/stockplotr/blob/doc-update-contrib/CONTRIBUTING.md#semantic-versioning-sec-version). - -5. Add a short summary or title line in the [NEWS.md](https://github.com/nmfs-ost/stockplotr/blob/main/NEWS) file indicating the feature -or fix. This will be how we include recognition for your contribution in our -monthly release notes. - ### Recommended practices - Write clear, succinct commit messages ([see some tips here](https://opensource.com/article/22/12/git-commit-message)) @@ -42,23 +36,10 @@ monthly release notes. - Ensure your base branch is correct. We merge all branches into main. - Test that your contributed code will function as expected under different circumstances. - Add comments to the code if it's not immediately clear what the purpose of the code is, or how it works. +- Name branches and title pull requests according to the release indicators in the table below. -### Semantic Versioning - -We use an approach to semantic versioning for our packages. This includes using -a typical structure for semantic versioning which follows: - -`v..` -where, - -- MAJOR = major release (not backwards compatible) -- MINOR = minor release (new features) -- PATCH = hot fixes and bug fixes (aka patches) - -A branch in `v...9000` indicates development in main branch. - -Please use the following "release indicators" for a naming a branch or pull request: +#### Release Indicators: | Indicator | Description | |-----------|-------------| @@ -78,7 +59,6 @@ Please use the following "release indicators" for a naming a branch or pull requ - If the type contains a fix, then PATCH version is incremented. - If the type contains refactor/style/perf/doc/test/chore, then nothing is incremented and no release will be made. - **The above content is modeled after an article on ["Automating Versioning and Releases Using Semantic Release"](https://medium.com/agoda-engineering/automating-versioning-and-releases-using-semantic-release-6ed355ede742) # from Agoda Engineering.** diff --git a/NEWS.md b/NEWS.md deleted file mode 100644 index 697c1425..00000000 --- a/NEWS.md +++ /dev/null @@ -1,18 +0,0 @@ -## version v0.11.1 - ---- - - -### Features - - - -### Bugfixes - - ---- - -### NEWS.md setup - -- added NEWS.md creation with [newsmd](https://github.com/Dschaykib/newsmd) - From 95e890a34b7916a0f89cd0e1d919d2f7338089ec Mon Sep 17 00:00:00 2001 From: Sam Schiano <125507018+Schiano-NOAA@users.noreply.github.com> Date: Wed, 27 May 2026 15:35:02 -0400 Subject: [PATCH 09/10] update wordlist --- inst/WORDLIST | 3 --- 1 file changed, 3 deletions(-) diff --git a/inst/WORDLIST b/inst/WORDLIST index 17ea4505..55b80a35 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,5 +1,4 @@ BAM -Bugfixes CPUE FIMS FIMSdiags @@ -42,10 +41,8 @@ kableExtra kobe kqs len -md msy natively -newsmd noaa nsim obsvpred From cf4488d086d64006fe3a86e63fd701dfe777829a Mon Sep 17 00:00:00 2001 From: Sam Schiano <125507018+Schiano-NOAA@users.noreply.github.com> Date: Thu, 28 May 2026 10:16:37 -0400 Subject: [PATCH 10/10] Update CONTRIBUTING.md Co-authored-by: Sophie Breitbart --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64f247ec..4f75e4ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -59,8 +59,7 @@ the [`{roxygen2}` package structure](https://roxygen2.r-lib.org/articles/roxygen - If the type contains a fix, then PATCH version is incremented. - If the type contains refactor/style/perf/doc/test/chore, then nothing is incremented and no release will be made. -**The above content is modeled after an article on ["Automating Versioning and Releases Using Semantic Release"](https://medium.com/agoda-engineering/automating-versioning-and-releases-using-semantic-release-6ed355ede742) -# from Agoda Engineering.** +**The above content is modeled after an article on ["Automating Versioning and Releases Using Semantic Release"](https://medium.com/agoda-engineering/automating-versioning-and-releases-using-semantic-release-6ed355ede742) from Agoda Engineering.** ## Contributing bugs