diff options
| -rwxr-xr-x | EasyInstall.txt | 4 | ||||
| -rwxr-xr-x | ez_setup.py | 2 | ||||
| -rwxr-xr-x | release.sh | 2 | ||||
| -rwxr-xr-x | setup.py | 2 | ||||
| -rwxr-xr-x | setuptools.txt | 4 | ||||
| -rw-r--r-- | setuptools/__init__.py | 2 | ||||
| -rwxr-xr-x | setuptools/command/bdist_rpm.py | 2 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 16 | ||||
| -rwxr-xr-x | version | 2 | ||||
| -rwxr-xr-x | version.dat | 2 |
10 files changed, 23 insertions, 15 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index 2cd7a7cd..f8687808 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -1194,6 +1194,10 @@ displayed MD5 info (broken onto two lines for readability):: Release Notes/Change History ============================ +0.6c5 + * Fixed ``.dll`` files on Cygwin not having executable permisions when an egg + is installed unzipped. + 0.6c4 * Added support for HTTP "Basic" authentication using ``http://user:pass@host`` URLs. If a password-protected page contains links to the same host (and diff --git a/ez_setup.py b/ez_setup.py index 41ac17ba..cbf003cc 100755 --- a/ez_setup.py +++ b/ez_setup.py @@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``. This file can also be run as a script to install or upgrade setuptools. """ import sys -DEFAULT_VERSION = "0.6c4" +DEFAULT_VERSION = "0.6c5" DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] md5_data = { @@ -7,7 +7,7 @@ # If your initials aren't PJE, don't run it. :) # -export VERSION="0.6c4" +export VERSION="0.6c5" python2.3 setup.py -q release source --target-version=2.3 upload && \ python2.4 setup.py -q release binary --target-version=2.4 upload && \ @@ -7,7 +7,7 @@ d = {} execfile(convert_path('setuptools/command/__init__.py'), d) SETUP_COMMANDS = d['__all__'] -VERSION = "0.6c4" +VERSION = "0.6c5" from setuptools import setup, find_packages import sys diff --git a/setuptools.txt b/setuptools.txt index 9f6fed9e..df3dee98 100755 --- a/setuptools.txt +++ b/setuptools.txt @@ -2600,6 +2600,10 @@ XXX Release Notes/Change History ---------------------------- +0.6c5 + * Fix uploaded ``bdist_rpm`` packages being described as ``bdist_egg`` + packages under Python versions less than 2.5. + 0.6c4 * Overhauled Windows script wrapping to support ``bdist_wininst`` better. diff --git a/setuptools/__init__.py b/setuptools/__init__.py index 0a64bf65..c58254a5 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -7,7 +7,7 @@ from distutils.core import Command as _Command from distutils.util import convert_path import os.path -__version__ = '0.6c4' +__version__ = '0.6c5' __all__ = [ 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', 'find_packages' diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py index 9ca75e10..24e851a4 100755 --- a/setuptools/command/bdist_rpm.py +++ b/setuptools/command/bdist_rpm.py @@ -18,7 +18,7 @@ class bdist_rpm(_bdist_rpm): _bdist_rpm.move_file(self, src, dst, level) if dst==self.dist_dir and src.endswith('.rpm'): getattr(self.distribution,'dist_files',[]).append( - ('bdist_egg', + ('bdist_rpm', src.endswith('.src.rpm') and 'any' or get_python_version(), os.path.join(dst, os.path.basename(src))) ) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 79a441bd..f718d3d4 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -983,16 +983,22 @@ See the setuptools documentation for the "develop" command for more info. return dst # only unpack-and-compile skips files for dry run def unpack_and_compile(self, egg_path, destination): - to_compile = [] + to_compile = []; to_chmod = [] def pf(src,dst): if dst.endswith('.py') and not src.startswith('EGG-INFO/'): to_compile.append(dst) - self.unpack_progress(src,dst) + self.unpack_progress(src,dst); to_chmod.append(dst) return not self.dry_run and dst or None unpack_archive(egg_path, destination, pf) self.byte_compile(to_compile) + if not self.dry_run: + flags = stat.S_IXGRP|stat.S_IXGRP + for f in to_chmod: + mode = ((os.stat(f)[stat.ST_MODE]) | 0555) & 07777 + log.debug("changing mode of %s to %o", f, mode) + os.chmod(f, mode) def byte_compile(self, to_compile): @@ -1017,12 +1023,6 @@ See the setuptools documentation for the "develop" command for more info. - - - - - - def no_default_version_msg(self): return """bad install directory or PYTHONPATH @@ -1,4 +1,4 @@ -#!/usr/local/bin/invoke /usr/local/bin/c6peak version-config +#!/usr/local/bin/invoke /usr/bin/peak version-config # This is a PEAK 'version' tool configuration file, that's # also executable. PJE uses it to bump version numbers in diff --git a/version.dat b/version.dat index 96635d35..dabec73c 100755 --- a/version.dat +++ b/version.dat @@ -1,6 +1,6 @@ [setuptools]
status = 'release candidate'
major = 0
-build = 4
+build = 5
minor = 6
|