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 alias_generator and field config conflict #658

Merged

Conversation

@MrMrRobat
Copy link
Contributor

commented Jul 13, 2019

Change Summary

alias_generator will work if field has extra values in schema, but no 'alias' specified

Related issue number

#645

Checklist

  • Unit tests for the changes exist
  • Tests pass on CI and coverage remains at 100%
  • Documentation reflects the changes where applicable
  • HISTORY.rst has been updated
    • if this is the first change since a release, please add a new section
    • include the issue number or this pull request number #<number>
    • include your github username @<whomever>
@codecov

This comment has been minimized.

Copy link

commented Jul 13, 2019

Codecov Report

Merging #658 into master will not change coverage.
The diff coverage is 100%.

@@          Coverage Diff          @@
##           master   #658   +/-   ##
=====================================
  Coverage     100%   100%           
=====================================
  Files          15     15           
  Lines        2712   2712           
  Branches      537    537           
=====================================
  Hits         2712   2712
@MrMrRobat

This comment has been minimized.

Copy link
Contributor Author

commented Jul 13, 2019

@gmetzker, check this out please :)

@samuelcolvin
Copy link
Owner

left a comment

LGTM, just rebase and update HISTORY I'm afraid (sorry, will move to towncrier or similar soon).

@gmetzker

This comment has been minimized.

Copy link

commented Jul 18, 2019

@gmetzker, check this out please :)

I tried your branch and it indeed fixed the issue. Thx @MrMrRobat

MrMrRobat added some commits Jul 19, 2019

@MrMrRobat

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

@samuelcolvin, I gues we ready for merge!

MrMrRobat and others added some commits Jul 23, 2019

@samuelcolvin samuelcolvin merged commit 1b4c1a8 into samuelcolvin:master Jul 24, 2019

7 of 10 checks passed

Header rules No header rules processed
Details
Pages changed 2 new files uploaded
Details
Redirect rules No redirect rules processed
Details
Mixed content No mixed content detected
Details
codecov/project 100% (+0%) compared to 886d05e
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details
samuelcolvin.pydantic Build #20190724.5 succeeded
Details
samuelcolvin.pydantic (Job Python36) Job Python36 succeeded
Details
samuelcolvin.pydantic (Job Python37) Job Python37 succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.