[Python-checkins] r53317 - in sandbox/branches/setuptools-0.6: EasyInstall.txt ez_setup.py release.sh setup.py setuptools.txt setuptools/__init__.py setuptools/command/bdist_rpm.py setuptools/command/easy_install.py version version.dat

[phillip.eby]

Author: phillip.eby
Date: Tue Jan  9 20:21:05 2007
New Revision: 53317

Modified:
   sandbox/branches/setuptools-0.6/EasyInstall.txt
   sandbox/branches/setuptools-0.6/ez_setup.py
   sandbox/branches/setuptools-0.6/release.sh
   sandbox/branches/setuptools-0.6/setup.py
   sandbox/branches/setuptools-0.6/setuptools.txt
   sandbox/branches/setuptools-0.6/setuptools/__init__.py
   sandbox/branches/setuptools-0.6/setuptools/command/bdist_rpm.py
   sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
   sandbox/branches/setuptools-0.6/version
   sandbox/branches/setuptools-0.6/version.dat
Log:
Bump version to 0.6c5, and backport bdist_rpm and cygwin dll fixes


Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Tue Jan  9 20:21:05 2007
@@ -1194,6 +1194,10 @@
 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

Modified: sandbox/branches/setuptools-0.6/ez_setup.py
==============================================================================
--- sandbox/branches/setuptools-0.6/ez_setup.py	(original)
+++ sandbox/branches/setuptools-0.6/ez_setup.py	Tue Jan  9 20:21:05 2007
@@ -14,7 +14,7 @@
 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 = {

Modified: sandbox/branches/setuptools-0.6/release.sh
==============================================================================
--- sandbox/branches/setuptools-0.6/release.sh	(original)
+++ sandbox/branches/setuptools-0.6/release.sh	Tue Jan  9 20:21:05 2007
@@ -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 && \

Modified: sandbox/branches/setuptools-0.6/setup.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setup.py	(original)
+++ sandbox/branches/setuptools-0.6/setup.py	Tue Jan  9 20:21:05 2007
@@ -7,7 +7,7 @@
 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

Modified: sandbox/branches/setuptools-0.6/setuptools.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools.txt	(original)
+++ sandbox/branches/setuptools-0.6/setuptools.txt	Tue Jan  9 20:21:05 2007
@@ -2600,6 +2600,10 @@
 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.

Modified: sandbox/branches/setuptools-0.6/setuptools/__init__.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/__init__.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/__init__.py	Tue Jan  9 20:21:05 2007
@@ -7,7 +7,7 @@
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6c4'
+__version__ = '0.6c5'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

Modified: sandbox/branches/setuptools-0.6/setuptools/command/bdist_rpm.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/bdist_rpm.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/bdist_rpm.py	Tue Jan  9 20:21:05 2007
@@ -18,7 +18,7 @@
             _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)))
                 )

Modified: sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py	Tue Jan  9 20:21:05 2007
@@ -983,16 +983,22 @@
         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 @@
 
 
 
-
-
-
-
-
-
     def no_default_version_msg(self):
         return """bad install directory or PYTHONPATH
 

Modified: sandbox/branches/setuptools-0.6/version
==============================================================================
--- sandbox/branches/setuptools-0.6/version	(original)
+++ sandbox/branches/setuptools-0.6/version	Tue Jan  9 20:21:05 2007
@@ -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

Modified: sandbox/branches/setuptools-0.6/version.dat
==============================================================================
--- sandbox/branches/setuptools-0.6/version.dat	(original)
+++ sandbox/branches/setuptools-0.6/version.dat	Tue Jan  9 20:21:05 2007
@@ -1,6 +1,6 @@
 [setuptools]
 status = 'release candidate'
 major = 0
-build = 4
+build = 5
 minor = 6