Skip to content

Commit

Permalink
Fix some problems with data-files not being added in top-level and ex…
Browse files Browse the repository at this point in the history
…tra version information added to the name of development distributions.
  • Loading branch information
teoliphant committed May 31, 2007
1 parent aaba782 commit 00a3587
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion numpy/distutils/misc_util.py
Expand Up @@ -1041,7 +1041,7 @@ def paths(self,*paths,**kws):
"""
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):
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Expand Up @@ -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.
Expand Down Expand Up @@ -47,11 +48,12 @@ def configuration(parent_package='',top_path=None):

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():
Expand All @@ -64,10 +66,8 @@ def setup_package():
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@lists.sourceforge.net",
description = DOCLINES[0],
Expand Down

0 comments on commit 00a3587

Please sign in to comment.