1212
Merge pull request #356 from cbenhagen/numpy-1.9.2 · lineCode/python-for-android@fb2b311 · GitHub
Skip to content

Commit fb2b311

Browse files
titotito
committed
Merge pull request kivy#356 from cbenhagen/numpy-1.9.2
bump numpy to 1.9.2
2 parents aa12697 + 1169950 commit fb2b311

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

‎recipes/numpy/patches/fix-numpy.patch‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
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
2-
--- numpy-1.7.1.orig/numpy/core/src/multiarray/numpyos.c 2013-04-07 07:04:05.000000000 +0200
3-
+++ numpy-1.7.1/numpy/core/src/multiarray/numpyos.c 2013-05-03 10:57:35.812501674 +0200
4-
@@ -170,8 +170,7 @@
1+
diff --git a/numpy/core/src/multiarray/numpyos.c b/numpy/core/src/multiarray/numpyos.c
2+
index 44b32f4..378e199 100644
3+
--- a/numpy/core/src/multiarray/numpyos.c
4+
+++ b/numpy/core/src/multiarray/numpyos.c
5+
@@ -165,8 +165,7 @@ ensure_decimal_point(char* buffer, size_t buf_size)
56
static void
6-
_change_decimal_from_locale_to_dot(char* buffer)
7+
change_decimal_from_locale_to_dot(char* buffer)
78
{
89
- struct lconv *locale_data = localeconv();
910
- const char *decimal_point = locale_data->decimal_point;
1011
+ const char *decimal_point = ".";
1112

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

2324
char buffer[FLOAT_FORMATBUFLEN+1];
24-
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
25-
--- numpy-1.7.1.orig/numpy/core/src/private/npy_config.h 2013-04-07 07:04:05.000000000 +0200
26-
+++ numpy-1.7.1/numpy/core/src/private/npy_config.h 2013-05-03 10:57:35.812501674 +0200
27-
@@ -41,4 +41,12 @@
28-
#define SIZEOF_PY_INTPTR_T 4
29-
#endif
25+
diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h
26+
index f768c90..4e5d168 100644
27+
--- a/numpy/core/src/private/npy_config.h
28+
+++ b/numpy/core/src/private/npy_config.h
29+
@@ -41,4 +41,10 @@
30+
#undef HAVE_ATAN2
3031
#endif
31-
+
32-
+/* Android only
33-
+ */
32+
33+
+/* Android only */
3434
+#ifdef ANDROID
3535
+#undef HAVE_LDEXPL
3636
+#undef HAVE_FREXPL
3737
+#endif
3838
+
3939
#endif
40-
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
41-
--- numpy-1.7.1.orig/numpy/testing/__init__.py 2013-04-07 07:04:05.000000000 +0200
42-
+++ numpy-1.7.1/numpy/testing/__init__.py 2013-05-03 11:09:29.316488099 +0200
43-
@@ -1,15 +1,7 @@
40+
diff --git a/numpy/testing/__init__.py b/numpy/testing/__init__.py
41+
index 258cbe9..ce4e0eb 100644
42+
--- a/numpy/testing/__init__.py
43+
+++ b/numpy/testing/__init__.py
44+
@@ -1,16 +1,7 @@
4445
-"""Common test support for all numpy test scripts.
4546
-
4647
-This single module should provide all the common functionality for numpy tests
4748
-in a single location, so that test scripts can just import it and work right
4849
-away.
50+
-
4951
-"""
52+
-from __future__ import division, absolute_import, print_function
5053
-
5154
-from unittest import TestCase
5255
-
53-
-import decorators as dec
54-
-from utils import *
55-
-from numpytest import *
56-
-from nosetester import NoseTester as Tester
57-
-from nosetester import run_module_suite
56+
-from . import decorators as dec
57+
-from .utils import *
58+
-from .nosetester import NoseTester as Tester
59+
-from .nosetester import run_module_suite
5860
+# fake tester, android don't have unittest
5961
+class Tester(object):
6062
+ def test(self, *args, **kwargs):

‎recipes/numpy/recipe.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22

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

‎src/blacklist.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ lib-dynload/*audioop.so
8181
lib-dynload/mmap.so
8282
lib-dynload/_hotshot.so
8383
lib-dynload/_csv.so
84-
lib-dynload/future_builtins.so
8584
lib-dynload/_heapq.so
8685
lib-dynload/_json.so
8786
lib-dynload/grp.so

0 commit comments

Comments
 (0)