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

Test Updated Character Groups for XML Schema Regexes for OSCAL Token Data Type #1161

Conversation

aj-stein-nist
Copy link
Contributor

@aj-stein-nist aj-stein-nist commented Mar 5, 2022

Test updates in usnistgov/metaschema#183. This closes #1127.

Committer Notes

{Please provide a brief description of what this PR accomplishes. Be sure to reference any issues addressed. If the PR is a work-in-progress submitted for early review, please include [WIP] at the beginning of the title or mark the PR as DRAFT.}

All Submissions:

  • Have you selected the correct base branch per Contributing guidance?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you squashed any non-relevant commits and commit messages? [instructions]
  • Do all automated CI/CD checks pass?

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?
  • Have you included examples of how to use your new feature(s)?
  • Have you updated all OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch.

@aj-stein-nist aj-stein-nist marked this pull request as ready for review March 5, 2022 02:15
@aj-stein-nist
Copy link
Contributor Author

Also @david-waltermire-nist, since this is a bug fix, not sure where you want to point this branch either.

@aj-stein-nist aj-stein-nist changed the base branch from main to release-1.0 March 9, 2022 16:51
@aj-stein-nist aj-stein-nist force-pushed the issue-1127-test-metaschema-183 branch from 931012a to dc22670 Compare March 9, 2022 16:53
@aj-stein-nist
Copy link
Contributor Author

Updated this to point to release-1.0 in place of main as this is a bug fix we want to land in the 1.0.2 release. @david-waltermire-nist pending usnistgov/metaschema#183, merged (I approved last week), this will be ready to go and/or I can update again to the right submodule commit. LMK, thanks.

@david-waltermire
Copy link
Contributor

@david-waltermire-nist Will integrate the data type changes from usnistgov/metaschema#191 to complete this PR.

@aj-stein-nist
Copy link
Contributor Author

@david-waltermire-nist, I know you are doing PR review, I assume this one is waaaay out of date. I can bring it up to the current commit if you need or we can close. Either way.

@aj-stein-nist
Copy link
Contributor Author

Per conversation with PR, don't close this. Update to latest metaschema commit once usnistgov/metaschema#199 and usnistgov/metaschema#204.

@aj-stein-nist
Copy link
Contributor Author

@mpemy, if you want I can update this PR accordingly (I agreed to that for the team before I depart today in #1161 (comment)) and you can clone my fork of the repo to test? It will be merged into v1.0.3 once the "final it's ready version of the Metaschema module" is ready and we know the specific commit.

@aj-stein-nist
Copy link
Contributor Author

aj-stein-nist commented May 3, 2022

@david-waltermire-nist I know this is a small lift, but I pointed the submodule as metaschema changes have stabilized as it pertains to the OSCAL v1.0.3 release at least up to commit usnistgov/metaschema@86952d7 on master usnistgov/metaschema@42db043 on develop. We discussed today this should be good enough for upcoming release since any significant Metaschema changes are merged in and good to go. Let me know if you needed changes or prefer I start over.

UPDATE: Haha, just kidding, I meant usnistgov/metaschema@42db043 on develop review commit histories and maybe that is what we hope to use for now given my more thorough review of usnistgov/metaschema#199 and relevant issues. Sorry!

@aj-stein-nist aj-stein-nist force-pushed the issue-1127-test-metaschema-183 branch 3 times, most recently from 4fbba60 to 7ba4716 Compare May 4, 2022 15:13
@aj-stein-nist
Copy link
Contributor Author

@david-waltermire-nist ok, haha, just kidding for a second time! Per our convo rebased to metaschema main (renamed from master) after discussion on the call. I didn't notice you backported main changes into develop, sorry for the confusion.

Copy link
Contributor

@david-waltermire david-waltermire left a comment

Choose a reason for hiding this comment

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

Any reason this shouldn't be updated to commit 86952d7b283c41dcfcfcd68ceb7b7e1e2e289c9b?

@david-waltermire david-waltermire added this to the OSCAL 1.0.3 milestone May 4, 2022
@aj-stein-nist aj-stein-nist force-pushed the issue-1127-test-metaschema-183 branch from 7ba4716 to 24ab0f8 Compare May 4, 2022 16:15
@aj-stein-nist
Copy link
Contributor Author

Any reason this shouldn't be updated to commit 86952d7b283c41dcfcfcd68ceb7b7e1e2e289c9b?

Nope, other then some really PEBKAC nonsense from me apologies. Please see updated force push. 🤦

@david-waltermire david-waltermire merged commit 6ac5399 into usnistgov:release-1.0 May 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants