support Python3.10 over & Django4.2

beproud · Feb 2, 2024 · 42bfb0f · 42bfb0f
1 parent 4c7694e
commit 42bfb0f
Show file tree

Hide file tree

Showing 21 changed files with 154 additions and 205 deletions.
diff --git a/.github/workflows/tests.yml b/.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 }}
 

diff --git a/.hgignore b/.hgignore
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -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)
 ===================
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,3 @@
-recursive-include beproud/django/notify/tests/templates *
 recursive-include beproud/django/notify/templates *
 recursive-include beproud/django/notify/fixtures *
 include README.rst

diff --git a/README.rst b/README.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
 =================

diff --git a/beproud/django/notify/models.py b/beproud/django/notify/models.py
@@ -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)
 

diff --git a/beproud/django/notify/tests/__init__.py b/beproud/django/notify/tests/__init__.py
diff --git a/setup.py b/setup.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,

diff --git a/tests.py b/tests.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/beproud/django/notify/tests/base.py → tests/base.py b/beproud/django/notify/tests/base.py → tests/base.py
diff --git a/test_settings.py → tests/settings.py b/test_settings.py → tests/settings.py
diff --git a/...ivate_msg/private_messages/mail_body.html → ...ivate_msg/private_messages/mail_body.html b/...ivate_msg/private_messages/mail_body.html → ...ivate_msg/private_messages/mail_body.html
diff --git a/...rivate_msg/private_messages/mail_body.txt → ...rivate_msg/private_messages/mail_body.txt b/...rivate_msg/private_messages/mail_body.txt → ...rivate_msg/private_messages/mail_body.txt
diff --git a/...ate_msg/private_messages/mail_subject.txt → ...ate_msg/private_messages/mail_subject.txt b/...ate_msg/private_messages/mail_subject.txt → ...ate_msg/private_messages/mail_subject.txt