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 Python3.10 over & Django4.2 #15

Merged
merged 5 commits into from
Feb 7, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
19 changes: 0 additions & 19 deletions .hgignore

This file was deleted.

12 changes: 12 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -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)
===================

Expand Down
7 changes: 3 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
=================
Expand Down
6 changes: 2 additions & 4 deletions beproud/django/notify/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 _
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

django.utils.translation.ugettext() はDjango4.0で削除 https://docs.djangoproject.com/en/5.0/releases/4.0/#features-removed-in-4-0

from django.db import models

import jsonfield

from beproud.django.notify.api import _get_media_map

__all__ = (
Expand Down Expand Up @@ -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)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Django標準のものを使うようにするので置き換え https://docs.djangoproject.com/en/5.0/ref/models/fields/#django.db.models.JSONField

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MEMO: 旧バージョンのbpnotify使ってたプロジェクトの場合は、自プロジェクトでマイグレーションが必要


ctime = models.DateTimeField(_('created'), auto_now_add=True, db_index=True)

Expand Down
Loading