Accepting request 638249 from devel:languages:python:numeric

- Update to version 1.15.2
  Changes documented in release notes:
  https://github.com/numpy/numpy/blob/master/doc/release/1.15.2-notes.rst
- Update to version 1.15.1
  Changes documented in release notes:
  https://github.com/numpy/numpy/blob/master/doc/release/1.15.1-notes.rst
- Update to version 1.15.0
  Changes documented in release notes:
  https://github.com/numpy/numpy/blob/master/doc/release/1.15.0-notes.rst
- Update to version 1.14.6
  Changes documented in release notes:
  https://github.com/numpy/numpy/blob/master/doc/release/1.14.6-notes.rst
- Rebase numpy-1.9.0-remove-__declspec.patch
- Rebase riscv.patch

OBS-URL: https://build.opensuse.org/request/show/638249
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=70
This commit is contained in:
Dominique Leuenberger 2018-10-02 17:44:22 +00:00 committed by Git OBS Bridge
parent bf2f4604de
commit 0782c0a445
6 changed files with 31 additions and 13 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a4a433b3a264dbc9aa9c7c241e87c0358a503ea6394f8737df1683c7c9a102ac
size 4904624

3
numpy-1.15.2.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:27a0d018f608a3fe34ac5e2b876f4c23c47e38295c47dd0775cc294cd2614bc1
size 4484511

View File

@ -15,12 +15,12 @@ safely removed.
--- a/numpy/core/setup_common.py --- a/numpy/core/setup_common.py
+++ b/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py
@@ -163,7 +163,7 @@ @@ -166,7 +166,7 @@
] ]
# variable attributes tested via "int %s a" % attribute # variable attributes tested via "int %s a" % attribute
-OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread", "__declspec(thread)"] -OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread", "__declspec(thread)"]
+OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread"] +OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread"]
# Subset of OPTIONAL_STDFUNCS which may alreay have HAVE_* defined by Python.h # Subset of OPTIONAL_STDFUNCS which may already have HAVE_* defined by Python.h
OPTIONAL_STDFUNCS_MAYBE = [ OPTIONAL_STDFUNCS_MAYBE = [

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Sep 24 14:56:59 UTC 2018 - Todd R <toddrme2178@gmail.com>
- Update to version 1.15.2
Changes documented in release notes:
https://github.com/numpy/numpy/blob/master/doc/release/1.15.2-notes.rst
- Update to version 1.15.1
Changes documented in release notes:
https://github.com/numpy/numpy/blob/master/doc/release/1.15.1-notes.rst
- Update to version 1.15.0
Changes documented in release notes:
https://github.com/numpy/numpy/blob/master/doc/release/1.15.0-notes.rst
- Update to version 1.14.6
Changes documented in release notes:
https://github.com/numpy/numpy/blob/master/doc/release/1.14.6-notes.rst
- Rebase numpy-1.9.0-remove-__declspec.patch
- Rebase riscv.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 13 18:14:49 UTC 2018 - toddrme2178@gmail.com Wed Jun 13 18:14:49 UTC 2018 - toddrme2178@gmail.com

View File

@ -18,8 +18,8 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%define ver 1.14.5 %define ver 1.15.2
%define _ver 1_14_5 %define _ver 1_15_2
%define pname python-numpy %define pname python-numpy
%bcond_with ringdisabled %bcond_with ringdisabled
@ -169,7 +169,7 @@ This package contains files for developing applications using numpy.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
# Fix non-executable scripts # Fix non-executable scripts
sed -i '1s/^#!.*$//' numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py sed -i '1s/^#!.*$//' numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/{setup,bench},matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py
%build %build
%if %{with hpc} %if %{with hpc}

View File

@ -2,18 +2,18 @@ Index: numpy-1.14.0/numpy/core/include/numpy/npy_cpu.h
=================================================================== ===================================================================
--- numpy-1.14.0.orig/numpy/core/include/numpy/npy_cpu.h --- numpy-1.14.0.orig/numpy/core/include/numpy/npy_cpu.h
+++ numpy-1.14.0/numpy/core/include/numpy/npy_cpu.h +++ numpy-1.14.0/numpy/core/include/numpy/npy_cpu.h
@@ -17,6 +17,7 @@ @@ -18,6 +18,7 @@
* NPY_CPU_SH_BE
* NPY_CPU_ARCEL * NPY_CPU_ARCEL
* NPY_CPU_ARCEB * NPY_CPU_ARCEB
* NPY_CPU_RISCV64
+ * NPY_CPU_RISCV + * NPY_CPU_RISCV
*/ */
#ifndef _NPY_CPUARCH_H_ #ifndef _NPY_CPUARCH_H_
#define _NPY_CPUARCH_H_ #define _NPY_CPUARCH_H_
@@ -82,6 +83,8 @@ @@ -102,6 +103,8 @@
#define NPY_CPU_ARCEL
#elif defined(__arc__) && defined(__BIG_ENDIAN__)
#define NPY_CPU_ARCEB #define NPY_CPU_ARCEB
#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
#define NPY_CPU_RISCV64
+#elif defined(__riscv) +#elif defined(__riscv)
+ #define NPY_CPU_RISCV + #define NPY_CPU_RISCV
#else #else