Permalink
Browse files

Fixed error in setflags and added a few unit tests for test_multiarray

  • Loading branch information...
1 parent 9dd16b4 commit c8b5a7e9e0d39c225ac3e590d83ebf869d9c1235 @teoliphant teoliphant committed Jan 6, 2006
Showing with 13 additions and 8 deletions.
  1. +2 −2 numpy/core/setup.py
  2. +1 −1 numpy/core/src/arraymethods.c
  3. +6 −1 numpy/testing/utils.py
  4. +1 −1 numpy/version.py
  5. +3 −3 setup.py
View
@@ -136,6 +136,8 @@ def generate_umath_c(ext,build_dir):
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 generate_umath_c(ext,build_dir):
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'),
@@ -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;
View
@@ -9,7 +9,8 @@
__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
+
View
@@ -1,4 +1,4 @@
-version='0.9.2'
+version='0.9.3'
import os
svn_version_file = os.path.join(os.path.dirname(__file__),
View
@@ -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.

0 comments on commit c8b5a7e

Please sign in to comment.