Changeset 3660

Timestamp:

04/04/07 12:25:29 (3 years ago)

Author:

rkern

Message:

Fix #491

Location:

trunk/numpy

Files:

• distutils/misc_util.py (modified) (1 diff)
• f2py/__version__.py (modified) (1 diff)
• version.py (modified) (2 diffs)

trunk/numpy/distutils/misc_util.py

@@ -1313 +1313 @@
         """
         target = njoin(self.local_path,'__svn_version__.py')
-        if os.path.isfile(target):
+        revision = self._get_svn_revision(self.local_path)
+        if os.path.isfile(target) or revision is None:
             return
-        def generate_svn_version_py():
-            if not os.path.isfile(target):
-                revision = self._get_svn_revision(self.local_path)
-                assert revision is not None,'hmm, why I am not inside SVN tree???'
-                version = str(revision)
-                self.info('Creating %s (version=%r)' % (target,version))
-                f = open(target,'w')
-                f.write('version = %r\n' % (version))
-                f.close()
-
-            import atexit
-            def rm_file(f=target,p=self.info):
-                if delete:
-                    try: os.remove(f); p('removed '+f)
-                    except OSError: pass
-                    try: os.remove(f+'c'); p('removed '+f+'c')
-                    except OSError: pass
-
-            atexit.register(rm_file)
-
-            return target
-
-        self.add_data_files(('', generate_svn_version_py()))
+        else:
+            def generate_svn_version_py():
+                if not os.path.isfile(target):
+                    version = str(revision)
+                    self.info('Creating %s (version=%r)' % (target,version))
+                    f = open(target,'w')
+                    f.write('version = %r\n' % (version))
+                    f.close()
+
+                import atexit
+                def rm_file(f=target,p=self.info):
+                    if delete:
+                        try: os.remove(f); p('removed '+f)
+                        except OSError: pass
+                        try: os.remove(f+'c'); p('removed '+f+'c')
+                        except OSError: pass
+
+                atexit.register(rm_file)
+
+                return target
+
+            self.add_data_files(('', generate_svn_version_py()))
 
     def make_config_py(self,name='__config__'):

trunk/numpy/f2py/__version__.py

@@ -3 +3 @@
 try:
     from __svn_version__ import version
-    version_info = (major,version)
+    version_info = (major, version)
     version = '%s_%s' % version_info
-except Exception,msg:
-    print msg
-    version = '%s_?' % (major)
+except ImportError:
+    version = str(major)

trunk/numpy/version.py

@@ -3 +3 @@
 
 if not release:
+    version += '.dev'
     import os
     svn_version_file = os.path.join(os.path.dirname(__file__),
@@ -12 +13 @@
                               svn_version_file,
                               ('.py','U',1))
-        version += '.dev'+svn.version
+        version += svn.version