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

Fix constraint violation checking for GranularMarking in v21. #605

Merged
merged 4 commits into from
Sep 25, 2024

Conversation

mfang90739
Copy link
Contributor

This PR fixes #586.

  • used the _check_mutually_exclusive_properties method to catch the exception caused by the incorrect use of both lang and marking_ref properties in the same time
  • added a corresponding unit test case

@CLAassistant
Copy link

CLAassistant commented Sep 23, 2024

CLA assistant check
All committers have signed the CLA.

@rpiazza
Copy link
Contributor

rpiazza commented Sep 24, 2024

@mfang90739 -
The linting/style checking failed (see 3.11 build). Just some minor issues. Can you fix them? Otherwise looks good!

@rpiazza
Copy link
Contributor

rpiazza commented Sep 25, 2024

One last thing to fix to make pre-commit happy...

Check project styling....................................................Failed

  • hook id: flake8
  • exit code: 1

stix2/v21/common.py:82:1: E302 expected 2 blank lines, found 1

@rpiazza rpiazza merged commit b2bbaee into oasis-open:master Sep 25, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Granular marking constraint checking is incorrect
3 participants