diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-01-06 02:12:50 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-01-06 02:12:50 +0000 |
| commit | c8b5a7e9e0d39c225ac3e590d83ebf869d9c1235 (patch) | |
| tree | 01c150ee7014c8970c2a7f103be13666595a5ec6 | |
| parent | 9dd16b4b933636baeb28076d73f4bdd7ab006527 (diff) | |
| download | numpy-c8b5a7e9e0d39c225ac3e590d83ebf869d9c1235.tar.gz | |
Fixed error in setflags and added a few unit tests for test_multiarray
| -rw-r--r-- | numpy/core/setup.py | 4 | ||||
| -rw-r--r-- | numpy/core/src/arraymethods.c | 2 | ||||
| -rw-r--r-- | numpy/testing/utils.py | 7 | ||||
| -rw-r--r-- | numpy/version.py | 2 | ||||
| -rwxr-xr-x | setup.py | 6 |
5 files changed, 13 insertions, 8 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 51035d6e0..66d086a7d 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -136,6 +136,8 @@ def configuration(parent_package='',top_path=None): join('src','arraymethods.c'), join('src','scalartypes.inc.src'), join('src','arraytypes.inc.src'), + join('src','_signbit.c'), + join('src','_isnan.c'), join('include','numpy','*object.h'), join(codegen_dir,'genapi.py'), join(codegen_dir,'*.txt') @@ -156,8 +158,6 @@ def configuration(parent_package='',top_path=None): config.add_extension('umath', sources = [generate_config_h, join('src','umathmodule.c.src'), - join('src','_signbit.c'), - join('src','_isnan.c'), generate_umath_c, generate_ufunc_api, join('src','scalartypes.inc.src'), diff --git a/numpy/core/src/arraymethods.c b/numpy/core/src/arraymethods.c index 98206314f..0760e7af1 100644 --- a/numpy/core/src/arraymethods.c +++ b/numpy/core/src/arraymethods.c @@ -1457,7 +1457,7 @@ array_setflags(PyArrayObject *self, PyObject *args, PyObject *kwds) PyObject *uic=Py_None; int flagback = self->flags; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OOOO", kwlist, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OOO", kwlist, &write, &align, &uic)) return NULL; diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py index a7d303973..19acd2654 100644 --- a/numpy/testing/utils.py +++ b/numpy/testing/utils.py @@ -9,7 +9,8 @@ import math __all__ = ['assert_equal', 'assert_almost_equal','assert_approx_equal', 'assert_array_equal', 'assert_array_less', - 'assert_array_almost_equal', 'jiffies', 'memusage', 'rand'] + 'assert_array_almost_equal', 'jiffies', 'memusage', 'rand', + 'runstring'] def rand(*args): """Returns an array of random numbers with the given shape. @@ -208,3 +209,7 @@ def assert_array_less(x,y,err_msg=''): except ValueError: print shape(x),shape(y) raise ValueError, 'arrays are not less-ordered' + +def runstring(astr, dict): + exec astr in dict + diff --git a/numpy/version.py b/numpy/version.py index a67dab5b3..64f7aa11b 100644 --- a/numpy/version.py +++ b/numpy/version.py @@ -1,4 +1,4 @@ -version='0.9.2' +version='0.9.3' import os svn_version_file = os.path.join(os.path.dirname(__file__), @@ -1,9 +1,9 @@ -"""Numpy: array processing for numbers, strings, records, and objects. +"""NumPy: array processing for numbers, strings, records, and objects. -Numpy is a general-purpose array-processing package designed to +NumPy is a general-purpose array-processing package designed to efficiently manipulate large multi-dimensional arrays of arbitrary records without sacrificing too much speed for small multi-dimensional -arrays. Numpy is built on the Numeric code base and adds features +arrays. NumPy is built on the Numeric code base and adds features introduced by numarray as well as an extended C-API and the ability to create arrays of arbitrary type. |