* [meta-python][PATCH 1/3] python3-markupsafe: bbappend for ptest
@ 2020-09-22 4:47 Tim Orling
2020-09-22 4:47 ` [meta-python][PATCH 2/3] python3-jinja2: " Tim Orling
2020-09-22 4:47 ` [meta-python][PATCH 3/3] packagegroup-meta-python: -jinja2 -markupsafe => -ptest Tim Orling
0 siblings, 2 replies; 4+ messages in thread
From: Tim Orling @ 2020-09-22 4:47 UTC (permalink / raw)
To: openembedded-devel; +Cc: Tim Orling
From: Tim Orling <ticotimo@gmail.com>
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.
Signed-off-by: Tim Orling <ticotimo@gmail.com>
---
.../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
diff --git a/meta-python/recipes-devtools/python/python3-markupsafe/run-ptest b/meta-python/recipes-devtools/python/python3-markupsafe/run-ptest
deleted file mode 100644
index 5cec7116968..00000000000
--- a/meta-python/recipes-devtools/python/python3-markupsafe/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest
diff --git a/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend b/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend
new file mode 100644
index 00000000000..91814e6cde9
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend
@@ -0,0 +1,2 @@
+# Main recipe was moved to oe-core, but with ptest disabled
+inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)}
diff --git a/meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb b/meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb
deleted file mode 100644
index 7de57cbd636..00000000000
--- a/meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb
+++ /dev/null
@@ -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/
-}
--
2.25.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-python][PATCH 2/3] python3-jinja2: bbappend for ptest
2020-09-22 4:47 [meta-python][PATCH 1/3] python3-markupsafe: bbappend for ptest Tim Orling
@ 2020-09-22 4:47 ` Tim Orling
2020-09-22 4:47 ` [meta-python][PATCH 3/3] packagegroup-meta-python: -jinja2 -markupsafe => -ptest Tim Orling
1 sibling, 0 replies; 4+ messages in thread
From: Tim Orling @ 2020-09-22 4:47 UTC (permalink / raw)
To: openembedded-devel; +Cc: Tim Orling
From: Tim Orling <ticotimo@gmail.com>
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.
Signed-off-by: Tim Orling <ticotimo@gmail.com>
---
.../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
diff --git a/meta-python/recipes-devtools/python/python3-jinja2/run-ptest b/meta-python/recipes-devtools/python/python3-jinja2/run-ptest
deleted file mode 100644
index 5cec7116968..00000000000
--- a/meta-python/recipes-devtools/python/python3-jinja2/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest
diff --git a/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend b/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend
new file mode 100644
index 00000000000..91814e6cde9
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend
@@ -0,0 +1,2 @@
+# Main recipe was moved to oe-core, but with ptest disabled
+inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)}
diff --git a/meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb b/meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb
deleted file mode 100644
index 681acf8f1c0..00000000000
--- a/meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Python Jinja2: A small but fast and easy to use stand-alone template engine written in pure python."
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462"
-
-SRC_URI[sha256sum] = "89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0"
-
-PYPI_PACKAGE = "Jinja2"
-
-CLEANBROKEN = "1"
-
-inherit pypi setuptools3 ptest
-
-SRC_URI += " \
- file://run-ptest \
-"
-
-do_install_ptest() {
- install -d ${D}${PTEST_PATH}/tests
- cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
-
-RDEPENDS_${PN}-ptest += " \
- ${PYTHON_PN}-pytest \
- ${PYTHON_PN}-unixadmin \
-"
-
-RDEPENDS_${PN} += " \
- ${PYTHON_PN}-asyncio \
- ${PYTHON_PN}-crypt \
- ${PYTHON_PN}-io \
- ${PYTHON_PN}-json \
- ${PYTHON_PN}-markupsafe \
- ${PYTHON_PN}-math \
- ${PYTHON_PN}-netclient \
- ${PYTHON_PN}-numbers\
- ${PYTHON_PN}-pickle \
- ${PYTHON_PN}-pprint \
- ${PYTHON_PN}-shell \
- ${PYTHON_PN}-threading \
-"
-
-BBCLASSEXTEND = "native nativesdk"
--
2.25.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-python][PATCH 3/3] packagegroup-meta-python: -jinja2 -markupsafe => -ptest
2020-09-22 4:47 [meta-python][PATCH 1/3] python3-markupsafe: bbappend for ptest Tim Orling
2020-09-22 4:47 ` [meta-python][PATCH 2/3] python3-jinja2: " Tim Orling
@ 2020-09-22 4:47 ` Tim Orling
2020-09-22 5:23 ` [oe] " Khem Raj
1 sibling, 1 reply; 4+ messages in thread
From: Tim Orling @ 2020-09-22 4:47 UTC (permalink / raw)
To: openembedded-devel; +Cc: Tim Orling
From: Tim Orling <ticotimo@gmail.com>
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 <ticotimo@gmail.com>
---
.../recipes-core/packagegroups/packagegroup-meta-python.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index c03f610da8d..e1624df6e7b 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [oe] [meta-python][PATCH 3/3] packagegroup-meta-python: -jinja2 -markupsafe => -ptest
2020-09-22 4:47 ` [meta-python][PATCH 3/3] packagegroup-meta-python: -jinja2 -markupsafe => -ptest Tim Orling
@ 2020-09-22 5:23 ` Khem Raj
0 siblings, 0 replies; 4+ messages in thread
From: Khem Raj @ 2020-09-22 5:23 UTC (permalink / raw)
To: Tim Orling; +Cc: openembeded-devel
please rebase it on latest master and resend.
On Mon, Sep 21, 2020 at 9:47 PM Tim Orling <ticotimo@gmail.com> wrote:
>
> From: Tim Orling <ticotimo@gmail.com>
>
> 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 <ticotimo@gmail.com>
> ---
> .../recipes-core/packagegroups/packagegroup-meta-python.bb | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
> index c03f610da8d..e1624df6e7b 100644
> --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
> +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
> @@ -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
>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-22 5:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-22 4:47 [meta-python][PATCH 1/3] python3-markupsafe: bbappend for ptest Tim Orling
2020-09-22 4:47 ` [meta-python][PATCH 2/3] python3-jinja2: " Tim Orling
2020-09-22 4:47 ` [meta-python][PATCH 3/3] packagegroup-meta-python: -jinja2 -markupsafe => -ptest Tim Orling
2020-09-22 5:23 ` [oe] " Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.