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.

Sign up for GitHub

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

Jump to bottom

fix: merge control markdown with json (#1528) #1740

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

fix: merge control markdown with json (#1528) #1740

wants to merge 5 commits into from

Conversation

d10n
Copy link

@d10n d10n commented Oct 30, 2024 •
edited
Loading

Function cleanup / unit tests to follow

Types of changes

  • Hot fix (emergency fix and release)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation (change which affects the documentation site)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Release (develop -> main)

Quality assurance (all should be covered).

  • My code follows the code style of this project.
  • Documentation for my change is up to date?
  • My PR meets testing requirements.
  • All new and existing tests passed.
  • All commits are signed-off.

Summary

Key links:

Before you merge

  • Ensure it is a 'squash commit' if not a release.
  • Ensure CI is currently passing
  • Check sonar. If you are working for a fork a maintainer will reach out, if required.

@d10n d10n force-pushed the merge-controls-md-json branch 2 times, most recently from 07bc7d5 to c191240 Compare October 30, 2024 14:16
@d10n
fix: merge control markdown with json (oscal-compass#1528)
230c326 
Function cleanup / unit tests to follow

Signed-off-by: d10n <[email protected]>
@d10n d10n changed the title fix: Merge control markdown with json (#1528) fix: merge control markdown with json (#1528) Oct 30, 2024
@d10n
Reuse existing merge_dicts_deep
d100b44 
Signed-off-by: d10n <[email protected]>
@d10n
Enable unit tests to run in PyCharm
a3df98c 
PyCharm has trouble keeping the working directory consistent, so make
the tests look for files relative to the test file instead of the CWD

Signed-off-by: d10n <[email protected]>
@d10n
Format code
387fb5e 
Signed-off-by: d10n <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@degenaro degenaro Awaiting requested review from degenaro

@jpower432 jpower432 Awaiting requested review from jpower432

@vikas-agarwal76 vikas-agarwal76 Awaiting requested review from vikas-agarwal76

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@d10n @butler54