Hello community, here is the log from the commit of package python-numpy for openSUSE:Factory checked in at 2012-11-22 14:15:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-numpy (Old) and /work/SRC/openSUSE:Factory/.python-numpy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-numpy", Maintainer is "[email protected]" Changes: -------- python-numpy.changes: same change --- /work/SRC/openSUSE:Factory/python-numpy/python3-numpy.changes 2012-11-14 09:16:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-numpy.new/python3-numpy.changes 2012-11-22 14:15:07.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 21 09:31:44 UTC 2012 - [email protected] + +- Add numpy-fd15162.patch which should fix python3-scipy + See https://github.com/numpy/numpy/commit/fd15162fbff5dd68c548284947d39bb2a2481183 + +------------------------------------------------------------------- New: ---- numpy-fd15162.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ python-numpy.spec: same change ++++++ python3-numpy.spec ++++++ --- /var/tmp/diff_new_pack.enc3IV/_old 2012-11-22 14:15:08.000000000 +0100 +++ /var/tmp/diff_new_pack.enc3IV/_new 2012-11-22 14:15:08.000000000 +0100 @@ -27,6 +27,7 @@ Source: %{modname}-%{version}.tar.gz Patch1: numpy-buildfix.patch Patch2: numpy-python33.patch +Patch3: numpy-fd15162.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: blas-devel BuildRequires: lapack-devel @@ -88,6 +89,7 @@ %setup -q -n %{modname}-%{version} %patch1 %patch2 -p1 +%patch3 -p1 sed -i "1d" %{modname}/{compat/setup{,scons},distutils/{conv_template,cpuinfo,exec_command,from_template,setup,setupscons,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,rules,setup,setupscons,use_rules},ma/setup{,scons},matrixlib/setup{,scons},setup,setupscons,testing/print_coercion_tables,testing/setup{,scons}}.py # Fix non-executable scripts ++++++ numpy-fd15162.patch ++++++ Index: numpy-1.6.2/numpy/core/src/multiarray/methods.c =================================================================== --- numpy-1.6.2.orig/numpy/core/src/multiarray/methods.c +++ numpy-1.6.2/numpy/core/src/multiarray/methods.c @@ -1476,7 +1476,15 @@ array_setstate(PyArrayObject *self, PyOb if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) { int swap=!PyArray_ISNOTSWAPPED(self); self->data = datastr; - if (!_IsAligned(self) || swap) { +#ifndef NPY_PY3K + /* Check that the string is not interned */ + if (!_IsAligned(self) || swap || PyString_CHECK_INTERNED(rawdata)) { +#else + /* Bytes should always be considered immutable, but we just grab the + * pointer if they are large, to save memory. */ + if (!_IsAligned(self) || swap || (len <= 1000)) { +#endif + intp num = PyArray_NBYTES(self); self->data = PyDataMem_NEW(num); if (self->data == NULL) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
