[arch-commits] Commit in python-numpy/trunk (2 files)
Jan de Groot
jgc at nymeria.archlinux.org
Tue Apr 16 08:33:14 UTC 2013
Date: Tuesday, April 16, 2013 @ 10:33:14
Author: jgc
Revision: 182930
upgpkg: python-numpy 1.7.1-1
Fix python3 include path (FS#34609)
Modified:
python-numpy/trunk/PKGBUILD
Deleted:
python-numpy/trunk/numpy-1.6.2-python-3.3-build-fix.patch
----------------------------------------+
PKGBUILD | 11 ++-
numpy-1.6.2-python-3.3-build-fix.patch | 92 -------------------------------
2 files changed, 6 insertions(+), 97 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-16 07:48:55 UTC (rev 182929)
+++ PKGBUILD 2013-04-16 08:33:14 UTC (rev 182930)
@@ -5,15 +5,15 @@
pkgbase=python-numpy
pkgname=('python2-numpy' 'python-numpy')
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.7.1
+pkgrel=1
pkgdesc="Scientific tools for Python"
arch=('i686' 'x86_64')
license=('custom')
url="http://www.numpy.org/"
makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
-md5sums=('4fa54e40b6a243416f0248123b6ec332')
+md5sums=('0ab72b3b83528a7ae79c6df9042d61c6')
build() {
cd "${srcdir}"
@@ -62,6 +62,7 @@
conflicts=('python3-numpy')
_pyver=3.3
+ _pyinc=3.3m
export ATLAS=None
export LDFLAGS="$LDFLAGS -shared"
@@ -72,6 +73,6 @@
install -m755 -d "${pkgdir}/usr/share/licenses/python-numpy"
install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-numpy/"
- install -m755 -d "${pkgdir}/usr/include/python${_pyver}"
- ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy"
+ install -m755 -d "${pkgdir}/usr/include/python${_pyinc}"
+ ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyinc}/numpy"
}
Deleted: numpy-1.6.2-python-3.3-build-fix.patch
===================================================================
--- numpy-1.6.2-python-3.3-build-fix.patch 2013-04-16 07:48:55 UTC (rev 182929)
+++ numpy-1.6.2-python-3.3-build-fix.patch 2013-04-16 08:33:14 UTC (rev 182930)
@@ -1,92 +0,0 @@
-diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c
-index 00c71f9..0afdc17 100644
---- a/numpy/core/src/multiarray/scalarapi.c
-+++ b/numpy/core/src/multiarray/scalarapi.c
-@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
- itemsize = (((itemsize - 1) >> 2) + 1) << 2;
- }
- }
-+#if PY_VERSION_HEX >= 0x03030000
-+ if (type_num == NPY_UNICODE) {
-+ PyObject *u, *args;
-+ char *buffer;
-+ if (swap) {
-+ buffer = malloc(itemsize);
-+ if (buffer == NULL) {
-+ PyErr_NoMemory();
-+ return NULL;
-+ }
-+ memcpy(buffer, data, itemsize);
-+ byte_swap_vector(buffer, itemsize >> 2, 4);
-+ } else {
-+ buffer = data;
-+ }
-+ u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer,
-+ itemsize >> 2);
-+ if (swap) {
-+ free(buffer);
-+ }
-+ if (u == NULL) {
-+ return NULL;
-+ }
-+ args = Py_BuildValue("(O)", u);
-+ if (args == NULL) {
-+ Py_DECREF(u);
-+ return NULL;
-+ }
-+ obj = type->tp_new(type, args, NULL);
-+ Py_DECREF(u);
-+ Py_DECREF(args);
-+ return obj;
-+ }
-+#endif
- if (type->tp_itemsize != 0) {
- /* String type */
- obj = type->tp_alloc(type, itemsize);
-@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
- memcpy(destptr, data, itemsize);
- return obj;
- }
-+#if PY_VERSION_HEX < 0x03030000
- else if (type_num == PyArray_UNICODE) {
- /* tp_alloc inherited from Python PyBaseObject_Type */
- PyUnicodeObject *uni = (PyUnicodeObject*)obj;
-@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
- #endif
- return obj;
- }
-+#endif // PY_VERSION_HEX < 0x03030000
- else {
- PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj;
- vobj->base = NULL;
-diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
-index e547071..12745d7 100644
---- a/numpy/core/src/multiarray/scalartypes.c.src
-+++ b/numpy/core/src/multiarray/scalartypes.c.src
-@@ -2592,7 +2592,11 @@ finish:
- *((npy_ at name@ *)dest) = *((npy_ at name@ *)src);
- #elif @default@ == 1 /* unicode and strings */
- if (itemsize == 0) { /* unicode */
-+#if PY_VERSION_HEX >= 0x03030000
-+ itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj);
-+#else
- itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE);
-+#endif
- }
- 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
More information about the arch-commits
mailing list