[Numpy-svn] r6221 - trunk

numpy-svn@scip... numpy-svn@scip...
Sun Dec 28 00:44:12 CST 2008


Author: cdavid
Date: 2008-12-28 00:44:06 -0600 (Sun, 28 Dec 2008)
New Revision: 6221

Modified:
   trunk/MANIFEST.in
   trunk/setup.py
Log:
Do not add doc sources through add_data_dir: it will put the docs alongside numpy, as a separate package, which is not what we want. Use the manifest instead, since that's the only way I know of to include something in sdist-generated tarballs.

Modified: trunk/MANIFEST.in
===================================================================
--- trunk/MANIFEST.in	2008-12-28 03:18:20 UTC (rev 6220)
+++ trunk/MANIFEST.in	2008-12-28 06:44:06 UTC (rev 6221)
@@ -11,3 +11,9 @@
 recursive-include numpy/core/code_generators *.py
 include numpy/core/include/numpy/numpyconfig.h.in
 recursive-include numpy SConstruct
+# Add documentation: we don't use add_data_dir since we do not want to include
+# this at installation, only for sdist-generated tarballs
+include doc/Makefile doc/postprocess.py
+recursive-include doc/release *
+recursive-include doc/source *
+recursive-include doc/sphinxext *

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2008-12-28 03:18:20 UTC (rev 6220)
+++ trunk/setup.py	2008-12-28 06:44:06 UTC (rev 6221)
@@ -44,14 +44,6 @@
 # a lot more robust than what was previously being used.
 __builtin__.__NUMPY_SETUP__ = True
 
-def setup_doc_files(configuration):
-    # Add doc sources
-    configuration.add_data_dir("doc/release")
-    configuration.add_data_dir("doc/source")
-    configuration.add_data_dir("doc/sphinxext")
-    configuration.add_data_files(("doc/Makefile"), ("doc/postprocess.py"))
-
-
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
 
@@ -69,8 +61,6 @@
 
     config.get_version('numpy/version.py') # sets config.version
 
-    setup_doc_files(config)
-
     return config
 
 def setup_package():



More information about the Numpy-svn mailing list