summaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2021-07-20 18:30:51 +0200
committerArmin Kuster <akuster808@gmail.com>2021-07-25 13:36:16 -0700
commitd34d040fdaf199cee2a956b09a448aa8d9aa8fe9 (patch)
treeaf806fd4788c52c7df685cd6f33be5bc3ed92766 /meta-python
parent8bdc78483115e12943f0946c8e863d4a70ef7168 (diff)
downloadmeta-openembedded-d34d040fdaf199cee2a956b09a448aa8d9aa8fe9.tar.gz
python3-{pyyaml,cython,pyparsing}: move from meta-python to meta-oe
This specific statement in ostree recipe breaks the YP compatible status (yocto-check-layer): RDEPENDS_${PN}-ptest += " \ ... ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \ ... " Recently python3-pyyaml was moved to OE-core (0a8600f9cec0), and the ostree recipe was fixed with: b9ede0cb182a (python3-pyyaml: Do not check for meta-python) In dunfell, moving python3-pyyaml to OE-core is not a great idea, but moving it from meta-python to meta-oe allows us to fix ostree YP compatible issue. Since meta-python depends on meta-oe, it should not be a change with any visible effect. python3-cython and python3-pyparsing are collateral damages since they are dependency for python3-pyyaml, so needed to be moved too. Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-devtools/python/python-cython.inc40
-rw-r--r--meta-python/recipes-devtools/python/python3-cython_0.29.14.bb18
-rw-r--r--meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb21
-rw-r--r--meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb18
4 files changed, 0 insertions, 97 deletions
diff --git a/meta-python/recipes-devtools/python/python-cython.inc b/meta-python/recipes-devtools/python/python-cython.inc
deleted file mode 100644
index 3260e92bac..0000000000
--- a/meta-python/recipes-devtools/python/python-cython.inc
+++ /dev/null
@@ -1,40 +0,0 @@
1DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \
2It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \
3and the messy, low-level world of C."
4SECTION = "devel/python"
5LICENSE = "Apache-2.0"
6LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa"
7PYPI_PACKAGE = "Cython"
8BBCLASSEXTEND = "native nativesdk"
9
10SRC_URI[md5sum] = "6e2f139e30bb08d68366f9370d87964c"
11SRC_URI[sha256sum] = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414"
12
13inherit pypi
14
15RDEPENDS_${PN}_class-target += "\
16 ${PYTHON_PN}-misc \
17 ${PYTHON_PN}-netserver \
18 ${PYTHON_PN}-pkgutil \
19 ${PYTHON_PN}-pyparsing \
20 ${PYTHON_PN}-setuptools \
21 ${PYTHON_PN}-shell \
22 ${PYTHON_PN}-xml \
23"
24
25RDEPENDS_${PN}_class-nativesdk += "\
26 nativesdk-${PYTHON_PN}-misc \
27 nativesdk-${PYTHON_PN}-netserver \
28 nativesdk-${PYTHON_PN}-pkgutil \
29 nativesdk-${PYTHON_PN}-pyparsing \
30 nativesdk-${PYTHON_PN}-setuptools \
31 nativesdk-${PYTHON_PN}-shell \
32 nativesdk-${PYTHON_PN}-xml \
33"
34
35do_install_append() {
36 # Make sure we use /usr/bin/env python
37 for PYTHSCRIPT in `grep -rIl '^#!.*python' ${D}`; do
38 sed -i -e '1s|^#!.*|#!/usr/bin/env ${PYTHON_PN}|' $PYTHSCRIPT
39 done
40}
diff --git a/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb b/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb
deleted file mode 100644
index 2ce6bdbd68..0000000000
--- a/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1inherit setuptools3
2require python-cython.inc
3
4RDEPENDS_${PN} += "\
5 python3-setuptools \
6"
7
8# running build_ext a second time during install fails, because Python
9# would then attempt to import cythonized modules built for the target
10# architecture.
11DISTUTILS_INSTALL_ARGS += "--skip-build"
12
13do_install_append() {
14 # rename scripts that would conflict with the Python 2 build of Cython
15 mv ${D}${bindir}/cython ${D}${bindir}/cython3
16 mv ${D}${bindir}/cythonize ${D}${bindir}/cythonize3
17 mv ${D}${bindir}/cygdb ${D}${bindir}/cygdb3
18}
diff --git a/meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb b/meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb
deleted file mode 100644
index a6ec1cb9c3..0000000000
--- a/meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1SUMMARY = "Python parsing module"
2HOMEPAGE = "http://pyparsing.wikispaces.com/"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1"
5
6SRC_URI[md5sum] = "29733ea8cbee0291aad121c69c6e51a1"
7SRC_URI[sha256sum] = "4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f"
8
9inherit pypi setuptools3
10
11RDEPENDS_${PN} += " \
12 ${PYTHON_PN}-datetime \
13 ${PYTHON_PN}-debugger \
14 ${PYTHON_PN}-json \
15 ${PYTHON_PN}-netclient \
16 ${PYTHON_PN}-pprint \
17 ${PYTHON_PN}-stringold \
18 ${PYTHON_PN}-threading \
19"
20
21BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb b/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb
deleted file mode 100644
index 8cf9093041..0000000000
--- a/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1SUMMARY = "Python support for YAML"
2DEPENDS += "libyaml ${PYTHON_PN}-cython-native"
3
4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=7bbd28caa69f81f5cd5f48647236663d"
6
7PYPI_PACKAGE = "PyYAML"
8
9inherit pypi setuptools3
10
11SRC_URI[sha256sum] = "b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d"
12
13RDEPENDS_${PN} += "\
14 ${PYTHON_PN}-datetime \
15 ${PYTHON_PN}-netclient \
16"
17
18BBCLASSEXTEND = "native nativesdk"