diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-06-26 09:18:40 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-28 08:36:00 +0100 |
| commit | 3d404ffa425213f8bcc02543df0eaa55b122fcaf (patch) | |
| tree | cd5ab16c698059fc7a0a6448599934d81a8e7e45 | |
| parent | ddaa85812a432d5ec7958f5c7acf229447e18f6c (diff) | |
| download | poky-3d404ffa425213f8bcc02543df0eaa55b122fcaf.tar.gz | |
python3-numpy: update 1.18.5 -> 1.19.0
License-Update: copyright years
(From OE-Core rev: c5774fca09de12b29b1f9062e41c71db6abc972b)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch | 11 | ||||
| -rw-r--r-- | meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch | 555 | ||||
| -rw-r--r-- | meta/recipes-devtools/python-numpy/python-numpy.inc | 7 | ||||
| -rw-r--r-- | meta/recipes-devtools/python-numpy/python3-numpy_1.19.0.bb (renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.18.5.bb) | 0 |
4 files changed, 10 insertions, 563 deletions
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 98a9705831..cdb6a473d2 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,4 +1,4 @@ | |||
| 1 | From 672a75c8417ce08db9e31fc415ec445479231d5a Mon Sep 17 00:00:00 2001 | 1 | From 27f6687e49bf555fc494d2f14bae6ecd0fa30f14 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Thu, 10 Dec 2015 13:20:30 +0200 | 3 | Date: Thu, 10 Dec 2015 13:20:30 +0200 |
| 4 | Subject: [PATCH] Don't search /usr and so on for libraries by default to | 4 | Subject: [PATCH] Don't search /usr and so on for libraries by default to |
| @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
| 14 | 1 file changed, 5 insertions(+), 37 deletions(-) | 14 | 1 file changed, 5 insertions(+), 37 deletions(-) |
| 15 | 15 | ||
| 16 | diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py | 16 | diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
| 17 | index ba2b1f4..f94dce1 100644 | 17 | index 3a6a7b2..6c2c3da 100644 |
| 18 | --- a/numpy/distutils/system_info.py | 18 | --- a/numpy/distutils/system_info.py |
| 19 | +++ b/numpy/distutils/system_info.py | 19 | +++ b/numpy/distutils/system_info.py |
| 20 | @@ -278,45 +278,13 @@ if sys.platform == 'win32': | 20 | @@ -309,45 +309,13 @@ if sys.platform == 'win32': |
| 21 | add_system_root(os.path.join(conda_dir, 'Library')) | 21 | add_system_root(os.path.join(conda_dir, 'Library')) |
| 22 | 22 | ||
| 23 | else: | 23 | else: |
| 24 | - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', | 24 | - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', |
| @@ -68,3 +68,6 @@ index ba2b1f4..f94dce1 100644 | |||
| 68 | 68 | ||
| 69 | if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: | 69 | if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: |
| 70 | default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) | 70 | default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) |
| 71 | -- | ||
| 72 | 2.17.1 | ||
| 73 | |||
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 deleted file mode 100644 index a416244420..0000000000 --- a/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch +++ /dev/null | |||
| @@ -1,555 +0,0 @@ | |||
| 1 | From 00848d760fa3999e2bed759b585452b35d65d6ec Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Thu, 5 Mar 2020 12:02:35 +0800 | ||
| 4 | Subject: [PATCH] convert shebang from python to python3 | ||
| 5 | |||
| 6 | Upstream-Status: Backport | ||
| 7 | [https://github.com/numpy/numpy/commit/583901a074dc65145d3d6136ba7dcd02634d680b] | ||
| 8 | |||
| 9 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 10 | |||
| 11 | --- | ||
| 12 | doc/DISTUTILS.rst.txt | 2 +- | ||
| 13 | doc/cdoc/numpyfilter.py | 2 +- | ||
| 14 | doc/postprocess.py | 2 +- | ||
| 15 | doc/summarize.py | 2 +- | ||
| 16 | numpy/distutils/conv_template.py | 2 +- | ||
| 17 | numpy/distutils/cpuinfo.py | 2 +- | ||
| 18 | numpy/distutils/from_template.py | 2 +- | ||
| 19 | numpy/distutils/setup.py | 2 +- | ||
| 20 | numpy/distutils/system_info.py | 2 +- | ||
| 21 | numpy/f2py/__init__.py | 2 +- | ||
| 22 | numpy/f2py/auxfuncs.py | 2 +- | ||
| 23 | numpy/f2py/capi_maps.py | 2 +- | ||
| 24 | numpy/f2py/cb_rules.py | 2 +- | ||
| 25 | numpy/f2py/cfuncs.py | 2 +- | ||
| 26 | numpy/f2py/common_rules.py | 2 +- | ||
| 27 | numpy/f2py/crackfortran.py | 2 +- | ||
| 28 | numpy/f2py/diagnose.py | 2 +- | ||
| 29 | numpy/f2py/f2py2e.py | 2 +- | ||
| 30 | numpy/f2py/f90mod_rules.py | 2 +- | ||
| 31 | numpy/f2py/func2subr.py | 2 +- | ||
| 32 | numpy/f2py/rules.py | 2 +- | ||
| 33 | numpy/f2py/setup.py | 2 +- | ||
| 34 | numpy/f2py/use_rules.py | 2 +- | ||
| 35 | numpy/linalg/lapack_lite/clapack_scrub.py | 2 +- | ||
| 36 | numpy/linalg/lapack_lite/make_lite.py | 2 +- | ||
| 37 | numpy/ma/bench.py | 2 +- | ||
| 38 | numpy/ma/setup.py | 2 +- | ||
| 39 | numpy/matrixlib/setup.py | 2 +- | ||
| 40 | numpy/random/_examples/cython/extending.pyx | 2 +- | ||
| 41 | numpy/random/_examples/cython/extending_distributions.pyx | 2 +- | ||
| 42 | numpy/setup.py | 2 +- | ||
| 43 | numpy/testing/print_coercion_tables.py | 2 +- | ||
| 44 | numpy/testing/setup.py | 2 +- | ||
| 45 | runtests.py | 2 +- | ||
| 46 | setup.py | 2 +- | ||
| 47 | tools/c_coverage/c_coverage_report.py | 2 +- | ||
| 48 | tools/changelog.py | 2 +- | ||
| 49 | tools/ci/push_docs_to_repo.py | 2 +- | ||
| 50 | tools/find_deprecated_escaped_characters.py | 2 +- | ||
| 51 | tools/refguide_check.py | 2 +- | ||
| 52 | tools/swig/test/setup.py | 2 +- | ||
| 53 | tools/swig/test/testArray.py | 2 +- | ||
| 54 | tools/swig/test/testFarray.py | 2 +- | ||
| 55 | tools/swig/test/testFlat.py | 2 +- | ||
| 56 | tools/swig/test/testFortran.py | 2 +- | ||
| 57 | tools/swig/test/testMatrix.py | 2 +- | ||
| 58 | tools/swig/test/testSuperTensor.py | 2 +- | ||
| 59 | tools/swig/test/testTensor.py | 2 +- | ||
| 60 | tools/swig/test/testVector.py | 2 +- | ||
| 61 | 49 files changed, 49 insertions(+), 49 deletions(-) | ||
| 62 | |||
| 63 | diff --git a/doc/DISTUTILS.rst.txt b/doc/DISTUTILS.rst.txt | ||
| 64 | index bcef825..bc1700f 100644 | ||
| 65 | --- a/doc/DISTUTILS.rst.txt | ||
| 66 | +++ b/doc/DISTUTILS.rst.txt | ||
| 67 | @@ -59,7 +59,7 @@ SciPy pure Python package example | ||
| 68 | |||
| 69 | Below is an example of a minimal ``setup.py`` file for a pure SciPy package:: | ||
| 70 | |||
| 71 | - #!/usr/bin/env python | ||
| 72 | + #!/usr/bin/env python3 | ||
| 73 | def configuration(parent_package='',top_path=None): | ||
| 74 | from numpy.distutils.misc_util import Configuration | ||
| 75 | config = Configuration('mypackage',parent_package,top_path) | ||
| 76 | diff --git a/doc/cdoc/numpyfilter.py b/doc/cdoc/numpyfilter.py | ||
| 77 | index 0ec5069..067bd36 100755 | ||
| 78 | --- a/doc/cdoc/numpyfilter.py | ||
| 79 | +++ b/doc/cdoc/numpyfilter.py | ||
| 80 | @@ -1,4 +1,4 @@ | ||
| 81 | -#!/usr/bin/env python | ||
| 82 | +#!/usr/bin/env python3 | ||
| 83 | """ | ||
| 84 | numpyfilter.py INPUTFILE | ||
| 85 | |||
| 86 | diff --git a/doc/postprocess.py b/doc/postprocess.py | ||
| 87 | index 2e50c11..1be6f39 100755 | ||
| 88 | --- a/doc/postprocess.py | ||
| 89 | +++ b/doc/postprocess.py | ||
| 90 | @@ -1,4 +1,4 @@ | ||
| 91 | -#!/usr/bin/env python | ||
| 92 | +#!/usr/bin/env python3 | ||
| 93 | """ | ||
| 94 | %prog MODE FILES... | ||
| 95 | |||
| 96 | diff --git a/doc/summarize.py b/doc/summarize.py | ||
| 97 | index cfce271..563af02 100755 | ||
| 98 | --- a/doc/summarize.py | ||
| 99 | +++ b/doc/summarize.py | ||
| 100 | @@ -1,4 +1,4 @@ | ||
| 101 | -#!/usr/bin/env python | ||
| 102 | +#!/usr/bin/env python3 | ||
| 103 | """ | ||
| 104 | summarize.py | ||
| 105 | |||
| 106 | diff --git a/numpy/distutils/conv_template.py b/numpy/distutils/conv_template.py | ||
| 107 | index 3bcb7b8..88432c8 100644 | ||
| 108 | --- a/numpy/distutils/conv_template.py | ||
| 109 | +++ b/numpy/distutils/conv_template.py | ||
| 110 | @@ -1,4 +1,4 @@ | ||
| 111 | -#!/usr/bin/env python | ||
| 112 | +#!/usr/bin/env python3 | ||
| 113 | """ | ||
| 114 | takes templated file .xxx.src and produces .xxx file where .xxx is | ||
| 115 | .i or .c or .h, using the following template rules | ||
| 116 | diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py | ||
| 117 | index bc97283..87502a9 100644 | ||
| 118 | --- a/numpy/distutils/cpuinfo.py | ||
| 119 | +++ b/numpy/distutils/cpuinfo.py | ||
| 120 | @@ -1,4 +1,4 @@ | ||
| 121 | -#!/usr/bin/env python | ||
| 122 | +#!/usr/bin/env python3 | ||
| 123 | """ | ||
| 124 | cpuinfo | ||
| 125 | |||
| 126 | diff --git a/numpy/distutils/from_template.py b/numpy/distutils/from_template.py | ||
| 127 | index c5c1163..af75971 100644 | ||
| 128 | --- a/numpy/distutils/from_template.py | ||
| 129 | +++ b/numpy/distutils/from_template.py | ||
| 130 | @@ -1,4 +1,4 @@ | ||
| 131 | -#!/usr/bin/env python | ||
| 132 | +#!/usr/bin/env python3 | ||
| 133 | """ | ||
| 134 | |||
| 135 | process_file(filename) | ||
| 136 | diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py | ||
| 137 | index 82a53bd..646921b 100644 | ||
| 138 | --- a/numpy/distutils/setup.py | ||
| 139 | +++ b/numpy/distutils/setup.py | ||
| 140 | @@ -1,4 +1,4 @@ | ||
| 141 | -#!/usr/bin/env python | ||
| 142 | +#!/usr/bin/env python3 | ||
| 143 | from __future__ import division, print_function | ||
| 144 | |||
| 145 | def configuration(parent_package='',top_path=None): | ||
| 146 | diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py | ||
| 147 | index 4f340b6..189081d 100644 | ||
| 148 | --- a/numpy/distutils/system_info.py | ||
| 149 | +++ b/numpy/distutils/system_info.py | ||
| 150 | @@ -1,4 +1,4 @@ | ||
| 151 | -#!/usr/bin/env python | ||
| 152 | +#!/usr/bin/env python3 | ||
| 153 | """ | ||
| 154 | This file defines a set of system_info classes for getting | ||
| 155 | information about various resources (libraries, library directories, | ||
| 156 | diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py | ||
| 157 | index 42e3632..09a3657 100644 | ||
| 158 | --- a/numpy/f2py/__init__.py | ||
| 159 | +++ b/numpy/f2py/__init__.py | ||
| 160 | @@ -1,4 +1,4 @@ | ||
| 161 | -#!/usr/bin/env python | ||
| 162 | +#!/usr/bin/env python3 | ||
| 163 | """Fortran to Python Interface Generator. | ||
| 164 | |||
| 165 | """ | ||
| 166 | diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py | ||
| 167 | index 404bdbd..d23d959 100644 | ||
| 168 | --- a/numpy/f2py/auxfuncs.py | ||
| 169 | +++ b/numpy/f2py/auxfuncs.py | ||
| 170 | @@ -1,4 +1,4 @@ | ||
| 171 | -#!/usr/bin/env python | ||
| 172 | +#!/usr/bin/env python3 | ||
| 173 | """ | ||
| 174 | |||
| 175 | Auxiliary functions for f2py2e. | ||
| 176 | diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py | ||
| 177 | index ce79f68..e5d3fd2 100644 | ||
| 178 | --- a/numpy/f2py/capi_maps.py | ||
| 179 | +++ b/numpy/f2py/capi_maps.py | ||
| 180 | @@ -1,4 +1,4 @@ | ||
| 181 | -#!/usr/bin/env python | ||
| 182 | +#!/usr/bin/env python3 | ||
| 183 | """ | ||
| 184 | |||
| 185 | Copyright 1999,2000 Pearu Peterson all rights reserved, | ||
| 186 | diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py | ||
| 187 | index 183d7c2..93e93fe 100644 | ||
| 188 | --- a/numpy/f2py/cb_rules.py | ||
| 189 | +++ b/numpy/f2py/cb_rules.py | ||
| 190 | @@ -1,4 +1,4 @@ | ||
| 191 | -#!/usr/bin/env python | ||
| 192 | +#!/usr/bin/env python3 | ||
| 193 | """ | ||
| 194 | |||
| 195 | Build call-back mechanism for f2py2e. | ||
| 196 | diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py | ||
| 197 | index ccb7b3a..cdb783d 100644 | ||
| 198 | --- a/numpy/f2py/cfuncs.py | ||
| 199 | +++ b/numpy/f2py/cfuncs.py | ||
| 200 | @@ -1,4 +1,4 @@ | ||
| 201 | -#!/usr/bin/env python | ||
| 202 | +#!/usr/bin/env python3 | ||
| 203 | """ | ||
| 204 | |||
| 205 | C declarations, CPP macros, and C functions for f2py2e. | ||
| 206 | diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py | ||
| 207 | index f61d881..fe510bf 100644 | ||
| 208 | --- a/numpy/f2py/common_rules.py | ||
| 209 | +++ b/numpy/f2py/common_rules.py | ||
| 210 | @@ -1,4 +1,4 @@ | ||
| 211 | -#!/usr/bin/env python | ||
| 212 | +#!/usr/bin/env python3 | ||
| 213 | """ | ||
| 214 | |||
| 215 | Build common block mechanism for f2py2e. | ||
| 216 | diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py | ||
| 217 | index 2aaf5d7..fb5ef2f 100755 | ||
| 218 | --- a/numpy/f2py/crackfortran.py | ||
| 219 | +++ b/numpy/f2py/crackfortran.py | ||
| 220 | @@ -1,4 +1,4 @@ | ||
| 221 | -#!/usr/bin/env python | ||
| 222 | +#!/usr/bin/env python3 | ||
| 223 | """ | ||
| 224 | crackfortran --- read fortran (77,90) code and extract declaration information. | ||
| 225 | |||
| 226 | diff --git a/numpy/f2py/diagnose.py b/numpy/f2py/diagnose.py | ||
| 227 | index 0241fed..6c0304c 100644 | ||
| 228 | --- a/numpy/f2py/diagnose.py | ||
| 229 | +++ b/numpy/f2py/diagnose.py | ||
| 230 | @@ -1,4 +1,4 @@ | ||
| 231 | -#!/usr/bin/env python | ||
| 232 | +#!/usr/bin/env python3 | ||
| 233 | from __future__ import division, absolute_import, print_function | ||
| 234 | |||
| 235 | import os | ||
| 236 | diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py | ||
| 237 | index d03eff9..c17bfd9 100755 | ||
| 238 | --- a/numpy/f2py/f2py2e.py | ||
| 239 | +++ b/numpy/f2py/f2py2e.py | ||
| 240 | @@ -1,4 +1,4 @@ | ||
| 241 | -#!/usr/bin/env python | ||
| 242 | +#!/usr/bin/env python3 | ||
| 243 | """ | ||
| 244 | |||
| 245 | f2py2e - Fortran to Python C/API generator. 2nd Edition. | ||
| 246 | diff --git a/numpy/f2py/f90mod_rules.py b/numpy/f2py/f90mod_rules.py | ||
| 247 | index 85eae80..70be128 100644 | ||
| 248 | --- a/numpy/f2py/f90mod_rules.py | ||
| 249 | +++ b/numpy/f2py/f90mod_rules.py | ||
| 250 | @@ -1,4 +1,4 @@ | ||
| 251 | -#!/usr/bin/env python | ||
| 252 | +#!/usr/bin/env python3 | ||
| 253 | """ | ||
| 254 | |||
| 255 | Build F90 module support for f2py2e. | ||
| 256 | diff --git a/numpy/f2py/func2subr.py b/numpy/f2py/func2subr.py | ||
| 257 | index 6010d5a..fdea0c2 100644 | ||
| 258 | --- a/numpy/f2py/func2subr.py | ||
| 259 | +++ b/numpy/f2py/func2subr.py | ||
| 260 | @@ -1,4 +1,4 @@ | ||
| 261 | -#!/usr/bin/env python | ||
| 262 | +#!/usr/bin/env python3 | ||
| 263 | """ | ||
| 264 | |||
| 265 | Rules for building C/API module with f2py2e. | ||
| 266 | diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py | ||
| 267 | index f2f713b..f87b03c 100755 | ||
| 268 | --- a/numpy/f2py/rules.py | ||
| 269 | +++ b/numpy/f2py/rules.py | ||
| 270 | @@ -1,4 +1,4 @@ | ||
| 271 | -#!/usr/bin/env python | ||
| 272 | +#!/usr/bin/env python3 | ||
| 273 | """ | ||
| 274 | |||
| 275 | Rules for building C/API module with f2py2e. | ||
| 276 | diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py | ||
| 277 | index a8c1401..2e7a517 100644 | ||
| 278 | --- a/numpy/f2py/setup.py | ||
| 279 | +++ b/numpy/f2py/setup.py | ||
| 280 | @@ -1,4 +1,4 @@ | ||
| 281 | -#!/usr/bin/env python | ||
| 282 | +#!/usr/bin/env python3 | ||
| 283 | """ | ||
| 284 | setup.py for installing F2PY | ||
| 285 | |||
| 286 | diff --git a/numpy/f2py/use_rules.py b/numpy/f2py/use_rules.py | ||
| 287 | index 6f44f16..8214f42 100644 | ||
| 288 | --- a/numpy/f2py/use_rules.py | ||
| 289 | +++ b/numpy/f2py/use_rules.py | ||
| 290 | @@ -1,4 +1,4 @@ | ||
| 291 | -#!/usr/bin/env python | ||
| 292 | +#!/usr/bin/env python3 | ||
| 293 | """ | ||
| 294 | |||
| 295 | Build 'use others module data' mechanism for f2py2e. | ||
| 296 | diff --git a/numpy/linalg/lapack_lite/clapack_scrub.py b/numpy/linalg/lapack_lite/clapack_scrub.py | ||
| 297 | index 4345861..91e66e7 100644 | ||
| 298 | --- a/numpy/linalg/lapack_lite/clapack_scrub.py | ||
| 299 | +++ b/numpy/linalg/lapack_lite/clapack_scrub.py | ||
| 300 | @@ -1,4 +1,4 @@ | ||
| 301 | -#!/usr/bin/env python | ||
| 302 | +#!/usr/bin/env python3 | ||
| 303 | from __future__ import division, absolute_import, print_function | ||
| 304 | |||
| 305 | import sys, os | ||
| 306 | diff --git a/numpy/linalg/lapack_lite/make_lite.py b/numpy/linalg/lapack_lite/make_lite.py | ||
| 307 | index 61102d6..0211f4e 100755 | ||
| 308 | --- a/numpy/linalg/lapack_lite/make_lite.py | ||
| 309 | +++ b/numpy/linalg/lapack_lite/make_lite.py | ||
| 310 | @@ -1,4 +1,4 @@ | ||
| 311 | -#!/usr/bin/env python | ||
| 312 | +#!/usr/bin/env python3 | ||
| 313 | """ | ||
| 314 | Usage: make_lite.py <wrapped_routines_file> <lapack_dir> <output_dir> | ||
| 315 | |||
| 316 | diff --git a/numpy/ma/bench.py b/numpy/ma/bench.py | ||
| 317 | index a9ba42d..a377436 100644 | ||
| 318 | --- a/numpy/ma/bench.py | ||
| 319 | +++ b/numpy/ma/bench.py | ||
| 320 | @@ -1,4 +1,4 @@ | ||
| 321 | -#! /usr/bin/env python | ||
| 322 | +#!/usr/bin/env python3 | ||
| 323 | # -*- coding: utf-8 -*- | ||
| 324 | |||
| 325 | from __future__ import division, print_function | ||
| 326 | diff --git a/numpy/ma/setup.py b/numpy/ma/setup.py | ||
| 327 | index d1d6c89..a04b79b 100644 | ||
| 328 | --- a/numpy/ma/setup.py | ||
| 329 | +++ b/numpy/ma/setup.py | ||
| 330 | @@ -1,4 +1,4 @@ | ||
| 331 | -#!/usr/bin/env python | ||
| 332 | +#!/usr/bin/env python3 | ||
| 333 | from __future__ import division, print_function | ||
| 334 | |||
| 335 | def configuration(parent_package='',top_path=None): | ||
| 336 | diff --git a/numpy/matrixlib/setup.py b/numpy/matrixlib/setup.py | ||
| 337 | index d0981d6..57534d1 100644 | ||
| 338 | --- a/numpy/matrixlib/setup.py | ||
| 339 | +++ b/numpy/matrixlib/setup.py | ||
| 340 | @@ -1,4 +1,4 @@ | ||
| 341 | -#!/usr/bin/env python | ||
| 342 | +#!/usr/bin/env python3 | ||
| 343 | from __future__ import division, print_function | ||
| 344 | |||
| 345 | def configuration(parent_package='', top_path=None): | ||
| 346 | diff --git a/numpy/random/_examples/cython/extending.pyx b/numpy/random/_examples/cython/extending.pyx | ||
| 347 | index 7a0dfe0..3a7f81a 100644 | ||
| 348 | --- a/numpy/random/_examples/cython/extending.pyx | ||
| 349 | +++ b/numpy/random/_examples/cython/extending.pyx | ||
| 350 | @@ -1,4 +1,4 @@ | ||
| 351 | -#!/usr/bin/env python | ||
| 352 | +#!/usr/bin/env python3 | ||
| 353 | #cython: language_level=3 | ||
| 354 | |||
| 355 | from libc.stdint cimport uint32_t | ||
| 356 | diff --git a/numpy/random/_examples/cython/extending_distributions.pyx b/numpy/random/_examples/cython/extending_distributions.pyx | ||
| 357 | index 1bef506..4da6a4b 100644 | ||
| 358 | --- a/numpy/random/_examples/cython/extending_distributions.pyx | ||
| 359 | +++ b/numpy/random/_examples/cython/extending_distributions.pyx | ||
| 360 | @@ -1,4 +1,4 @@ | ||
| 361 | -#!/usr/bin/env python | ||
| 362 | +#!/usr/bin/env python3 | ||
| 363 | #cython: language_level=3 | ||
| 364 | """ | ||
| 365 | This file shows how the to use a BitGenerator to create a distribution. | ||
| 366 | diff --git a/numpy/setup.py b/numpy/setup.py | ||
| 367 | index 4ccdaee..db06c82 100644 | ||
| 368 | --- a/numpy/setup.py | ||
| 369 | +++ b/numpy/setup.py | ||
| 370 | @@ -1,4 +1,4 @@ | ||
| 371 | -#!/usr/bin/env python | ||
| 372 | +#!/usr/bin/env python3 | ||
| 373 | from __future__ import division, print_function | ||
| 374 | |||
| 375 | |||
| 376 | diff --git a/numpy/testing/print_coercion_tables.py b/numpy/testing/print_coercion_tables.py | ||
| 377 | index 72b22ce..1e9a301 100755 | ||
| 378 | --- a/numpy/testing/print_coercion_tables.py | ||
| 379 | +++ b/numpy/testing/print_coercion_tables.py | ||
| 380 | @@ -1,4 +1,4 @@ | ||
| 381 | -#!/usr/bin/env python | ||
| 382 | +#!/usr/bin/env python3 | ||
| 383 | """Prints type-coercion tables for the built-in NumPy types | ||
| 384 | |||
| 385 | """ | ||
| 386 | diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py | ||
| 387 | index 7c3f2fb..bd315ee 100755 | ||
| 388 | --- a/numpy/testing/setup.py | ||
| 389 | +++ b/numpy/testing/setup.py | ||
| 390 | @@ -1,4 +1,4 @@ | ||
| 391 | -#!/usr/bin/env python | ||
| 392 | +#!/usr/bin/env python3 | ||
| 393 | from __future__ import division, print_function | ||
| 394 | |||
| 395 | |||
| 396 | diff --git a/runtests.py b/runtests.py | ||
| 397 | index a38054f..383ddaa 100755 | ||
| 398 | --- a/runtests.py | ||
| 399 | +++ b/runtests.py | ||
| 400 | @@ -1,4 +1,4 @@ | ||
| 401 | -#!/usr/bin/env python | ||
| 402 | +#!/usr/bin/env python3 | ||
| 403 | """ | ||
| 404 | runtests.py [OPTIONS] [-- ARGS] | ||
| 405 | |||
| 406 | diff --git a/setup.py b/setup.py | ||
| 407 | index d7f807b..705ea5d 100755 | ||
| 408 | --- a/setup.py | ||
| 409 | +++ b/setup.py | ||
| 410 | @@ -1,4 +1,4 @@ | ||
| 411 | -#!/usr/bin/env python | ||
| 412 | +#!/usr/bin/env python3 | ||
| 413 | """ NumPy is the fundamental package for array computing with Python. | ||
| 414 | |||
| 415 | It provides: | ||
| 416 | diff --git a/tools/c_coverage/c_coverage_report.py b/tools/c_coverage/c_coverage_report.py | ||
| 417 | index 327f6dc..8837684 100755 | ||
| 418 | --- a/tools/c_coverage/c_coverage_report.py | ||
| 419 | +++ b/tools/c_coverage/c_coverage_report.py | ||
| 420 | @@ -1,4 +1,4 @@ | ||
| 421 | -#!/usr/bin/env python | ||
| 422 | +#!/usr/bin/env python3 | ||
| 423 | """ | ||
| 424 | A script to create C code-coverage reports based on the output of | ||
| 425 | valgrind's callgrind tool. | ||
| 426 | diff --git a/tools/changelog.py b/tools/changelog.py | ||
| 427 | index b135b14..5d8b33c 100755 | ||
| 428 | --- a/tools/changelog.py | ||
| 429 | +++ b/tools/changelog.py | ||
| 430 | @@ -1,4 +1,4 @@ | ||
| 431 | -#!/usr/bin/env python | ||
| 432 | +#!/usr/bin/env python3 | ||
| 433 | # -*- encoding:utf-8 -*- | ||
| 434 | """ | ||
| 435 | Script to generate contributor and pull request lists | ||
| 436 | diff --git a/tools/ci/push_docs_to_repo.py b/tools/ci/push_docs_to_repo.py | ||
| 437 | index a989668..ae53054 100755 | ||
| 438 | --- a/tools/ci/push_docs_to_repo.py | ||
| 439 | +++ b/tools/ci/push_docs_to_repo.py | ||
| 440 | @@ -1,4 +1,4 @@ | ||
| 441 | -#!/usr/bin/env python | ||
| 442 | +#!/usr/bin/env python3 | ||
| 443 | |||
| 444 | import argparse | ||
| 445 | import subprocess | ||
| 446 | diff --git a/tools/find_deprecated_escaped_characters.py b/tools/find_deprecated_escaped_characters.py | ||
| 447 | index 6f90001..10e0378 100644 | ||
| 448 | --- a/tools/find_deprecated_escaped_characters.py | ||
| 449 | +++ b/tools/find_deprecated_escaped_characters.py | ||
| 450 | @@ -1,4 +1,4 @@ | ||
| 451 | -#! /usr/bin/env python | ||
| 452 | +#!/usr/bin/env python3 | ||
| 453 | r""" | ||
| 454 | Look for escape sequences deprecated in Python 3.6. | ||
| 455 | |||
| 456 | diff --git a/tools/refguide_check.py b/tools/refguide_check.py | ||
| 457 | index 2c62809..a19a29e 100644 | ||
| 458 | --- a/tools/refguide_check.py | ||
| 459 | +++ b/tools/refguide_check.py | ||
| 460 | @@ -1,4 +1,4 @@ | ||
| 461 | -#!/usr/bin/env python | ||
| 462 | +#!/usr/bin/env python3 | ||
| 463 | """ | ||
| 464 | refguide_check.py [OPTIONS] [-- ARGS] | ||
| 465 | |||
| 466 | diff --git a/tools/swig/test/setup.py b/tools/swig/test/setup.py | ||
| 467 | index 4ff870e..f8f05e6 100755 | ||
| 468 | --- a/tools/swig/test/setup.py | ||
| 469 | +++ b/tools/swig/test/setup.py | ||
| 470 | @@ -1,4 +1,4 @@ | ||
| 471 | -#! /usr/bin/env python | ||
| 472 | +#!/usr/bin/env python3 | ||
| 473 | from __future__ import division, print_function | ||
| 474 | |||
| 475 | # System imports | ||
| 476 | diff --git a/tools/swig/test/testArray.py b/tools/swig/test/testArray.py | ||
| 477 | index 8d9c797..54ffe71 100755 | ||
| 478 | --- a/tools/swig/test/testArray.py | ||
| 479 | +++ b/tools/swig/test/testArray.py | ||
| 480 | @@ -1,4 +1,4 @@ | ||
| 481 | -#! /usr/bin/env python | ||
| 482 | +#!/usr/bin/env python3 | ||
| 483 | from __future__ import division, absolute_import, print_function | ||
| 484 | |||
| 485 | # System imports | ||
| 486 | diff --git a/tools/swig/test/testFarray.py b/tools/swig/test/testFarray.py | ||
| 487 | index e8bf711..b377f7c 100755 | ||
| 488 | --- a/tools/swig/test/testFarray.py | ||
| 489 | +++ b/tools/swig/test/testFarray.py | ||
| 490 | @@ -1,4 +1,4 @@ | ||
| 491 | -#! /usr/bin/env python | ||
| 492 | +#!/usr/bin/env python3 | ||
| 493 | from __future__ import division, absolute_import, print_function | ||
| 494 | |||
| 495 | # System imports | ||
| 496 | diff --git a/tools/swig/test/testFlat.py b/tools/swig/test/testFlat.py | ||
| 497 | index 71be277..55034bf 100755 | ||
| 498 | --- a/tools/swig/test/testFlat.py | ||
| 499 | +++ b/tools/swig/test/testFlat.py | ||
| 500 | @@ -1,4 +1,4 @@ | ||
| 501 | -#! /usr/bin/env python | ||
| 502 | +#!/usr/bin/env python3 | ||
| 503 | from __future__ import division, absolute_import, print_function | ||
| 504 | |||
| 505 | # System imports | ||
| 506 | diff --git a/tools/swig/test/testFortran.py b/tools/swig/test/testFortran.py | ||
| 507 | index 426e894..0f7d0e6 100644 | ||
| 508 | --- a/tools/swig/test/testFortran.py | ||
| 509 | +++ b/tools/swig/test/testFortran.py | ||
| 510 | @@ -1,4 +1,4 @@ | ||
| 511 | -#! /usr/bin/env python | ||
| 512 | +#!/usr/bin/env python3 | ||
| 513 | from __future__ import division, absolute_import, print_function | ||
| 514 | |||
| 515 | # System imports | ||
| 516 | diff --git a/tools/swig/test/testMatrix.py b/tools/swig/test/testMatrix.py | ||
| 517 | index 065be0d..854a23c 100755 | ||
| 518 | --- a/tools/swig/test/testMatrix.py | ||
| 519 | +++ b/tools/swig/test/testMatrix.py | ||
| 520 | @@ -1,4 +1,4 @@ | ||
| 521 | -#! /usr/bin/env python | ||
| 522 | +#!/usr/bin/env python3 | ||
| 523 | from __future__ import division, absolute_import, print_function | ||
| 524 | |||
| 525 | # System imports | ||
| 526 | diff --git a/tools/swig/test/testSuperTensor.py b/tools/swig/test/testSuperTensor.py | ||
| 527 | index 97fe80c..31b63d0 100644 | ||
| 528 | --- a/tools/swig/test/testSuperTensor.py | ||
| 529 | +++ b/tools/swig/test/testSuperTensor.py | ||
| 530 | @@ -1,4 +1,4 @@ | ||
| 531 | -#! /usr/bin/env python | ||
| 532 | +#!/usr/bin/env python3 | ||
| 533 | from __future__ import division, print_function | ||
| 534 | |||
| 535 | # System imports | ||
| 536 | diff --git a/tools/swig/test/testTensor.py b/tools/swig/test/testTensor.py | ||
| 537 | index ac1b749..f47d9e8 100755 | ||
| 538 | --- a/tools/swig/test/testTensor.py | ||
| 539 | +++ b/tools/swig/test/testTensor.py | ||
| 540 | @@ -1,4 +1,4 @@ | ||
| 541 | -#! /usr/bin/env python | ||
| 542 | +#!/usr/bin/env python3 | ||
| 543 | from __future__ import division, absolute_import, print_function | ||
| 544 | |||
| 545 | # System imports | ||
| 546 | diff --git a/tools/swig/test/testVector.py b/tools/swig/test/testVector.py | ||
| 547 | index 45e763b..067b922 100755 | ||
| 548 | --- a/tools/swig/test/testVector.py | ||
| 549 | +++ b/tools/swig/test/testVector.py | ||
| 550 | @@ -1,4 +1,4 @@ | ||
| 551 | -#! /usr/bin/env python | ||
| 552 | +#!/usr/bin/env python3 | ||
| 553 | from __future__ import division, absolute_import, print_function | ||
| 554 | |||
| 555 | # System imports | ||
diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc index 75309e3080..e37ab399ed 100644 --- a/meta/recipes-devtools/python-numpy/python-numpy.inc +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc | |||
| @@ -1,15 +1,14 @@ | |||
| 1 | SUMMARY = "A sophisticated Numeric Processing Package for Python" | 1 | SUMMARY = "A sophisticated Numeric Processing Package for Python" |
| 2 | SECTION = "devel/python" | 2 | SECTION = "devel/python" |
| 3 | LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" | 3 | LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=643d4e90100b7abe468c4db88127b895" |
| 5 | 5 | ||
| 6 | SRCNAME = "numpy" | 6 | 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-convert-shebang-from-python-to-python3.patch \ | ||
| 11 | " | 10 | " |
| 12 | SRC_URI[sha256sum] = "2c095bd1c5290966cceee8b6ef5cd66f13cd0e9d6d0e8d6fc8961abd64a8e51f" | 11 | SRC_URI[sha256sum] = "153cf8b0176e57a611931981acfe093d2f7fef623b48f91176efa199798a6b90" |
| 13 | 12 | ||
| 14 | UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" | 13 | UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" |
| 15 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" | 14 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" |
| @@ -20,7 +19,7 @@ S = "${WORKDIR}/numpy-${PV}" | |||
| 20 | 19 | ||
| 21 | CLEANBROKEN = "1" | 20 | CLEANBROKEN = "1" |
| 22 | 21 | ||
| 23 | FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" | 22 | FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a ${PYTHON_SITEPACKAGES_DIR}/numpy/random/lib/*.a" |
| 24 | 23 | ||
| 25 | # install what is needed for numpy.test() | 24 | # install what is needed for numpy.test() |
| 26 | RDEPENDS_${PN} = "${PYTHON_PN}-unittest \ | 25 | RDEPENDS_${PN} = "${PYTHON_PN}-unittest \ |
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.18.5.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.0.bb index d388e88d25..d388e88d25 100644 --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.18.5.bb +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.19.0.bb | |||
