math/py-numpy: Update to 1.20.3

PR:		259063
Reported by:	wen@
Exp-run by:	antoine@

4 files changed, 11 insertions, 53 deletions

diff --git a/math/py-numpy/files/patch-numpy-distutils-exec_command.py b/math/py-numpy/files/patch-numpy-distutils-exec_command.py
index ea297206195c..a99e5814811d 100644
--- a/math/py-numpy/files/patch-numpy-distutils-exec_command.py
+++ b/math/py-numpy/files/patch-numpy-distutils-exec_command.py
@@ -1,6 +1,6 @@
---- numpy/distutils/exec_command.py.orig	2017-09-29 20:10:10 UTC
+--- numpy/distutils/exec_command.py.orig	2021-05-08 18:35:28 UTC
 +++ numpy/distutils/exec_command.py
-@@ -231,7 +231,7 @@ def _exec_command(command, use_shell=Non
+@@ -261,7 +261,7 @@ def _exec_command(command, use_shell=None, use_tee = N
  
      if os.name == 'posix' and use_shell:
          # On POSIX, subprocess always uses /bin/sh, override
diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
index 4c52b846e1b4..63c4d24b2f9b 100644
--- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
+++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
@@ -1,6 +1,6 @@
---- numpy/distutils/fcompiler/__init__.py.orig	2019-01-31 02:31:08 UTC
+--- numpy/distutils/fcompiler/__init__.py.orig	2021-05-09 10:38:00 UTC
 +++ numpy/distutils/fcompiler/__init__.py
-@@ -177,7 +177,7 @@ class FCompiler(CCompiler):
+@@ -171,7 +171,7 @@ class FCompiler(CCompiler):
      # gnu95 compiler type when there are F90 sources.
      suggested_f90_compiler = None
  
diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
index c34798b4f9a1..5efb5d0a3d37 100644
--- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
+++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
@@ -1,6 +1,6 @@
---- numpy/distutils/fcompiler/gnu.py.orig	2015-09-13 16:21:27 UTC
+--- numpy/distutils/fcompiler/gnu.py.orig	2021-05-08 21:14:06 UTC
 +++ numpy/distutils/fcompiler/gnu.py
-@@ -83,7 +83,7 @@ class GnuFCompiler(FCompiler):
+@@ -79,7 +79,7 @@ class GnuFCompiler(FCompiler):
              return None
          return v[1]
  
@@ -9,7 +9,7 @@
      executables = {
          'version_cmd'  : [None, "-dumpversion"],
          'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
-@@ -107,11 +107,13 @@ class GnuFCompiler(FCompiler):
+@@ -103,11 +103,13 @@ class GnuFCompiler(FCompiler):
          for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']:
              executables[key].append('-mno-cygwin')
  
@@ -24,7 +24,7 @@
          if sys.platform == 'darwin':
              target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', None)
              # If MACOSX_DEPLOYMENT_TARGET is set, we simply trust the value
-@@ -265,7 +267,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -287,7 +289,7 @@ class Gnu95FCompiler(GnuFCompiler):
                      self.executables[key].append('-mno-cygwin')
          return v
  
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 299f98311648..4ba9667e65c6 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,6 @@
---- numpy/distutils/system_info.py.orig	2019-08-27 21:01:36 UTC
+--- numpy/distutils/system_info.py.orig	2021-05-09 10:38:00 UTC
 +++ numpy/distutils/system_info.py
-@@ -172,6 +172,8 @@ def _c_string_literal(s):
+@@ -209,6 +209,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
@@ -9,7 +9,7 @@
      s = s.replace('\\', r'\\')
      s = s.replace('"',  r'\"')
      s = s.replace('\n', r'\n')
-@@ -1112,8 +1114,8 @@ class atlas_info(system_info):
+@@ -1322,8 +1324,8 @@ class atlas_info(system_info):
      dir_env_var = 'ATLAS'
      _lib_names = ['f77blas', 'cblas']
      if sys.platform[:7] == 'freebsd':
@@ -20,45 +20,3 @@
      else:
          _lib_atlas = ['atlas']
          _lib_lapack = ['lapack']
-@@ -1633,11 +1635,6 @@ class blas_opt_info(system_info):
-             self.set_info(**blis_info)
-             return
- 
--        openblas_info = get_info('openblas')
--        if openblas_info:
--            self.set_info(**openblas_info)
--            return
--
-         atlas_info = get_info('atlas_3_10_blas_threads')
-         if not atlas_info:
-             atlas_info = get_info('atlas_3_10_blas')
-@@ -1730,18 +1727,17 @@ class blas_info(system_info):
-                 # check we can link (find library)
-                 # some systems have separate cblas and blas libs. First
-                 # check for cblas lib, and if not present check for blas lib.
--                try:
--                    c.link_executable(obj, os.path.join(tmpdir, "a.out"),
--                                      libraries=["cblas"],
--                                      library_dirs=info['library_dirs'],
--                                      extra_postargs=info.get('extra_link_args', []))
--                    res = "cblas"
--                except distutils.ccompiler.LinkError:
--                    c.link_executable(obj, os.path.join(tmpdir, "a.out"),
--                                      libraries=["blas"],
--                                      library_dirs=info['library_dirs'],
--                                      extra_postargs=info.get('extra_link_args', []))
--                    res = "blas"
-+                res = None
-+                for libname in ['cblas', 'blas', 'openblas']:
-+                    try:
-+                        c.link_executable(obj, os.path.join(tmpdir, "a.out"),
-+                                          libraries=[libname],
-+                                          library_dirs=info['library_dirs'],
-+                                          extra_postargs=info.get('extra_link_args', []))
-+                        res = libname
-+                        break
-+                    except distutils.ccompiler.LinkError:
-+                        pass
-             except distutils.ccompiler.CompileError:
-                 res = None
-         finally: