Skip to content

bump numpy to 1.9.2 #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tito merged 1 commit into from
May 16, 2015
Merged

bump numpy to 1.9.2 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions recipes/numpy/patches/fix-numpy.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
diff -x build -x '*.pyc' -x '*.swp' -Naur numpy-1.7.1.orig/numpy/core/src/multiarray/numpyos.c numpy-1.7.1/numpy/core/src/multiarray/numpyos.c
--- numpy-1.7.1.orig/numpy/core/src/multiarray/numpyos.c 2013-04-07 07:04:05.000000000 +0200
+++ numpy-1.7.1/numpy/core/src/multiarray/numpyos.c 2013-05-03 10:57:35.812501674 +0200
@@ -170,8 +170,7 @@
diff --git a/numpy/core/src/multiarray/numpyos.c b/numpy/core/src/multiarray/numpyos.c
index 44b32f4..378e199 100644
--- a/numpy/core/src/multiarray/numpyos.c
+++ b/numpy/core/src/multiarray/numpyos.c
@@ -165,8 +165,7 @@ ensure_decimal_point(char* buffer, size_t buf_size)
static void
_change_decimal_from_locale_to_dot(char* buffer)
change_decimal_from_locale_to_dot(char* buffer)
{
- struct lconv *locale_data = localeconv();
- const char *decimal_point = locale_data->decimal_point;
+ const char *decimal_point = ".";

if (decimal_point[0] != '.' || decimal_point[1] != 0) {
size_t decimal_point_len = strlen(decimal_point);
@@ -455,8 +454,7 @@
@@ -448,8 +447,7 @@ NumPyOS_ascii_strtod_plain(const char *s, char** endptr)
NPY_NO_EXPORT double
NumPyOS_ascii_strtod(const char *s, char** endptr)
{
Expand All @@ -21,40 +22,41 @@ diff -x build -x '*.pyc' -x '*.swp' -Naur numpy-1.7.1.orig/numpy/core/src/multia
size_t decimal_point_len = strlen(decimal_point);

char buffer[FLOAT_FORMATBUFLEN+1];
diff -x build -x '*.pyc' -x '*.swp' -Naur numpy-1.7.1.orig/numpy/core/src/private/npy_config.h numpy-1.7.1/numpy/core/src/private/npy_config.h
--- numpy-1.7.1.orig/numpy/core/src/private/npy_config.h 2013-04-07 07:04:05.000000000 +0200
+++ numpy-1.7.1/numpy/core/src/private/npy_config.h 2013-05-03 10:57:35.812501674 +0200
@@ -41,4 +41,12 @@
#define SIZEOF_PY_INTPTR_T 4
#endif
diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h
index f768c90..4e5d168 100644
--- a/numpy/core/src/private/npy_config.h
+++ b/numpy/core/src/private/npy_config.h
@@ -41,4 +41,10 @@
#undef HAVE_ATAN2
#endif
+
+/* Android only
+ */

+/* Android only */
+#ifdef ANDROID
+#undef HAVE_LDEXPL
+#undef HAVE_FREXPL
+#endif
+
#endif
diff -x build -x '*.pyc' -x '*.swp' -Naur numpy-1.7.1.orig/numpy/testing/__init__.py numpy-1.7.1/numpy/testing/__init__.py
--- numpy-1.7.1.orig/numpy/testing/__init__.py 2013-04-07 07:04:05.000000000 +0200
+++ numpy-1.7.1/numpy/testing/__init__.py 2013-05-03 11:09:29.316488099 +0200
@@ -1,15 +1,7 @@
diff --git a/numpy/testing/__init__.py b/numpy/testing/__init__.py
index 258cbe9..ce4e0eb 100644
--- a/numpy/testing/__init__.py
+++ b/numpy/testing/__init__.py
@@ -1,16 +1,7 @@
-"""Common test support for all numpy test scripts.
-
-This single module should provide all the common functionality for numpy tests
-in a single location, so that test scripts can just import it and work right
-away.
-
-"""
-from __future__ import division, absolute_import, print_function
-
-from unittest import TestCase
-
-import decorators as dec
-from utils import *
-from numpytest import *
-from nosetester import NoseTester as Tester
-from nosetester import run_module_suite
-from . import decorators as dec
-from .utils import *
-from .nosetester import NoseTester as Tester
-from .nosetester import run_module_suite
+# fake tester, android don't have unittest
+class Tester(object):
+ def test(self, *args, **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions recipes/numpy/recipe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash

VERSION_numpy=${VERSION_numpy:-1.7.1}
VERSION_numpy=${VERSION_numpy:-1.9.2}
URL_numpy=http://pypi.python.org/packages/source/n/numpy/numpy-$VERSION_numpy.tar.gz
DEPS_numpy=(python)
MD5_numpy=0ab72b3b83528a7ae79c6df9042d61c6
MD5_numpy=a1ed53432dbcd256398898d35bc8e645
BUILD_numpy=$BUILD_PATH/numpy/$(get_directory $URL_numpy)
RECIPE_numpy=$RECIPES_PATH/numpy

Expand Down
1 change: 0 additions & 1 deletion src/blacklist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ lib-dynload/*audioop.so
lib-dynload/mmap.so
lib-dynload/_hotshot.so
lib-dynload/_csv.so
lib-dynload/future_builtins.so
lib-dynload/_heapq.so
lib-dynload/_json.so
lib-dynload/grp.so
Expand Down