Skip to content

feat: Allow allOf enums to be subsets of one another or their base types [#379, #423, #461]. Thanks @forest-benchling! #461

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

Merged
merged 13 commits into from
Aug 1, 2021
Merged

feat: Allow allOf enums to be subsets of one another or their base types [#379, #423, #461]. Thanks @forest-benchling! #461

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
36a8fde
Allof enum and string or int
forest-benchling May 10, 2021
c080587
Combine statements
forest-benchling May 10, 2021
370cae7
Another style
forest-benchling May 10, 2021
a4da06c
Support enums
forest-benchling May 10, 2021
e4e2353
Style
forest-benchling May 10, 2021
4e07c2f
Fix bug
forest-benchling Jun 28, 2021
9da37c6
Revert "Fix bug"
forest-benchling Jun 28, 2021
0b6f8e9
Fix bug
forest-benchling Jun 28, 2021
81e18ff
Lint
forest-benchling Jun 28, 2021
d0ebdc5
Fix bug
forest-benchling Jun 28, 2021
be5481c
Regen
forest-benchling Jun 28, 2021
a3623c2
Add tests
forest-benchling Jun 29, 2021
864e0f8
refactor: Improve performance of enum sub-type checking, add more tes…
dbanty Aug 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Fix bug" 
This reverts commit 7561c01.
  • Loading branch information
@forest-benchling @dbanty
forest-benchling authored and dbanty committed Aug 1, 2021
commit 9da37c6e43bbde4ae7bf71bc54a9d6204da8ad5e
6 changes: 2 additions & 4 deletions openapi_python_client/parser/properties/model_property.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ def _is_subtype(first: Property, second: Property) -> bool:
_is_int_enum(first) and isinstance(second, IntProperty),
_is_string_enum(first)
and _is_string_enum(second)
and set(e.value for e in first) <= set(e.value for e in second),
_is_int_enum(first)
and _is_int_enum(second)
and set(e.value for e in first) <= set(e.value for e in second),
and set(first.values.items()) <= set(second.values.items()),
_is_int_enum(first) and _is_int_enum(second) and set(first.values.items()) <= set(second.values.items()),
]
)

Expand Down