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 error messages for Literal types with multiple allowed values #770

Merged
merged 2 commits into from Aug 21, 2019

Conversation

dmontagu
Copy link
Collaborator

@dmontagu dmontagu commented Aug 20, 2019

Change Summary

Fix error messages for Literal types with multiple allowed values

Related issue number

Fixes #768

Checklist

  • Unit tests for the changes exist
  • Tests pass on CI and coverage remains at 100%
  • Documentation reflects the changes where applicable
  • changes/<pull request or issue id>-<github username>.rst file added describing change
    (see changes/README.md for details)

@codecov
Copy link

@codecov codecov bot commented Aug 20, 2019

Codecov Report

Merging #770 into v0.32.x will not change coverage.
The diff coverage is 100%.

@@          Coverage Diff           @@
##           v0.32.x   #770   +/-   ##
======================================
  Coverage      100%   100%           
======================================
  Files           15     15           
  Lines         2733   2736    +3     
  Branches       543    543           
======================================
+ Hits          2733   2736    +3

Copy link
Owner

@samuelcolvin samuelcolvin left a comment

otherwise LGTM.

@@ -807,6 +816,20 @@ def field_singleton_schema( # noqa: C901 (ignore complexity)
raise ValueError(f'Value not declarable with JSON Schema, field: {field}')


def multivalue_literal_field_for_schema(values: Tuple[Any, ...], field: Field) -> Field:
field = Field(
Copy link
Owner

@samuelcolvin samuelcolvin Aug 20, 2019

Choose a reason for hiding this comment

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

Suggested change
field = Field(
return Field(

Copy link
Collaborator Author

@dmontagu dmontagu Aug 21, 2019

Choose a reason for hiding this comment

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

my dreams of a one-commit pull request dashed

Copy link
Owner

@samuelcolvin samuelcolvin Aug 21, 2019

Choose a reason for hiding this comment

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

sorry. 🙇‍♂️

I'll try to stop being such a pedant (pun intended).

@samuelcolvin samuelcolvin merged commit 080c288 into samuelcolvin:v0.32.x Aug 21, 2019
9 checks passed
@samuelcolvin
Copy link
Owner

@samuelcolvin samuelcolvin commented Aug 21, 2019

thanks so much.

samuelcolvin added a commit that referenced this issue Oct 1, 2019
* fix(validate-assignment): do not validate extra fields when `vaidate_assignment` is on

* Update history

* Fix `value` vs. `value_`

* Add tests for `value` vs `value_` case

* uprev

* Fix generic required (#742)

* Fix required fields on GenericModel

* lint

* version up

* __post_init__ with inheritance, fix #739 (#740)

* Fix custom Schema on GenericModel fields (#754)

* Fix custom Schema on GenericModel fields

* Add PR#

* uprev

* Fix error messages for Literal types with multiple allowed values (#770)

* Fix error messages for Literal types with multiple allowed values

* Incorporate feedback

* update history
andreshndz pushed a commit to cuenca-mx/pydantic that referenced this issue Jan 17, 2020
* fix(validate-assignment): do not validate extra fields when `vaidate_assignment` is on

* Update history

* Fix `value` vs. `value_`

* Add tests for `value` vs `value_` case

* uprev

* Fix generic required (samuelcolvin#742)

* Fix required fields on GenericModel

* lint

* version up

* __post_init__ with inheritance, fix samuelcolvin#739 (samuelcolvin#740)

* Fix custom Schema on GenericModel fields (samuelcolvin#754)

* Fix custom Schema on GenericModel fields

* Add PR#

* uprev

* Fix error messages for Literal types with multiple allowed values (samuelcolvin#770)

* Fix error messages for Literal types with multiple allowed values

* Incorporate feedback

* update history
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.

None yet

2 participants