[Python-checkins] commit of r41377 - in sandbox/trunk/setuptools: . setuptools setuptools.egg-info setuptools/command setuptools/tests

Thu Nov 3 00:55:36 CET 2005

Author: phillip.eby
Date: Thu Nov 3 00:55:34 2005
New Revision: 41377
Modified:
 sandbox/trunk/setuptools/setup.py
 sandbox/trunk/setuptools/setuptools.egg-info/entry_points.txt
 sandbox/trunk/setuptools/setuptools/__init__.py
 sandbox/trunk/setuptools/setuptools/command/build_py.py
 sandbox/trunk/setuptools/setuptools/tests/test_resources.py
Log:
0.6a7 bugfix release
Modified: sandbox/trunk/setuptools/setup.py
==============================================================================

--- sandbox/trunk/setuptools/setup.py	(original)
+++ sandbox/trunk/setuptools/setup.py	Thu Nov 3 00:55:34 2005
@@ -15,7 +15,7 @@
 f.close()
 return ''.join(lines)
 
-VERSION = "0.6a6"
+VERSION = "0.6a7"
 from setuptools import setup, find_packages
 import sys
 from setuptools.command import __all__ as SETUP_COMMANDS
@@ -43,7 +43,7 @@
 entry_points = {
 "distutils.commands" : [
 "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()
- for cmd in SETUP_COMMANDS if cmd!="build_py" or sys.version<"2.4"
+ for cmd in SETUP_COMMANDS
 ],
 "distutils.setup_keywords": [
 "eager_resources = setuptools.dist:assert_string_list",
Modified: sandbox/trunk/setuptools/setuptools.egg-info/entry_points.txt
==============================================================================
--- sandbox/trunk/setuptools/setuptools.egg-info/entry_points.txt	(original)
+++ sandbox/trunk/setuptools/setuptools.egg-info/entry_points.txt	Thu Nov 3 00:55:34 2005
@@ -24,6 +24,7 @@
 rotate = setuptools.command.rotate:rotate
 develop = setuptools.command.develop:develop
 setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
 saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 upload = setuptools.command.upload:upload
Modified: sandbox/trunk/setuptools/setuptools/__init__.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/__init__.py	(original)
+++ sandbox/trunk/setuptools/setuptools/__init__.py	Thu Nov 3 00:55:34 2005
@@ -8,7 +8,7 @@
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6a6'
+__version__ = '0.6a7'
 __all__ = [
 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
 'find_packages'
Modified: sandbox/trunk/setuptools/setuptools/command/build_py.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/build_py.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/build_py.py	Thu Nov 3 00:55:34 2005
@@ -1,5 +1,4 @@
-import os.path
-
+import os.path, sys
 from distutils.command.build_py import build_py as _build_py
 from distutils.util import convert_path
 from glob import glob
@@ -36,6 +35,10 @@
 # output files are.
 self.byte_compile(_build_py.get_outputs(self, include_bytecode=0))
 
+
+
+
+
 def get_data_files(self):
 """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
 data = []
@@ -75,6 +78,8 @@
 self.mkpath(os.path.dirname(target))
 self.copy_file(os.path.join(src_dir, filename), target)
 
+
+
 def get_outputs(self, include_bytecode=1):
 """Return complete list of files copied to the build directory
 
@@ -88,3 +93,31 @@
 for package, src_dir, build_dir,filenames in self.data_files
 for filename in filenames
 ]
+
+
+if sys.version>="2.4":
+ # Python 2.4 already has the above code
+ build_py = _build_py
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified: sandbox/trunk/setuptools/setuptools/tests/test_resources.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/tests/test_resources.py	(original)
+++ sandbox/trunk/setuptools/setuptools/tests/test_resources.py	Thu Nov 3 00:55:34 2005
@@ -134,7 +134,7 @@
 "/foo_dir/Foo-1.2.egg",
 metadata=Metadata(('depends.txt', "[bar]\nBaz>=2.0"))
 )
- ad.add(Foo)
+ ad.add(Foo); ad.add(Distribution.from_filename("Foo-0.9.egg"))
 
 # Request thing(s) that are available -> list to activate
 for i in range(3):
