Version 2.1.2 (#1259)

* extend testing matrix to Python-3.10 with Django-3.2 * make user and group autocomplete fields * Bump to version 2.1.2 * deactive python-3.10 for now * filter tox by gh-actions * set SECRET_KEY for testing * fix JS style checking complains * try quoting Python-3.10 * move SECRET_KEY into HELPER_SETTINGS * Remove Python-3.10 from matrix; lxml2 don’t work Co-authored-by: Jacob Rief <[email protected]>
django-cms · Nov 9, 2021 · 716f588 · 716f588
1 parent f623448
commit 716f588
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,11 +8,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.6, 3.7, 3.8, 3.9, ]
+        python-version: [ 3.6, 3.7, 3.8, 3.9 ]
         requirements-file: [
           django-2.2.txt,
           django-3.0.txt,
-          django-3.1.txt
+          django-3.1.txt,
+          django-3.2.txt
         ]
         os: [
           ubuntu-20.04,

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,13 @@ CHANGELOG
 =========
 
 
+2.1.2 (2021-11-09)
+==================
+
+* In Folder permissions, make user and group autocomplete fields.
+* Extent testing matrix to Python-3.10.
+
+
 2.1.1 (2021-11-03)
 ==================
 

diff --git a/filer/__init__.py b/filer/__init__.py
@@ -14,6 +14,6 @@
 10. twine upload dist/django-filer-{new version}.tar.gz
 """
 
-__version__ = '2.1.1'
+__version__ = '2.1.2'
 
 default_app_config = 'filer.apps.FilerConfig'
diff --git a/filer/admin/permissionadmin.py b/filer/admin/permissionadmin.py
@@ -13,6 +13,7 @@ class PermissionAdmin(admin.ModelAdmin):
     list_filter = ['group']
     list_display = ['__str__', 'folder', 'user']
     search_fields = ['user__username', 'group__name', 'folder__name']
+    autocomplete_fields = ['user', 'group']
 
     def get_queryset(self, request):
         qs = super(PermissionAdmin, self).get_queryset(request)

diff --git a/filer/static/filer/js/addons/dropzone.init.js b/filer/static/filer/js/addons/dropzone.init.js
@@ -131,7 +131,7 @@ djQuery(function ($) {
                 });
             },
             error: function (file, msg, response) {
-                if(response && response.error){
+                if (response && response.error) {
                     msg += ' ; ' + response.error;
                 }
                 showError(file.name + ': ' + msg);

diff --git a/setup.py b/setup.py
@@ -24,14 +24,18 @@
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
     'Framework :: Django',
     'Framework :: Django :: 2.2',
     'Framework :: Django :: 3.0',
     'Framework :: Django :: 3.1',
+    'Framework :: Django :: 3.2',
     'Framework :: Django CMS',
     'Framework :: Django CMS :: 3.6',
     'Framework :: Django CMS :: 3.7',
     'Framework :: Django CMS :: 3.8',
+    'Framework :: Django CMS :: 3.9',
     'Topic :: Internet :: WWW/HTTP',
     'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     'Topic :: Software Development',
@@ -53,6 +57,7 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=REQUIREMENTS,
+    python_requires='>=3.6',
     classifiers=CLASSIFIERS,
     test_suite='tests.settings.run',
 )
diff --git a/tests/requirements/django-3.2.txt b/tests/requirements/django-3.2.txt
@@ -0,0 +1,5 @@
+-r base.txt
+
+django>=3.2,<4
+django-mptt>=0.9.1
+django_polymorphic>=2,<3.1
diff --git a/tests/settings.py b/tests/settings.py
@@ -53,6 +53,7 @@
     'FILE_UPLOAD_TEMP_DIR': mkdtemp(),
     'TEMPLATE_DIRS': (os.path.join(BASE_DIR, 'django-filer', 'filer', 'utils', 'templates'),),
     'FILER_CANONICAL_URL': 'test-path/',
+    'SECRET_KEY': '__secret__',
 }
 if os.environ.get('CUSTOM_IMAGE', False):
     HELPER_SETTINGS['FILER_IMAGE_MODEL'] = os.environ.get('CUSTOM_IMAGE')

diff --git a/tox.ini b/tox.ini
@@ -6,8 +6,18 @@ envlist =
     frontend
     py{36,37,38}-dj{22}-swap
     py{36,37,38}-dj{22}-noswap
-    py{36,37,38}-dj{30,31}-swap
-    py{36,37,38}-dj{30,31}-noswap
+    py{36,37,38,39}-dj{30,31}-swap
+    py{36,37,38,39}-dj{30,31}-noswap
+    py{36,37,38,39,310}-dj32-swap
+    py{36,37,38,39,310}-dj32-noswap
+
+[gh-actions]
+python =
+    3.6: py36
+    3.7: py37
+    3.8: py38
+    3.9: py39
+    3.10: py310
 
 skip_missing_interpreters=True
 
@@ -45,6 +55,7 @@ deps =
     dj22: -r tests/requirements/django-2.2.txt
     dj30: -r tests/requirements/django-3.0.txt
     dj31: -r tests/requirements/django-3.1.txt
+    dj32: -r tests/requirements/django-3.2.txt
 commands =
     {envpython} --version
     {env:COMMAND:coverage} erase