setup.pyからpyproject.tomlへ移行し、Python 3.12~3.14とDjango 5.2をサポート

kashewnuts · claude · kashewnuts · commit 177c0c899b8d · 2026-02-06T15:12:42.000+09:00
- setup.py/setup.cfgを削除し、pyproject.tomlへ移行
- tox.iniをpyproject.tomlのlegacy_tox_iniへ移植
- Python 3.12, 3.13, 3.14サポート追加
- Django 5.2サポート追加
- Python 3.8, 3.9サポート終了
- Django 3.2, 4.1, 5.1サポート終了
- namespace packageをpkg_resourcesから暗黙的namespace packageに変更
- CI設定をPython/Djangoの新マトリクスに更新
- ChangeLog.rst, checklist.rstを更新

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,27 +10,32 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
-        django-version: ['3.2', '4.1', '4.2']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
+        django-version: ['4.2', '5.2']
+        exclude:
+          - python-version: '3.13'
+            django-version: '4.2'
+          - python-version: '3.14'
+            django-version: '4.2'
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Get pip cache dir
       id: pip-cache
       run: |
-        echo "::set-output name=dir::$(pip cache dir)"
+        echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
     - name: Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v5
       with:
         path: ${{ steps.pip-cache.outputs.dir }}
         key:
-          ${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}-${{ hashFiles('**/tox.ini') }}
+          ${{ matrix.python-version }}-v1-${{ hashFiles('**/pyproject.toml') }}
         restore-keys: |
           ${{ matrix.python-version }}-v1-
     - name: Install dependencies
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -4,6 +4,11 @@ ChangeLog
 
 Release 0.43 (Unreleased)
 ==========================
+- Support Python-3.12, 3.13, 3.14
+- Support Django-4.2, 5.2
+- Drop Python-3.8, 3.9
+- Drop Django-3.2, 4.1, 5.1
+- Migrate packaging from setup.py to pyproject.toml
 
 Release 0.42 (2023-01-24)
 ==========================
diff --git a/README.rst b/README.rst
@@ -12,8 +12,8 @@ Run tests using tox::
 
 Supports
 ========
-- Python: 3.6, 3.7, 3.8, 3.9, 3.10
-- Django: 2.2, 3.2
+- Python: 3.10, 3.11, 3.12, 3.13, 3.14
+- Django: 4.2, 5.2
 
 Links
 =====
diff --git a/beproud/__init__.py b/beproud/__init__.py
@@ -1,7 +0,0 @@
-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = locals()['__path__'] # make PyFlakes happy
-    __path__ = extend_path(__path__, __name__)
diff --git a/beproud/django/__init__.py b/beproud/django/__init__.py
@@ -1,7 +0,0 @@
-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = locals()['__path__'] # make PyFlakes happy
-    __path__ = extend_path(__path__, __name__)
diff --git a/beproud/django/commons/test/simple.py b/beproud/django/commons/test/simple.py
@@ -26,7 +26,7 @@ def __str__(self):
 class RequestTestCase(TestCase):
 
     def assertStatus(self, response, status=200):
-        self.assertEquals(response.status_code, status)
+        self.assertEqual(response.status_code, status)
 
     def assertOk(self, response):
         self.assertStatus(response)
@@ -70,12 +70,12 @@ def assertNotFound(self, response):
         self.assertStatus(response, 404)
 
     def assertNotAllowed(self, response, allow=None):
-        self.assertEquals(response.status_code, 405)
+        self.assertEqual(response.status_code, 405)
         if allow is not None:
-            self.assertEquals(response["Allow"], allow)
+            self.assertEqual(response["Allow"], allow)
 
     def assertGone(self, response):
-        self.assertEquals(response.status_code, 410)
+        self.assertEqual(response.status_code, 410)
 
     def assertHtml(self, response):
         self.assertContains(response, "<html")  # open tag
@@ -103,7 +103,7 @@ def _assertLocationHeader(self, response, redirect_url=None):
         if redirect_url is None:
             self.assertTrue(response.get("Location", None) is not None)
         else:
-            self.assertEquals(response.get("Location", None), redirect_url)
+            self.assertEqual(response.get("Location", None), redirect_url)
 
 
 class BaseURLTestCase(type):
diff --git a/checklist.rst b/checklist.rst
@@ -4,12 +4,15 @@ Procedure:
 
 1. check CI status testing result: https://github.com/beproud/bpcommons/actions
 2. update release version/date in ``ChangeLog.rst``
-3. run ``python setup.py release sdist bdist_wheel``
-4. check ``twine check dist/*``
-5. upload ``twine upload dist/*``
-6. tagging version e.g. ``git tag v0.40``.
-7. check PyPI page: https://pypi.org/p/beproud.django.commons/
-8. bump versions and commit/push them onto GitHub
+3. run ``python -m build .``
+4. check ``twine check --strict dist/*``
+5. upload testpypi ``twine upload --repository testpypi dist/*``
+6. check description, and uploaded build package.
+7. upload ``twine upload dist/*``
+8. tagging version e.g. ``git tag v0.40``.
+9. check PyPI page: https://pypi.org/p/beproud.django.commons/
+10. bump versions and commit/push them onto GitHub
 
    * ``ChangeLog.rst``  next version
-   * ``bpcommons/beproud/django/commons/__init__.py`` next version
+   * ``beproud/django/commons/__init__.py`` next version
+   * ``pyproject.toml`` next version
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,70 @@
+[build-system]
+requires = ["setuptools>=77.0.3", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "beproud.django.commons"
+version = "0.43"
+description = "Common utilities for Django"
+readme = "README.rst"
+authors = [
+    { name = "BeProud Inc.", email = "project@beproud.jp" },
+]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Environment :: Plugins",
+    "Framework :: Django",
+    "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.2",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+dependencies = [
+    "Django>=4.2", "six",
+]
+
+[project.urls]
+Homepage = "http://www.beproud.jp/"
+
+[tool.setuptools.packages.find]
+where = ["."]
+
+[tool.tox]
+legacy_tox_ini = """
+[tox]
+envlist = py{310,311,312}-dj{42,52},py{313,314}-dj52
+
+[testenv]
+deps =
+    pytest
+    pytest-django
+    factory-boy
+    six
+    BeautifulSoup4==4.10.0
+    dj42: Django>=4.2,<5.0
+    dj52: Django>=5.2,<6.0
+
+commands=pytest tests {posargs}
+
+[gh-actions]
+python =
+    3.10: py310
+    3.11: py311
+    3.12: py312
+    3.13: py313
+    3.14: py314
+
+[gh-actions:env]
+DJANGO =
+    4.2: dj42
+    5.2: dj52
+"""
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/tests/test_models_fields.py b/tests/test_models_fields.py
@@ -45,6 +45,7 @@ class Meta:
 class ManyToManyModelFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = ManyToManyModel
+        skip_postgeneration_save = True
 
     @factory.post_generation
     def bigids(self, create, extracted, **kwargs):
diff --git a/tox.ini b/tox.ini
