Skip to content

Fix field type arguments #58

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 3 commits into from
Apr 8, 2020
Merged

Fix field type arguments #58

merged 3 commits into from
Apr 8, 2020

Conversation

asfaltboy
Copy link
Contributor

I came across these couple of issues when using ImageField in my project

@asfaltboy
Correct ImageField constructor args
9cb70b0 
use the ones inherited from FileField
@asfaltboy
Allow None values for min/max length keyword args
1c34626 
the field is set to None by default if the keyword argument is not set
sobolevn
sobolevn approved these changes Jan 8, 2020
View reviewed changes
Copy link
Member

@sobolevn sobolevn left a comment

Choose a reason for hiding this comment

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

Thanks!

@sobolevn sobolevn merged commit 1b551eb into typeddjango:master Apr 8, 2020
@kalekseev
Copy link
Contributor

@sobolevn I think this merge should be reverted, because it conflicts with #62

@sobolevn
Copy link
Member

sobolevn commented Apr 8, 2020

@kalekseev does it? I have manually resolved conflicts, it seemed fine. Can you please highlight conflicting places?

@kalekseev
Copy link
Contributor

@sobolevn the master build is broken because now we have duplicate attributes in fields, check the master code, these are duplicates:

and many more.

I think all fields were already covered by #62 so this merge should be reverted.

sobolevn added a commit that referenced this pull request Apr 9, 2020
@sobolevn
Revert "Fix field type arguments (#58)"
9cc4a41 
This reverts commit 1b551eb.
@sobolevn sobolevn mentioned this pull request Apr 9, 2020
Merged
sobolevn added a commit that referenced this pull request Apr 9, 2020
@sobolevn
Revert "Fix field type arguments" (#68)
e85c9c2 
* Revert "Fix field type arguments (#58)"

This reverts commit 1b551eb.

* Update fields.pyi

* Improves testing stage, fixes CI
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sobolevn sobolevn sobolevn approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@asfaltboy @kalekseev @sobolevn