From 372321ca4bad8329baafb52a5003faa39a16ea73 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 31 Aug 2023 10:47:06 +0800 Subject: python3-setuptools: upgrade 68.1.0 -> 68.1.2 0001-conditionally-do-not-fetch-code-by-easy_install.patch refreshed for new version. Changelog: -Fix editable install finder handling of nested packages, by only handling 1 level of nesting and relying on importlib.machinery to find the remaining modules based on the parent package path. (From OE-Core rev: 27d3e5bc7ea949c4e7691674617cf29c80b3035f) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...ionally-do-not-fetch-code-by-easy_install.patch | 10 ++-- .../python/python3-setuptools_68.1.0.bb | 55 ---------------------- .../python/python3-setuptools_68.1.2.bb | 55 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-setuptools_68.1.0.bb create mode 100644 meta/recipes-devtools/python/python3-setuptools_68.1.2.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 1e5ab498a4..84a9492caf 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 5e603da9c01ccb828a03ea3e82d15599971f794f Mon Sep 17 00:00:00 2001 +From c90cc4a07ce6d2b7128e37d811d0c6bbc4b905a6 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 @@ -9,15 +9,16 @@ internet by easy_install. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia + --- setuptools/command/easy_install.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 0b8d1159..93308060 100644 +index 8ba4f09..8ea40c5 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -644,6 +644,11 @@ class easy_install(Command): +@@ -676,6 +676,11 @@ class easy_install(Command): os.path.exists(tmpdir) and _rmtree(tmpdir) def easy_install(self, spec, deps=False): @@ -29,6 +30,3 @@ index 0b8d1159..93308060 100644 with self._tmpdir() as tmpdir: if not isinstance(spec, Requirement): if URL_SCHEME(spec): --- -2.41.0 - diff --git a/meta/recipes-devtools/python/python3-setuptools_68.1.0.bb b/meta/recipes-devtools/python/python3-setuptools_68.1.0.bb deleted file mode 100644 index e04cd1dcd0..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools_68.1.0.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] = "d59c97e7b774979a5ccb96388efc9eb65518004537e85d52e81eaee89ab6dd91" - -DEPENDS += "${PYTHON_PN}" - -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-2to3 \ - ${PYTHON_PN}-compile \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pkg-resources \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-plistlib \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unittest \ - ${PYTHON_PN}-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 =+ "${PYTHON_PN}-pkg-resources " -FILES:${PYTHON_PN}-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*" -RDEPENDS:${PYTHON_PN}-pkg-resources = "\ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-plistlib \ - ${PYTHON_PN}-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_68.1.2.bb b/meta/recipes-devtools/python/python3-setuptools_68.1.2.bb new file mode 100644 index 0000000000..a1e84b635c --- /dev/null +++ b/meta/recipes-devtools/python/python3-setuptools_68.1.2.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] = "3d4dfa6d95f1b101d695a6160a7626e15583af71a5f52176efa5d39a054d475d" + +DEPENDS += "${PYTHON_PN}" + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-2to3 \ + ${PYTHON_PN}-compile \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-email \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-pkg-resources \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-plistlib \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-unittest \ + ${PYTHON_PN}-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 =+ "${PYTHON_PN}-pkg-resources " +FILES:${PYTHON_PN}-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*" +RDEPENDS:${PYTHON_PN}-pkg-resources = "\ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-email \ + ${PYTHON_PN}-plistlib \ + ${PYTHON_PN}-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