Drop old Python and Django versions (#220)

* drop old python and django versions

* fix tests

* remove compat module entirely

Co-authored-by: Fabio Caccamo <[email protected]>

Author: merwok

.github/workflows/test-package.yml

@@ -19,9 +19,6 @@ jobs:
         id: create_matrix
         with:
           matrix: |
-            python-version {2.7}, django-version {1.8,1.9,1.10,1.11}, database {sqlite,postgres}
-            python-version {3.6}, django-version {1.8,1.9,1.10,1.11,2.0,2.1,2.2,3.0,3.1,3.2}, database {sqlite,postgres}
-            python-version {3.7}, django-version {2.0,2.1,2.2,3.0,3.1,3.2}, database {sqlite,postgres}
             python-version {3.8}, django-version {2.2,3.0,3.1,3.2}, database {sqlite,postgres}
             python-version {3.9}, django-version {2.2,3.0,3.1,3.2}, database {sqlite,postgres}
             python-version {3.10}, django-version {3.2,4.0,4.1}, database {sqlite,postgres}

README.md

@@ -47,20 +47,17 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 
 ## Installation
 - Run `pip install django-admin-interface`
-- Add `admin_interface`, `flat_responsive`, `flat` and `colorfield` to `settings.INSTALLED_APPS` **before** `django.contrib.admin`
+- Add `admin_interface` and `colorfield` to `settings.INSTALLED_APPS` **before** `django.contrib.admin`
 ```python
 INSTALLED_APPS = (
     #...
     "admin_interface",
-    "flat_responsive", # only if django version < 2.0
-    "flat", # only if django version < 1.9
     "colorfield",
     #...
     "django.contrib.admin",
     #...
 )
 
-# only if django version >= 3.0
 X_FRAME_OPTIONS = "SAMEORIGIN"
 SILENCED_SYSTEM_CHECKS = ["security.W019"]
 ```

admin_interface/admin.py

@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
-
 from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
 
-from admin_interface.compat import gettext_lazy as _
 from admin_interface.models import Theme
 
 

admin_interface/apps.py

@@ -1,9 +1,6 @@
-# -*- coding: utf-8 -*-
-
 from django.apps import AppConfig
 from django.db.models.signals import post_migrate
-
-from admin_interface.compat import gettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AdminInterfaceConfig(AppConfig):

admin_interface/cache.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.conf import settings
 from django.core.cache import cache, caches
 

admin_interface/compat.py

@@ -2,10 +2,9 @@
 
 from __future__ import unicode_literals
 
+from django.core.validators import FileExtensionValidator
 from django.db import migrations, models
 
-from admin_interface.compat import FileExtensionValidator
-
 
 class Migration(migrations.Migration):
 

admin_interface/migrations/0021_file_extension_validator.py

@@ -1,18 +1,13 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 from colorfield.fields import ColorField
+from django.core.validators import FileExtensionValidator
 from django.db import models
 from django.db.models.signals import post_delete, post_save, pre_save
-from six import python_2_unicode_compatible
+from django.utils.encoding import force_str
+from django.utils.translation import gettext_lazy as _
 
-from admin_interface.cache import del_cached_active_theme
-from admin_interface.compat import FileExtensionValidator, force_str
-from admin_interface.compat import gettext_lazy as _
+from .cache import del_cached_active_theme
 
 
-@python_2_unicode_compatible
 class Theme(models.Model):
     @staticmethod
     def post_migrate_handler(**kwargs):

admin_interface/models.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import django
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
@@ -29,5 +27,3 @@ def check_installed_app(app, max_dj_version=None):
 
 def check_installed_apps():
     check_installed_app("colorfield")
-    check_installed_app("flat", max_dj_version=(1, 9))
-    check_installed_app("flat_responsive", max_dj_version=(2, 0))

admin_interface/settings.py

@@ -42,11 +42,7 @@
             if (typeof(openerRef.dismissAddRelatedObjectPopup) === 'function') {
                 openerRef.dismissAddRelatedObjectPopup(windowRef, initData.value, initData.obj);
             }
-            else if (typeof(openerRef.dismissAddAnotherPopup) === 'function') {
-                // django 1.7 compatibility
-                openerRef.dismissAddAnotherPopup(windowRef, initData.value, initData.obj);
-            }
             break;
     }
 
-})();
+})();