Add Django 3.1 support (django-cms#1201)

* lift the setup.py restrictions

* update files

* fix isort

* add further fixes

* update app helper

* fix docs

* fix last issues

* update docs :)

* Remove Python-2 legacy (django-cms#1178)

* remove all occurences of six

* remove all occurences of __future__

* also adopt for all unit tests

* remove six as external dependency

* fix isort complaints

* no need to inherit from ‘object’ in Python-3

* use Python-3 super() style

* further adaptions

* additional fixes fom comments

* fix tests

* fix isort

* I give up on the integration tests

* well fe tests can still be enabled :)

* move the comma to the comment

* add depth again

* fix 3.1 issue

* fix windowname_to_id

* updates

* compare in lowercase for certain dbs

* fixes docs?

* update polymorphic version

* update docs

* rename license file

Co-authored-by: Jacob Rief <[email protected]>

Author: FinalAngel

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 
 dist: xenial
-sudo: false
 
 matrix:
   include:
@@ -13,29 +12,33 @@ matrix:
       env: TOX_ENV='docs'
     - python: 3.6
       env: TOX_ENV='frontend'
-    # Django 1.11
-    - python: 3.4
-      env: DJANGO='dj111' SWAP='noswap'
+    # Django 2.2
     - python: 3.5
-      env: DJANGO='dj111' SWAP='noswap'
-    - python: 3.6
-      env: DJANGO='dj111' SWAP='noswap'
+      env: DJANGO='dj22' SWAP='swap'
     - python: 3.6
-      env: DJANGO='dj111' SWAP='swap'
-    # Django 2.2
-    - python: 3.7
       env: DJANGO='dj22' SWAP='noswap'
-    - python: 3.8
-      env: DJANGO='dj22' SWAP='swap'
-    # Django 3.0
     - python: 3.7
-      env: DJANGO='dj30' SWAP='noswap'
+      env: DJANGO='dj22' SWAP='swap'
     - python: 3.8
+      env: DJANGO='dj22' SWAP='noswap'
+    # Django 3.0, always run the lowest supported version
+    - python: 3.6
       env: DJANGO='dj30' SWAP='swap'
+    - python: 3.6
+      env: DJANGO='dj30' SWAP='noswap'
+    # Django 3.1, always run the lowest supported version
+    - python: 3.6
+      env: DJANGO='dj31' SWAP='swap'
+    - python: 3.6
+      env: DJANGO='dj31' SWAP='noswap'
+  allow_failures:
+    - python: 3.6
+      env: DJANGO='dj31' SWAP='swap'
+    - python: 3.6
+      env: DJANGO='dj31' SWAP='noswap'
 
 install:
   - pip install coverage isort tox
-  - "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"
@@ -44,6 +47,7 @@ install:
 
 before_script:
   - if [ $TOX_ENV == 'frontend' ]; then
+    pip install -r tests/requirements/frontend.txt;
     nvm install 0.12.7 && nvm use 0.12.7;
     npm config set spin false;
     npm install -g npm@2;

CHANGELOG.rst

@@ -2,9 +2,13 @@
 CHANGELOG
 =========
 
-Next Version
-============
 
+2.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
 * Changed the preferred way to do model registration via model inheritance
   and ``mptt.AlreadyRegistered``, which is deprecated since django-mptt 0.4
 

LICENSE.txt LICENSELICENSE.txt renamed to LICENSE

@@ -1,4 +1,4 @@
-include LICENSE.txt
+include LICENSE
 include README.rst
 recursive-include filer/locale *
 recursive-include filer/static *

MANIFEST.in

@@ -51,7 +51,7 @@ for all the details on how to install, configure and use django-filer.
 .. |coverage| image:: https://codecov.io/gh/divio/django-filer/branch/master/graph/badge.svg
     :target: https://codecov.io/gh/divio/django-filer
 
-.. |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/django-filer/
-.. |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/

README.rst

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from aldryn_client import forms
 
 

aldryn_config.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # django-filer documentation build configuration file, created by
 # sphinx-quickstart on Tue Nov 16 22:05:55 2010.
@@ -11,12 +10,13 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
-sys.path.append(os.path.abspath('../'))
 import datetime
+import os
+import sys
 
-from filer import __version__
+sys.path.append(os.path.abspath('../'))
 
+from filer import __version__
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

docs/conf.py

@@ -14,7 +14,7 @@ The easiest way to get ``django-filer`` is simply install it with `pip`_::
 Dependencies
 ------------
 
-* `Django`_ >= 1.11
+* `Django`_ >= 2.2
 * `django-mptt`_ >=0.6
 * `easy_thumbnails`_ >= 2.0
 * `django-polymorphic`_ >= 0.7
@@ -28,9 +28,9 @@ check `Pillow doc`_.
 
 `django-polymorphic`_ version depends on `Django`_ version:
 
-* for `Django`_ >=1.8,<1.11 use `django-polymorphic`_ 1.3.1
-* for `Django`_ >=1.11 use `django-polymorphic`_ >=2.0
+* for `Django`_ >=2.2 use `django-polymorphic`_ >=2.0
 * for `Django`_ >=3.0 use `django-polymorphic`_ >=2.1
+* for `Django`_ >=3.1 use `django-polymorphic`_ >=3.0
 
 Configuration
 -------------

docs/installation.rst

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 See PEP 386 (https://www.python.org/dev/peps/pep-0386/)
 

filer/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.contrib import admin
 
 from ..models import Clipboard, File, Folder, FolderPermission, ThumbnailOption