Skip to content

Simplified model's Options.add_field() a bit. #12282

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

Jump to bottom
Merged
merged 1 commit into from
Jan 7, 2020
Merged

Simplified model's Options.add_field() a bit. #12282

merged 1 commit into from
Jan 7, 2020

Conversation

Taoup
Copy link
Contributor

@Taoup Taoup commented Jan 6, 2020

No description provided.

ngnpope
ngnpope approved these changes Jan 6, 2020
View reviewed changes
Copy link
Member

@ngnpope ngnpope left a comment

Choose a reason for hiding this comment

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

Well spotted! Just a little issue with the order of imports.

@Taoup Taoup requested a review from ngnpope January 7, 2020 01:50
ngnpope
ngnpope approved these changes Jan 7, 2020
View reviewed changes
Copy link
Member

@ngnpope ngnpope left a comment

Choose a reason for hiding this comment

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

Thanks. LGTM.

@felixxm Test failures are unrelated - all in serialisation tests related to timezones. Has something changed on the CI?

@felixxm
Copy link
Member

felixxm commented Jan 7, 2020

@pope1ni PyYAML 5.3 fixed one issue, see #12283.

@felixxm felixxm changed the title minor cleanup Simplified model's Options.add_field() a bit. Jan 7, 2020
@felixxm
Copy link
Member

felixxm commented Jan 7, 2020

@Taoup Thanks 👍 .

@felixxm felixxm merged commit 979f61a into django:master Jan 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@ngnpope ngnpope ngnpope approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Taoup @felixxm @ngnpope