summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COMPATIBILITY4
-rw-r--r--README.txt12
-rw-r--r--scipy/base/src/arrayobject.c2
-rw-r--r--scipy/core_version.py2
4 files changed, 15 insertions, 5 deletions
diff --git a/COMPATIBILITY b/COMPATIBILITY
index fb5144e76..efafa49aa 100644
--- a/COMPATIBILITY
+++ b/COMPATIBILITY
@@ -2,11 +2,9 @@
X.flat returns an indexable 1-D iterator (mostly similar to an array but always 1-d)
-long(<>) --> pylong(<>) if from Numeric * was changed to from scipy.base import *
-
.typecode() --> .dtypechar
-.iscontiguous() --> .flags['CONTIGUOUS']
+.iscontiguous() --> .flags['CONTIGUOUS'] or .flags.contiguous
.byteswapped() -> .byteswap()
diff --git a/README.txt b/README.txt
index e69de29bb..cbb798a92 100644
--- a/README.txt
+++ b/README.txt
@@ -0,0 +1,12 @@
+
+Scipy Core is a replacement of Numeric Python that adds the features
+of numarray
+
+python setup.py install
+
+to install
+
+The setup.py script will take advantage of fast BLAS on your system if it can find it. You can help the process with a site.cfg file.
+
+If fast BLAS and LAPACK cannot be found, then a slower default version is used.
+
diff --git a/scipy/base/src/arrayobject.c b/scipy/base/src/arrayobject.c
index 46b49a7ae..9c3aed7d1 100644
--- a/scipy/base/src/arrayobject.c
+++ b/scipy/base/src/arrayobject.c
@@ -3768,7 +3768,7 @@ array_shape_set(PyArrayObject *self, PyObject *val)
memcpy(self->strides, PyArray_STRIDES(ret),
nd*sizeof(intp));
}
- else self->dimensions=NULL;
+ else {self->dimensions=NULL; self->strides=NULL;}
Py_DECREF(ret);
PyArray_UpdateFlags(self, CONTIGUOUS | FORTRAN);
return 0;
diff --git a/scipy/core_version.py b/scipy/core_version.py
index d2f5df724..33b2aa422 100644
--- a/scipy/core_version.py
+++ b/scipy/core_version.py
@@ -1,4 +1,4 @@
-version='0.4.3'
+version='0.5.9'
import os
svn_version_file = os.path.join(os.path.dirname(__file__),