python3-numpy: Upgrade to 1.19.4
PATCH v5 1/5 python3-numpy: Upgrade to 1.19.4
Unify inc file into single recipe, py2 is gone
---
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%)meta/recipes-devtools/python-numpy/python3-numpy_1.19.3.bb deleted +0 -3
@@ -1,3 +0,0 @@ -inherit setuptools3 -require python-numpy.inc -
meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb renamed from meta/recipes-devtools/python-numpy/python-numpy.inc +4 -2
@@ -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"
Signature · 1 line
2.29.2
PATCH v5 2/5 python3-numpy: Add ptest
Since 1.15, numpy have replaced nose with pytest testing framework it additionally needs hypothesis and sortedcontainers modules
--- 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
meta/recipes-devtools/python-numpy/files/run-ptest new file +5 -0
@@ -0,0 +1,5 @@ +#!/usr/bin/env python3 + +import numpy +numpy.test(label='full', verbose=2) +
meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb +5 -2
@@ -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 \
Signature · 1 line
2.29.2
Re: [OE-core] [PATCH v5 2/5] python3-numpy: Add ptest
Why are all the patches from this not squashed into this? We don't need to see the bugs you fixed.
Ross
Quoted 67 lines · 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 <[email protected]>--- 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-ptestmeta/recipes-devtools/python-numpy/files/run-ptest new file +5
-0@@ -0,0 +1,5 @@ +#!/usr/bin/env python3 + +import numpy +numpy.test(label='full', verbose=2) +meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb +5
-3@@ -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
Re: [OE-core] [PATCH v5 2/5] python3-numpy: Add ptest
Quoted 3 lines · Ross Burton
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.
Quoted 71 lines
Ross
Quoted 67 lines · 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 <[email protected]>--- 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-ptestmeta/recipes-devtools/python-numpy/files/run-ptest new file +5
-0@@ -0,0 +1,5 @@ +#!/usr/bin/env python3 + +import numpy +numpy.test(label='full', verbose=2) +meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb +5
-3@@ -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
PATCH v5 3/5 python3-numpy: Add ldd runtime dependency on ptest package
In reply to Khem RajFixes
E RuntimeError: command ['ldd'] cannot be run
--- meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb +1 -0
@@ -49,6 +49,7 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-multiprocessing \ " +RDEPENDS_${PN}-ptest += "ldd" RDEPENDS_${PN}_class-native = ""
Signature · 1 line
2.29.2
PATCH v5 4/5 python3-numpy: Move ptest dependencies to PN-ptest package
In reply to Khem Raj--- .../python-numpy/python3-numpy_1.19.4.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb +5 -4
@@ -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 = ""
Signature · 1 line
2.29.2
PATCH v5 5/5 python3-numpy: Add python3-resource to ptest deps
In reply to Khem RajFixes
Quoted 1 line
import resource
E ModuleNotFoundError: No module named 'resource'
--- meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/python-numpy/python3-numpy_1.19.4.bb +1 -0
@@ -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 \ "
Signature · 1 line
2.29.2