diff options
| -rw-r--r-- | scipy/__init__.py | 2 | ||||
| -rw-r--r-- | scipy/base/setup.py | 1 | ||||
| -rw-r--r-- | scipy/base/src/arrayobject.c | 2 | ||||
| -rw-r--r-- | scipy/core_version.py | 2 | ||||
| -rw-r--r-- | scipy/setup.py | 1 |
5 files changed, 4 insertions, 4 deletions
diff --git a/scipy/__init__.py b/scipy/__init__.py index 320c5067b..8d9639913 100644 --- a/scipy/__init__.py +++ b/scipy/__init__.py @@ -16,7 +16,7 @@ try: # For installation purposes only import scipy.basic.fft as fftpack import scipy.basic.linalg as linalg import scipy.basic.random as random - from core_version import version as __version__ + from core_version import version as __core_version__ from scipy.test.testing import ScipyTest test = ScipyTest('scipy').test diff --git a/scipy/base/setup.py b/scipy/base/setup.py index 2934b050d..a1455eb25 100644 --- a/scipy/base/setup.py +++ b/scipy/base/setup.py @@ -175,6 +175,7 @@ def configuration(parent_package='',top_path=None): ) config.add_data_dir('tests') + config.make_svn_version_py() return config diff --git a/scipy/base/src/arrayobject.c b/scipy/base/src/arrayobject.c index 1edd5d154..e2446dc5b 100644 --- a/scipy/base/src/arrayobject.c +++ b/scipy/base/src/arrayobject.c @@ -4279,7 +4279,7 @@ static char Arraytype__doc__[] = "A array object represents a multidimensional, homogeneous array\n" " of basic values. Arrays are sequence, mapping and numeric\n" " objects. More information is available in the scipy module and\n" - " by looking at the methods and attributes of an array." + " by looking at the methods and attributes of an array."; static PyTypeObject PyBigArray_Type = { PyObject_HEAD_INIT(NULL) diff --git a/scipy/core_version.py b/scipy/core_version.py index c97ced967..facdbf865 100644 --- a/scipy/core_version.py +++ b/scipy/core_version.py @@ -1,7 +1,7 @@ version='0.4.2' try: - import __svn_version__ as svn + import scipy.base.__svn_version__ as svn version += '.'+svn.version except ImportError: pass diff --git a/scipy/setup.py b/scipy/setup.py index 9a7a5919c..e89e0fbef 100644 --- a/scipy/setup.py +++ b/scipy/setup.py @@ -11,7 +11,6 @@ def configuration(parent_package='',top_path=None): config.add_subpackage('base') config.add_subpackage('corelib') # installed as scipy.lib config.add_subpackage('basic') - config.make_svn_version_py() # installs __svn_version__.py return config.todict() if __name__ == '__main__': |