Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Documentation Changes for Git Usage, Branching Model, and Release Management #207

Merged

Conversation

robertbartel
Copy link
Contributor

Modifying and expanding documentation related to release management and new Git branching model.

Note the big caveat: this release process documented in this change deviates somewhat from the discussed branching model (or at least from things implied in those discussions). This was due to ngen-cal being composed, essentially exclusively, of several separate, independently-versioned Python packages. This is in contrast to something like DMOD, which similarly has several nested, individually-versioned packages, but also contains many other things without an independent versioning mechanism, such that a distinct version scheme for the repo as a whole is justified and necessary.

Regardless, for ngen-cal, instead of one version tagging scheme for the whole repo, package-specific tags are expected to be applied as appropriate any time the release process is executed (see RELEASE_MANAGEMENT.md for details). Both the strategy itself and the documented explanation deserve careful review and may require further discussion.

Additions

  • New RELEASE_MANAGEMENT.md doc with details on release process
  • New GIT_USAGE.md with info on Git usage and branching model

Changes

  • Updated CONTRIBUTING.md with some additional info and to be consistent with other repos
  • Move some details present in CONTRIBUTING.md to GIT_USAGE.md

Testing

  1. None; doc updates only

Todos

  • The specifics for "testing and quality pre-release tasks" during the release process need to be decided upon and documented.
  • The exact process for peer reviewing changes made to release branches (e.g., bug fixes) during the release process needs to be decided upon and documented.

Checklist

  • PR has an informative and human-readable title
  • Changes are limited to a single goal (no scope creep)
  • Code can be automatically merged (no conflicts)
  • Code follows project standards (link if applicable)
  • Passes all existing automated tests
  • Any change in functionality is tested
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • Project documentation has been updated (including the "Unreleased" section of the CHANGELOG)
  • Reviewers requested with the Reviewers tool ➡️

Testing checklist (automated report can be put here)

Target Environment support

  • Linux

Adding initial with more complicated, repository-level versioning, in addition to package-level versioning.
Avoiding composite, repo-level versions, and trying to just have package level tagging when things are released.
Also making consistent with analog in other repos.
@robertbartel robertbartel added the documentation Improvements or additions to documentation label Oct 3, 2024
Copy link

@christophertubbs christophertubbs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

B-e-a-utiful. Good job.

@christophertubbs christophertubbs merged commit bc3f56a into NOAA-OWP:master Oct 3, 2024
10 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants