* [PATCH v5 1/5] python3-numpy: Upgrade to 1.19.4
@ 2020-11-29 7:47 Khem Raj
2020-11-29 7:47 ` [PATCH v5 2/5] python3-numpy: Add ptest Khem Raj
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Khem Raj @ 2020-11-29 7:47 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] 7+ messages in thread* [PATCH v5 2/5] python3-numpy: Add ptest
2020-11-29 7:47 [PATCH v5 1/5] python3-numpy: Upgrade to 1.19.4 Khem Raj
@ 2020-11-29 7:47 ` Khem Raj
2020-11-30 14:10 ` [OE-core] " Ross Burton
2020-11-29 7:48 ` [PATCH v5 3/5] python3-numpy: Add ldd runtime dependency on ptest package Khem Raj
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Khem Raj @ 2020-11-29 7:47 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] 7+ messages in thread* Re: [OE-core] [PATCH v5 2/5] python3-numpy: Add ptest
2020-11-29 7:47 ` [PATCH v5 2/5] python3-numpy: Add ptest Khem Raj
@ 2020-11-30 14:10 ` Ross Burton
2020-11-30 16:52 ` Khem Raj
0 siblings, 1 reply; 7+ messages in thread
From: Ross Burton @ 2020-11-30 14:10 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
Why are all the patches from this not squashed into this? We don't
need to see the bugs you fixed.
Ross
On Sun, 29 Nov 2020 at 07:48, 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 \
> ${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 [flat|nested] 7+ messages in thread* Re: [OE-core] [PATCH v5 2/5] python3-numpy: Add ptest
2020-11-30 14:10 ` [OE-core] " Ross Burton
@ 2020-11-30 16:52 ` Khem Raj
0 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2020-11-30 16:52 UTC (permalink / raw)
To: Ross Burton; +Cc: OE-core
On Mon, Nov 30, 2020 at 6:11 AM Ross Burton <ross@burtonini.com> wrote:
>
> Why are all the patches from this not squashed into this? We don't
> need to see the bugs you fixed.
Right.
heh its better to eat the sausage than to see it being made.
Richard did it before pushing to all is set.
>
> Ross
>
> On Sun, 29 Nov 2020 at 07:48, 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 \
> > ${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 [flat|nested] 7+ messages in thread
* [PATCH v5 3/5] python3-numpy: Add ldd runtime dependency on ptest package
2020-11-29 7:47 [PATCH v5 1/5] python3-numpy: Upgrade to 1.19.4 Khem Raj
2020-11-29 7:47 ` [PATCH v5 2/5] python3-numpy: Add ptest Khem Raj
@ 2020-11-29 7:48 ` Khem Raj
2020-11-29 7:48 ` [PATCH v5 4/5] python3-numpy: Move ptest dependencies to PN-ptest package Khem Raj
2020-11-29 7:48 ` [PATCH v5 5/5] python3-numpy: Add python3-resource to ptest deps Khem Raj
3 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2020-11-29 7:48 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] 7+ messages in thread* [PATCH v5 4/5] python3-numpy: Move ptest dependencies to PN-ptest package
2020-11-29 7:47 [PATCH v5 1/5] python3-numpy: Upgrade to 1.19.4 Khem Raj
2020-11-29 7:47 ` [PATCH v5 2/5] python3-numpy: Add ptest Khem Raj
2020-11-29 7:48 ` [PATCH v5 3/5] python3-numpy: Add ldd runtime dependency on ptest package Khem Raj
@ 2020-11-29 7:48 ` Khem Raj
2020-11-29 7:48 ` [PATCH v5 5/5] python3-numpy: Add python3-resource to ptest deps Khem Raj
3 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2020-11-29 7:48 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../python-numpy/python3-numpy_1.19.4.bb | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
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 e59ea752cc..9351e507c1 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
@@ -39,9 +39,6 @@ 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 \
@@ -49,7 +46,11 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
${PYTHON_PN}-threading \
${PYTHON_PN}-multiprocessing \
"
-RDEPENDS_${PN}-ptest += "ldd"
+RDEPENDS_${PN}-ptest += "${PYTHON_PN}-pytest \
+ ${PYTHON_PN}-hypothesis \
+ ${PYTHON_PN}-sortedcontainers \
+ ldd \
+"
RDEPENDS_${PN}_class-native = ""
--
2.29.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v5 5/5] python3-numpy: Add python3-resource to ptest deps
2020-11-29 7:47 [PATCH v5 1/5] python3-numpy: Upgrade to 1.19.4 Khem Raj
` (2 preceding siblings ...)
2020-11-29 7:48 ` [PATCH v5 4/5] python3-numpy: Move ptest dependencies to PN-ptest package Khem Raj
@ 2020-11-29 7:48 ` Khem Raj
3 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2020-11-29 7:48 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj, Tim Orling
Fixes
> import resource
E ModuleNotFoundError: No module named 'resource'
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Tim Orling <ticotimo@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 9351e507c1..2bfc913aa0 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 \
RDEPENDS_${PN}-ptest += "${PYTHON_PN}-pytest \
${PYTHON_PN}-hypothesis \
${PYTHON_PN}-sortedcontainers \
+ ${PYTHON_PN}-resource \
ldd \
"
--
2.29.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-11-30 16:52 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-29 7:47 [PATCH v5 1/5] python3-numpy: Upgrade to 1.19.4 Khem Raj
2020-11-29 7:47 ` [PATCH v5 2/5] python3-numpy: Add ptest Khem Raj
2020-11-30 14:10 ` [OE-core] " Ross Burton
2020-11-30 16:52 ` Khem Raj
2020-11-29 7:48 ` [PATCH v5 3/5] python3-numpy: Add ldd runtime dependency on ptest package Khem Raj
2020-11-29 7:48 ` [PATCH v5 4/5] python3-numpy: Move ptest dependencies to PN-ptest package Khem Raj
2020-11-29 7:48 ` [PATCH v5 5/5] python3-numpy: Add python3-resource to ptest deps Khem Raj
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox