Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix some problems with data-files not being added in top-level and ex…

…tra version information added to the name of development distributions.
  • Loading branch information...
commit 00a35871d1af7aee6c329b6341e79d592e234272 1 parent aaba782
Travis Oliphant authored
Showing with 7 additions and 7 deletions.
  1. +1 −1  numpy/distutils/misc_util.py
  2. +6 −6 setup.py
View
2  numpy/distutils/misc_util.py
@@ -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):
View
12 setup.py
@@ -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 @@ 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():
@@ -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],
Please sign in to comment.
Something went wrong with that request. Please try again.