diff options
| -rw-r--r-- | scipy/__init__.py | 16 | ||||
| -rw-r--r-- | scipy/base/convertcode.py | 10 | ||||
| -rw-r--r-- | scipy/base/matrix.py | 2 | ||||
| -rw-r--r-- | scipy/basic/__init__.py | 1 | ||||
| -rw-r--r-- | scipy/basic/basic_lite.py (renamed from scipy/linalg/basic_lite.py) | 0 | ||||
| -rw-r--r-- | scipy/basic/fft.py (renamed from scipy/fftpack/__init__.py) | 0 | ||||
| -rw-r--r-- | scipy/basic/fft_lite.py (renamed from scipy/fftpack/fft_lite.py) | 0 | ||||
| -rw-r--r-- | scipy/basic/helper.py (renamed from scipy/fftpack/helper.py) | 0 | ||||
| -rw-r--r-- | scipy/basic/linalg.py (renamed from scipy/linalg/__init__.py) | 0 | ||||
| -rw-r--r-- | scipy/basic/random.py (renamed from scipy/random.py) | 0 | ||||
| -rw-r--r-- | scipy/core_version.py | 7 | ||||
| -rw-r--r-- | scipy/setup.py | 3 |
12 files changed, 22 insertions, 17 deletions
diff --git a/scipy/__init__.py b/scipy/__init__.py index 614a5c244..34979e70b 100644 --- a/scipy/__init__.py +++ b/scipy/__init__.py @@ -1,20 +1,18 @@ -"""SciPy +"""SciPy Core -You can support the development of scipy by purchasing documentation at +You can support the development of SciPy by purchasing documentation at http://www.trelgol.com -Ironically, you can help make the documentation free by purchasing a copy today. +It is being distributed for a fee for a limited time to try and raise money for +development. """ - try: # For installation purposes only from scipy.base import * - import scipy.linalg as linalg - import scipy.fftpack as fftpack - from scipy.fftpack import fft, ifft - import scipy.random as random - from scipy.random import rand, randn + import scipy.basic as basic + from scipy.basic.fft import fft, ifft + from scipy.basic.random import rand, randn from core_version import version as __version__ from scipy.test.testing import ScipyTest test = ScipyTest('scipy').test diff --git a/scipy/base/convertcode.py b/scipy/base/convertcode.py index 9ff2c31a9..f84d022d9 100644 --- a/scipy/base/convertcode.py +++ b/scipy/base/convertcode.py @@ -120,11 +120,11 @@ def fromstr(filestr): filestr, fromall1 = changeimports(filestr, 'Precision', 'scipy.base') filestr, fromall2 = changeimports(filestr, 'numerix', 'scipy.base') filestr, fromall3 = changeimports(filestr, 'scipy_base', 'scipy.base') - filestr, fromall3 = changeimports(filestr, 'MLab', 'scipy.linalg') - filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'scipy.linalg') - filestr, fromall3 = changeimports(filestr, 'RNG', 'scipy.random') - filestr, fromall3 = changeimports(filestr, 'RandomArray', 'scipy.random') - filestr, fromall3 = changeimports(filestr, 'FFT', 'scipy.fftpack') + filestr, fromall3 = changeimports(filestr, 'MLab', 'scipy.basic.linalg') + filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'scipy.basic.linalg') + filestr, fromall3 = changeimports(filestr, 'RNG', 'scipy.basic.random') + filestr, fromall3 = changeimports(filestr, 'RandomArray', 'scipy.basic.random') + filestr, fromall3 = changeimports(filestr, 'FFT', 'scipy.basdic.fft') filestr, fromall3 = changeimports(filestr, 'MA', 'scipy.base.ma') fromall = fromall1 or fromall2 or fromall3 filestr = replaceattr(filestr) diff --git a/scipy/base/matrix.py b/scipy/base/matrix.py index 525899ae7..511039bc9 100644 --- a/scipy/base/matrix.py +++ b/scipy/base/matrix.py @@ -189,7 +189,7 @@ class matrix(N.ndarray): return self.transpose() def getI(self): - from scipy.linalg import inv + from scipy.basic.linalg import inv return matrix(inv(self)) A = property(getA, None, doc="base array") diff --git a/scipy/basic/__init__.py b/scipy/basic/__init__.py new file mode 100644 index 000000000..d61b68fbe --- /dev/null +++ b/scipy/basic/__init__.py @@ -0,0 +1 @@ +# To get sub-modules diff --git a/scipy/linalg/basic_lite.py b/scipy/basic/basic_lite.py index 2871c6120..2871c6120 100644 --- a/scipy/linalg/basic_lite.py +++ b/scipy/basic/basic_lite.py diff --git a/scipy/fftpack/__init__.py b/scipy/basic/fft.py index b529746de..b529746de 100644 --- a/scipy/fftpack/__init__.py +++ b/scipy/basic/fft.py diff --git a/scipy/fftpack/fft_lite.py b/scipy/basic/fft_lite.py index 1118a7b1f..1118a7b1f 100644 --- a/scipy/fftpack/fft_lite.py +++ b/scipy/basic/fft_lite.py diff --git a/scipy/fftpack/helper.py b/scipy/basic/helper.py index 36a9c3dec..36a9c3dec 100644 --- a/scipy/fftpack/helper.py +++ b/scipy/basic/helper.py diff --git a/scipy/linalg/__init__.py b/scipy/basic/linalg.py index 808b0cbfa..808b0cbfa 100644 --- a/scipy/linalg/__init__.py +++ b/scipy/basic/linalg.py diff --git a/scipy/random.py b/scipy/basic/random.py index 90cbd5cc7..90cbd5cc7 100644 --- a/scipy/random.py +++ b/scipy/basic/random.py diff --git a/scipy/core_version.py b/scipy/core_version.py index b2adf9a1a..c97ced967 100644 --- a/scipy/core_version.py +++ b/scipy/core_version.py @@ -1 +1,8 @@ version='0.4.2' + +try: + import __svn_version__ as svn + version += '.'+svn.version +except ImportError: + pass + diff --git a/scipy/setup.py b/scipy/setup.py index 2e653e248..9a7a5919c 100644 --- a/scipy/setup.py +++ b/scipy/setup.py @@ -10,8 +10,7 @@ def configuration(parent_package='',top_path=None): config.add_subpackage('f2py2e') # installed as scipy.f2py config.add_subpackage('base') config.add_subpackage('corelib') # installed as scipy.lib - config.add_subpackage('fftpack') - config.add_subpackage('linalg') + config.add_subpackage('basic') config.make_svn_version_py() # installs __svn_version__.py return config.todict() |