8 files changed, 232 insertions, 20 deletions

diff --git a/meta-python/recipes-devtools/python/python3-django.inc b/meta-python/recipes-devtools/python/python3-django.inc
index c6475d2079..589f6a5b85 100644
--- a/meta-python/recipes-devtools/python/python3-django.inc
+++ b/meta-python/recipes-devtools/python/python3-django.inc
@@ -6,13 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa"
 PYPI_PACKAGE = "django"
 UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
 
-inherit pypi
+inherit pypi ptest
+
+SRC_URI += "file://run-ptest"
 
 FILES:${PN} += "${datadir}/django"
 
 BBCLASSEXTEND = "native nativesdk"
 
 RDEPENDS:${PN} += "\
+    python3-asgiref \
     python3-compression \
     python3-ctypes \
     python3-datetime \
@@ -25,9 +28,37 @@ RDEPENDS:${PN} += "\
     python3-numbers \
     python3-pkgutil \
     python3-pytz \
+    python3-sqlparse \
     python3-threading \
     python3-unixadmin \
     python3-xml \
 "
 
 CVE_PRODUCT = "django"
+
+do_install_ptest(){
+    install -d ${D}${PTEST_PATH}//docs/_ext
+    install -m 0644 ${S}/docs/_ext/github_links.py ${D}${PTEST_PATH}/docs/_ext
+
+    cp -r ${S}/tests ${D}${PTEST_PATH}
+    sed -i 's,/usr/bin/env python,/usr/bin/env python3,' ${D}${PTEST_PATH}/tests/runtests.py
+    ln -sr ${D}${libdir}/python3.*/site-packages/django ${D}${PTEST_PATH}/django
+}
+
+RDEPENDS:${PN}-ptest += " \
+    gettext \
+    python3-bcrypt \
+    python3-compile \
+    python3-docutils \
+    python3-fcntl \
+    python3-jinja2 \
+    python3-misc \
+    python3-numpy \
+    python3-pillow \
+    python3-pyyaml \
+    python3-sqlite3 \
+    python3-statistics \
+    python3-tblib \
+    python3-zoneinfo \
+    tzdata \
+"
diff --git a/meta-python/recipes-devtools/python/python3-django/0001-Fix-test_strip_tags-test.patch b/meta-python/recipes-devtools/python/python3-django/0001-Fix-test_strip_tags-test.patch
new file mode 100644
index 0000000000..f77c3b963a
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django/0001-Fix-test_strip_tags-test.patch
@@ -0,0 +1,76 @@
+From 7b80b2186300620931009fd62c2969f108fe7a62 Mon Sep 17 00:00:00 2001
+From: Jacob Walls <jacobtylerwalls@gmail.com>
+Date: Thu, 11 Dec 2025 08:44:19 -0500
+Subject: [PATCH] Refs #36499 -- Adjusted test_strip_tags following Python
+ behavior change for incomplete entities.
+
+Upstream-Status: Backport [https://github.com/django/django/commit/7b80b2186300620931009fd62c2969f108fe7a62]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ tests/utils_tests/test_html.py | 25 ++++++++++++++++++++-----
+ 1 file changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py
+index 7412c2624c73..ee115aaf1cf2 100644
+--- a/tests/utils_tests/test_html.py
++++ b/tests/utils_tests/test_html.py
+@@ -1,3 +1,4 @@
++import math
+ import os
+ import sys
+ from datetime import datetime
+@@ -124,7 +125,7 @@
+         # old and new results. The check below is temporary until all supported
+         # Python versions and CI workers include the fix. See:
+         # https://github.com/python/cpython/commit/6eb6c5db
+-        min_fixed = {
++        min_fixed_security = {
+             (3, 14): (3, 14),
+             (3, 13): (3, 13, 6),
+             (3, 12): (3, 12, 12),
+@@ -132,7 +133,21 @@
+             (3, 10): (3, 10, 19),
+             (3, 9): (3, 9, 24),
+         }
+-        htmlparser_fixed = sys.version_info >= min_fixed[sys.version_info[:2]]
++        # Similarly, there was a fix for terminating incomplete entities. See:
++        # https://github.com/python/cpython/commit/95296a9d
++        min_fixed_incomplete_entities = {
++            (3, 14): (3, 14, 1),
++            (3, 13): (3, 13, 10),
++            (3, 12): (3, 12, math.inf),  # not fixed in 3.12.
++        }
++        major_version = sys.version_info[:2]
++        htmlparser_fixed_security = sys.version_info >= min_fixed_security.get(
++            major_version, major_version
++        )
++        htmlparser_fixed_incomplete_entities = (
++            sys.version_info
++            >= min_fixed_incomplete_entities.get(major_version, major_version)
++        )
+         items = (
+             (
+                 "<p>See: &#39;&eacute; is an apostrophe followed by e acute</p>",
+@@ -159,16 +174,19 @@
+             # https://bugs.python.org/issue20288
+             ("&gotcha&#;<>", "&gotcha&#;<>"),
+             ("<sc<!-- -->ript>test<<!-- -->/script>", "ript>test"),
+-            ("<script>alert()</script>&h", "alert()h"),
++            (
++                "<script>alert()</script>&h",
++                "alert()&h;" if htmlparser_fixed_incomplete_entities else "alert()h",
++            ),
+             (
+                 "><!" + ("&" * 16000) + "D",
+-                ">" if htmlparser_fixed else "><!" + ("&" * 16000) + "D",
++                ">" if htmlparser_fixed_security else "><!" + ("&" * 16000) + "D",
+             ),
+             ("X<<<<br>br>br>br>X", "XX"),
+             ("<" * 50 + "a>" * 50, ""),
+             (
+                 ">" + "<a" * 500 + "a",
+-                ">" if htmlparser_fixed else ">" + "<a" * 500 + "a",
++                ">" if htmlparser_fixed_security else ">" + "<a" * 500 + "a",
+             ),
+             ("<a" * 49 + "a" * 951, "<a" * 49 + "a" * 951),
+             ("<" + "a" * 1_002, "<" + "a" * 1_002),
diff --git a/meta-python/recipes-devtools/python/python3-django/0001-fix-test_msgfmt_error_including_non_ascii-test.patch b/meta-python/recipes-devtools/python/python3-django/0001-fix-test_msgfmt_error_including_non_ascii-test.patch
new file mode 100644
index 0000000000..6f887b3015
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django/0001-fix-test_msgfmt_error_including_non_ascii-test.patch
@@ -0,0 +1,71 @@
+From 1960ecd879ce351226b36e7ac0aa25616241b6f6 Mon Sep 17 00:00:00 2001
+From: Jericho Serrano <118679068+jericho1050@users.noreply.github.com>
+Date: Fri, 6 Jun 2025 04:58:29 +0800
+Subject: [PATCH] Fixed #36421 -- Made test_msgfmt_error_including_non_ascii
+ compatible with msgfmt 0.25.
+
+Upstream-Status: Backport [https://github.com/django/django/commit/1960ecd879ce351226b36e7ac0aa25616241b6f6]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ tests/i18n/test_compilation.py | 25 +++++++++++++++++++++++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/tests/i18n/test_compilation.py b/tests/i18n/test_compilation.py
+index 4b0bb9f6bb16..3a57dbf0765f 100644
+--- a/tests/i18n/test_compilation.py
++++ b/tests/i18n/test_compilation.py
+@@ -1,5 +1,6 @@
+ import gettext as gettext_module
+ import os
++import re
+ import stat
+ import unittest
+ from io import StringIO
+@@ -8,10 +9,12 @@
+ from unittest import mock
+ 
+ from django.core.management import CommandError, call_command, execute_from_command_line
+-from django.core.management.utils import find_command
++from django.core.management.utils import find_command, popen_wrapper
+ from django.test import SimpleTestCase, override_settings
+ from django.test.utils import captured_stderr, captured_stdout
+ from django.utils import translation
++from django.utils.encoding import DEFAULT_LOCALE_ENCODING
++from django.utils.functional import cached_property
+ from django.utils.translation import gettext
+ 
+ from .utils import RunInTmpDirMixin, copytree
+@@ -254,6 +257,17 @@ def test_no_dirs_accidentally_skipped(self):
+ 
+ 
+ class CompilationErrorHandling(MessageCompilationTests):
++    @cached_property
++    def msgfmt_version(self):
++        # Note that msgfmt is installed via GNU gettext tools, hence the msgfmt
++        # version should align to gettext.
++        out, err, status = popen_wrapper(
++            ["msgfmt", "--version"],
++            stdout_encoding=DEFAULT_LOCALE_ENCODING,
++        )
++        m = re.search(r"(\d+)\.(\d+)\.?(\d+)?", out)
++        return tuple(int(d) for d in m.groups() if d is not None)
++
+     def test_error_reported_by_msgfmt(self):
+         # po file contains wrong po formatting.
+         with self.assertRaises(CommandError):
+@@ -278,7 +292,14 @@ def test_msgfmt_error_including_non_ascii(self):
+                 call_command(
+                     "compilemessages", locale=["ko"], stdout=StringIO(), stderr=stderr
+                 )
+-            self.assertIn("' cannot start a field name", stderr.getvalue())
++            if self.msgfmt_version < (0, 25):
++                error_msg = "' cannot start a field name"
++            else:
++                error_msg = (
++                    "a field name starts with a character that is not alphanumerical "
++                    "or underscore"
++                )
++            self.assertIn(error_msg, stderr.getvalue())
+ 
+ 
+ class ProjectAndAppTests(MessageCompilationTests):
diff --git a/meta-python/recipes-devtools/python/python3-django/run-ptest b/meta-python/recipes-devtools/python/python3-django/run-ptest
new file mode 100644
index 0000000000..dd257cc843
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django/run-ptest
@@ -0,0 +1,19 @@
+#!/bin/sh
+useradd tester || echo test user exists already
+
+# We need $(pwd), because some tests import modules from the actual tests folder
+# Also, there is one module in the docs/_ext folder that is imported, and that
+# module accesses other modules by a relative path to itself.
+export PYTHONPATH=$(pwd):$(pwd)/docs/_ext:$PYTHONPATH
+
+cd tests
+
+su tester -c "./runtests.py --noinput -v 2" 2>&1 | \
+     tee ../testoutput.log | \
+     sed -e '/\.\.\. ok/ s/^/PASS: /g' \
+         -e '/\.\.\. [ERROR|FAIL]/ s/^/FAIL: /g' \
+         -e '/\.\.\. skipped/ s/^/SKIP: /g' \
+         -e 's/ \.\.\. ok//g' \
+         -e 's/ \.\.\. ERROR//g' \
+         -e 's/ \.\.\. FAIL//g' \
+         -e 's/ \.\.\. skipped//g'
diff --git a/meta-python/recipes-devtools/python/python3-django_4.2.27.bb b/meta-python/recipes-devtools/python/python3-django_4.2.27.bb
deleted file mode 100644
index 86425ca724..0000000000
--- a/meta-python/recipes-devtools/python/python3-django_4.2.27.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require python3-django.inc
-inherit python_setuptools_build_meta
-
-SRC_URI[sha256sum] = "b865fbe0f4a3d1ee36594c5efa42b20db3c8bbb10dff0736face1c6e4bda5b92"
-
-RDEPENDS:${PN} += "\
-    python3-sqlparse \
-    python3-asgiref \
-"
-
-# Set DEFAULT_PREFERENCE so that the LTS version of django is built by
-# default. To build the 4.x branch,
-# PREFERRED_VERSION_python3-django = "4.2.%" can be added to local.conf
-DEFAULT_PREFERENCE = "-1"
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.9.bb b/meta-python/recipes-devtools/python/python3-django_5.2.9.bb
index c0aff44a78..11f438d623 100644
--- a/meta-python/recipes-devtools/python/python3-django_5.2.9.bb
+++ b/meta-python/recipes-devtools/python/python3-django_5.2.9.bb
@@ -1,9 +1,7 @@
 require python3-django.inc
 inherit python_setuptools_build_meta
 
-SRC_URI[sha256sum] = "16b5ccfc5e8c27e6c0561af551d2ea32852d7352c67d452ae3e76b4f6b2ca495"
-
-RDEPENDS:${PN} += "\
-    python3-sqlparse \
-    python3-asgiref \
+SRC_URI += "file://0001-fix-test_msgfmt_error_including_non_ascii-test.patch \
+            file://0001-Fix-test_strip_tags-test.patch \
 "
+SRC_URI[sha256sum] = "16b5ccfc5e8c27e6c0561af551d2ea32852d7352c67d452ae3e76b4f6b2ca495"
diff --git a/meta-python/recipes-devtools/python/python3-django_6.0.1.bb b/meta-python/recipes-devtools/python/python3-django_6.0.1.bb
new file mode 100644
index 0000000000..9642a3c581
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django_6.0.1.bb
@@ -0,0 +1,9 @@
+require python3-django.inc
+inherit python_setuptools_build_meta
+
+SRC_URI[sha256sum] = "ed76a7af4da21551573b3d9dfc1f53e20dd2e6c7d70a3adc93eedb6338130a5f"
+
+# Set DEFAULT_PREFERENCE so that the LTS version of django is built by
+# default. To build the 6.x branch,
+# PREFERRED_VERSION_python3-django = "6.0.%" can be added to local.conf
+DEFAULT_PREFERENCE = "-1"
diff --git a/meta-python/recipes-devtools/python/python3-tblib_3.2.2.bb b/meta-python/recipes-devtools/python/python3-tblib_3.2.2.bb
new file mode 100644
index 0000000000..ae3ba730c5
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-tblib_3.2.2.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Serialization library for Exceptions and Tracebacks."
+HOMEPAGE = "https://github.com/ionelmc/python-tblib"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=810c4c43873f8d9331fb067a6473a960"
+
+inherit pypi python_setuptools_build_meta ptest-python-pytest
+
+SRC_URI[sha256sum] = "e9a652692d91bf4f743d4a15bc174c0b76afc750fe8c7b6d195cc1c1d6d2ccec"
+
+do_install_ptest:append(){
+    install -m 0644 ${S}/pytest.ini ${D}${PTEST_PATH}
+    # The tests are comparing exception outputs with expected ones, and it doesn't
+    # expect carets in the exception.
+    sed -i 's/pytest/PYTHONNODEBUGRANGES=1 pytest/' ${D}${PTEST_PATH}/run-ptest
+}
+
+RDEPENDS:${PN}-ptest += " \
+    python3-misc \
+    python3-pytest-benchmark \
+    python3-statistics \
+    python3-twisted \
+"