[arch-commits] Commit in python-numpy/trunk (2 files)

[Allan McRae]

    Date: Tuesday, October 16, 2012 @ 06:01:22
  Author: allan
Revision: 168824

upgpkg: python-numpy 1.7.0-1

python-3.3 rebuild, bump to pre-release version for compatibilty

Modified:
  python-numpy/trunk/PKGBUILD
  python-numpy/trunk/numpy-1.6.2-python-3.3-build-fix.patch

----------------------------------------+
 PKGBUILD                               |   22 ++++++++++------------
 numpy-1.6.2-python-3.3-build-fix.patch |   14 +++++++++++++-
 2 files changed, 23 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-16 10:00:41 UTC (rev 168823)
+++ PKGBUILD	2012-10-16 10:01:22 UTC (rev 168824)
@@ -5,32 +5,30 @@
 
 pkgbase=python-numpy
 pkgname=('python2-numpy' 'python-numpy')
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.7.0
+_pkgver=1.7.0b2
+pkgrel=1
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://numpy.scipy.org/"
 makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
-source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz
-        numpy-1.6.2-python-3.3-build-fix.patch)
-md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba'
-         'e0fdbcfc9f6193b6762383b4693e749e')
+source=(http://downloads.sourceforge.net/numpy/numpy-${_pkgver}.tar.gz)
+md5sums=('1b62cf0e34e2db58b0241b00d603df24')
 
 build() {
   cd "${srcdir}"
-  cp -a numpy-${pkgver} numpy-py2-${pkgver}
+  cp -a numpy-${_pkgver} numpy-py2-${_pkgver}
 
   export Atlas=None
   export LDFLAGS="$LDFLAGS -shared"
 
   echo "Building Python2"
-  cd "${srcdir}/numpy-py2-${pkgver}"
+  cd "${srcdir}/numpy-py2-${_pkgver}"
   python2 setup.py config_fc --fcompiler=gnu95 build
 
   echo "Building Python3"
-  cd "${srcdir}/numpy-${pkgver}"
-  patch -Np1 -i $srcdir/numpy-1.6.2-python-3.3-build-fix.patch
+  cd "${srcdir}/numpy-${_pkgver}"
   python setup.py config_fc --fcompiler=gnu95 build
 }
 
@@ -38,7 +36,7 @@
   depends=('lapack' 'python2')
   optdepends=('python-nose: testsuite')
 
-  cd "${srcdir}/numpy-py2-${pkgver}"
+  cd "${srcdir}/numpy-py2-${_pkgver}"
   python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
 
   install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
@@ -56,7 +54,7 @@
   replaces=('python3-numpy')
   conflicts=('python3-numpy')
 
-  cd "${srcdir}/numpy-${pkgver}"
+  cd "${srcdir}/numpy-${_pkgver}"
   python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
 
   install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"

Modified: numpy-1.6.2-python-3.3-build-fix.patch
===================================================================
--- numpy-1.6.2-python-3.3-build-fix.patch	2012-10-16 10:00:41 UTC (rev 168823)
+++ numpy-1.6.2-python-3.3-build-fix.patch	2012-10-16 10:01:22 UTC (rev 168824)
@@ -75,6 +75,18 @@
      }
      memcpy(dest, src, itemsize);
      /* @default@ == 2 won't get here */
+diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
+index c4147ef..119056c 100644
+--- a/numpy/core/src/multiarray/methods.c
++++ b/numpy/core/src/multiarray/methods.c
+@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args)
+     if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) {
+         int swap=!PyArray_ISNOTSWAPPED(self);
+         self->data = datastr;
+-        if (!_IsAligned(self) || swap) {
++        if (!_IsAligned(self) || swap || (len <= 1000)) {
+             intp num = PyArray_NBYTES(self);
+             self->data = PyDataMem_NEW(num);
+             if (self->data == NULL) {
 -- 
 1.7.12.3
-