diff options
Diffstat (limited to 'meta-python')
-rw-r--r-- | meta-python/recipes-devtools/python/python3-django.inc | 2 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-django/0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch | 27 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-django_4.2.24.bb (renamed from meta-python/recipes-devtools/python/python3-django_4.2.20.bb) | 4 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-django_5.2.6.bb | 9 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-django_5.2.bb | 13 |
5 files changed, 12 insertions, 43 deletions
diff --git a/meta-python/recipes-devtools/python/python3-django.inc b/meta-python/recipes-devtools/python/python3-django.inc index cde32be477..c6475d2079 100644 --- a/meta-python/recipes-devtools/python/python3-django.inc +++ b/meta-python/recipes-devtools/python/python3-django.inc | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://www.djangoproject.com/" | |||
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" |
5 | 5 | ||
6 | PYPI_PACKAGE = "Django" | 6 | PYPI_PACKAGE = "django" |
7 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 7 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
8 | 8 | ||
9 | inherit pypi | 9 | inherit pypi |
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 deleted file mode 100644 index 4e28f59d8a..0000000000 --- a/meta-python/recipes-devtools/python/python3-django/0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 3ae049b26b995c650c41ef918d5f60beed52b4ba Mon Sep 17 00:00:00 2001 | ||
2 | From: Nick Pope <nick@nickpope.me.uk> | ||
3 | Date: Fri, 6 Dec 2024 18:32:39 +0000 | ||
4 | Subject: [PATCH] Fixed #35980 -- Updated setuptools to normalize package names | ||
5 | in built artifacts. | ||
6 | |||
7 | Upstream-Status: Backport [https://github.com/django/django/commit/3ae049b26b995c650c41ef918d5f60beed52b4ba] | ||
8 | |||
9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
10 | --- | ||
11 | pyproject.toml | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/pyproject.toml b/pyproject.toml | ||
15 | index f10d15d20d..b9e82334cd 100644 | ||
16 | --- a/pyproject.toml | ||
17 | +++ b/pyproject.toml | ||
18 | @@ -1,5 +1,5 @@ | ||
19 | [build-system] | ||
20 | -requires = ["setuptools>=61.0.0,<69.3.0"] | ||
21 | +requires = ["setuptools>=75.8.1"] | ||
22 | build-backend = "setuptools.build_meta" | ||
23 | |||
24 | [project] | ||
25 | -- | ||
26 | 2.34.1 | ||
27 | |||
diff --git a/meta-python/recipes-devtools/python/python3-django_4.2.20.bb b/meta-python/recipes-devtools/python/python3-django_4.2.24.bb index 8644b282c6..286d757733 100644 --- a/meta-python/recipes-devtools/python/python3-django_4.2.20.bb +++ b/meta-python/recipes-devtools/python/python3-django_4.2.24.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require python3-django.inc | 1 | require python3-django.inc |
2 | inherit python_setuptools_build_meta | 2 | inherit python_setuptools_build_meta |
3 | 3 | ||
4 | SRC_URI[sha256sum] = "92bac5b4432a64532abb73b2ac27203f485e40225d2640a7fbef2b62b876e789" | 4 | SRC_URI[sha256sum] = "40cd7d3f53bc6cd1902eadce23c337e97200888df41e4a73b42d682f23e71d80" |
5 | 5 | ||
6 | RDEPENDS:${PN} += "\ | 6 | RDEPENDS:${PN} += "\ |
7 | python3-sqlparse \ | 7 | python3-sqlparse \ |
@@ -10,5 +10,5 @@ RDEPENDS:${PN} += "\ | |||
10 | 10 | ||
11 | # Set DEFAULT_PREFERENCE so that the LTS version of django is built by | 11 | # Set DEFAULT_PREFERENCE so that the LTS version of django is built by |
12 | # default. To build the 4.x branch, | 12 | # default. To build the 4.x branch, |
13 | # PREFERRED_VERSION_python3-django = "4.2.20" can be added to local.conf | 13 | # PREFERRED_VERSION_python3-django = "4.2.%" can be added to local.conf |
14 | DEFAULT_PREFERENCE = "-1" | 14 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.6.bb b/meta-python/recipes-devtools/python/python3-django_5.2.6.bb new file mode 100644 index 0000000000..644d825705 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-django_5.2.6.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require python3-django.inc | ||
2 | inherit python_setuptools_build_meta | ||
3 | |||
4 | SRC_URI[sha256sum] = "da5e00372763193d73cecbf71084a3848458cecf4cee36b9a1e8d318d114a87b" | ||
5 | |||
6 | RDEPENDS:${PN} += "\ | ||
7 | python3-sqlparse \ | ||
8 | python3-asgiref \ | ||
9 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.bb b/meta-python/recipes-devtools/python/python3-django_5.2.bb deleted file mode 100644 index 8a20448e22..0000000000 --- a/meta-python/recipes-devtools/python/python3-django_5.2.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | require python3-django.inc | ||
2 | inherit python_setuptools_build_meta | ||
3 | |||
4 | SRC_URI[sha256sum] = "1a47f7a7a3d43ce64570d350e008d2949abe8c7e21737b351b6a1611277c6d89" | ||
5 | |||
6 | SRC_URI += "\ | ||
7 | file://0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch \ | ||
8 | " | ||
9 | |||
10 | RDEPENDS:${PN} += "\ | ||
11 | python3-sqlparse \ | ||
12 | python3-asgiref \ | ||
13 | " | ||