From 9b5c9136df421ef87b41b9db492eeef6d8a77afe Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 11 Apr 2025 17:19:07 +0800 Subject: python3-django: Upgrade 5.0.13 -> 5.2 Release note: https://docs.djangoproject.com/en/5.2/releases/5.2/ Backport a patch [1] to fix the below build failure: | ERROR Missing dependencies: | setuptools<69.3.0,>=61.0.0 [1] https://github.com/django/django/commit/3ae049b26b995c650c41ef918d5f60beed52b4ba Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- ...0-Updated-setuptools-to-normalize-package.patch | 27 ++++++++++++++++++++++ .../python/python3-django_5.0.13.bb | 9 -------- .../recipes-devtools/python/python3-django_5.2.bb | 13 +++++++++++ 3 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python3-django/0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch delete mode 100644 meta-python/recipes-devtools/python/python3-django_5.0.13.bb create mode 100644 meta-python/recipes-devtools/python/python3-django_5.2.bb (limited to 'meta-python') diff --git a/meta-python/recipes-devtools/python/python3-django/0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch b/meta-python/recipes-devtools/python/python3-django/0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch new file mode 100644 index 0000000000..4e28f59d8a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-django/0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch @@ -0,0 +1,27 @@ +From 3ae049b26b995c650c41ef918d5f60beed52b4ba Mon Sep 17 00:00:00 2001 +From: Nick Pope +Date: Fri, 6 Dec 2024 18:32:39 +0000 +Subject: [PATCH] Fixed #35980 -- Updated setuptools to normalize package names + in built artifacts. + +Upstream-Status: Backport [https://github.com/django/django/commit/3ae049b26b995c650c41ef918d5f60beed52b4ba] + +Signed-off-by: Mingli Yu +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index f10d15d20d..b9e82334cd 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["setuptools>=61.0.0,<69.3.0"] ++requires = ["setuptools>=75.8.1"] + build-backend = "setuptools.build_meta" + + [project] +-- +2.34.1 + diff --git a/meta-python/recipes-devtools/python/python3-django_5.0.13.bb b/meta-python/recipes-devtools/python/python3-django_5.0.13.bb deleted file mode 100644 index 801083833c..0000000000 --- a/meta-python/recipes-devtools/python/python3-django_5.0.13.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python3-django.inc -inherit python_setuptools_build_meta - -SRC_URI[sha256sum] = "f9d4b7b87a9dae248d5f20cec940cf7290e07d508d6d8432e3c2cabf09b3b0ff" - -RDEPENDS:${PN} += "\ - python3-sqlparse \ - python3-asgiref \ -" diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.bb b/meta-python/recipes-devtools/python/python3-django_5.2.bb new file mode 100644 index 0000000000..8a20448e22 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-django_5.2.bb @@ -0,0 +1,13 @@ +require python3-django.inc +inherit python_setuptools_build_meta + +SRC_URI[sha256sum] = "1a47f7a7a3d43ce64570d350e008d2949abe8c7e21737b351b6a1611277c6d89" + +SRC_URI += "\ + file://0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch \ +" + +RDEPENDS:${PN} += "\ + python3-sqlparse \ + python3-asgiref \ +" -- cgit v1.2.3-54-g00ecf