Adapted test matrix, fixes #36 and #32 (#37)

* adapted tests

* added test for missing migrations

* fixed spacing

* added missing imports

* added missing migrations

* implemented #32

* adapted changelog

* adapted changelok [ci-skip]

* remove missplaced requirements file

* fix from comment [ci-skip]

Author: FinalAngel

.travis.yml

@@ -2,20 +2,29 @@ language: python
 
 sudo: false
 
-env:
-  - TOX_ENV=flake8
-  # 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
+matrix:
+  include:
+    - python: 3.5
+      env: TOX_ENV='flake8'
+    # Django 1.11
+    - python: 2.7
+      env: DJANGO='dj111' CMS='cms34'
+    - python: 3.5
+      env: DJANGO='dj111' CMS='cms35'
+    - python: 3.5
+      env: DJANGO='dj111' CMS='cms36'
+    # Django 2.0
+    - python: 3.5
+      env: DJANGO='dj20' CMS='cms36'
+    # Django 2.1
+    - python: 3.5
+      env: DJANGO='dj21' CMS='cms36'
 
 install:
   - pip install tox coverage
+  - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PY_VER=py27; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PY_VER=py35; fi"
+  - "if [[ ${DJANGO}z != 'z' ]]; then export TOX_ENV=$PY_VER-$DJANGO-$CMS; fi"
 
 script:
   - tox -e $TOX_ENV

CHANGELOG.rst

@@ -2,6 +2,15 @@
 Changelog
 =========
 
+2.1.1 (unreleased)
+==================
+
+* Fixed test matrix
+* Exclude ``tests`` folder from release build
+* Added missing migrations for Django 2.1
+* Added abstract models for ``File`` and ``Folder``
+* Improved readability of ``Folder.get_files``
+
 
 2.1.0 (2018-11-13)
 ==================

djangocms_file/migrations/0011_auto_20181211_0357.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.1.2 on 2018-12-11 03:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djangocms_file', '0010_removed_null_fields'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='file',
+            name='show_file_size',
+            field=models.BooleanField(blank=True, default=False, help_text='Appends the file size at the end of the name.', verbose_name='Show file size'),
+        ),
+        migrations.AlterField(
+            model_name='folder',
+            name='show_file_size',
+            field=models.BooleanField(blank=True, default=False, help_text='Appends the file size at the end of the name.', verbose_name='Show file size'),
+        ),
+    ]

djangocms_file/models.py

@@ -183,11 +183,9 @@ def copy_relations(self, oldinstance):
         self.folder_src = oldinstance.folder_src
 
     def get_files(self):
-        folder_files = []
-        if self.folder_src:
-            for folder in self.folder_src.files:
-                folder_files.append(folder)
-        return folder_files
+        if not self.folder_src:
+            return []
+        return list(self.folder_src.files)
 
 
 class File(AbstractFile):

setup.py

@@ -41,7 +41,7 @@
     url='https://github.com/divio/djangocms-file',
     license='BSD',
     long_description=open('README.rst').read(),
-    packages=find_packages(),
+    packages=find_packages(exclude=['tests']),
     include_package_data=True,
     zip_safe=False,
     install_requires=REQUIREMENTS,

requirements.txt renamed to tests/requirements.txt

@@ -1,5 +1,5 @@
 # requirements from setup.py
 # other requirements
-djangocms-helper>=0.9.2,<0.10
+djangocms-helper
 tox
 coverage

tests/settings.py

@@ -7,14 +7,14 @@
         'filer',
         'mptt',
     ],
-    'ALLOWED_HOSTS': ['localhost'],
     'CMS_LANGUAGES': {
         1: [{
             'code': 'en',
             'name': 'English',
         }]
     },
     'LANGUAGE_CODE': 'en',
+    'ALLOWED_HOSTS': ['localhost'],
 }
 
 

tests/tests_models.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 from django.test import TestCase
+from django.core.management import call_command
+from django.utils.six import StringIO
+
 from filer.models import File as FilerFile
 from filer.models import Folder as FilerFolder
 
@@ -34,3 +37,17 @@ def test_folder_instance(self):
         """Folder instance has been created"""
         test_folder = FilerFolder.objects.get(name='test')
         self.assertEqual(test_folder.name, 'test')
+
+
+class MigrationTestCase(TestCase):
+
+    def test_makemigrations(self):
+        """Fail if there are schema changes with no migrations."""
+        app_name = 'djangocms_file'
+        out = StringIO()
+        call_command('makemigrations', dry_run=True, no_input=True, stdout=out)
+        output = out.getvalue()
+        self.assertNotIn(app_name, output, (
+            '`makemigrations` thinks there are schema changes without'
+            ' migrations.'
+        ))

tox.ini

@@ -1,22 +1,21 @@
 [tox]
 envlist =
     flake8
-    py{27,34,35,36}-dj111-cms{34,35}
-    py{34,35,36}-dj20-cms{35,36,40}
-    py{35,36}-dj21-cms{35,36,40}
+    py{27,34,35,36}-dj111-cms{34,35,36}
+    py{34,35,36}-dj20-cms36
+    py{35,36}-dj21-cms36
 
 skip_missing_interpreters=True
 
-
 [testenv]
 deps =
-    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/tests/requirements.txt
     dj111: Django>=1.11,<2.0
     dj20: Django>=2.0,<2.1
     dj21: Django>=2.1,<2.2
     cms34: django-cms>=3.4,<3.5
     cms35: django-cms>=3.5,<3.6
-    cms40: https://github.com/divio/django-cms/archive/release/4.0.x.zip
+    cms36: https://github.com/divio/django-cms/archive/release/3.6.x.zip
 commands =
     {envpython} --version
     {env:COMMAND:coverage} erase