diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index b9e443a..0000000 --- a/pyproject.toml +++ /dev/null @@ -1,37 +0,0 @@ -[build-system] -requires = ["setuptools>=61.0.0", "wheel"] -build-backend = "setuptools.build_meta" - -[project] -name = "bpnotify" -version = "0.48" -authors = [ - { name="BeProud Inc.", email="project@beproud.jp" }, -] -description = "Notification routing for Django" -readme = "README.rst" -requires-python = ">=3.9" -keywords=["django"] -classifiers = [ - "Development Status :: 3 - Alpha", - "License :: OSI Approved :: BSD License", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Framework :: Django", - "Framework :: Django :: 3.2", - "Framework :: Django :: 4.2", - "Intended Audience :: Developers", - "Environment :: Plugins", - "Topic :: Software Development :: Libraries :: Python Modules", -] -dependencies = ["Django>=3.2", "six", "Celery"] - -[project.urls] -Homepage = "https://github.com/beproud/bpnotify/" - -[tool.setuptools.packages.find] -where = ["."] diff --git a/setup.py b/setup.py index 7bfab3c..3402eb8 100644 --- a/setup.py +++ b/setup.py @@ -14,14 +14,14 @@ def read_file(filename): setup( name='bpnotify', - version='0.48', + version='0.49', description='Notification routing for Django', author='BeProud', author_email='project@beproud.jp', 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,11 +30,13 @@ 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, @@ -42,9 +44,8 @@ def read_file(filename): 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/test_settings.py b/test_settings.py index 47da56d..cbbf09c 100644 --- a/test_settings.py +++ b/test_settings.py @@ -1,9 +1,6 @@ # Django3では、標準のdjango.conf.global_settingsの定数をオーバーライドすると例外が発生する場合がある。 # https://github.com/django/django/blob/70035fb0444ae7c01613374212ca5e3c27c9782c/django/conf/__init__.py#L188 # そのため、testではdjango.conf.global_settingsを直接利用せず、このtest用settings定数を使用する。 - -import os - SECRET_KEY = "SECRET" INSTALLED_APPS = ( 'django.contrib.auth', @@ -24,6 +21,8 @@ } } +import os + BASE_PATH = os.path.dirname(__file__) TEMPLATES = [ diff --git a/tox.ini b/tox.ini index 887fe0d..3891b34 100644 --- a/tox.ini +++ b/tox.ini @@ -3,11 +3,6 @@ envlist = py{39,310,311}-dj{32,42}-celery{52,53},py312-dj42-celery53 skipsdist = True -[pytest] -python_files = tests test_*.py *_tests.py -django_find_project = false -DJANGO_SETTINGS_MODULE = beproud.django.notify.tests.settings - [testenv] basepython = py39: python3.9 @@ -24,7 +19,6 @@ deps = dj42: Django>=4.2,<5.0 celery52: celery>=5.2,<5.3 celery53: celery>=5.3,<5.4 -# commands=pytest {posargs} commands=python setup.py test # tox-gh-actionsパッケージの設定