diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3aae6e9..0acc5fb 100644 --- a/.github/workflows/test.yml +++ b/.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'] steps: - uses: actions/checkout@v3 diff --git a/eav/migrations/0003_auto_20210404_2209.py b/eav/migrations/0003_auto_20210404_2209.py index 7c59583..e3a1591 100644 --- a/eav/migrations/0003_auto_20210404_2209.py +++ b/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 = [ diff --git a/eav/models.py b/eav/models.py index 6a990f2..41c6b54 100644 --- a/eav/models.py +++ b/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, diff --git a/pyproject.toml b/pyproject.toml index 689445c..696f428 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,15 +49,13 @@ classifiers = [ "Topic :: Database", "Topic :: Software Development :: Libraries :: Python Modules", "Framework :: Django", - "Framework :: Django :: 2.2", "Framework :: Django :: 3.2", "Framework :: Django :: 4.0", ] [tool.poetry.dependencies] -python = "^3.7" -django = ">=2.2, <4.1" -django-jsonfield-backport = "^1.0.4" +python = "^3.8" +django = ">=3.2, <4.1" # Docs extra: sphinx = { version = "^5.0", optional = true }