forked from rpkilby/jsonfield
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Upstream merge #1
Open
rmgorman
wants to merge
139
commits into
Petro-Viron:master
Choose a base branch
from
rpkilby:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Drop support for Django < 1.8, add support for 1.10+ * Add support for running tox locally with Docker
Move Django support to >= 1.8
Updated `README.rst` with svg badge
Update README.rst with minor edits
Closes #168
Add LICENSE to manifest
fix: allow empty string in to_python
split out and reformat the changelog
Renamed method get_db_prep_value to get_prep_value
Add Django 1.11 to testing matrix
Prep version 2.0.1
Add additional documentation after maintainer switch
Test with released version of Django 1.11
The code was copied from this old file in Django: https://github.com/django/django/blob/1.6.11/django/db/models/fields/subclassing.py#L31 But Django has since been updated to return `self` instead of raising `AttributeError`: https://github.com/django/django/blob/1.7.11/django/db/models/fields/subclassing.py#L33 So reflecting this change in this code now too. Relevant discussion: #189
Django 1.11 compatibility, prevents AttributeError
Merge in jsonfield2
Testing updates
Note that the current implementation where the form field sets the default help text does not work, as the model field's `formfield()` will always provide its own default value, even if an empty string.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.