python-numpy: move recipe to python directory
PATCH v2 1/1 python-numpy: move recipe to python directory
This recipe had been moved out from python directory since 2016[1] in order to share patches between python2 and python3. But now there is no reason to keep it in its own directory as we only keep python3-nump. Move it back to python directory.
Also add python3-json to RDEPENDS to fix import error:
$ python3
Quoted 1 line
Quoted 1 line
Quoted 1 line
import numpy
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib/python3.10/site-packages/numpy/__init__.py", line 138, in <module>
from ._version import get_versions
File "/usr/lib/python3.10/site-packages/numpy/_version.py", line 7, in <module>
import json
ModuleNotFoundError: No module named 'json'
Quoted 1 line
Quoted 1 line
Quoted 1 line
[1] https://git.openembedded.org/openembedded-core/commit/?id=9bffe2f9fb4ce6c0b265f27e5b484fbe076c6349
---
...01-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch | 0
.../python3-numpy}/0001-numpy-core-Define-RISCV-32-support.patch | 0
.../{python-numpy/files => python/python3-numpy}/run-ptest | 0
.../{python-numpy => python}/python3-numpy_1.21.4.bb | 1 +
4 files changed, 1 insertion(+)
rename meta/recipes-devtools/{python-numpy/files => python/python3-numpy}/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch (100%)
rename meta/recipes-devtools/{python-numpy/files => python/python3-numpy}/0001-numpy-core-Define-RISCV-32-support.patch (100%)
rename meta/recipes-devtools/{python-numpy/files => python/python3-numpy}/run-ptest (100%)
rename meta/recipes-devtools/{python-numpy => python}/python3-numpy_1.21.4.bb (98%)meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch renamed from meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +0 -0
meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch renamed from meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch +0 -0
meta/recipes-devtools/python/python3-numpy/run-ptest renamed from meta/recipes-devtools/python-numpy/files/run-ptest +0 -0
meta/recipes-devtools/python/python3-numpy_1.21.4.bb renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.21.4.bb +1 -0
@@ -47,6 +47,7 @@ RDEPENDS:${PN} = "${PYTHON_PN}-unittest \ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-json \ " RDEPENDS:${PN}-ptest += "${PYTHON_PN}-pytest \ ${PYTHON_PN}-hypothesis \
Signature · 1 line
2.25.1
This is identical to v1 :)
Alex
Quoted 80 lines · Yi Zhao
This recipe had been moved out from python directory since 2016[1] in order to share patches between python2 and python3. But now there is no reason to keep it in its own directory as we only keep python3-nump. Move it back to python directory.
Also add python3-json to RDEPENDS to fix import error:
$ python3Quoted 1 line
Quoted 1 line
Quoted 1 line
import numpy
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib/python3.10/site-packages/numpy/__init__.py", line 138, in
<module>
from ._version importget_versions
File "/usr/lib/python3.10/site-packages/numpy/_version.py", line 7, in
<module>
import json
ModuleNotFoundError: No module named 'json'Quoted 1 line
Quoted 1 line
Quoted 1 line
[1]
https://git.openembedded.org/openembedded-core/commit/?id=9bffe2f9fb4ce6c0b265f27e5b484fbe076c6349Signed-off-by Yi Zhao <[email protected]>--- ...01-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch | 0 .../python3-numpy}/0001-numpy-core-Define-RISCV-32-support.patch | 0 .../{python-numpy/files => python/python3-numpy}/run-ptest | 0 .../{python-numpy => python}/python3-numpy_1.21.4.bb | 1 + 4 files changed, 1 insertion(+) rename meta/recipes-devtools/{python-numpy/files => python/python3-numpy}/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch (100%) rename meta/recipes-devtools/{python-numpy/files => python/python3-numpy}/0001-numpy-core-Define-RISCV-32-support.patch (100%) rename meta/recipes-devtools/{python-numpy/files => python/python3-numpy}/run-ptest (100%) rename meta/recipes-devtools/{python-numpy => python}/python3-numpy_1.21.4.bb (98%)
diff --git
a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patchb/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patchsimilarity index 100%
rename frommeta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patchrename tometa/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patchdiff --gita/meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patchb/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patchsimilarity index 100%
rename frommeta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patchrename tometa/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patchmeta/recipes-devtools/python/python3-numpy/run-ptest renamed from meta/recipes-devtools/python-numpy/files/run-ptest +0
-0meta/recipes-devtools/python/python3-numpy_1.21.4.bb renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.21.4.bb +1
-1@@ -47,6 +47,7 @@ RDEPENDS:${PN} = "${PYTHON_PN}-unittest \ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-json \ " RDEPENDS:${PN}-ptest += "${PYTHON_PN}-pytest \ ${PYTHON_PN}-hypothesis \ --2.25.1
Quoted 7 lines · Yi Zhao
This recipe had been moved out from python directory since 2016[1] in order to share patches between python2 and python3. But now there is no reason to keep it in its own directory as we only keep python3-nump. Move it back to python directory.
Also add python3-json to RDEPENDS to fix import error:
$ python3
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
import numpy
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib/python3.10/site-packages/numpy/__init__.py", line 138, in <module>
from ._version importget_versions
File "/usr/lib/python3.10/site-packages/numpy/_version.py", line 7, in <module>
import json
ModuleNotFoundError: No module named 'json'Quoted 1 line
Quoted 1 line
Please make these two separate commits since they're not really related.
Cheers,
Richard