Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Django 4.1 #323

Merged
merged 5 commits into from
Feb 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions eav/migrations/0003_auto_20210404_2209.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
6 changes: 1 addition & 5 deletions eav/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
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

Expand Down Expand Up @@ -526,7 +522,7 @@ class Meta:
verbose_name=_('Value text'),
)

value_json = JSONField(
value_json = models.JSONField(
default=dict,
encoder=DjangoJSONEncoder,
blank=True,
Expand Down
1,105 changes: 571 additions & 534 deletions poetry.lock

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
1 change: 0 additions & 1 deletion test_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'django_jsonfield_backport',
# Test Project:
'test_project.apps.TestAppConfig',
# Our app:
Expand Down