support Python3.10 over & Django4.2

Author: kashewnuts

.github/workflows/tests.yml

@@ -14,16 +14,16 @@ jobs:
     # 並列して実行する各ジョブのPythonバージョン
     strategy:
       matrix:
-        python-version: ['3.6', '3.9']
-        django-version: ['2.2', '3.2']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+        django-version: ['3.2', '4.2']
 
     steps:
     # ソースコードをチェックアウト
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     # ジョブのPython環境を設定
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 

.hgignore

@@ -1,6 +1,18 @@
 ChangeLog
 =========
 
+0.49 (2024-02-XX)
+===================
+
+Features:
+
+* Add Support Python3.10~3.12, Django4.2
+
+Incompatible Changes:
+
+* Drop Python3.6 & Django2.2
+* Migrate from django-jsonfield to models.JSONField
+
 0.48 (2022-04-11)
 ===================
 

CHANGES.rst

@@ -7,11 +7,10 @@
 Requirements
 ============
 
-* Python (3.6, 3.9)
-* Celery (4.2, 5.1, 5.2)
-* Django (2.2, 3.2)
+* Python (3.9, 3.10, 3.11, 3.12)
+* Celery (5.2, 5.3)
+* Django (3.2, 4.2)
 * six
-* django-jsonfield (1.0.1)
 
 Links
 =================

README.rst

@@ -3,11 +3,9 @@
 
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.db import models
 
-import jsonfield
-
 from beproud.django.notify.api import _get_media_map
 
 __all__ = (
@@ -42,7 +40,7 @@ class Notification(models.Model):
     notify_type = models.CharField(_('notify type'), max_length=100, db_index=True)
     media = models.CharField(_('media'), max_length=100, choices=MediaChoices(), db_index=True)
 
-    extra_data = jsonfield.JSONField(_('extra data'), null=True, blank=True)
+    extra_data = models.JSONField(_('extra data'), null=True, blank=True)
 
     ctime = models.DateTimeField(_('created'), auto_now_add=True, db_index=True)
 

beproud/django/notify/models.py

@@ -21,7 +21,7 @@ def read_file(filename):
     long_description=read_file('README.rst'),
     long_description_content_type="text/x-rst",
     url='https://github.com/beproud/bpnotify/',
-    python_requires='>=3.6',
+    python_requires='>=3.9',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Environment :: Plugins',
@@ -30,21 +30,22 @@ def read_file(filename):
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.2',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     include_package_data=True,
     packages=find_packages(),
     namespace_packages=['beproud', 'beproud.django'],
     test_suite='tests.main',
     install_requires=[
-        'Django>=2.2',
-        'django-jsonfield>=1.0.1',
-        'Celery>=4.2',
+        'Django>=3.2',
+        'Celery>=5.2',
         'six',
     ],
     zip_safe=False,

setup.py

@@ -1,30 +1,42 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-# celery5.2はPython3.7以降に対応しているため、Python3.6のテストではcelery 5.1までを使用する
-envlist = py36-django{22,32}-celery{42,51},py39-django{22,32}-celery{51,52}
+envlist = py{39,310,311,312}-dj{32,42}-celery{52,53}
+skipsdist = True
 
 [testenv]
 basepython =
-    py36: python3.6
     py39: python3.9
+    py310: python3.10
+    py311: python3.11
+    py312: python3.12
+
+[pytest]
+test_paths = tests test_*.py *_test.py
+python_paths = tests
+django_find_project = false
+DJANGO_SETTINGS_MODULE = test_settings
 
 deps =
+    pytest
+    pytest-django
+    pytest-pythonpath
     six
-    django22: Django~=2.2.12
-    django32: Django~=3.2.1
-    celery42: celery>=4.2,<4.3
-    celery51: celery>=5.0,<5.2
+    dj32: Django>=3.2,<4.0
+    dj42: Django>=4.2,<5.0
     celery52: celery>=5.2,<5.3
+    celery53: celery>=5.3,<5.4
 
-commands=python setup.py test
+commands=pytest {posargs}
 
 # tox-gh-actionsパッケージの設定
 [gh-actions]
 python =
-    3.6: py36
     3.9: py39
+    3.10: py310
+    3.11: py311
+    3.12: py312
 
 [gh-actions:env]
 DJANGO =
-    2.2: django22
     3.2: django32
+    4.2: django42