Skip to content
This repository has been archived by the owner on Jun 20, 2018. It is now read-only.

Django 1.6, 1.7 support #93

Merged
merged 1 commit into from
Jan 29, 2015
Merged

Django 1.6, 1.7 support #93

merged 1 commit into from
Jan 29, 2015

Conversation

frewsxcv
Copy link
Contributor

No description provided.

@frewsxcv frewsxcv changed the title Utilize newer alias for HttpResponse.mimetype Django 1.6, 1.7 support Jan 28, 2015
@frewsxcv frewsxcv force-pushed the patch-1 branch 4 times, most recently from 70b751c to 06bae97 Compare January 29, 2015 02:07
@@ -17,7 +17,7 @@
install_requires = [
'django-modeldict>=1.2.0',
'nexus>=0.2.3',
'django-jsonfield>=0.8.0,<0.9.4',
'jsonfield==0.9.23',
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why from django-jsonfield to jsonfield?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought django-jsonfield didn't have Django 1.7 compatibility, but it's just the 0.8.x series that doesn't have compatiblity. I just force pushed and reverted back to django-jsonfield, but bumped the version numbers

@frewsxcv frewsxcv force-pushed the patch-1 branch 2 times, most recently from 8a883c5 to f951eff Compare January 29, 2015 02:18
@@ -8,7 +8,7 @@
pass

tests_require = [
'Django>=1.2,<1.6',
'Django>=1.2,<1.8',
Copy link
Collaborator

Choose a reason for hiding this comment

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

Bump to >=1.4 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Preserves backwards compatiblity to Django 1.4
@mattrobenolt
Copy link
Collaborator

👍

mattrobenolt added a commit that referenced this pull request Jan 29, 2015
@mattrobenolt mattrobenolt merged commit d76a602 into disqus:master Jan 29, 2015
@frewsxcv frewsxcv deleted the patch-1 branch January 29, 2015 15:16
@frewsxcv frewsxcv mentioned this pull request Feb 3, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants