[Numpy-svn] r3846 - in trunk: . numpy/distutils

[numpy-svn at scipy.org]

Author: oliphant
Date: 2007-05-30 23:57:01 -0500 (Wed, 30 May 2007)
New Revision: 3846

Modified:
   trunk/numpy/distutils/misc_util.py
   trunk/setup.py
Log:
Fix some problems with data-files not being added in top-level and extra version information added to the name of development distributions.

Modified: trunk/numpy/distutils/misc_util.py
===================================================================
--- trunk/numpy/distutils/misc_util.py	2007-05-31 04:01:55 UTC (rev 3845)
+++ trunk/numpy/distutils/misc_util.py	2007-05-31 04:57:01 UTC (rev 3846)
@@ -1041,7 +1041,7 @@
         """
         include_non_existing = kws.get('include_non_existing',True)
         return gpaths(paths,
-                      local_path = self.local_path,
+                      local_path = self.path_in_package,
                       include_non_existing=include_non_existing)
 
     def _fix_paths_dict(self,kw):

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2007-05-31 04:01:55 UTC (rev 3845)
+++ trunk/setup.py	2007-05-31 04:57:01 UTC (rev 3846)
@@ -6,7 +6,8 @@
 records without sacrificing too much speed for small multi-dimensional
 arrays.  NumPy is built on the Numeric code base and adds features
 introduced by numarray as well as an extended C-API and the ability to
-create arrays of arbitrary type.
+create arrays of arbitrary type which also makes NumPy suitable for
+interfacing with general-purpose data-base applications.
 
 There are also basic facilities for discrete fourier transform,
 basic linear algebra and random number generation.
@@ -47,11 +48,12 @@
     
     config.add_subpackage('numpy')
         
-    config.add_data_files(('numpy',['*.txt','COMPATIBILITY',
-                                    'scipy_compatibility']))
+    config.add_data_files(('numpy','*.txt'), ('.','COMPATIBILITY'),
+                          ('.','scipy_compatibility'), 
+                          ('.','site.cfg.example'))
 
     config.get_version('numpy/version.py') # sets config.version
-    
+
     return config
 
 def setup_package():
@@ -64,10 +66,8 @@
     sys.path.insert(0,local_path)
 
     try:
-        from numpy.version import version
         setup(
             name = 'numpy',
-            version = version, # will be overwritten by configuration version
             maintainer = "NumPy Developers",
             maintainer_email = "numpy-discussion at lists.sourceforge.net",
             description = DOCLINES[0],