meta: remove obsolete PIP_INSTALL_PACKAGE
PATCH 1/2 meta: remove obsolete PIP_INSTALL_PACKAGE
PIP_INSTALL_PACKAGE isn't used anymore, so remove all instances of it from the recipes.
--- meta/recipes-devtools/meson/meson_0.61.2.bb | 2 -- meta/recipes-devtools/python/python3-dbusmock_0.26.1.bb | 1 - meta/recipes-devtools/python/python3-flit-core_3.7.1.bb | 1 - meta/recipes-devtools/python/python3-libarchive-c_4.0.bb | 2 -- meta/recipes-devtools/python/python3-magic_0.4.25.bb | 1 - meta/recipes-devtools/python/python3-more-itertools_8.12.0.bb | 2 -- meta/recipes-devtools/python/python3-numpy_1.22.2.bb | 1 - meta/recipes-devtools/python/python3-strict-rfc3339_0.7.bb | 2 -- meta/recipes-devtools/python/python3-subunit_1.4.0.bb | 2 -- meta/recipes-extended/asciidoc/asciidoc_10.1.4.bb | 1 - meta/recipes-gnome/gi-docgen/gi-docgen_git.bb | 1 - meta/recipes-support/bmap-tools/bmap-tools_git.bb | 2 -- 12 files changed, 18 deletions(-)
meta/recipes-devtools/meson/meson_0.61.2.bb +0 -2
@@ -23,8 +23,6 @@ UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar" inherit setuptools_build_meta -PIP_INSTALL_PACKAGE = "meson" - RDEPENDS:${PN} = "ninja python3-modules python3-pkg-resources" FILES:${PN} += "${datadir}/polkit-1"
meta/recipes-devtools/python/python3-dbusmock_0.26.1.bb +0 -1
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" SRC_URI[sha256sum] = "0e95ef6ec1e6b58aeb0e08839a76972debea94184570f09e29e5f12551399e55" PYPI_PACKAGE = "python-dbusmock" -PIP_INSTALL_PACKAGE = "python_dbusmock" inherit pypi setuptools3
meta/recipes-devtools/python/python3-flit-core_3.7.1.bb +0 -1
@@ -19,7 +19,6 @@ DEPENDS:append:class-native = " unzip-native" # We need the full flit tarball PYPI_PACKAGE = "flit" PEP517_SOURCE_PATH = "${S}/flit_core" -PIP_INSTALL_PACKAGE = "flit_core" do_install:class-native () { pip_install_wheel_do_bootstrap_install
meta/recipes-devtools/python/python3-libarchive-c_4.0.bb +0 -2
@@ -9,8 +9,6 @@ PYPI_PACKAGE = "libarchive-c" inherit pypi setuptools3 -PIP_INSTALL_PACKAGE = "libarchive_c" - SRC_URI[sha256sum] = "a5b41ade94ba58b198d778e68000f6b7de41da768de7140c984f71d7fa8416e5" RDEPENDS:${PN} += "\
meta/recipes-devtools/python/python3-magic_0.4.25.bb +0 -1
@@ -8,7 +8,6 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=61495c152d794e6be5799a9edca149e3" PYPI_PACKAGE = "python-magic" -PIP_INSTALL_PACKAGE = "python_magic" inherit pypi setuptools3
meta/recipes-devtools/python/python3-more-itertools_8.12.0.bb +0 -2
@@ -7,8 +7,6 @@ SRC_URI[sha256sum] = "7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d24 inherit pypi setuptools3 ptest -PIP_INSTALL_PACKAGE = "more_itertools" - SRC_URI += " \ file://run-ptest \ "
meta/recipes-devtools/python/python3-numpy_1.22.2.bb +0 -1
@@ -20,7 +20,6 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" DEPENDS += "python3-cython-native" inherit ptest setuptools3 -PIP_INSTALL_PACKAGE = "numpy" S = "${WORKDIR}/numpy-${PV}"
meta/recipes-devtools/python/python3-strict-rfc3339_0.7.bb +0 -2
@@ -8,6 +8,4 @@ SRC_URI[sha256sum] = "5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac inherit pypi setuptools3 -PIP_INSTALL_PACKAGE = "strict_rfc3339" - BBCLASSEXTEND = "native nativesdk"
meta/recipes-devtools/python/python3-subunit_1.4.0.bb +0 -2
@@ -10,8 +10,6 @@ SRC_URI[sha256sum] = "042039928120fbf392e8c983d60f3d8ae1b88f90a9f8fd7188ddd9c26c inherit pypi setuptools3 -PIP_INSTALL_PACKAGE = "python_subunit" - RDEPENDS:${PN} = " python3-testtools" BBCLASSEXTEND = "nativesdk"
meta/recipes-extended/asciidoc/asciidoc_10.1.4.bb +0 -1
@@ -21,7 +21,6 @@ S = "${WORKDIR}/git" export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" inherit setuptools3 -PIP_INSTALL_PACKAGE = "asciidoc" CLEANBROKEN = "1" BBCLASSEXTEND = "native nativesdk"
meta/recipes-gnome/gi-docgen/gi-docgen_git.bb +0 -1
@@ -16,7 +16,6 @@ SRCREV = "37b04455ff58cb2ec3f58917d0737c435344f2fb" S = "${WORKDIR}/git" inherit setuptools3 -PIP_INSTALL_PACKAGE = "gi_docgen" RDEPENDS:${PN} += "python3-asyncio python3-core python3-jinja2 python3-json python3-markdown python3-markupsafe python3-pygments python3-toml python3-typogrify python3-xml"
meta/recipes-support/bmap-tools/bmap-tools_git.bb +0 -2
@@ -23,6 +23,4 @@ RDEPENDS:${PN} = "python3-core python3-compression python3-mmap python3-setuptoo inherit setuptools3 -PIP_INSTALL_PACKAGE = "bmap_tools" - BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.25.1
PATCH 2/2 meta: rename pip_install_wheel.bbclass to python_pep517.bbclass
pip_install_wheel shouldn't restricted to just using Pip to install wheels (the installer module is simplier and likely a better option), and in the future may be extended to also provide do_compile() using the build module.
---
meta/classes/flit_core.bbclass | 6 ++---
...ll_wheel.bbclass => python_pep517.bbclass} | 27 ++++++++++---------
meta/classes/setuptools3.bbclass | 8 +++---
meta/classes/setuptools_build_meta.bbclass | 6 ++---
.../python/python3-flit-core_3.7.1.bb | 2 +-
.../python/python3-wheel_0.37.1.bb | 2 +-
6 files changed, 27 insertions(+), 24 deletions(-)
rename meta/classes/{pip_install_wheel.bbclass => python_pep517.bbclass} (56%)meta/classes/flit_core.bbclass +3 -3
@@ -1,4 +1,4 @@ -inherit pip_install_wheel python3native python3-dir setuptools3-base +inherit python_pep517 python3native python3-dir setuptools3-base DEPENDS += "python3 python3-flit-core-native"
@@ -12,8 +12,8 @@ PEP517_SOURCE_PATH ?= "${S}" # TODO: ideally this uses pypa/build flit_core_do_compile () { cd ${PEP517_SOURCE_PATH} - nativepython3 -mflit_core.wheel --outdir ${PIP_INSTALL_DIST_PATH} + nativepython3 -mflit_core.wheel --outdir ${PEP517_WHEEL_PATH} } -do_compile[cleandirs] += "${PIP_INSTALL_DIST_PATH}" +do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" EXPORT_FUNCTIONS do_configure do_compile
meta/classes/python_pep517.bbclass renamed from meta/classes/pip_install_wheel.bbclass +15 -12
@@ -1,9 +1,12 @@ +# Common infrastructure for Python packages that use PEP-517 compliant packaging. +# https://www.python.org/dev/peps/pep-0517/ + DEPENDS:append = " python3-pip-native" # The directory where wheels should be written too. Build classes # will ideally [cleandirs] this but we don't do that here in case # a recipe wants to install prebuilt wheels. -PIP_INSTALL_DIST_PATH ?= "${WORKDIR}/dist" +PEP517_WHEEL_PATH ?= "${WORKDIR}/dist" PIP_INSTALL_ARGS = "\ -vvvv \
@@ -15,24 +18,24 @@ PIP_INSTALL_ARGS = "\ --prefix=${prefix} \ " -PIP_INSTALL_PYTHON = "python3" -PIP_INSTALL_PYTHON:class-native = "nativepython3" +PEP517_INSTALL_PYTHON = "python3" +PEP517_INSTALL_PYTHON:class-native = "nativepython3" -pip_install_wheel_do_install () { - COUNT=$(find ${PIP_INSTALL_DIST_PATH} -name '*.whl' | wc -l) +python_pep517_do_install () { + COUNT=$(find ${PEP517_WHEEL_PATH} -name '*.whl' | wc -l) if test $COUNT -eq 0; then - bbfatal No wheels found in ${PIP_INSTALL_DIST_PATH} + bbfatal No wheels found in ${PEP517_WHEEL_PATH} elif test $COUNT -gt 1; then - bbfatal More than one wheel found in ${PIP_INSTALL_DIST_PATH}, this should not happen + bbfatal More than one wheel found in ${PEP517_WHEEL_PATH}, this should not happen fi - nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PIP_INSTALL_DIST_PATH}/*.whl + nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PEP517_WHEEL_PATH}/*.whl cd ${D} for i in ${D}${bindir}/* ${D}${sbindir}/*; do if [ -f "$i" ]; then - sed -i -e "1s,#!.*nativepython3,#!${USRBINPATH}/env ${PIP_INSTALL_PYTHON}," $i - sed -i -e "s:${PYTHON}:${USRBINPATH}/env\ ${PIP_INSTALL_PYTHON}:g" $i + sed -i -e "1s,#!.*nativepython3,#!${USRBINPATH}/env ${PEP517_INSTALL_PYTHON}," $i + sed -i -e "s:${PYTHON}:${USRBINPATH}/env\ ${PEP517_INSTALL_PYTHON}:g" $i sed -i -e "s:${STAGING_BINDIR_NATIVE}:${bindir}:g" $i # Not everything we find may be Python, so ignore errors nativepython3 -mpy_compile $(realpath --relative-to=${D} $i) || true
@@ -41,9 +44,9 @@ pip_install_wheel_do_install () { } # A manual do_install that just uses unzip for bootstrapping purposes. Callers should DEPEND on unzip-native. -pip_install_wheel_do_bootstrap_install () { +python_pep517_do_bootstrap_install () { install -d ${D}${PYTHON_SITEPACKAGES_DIR} - unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PIP_INSTALL_DIST_PATH}/*.whl + unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PEP517_WHEEL_PATH}/*.whl } EXPORT_FUNCTIONS do_install
meta/classes/setuptools3.bbclass +4 -4
@@ -1,4 +1,4 @@ -inherit setuptools3-base pip_install_wheel +inherit setuptools3-base python_pep517 # bdist_wheel builds in ./dist #B = "${WORKDIR}/build"
@@ -17,14 +17,14 @@ setuptools3_do_compile() { STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ - bdist_wheel --verbose --dist-dir ${PIP_INSTALL_DIST_PATH} ${SETUPTOOLS_BUILD_ARGS} || \ + bdist_wheel --verbose --dist-dir ${PEP517_WHEEL_PATH} ${SETUPTOOLS_BUILD_ARGS} || \ bbfatal_log "'${PYTHON_PN} setup.py bdist_wheel ${SETUPTOOLS_BUILD_ARGS}' execution failed." } setuptools3_do_compile[vardepsexclude] = "MACHINE" -do_compile[cleandirs] += "${PIP_INSTALL_DIST_PATH}" +do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" setuptools3_do_install() { - pip_install_wheel_do_install + python_pep517_do_install } EXPORT_FUNCTIONS do_configure do_compile do_install
meta/classes/setuptools_build_meta.bbclass +3 -3
@@ -1,4 +1,4 @@ -inherit pip_install_wheel setuptools3-base +inherit setuptools3-base python_pep517 DEPENDS += "python3-setuptools-native python3-wheel-native"
@@ -12,8 +12,8 @@ setuptools_build_meta_do_configure () { # TODO: ideally this uses pypa/build setuptools_build_meta_do_compile () { cd ${PEP517_SOURCE_PATH} - nativepython3 -c "from setuptools import build_meta; build_meta.build_wheel('${PIP_INSTALL_DIST_PATH}')" + nativepython3 -c "from setuptools import build_meta; build_meta.build_wheel('${PEP517_WHEEL_PATH}')" } -do_compile[cleandirs] += "${PIP_INSTALL_DIST_PATH}" +do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" EXPORT_FUNCTIONS do_configure do_compile
meta/recipes-devtools/python/python3-flit-core_3.7.1.bb +1 -1
@@ -21,7 +21,7 @@ PYPI_PACKAGE = "flit" PEP517_SOURCE_PATH = "${S}/flit_core" do_install:class-native () { - pip_install_wheel_do_bootstrap_install + python_pep517_do_bootstrap_install } PACKAGES =+ "${PN}-tests"
meta/recipes-devtools/python/python3-wheel_0.37.1.bb +1 -1
@@ -13,7 +13,7 @@ SRC_URI += " file://0001-Backport-pyproject.toml-from-flit-backend-branch.patch" DEPENDS:remove:class-native = "python3-pip-native" do_install:class-native () { - pip_install_wheel_do_bootstrap_install + python_pep517_do_bootstrap_install # pip install would normally generate [project.scripts] in ${bindir} install -d ${D}/${bindir}
Signature · 1 line
2.25.1
Re: [OE-core] [PATCH 2/2] meta: rename pip_install_wheel.bbclass to python_pep517.bbclass
A fixup failed to land in this, v2 incoming.
Ross
Quoted 192 lines · Ross Burton via lists.openembedded.org
pip_install_wheelshouldn't restricted to just using Pip to install wheels (the installer module is simplier and likely a better option), and in the future may be extended to also providedo_compile()using the build module.Signed-off-by Ross Burton <[email protected]>--- meta/classes/flit_core.bbclass | 6 ++--- ...ll_wheel.bbclass => python_pep517.bbclass} | 27 ++++++++++--------- meta/classes/setuptools3.bbclass | 8 +++--- meta/classes/setuptools_build_meta.bbclass | 6 ++--- .../python/python3-flit-core_3.7.1.bb | 2 +- .../python/python3-wheel_0.37.1.bb | 2 +- 6 files changed, 27 insertions(+), 24 deletions(-) rename meta/classes/{pip_install_wheel.bbclass => python_pep517.bbclass} (56%)meta/classes/flit_core.bbclass +3
-3@@ -1,4 +1,4 @@ -inherit pip_install_wheel python3native python3-dir setuptools3-base +inherit python_pep517 python3native python3-dir setuptools3-base DEPENDS += "python3 python3-flit-core-native"@@ -12,8 +12,8 @@ PEP517_SOURCE_PATH ?= "${S}" # TODO: ideally this uses pypa/build flit_core_do_compile () { cd ${PEP517_SOURCE_PATH} - nativepython3 -mflit_core.wheel --outdir ${PIP_INSTALL_DIST_PATH} + nativepython3 -mflit_core.wheel --outdir ${PEP517_WHEEL_PATH} } -do_compile[cleandirs] += "${PIP_INSTALL_DIST_PATH}" +do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" EXPORT_FUNCTIONS do_configure do_compilemeta/classes/python_pep517.bbclass renamed from meta/classes/pip_install_wheel.bbclass +15
-12@@ -1,9 +1,12 @@ +# Common infrastructure for Python packages that use PEP-517 compliant packaging. +# https://www.python.org/dev/peps/pep-0517/ + DEPENDS:append = " python3-pip-native" # The directory where wheels should be written too. Build classes # will ideally [cleandirs] this but we don't do that here in case # a recipe wants to install prebuilt wheels. -PIP_INSTALL_DIST_PATH ?= "${WORKDIR}/dist" +PEP517_WHEEL_PATH ?= "${WORKDIR}/dist" PIP_INSTALL_ARGS = "\ -vvvv \@@ -15,24 +18,24 @@ PIP_INSTALL_ARGS = "\ --prefix=${prefix} \ " -PIP_INSTALL_PYTHON = "python3" -PIP_INSTALL_PYTHON:class-native = "nativepython3" +PEP517_INSTALL_PYTHON = "python3" +PEP517_INSTALL_PYTHON:class-native = "nativepython3" -pip_install_wheel_do_install () { - COUNT=$(find ${PIP_INSTALL_DIST_PATH} -name '*.whl' | wc -l) +python_pep517_do_install () { + COUNT=$(find ${PEP517_WHEEL_PATH} -name '*.whl' | wc -l) if test $COUNT -eq 0; then - bbfatal No wheels found in ${PIP_INSTALL_DIST_PATH} + bbfatal No wheels found in ${PEP517_WHEEL_PATH} elif test $COUNT -gt 1; then - bbfatal More than one wheel found in ${PIP_INSTALL_DIST_PATH}, this should not happen + bbfatal More than one wheel found in ${PEP517_WHEEL_PATH}, this should not happen fi - nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PIP_INSTALL_DIST_PATH}/*.whl + nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PEP517_WHEEL_PATH}/*.whl cd ${D} for i in ${D}${bindir}/* ${D}${sbindir}/*; do if [ -f "$i" ]; then - sed -i -e "1s,#!.*nativepython3,#!${USRBINPATH}/env ${PIP_INSTALL_PYTHON}," $i - sed -i -e "s:${PYTHON}:${USRBINPATH}/env\ ${PIP_INSTALL_PYTHON}:g" $i + sed -i -e "1s,#!.*nativepython3,#!${USRBINPATH}/env ${PEP517_INSTALL_PYTHON}," $i + sed -i -e "s:${PYTHON}:${USRBINPATH}/env\ ${PEP517_INSTALL_PYTHON}:g" $i sed -i -e "s:${STAGING_BINDIR_NATIVE}:${bindir}:g" $i # Not everything we find may be Python, so ignore errors nativepython3 -mpy_compile $(realpath --relative-to=${D} $i) || true@@ -41,9 +44,9 @@ pip_install_wheel_do_install () { } # A manual do_install that just uses unzip for bootstrapping purposes. Callers should DEPEND on unzip-native. -pip_install_wheel_do_bootstrap_install () { +python_pep517_do_bootstrap_install () { install -d ${D}${PYTHON_SITEPACKAGES_DIR} - unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PIP_INSTALL_DIST_PATH}/*.whl + unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PEP517_WHEEL_PATH}/*.whl } EXPORT_FUNCTIONS do_installmeta/classes/setuptools3.bbclass +4
-4@@ -1,4 +1,4 @@ -inherit setuptools3-base pip_install_wheel +inherit setuptools3-base python_pep517 # bdist_wheel builds in ./dist #B = "${WORKDIR}/build"@@ -17,14 +17,14 @@ setuptools3_do_compile() { STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ - bdist_wheel --verbose --dist-dir ${PIP_INSTALL_DIST_PATH} ${SETUPTOOLS_BUILD_ARGS} || \ + bdist_wheel --verbose --dist-dir ${PEP517_WHEEL_PATH} ${SETUPTOOLS_BUILD_ARGS} || \ bbfatal_log "'${PYTHON_PN} setup.py bdist_wheel ${SETUPTOOLS_BUILD_ARGS}' execution failed." } setuptools3_do_compile[vardepsexclude] = "MACHINE" -do_compile[cleandirs] += "${PIP_INSTALL_DIST_PATH}" +do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" setuptools3_do_install() { - pip_install_wheel_do_install + python_pep517_do_install } EXPORT_FUNCTIONS do_configure do_compile do_installmeta/classes/setuptools_build_meta.bbclass +3
-3@@ -1,4 +1,4 @@ -inherit pip_install_wheel setuptools3-base +inherit setuptools3-base python_pep517 DEPENDS += "python3-setuptools-native python3-wheel-native"@@ -12,8 +12,8 @@ setuptools_build_meta_do_configure () { # TODO: ideally this uses pypa/build setuptools_build_meta_do_compile () { cd ${PEP517_SOURCE_PATH} - nativepython3 -c "from setuptools import build_meta; build_meta.build_wheel('${PIP_INSTALL_DIST_PATH}')" + nativepython3 -c "from setuptools import build_meta; build_meta.build_wheel('${PEP517_WHEEL_PATH}')" } -do_compile[cleandirs] += "${PIP_INSTALL_DIST_PATH}" +do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" EXPORT_FUNCTIONS do_configure do_compilemeta/recipes-devtools/python/python3-flit-core_3.7.1.bb +1
-1@@ -21,7 +21,7 @@ PYPI_PACKAGE = "flit" PEP517_SOURCE_PATH = "${S}/flit_core" do_install:class-native () { - pip_install_wheel_do_bootstrap_install + python_pep517_do_bootstrap_install } PACKAGES =+ "${PN}-tests"meta/recipes-devtools/python/python3-wheel_0.37.1.bb +1
-2@@ -13,7 +13,7 @@ SRC_URI += " file://0001-Backport-pyproject.toml-from-flit-backend-branch.patch" DEPENDS:remove:class-native = "python3-pip-native" do_install:class-native () { - pip_install_wheel_do_bootstrap_install + python_pep517_do_bootstrap_install # pip install would normally generate [project.scripts] in ${bindir} install -d ${D}/${bindir} --2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163049): https://lists.openembedded.org/g/openembedded-core/message/163049
Mute This Topic: https://lists.openembedded.org/mt/89708482/1676615
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-