[Python-checkins] commit of r41776 - sandbox/trunk/setuptools/setup.py

[phillip.eby]

Author: phillip.eby
Date: Tue Dec 20 17:21:50 2005
New Revision: 41776

Modified:
   sandbox/trunk/setuptools/setup.py
Log:
Changes so that upgrading an existing setuptools to a development
version doesn't lose its entry points by using the already-installed 
setuptools as a basis for generating them.


Modified: sandbox/trunk/setuptools/setup.py
==============================================================================
--- sandbox/trunk/setuptools/setup.py	(original)
+++ sandbox/trunk/setuptools/setup.py	Tue Dec 20 17:21:50 2005
@@ -15,10 +15,13 @@
     f.close()
     return ''.join(lines)
 
+from distutils.util import convert_path
+d = {}; execfile(convert_path('setuptools/command/__init__.py'), d)
+SETUP_COMMANDS = d['__all__']
+
 VERSION = "0.6a9"
 from setuptools import setup, find_packages
 import sys
-from setuptools.command import __all__ as SETUP_COMMANDS
 scripts = []
 if sys.platform != "win32":
     scripts = ["easy_install.py"]   # for backward compatibility only
@@ -35,8 +38,9 @@
     keywords = "CPAN PyPI distutils eggs package management",
     url = "http://peak.telecommunity.com/DevCenter/setuptools",
     test_suite = 'setuptools.tests.test_suite',
+    
     packages = find_packages(),
-    include_package_data = True,
+    package_data = {'setuptools':'*.exe'},
     py_modules = ['pkg_resources', 'easy_install', 'site'],
 
     zip_safe = False,   # We want 'python -m easy_install' to work, for now :(
@@ -76,10 +80,6 @@
 
 
 
-
-
-
-
     classifiers = [f.strip() for f in """
     Development Status :: 3 - Alpha
     Intended Audience :: Developers