Commit e75740ba authored by PJ Eby's avatar PJ Eby

Bump version to 0.6c5, and backport bdist_rpm and cygwin dll fixes

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4053317
parent c9e71537
...@@ -1194,6 +1194,10 @@ displayed MD5 info (broken onto two lines for readability):: ...@@ -1194,6 +1194,10 @@ displayed MD5 info (broken onto two lines for readability)::
Release Notes/Change History Release Notes/Change History
============================ ============================
0.6c5
* Fixed ``.dll`` files on Cygwin not having executable permisions when an egg
is installed unzipped.
0.6c4 0.6c4
* Added support for HTTP "Basic" authentication using ``http://user:pass@host`` * Added support for HTTP "Basic" authentication using ``http://user:pass@host``
URLs. If a password-protected page contains links to the same host (and URLs. If a password-protected page contains links to the same host (and
......
...@@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``. ...@@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``.
This file can also be run as a script to install or upgrade setuptools. This file can also be run as a script to install or upgrade setuptools.
""" """
import sys import sys
DEFAULT_VERSION = "0.6c4" DEFAULT_VERSION = "0.6c5"
DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
md5_data = { md5_data = {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# If your initials aren't PJE, don't run it. :) # 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.3 setup.py -q release source --target-version=2.3 upload && \
python2.4 setup.py -q release binary --target-version=2.4 upload && \ python2.4 setup.py -q release binary --target-version=2.4 upload && \
......
...@@ -7,7 +7,7 @@ d = {} ...@@ -7,7 +7,7 @@ d = {}
execfile(convert_path('setuptools/command/__init__.py'), d) execfile(convert_path('setuptools/command/__init__.py'), d)
SETUP_COMMANDS = d['__all__'] SETUP_COMMANDS = d['__all__']
VERSION = "0.6c4" VERSION = "0.6c5"
from setuptools import setup, find_packages from setuptools import setup, find_packages
import sys import sys
......
...@@ -2600,6 +2600,10 @@ XXX ...@@ -2600,6 +2600,10 @@ XXX
Release Notes/Change History 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 0.6c4
* Overhauled Windows script wrapping to support ``bdist_wininst`` better. * Overhauled Windows script wrapping to support ``bdist_wininst`` better.
......
...@@ -7,7 +7,7 @@ from distutils.core import Command as _Command ...@@ -7,7 +7,7 @@ from distutils.core import Command as _Command
from distutils.util import convert_path from distutils.util import convert_path
import os.path import os.path
__version__ = '0.6c4' __version__ = '0.6c5'
__all__ = [ __all__ = [
'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
'find_packages' 'find_packages'
......
...@@ -18,7 +18,7 @@ class bdist_rpm(_bdist_rpm): ...@@ -18,7 +18,7 @@ class bdist_rpm(_bdist_rpm):
_bdist_rpm.move_file(self, src, dst, level) _bdist_rpm.move_file(self, src, dst, level)
if dst==self.dist_dir and src.endswith('.rpm'): if dst==self.dist_dir and src.endswith('.rpm'):
getattr(self.distribution,'dist_files',[]).append( getattr(self.distribution,'dist_files',[]).append(
('bdist_egg', ('bdist_rpm',
src.endswith('.src.rpm') and 'any' or get_python_version(), src.endswith('.src.rpm') and 'any' or get_python_version(),
os.path.join(dst, os.path.basename(src))) os.path.join(dst, os.path.basename(src)))
) )
......
...@@ -983,16 +983,22 @@ See the setuptools documentation for the "develop" command for more info. ...@@ -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 return dst # only unpack-and-compile skips files for dry run
def unpack_and_compile(self, egg_path, destination): def unpack_and_compile(self, egg_path, destination):
to_compile = [] to_compile = []; to_chmod = []
def pf(src,dst): def pf(src,dst):
if dst.endswith('.py') and not src.startswith('EGG-INFO/'): if dst.endswith('.py') and not src.startswith('EGG-INFO/'):
to_compile.append(dst) 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 return not self.dry_run and dst or None
unpack_archive(egg_path, destination, pf) unpack_archive(egg_path, destination, pf)
self.byte_compile(to_compile) 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): def byte_compile(self, to_compile):
...@@ -1017,12 +1023,6 @@ See the setuptools documentation for the "develop" command for more info. ...@@ -1017,12 +1023,6 @@ See the setuptools documentation for the "develop" command for more info.
def no_default_version_msg(self): def no_default_version_msg(self):
return """bad install directory or PYTHONPATH return """bad install directory or PYTHONPATH
......
#!/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 # This is a PEAK 'version' tool configuration file, that's
# also executable. PJE uses it to bump version numbers in # also executable. PJE uses it to bump version numbers in
......
[setuptools] [setuptools]
status = 'release candidate' status = 'release candidate'
major = 0 major = 0
build = 4 build = 5
minor = 6 minor = 6
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment