diff options
| -rwxr-xr-x | setup.py | 4 | ||||
| -rwxr-xr-x | setuptools.egg-info/entry_points.txt | 1 | ||||
| -rw-r--r-- | setuptools/__init__.py | 2 | ||||
| -rw-r--r-- | setuptools/command/build_py.py | 37 | ||||
| -rw-r--r-- | setuptools/tests/test_resources.py | 2 |
5 files changed, 40 insertions, 6 deletions
@@ -15,7 +15,7 @@ def get_description(): 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 @@ setup( 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", diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt index 3136631e..37a81910 100755 --- a/setuptools.egg-info/entry_points.txt +++ b/setuptools.egg-info/entry_points.txt @@ -24,6 +24,7 @@ bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm 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 diff --git a/setuptools/__init__.py b/setuptools/__init__.py index f671acc9..3e88096d 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -8,7 +8,7 @@ from distutils.core import Command as _Command from distutils.util import convert_path import os.path -__version__ = '0.6a6' +__version__ = '0.6a7' __all__ = [ 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', 'find_packages' diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py index 9db49080..d13c46f2 100644 --- a/setuptools/command/build_py.py +++ b/setuptools/command/build_py.py @@ -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 @@ class build_py(_build_py): # 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 @@ class build_py(_build_py): 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 @@ class build_py(_build_py): 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 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index c36ad952..16531de3 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -134,7 +134,7 @@ class DistroTests(TestCase): "/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): |