* [PATCH v3 1/8] python3-numpy: Upgrade to 1.19.4
@ 2020-11-20 17:29 Khem Raj
2020-11-20 17:29 ` [PATCH v3 2/8] python3-hypothesis: Add recipe Khem Raj
` (6 more replies)
0 siblings, 7 replies; 13+ messages in thread
From: Khem Raj @ 2020-11-20 17:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Unify inc file into single recipe, py2 is gone
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/python-numpy/python3-numpy_1.19.3.bb | 3 ---
.../{python-numpy.inc => python3-numpy_1.19.4.bb} | 6 ++++--
2 files changed, 4 insertions(+), 5 deletions(-)
delete mode 100644 meta/recipes-devtools/python-numpy/python3-numpy_1.19.3.bb
rename meta/recipes-devtools/python-numpy/{python-numpy.inc => python3-numpy_1.19.4.bb} (94%)
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.3.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.3.bb
deleted file mode 100644
index d388e88d25..0000000000
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.3.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit setuptools3
-require python-numpy.inc
-
diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
similarity index 94%
rename from meta/recipes-devtools/python-numpy/python-numpy.inc
rename to meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
index 40f81046ee..d54f2f6c18 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy.inc
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
@@ -8,14 +8,16 @@ SRCNAME = "numpy"
SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \
file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
file://0001-numpy-core-Define-RISCV-32-support.patch \
- "
-SRC_URI[sha256sum] = "9179d259a9bc53ed7b153d31fc3156d1ca560d61079f53191cf177c3efc4a498"
+"
+SRC_URI[sha256sum] = "fe836a685d6838dbb3f603caef01183ea98e88febf4ce956a2ea484a75378413"
UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
DEPENDS += "python3-cython-native"
+inherit setuptools3
+
S = "${WORKDIR}/numpy-${PV}"
CLEANBROKEN = "1"
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 2/8] python3-hypothesis: Add recipe
2020-11-20 17:29 [PATCH v3 1/8] python3-numpy: Upgrade to 1.19.4 Khem Raj
@ 2020-11-20 17:29 ` Khem Raj
2020-11-20 17:29 ` [PATCH v3 3/8] python3-sortedcontainers: " Khem Raj
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Khem Raj @ 2020-11-20 17:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Its used in many python packages for testing eg. numpy
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../python/python3-hypothesis_5.41.2.bb | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3-hypothesis_5.41.2.bb
diff --git a/meta/recipes-devtools/python/python3-hypothesis_5.41.2.bb b/meta/recipes-devtools/python/python3-hypothesis_5.41.2.bb
new file mode 100644
index 0000000000..d6b85089d2
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-hypothesis_5.41.2.bb
@@ -0,0 +1,14 @@
+SUMMARY = "A library for property-based testing"
+HOMEPAGE = "https://github.com/HypothesisWorks/hypothesis/tree/master/hypothesis-python"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4ee62c16ebd0f4f99d906f36b7de8c3c"
+
+PYPI_PACKAGE = "hypothesis"
+
+inherit pypi setuptools3
+
+SRC_URI[sha256sum] = "f8c281355aaba1da696e40f1488c2bb47c42660424f5750daea45a85e2d047b3"
+
+RDEPENDS_${PN} += "python3-core"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 3/8] python3-sortedcontainers: Add recipe
2020-11-20 17:29 [PATCH v3 1/8] python3-numpy: Upgrade to 1.19.4 Khem Raj
2020-11-20 17:29 ` [PATCH v3 2/8] python3-hypothesis: Add recipe Khem Raj
@ 2020-11-20 17:29 ` Khem Raj
2020-11-20 17:29 ` [PATCH v3 4/8] python-numpy: Add ptest Khem Raj
` (4 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Khem Raj @ 2020-11-20 17:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Used in some python package testing infrastructures
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../python/python3-sortedcontainers_2.3.0.bb | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3-sortedcontainers_2.3.0.bb
diff --git a/meta/recipes-devtools/python/python3-sortedcontainers_2.3.0.bb b/meta/recipes-devtools/python/python3-sortedcontainers_2.3.0.bb
new file mode 100644
index 0000000000..6060c03723
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-sortedcontainers_2.3.0.bb
@@ -0,0 +1,9 @@
+SUMMARY = "Sorted Containers is an Apache2 licensed sorted collections library, written in pure-Python, and fast as C-extensions."
+HOMEPAGE = "http://www.grantjenks.com/docs/sortedcontainers/"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7c7c6a1a12ec816da16c1839137d53ae"
+
+inherit pypi setuptools3
+SRC_URI[sha256sum] = "59cc937650cf60d677c16775597c89a960658a09cf7c1a668f86e1e4464b10a1"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 4/8] python-numpy: Add ptest
2020-11-20 17:29 [PATCH v3 1/8] python3-numpy: Upgrade to 1.19.4 Khem Raj
2020-11-20 17:29 ` [PATCH v3 2/8] python3-hypothesis: Add recipe Khem Raj
2020-11-20 17:29 ` [PATCH v3 3/8] python3-sortedcontainers: " Khem Raj
@ 2020-11-20 17:29 ` Khem Raj
2020-11-28 18:56 ` [OE-core] " Tim Orling
2020-11-20 17:29 ` [PATCH v3 5/8] python3-numpy: Add ldd runtime dependency on ptest package Khem Raj
` (3 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Khem Raj @ 2020-11-20 17:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Since 1.15, numpy have replaced nose with pytest testing framework
it additionally needs hypothesis and sortedcontainers modules
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/python-numpy/files/run-ptest | 5 +++++
meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb | 7 +++++--
2 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/python-numpy/files/run-ptest
diff --git a/meta/recipes-devtools/python-numpy/files/run-ptest b/meta/recipes-devtools/python-numpy/files/run-ptest
new file mode 100644
index 0000000000..9a1c72aeb1
--- /dev/null
+++ b/meta/recipes-devtools/python-numpy/files/run-ptest
@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+import numpy
+numpy.test(label='full', verbose=2)
+
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
index d54f2f6c18..b484e7cddc 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
@@ -8,6 +8,7 @@ SRCNAME = "numpy"
SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \
file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
file://0001-numpy-core-Define-RISCV-32-support.patch \
+ file://run-ptest \
"
SRC_URI[sha256sum] = "fe836a685d6838dbb3f603caef01183ea98e88febf4ce956a2ea484a75378413"
@@ -16,7 +17,7 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
DEPENDS += "python3-cython-native"
-inherit setuptools3
+inherit ptest setuptools3
S = "${WORKDIR}/numpy-${PV}"
@@ -30,7 +31,6 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
${PYTHON_PN}-pprint \
${PYTHON_PN}-pickle \
${PYTHON_PN}-shell \
- ${PYTHON_PN}-nose \
${PYTHON_PN}-doctest \
${PYTHON_PN}-datetime \
${PYTHON_PN}-distutils \
@@ -39,6 +39,9 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
${PYTHON_PN}-netclient \
${PYTHON_PN}-numbers \
${PYTHON_PN}-pydoc \
+ ${PYTHON_PN}-pytest \
+ ${PYTHON_PN}-hypothesis \
+ ${PYTHON_PN}-sortedcontainers \
${PYTHON_PN}-pkgutil \
${PYTHON_PN}-email \
${PYTHON_PN}-compression \
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 5/8] python3-numpy: Add ldd runtime dependency on ptest package
2020-11-20 17:29 [PATCH v3 1/8] python3-numpy: Upgrade to 1.19.4 Khem Raj
` (2 preceding siblings ...)
2020-11-20 17:29 ` [PATCH v3 4/8] python-numpy: Add ptest Khem Raj
@ 2020-11-20 17:29 ` Khem Raj
2020-11-20 17:29 ` [PATCH v3 6/8] python3-pytest: Add recipe Khem Raj
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Khem Raj @ 2020-11-20 17:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Fixes
E RuntimeError: command ['ldd'] cannot be run
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
index b484e7cddc..e59ea752cc 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
@@ -49,6 +49,7 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
${PYTHON_PN}-threading \
${PYTHON_PN}-multiprocessing \
"
+RDEPENDS_${PN}-ptest += "ldd"
RDEPENDS_${PN}_class-native = ""
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 6/8] python3-pytest: Add recipe
2020-11-20 17:29 [PATCH v3 1/8] python3-numpy: Upgrade to 1.19.4 Khem Raj
` (3 preceding siblings ...)
2020-11-20 17:29 ` [PATCH v3 5/8] python3-numpy: Add ldd runtime dependency on ptest package Khem Raj
@ 2020-11-20 17:29 ` Khem Raj
2020-11-20 17:35 ` [OE-core] " Richard Purdie
2020-11-20 17:29 ` [PATCH v3 7/8] maintainers: Add myself for new pytest related recipes Khem Raj
2020-11-20 17:29 ` [PATCH v3 8/8] python3-pytest: Upgrade to 6.1.2 Khem Raj
6 siblings, 1 reply; 13+ messages in thread
From: Khem Raj @ 2020-11-20 17:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Moved to OE-Core from meta-python
There are several recipes in various layers which use pytest framework
some of them being in OE-Core, this will help to keep this in core
recipe metadata
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...he-setup_requires-for-setuptools-scm.patch | 39 +++++++++++++++++++
.../python/python3-pytest_6.1.0.bb | 38 ++++++++++++++++++
2 files changed, 77 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
create mode 100644 meta/recipes-devtools/python/python3-pytest_6.1.0.bb
diff --git a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
new file mode 100644
index 0000000000..8c5c17247e
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
@@ -0,0 +1,39 @@
+From ff784f4803ab33f5e3389e40d038d52d1e211843 Mon Sep 17 00:00:00 2001
+From: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
+Date: Wed, 28 Aug 2019 16:12:27 +0900
+Subject: [PATCH] [PATCH] setup.py: remove the setup_requires for
+ setuptools-scm
+
+The setup_requires argument forces the download of the egg file for setuptools-scm
+during the do_compile phase. This download is incompatible with the typical fetch
+and mirror structure. The only usage of scm is the generation of the _version.py
+file and in the release tarball it is already correctly created
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Derek Straka <derek@asterius.io>
+
+Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
+
+Rebase for pytest 6.1.0.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ setup.cfg | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 60f6564..c4d1471 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -55,7 +55,6 @@ package_dir =
+ =src
+ setup_requires =
+ setuptools>=40.0
+- setuptools-scm
+ zip_safe = no
+
+ [options.entry_points]
+--
+2.17.1
+
diff --git a/meta/recipes-devtools/python/python3-pytest_6.1.0.bb b/meta/recipes-devtools/python/python3-pytest_6.1.0.bb
new file mode 100644
index 0000000000..e3e65986db
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pytest_6.1.0.bb
@@ -0,0 +1,38 @@
+SUMMARY = "Simple powerful testing with python"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b"
+
+SRC_URI[sha256sum] = "d010e24666435b39a4cf48740b039885642b6c273a3f77be3e7e03554d2806b7"
+
+SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch "
+
+inherit update-alternatives pypi setuptools3
+
+RDEPENDS_${PN}_append_class-target = " \
+ ${PYTHON_PN}-attrs \
+ ${PYTHON_PN}-debugger \
+ ${PYTHON_PN}-doctest \
+ ${PYTHON_PN}-iniconfig \
+ ${PYTHON_PN}-json \
+ ${PYTHON_PN}-pluggy \
+ ${PYTHON_PN}-py \
+ ${PYTHON_PN}-setuptools \
+ ${PYTHON_PN}-six \
+ ${PYTHON_PN}-atomicwrites \
+ ${PYTHON_PN}-importlib-metadata \
+ ${PYTHON_PN}-pathlib2 \
+ ${PYTHON_PN}-wcwidth \
+ ${PYTHON_PN}-more-itertools \
+ ${PYTHON_PN}-packaging \
+"
+
+ALTERNATIVE_${PN} += "py.test pytest"
+
+NATIVE_LINK_NAME[pytest] = "${bindir}/pytest"
+ALTERNATIVE_TARGET[pytest] = "${bindir}/pytest"
+
+ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test"
+ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 7/8] maintainers: Add myself for new pytest related recipes
2020-11-20 17:29 [PATCH v3 1/8] python3-numpy: Upgrade to 1.19.4 Khem Raj
` (4 preceding siblings ...)
2020-11-20 17:29 ` [PATCH v3 6/8] python3-pytest: Add recipe Khem Raj
@ 2020-11-20 17:29 ` Khem Raj
2020-11-20 17:29 ` [PATCH v3 8/8] python3-pytest: Upgrade to 6.1.2 Khem Raj
6 siblings, 0 replies; 13+ messages in thread
From: Khem Raj @ 2020-11-20 17:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/conf/distro/include/maintainers.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 5349aa3971..def8098b06 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -591,6 +591,7 @@ RECIPE_MAINTAINER_pn-python3-pycryptodomex = "Joshua Watt <JPEWhacker@gmail.com>
RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
RECIPE_MAINTAINER_pn-python3-gitdb = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-hypothesis = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-python3-iniparse = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard Purdie <richard.purdie@linuxfoundation.org>"
RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <JPEWhacker@gmail.com>"
@@ -606,11 +607,13 @@ RECIPE_MAINTAINER_pn-python3-pyelftools = "Joshua Watt <JPEWhacker@gmail.com>"
RECIPE_MAINTAINER_pn-python3-pygments = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
RECIPE_MAINTAINER_pn-python3-pygobject = "Zang Ruochen <zangrc.fnst@cn.fujitsu.com>"
RECIPE_MAINTAINER_pn-python3-pyparsing = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-pytest = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-python3-scons = "Tim Orling <timothy.t.orling@linux.intel.com>"
RECIPE_MAINTAINER_pn-python3-scons-native = "Tim Orling <timothy.t.orling@linux.intel.com>"
RECIPE_MAINTAINER_pn-python3-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
RECIPE_MAINTAINER_pn-python3-six = "Zang Ruochen <zangrc.fnst@cn.fujitsu.com>"
RECIPE_MAINTAINER_pn-python3-smmap = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-sortedcontainers = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-python3-subunit = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
RECIPE_MAINTAINER_pn-python3-testtools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
RECIPE_MAINTAINER_pn-qemu = "Richard Purdie <richard.purdie@linuxfoundation.org>"
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 8/8] python3-pytest: Upgrade to 6.1.2
2020-11-20 17:29 [PATCH v3 1/8] python3-numpy: Upgrade to 1.19.4 Khem Raj
` (5 preceding siblings ...)
2020-11-20 17:29 ` [PATCH v3 7/8] maintainers: Add myself for new pytest related recipes Khem Raj
@ 2020-11-20 17:29 ` Khem Raj
6 siblings, 0 replies; 13+ messages in thread
From: Khem Raj @ 2020-11-20 17:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../{python3-pytest_6.1.0.bb => python3-pytest_6.1.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-pytest_6.1.0.bb => python3-pytest_6.1.2.bb} (92%)
diff --git a/meta/recipes-devtools/python/python3-pytest_6.1.0.bb b/meta/recipes-devtools/python/python3-pytest_6.1.2.bb
similarity index 92%
rename from meta/recipes-devtools/python/python3-pytest_6.1.0.bb
rename to meta/recipes-devtools/python/python3-pytest_6.1.2.bb
index e3e65986db..1b5139ddee 100644
--- a/meta/recipes-devtools/python/python3-pytest_6.1.0.bb
+++ b/meta/recipes-devtools/python/python3-pytest_6.1.2.bb
@@ -3,10 +3,10 @@ SUMMARY = "Simple powerful testing with python"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b"
-SRC_URI[sha256sum] = "d010e24666435b39a4cf48740b039885642b6c273a3f77be3e7e03554d2806b7"
-
SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch "
+SRC_URI[sha256sum] = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"
+
inherit update-alternatives pypi setuptools3
RDEPENDS_${PN}_append_class-target = " \
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH v3 6/8] python3-pytest: Add recipe
2020-11-20 17:29 ` [PATCH v3 6/8] python3-pytest: Add recipe Khem Raj
@ 2020-11-20 17:35 ` Richard Purdie
2020-11-20 17:43 ` Khem Raj
0 siblings, 1 reply; 13+ messages in thread
From: Richard Purdie @ 2020-11-20 17:35 UTC (permalink / raw)
To: Khem Raj, openembedded-core
On Fri, 2020-11-20 at 09:29 -0800, Khem Raj wrote:
> +RDEPENDS_${PN}_append_class-target = " \
> + ${PYTHON_PN}-attrs \
> + ${PYTHON_PN}-debugger \
> + ${PYTHON_PN}-doctest \
> + ${PYTHON_PN}-iniconfig \
> + ${PYTHON_PN}-json \
> + ${PYTHON_PN}-pluggy \
> + ${PYTHON_PN}-py \
> + ${PYTHON_PN}-setuptools \
> + ${PYTHON_PN}-six \
> + ${PYTHON_PN}-atomicwrites \
> + ${PYTHON_PN}-importlib-metadata \
> + ${PYTHON_PN}-pathlib2 \
> + ${PYTHON_PN}-wcwidth \
> + ${PYTHON_PN}-more-itertools \
> + ${PYTHON_PN}-packaging \
> +"
Do these exist in OE-Core? I think there are a lot of dependencies
pytest pulls in? I don't think this precludes the move but I'm not sure
the patchset is complete.
Cheers,
Richard
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH v3 6/8] python3-pytest: Add recipe
2020-11-20 17:35 ` [OE-core] " Richard Purdie
@ 2020-11-20 17:43 ` Khem Raj
0 siblings, 0 replies; 13+ messages in thread
From: Khem Raj @ 2020-11-20 17:43 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Fri, Nov 20, 2020 at 9:35 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Fri, 2020-11-20 at 09:29 -0800, Khem Raj wrote:
> > +RDEPENDS_${PN}_append_class-target = " \
> > + ${PYTHON_PN}-attrs \
> > + ${PYTHON_PN}-debugger \
> > + ${PYTHON_PN}-doctest \
> > + ${PYTHON_PN}-iniconfig \
> > + ${PYTHON_PN}-json \
> > + ${PYTHON_PN}-pluggy \
> > + ${PYTHON_PN}-py \
> > + ${PYTHON_PN}-setuptools \
> > + ${PYTHON_PN}-six \
> > + ${PYTHON_PN}-atomicwrites \
> > + ${PYTHON_PN}-importlib-metadata \
> > + ${PYTHON_PN}-pathlib2 \
> > + ${PYTHON_PN}-wcwidth \
> > + ${PYTHON_PN}-more-itertools \
> > + ${PYTHON_PN}-packaging \
> > +"
>
> Do these exist in OE-Core? I think there are a lot of dependencies
> pytest pulls in? I don't think this precludes the move but I'm not sure
> the patchset is complete.
>
hmm not all. I wonder if it makes sense to move these recipes as well
to support pytest in core otherwise
I guess I will just move the numpy dependencies onto PN-ptest in numpy
recipe and live with that or packageconfig it out.
> Cheers,
>
> Richard
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH v3 4/8] python-numpy: Add ptest
2020-11-20 17:29 ` [PATCH v3 4/8] python-numpy: Add ptest Khem Raj
@ 2020-11-28 18:56 ` Tim Orling
2020-11-28 21:03 ` Khem Raj
0 siblings, 1 reply; 13+ messages in thread
From: Tim Orling @ 2020-11-28 18:56 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3602 bytes --]
On Fri, Nov 20, 2020 at 9:30 AM Khem Raj <raj.khem@gmail.com> wrote:
> Since 1.15, numpy have replaced nose with pytest testing framework
> it additionally needs hypothesis and sortedcontainers modules
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-devtools/python-numpy/files/run-ptest | 5 +++++
> meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb | 7 +++++--
> 2 files changed, 10 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-devtools/python-numpy/files/run-ptest
>
> diff --git a/meta/recipes-devtools/python-numpy/files/run-ptest
> b/meta/recipes-devtools/python-numpy/files/run-ptest
> new file mode 100644
> index 0000000000..9a1c72aeb1
> --- /dev/null
> +++ b/meta/recipes-devtools/python-numpy/files/run-ptest
> @@ -0,0 +1,5 @@
> +#!/usr/bin/env python3
> +
> +import numpy
> +numpy.test(label='full', verbose=2)
> +
> diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
> b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
> index d54f2f6c18..b484e7cddc 100644
> --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
> +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
> @@ -8,6 +8,7 @@ SRCNAME = "numpy"
> SRC_URI = "
> https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz
> \
>
> file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
> file://0001-numpy-core-Define-RISCV-32-support.patch \
> + file://run-ptest \
> "
> SRC_URI[sha256sum] =
> "fe836a685d6838dbb3f603caef01183ea98e88febf4ce956a2ea484a75378413"
>
> @@ -16,7 +17,7 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
>
> DEPENDS += "python3-cython-native"
>
> -inherit setuptools3
> +inherit ptest setuptools3
>
> S = "${WORKDIR}/numpy-${PV}"
>
> @@ -30,7 +31,6 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
> ${PYTHON_PN}-pprint \
> ${PYTHON_PN}-pickle \
> ${PYTHON_PN}-shell \
> - ${PYTHON_PN}-nose \
> ${PYTHON_PN}-doctest \
> ${PYTHON_PN}-datetime \
> ${PYTHON_PN}-distutils \
> @@ -39,6 +39,9 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
> ${PYTHON_PN}-netclient \__class__ = <class
> 'zipfile._ZipWriteFile'>
> # and may, or may not, abort the process depending on the LAPACK
> package.
>
> XERBLA_OK = 255
>
> try:
> pid = os.fork()
> except (OSError, AttributeError):
> # fork failed, or not running on POSIX
> pytest.skip("Not POSIX or fork failed.")
>
> if pid == 0:
> # child; close i/o file handles
> os.close(1)
> os.close(0)
> # Avoid producing core files.
> > import resource
> E ModuleNotFoundError: No module named 'resource'
>
> XERBLA_OK = 255
> pid = 0
>
> ../../python3.9/site-packages/numpy/linalg/tests/test_linalg.py:1808:
> ModuleNotFoundError
>
> """
> ${PYTHON_PN}-numbers \
> ${PYTHON_PN}-pydoc \
> + ${PYTHON_PN}-pytest \
> + ${PYTHON_PN}-hypothesis \
> + ${PYTHON_PN}-sortedcontainers \
>
Also needs ${PYTHON_PN}-resource
"""
${PYTHON_PN}-pkgutil \
> ${PYTHON_PN}-email \
> ${PYTHON_PN}-compression \
> --
> 2.29.2
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 5389 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH v3 4/8] python-numpy: Add ptest
2020-11-28 18:56 ` [OE-core] " Tim Orling
@ 2020-11-28 21:03 ` Khem Raj
2020-11-29 0:46 ` Tim Orling
0 siblings, 1 reply; 13+ messages in thread
From: Khem Raj @ 2020-11-28 21:03 UTC (permalink / raw)
To: Tim Orling; +Cc: openembedded-core
On Sat, Nov 28, 2020 at 10:57 AM Tim Orling <ticotimo@gmail.com> wrote:
>
>
>
> On Fri, Nov 20, 2020 at 9:30 AM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Since 1.15, numpy have replaced nose with pytest testing framework
>> it additionally needs hypothesis and sortedcontainers modules
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> meta/recipes-devtools/python-numpy/files/run-ptest | 5 +++++
>> meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb | 7 +++++--
>> 2 files changed, 10 insertions(+), 2 deletions(-)
>> create mode 100644 meta/recipes-devtools/python-numpy/files/run-ptest
>>
>> diff --git a/meta/recipes-devtools/python-numpy/files/run-ptest b/meta/recipes-devtools/python-numpy/files/run-ptest
>> new file mode 100644
>> index 0000000000..9a1c72aeb1
>> --- /dev/null
>> +++ b/meta/recipes-devtools/python-numpy/files/run-ptest
>> @@ -0,0 +1,5 @@
>> +#!/usr/bin/env python3
>> +
>> +import numpy
>> +numpy.test(label='full', verbose=2)
>> +
>> diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
>> index d54f2f6c18..b484e7cddc 100644
>> --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
>> +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
>> @@ -8,6 +8,7 @@ SRCNAME = "numpy"
>> SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \
>> file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
>> file://0001-numpy-core-Define-RISCV-32-support.patch \
>> + file://run-ptest \
>> "
>> SRC_URI[sha256sum] = "fe836a685d6838dbb3f603caef01183ea98e88febf4ce956a2ea484a75378413"
>>
>> @@ -16,7 +17,7 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
>>
>> DEPENDS += "python3-cython-native"
>>
>> -inherit setuptools3
>> +inherit ptest setuptools3
>>
>> S = "${WORKDIR}/numpy-${PV}"
>>
>> @@ -30,7 +31,6 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
>> ${PYTHON_PN}-pprint \
>> ${PYTHON_PN}-pickle \
>> ${PYTHON_PN}-shell \
>> - ${PYTHON_PN}-nose \
>> ${PYTHON_PN}-doctest \
>> ${PYTHON_PN}-datetime \
>> ${PYTHON_PN}-distutils \
>> @@ -39,6 +39,9 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
>> ${PYTHON_PN}-netclient \__class__ = <class 'zipfile._ZipWriteFile'>
>> # and may, or may not, abort the process depending on the LAPACK package.
>>
>> XERBLA_OK = 255
>>
>> try:
>> pid = os.fork()
>> except (OSError, AttributeError):
>> # fork failed, or not running on POSIX
>> pytest.skip("Not POSIX or fork failed.")
>>
>> if pid == 0:
>> # child; close i/o file handles
>> os.close(1)
>> os.close(0)
>> # Avoid producing core files.
>> > import resource
>> E ModuleNotFoundError: No module named 'resource'
>>
>> XERBLA_OK = 255
>> pid = 0
>>
>> ../../python3.9/site-packages/numpy/linalg/tests/test_linalg.py:1808: ModuleNotFoundError
>>
>> """
>
>
>>
>> ${PYTHON_PN}-numbers \
>> ${PYTHON_PN}-pydoc \
>> + ${PYTHON_PN}-pytest \
>> + ${PYTHON_PN}-hypothesis \
>> + ${PYTHON_PN}-sortedcontainers \
>
>
> Also needs ${PYTHON_PN}-resource
>
Thanks, did you mean python3-pkg-resources ?
I did not encounter this locally and I have the above installed and
was wondering if thats the case.
but I have added this, I will send that in v4 otherwise.
> """
>
>> ${PYTHON_PN}-pkgutil \
>> ${PYTHON_PN}-email \
>> ${PYTHON_PN}-compression \
>> --
>> 2.29.2
>>
>>
>>
>>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH v3 4/8] python-numpy: Add ptest
2020-11-28 21:03 ` Khem Raj
@ 2020-11-29 0:46 ` Tim Orling
0 siblings, 0 replies; 13+ messages in thread
From: Tim Orling @ 2020-11-29 0:46 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 4494 bytes --]
It’s just
“import resource”
It’s a sub-package of python3 itself
https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/python/python3/python3-manifest.json#n1024
On Sat, Nov 28, 2020 at 1:03 PM Khem Raj <raj.khem@gmail.com> wrote:
> On Sat, Nov 28, 2020 at 10:57 AM Tim Orling <ticotimo@gmail.com> wrote:
> >
> >
> >
> > On Fri, Nov 20, 2020 at 9:30 AM Khem Raj <raj.khem@gmail.com> wrote:
> >>
> >> Since 1.15, numpy have replaced nose with pytest testing framework
> >> it additionally needs hypothesis and sortedcontainers modules
> >>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> ---
> >> meta/recipes-devtools/python-numpy/files/run-ptest | 5 +++++
> >> meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb | 7 +++++--
> >> 2 files changed, 10 insertions(+), 2 deletions(-)
> >> create mode 100644 meta/recipes-devtools/python-numpy/files/run-ptest
> >>
> >> diff --git a/meta/recipes-devtools/python-numpy/files/run-ptest
> b/meta/recipes-devtools/python-numpy/files/run-ptest
> >> new file mode 100644
> >> index 0000000000..9a1c72aeb1
> >> --- /dev/null
> >> +++ b/meta/recipes-devtools/python-numpy/files/run-ptest
> >> @@ -0,0 +1,5 @@
> >> +#!/usr/bin/env python3
> >> +
> >> +import numpy
> >> +numpy.test(label='full', verbose=2)
> >> +
> >> diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
> b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
> >> index d54f2f6c18..b484e7cddc 100644
> >> --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
> >> +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb
> >> @@ -8,6 +8,7 @@ SRCNAME = "numpy"
> >> SRC_URI = "
> https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz
> \
> >>
> file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
> >> file://0001-numpy-core-Define-RISCV-32-support.patch \
> >> + file://run-ptest \
> >> "
> >> SRC_URI[sha256sum] =
> "fe836a685d6838dbb3f603caef01183ea98e88febf4ce956a2ea484a75378413"
> >>
> >> @@ -16,7 +17,7 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
> >>
> >> DEPENDS += "python3-cython-native"
> >>
> >> -inherit setuptools3
> >> +inherit ptest setuptools3
> >>
> >> S = "${WORKDIR}/numpy-${PV}"
> >>
> >> @@ -30,7 +31,6 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
> >> ${PYTHON_PN}-pprint \
> >> ${PYTHON_PN}-pickle \
> >> ${PYTHON_PN}-shell \
> >> - ${PYTHON_PN}-nose \
> >> ${PYTHON_PN}-doctest \
> >> ${PYTHON_PN}-datetime \
> >> ${PYTHON_PN}-distutils \
> >> @@ -39,6 +39,9 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
> >> ${PYTHON_PN}-netclient \__class__ = <class
> 'zipfile._ZipWriteFile'>
> >> # and may, or may not, abort the process depending on the
> LAPACK package.
> >>
> >> XERBLA_OK = 255
> >>
> >> try:
> >> pid = os.fork()
> >> except (OSError, AttributeError):
> >> # fork failed, or not running on POSIX
> >> pytest.skip("Not POSIX or fork failed.")
> >>
> >> if pid == 0:
> >> # child; close i/o file handles
> >> os.close(1)
> >> os.close(0)
> >> # Avoid producing core files.
> >> > import resource
> >> E ModuleNotFoundError: No module named 'resource'
> >>
> >> XERBLA_OK = 255
> >> pid = 0
> >>
> >> ../../python3.9/site-packages/numpy/linalg/tests/test_linalg.py:1808:
> ModuleNotFoundError
> >>
> >> """
> >
> >
> >>
> >> ${PYTHON_PN}-numbers \
> >> ${PYTHON_PN}-pydoc \
> >> + ${PYTHON_PN}-pytest \
> >> + ${PYTHON_PN}-hypothesis \
> >> + ${PYTHON_PN}-sortedcontainers \
> >
> >
> > Also needs ${PYTHON_PN}-resource
> >
>
> Thanks, did you mean python3-pkg-resources ?
> I did not encounter this locally and I have the above installed and
> was wondering if thats the case.
> but I have added this, I will send that in v4 otherwise.
>
> > """
> >
> >> ${PYTHON_PN}-pkgutil \
> >> ${PYTHON_PN}-email \
> >> ${PYTHON_PN}-compression \
> >> --
> >> 2.29.2
> >>
> >>
> >>
> >>
>
[-- Attachment #2: Type: text/html, Size: 6983 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2020-11-29 0:46 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-20 17:29 [PATCH v3 1/8] python3-numpy: Upgrade to 1.19.4 Khem Raj
2020-11-20 17:29 ` [PATCH v3 2/8] python3-hypothesis: Add recipe Khem Raj
2020-11-20 17:29 ` [PATCH v3 3/8] python3-sortedcontainers: " Khem Raj
2020-11-20 17:29 ` [PATCH v3 4/8] python-numpy: Add ptest Khem Raj
2020-11-28 18:56 ` [OE-core] " Tim Orling
2020-11-28 21:03 ` Khem Raj
2020-11-29 0:46 ` Tim Orling
2020-11-20 17:29 ` [PATCH v3 5/8] python3-numpy: Add ldd runtime dependency on ptest package Khem Raj
2020-11-20 17:29 ` [PATCH v3 6/8] python3-pytest: Add recipe Khem Raj
2020-11-20 17:35 ` [OE-core] " Richard Purdie
2020-11-20 17:43 ` Khem Raj
2020-11-20 17:29 ` [PATCH v3 7/8] maintainers: Add myself for new pytest related recipes Khem Raj
2020-11-20 17:29 ` [PATCH v3 8/8] python3-pytest: Upgrade to 6.1.2 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.