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

Upstream merge #1

Open
wants to merge 139 commits into
base: master
Choose a base branch
from
Open

Upstream merge #1

wants to merge 139 commits into from

Conversation

rmgorman
Copy link

No description provided.

sobolevn and others added 30 commits September 26, 2016 12:07
* 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
fix: allow empty string in to_python
split out and reformat the changelog
Renamed method get_db_prep_value to get_prep_value
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
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.