diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-02-21 16:11:06 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-02-21 16:11:06 +0000 |
| commit | f9d7c5e40df67b32de23f894524a6bd311c50007 (patch) | |
| tree | 07f537895f7f2c2f82355de5bacde3936881a8f7 /math/py-numpy/files/patch-numpy-distutils-system_info.py | |
| parent | Update to 3.44 (diff) | |
Update to 1.16.1
- Move TEST_DEPENDS upward
- Simplify Makefile
Changes: https://github.com/numpy/numpy/releases
PR: 235721
Exp-run by: antoine
Diffstat (limited to '')
| -rw-r--r-- | math/py-numpy/files/patch-numpy-distutils-system_info.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/math/py-numpy/files/patch-numpy-distutils-system_info.py b/math/py-numpy/files/patch-numpy-distutils-system_info.py index 20864eb025d2..14d70b2bf714 100644 --- a/math/py-numpy/files/patch-numpy-distutils-system_info.py +++ b/math/py-numpy/files/patch-numpy-distutils-system_info.py @@ -1,6 +1,15 @@ ---- numpy/distutils/system_info.py.orig 2016-10-03 23:42:24 UTC +--- numpy/distutils/system_info.py.orig 2019-01-31 02:31:08 UTC +++ numpy/distutils/system_info.py -@@ -1038,8 +1038,8 @@ class atlas_info(system_info): +@@ -169,6 +169,8 @@ def _c_string_literal(s): + Convert a python string into a literal suitable for inclusion into C code + """ + # only these three characters are forbidden in C strings ++ if s is None: ++ return '"None"' + s = s.replace('\\', r'\\') + s = s.replace('"', r'\"') + s = s.replace('\n', r'\n') +@@ -1109,8 +1111,8 @@ class atlas_info(system_info): dir_env_var = 'ATLAS' _lib_names = ['f77blas', 'cblas'] if sys.platform[:7] == 'freebsd': @@ -11,8 +20,8 @@ else: _lib_atlas = ['atlas'] _lib_lapack = ['lapack'] -@@ -1574,11 +1574,6 @@ class blas_opt_info(system_info): - self.set_info(**blas_mkl_info) +@@ -1630,11 +1632,6 @@ class blas_opt_info(system_info): + self.set_info(**blis_info) return - openblas_info = get_info('openblas') |