Merge pull request #34 from vThaian/add-support-for-django20-21

Add support for newer Django versions

Author: vthaian

.travis.yml

@@ -4,8 +4,6 @@ sudo: false
 
 env:
   - TOX_ENV=flake8
-  - TOX_ENV=py27-latest
-  - TOX_ENV=py34-latest
   # Django 1.8
   - TOX_ENV=py27-dj18-cms34
   - TOX_ENV=py27-dj18-cms33
@@ -16,6 +14,18 @@ env:
   - TOX_ENV=py27-dj19-cms33
   - TOX_ENV=py34-dj19-cms34
   - TOX_ENV=py34-dj19-cms33
+  # Django 1.10
+  - TOX_ENV=py27-dj110-cms35
+  - TOX_ENV=py35-dj110-cms35
+  # Django 1.11
+  - TOX_ENV=py27-dj111-cms35
+  - TOX_ENV=py35-dj111-cms35
+  # Django 2.0
+  - TOX_ENV=py35-dj20-cms35
+  - TOX_ENV=py35-dj20-cms40
+  # Django 2.1
+  - TOX_ENV=py35-dj21-cms35
+  - TOX_ENV=py35-dj21-cms40
 
 install:
   - pip install tox coverage

README.rst

@@ -85,7 +85,7 @@ You can run tests by executing:
 
     virtualenv env
     source env/bin/activate
-    pip install -r tests/requirements.txt
+    pip install -r test_requirements/base.txt
     python setup.py test
 
 

djangocms_file/cms_plugins.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
-from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
-
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
+from django.utils.translation import ugettext_lazy as _
 
 from .models import File, Folder
 

djangocms_file/migrations/0001_initial.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 import cms.models.pluginmodel
+import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -15,7 +16,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='File',
             fields=[
-                ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)),
+                ('cmsplugin_ptr', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)),
                 ('file', models.FileField(verbose_name='file', upload_to=cms.models.pluginmodel.get_plugin_media_path)),
                 ('title', models.CharField(verbose_name='title', blank=True, null=True, max_length=255)),
                 ('target', models.CharField(verbose_name='target', blank=True, default='', max_length=100, choices=[('', 'same window'), ('_blank', 'new window'), ('_parent', 'parent window'), ('_top', 'topmost frame')])),

djangocms_file/migrations/0002_auto_20151202_1551.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

djangocms_file/migrations/0003_remove_related_name_for_cmsplugin_ptr.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

djangocms_file/migrations/0004_set_related_name_for_cmsplugin_ptr.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

djangocms_file/migrations/0006_migrate_to_filer.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import filer.fields.file
 import django.db.models.deletion
+import filer.fields.file
+from django.db import migrations, models
 
 
 def migrate_to_filer(apps, schema_editor):

djangocms_file/migrations/0007_adapted_fields.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
-import filer.fields.file
 import djangocms_attributes_field.fields
+import filer.fields.file
+from django.db import migrations, models
+
 from djangocms_file.models import get_templates
 
 

djangocms_file/migrations/0008_add_folder.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
-import filer.fields.folder
 import djangocms_attributes_field.fields
+import filer.fields.folder
+from django.db import migrations, models
+
 from djangocms_file.models import get_templates
 
 
@@ -24,7 +25,7 @@ class Migration(migrations.Migration):
                 ('link_target', models.CharField(default='', max_length=255, verbose_name='Link target', blank=True, choices=[('_self', 'Open in same window'), ('_blank', 'Open in new window'), ('_parent', 'Delegate to parent'), ('_top', 'Delegate to top')])),
                 ('show_file_size', models.BooleanField(default=False, help_text='Appends the file size at the end of the name.', verbose_name='Show file size')),
                 ('attributes', djangocms_attributes_field.fields.AttributesField(default=dict, verbose_name='Attributes', blank=True)),
-                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, related_name='djangocms_file_folder', primary_key=True, serialize=False, to='cms.CMSPlugin')),
+                ('cmsplugin_ptr', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, parent_link=True, related_name='djangocms_file_folder', primary_key=True, serialize=False, to='cms.CMSPlugin')),
                 ('folder_src', filer.fields.folder.FilerFolderField(related_name='+', on_delete=django.db.models.deletion.SET_NULL, verbose_name='Folder', to='filer.Folder', null=True)),
             ],
             options={