python3-markupsafe: bbappend for ptest
PATCH 1/3 python3-markupsafe: bbappend for ptest
From: Tim Orling <[email protected]>
The main recipe has moved to oe-core, but with ptest disabled. Here we simply conditionally inherit ptest to enable it in meta-python.
Remove the original recipe and the python3-markupsafe/ directory.
--- .../python/python3-markupsafe/run-ptest | 3 --- .../python/python3-markupsafe_1.%.bbappend | 2 ++ .../python/python3-markupsafe_1.1.1.bb | 27 ------------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-markupsafe/run-ptest create mode 100644 meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend delete mode 100644 meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb
meta-python/recipes-devtools/python/python3-markupsafe/run-ptest deleted +0 -3
@@ -1,3 +0,0 @@ -#!/bin/sh - -pytest
meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend new file +2 -0
@@ -0,0 +1,2 @@ +# Main recipe was moved to oe-core, but with ptest disabled +inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)}
meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb deleted +0 -27
@@ -1,27 +0,0 @@ -DESCRIPTION = "Implements a XML/HTML/XHTML Markup safe string for Python" -HOMEPAGE = "http://github.com/mitsuhiko/markupsafe" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" - -SRC_URI[md5sum] = "43fd756864fe42063068e092e220c57b" -SRC_URI[sha256sum] = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b" - -PYPI_PACKAGE = "MarkupSafe" -inherit pypi ptest setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-stringold" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -f ${S}/tests/* ${D}${PTEST_PATH}/tests/ -}
Signature · 1 line
2.25.0
PATCH 2/3 python3-jinja2: bbappend for ptest
From: Tim Orling <[email protected]>
The main recipe has moved to oe-core, but with ptest disabled. Here we simply conditionally inherit ptest to enable it in meta-python.
Remove the original recipe and the python3-jinja2/ directory.
--- .../python/python3-jinja2/run-ptest | 3 -- .../python/python3-jinja2_2.%.bbappend | 2 + .../python/python3-jinja2_2.11.2.bb | 43 ------------------- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-jinja2/run-ptest create mode 100644 meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend delete mode 100644 meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb
meta-python/recipes-devtools/python/python3-jinja2/run-ptest deleted +0 -3
@@ -1,3 +0,0 @@ -#!/bin/sh - -pytest
meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend new file +2 -0
@@ -0,0 +1,2 @@ +# Main recipe was moved to oe-core, but with ptest disabled +inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)}
meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb deleted +0 -43
43 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH 3/3 packagegroup-meta-python: -jinja2 -markupsafe => -ptest
In reply to Tim OrlingFrom: Tim Orling <[email protected]>
The main recipes for python3-jinja2 and python3-markupsafe have moved to oe-core. No need to duplicate them here.
Instead, we add them to meta-python3-ptest sub-package, since we do enable ptest with bbappends.
--- .../recipes-core/packagegroups/packagegroup-meta-python.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +3 -3
@@ -17,13 +17,13 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-rfc3987 python3-xlrd python3-bandit python3-constantly python3-inflection \ python3-javaobj-py3 python3-sh python3-pycrypto python3-pyasn1 python3-pydbus python3-wtforms \ python3-pybluez python3-babel python3-parse-type python3-bitarray python3-django-south \ - python3-pyusb python3-prctl python3-jinja2 python3-werkzeug python3-pyjks python3-requests-ftp \ + python3-pyusb python3-prctl python3-werkzeug python3-pyjks python3-requests-ftp \ python3-behave python3-pyyaml python3-tzlocal python3-pretend python3-stevedore \ python3-sijax python3-langtable python3-requests-file python3-crcmod python3-robotframework \ python3-pint python3-coverage python3-iso8601 python3-ndg-httpsclient python3-yappi python3-twofish \ python3-speaklater python3-smbus python3-djangorestframework python3-msgpack python3-jsonpointer \ python3-flask-script python3-cassandra-driver python3-ujson python3-aws-iot-device-sdk-python \ - python3-pytest-runner python3-pyiface python3-flask-login python3-markupsafe python3-setuptools-scm \ + python3-pytest-runner python3-pyiface python3-flask-login python3-setuptools-scm \ python3-semver python3-sdnotify python3-flask-user python3-tornado python3-jsonpatch python3-pexpect \ python3-progress python3-jsonschema python3-xstatic python3-pyroute2 python3-idna python3-sqlalchemy \ python3-urllib3 python3-flask-mail python3-asn1crypto python3-pyinotify python3-intervals python3-pyperclip \
@@ -68,7 +68,7 @@ RDEPENDS_packagegroup-meta-python3-connectivity = "\ " RDEPENDS_packagegroup-meta-python3-ptest = "\ - python3-cryptography \ + python3-cryptography python3-jinja2 python3-markupsafe \ " EXCLUDE_FROM_WORLD = "1"
Signature · 1 line
2.25.0
Re: [oe] [meta-python][PATCH 3/3] packagegroup-meta-python: -jinja2 -markupsafe => -ptest
please rebase it on latest master and resend.
Quoted 49 lines · Tim Orling
From: Tim Orling <[email protected]>
The main recipes for python3-jinja2 and python3-markupsafe have moved to oe-core. No need to duplicate them here.
Instead, we add them to meta-python3-ptest sub-package, since we do enable ptest with bbappends.
Signed-off-by Tim Orling <[email protected]>--- .../recipes-core/packagegroups/packagegroup-meta-python.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +3
-4@@ -17,13 +17,13 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-rfc3987 python3-xlrd python3-bandit python3-constantly python3-inflection \ python3-javaobj-py3 python3-sh python3-pycrypto python3-pyasn1 python3-pydbus python3-wtforms \ python3-pybluez python3-babel python3-parse-type python3-bitarray python3-django-south \ - python3-pyusb python3-prctl python3-jinja2 python3-werkzeug python3-pyjks python3-requests-ftp \ + python3-pyusb python3-prctl python3-werkzeug python3-pyjks python3-requests-ftp \ python3-behave python3-pyyaml python3-tzlocal python3-pretend python3-stevedore \ python3-sijax python3-langtable python3-requests-file python3-crcmod python3-robotframework \ python3-pint python3-coverage python3-iso8601 python3-ndg-httpsclient python3-yappi python3-twofish \ python3-speaklater python3-smbus python3-djangorestframework python3-msgpack python3-jsonpointer \ python3-flask-script python3-cassandra-driver python3-ujson python3-aws-iot-device-sdk-python \ - python3-pytest-runner python3-pyiface python3-flask-login python3-markupsafe python3-setuptools-scm \ + python3-pytest-runner python3-pyiface python3-flask-login python3-setuptools-scm \ python3-semver python3-sdnotify python3-flask-user python3-tornado python3-jsonpatch python3-pexpect \ python3-progress python3-jsonschema python3-xstatic python3-pyroute2 python3-idna python3-sqlalchemy \ python3-urllib3 python3-flask-mail python3-asn1crypto python3-pyinotify python3-intervals python3-pyperclip \@@ -68,7 +68,7 @@ RDEPENDS_packagegroup-meta-python3-connectivity = "\ " RDEPENDS_packagegroup-meta-python3-ptest = "\ - python3-cryptography \ + python3-cryptography python3-jinja2 python3-markupsafe \ " EXCLUDE_FROM_WORLD = "1" --2.25.0