Skip to content
Browse files

Removed svn version number for release.

  • Loading branch information...
1 parent 42a1219 commit 280dfb5924f132f8e5103bd44d9c468f9255f9ca Travis Oliphant committed
Showing with 15 additions and 15 deletions.
  1. +5 −5 scipy/base/src/arraymethods.c
  2. +10 −10 scipy/core_version.py
View
10 scipy/base/src/arraymethods.c
@@ -204,7 +204,7 @@ array_max(PyArrayObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|O&", PyArray_AxisConverter,
&axis)) return NULL;
- return PyArray_Max(self, axis);
+ return _ARET(PyArray_Max(self, axis));
}
static char doc_ptp[] = "a.ptp(axis=None) a.max(axis)-a.min(axis)";
@@ -217,7 +217,7 @@ array_ptp(PyArrayObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|O&", PyArray_AxisConverter,
&axis)) return NULL;
- return PyArray_Ptp(self, axis);
+ return _ARET(PyArray_Ptp(self, axis));
}
@@ -231,7 +231,7 @@ array_min(PyArrayObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|O&", PyArray_AxisConverter,
&axis)) return NULL;
- return PyArray_Min(self, axis);
+ return _ARET(PyArray_Min(self, axis));
}
@@ -565,7 +565,7 @@ array_copy(PyArrayObject *self, PyObject *args)
int fortran=0;
if (!PyArg_ParseTuple(args, "|i", &fortran)) return NULL;
- return PyArray_NewCopy(self, fortran);
+ return _ARET(PyArray_NewCopy(self, fortran));
}
static char doc_resize[] = "self.resize(new_shape). "\
@@ -616,7 +616,7 @@ array_repeat(PyArrayObject *self, PyObject *args, PyObject *kwds) {
&repeats, PyArray_AxisConverter,
&axis)) return NULL;
- return PyArray_Repeat(self, repeats, axis);
+ return _ARET(PyArray_Repeat(self, repeats, axis));
}
static char doc_choose[] = "a.choose(b0, b1, ..., bn)\n"\
View
20 scipy/core_version.py
@@ -1,12 +1,12 @@
-version='0.5.9'
+version='0.6.0'
-import os
-svn_version_file = os.path.join(os.path.dirname(__file__),
+#import os
+#svn_version_file = os.path.join(os.path.dirname(__file__),
'base','__svn_version__.py')
-if os.path.isfile(svn_version_file):
- import imp
- svn = imp.load_module('scipy.base.__svn_version__',
- open(svn_version_file),
- svn_version_file,
- ('.py','U',1))
- version += '.'+svn.version
+#if os.path.isfile(svn_version_file):
+# import imp
+# svn = imp.load_module('scipy.base.__svn_version__',
+# open(svn_version_file),
+# svn_version_file,
+# ('.py','U',1))
+# version += '.'+svn.version

0 comments on commit 280dfb5

Please sign in to comment.
Something went wrong with that request. Please try again.