From f49f2ca1c8304ed33cabc394e4a77b9cf66ccb3a Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 26 Mar 2024 08:34:45 +0800 Subject: python3-setuptools: upgrade 69.1.1 -> 69.2.0 0001-conditionally-do-not-fetch-code-by-easy_install.patch refreshed for 69.2.0 Changelog: ========== -Explicitly use encoding="locale" for .pth files whenever possible, to reduce EncodingWarnings. This avoid errors with UTF-8 -Clarify some Package Discovery and Resource Access using pkg_resources methods return bytes, not str. Also return an empty bytes in EmptyProvider._get -Return an empty list by default in pkg_resources.ResourceManager.cleanup_resources -Made pkg_resoursces.NullProvider's has_metadata and metadata_isdir methods return actual booleans like all other Providers. (From OE-Core rev: 49d2c4cf43d4ccac6f3f6c090fc0e5b0365645b6) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...ionally-do-not-fetch-code-by-easy_install.patch | 6 +-- .../python/python3-setuptools_69.1.1.bb | 55 ---------------------- .../python/python3-setuptools_69.2.0.bb | 55 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-setuptools_69.1.1.bb create mode 100644 meta/recipes-devtools/python/python3-setuptools_69.2.0.bb (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 2a3c71fb62..e227c2889c 100644 --- a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 40648dfa770f9f7b9b9efa501c9ef7af96be9f2d Mon Sep 17 00:00:00 2001 +From 80fe63816eb3bfd1f5b6d354e1f2442805cff4e0 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -14,10 +14,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 5d6fd5c..377e575 100644 +index 858fb20..62bd853 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -676,6 +676,11 @@ class easy_install(Command): +@@ -672,6 +672,11 @@ class easy_install(Command): os.path.exists(tmpdir) and _rmtree(tmpdir) def easy_install(self, spec, deps=False): diff --git a/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb b/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb deleted file mode 100644 index 77d4e0aa03..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" -HOMEPAGE = "https://pypi.org/project/setuptools" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" - -inherit pypi python_setuptools_build_meta - -SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" - -SRC_URI += " \ - file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" - -SRC_URI[sha256sum] = "5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8" - -DEPENDS += "python3" - -RDEPENDS:${PN} = "\ - python3-2to3 \ - python3-compile \ - python3-compression \ - python3-ctypes \ - python3-email \ - python3-html \ - python3-json \ - python3-netserver \ - python3-numbers \ - python3-pickle \ - python3-pkg-resources \ - python3-pkgutil \ - python3-plistlib \ - python3-shell \ - python3-stringold \ - python3-threading \ - python3-unittest \ - python3-xml \ -" - -BBCLASSEXTEND = "native nativesdk" - -# The pkg-resources module can be used by itself, without the package downloader -# and easy_install. Ship it in a separate package so that it can be used by -# minimal distributions. -PACKAGES =+ "python3-pkg-resources " -FILES:python3-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*" -RDEPENDS:python3-pkg-resources = "\ - python3-compression \ - python3-email \ - python3-plistlib \ - python3-pprint \ -" - -# This used to use the bootstrap install which didn't compile. Until we bump the -# tmpdir version we can't compile the native otherwise the sysroot unpack fails -INSTALL_WHEEL_COMPILE_BYTECODE:class-native = "--no-compile-bytecode" diff --git a/meta/recipes-devtools/python/python3-setuptools_69.2.0.bb b/meta/recipes-devtools/python/python3-setuptools_69.2.0.bb new file mode 100644 index 0000000000..897398afc5 --- /dev/null +++ b/meta/recipes-devtools/python/python3-setuptools_69.2.0.bb @@ -0,0 +1,55 @@ +SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" +HOMEPAGE = "https://pypi.org/project/setuptools" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" + +inherit pypi python_setuptools_build_meta + +SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" + +SRC_URI += " \ + file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" + +SRC_URI[sha256sum] = "0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e" + +DEPENDS += "python3" + +RDEPENDS:${PN} = "\ + python3-2to3 \ + python3-compile \ + python3-compression \ + python3-ctypes \ + python3-email \ + python3-html \ + python3-json \ + python3-netserver \ + python3-numbers \ + python3-pickle \ + python3-pkg-resources \ + python3-pkgutil \ + python3-plistlib \ + python3-shell \ + python3-stringold \ + python3-threading \ + python3-unittest \ + python3-xml \ +" + +BBCLASSEXTEND = "native nativesdk" + +# The pkg-resources module can be used by itself, without the package downloader +# and easy_install. Ship it in a separate package so that it can be used by +# minimal distributions. +PACKAGES =+ "python3-pkg-resources " +FILES:python3-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*" +RDEPENDS:python3-pkg-resources = "\ + python3-compression \ + python3-email \ + python3-plistlib \ + python3-pprint \ +" + +# This used to use the bootstrap install which didn't compile. Until we bump the +# tmpdir version we can't compile the native otherwise the sysroot unpack fails +INSTALL_WHEEL_COMPILE_BYTECODE:class-native = "--no-compile-bytecode" -- cgit v1.2.3-54-g00ecf