Add django 3.1 support (#47)

FinalAngel · web-flow · commit cc59a60a69d4 · 2020-09-02T10:11:36.000+02:00
* add django 3.1 support * ups * fixes #45 * update readme * fix warnings * fiyes * remove not supported version * needs to be py2 compatible for now
diff --git a/.travis.yml b/.travis.yml
@@ -1,41 +1,38 @@
 language: python
 
 dist: xenial
-sudo: false
 
 matrix:
   include:
     - python: 3.5
       env: TOX_ENV='flake8'
     - python: 3.5
       env: TOX_ENV='isort'
-      # Django 1.11
-    - python: 2.7
-      env: DJANGO='dj111' CMS='cms34'
-    - python: 3.4
-      env: DJANGO='dj111' CMS='cms35'
-    - python: 3.5
-      env: DJANGO='dj111' CMS='cms36'
-    - python: 3.6
-      env: DJANGO='dj111' CMS='cms37'
-    # Django 2.1
-    - python: 3.6
-      env: DJANGO='dj21' CMS='cms36'
-    - python: 3.6
-      env: DJANGO='dj21' CMS='cms37'
     # Django 2.2
+    - python: 3.5
+      env: DJANGO='dj22' CMS='cms37'
     - python: 3.6
       env: DJANGO='dj22' CMS='cms37'
     - python: 3.7
       env: DJANGO='dj22' CMS='cms37'
+    - python: 3.8
+      env: DJANGO='dj22' CMS='cms37'
+    # Django 3.0, always run the lowest supported version
+    - python: 3.6
+      env: DJANGO='dj30' CMS='cms37'
+    # Django 3.1, always run the lowest supported version
+    - python: 3.6
+      env: DJANGO='dj31' CMS='cms38'
+  allow_failures:
+    - python: 3.6
+      env: DJANGO='dj31' CMS='cms38'
 
 install:
   - pip install coverage isort tox
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PY_VER=py27; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PY_VER=py34; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PY_VER=py35; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PY_VER=py36; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then export PY_VER=py37; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.8' ]]; then export PY_VER=py38; fi"
   - "if [[ ${DJANGO}z != 'z' ]]; then export TOX_ENV=$PY_VER-$DJANGO-$CMS; fi"
 
 script:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,14 @@ Changelog
 =========
 
 
+3.0.0 (unreleased)
+==================
+
+* Added support for Django 3.1
+* Dropped support for Python 2.7 and Python 3.4
+* Dropped support for Django < 2.2
+
+
 2.4.0 (2020-01-29)
 ==================
 
diff --git a/README.rst b/README.rst
@@ -41,7 +41,7 @@ file for additional dependencies:
 
 |python| |django| |djangocms|
 
-* Django Filer 1.2.4 or higher
+* Django Filer 1.7 or higher
 
 Make sure `django-filer <http://django-filer.readthedocs.io/en/latest/installation.html>`_
 is installed and configured appropriately.
@@ -95,9 +95,9 @@ You can run tests by executing::
 .. |coverage| image:: https://codecov.io/gh/divio/djangocms-file/branch/master/graph/badge.svg
     :target: https://codecov.io/gh/divio/djangocms-file
 
-.. |python| image:: https://img.shields.io/badge/python-2.7%20%7C%203.4+-blue.svg
+.. |python| image:: https://img.shields.io/badge/python-3.5+-blue.svg
     :target: https://pypi.org/project/djangocms-file/
-.. |django| image:: https://img.shields.io/badge/django-1.11%20%7C%202.1%20%7C%202.2-blue.svg
+.. |django| image:: https://img.shields.io/badge/django-2.2,%203.0,%203.1-blue.svg
     :target: https://www.djangoproject.com/
-.. |djangocms| image:: https://img.shields.io/badge/django%20CMS-3.4%2B-blue.svg
+.. |djangocms| image:: https://img.shields.io/badge/django%20CMS-3.7%2B-blue.svg
     :target: https://www.django-cms.org/
diff --git a/aldryn_config.py b/aldryn_config.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from aldryn_client import forms
 
 
diff --git a/djangocms_file/__init__.py b/djangocms_file/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 __version__ = '2.4.0'
diff --git a/djangocms_file/cms_plugins.py b/djangocms_file/cms_plugins.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
@@ -58,7 +57,7 @@ class FolderPlugin(CMSPluginBase):
 
     def render(self, context, instance, placeholder):
         context['folder_files'] = instance.get_files()
-        return super(FolderPlugin, self).render(context, instance, placeholder)
+        return super().render(context, instance, placeholder)
 
     def get_render_template(self, context, instance, placeholder):
         return 'djangocms_file/{}/folder.html'.format(instance.template)
diff --git a/djangocms_file/migrations/0001_initial.py b/djangocms_file/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.db import migrations, models
 
diff --git a/djangocms_file/migrations/0002_auto_20151202_1551.py b/djangocms_file/migrations/0002_auto_20151202_1551.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/djangocms_file/migrations/0003_remove_related_name_for_cmsplugin_ptr.py b/djangocms_file/migrations/0003_remove_related_name_for_cmsplugin_ptr.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.db import migrations, models
 
diff --git a/djangocms_file/migrations/0004_set_related_name_for_cmsplugin_ptr.py b/djangocms_file/migrations/0004_set_related_name_for_cmsplugin_ptr.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.db import migrations, models
 
diff --git a/djangocms_file/migrations/0005_auto_20160119_1534.py b/djangocms_file/migrations/0005_auto_20160119_1534.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/djangocms_file/migrations/0006_migrate_to_filer.py b/djangocms_file/migrations/0006_migrate_to_filer.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.db import migrations, models
 
diff --git a/djangocms_file/migrations/0007_adapted_fields.py b/djangocms_file/migrations/0007_adapted_fields.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.db import migrations, models
 
diff --git a/djangocms_file/migrations/0008_add_folder.py b/djangocms_file/migrations/0008_add_folder.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.db import migrations, models
 
diff --git a/djangocms_file/migrations/0009_fixed_null_fields.py b/djangocms_file/migrations/0009_fixed_null_fields.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/djangocms_file/migrations/0010_removed_null_fields.py b/djangocms_file/migrations/0010_removed_null_fields.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/djangocms_file/migrations/0011_auto_20181211_0357.py b/djangocms_file/migrations/0011_auto_20181211_0357.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.db import migrations, models
 
 
diff --git a/djangocms_file/migrations/__init__.py b/djangocms_file/migrations/__init__.py
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff --git a/djangocms_file/models.py b/djangocms_file/models.py
@@ -1,21 +1,17 @@
-# -*- coding: utf-8 -*-
 """
 Enables the user to add a "File" plugin that displays a file wrapped by
 an <anchor> tag.
 """
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext
+from django.utils.translation import gettext_lazy as _
 
 from cms.models import CMSPlugin
 
 from djangocms_attributes_field.fields import AttributesField
 from filer.fields.file import FilerFileField
 from filer.fields.folder import FilerFolderField
-from six import python_2_unicode_compatible
 
 
 LINK_TARGET = (
@@ -39,7 +35,6 @@ def get_templates():
     return choices
 
 
-@python_2_unicode_compatible
 class AbstractFile(CMSPlugin):
     """
     Renders a file wrapped by an anchor
@@ -113,15 +108,14 @@ def get_short_description(self):
             return self.file_name
         if self.file_src and self.file_src.label:
             return self.file_src.label
-        return ugettext('<file is missing>')
+        return gettext('<file is missing>')
 
     def copy_relations(self, oldinstance):
         # Because we have a ForeignKey, it's required to copy over
         # the reference from the instance to the new plugin.
         self.file_src = oldinstance.file_src
 
 
-@python_2_unicode_compatible
 class AbstractFolder(CMSPlugin):
     """
     Renders a folder plugin to the selected tempalte
@@ -180,7 +174,7 @@ def __str__(self):
     def get_short_description(self):
         if self.folder_src and self.folder_src.name:
             return self.folder_src.name
-        return ugettext('<folder is missing>')
+        return gettext('<folder is missing>')
 
     def copy_relations(self, oldinstance):
         # Because we have a ForeignKey, it's required to copy over
diff --git a/setup.py b/setup.py
@@ -1,14 +1,13 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 from setuptools import find_packages, setup
 
 from djangocms_file import __version__
 
 
 REQUIREMENTS = [
-    'django-cms>=3.4.5',
-    'django-filer>=1.2.4',
-    'djangocms-attributes-field>=0.4.0',
+    'django-cms>=3.7',
+    'django-filer>=1.7',
+    'djangocms-attributes-field>=1',
 ]
 
 
@@ -19,22 +18,18 @@
     'License :: OSI Approved :: BSD License',
     'Operating System :: OS Independent',
     'Programming Language :: Python',
-    'Programming Language :: Python :: 2',
-    'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
     'Framework :: Django',
-    'Framework :: Django :: 1.11',
-    'Framework :: Django :: 2.1',
     'Framework :: Django :: 2.2',
+    'Framework :: Django :: 3.0',
+    'Framework :: Django :: 3.1',
     'Framework :: Django CMS',
-    'Framework :: Django CMS :: 3.4',
-    'Framework :: Django CMS :: 3.5',
-    'Framework :: Django CMS :: 3.6',
     'Framework :: Django CMS :: 3.7',
+    'Framework :: Django CMS :: 3.8',
     'Topic :: Internet :: WWW/HTTP',
     'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     'Topic :: Software Development',
@@ -48,10 +43,10 @@
     author='Divio AG',
     author_email='info@divio.ch',
     url='https://github.com/divio/djangocms-file',
-    license='BSD',
+    license='BSD-3-Clause',
     description='Adds file plugin to django CMS',
     long_description=open('README.rst').read(),
-    packages=find_packages(exclude=['tests']),
+    packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
     install_requires=REQUIREMENTS,
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff --git a/tests/settings.py b/tests/settings.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 HELPER_SETTINGS = {
     'INSTALLED_APPS': [
         'easy_thumbnails',
diff --git a/tests/test_migrations.py b/tests/test_migrations.py
@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
 # original from
 # http://tech.octopus.energy/news/2016/01/21/testing-for-missing-migrations-in-django.html
+from io import StringIO
+
 from django.core.management import call_command
 from django.test import TestCase, override_settings
-from django.utils.six import text_type
-from django.utils.six.moves import StringIO
 
 
 class MigrationTestCase(TestCase):
@@ -22,7 +21,7 @@ def test_for_missing_migrations(self):
         try:
             call_command('makemigrations', **options)
         except SystemExit as e:
-            status_code = text_type(e)
+            status_code = str(e)
         else:
             # the "no changes" exit code is 0
             status_code = '0'
diff --git a/tests/test_models.py b/tests/test_models.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.conf import settings
 from django.test import TestCase
 
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from cms.api import add_plugin, create_page
 from cms.test_utils.testcases import CMSTestCase
 
diff --git a/tox.ini b/tox.ini
@@ -2,9 +2,9 @@
 envlist =
     flake8
     isort
-    py{27,34,35,36}-dj111-cms{34,35,36}
-    py{27,35,36}-dj111-cms37
-    py{35,36,37}-dj{21,22}-cms{36,37}
+    py{35,36,37,38}-dj{22}-cms{37,38}
+    py{36,37,38}-dj{30}-cms{37,38}
+    py{36,37,38}-dj{31}-cms{38}
 
 skip_missing_interpreters=True
 
@@ -40,14 +40,11 @@ known_django = django
 [testenv]
 deps =
     -r{toxinidir}/tests/requirements.txt
-    dj111: Django>=1.11,<2.0
-    dj111: django-formtools>=2.0,<2.1
-    dj21: Django>=2.1,<2.2
     dj22: Django>=2.2,<3.0
-    cms34: django-cms>=3.4,<3.5
-    cms35: django-cms>=3.5,<3.6
-    cms36: django-cms>=3.6,<3.7
+    dj30: Django>=3.0,<3.1
+    dj31: Django>=3.1,<3.2
     cms37: django-cms>=3.7,<3.8
+    cms38: django-cms>=3.8,<3.9
 commands =
     {envpython} --version
     {env:COMMAND:coverage} erase

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`	`1`	`from aldryn_client import forms`
`3`	`2`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-# -- coding: utf-8 --`
`2`	`1`	`__version__ = '2.4.0'`