diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-04-25 19:28:14 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-29 15:02:18 +0100 |
commit | 0c53c56812926d74e6cffab53badaff9f97d2bd2 (patch) | |
tree | 5407a192a8ebfb7bcf7c8a6a0421a82e3edd54d7 /meta/recipes-devtools/python-numpy | |
parent | 10fd6095cd7f174aa190a30da0ef8a5eb5e7ed7f (diff) | |
download | poky-0c53c56812926d74e6cffab53badaff9f97d2bd2.tar.gz |
python3-numpy: update to 1.18.3
(From OE-Core rev: f31e3d2e55962472ba585736a7190e833b9bdf87)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python-numpy')
-rw-r--r-- | meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch | 176 | ||||
-rw-r--r-- | meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/python-numpy/python-numpy.inc | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/python-numpy/python3-numpy_1.18.3.bb (renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb) | 0 |
4 files changed, 80 insertions, 135 deletions
diff --git a/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch b/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch index b86e131122..a416244420 100644 --- a/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch +++ b/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c53237f90e4a3a435a20517552186d394d6d09c8 Mon Sep 17 00:00:00 2001 | 1 | From 00848d760fa3999e2bed759b585452b35d65d6ec Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Thu, 5 Mar 2020 12:02:35 +0800 | 3 | Date: Thu, 5 Mar 2020 12:02:35 +0800 |
4 | Subject: [PATCH] convert shebang from python to python3 | 4 | Subject: [PATCH] convert shebang from python to python3 |
@@ -7,62 +7,61 @@ Upstream-Status: Backport | |||
7 | [https://github.com/numpy/numpy/commit/583901a074dc65145d3d6136ba7dcd02634d680b] | 7 | [https://github.com/numpy/numpy/commit/583901a074dc65145d3d6136ba7dcd02634d680b] |
8 | 8 | ||
9 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 9 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
10 | |||
10 | --- | 11 | --- |
11 | doc/DISTUTILS.rst.txt | 2 +- | 12 | doc/DISTUTILS.rst.txt | 2 +- |
12 | doc/cdoc/numpyfilter.py | 2 +- | 13 | doc/cdoc/numpyfilter.py | 2 +- |
13 | doc/postprocess.py | 2 +- | 14 | doc/postprocess.py | 2 +- |
14 | doc/summarize.py | 2 +- | 15 | doc/summarize.py | 2 +- |
15 | numpy/distutils/conv_template.py | 2 +- | 16 | numpy/distutils/conv_template.py | 2 +- |
16 | numpy/distutils/cpuinfo.py | 2 +- | 17 | numpy/distutils/cpuinfo.py | 2 +- |
17 | numpy/distutils/from_template.py | 2 +- | 18 | numpy/distutils/from_template.py | 2 +- |
18 | numpy/distutils/setup.py | 2 +- | 19 | numpy/distutils/setup.py | 2 +- |
19 | numpy/distutils/system_info.py | 2 +- | 20 | numpy/distutils/system_info.py | 2 +- |
20 | numpy/f2py/__init__.py | 2 +- | 21 | numpy/f2py/__init__.py | 2 +- |
21 | numpy/f2py/auxfuncs.py | 2 +- | 22 | numpy/f2py/auxfuncs.py | 2 +- |
22 | numpy/f2py/capi_maps.py | 2 +- | 23 | numpy/f2py/capi_maps.py | 2 +- |
23 | numpy/f2py/cb_rules.py | 2 +- | 24 | numpy/f2py/cb_rules.py | 2 +- |
24 | numpy/f2py/cfuncs.py | 2 +- | 25 | numpy/f2py/cfuncs.py | 2 +- |
25 | numpy/f2py/common_rules.py | 2 +- | 26 | numpy/f2py/common_rules.py | 2 +- |
26 | numpy/f2py/crackfortran.py | 2 +- | 27 | numpy/f2py/crackfortran.py | 2 +- |
27 | numpy/f2py/diagnose.py | 2 +- | 28 | numpy/f2py/diagnose.py | 2 +- |
28 | numpy/f2py/f2py2e.py | 2 +- | 29 | numpy/f2py/f2py2e.py | 2 +- |
29 | numpy/f2py/f90mod_rules.py | 2 +- | 30 | numpy/f2py/f90mod_rules.py | 2 +- |
30 | numpy/f2py/func2subr.py | 2 +- | 31 | numpy/f2py/func2subr.py | 2 +- |
31 | numpy/f2py/rules.py | 2 +- | 32 | numpy/f2py/rules.py | 2 +- |
32 | numpy/f2py/setup.py | 2 +- | 33 | numpy/f2py/setup.py | 2 +- |
33 | numpy/f2py/use_rules.py | 2 +- | 34 | numpy/f2py/use_rules.py | 2 +- |
34 | numpy/linalg/lapack_lite/clapack_scrub.py | 2 +- | 35 | numpy/linalg/lapack_lite/clapack_scrub.py | 2 +- |
35 | numpy/linalg/lapack_lite/make_lite.py | 2 +- | 36 | numpy/linalg/lapack_lite/make_lite.py | 2 +- |
36 | numpy/ma/bench.py | 2 +- | 37 | numpy/ma/bench.py | 2 +- |
37 | numpy/ma/setup.py | 2 +- | 38 | numpy/ma/setup.py | 2 +- |
38 | numpy/matrixlib/setup.py | 2 +- | 39 | numpy/matrixlib/setup.py | 2 +- |
39 | numpy/random/examples/cython/extending.pyx | 2 +- | 40 | numpy/random/_examples/cython/extending.pyx | 2 +- |
40 | numpy/random/examples/cython/extending_distributions.pyx | 2 +- | 41 | numpy/random/_examples/cython/extending_distributions.pyx | 2 +- |
41 | numpy/setup.py | 2 +- | 42 | numpy/setup.py | 2 +- |
42 | numpy/testing/print_coercion_tables.py | 2 +- | 43 | numpy/testing/print_coercion_tables.py | 2 +- |
43 | numpy/testing/setup.py | 2 +- | 44 | numpy/testing/setup.py | 2 +- |
44 | runtests.py | 2 +- | 45 | runtests.py | 2 +- |
45 | setup.py | 2 +- | 46 | setup.py | 2 +- |
46 | tools/c_coverage/c_coverage_report.py | 2 +- | 47 | tools/c_coverage/c_coverage_report.py | 2 +- |
47 | tools/changelog.py | 2 +- | 48 | tools/changelog.py | 2 +- |
48 | tools/ci/push_docs_to_repo.py | 2 +- | 49 | tools/ci/push_docs_to_repo.py | 2 +- |
49 | tools/cythonize.py | 2 +- | 50 | tools/find_deprecated_escaped_characters.py | 2 +- |
50 | tools/find_deprecated_escaped_characters.py | 2 +- | 51 | tools/refguide_check.py | 2 +- |
51 | tools/refguide_check.py | 2 +- | 52 | tools/swig/test/setup.py | 2 +- |
52 | tools/swig/test/setup.py | 2 +- | 53 | tools/swig/test/testArray.py | 2 +- |
53 | tools/swig/test/testArray.py | 2 +- | 54 | tools/swig/test/testFarray.py | 2 +- |
54 | tools/swig/test/testFarray.py | 2 +- | 55 | tools/swig/test/testFlat.py | 2 +- |
55 | tools/swig/test/testFlat.py | 2 +- | 56 | tools/swig/test/testFortran.py | 2 +- |
56 | tools/swig/test/testFortran.py | 2 +- | 57 | tools/swig/test/testMatrix.py | 2 +- |
57 | tools/swig/test/testMatrix.py | 2 +- | 58 | tools/swig/test/testSuperTensor.py | 2 +- |
58 | tools/swig/test/testSuperTensor.py | 2 +- | 59 | tools/swig/test/testTensor.py | 2 +- |
59 | tools/swig/test/testTensor.py | 2 +- | 60 | tools/swig/test/testVector.py | 2 +- |
60 | tools/swig/test/testVector.py | 2 +- | 61 | 49 files changed, 49 insertions(+), 49 deletions(-) |
61 | tools/test-installed-numpy.py | 2 +- | ||
62 | 51 files changed, 51 insertions(+), 51 deletions(-) | ||
63 | 62 | ||
64 | diff --git a/doc/DISTUTILS.rst.txt b/doc/DISTUTILS.rst.txt | 63 | diff --git a/doc/DISTUTILS.rst.txt b/doc/DISTUTILS.rst.txt |
65 | index eadde63..2402110 100644 | 64 | index bcef825..bc1700f 100644 |
66 | --- a/doc/DISTUTILS.rst.txt | 65 | --- a/doc/DISTUTILS.rst.txt |
67 | +++ b/doc/DISTUTILS.rst.txt | 66 | +++ b/doc/DISTUTILS.rst.txt |
68 | @@ -59,7 +59,7 @@ SciPy pure Python package example | 67 | @@ -59,7 +59,7 @@ SciPy pure Python package example |
@@ -115,7 +114,7 @@ index 3bcb7b8..88432c8 100644 | |||
115 | takes templated file .xxx.src and produces .xxx file where .xxx is | 114 | takes templated file .xxx.src and produces .xxx file where .xxx is |
116 | .i or .c or .h, using the following template rules | 115 | .i or .c or .h, using the following template rules |
117 | diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py | 116 | diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py |
118 | index 5802993..7f6742e 100644 | 117 | index bc97283..87502a9 100644 |
119 | --- a/numpy/distutils/cpuinfo.py | 118 | --- a/numpy/distutils/cpuinfo.py |
120 | +++ b/numpy/distutils/cpuinfo.py | 119 | +++ b/numpy/distutils/cpuinfo.py |
121 | @@ -1,4 +1,4 @@ | 120 | @@ -1,4 +1,4 @@ |
@@ -145,7 +144,7 @@ index 82a53bd..646921b 100644 | |||
145 | 144 | ||
146 | def configuration(parent_package='',top_path=None): | 145 | def configuration(parent_package='',top_path=None): |
147 | diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py | 146 | diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
148 | index f94dce1..df526f6 100644 | 147 | index 4f340b6..189081d 100644 |
149 | --- a/numpy/distutils/system_info.py | 148 | --- a/numpy/distutils/system_info.py |
150 | +++ b/numpy/distutils/system_info.py | 149 | +++ b/numpy/distutils/system_info.py |
151 | @@ -1,4 +1,4 @@ | 150 | @@ -1,4 +1,4 @@ |
@@ -155,7 +154,7 @@ index f94dce1..df526f6 100644 | |||
155 | This file defines a set of system_info classes for getting | 154 | This file defines a set of system_info classes for getting |
156 | information about various resources (libraries, library directories, | 155 | information about various resources (libraries, library directories, |
157 | diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py | 156 | diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py |
158 | index d146739..0a83b99 100644 | 157 | index 42e3632..09a3657 100644 |
159 | --- a/numpy/f2py/__init__.py | 158 | --- a/numpy/f2py/__init__.py |
160 | +++ b/numpy/f2py/__init__.py | 159 | +++ b/numpy/f2py/__init__.py |
161 | @@ -1,4 +1,4 @@ | 160 | @@ -1,4 +1,4 @@ |
@@ -175,7 +174,7 @@ index 404bdbd..d23d959 100644 | |||
175 | 174 | ||
176 | Auxiliary functions for f2py2e. | 175 | Auxiliary functions for f2py2e. |
177 | diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py | 176 | diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py |
178 | index c41dd77..a3e2dc2 100644 | 177 | index ce79f68..e5d3fd2 100644 |
179 | --- a/numpy/f2py/capi_maps.py | 178 | --- a/numpy/f2py/capi_maps.py |
180 | +++ b/numpy/f2py/capi_maps.py | 179 | +++ b/numpy/f2py/capi_maps.py |
181 | @@ -1,4 +1,4 @@ | 180 | @@ -1,4 +1,4 @@ |
@@ -195,7 +194,7 @@ index 183d7c2..93e93fe 100644 | |||
195 | 194 | ||
196 | Build call-back mechanism for f2py2e. | 195 | Build call-back mechanism for f2py2e. |
197 | diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py | 196 | diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py |
198 | index d59b630..3847745 100644 | 197 | index ccb7b3a..cdb783d 100644 |
199 | --- a/numpy/f2py/cfuncs.py | 198 | --- a/numpy/f2py/cfuncs.py |
200 | +++ b/numpy/f2py/cfuncs.py | 199 | +++ b/numpy/f2py/cfuncs.py |
201 | @@ -1,4 +1,4 @@ | 200 | @@ -1,4 +1,4 @@ |
@@ -205,7 +204,7 @@ index d59b630..3847745 100644 | |||
205 | 204 | ||
206 | C declarations, CPP macros, and C functions for f2py2e. | 205 | C declarations, CPP macros, and C functions for f2py2e. |
207 | diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py | 206 | diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py |
208 | index 62c1ba2..c1825d4 100644 | 207 | index f61d881..fe510bf 100644 |
209 | --- a/numpy/f2py/common_rules.py | 208 | --- a/numpy/f2py/common_rules.py |
210 | +++ b/numpy/f2py/common_rules.py | 209 | +++ b/numpy/f2py/common_rules.py |
211 | @@ -1,4 +1,4 @@ | 210 | @@ -1,4 +1,4 @@ |
@@ -235,7 +234,7 @@ index 0241fed..6c0304c 100644 | |||
235 | 234 | ||
236 | import os | 235 | import os |
237 | diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py | 236 | diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py |
238 | index 110337f..c0789f6 100755 | 237 | index d03eff9..c17bfd9 100755 |
239 | --- a/numpy/f2py/f2py2e.py | 238 | --- a/numpy/f2py/f2py2e.py |
240 | +++ b/numpy/f2py/f2py2e.py | 239 | +++ b/numpy/f2py/f2py2e.py |
241 | @@ -1,4 +1,4 @@ | 240 | @@ -1,4 +1,4 @@ |
@@ -265,7 +264,7 @@ index 6010d5a..fdea0c2 100644 | |||
265 | 264 | ||
266 | Rules for building C/API module with f2py2e. | 265 | Rules for building C/API module with f2py2e. |
267 | diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py | 266 | diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py |
268 | index 1b41498..790d197 100755 | 267 | index f2f713b..f87b03c 100755 |
269 | --- a/numpy/f2py/rules.py | 268 | --- a/numpy/f2py/rules.py |
270 | +++ b/numpy/f2py/rules.py | 269 | +++ b/numpy/f2py/rules.py |
271 | @@ -1,4 +1,4 @@ | 270 | @@ -1,4 +1,4 @@ |
@@ -275,7 +274,7 @@ index 1b41498..790d197 100755 | |||
275 | 274 | ||
276 | Rules for building C/API module with f2py2e. | 275 | Rules for building C/API module with f2py2e. |
277 | diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py | 276 | diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py |
278 | index c0c50ce..044c9f2 100644 | 277 | index a8c1401..2e7a517 100644 |
279 | --- a/numpy/f2py/setup.py | 278 | --- a/numpy/f2py/setup.py |
280 | +++ b/numpy/f2py/setup.py | 279 | +++ b/numpy/f2py/setup.py |
281 | @@ -1,4 +1,4 @@ | 280 | @@ -1,4 +1,4 @@ |
@@ -344,26 +343,26 @@ index d0981d6..57534d1 100644 | |||
344 | from __future__ import division, print_function | 343 | from __future__ import division, print_function |
345 | 344 | ||
346 | def configuration(parent_package='', top_path=None): | 345 | def configuration(parent_package='', top_path=None): |
347 | diff --git a/numpy/random/examples/cython/extending.pyx b/numpy/random/examples/cython/extending.pyx | 346 | diff --git a/numpy/random/_examples/cython/extending.pyx b/numpy/random/_examples/cython/extending.pyx |
348 | index a6a4ba4..33f28f9 100644 | 347 | index 7a0dfe0..3a7f81a 100644 |
349 | --- a/numpy/random/examples/cython/extending.pyx | 348 | --- a/numpy/random/_examples/cython/extending.pyx |
350 | +++ b/numpy/random/examples/cython/extending.pyx | 349 | +++ b/numpy/random/_examples/cython/extending.pyx |
351 | @@ -1,4 +1,4 @@ | 350 | @@ -1,4 +1,4 @@ |
352 | -#!/usr/bin/env python | 351 | -#!/usr/bin/env python |
353 | +#!/usr/bin/env python3 | 352 | +#!/usr/bin/env python3 |
354 | #cython: language_level=3 | 353 | #cython: language_level=3 |
355 | 354 | ||
356 | from libc.stdint cimport uint32_t | 355 | from libc.stdint cimport uint32_t |
357 | diff --git a/numpy/random/examples/cython/extending_distributions.pyx b/numpy/random/examples/cython/extending_distributions.pyx | 356 | diff --git a/numpy/random/_examples/cython/extending_distributions.pyx b/numpy/random/_examples/cython/extending_distributions.pyx |
358 | index 3cefec9..7a526ab 100644 | 357 | index 1bef506..4da6a4b 100644 |
359 | --- a/numpy/random/examples/cython/extending_distributions.pyx | 358 | --- a/numpy/random/_examples/cython/extending_distributions.pyx |
360 | +++ b/numpy/random/examples/cython/extending_distributions.pyx | 359 | +++ b/numpy/random/_examples/cython/extending_distributions.pyx |
361 | @@ -1,4 +1,4 @@ | 360 | @@ -1,4 +1,4 @@ |
362 | -#!/usr/bin/env python | 361 | -#!/usr/bin/env python |
363 | +#!/usr/bin/env python3 | 362 | +#!/usr/bin/env python3 |
364 | #cython: language_level=3 | 363 | #cython: language_level=3 |
365 | """ | 364 | """ |
366 | This file shows how the distributions that are accessed through | 365 | This file shows how the to use a BitGenerator to create a distribution. |
367 | diff --git a/numpy/setup.py b/numpy/setup.py | 366 | diff --git a/numpy/setup.py b/numpy/setup.py |
368 | index 4ccdaee..db06c82 100644 | 367 | index 4ccdaee..db06c82 100644 |
369 | --- a/numpy/setup.py | 368 | --- a/numpy/setup.py |
@@ -375,7 +374,7 @@ index 4ccdaee..db06c82 100644 | |||
375 | 374 | ||
376 | 375 | ||
377 | diff --git a/numpy/testing/print_coercion_tables.py b/numpy/testing/print_coercion_tables.py | 376 | diff --git a/numpy/testing/print_coercion_tables.py b/numpy/testing/print_coercion_tables.py |
378 | index 3a359f4..a9c5363 100755 | 377 | index 72b22ce..1e9a301 100755 |
379 | --- a/numpy/testing/print_coercion_tables.py | 378 | --- a/numpy/testing/print_coercion_tables.py |
380 | +++ b/numpy/testing/print_coercion_tables.py | 379 | +++ b/numpy/testing/print_coercion_tables.py |
381 | @@ -1,4 +1,4 @@ | 380 | @@ -1,4 +1,4 @@ |
@@ -395,7 +394,7 @@ index 7c3f2fb..bd315ee 100755 | |||
395 | 394 | ||
396 | 395 | ||
397 | diff --git a/runtests.py b/runtests.py | 396 | diff --git a/runtests.py b/runtests.py |
398 | index 23245ae..cafdb92 100755 | 397 | index a38054f..383ddaa 100755 |
399 | --- a/runtests.py | 398 | --- a/runtests.py |
400 | +++ b/runtests.py | 399 | +++ b/runtests.py |
401 | @@ -1,4 +1,4 @@ | 400 | @@ -1,4 +1,4 @@ |
@@ -405,7 +404,7 @@ index 23245ae..cafdb92 100755 | |||
405 | runtests.py [OPTIONS] [-- ARGS] | 404 | runtests.py [OPTIONS] [-- ARGS] |
406 | 405 | ||
407 | diff --git a/setup.py b/setup.py | 406 | diff --git a/setup.py b/setup.py |
408 | index a205913..010884f 100755 | 407 | index d7f807b..705ea5d 100755 |
409 | --- a/setup.py | 408 | --- a/setup.py |
410 | +++ b/setup.py | 409 | +++ b/setup.py |
411 | @@ -1,4 +1,4 @@ | 410 | @@ -1,4 +1,4 @@ |
@@ -444,16 +443,6 @@ index a989668..ae53054 100755 | |||
444 | 443 | ||
445 | import argparse | 444 | import argparse |
446 | import subprocess | 445 | import subprocess |
447 | diff --git a/tools/cythonize.py b/tools/cythonize.py | ||
448 | index c81b72d..c1d4384 100755 | ||
449 | --- a/tools/cythonize.py | ||
450 | +++ b/tools/cythonize.py | ||
451 | @@ -1,4 +1,4 @@ | ||
452 | -#!/usr/bin/env python | ||
453 | +#!/usr/bin/env python3 | ||
454 | """ cythonize | ||
455 | |||
456 | Cythonize pyx files into C files as needed. | ||
457 | diff --git a/tools/find_deprecated_escaped_characters.py b/tools/find_deprecated_escaped_characters.py | 446 | diff --git a/tools/find_deprecated_escaped_characters.py b/tools/find_deprecated_escaped_characters.py |
458 | index 6f90001..10e0378 100644 | 447 | index 6f90001..10e0378 100644 |
459 | --- a/tools/find_deprecated_escaped_characters.py | 448 | --- a/tools/find_deprecated_escaped_characters.py |
@@ -465,7 +454,7 @@ index 6f90001..10e0378 100644 | |||
465 | Look for escape sequences deprecated in Python 3.6. | 454 | Look for escape sequences deprecated in Python 3.6. |
466 | 455 | ||
467 | diff --git a/tools/refguide_check.py b/tools/refguide_check.py | 456 | diff --git a/tools/refguide_check.py b/tools/refguide_check.py |
468 | index c208072..798e322 100644 | 457 | index 2c62809..a19a29e 100644 |
469 | --- a/tools/refguide_check.py | 458 | --- a/tools/refguide_check.py |
470 | +++ b/tools/refguide_check.py | 459 | +++ b/tools/refguide_check.py |
471 | @@ -1,4 +1,4 @@ | 460 | @@ -1,4 +1,4 @@ |
@@ -495,7 +484,7 @@ index 8d9c797..54ffe71 100755 | |||
495 | 484 | ||
496 | # System imports | 485 | # System imports |
497 | diff --git a/tools/swig/test/testFarray.py b/tools/swig/test/testFarray.py | 486 | diff --git a/tools/swig/test/testFarray.py b/tools/swig/test/testFarray.py |
498 | index 0037dc9..bedf384 100755 | 487 | index e8bf711..b377f7c 100755 |
499 | --- a/tools/swig/test/testFarray.py | 488 | --- a/tools/swig/test/testFarray.py |
500 | +++ b/tools/swig/test/testFarray.py | 489 | +++ b/tools/swig/test/testFarray.py |
501 | @@ -1,4 +1,4 @@ | 490 | @@ -1,4 +1,4 @@ |
@@ -564,16 +553,3 @@ index 45e763b..067b922 100755 | |||
564 | from __future__ import division, absolute_import, print_function | 553 | from __future__ import division, absolute_import, print_function |
565 | 554 | ||
566 | # System imports | 555 | # System imports |
567 | diff --git a/tools/test-installed-numpy.py b/tools/test-installed-numpy.py | ||
568 | index 5240253..fd7541c 100755 | ||
569 | --- a/tools/test-installed-numpy.py | ||
570 | +++ b/tools/test-installed-numpy.py | ||
571 | @@ -1,4 +1,4 @@ | ||
572 | -#!/usr/bin/env python | ||
573 | +#!/usr/bin/env python3 | ||
574 | from __future__ import division, absolute_import, print_function | ||
575 | |||
576 | # A simple script to test the installed version of numpy by calling | ||
577 | -- | ||
578 | 2.7.4 | ||
579 | |||
diff --git a/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch b/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch deleted file mode 100644 index 9da6a2b3da..0000000000 --- a/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From b881e0b2ba9cf1a4aa351a1c1ea90b1e1776ce21 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 12 Aug 2019 15:37:36 +0200 | ||
4 | Subject: [PATCH] numpy/random/setup.py: remove the detection of x86 targets | ||
5 | via uname() | ||
6 | |||
7 | This was badly breaking compilation for ARM targets (and possibly | ||
8 | other non-x86 targets); if -msse2 is desirable for x86 builds it has | ||
9 | to be passed through another channel. | ||
10 | |||
11 | Upstream-Status: Inappropriate [oe-core specific] | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | numpy/random/setup.py | 5 ----- | ||
15 | 1 file changed, 5 deletions(-) | ||
16 | |||
17 | diff --git a/numpy/random/setup.py b/numpy/random/setup.py | ||
18 | index a1bf3b8..60fb534 100644 | ||
19 | --- a/numpy/random/setup.py | ||
20 | +++ b/numpy/random/setup.py | ||
21 | @@ -49,11 +49,6 @@ def configuration(parent_package='', top_path=None): | ||
22 | elif not is_msvc: | ||
23 | # Some bit generators require c99 | ||
24 | EXTRA_COMPILE_ARGS += ['-std=c99'] | ||
25 | - INTEL_LIKE = any(arch in platform.machine() | ||
26 | - for arch in ('x86', 'i686', 'i386', 'amd64')) | ||
27 | - if INTEL_LIKE: | ||
28 | - # Assumes GCC or GCC-like compiler | ||
29 | - EXTRA_COMPILE_ARGS += ['-msse2'] | ||
30 | |||
31 | # Use legacy integer variable sizes | ||
32 | LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')] | ||
diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc index 42032a04a8..727755393e 100644 --- a/meta/recipes-devtools/python-numpy/python-numpy.inc +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc | |||
@@ -7,11 +7,10 @@ SRCNAME = "numpy" | |||
7 | 7 | ||
8 | SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ | 8 | SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ |
9 | file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ | 9 | file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ |
10 | file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \ | ||
11 | file://0001-convert-shebang-from-python-to-python3.patch \ | 10 | file://0001-convert-shebang-from-python-to-python3.patch \ |
12 | " | 11 | " |
13 | SRC_URI[md5sum] = "9147c3ee75e58d657b5b8b5a4f3564e0" | 12 | SRC_URI[md5sum] = "cd631c761f141d382b4e1b31c8232fc0" |
14 | SRC_URI[sha256sum] = "fb0415475e673cb9a6dd816df999e0ab9f86fa3af2b1770944e7288d2bea4ac9" | 13 | SRC_URI[sha256sum] = "93ee59ec38f3bf8f9a42d5f4301f60e6825a4a6385a145f70badcd2bf2a11134" |
15 | 14 | ||
16 | UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" | 15 | UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" |
17 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" | 16 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" |
@@ -19,6 +18,8 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" | |||
19 | # Needed for building with gcc 4.x from centos 7 | 18 | # Needed for building with gcc 4.x from centos 7 |
20 | CFLAGS_append_class-native = " -std=c99" | 19 | CFLAGS_append_class-native = " -std=c99" |
21 | 20 | ||
21 | DEPENDS += "python3-cython-native" | ||
22 | |||
22 | S = "${WORKDIR}/numpy-${PV}" | 23 | S = "${WORKDIR}/numpy-${PV}" |
23 | 24 | ||
24 | CLEANBROKEN = "1" | 25 | CLEANBROKEN = "1" |
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.18.3.bb index d388e88d25..d388e88d25 100644 --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.18.3.bb | |||