summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-03-08 20:18:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:04 -0800
commite5f5aa5604a7617af839832ded457c8a824bcf2f (patch)
tree00e727d032b3abaaf545d07c578d80e415abfd79
parentd1d088db2879f1fefeebda0da815c1138fa52256 (diff)
downloadpoky-e5f5aa5604a7617af839832ded457c8a824bcf2f.tar.gz
python-numpy: update to 1.14.1
Drop backported 0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch. Drop 0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch as upstream is using os.path.basename() instead now. License-Update: License.txt file was update to list licenses of individual components; not all of them are 3-clause BSD. (From OE-Core rev: c70d1c07e4e697156bd49c43e2cc800f3085b182) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch45
-rw-r--r--meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch33
-rw-r--r--meta/recipes-devtools/python-numpy/files/remove-build-path-in-comments.patch30
-rw-r--r--meta/recipes-devtools/python-numpy/python-numpy_1.14.1.bb (renamed from meta/recipes-devtools/python-numpy/python-numpy_1.13.1.bb)10
-rw-r--r--meta/recipes-devtools/python-numpy/python3-numpy_1.14.1.bb (renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.13.3.bb)13
5 files changed, 29 insertions, 102 deletions
diff --git a/meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch b/meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch
deleted file mode 100644
index b9e585610f..0000000000
--- a/meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 4170b98e0d5864ef4db1c5704a6e9428c3be9fb8 Mon Sep 17 00:00:00 2001
2From: Iryna Shcherbina <ishcherb@redhat.com>
3Date: Thu, 24 Aug 2017 18:01:43 +0200
4Subject: [PATCH] BUG: fix infinite loop when creating np.pad on an empty array
5
6Upstream-Status: Backport [https://github.com/numpy/numpy/pull/9599/commits/6f9ea0abbd305d53f9017debab3a3a591fe0e249]
7CVE: CVE-2017-12852
8Signed-off-by: Dengke Du <dengke.du@windriver.com>
9---
10 numpy/lib/arraypad.py | 3 +++
11 numpy/lib/tests/test_arraypad.py | 4 ++++
12 2 files changed, 7 insertions(+)
13
14diff --git a/numpy/lib/arraypad.py b/numpy/lib/arraypad.py
15index 2dad99c..294a689 100644
16--- a/numpy/lib/arraypad.py
17+++ b/numpy/lib/arraypad.py
18@@ -1406,6 +1406,9 @@ def pad(array, pad_width, mode, **kwargs):
19 newmat = _append_min(newmat, pad_after, chunk_after, axis)
20
21 elif mode == 'reflect':
22+ if narray.size == 0:
23+ raise ValueError("There aren't any elements to reflect in `array`")
24+
25 for axis, (pad_before, pad_after) in enumerate(pad_width):
26 # Recursive padding along any axis where `pad_amt` is too large
27 # for indexing tricks. We can only safely pad the original axis
28diff --git a/numpy/lib/tests/test_arraypad.py b/numpy/lib/tests/test_arraypad.py
29index 056aa45..0f71d32 100644
30--- a/numpy/lib/tests/test_arraypad.py
31+++ b/numpy/lib/tests/test_arraypad.py
32@@ -1014,6 +1014,10 @@ class ValueError1(TestCase):
33 assert_raises(ValueError, pad, arr, ((-2, 3), (3, 2)),
34 **kwargs)
35
36+ def test_check_empty_array(self):
37+ assert_raises(ValueError, pad, [], 4, mode='reflect')
38+ assert_raises(ValueError, pad, np.ndarray(0), 4, mode='reflect')
39+
40
41 class ValueError2(TestCase):
42 def test_check_negative_pad_amount(self):
43--
442.8.1
45
diff --git a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
index ffd6ced136..516ccd7b9b 100644
--- a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
+++ b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
@@ -1,23 +1,24 @@
1From cc2ce6d8b6a3e6e2c8874896c10897034a80cd4f Mon Sep 17 00:00:00 2001 1From c8c6649b29a08f82e1d6761a6d62ce5f632313c5 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 10 Dec 2015 13:20:30 +0200 3Date: Thu, 10 Dec 2015 13:20:30 +0200
4Subject: [PATCH] Don't search /usr and so on for libraries by default to avoid 4Subject: [PATCH 1/3] Don't search /usr and so on for libraries by default to
5 host contamination. 5 avoid host contamination.
6 6
7Upstream-Status: Inappropriate (As the code stands, this is a hack) 7Upstream-Status: Inappropriate (As the code stands, this is a hack)
8Signed-off-by: Ross Burton <ross.burton@intel.com> 8Signed-off-by: Ross Burton <ross.burton@intel.com>
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10
10--- 11---
11 numpy/distutils/system_info.py | 50 +++++------------------------------------- 12 numpy/distutils/system_info.py | 50 +++++-------------------------------------
12 1 file changed, 6 insertions(+), 44 deletions(-) 13 1 file changed, 6 insertions(+), 44 deletions(-)
13 14
14Index: numpy-1.13.1/numpy/distutils/system_info.py 15diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
15=================================================================== 16index bea120c..544e056 100644
16--- numpy-1.13.1.orig/numpy/distutils/system_info.py 17--- a/numpy/distutils/system_info.py
17+++ numpy-1.13.1/numpy/distutils/system_info.py 18+++ b/numpy/distutils/system_info.py
18@@ -211,51 +211,13 @@ if sys.platform == 'win32': 19@@ -262,51 +262,13 @@ if sys.platform == 'win32':
19 default_x11_lib_dirs = [] 20 add_system_root(os.path.join(conda_dir, 'Library'))
20 default_x11_include_dirs = [] 21
21 else: 22 else:
22- default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', 23- default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib',
23- '/opt/local/lib', '/sw/lib'], platform_bits) 24- '/opt/local/lib', '/sw/lib'], platform_bits)
@@ -29,10 +30,7 @@ Index: numpy-1.13.1/numpy/distutils/system_info.py
29- '/opt/local/include', '/sw/include', 30- '/opt/local/include', '/sw/include',
30- '/usr/include/suitesparse'] 31- '/usr/include/suitesparse']
31- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src'] 32- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src']
32+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) 33-
33+ default_include_dirs = ['/deaddir/include']
34+ default_src_dirs = ['.', '/deaddir/src']
35
36- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', 34- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib',
37- '/usr/lib'], platform_bits) 35- '/usr/lib'], platform_bits)
38- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include', 36- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include',
@@ -67,8 +65,15 @@ Index: numpy-1.13.1/numpy/distutils/system_info.py
67- finally: 65- finally:
68- if tmp is not None: 66- if tmp is not None:
69- tmp.close() 67- tmp.close()
68+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
69+ default_include_dirs = ['/deaddir/include']
70+ default_src_dirs = ['.', '/deaddir/src']
71+
70+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) 72+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits)
71+ default_x11_include_dirs = ['/deaddir/include'] 73+ default_x11_include_dirs = ['/deaddir/include']
72 74
73 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: 75 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
74 default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) 76 default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib'))
77--
782.16.1
79
diff --git a/meta/recipes-devtools/python-numpy/files/remove-build-path-in-comments.patch b/meta/recipes-devtools/python-numpy/files/remove-build-path-in-comments.patch
deleted file mode 100644
index eb8a71a2e2..0000000000
--- a/meta/recipes-devtools/python-numpy/files/remove-build-path-in-comments.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From c560abff71f98a39a7401f08c2c13dad9ae7f15f Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 25 Feb 2016 01:23:32 -0500
4Subject: [PATCH] remove build path in comments
5
6It has build path in comments, so remove it.
7
8Upstream-Status: Inappropriate [openembedded specific]
9
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11---
12 numpy/distutils/misc_util.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
16index 345e60f..dafb068 100644
17--- a/numpy/distutils/misc_util.py
18+++ b/numpy/distutils/misc_util.py
19@@ -2254,7 +2254,7 @@ def generate_config_py(target):
20 from distutils.dir_util import mkpath
21 mkpath(os.path.dirname(target))
22 f = open(target, 'w')
23- f.write('# This file is generated by %s\n' % (os.path.abspath(sys.argv[0])))
24+ f.write('# This file is generated by %s\n' % (os.path.abspath(sys.argv[0]).replace(os.path.abspath('../'),'')))
25 f.write('# It contains system_info results at the time of building this package.\n')
26 f.write('__all__ = ["get_info","show"]\n\n')
27 for k, i in system_info.saved_results.items():
28--
291.9.1
30
diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.13.1.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.14.1.bb
index b6ec2308e4..6b5dd67fa3 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.13.1.bb
+++ b/meta/recipes-devtools/python-numpy/python-numpy_1.14.1.bb
@@ -1,19 +1,17 @@
1SUMMARY = "A sophisticated Numeric Processing Package for Python" 1SUMMARY = "A sophisticated Numeric Processing Package for Python"
2SECTION = "devel/python" 2SECTION = "devel/python"
3LICENSE = "BSD-3-Clause" 3LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1002b09cd654fcaa2dcc87535acd9a96" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fc53b33304171d132128ebe82ea4a645"
5 5
6SRCNAME = "numpy" 6SRCNAME = "numpy"
7 7
8SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ 8SRC_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://remove-build-path-in-comments.patch \
11 file://fix_shebang_f2py.patch \ 10 file://fix_shebang_f2py.patch \
12 file://0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch \
13 ${CONFIGFILESURI} " 11 ${CONFIGFILESURI} "
14 12
15SRC_URI[md5sum] = "6d459e4a24f5035f720dda3c57716a92" 13SRC_URI[md5sum] = "0e09f20f62ab9f8a02cb7bd3fd023482"
16SRC_URI[sha256sum] = "de020ec06f1e9ce1115a50161a38bf8d4c2525379900f9cb478cc613a1e7cd93" 14SRC_URI[sha256sum] = "8708a775be9a9a457b80a49193c57bd9d51a8a195ed1f1c4b8e89eaf3aa646ee"
17 15
18UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" 16UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
19UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" 17UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.13.3.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.14.1.bb
index 553b0fac7f..736e0f57f0 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.13.3.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.14.1.bb
@@ -1,18 +1,17 @@
1SUMMARY = "A sophisticated Numeric Processing Package for Python" 1SUMMARY = "A sophisticated Numeric Processing Package for Python"
2SECTION = "devel/python" 2SECTION = "devel/python"
3LICENSE = "BSD-3-Clause" 3LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1002b09cd654fcaa2dcc87535acd9a96" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fc53b33304171d132128ebe82ea4a645"
5 5
6SRCNAME = "numpy" 6SRCNAME = "numpy"
7 7
8SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ 8SRC_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://remove-build-path-in-comments.patch \
11 file://fix_shebang_f2py.patch \ 10 file://fix_shebang_f2py.patch \
12 file://0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch \ 11 ${CONFIGFILESURI} \
13 ${CONFIGFILESURI} " 12 "
14SRC_URI[md5sum] = "c1d433e5973e548809e80c9118474b73" 13SRC_URI[md5sum] = "0e09f20f62ab9f8a02cb7bd3fd023482"
15SRC_URI[sha256sum] = "4c6b4eef790528bebb7ec9590d74cc193868940fe68e4109a91c196df72d8094" 14SRC_URI[sha256sum] = "8708a775be9a9a457b80a49193c57bd9d51a8a195ed1f1c4b8e89eaf3aa646ee"
16 15
17UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" 16UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
18UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" 17UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"