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

Doc changelog #115

Merged
merged 131 commits into from
Feb 7, 2022
Merged

Doc changelog #115

merged 131 commits into from
Feb 7, 2022

Conversation

yardasol
Copy link
Contributor

@yardasol yardasol commented Jan 31, 2022

Summary of changes

This PR adds several features related to change logs/release notes. Specifically, this PR adds:

  • A new section in the docs, releasenotes
  • A template for writing release notes
  • Workflows that:
    • Auto-populate the current draft release body with the associated release notes whenever those release notes are updated
    • Create a new milestone, draft release, and release notes one minor version higher than the current draft release when the current draft release gets published
    • Do the same as above but for micro versions (manual trigger only)
  • New content to CONTRIBUTING.md describing the release notes requirements
  • A new devguide section in the docs, consisting of
    • The landing page
    • Conversion of CONTRIBUTING.md to .rst
  • A new checkbox in the PR template that requires users to document their changes in the release notes for the current milestone.
  • Acknowledgement of OpenMC's doc structure and the use of sphinx-multiversion to make versioned documentation.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Required for Merging

  • I have read the CONTRIBUTING document.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly.
  • My change is a source code change
    • I have added/modified tests to cover my changes
    • I have explained why my change does not require new/modified tests
  • All new and existing tests passed.
    • CI tests pass
    • Local tests pass (including Serpent2 integration tests)

Associated Issues and PRs

Associated Developers

Checklist for Reviewers

Reviewers should use this link to get to the
Review Checklist before they begin their review.

Copy link
Contributor

@abachma2 abachma2 left a comment

Choose a reason for hiding this comment

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

Overall, this looks good. Do you need a next-release-major?

Comment on lines -8 to -9
branches:
- master
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this remove pushing the updates to the master branch? Or does this do something else?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's exactly what it does!

Copy link
Contributor

Choose a reason for hiding this comment

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

Is there any reason you are removing this? Does pushing to the master branch trigger this workflow?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm removing this because we only need to trigger the workflow when there are changes to the source code (which is what the API documentation is based on) or when there are new doc pages (in the doc folder). We don't need to trigger this workflow when we add/edit workflows or configuration files.

Comment on lines +1 to +5
Contributing
============

Thanks for Your Help!
---------------------
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason the information from the CONTRIBUTING.md file is repeated here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. It's the web-discoverable version decoupled from github.

Copy link
Contributor

Choose a reason for hiding this comment

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

So this is what ends up on the webpage separate from the repo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I used pandoc to generate the .rst file from the .md file

_version_minor = 3
_version_micro = '1' # use '' for first of series, number for 1 and above
_version_minor = 4
_version_micro = '0' # use '' for first of series, number for 1 and above
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do you have a 0 here? Based on the comment, shouldn't it be ''?

Copy link
Contributor Author

@yardasol yardasol Feb 1, 2022

Choose a reason for hiding this comment

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

I think I tried that once and had issues. I can check again though

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I read over this again and the reason we have a 0 there is because we are also using the _version_extra to signify that this version is in development and not a release version.

Copy link
Contributor

Choose a reason for hiding this comment

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

Would you mind changing the comment to reflect this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I read this over again and now I agree with you

@yardasol
Copy link
Contributor Author

yardasol commented Feb 1, 2022

@abachma2 to answer your question about next-version-major.yml, at some point yes we will want one, but we have not hit a major release version yet. It will have the same structure at next-version-micro.yml.

@yardasol yardasol mentioned this pull request Feb 2, 2022
2 tasks
@yardasol
Copy link
Contributor Author

yardasol commented Feb 2, 2022

In my meeting with @munkm this morning, we discussed removing the next_release_micro.yml workflow as it doesn't really make sense to have with our current release model. It is technically cruft, so I'll be removing it from this PR and putting it in a new feature branch, branched-releases, where we can more rigorously implement the needed workflow as discussed in #116.

@yardasol yardasol linked an issue Feb 3, 2022 that may be closed by this pull request
8 tasks
@yardasol yardasol removed a link to an issue Feb 3, 2022
8 tasks
@yardasol yardasol requested a review from abachma2 February 7, 2022 22:09
Copy link
Contributor

@abachma2 abachma2 left a comment

Choose a reason for hiding this comment

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

Looks good!

@abachma2 abachma2 merged commit 4104bf1 into arfc:master Feb 7, 2022
github-actions bot pushed a commit that referenced this pull request Feb 7, 2022
@yardasol yardasol deleted the doc-changelog branch March 9, 2022 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Feature: Add changelog to docs
2 participants