Support Python 3.9, 3.10, 3.11, 3.12, 3.13 and Django 4.2, 5.1, 5.2, main (#129)

Author: dyve

.github/workflows/ci.yml

@@ -44,38 +44,36 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
-        django-version: [4.2, 5.0, 5.1b1, master]
+        python-version: [3.9, "3.10", 3.11, 3.12, 3.13]
+        django-version: [4.2, 5.1, 5.2, "main"]
         postgres-version: ["postgres:13.13", "postgres:14"]
         exclude:
             # Django 4.2
-            - python-version: 3.12
-              django-version: 4.2
+            - django-version: 4.2
+              python-version: 3.13
             - django-version: 4.2
               postgres-version: postgres:13.13
 
-            # Django 5.0
-            - python-version: 3.8
-              django-version: 5.0
+            # Django 5.1
             - python-version: 3.9
-              django-version: 5.0
-            - django-version: 5.0
+              django-version: 5.1
+            - django-version: 5.1
               postgres-version: postgres:13.13
 
-            # Django 5.1b1
-            - python-version: 3.8
-              django-version: 5.1b1
+            # Django 5.2
             - python-version: 3.9
-              django-version: 5.1b1
-            - django-version: 5.1
+              django-version: 5.2
+            - django-version: 5.2
               postgres-version: postgres:13.13
 
-            # master
-            - python-version: 3.8
-              django-version: master
+            # Django main (6.0)
             - python-version: 3.9
-              django-version: master
-            - django-version: master
+              django-version: main
+            - python-version: "3.10"
+              django-version: main
+            - python-version: 3.11
+              django-version: main
+            - django-version: main
               postgres-version: postgres:13.13
     services:
       postgres:
@@ -93,10 +91,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - uses: actions/checkout@v4
       - run: python -m pip install Django==${{ matrix.django-version }}
-        if: matrix.django-version != 'master'
-      - run: python -m pip install https://github.com/django/django/archive/master.tar.gz
-        if: matrix.django-version == 'master'
+        if: matrix.django-version != 'main'
+      - run: python -m pip install https://github.com/django/django/archive/main.tar.gz
+        if: matrix.django-version == 'main'
       - run: |
           python -m pip install coverage
-          python -m pip install psycopg==3.1.8
+          python -m pip install psycopg==3.1.12
       - run: coverage run --source=modeltrans manage.py test

.gitignore

@@ -1,7 +1,7 @@
 # Python binaries
 *.pyc
 
-.env
+.env*
 .python-version
 pip-wheel-metadata
 .tox

CHANGELOG.md

@@ -1,6 +1,9 @@
 django-modeltrans change log
 ============================
 
+## In development
+- Support Python 3.9, 3.10, 3.11, 3.12, 3.13 and Django 4.2, 5.1, 5.2 and main (#129).
+
 ## 0.8.0 (2024-07-02)
 - Add `JSONField` support (#119) refs: #118 by @jacobwegner
 - Add `MODELTRANS_DEFAULT_LANGUAGE` setting (#117) by @jacobwegner

setup.py

@@ -39,19 +39,19 @@
         "Environment :: Web Environment",
         "Framework :: Django",
         "Framework :: Django :: 4.2",
-        "Framework :: Django :: 5.0",
         "Framework :: Django :: 5.1",
+        "Framework :: Django :: 5.2",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Software Development :: Libraries",
     ],

tests/test_translating.py

@@ -71,7 +71,8 @@ class RequiredLanguagesType_dict(models.Model):
             body = models.CharField(max_length=100)
 
             i18n = TranslationField(
-                fields=("title", "body"), required_languages={"body": ["nl"], "title": ["fr", "nl"]}
+                fields=("title", "body"),
+                required_languages={"body": ["nl"], "title": ["fr", "nl"]},
             )
 
             class Meta:
@@ -290,7 +291,8 @@ def test_limit_choices_to(self):
         comment = app_models.Comment.objects.create(post=published_post, text="foo")
         self.assertIsNotNone(comment.pk)
 
-        if django.get_version().startswith("5.2"):
+        # Remove if we no longer support Django 4.2, Django 5.1
+        if django.get_version() >= "5.2":
             expected = f"post instance with id {unpublished_post.pk} is not a valid choice."
         else:
             expected = f"post instance with id {unpublished_post.pk} does not exist"

tox.ini

@@ -2,11 +2,11 @@
 [tox]
 args_are_paths = false
 envlist =
-    py38-{4.2},
     py39-{4.2},
-    py310-{4.2,5.0,master},
-    py311-{4.2,5.0,master},
-    py311-{4.2,5.0,master},
+    py310-{4.2,5.1,5.2},
+    py311-{4.2,5.1,5.2},
+    py312-{4.2,5.1,5.2,main},
+    py313-{5.1,5.2,main},
     migrate,
     flake8,
     isort,
@@ -15,11 +15,11 @@ envlist =
 
 [testenv]
 basepython =
-    py38: python3.8
     py39: python3.9
     py310: python3.10
     py311: python3.11
     py312: python3.12
+    py312: python3.13
 usedevelop = true
 pip_pre = true
 setenv =
@@ -30,8 +30,9 @@ commands =
     coverage run ./manage.py test --no-input
 deps =
     4.2: Django==4.2.*
-    5.0: Django==5.0.*
-    master: https://github.com/django/django/archive/master.tar.gz
+    5.1: Django==5.1.*
+    5.2: Django==5.2.*
+    main: https://github.com/django/django/archive/main.tar.gz
     psycopg
     coverage