diff options
| author | Pearu Peterson <pearu.peterson@gmail.com> | 2005-10-13 07:40:55 +0000 |
|---|---|---|
| committer | Pearu Peterson <pearu.peterson@gmail.com> | 2005-10-13 07:40:55 +0000 |
| commit | b04bd56a7a87b55c89ed7fa4470a78adb87603c3 (patch) | |
| tree | 21beffe08f2764ca5b23d4dc58ca4679cc700667 | |
| parent | 956dd2252fd0dec5150be8a0a12f8b253754a4dc (diff) | |
| download | numpy-b04bd56a7a87b55c89ed7fa4470a78adb87603c3.tar.gz | |
Fixed getting base svn version number - avoiding importing base while in source directory.
| -rw-r--r-- | scipy/core_version.py | 10 | ||||
| -rw-r--r-- | scipy/setup.py | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/scipy/core_version.py b/scipy/core_version.py index 0ecaf8b62..03fa3d5bd 100644 --- a/scipy/core_version.py +++ b/scipy/core_version.py @@ -1,8 +1,8 @@ version='0.4.3' -try: - import base.__svn_version__ as svn +import os +svn_version_file = os.path.join(os.path.dirname(__file__), + 'base','__svn_version__.py') +if os.path.isfile(svn_version_file): + import base.__svn_version as svn version += '.'+svn.version -except ImportError: - pass - diff --git a/scipy/setup.py b/scipy/setup.py index 53342a8e8..ae11a11b5 100644 --- a/scipy/setup.py +++ b/scipy/setup.py @@ -24,7 +24,6 @@ def configuration(parent_package='',top_path=None): config.add_extension('__init__',[generate_install_init_py], depends=['install__init__py']) - return config.todict() if __name__ == '__main__': |