Merge pull request #323 from Dresdn/Dresdn/issue-322

Support Django 4.1

.github/workflows/test.yml

@@ -7,13 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        django-version: ['2.2', '3.2', '4.0']
-        exclude:
-          - python-version: '3.10'
-            django-version: '2.2'
-          - python-version: '3.7'
-            django-version: '4.0'
+        python-version: ['3.8', '3.9', '3.10']
+        django-version: ['3.2', '4.0', '4.1']
 
     steps:
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -6,11 +6,17 @@ We follow [Semantic Versions](https://semver.org/) starting at the `0.14.0` rele
 
 ### Features
 
+- Add support for Django 4.1
+
 ### Bug Fixes
 
 - Fixes missing `Add another` button for inlines in `BaseEntityAdmin`
 - Fixes saving of Attribute date types rendering using `BaseDynamicEntityForm` [#261](https://github.com/jazzband/django-eav2/issues/261)
 
+### Misc
+
+- Drops support for Django 2.2 and Python 3.7
+
 ## 1.2.3 (2022-08-15)
 
 ### Bug Fixes

eav/migrations/0003_auto_20210404_2209.py

@@ -2,14 +2,10 @@
 
 import django.core.serializers.json
 from django.db import migrations
+from django.db.models import JSONField
 
 import eav.fields
 
-try:
-    from django.db.models import JSONField
-except ImportError:
-    from django_jsonfield_backport.models import JSONField
-
 
 class Migration(migrations.Migration):
     dependencies = [

eav/models.py

@@ -42,10 +42,6 @@ try:
 except ImportError:
     from typing_extensions import Final
 
-try:
-    from django.db.models import JSONField
-except ImportError:
-    from django_jsonfield_backport.models import JSONField
 
 CHARFIELD_LENGTH: Final = 100
 
@@ -526,7 +522,7 @@ class Value(models.Model):  # noqa: WPS110
         verbose_name=_('Value text'),
     )
 
-    value_json = JSONField(
+    value_json = models.JSONField(
         default=dict,
         encoder=DjangoJSONEncoder,
         blank=True,

pyproject.toml

@@ -49,15 +49,14 @@ classifiers = [
   "Topic :: Database",
   "Topic :: Software Development :: Libraries :: Python Modules",
   "Framework :: Django",
-  "Framework :: Django :: 2.2",
   "Framework :: Django :: 3.2",
   "Framework :: Django :: 4.0",
+  "Framework :: Django :: 4.1",
 ]
 
 [tool.poetry.dependencies]
-python = "^3.7"
-django = ">=2.2, <4.1"
-django-jsonfield-backport = "^1.0.4"
+python = "^3.8"
+django = ">=3.2, <4.2"
 
 # Docs extra:
 sphinx = { version = "^5.0", optional = true }

test_project/settings.py

@@ -26,7 +26,6 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django_jsonfield_backport',
     # Test Project:
     'test_project.apps.TestAppConfig',
     # Our app: