Permalink
Browse files

Get ready to adapt django 1.10

  • Loading branch information...
1 parent e7715de commit 749a57948a5cf59d31b1d4a1cec34f69b2b82bce @lqez lqez committed Feb 15, 2016
Showing with 16 additions and 7 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 CHANGES
  3. +0 −2 README.md
  4. +1 −1 django_summernote/__init__.py
  5. +7 −0 django_summernote/test_settings.py
  6. +2 −2 django_summernote/tests.py
  7. +1 −1 runtests.py
  8. +3 −1 tox.ini
View
@@ -29,6 +29,7 @@ nosetests.xml
test_media
.coveralls.yml
coverage.xml
+.python-version
# Translations
*.mo
View
@@ -1,3 +1,4 @@
+0.7.4 - Ready for Django 1.10
0.7.3 - Update summernote with 0.7.3
0.7.0 - Update summernote with 0.7.0
0.6.16 - Update summernote with 0.6.16 and fix compatibility issue for Django 1.9
View
@@ -155,8 +155,6 @@ You can also pass additional parameters to custom `Attachment` model by adding a
class SomeForm(forms.Form):
foo = forms.CharField(widget=SummernoteWidget(attrs={'data-user-id': 123456, 'data-device': 'iphone'}))
-(TODO) Document for addtional settings will be added, soon. :^D
-
AUTHOR
------
@@ -1,4 +1,4 @@
-version_info = (0, 7, 3)
+version_info = (0, 7, 4)
__version__ = version = '.'.join(map(str, version_info))
__project__ = PROJECT = 'django-summernote'
@@ -27,3 +27,10 @@
'django.contrib.staticfiles',
'django_summernote',
)
+
+TEMPLATES = [
+ {
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ 'APP_DIRS': True,
+ },
+]
@@ -130,7 +130,7 @@ def test_attachment_with_custom_storage(self):
from django_summernote.models import \
Attachment, _get_attachment_storage
- file_field = get_attachment_model()._meta.get_field_by_name('file')[0]
+ file_field = get_attachment_model()._meta.get_field('file')
original_storage = file_field.storage
file_field.storage = _get_attachment_storage()
@@ -170,7 +170,7 @@ def test_attachment_with_bad_storage(self):
# IOError with patching storage class
from django_summernote.models import Attachment
from dummyplug.storage import IOErrorStorage
- file_field = get_attachment_model()._meta.get_field_by_name('file')[0]
+ file_field = get_attachment_model()._meta.get_field('file')
original_storage = file_field.storage
file_field.storage = IOErrorStorage()
View
@@ -7,7 +7,7 @@
from django.test.utils import get_runner
from django.conf import settings
import django
-if django.get_version() >= '1.7':
+if django.VERSION >= (1, 7):
django.setup()
View
@@ -1,6 +1,7 @@
[tox]
envlist =
- py{27,34,35}-django{17,18,19},
+ {py27,py34}-{1.7,1.8},
+ {py27,py34,py35}-{1.9,master}
[testenv]
basepython =
@@ -13,5 +14,6 @@ deps =
django17: Django<1.8
django18: Django<1.9
django19: Django<2.0
@claudep
claudep Feb 15, 2016 Contributor

This should be Django<1.10.

@lqez
lqez Feb 15, 2016 Member

OMG, gotcha.

@lqez
lqez Feb 15, 2016 Member

Resolved by cff6148

+ master: https://github.com/django/django/archive/master.tar.gz
commands = coverage run -a setup.py test

0 comments on commit 749a579

Please sign in to comment.