Mailman 3 July 2005 - Python-checkins

[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command egg_info.py, NONE, 1.1 bdist_egg.py, 1.20, 1.21
by pje＠users.sourceforge.net July 6, 2005

July 6, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12500/setuptools/command Modified Files: bdist_egg.py Added Files: egg_info.py Log Message: Added ``egg_info`` command to ``setuptools``-based packages. This command just creates or updates the "projectname.egg-info" directory, without building an egg. It's used by the ``bdist_egg`` command now, and will be used by the ``test`` and ``develop`` commands later on. --- NEW FILE: egg_info.py --- """setuptools.command.egg_info Create a distribution's .egg-info directory and contents""" # This module should be kept compatible with Python 2.3 import os from setuptools import Command from distutils.errors import * from distutils import log from pkg_resources import parse_requirements, safe_name, \ safe_version, yield_lines class egg_info(Command): description = "create a distribution's .egg-info directory" user_options = [ ('egg-base=', 'e', "directory containing .egg-info directories" " (default: top of the source tree)"), ('tag-svn-revision', 'r', "Add subversion revision ID to version number"), ('tag-date', 'd', "Add date stamp (e.g. 20050528) to version number"), ('tag-build=', 'b', "Specify explicit tag to add to version number"), ] boolean_options = ['tag-date','tag-svn-revision'] def initialize_options (self): self.egg_name = None self.egg_version = None self.egg_base = None self.egg_info = None self.tag_build = None self.tag_svn_revision = 0 self.tag_date = 0 def finalize_options (self): self.egg_name = safe_name(self.distribution.get_name()) self.egg_version = self.tagged_version() try: list( parse_requirements('%s==%s' % (self.egg_name,self.egg_version)) ) except ValueError: raise DistutilsOptionError( "Invalid distribution name or version syntax: %s-%s" % (self.egg_name,self.egg_version) ) if self.egg_base is None: dirs = self.distribution.package_dir self.egg_base = (dirs or {}).get('',os.curdir) self.ensure_dirname('egg_base') self.egg_info = os.path.join(self.egg_base, self.egg_name+'.egg-info') def run(self): # Make the .egg-info directory, then write PKG-INFO and requires.txt self.mkpath(self.egg_info) log.info("writing %s" % os.path.join(self.egg_info,'PKG-INFO')) if not self.dry_run: metadata = self.distribution.metadata metadata.version, oldver = self.egg_version, metadata.version metadata.name, oldname = self.egg_name, metadata.name try: metadata.write_pkg_info(self.egg_info) finally: metadata.name, metadata.version = oldname, oldver self.write_requirements() if os.path.exists(os.path.join(self.egg_info,'depends.txt')): log.warn( "WARNING: 'depends.txt' will not be used by setuptools 0.6!\n" "Use the install_requires/extras_require setup() args instead." ) def write_requirements(self): dist = self.distribution if not getattr(dist,'install_requires',None) and \ not getattr(dist,'extras_require',None): return requires = os.path.join(self.egg_info,"requires.txt") log.info("writing %s", requires) if not self.dry_run: f = open(requires, 'wt') f.write('\n'.join(yield_lines(dist.install_requires))) for extra,reqs in dist.extras_require.items(): f.write('\n\n[%s]\n%s' % (extra, '\n'.join(yield_lines(reqs)))) f.close() def tagged_version(self): version = self.distribution.get_version() if self.tag_build: version+='-'+self.tag_build if self.tag_svn_revision and os.path.exists('.svn'): version += '-%s' % self.get_svn_revision() if self.tag_date: import time version += time.strftime("-%Y%m%d") return safe_version(version) def get_svn_revision(self): stdin, stdout = os.popen4("svn info"); stdin.close() result = stdout.read(); stdout.close() import re match = re.search(r'Last Changed Rev: (\d+)', result) if not match: raise RuntimeError("svn info error: %s" % result.strip()) return match.group(1) Index: bdist_egg.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/bdist_egg.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- bdist_egg.py 4 Jul 2005 18:45:41 -0000 1.20 +++ bdist_egg.py 6 Jul 2005 01:37:41 -0000 1.21 @@ -5,13 +5,10 @@ # This module should be kept compatible with Python 2.3 import os from setuptools import Command -from distutils.util import get_platform -from distutils.dir_util import create_tree, remove_tree, ensure_relative,mkpath +from distutils.dir_util import remove_tree, mkpath from distutils.sysconfig import get_python_version, get_python_lib -from distutils.errors import * from distutils import log -from pkg_resources import parse_requirements, get_platform, safe_name, \ - safe_version, Distribution, yield_lines +from pkg_resources import get_platform, Distribution def write_stub(resource, pyfile): @@ -39,17 +36,16 @@ + + + class bdist_egg(Command): + description = "create an \"egg\" distribution" + user_options = [ - ('egg-base=', 'e', "directory containing .egg-info directories" - " (default: top of the source tree)"), ('bdist-dir=', 'd', "temporary directory for creating the distribution"), - ('tag-svn-revision', None, - "Add subversion revision ID to version number"), - ('tag-date', None, "Add date stamp (e.g. 20050528) to version number"), - ('tag-build=', None, "Specify explicit tag to add to version number"), ('plat-name=', 'p', "platform name to embed in generated filenames " "(default: %s)" % get_platform()), @@ -61,48 +57,47 @@ ('skip-build', None, "skip rebuilding everything (for testing/debugging)"), ] + boolean_options = [ 'keep-temp', 'skip-build', 'relative','tag-date','tag-svn-revision' ] + + + + + + + + + + + + + + + + + + def initialize_options (self): - self.egg_name = None - self.egg_version = None - self.egg_base = None - self.egg_info = None self.bdist_dir = None self.plat_name = None self.keep_temp = 0 self.dist_dir = None self.skip_build = 0 - self.tag_build = None - self.tag_svn_revision = 0 - self.tag_date = 0 self.egg_output = None - def finalize_options (self): - self.egg_name = safe_name(self.distribution.get_name()) - self.egg_version = self.tagged_version() - try: - list( - parse_requirements('%s==%s' % (self.egg_name,self.egg_version)) - ) - except ValueError: - raise DistutilsOptionError( - "Invalid distribution name or version syntax: %s-%s" % - (self.egg_name,self.egg_version) - ) - if self.egg_base is None: - dirs = self.distribution.package_dir - self.egg_base = (dirs or {}).get('','.') - self.ensure_dirname('egg_base') - self.egg_info = os.path.join( - self.egg_base, self.egg_name+'.egg-info' - ) + + def finalize_options(self): + ei_cmd = self.get_finalized_command("egg_info") + self.egg_info = ei_cmd.egg_info + if self.bdist_dir is None: bdist_base = self.get_finalized_command('bdist').bdist_base self.bdist_dir = os.path.join(bdist_base, 'egg') + if self.plat_name is None: self.plat_name = get_platform() @@ -112,7 +107,7 @@ # Compute filename of the output egg basename = Distribution( - None, None, self.egg_name, self.egg_version, + None, None, ei_cmd.egg_name, ei_cmd.egg_version, get_python_version(), self.distribution.has_ext_modules() and self.plat_name ).egg_name() @@ -121,6 +116,11 @@ + + + + + def do_install_data(self): # Hack for packages that install data to install's --install-lib self.get_finalized_command('install').install_lib = self.bdist_dir @@ -146,26 +146,29 @@ finally: self.distribution.data_files = old + def get_outputs(self): return [self.egg_output] - def write_requirements(self): - dist = self.distribution - if not getattr(dist,'install_requires',None) and \ - not getattr(dist,'extras_require',None): return - requires = os.path.join(self.egg_info,"requires.txt") - log.info("writing %s", requires) - if not self.dry_run: - f = open(requires, 'wt') - f.write('\n'.join(yield_lines(dist.install_requires))) - for extra,reqs in dist.extras_require.items(): - f.write('\n\n[%s]\n%s' % (extra, '\n'.join(yield_lines(reqs)))) - f.close() - + + def call_command(self,cmdname,**kw): + """Invoke reinitialized command `cmdname` with keyword args""" + for dirname in INSTALL_DIRECTORY_ATTRS: + kw.setdefault(dirname,self.bdist_dir) + kw.setdefault('skip_build',self.skip_build) + kw.setdefault('dry_run', self.dry_run) + cmd = self.reinitialize_command(cmdname, **kw) + self.run_command(cmdname) + return cmd + + def run(self): + # Generate metadata first + self.run_command("egg_info") + # We run install_lib before install_data, because some data hacks # pull their data path from the install_lib command. - + log.info("installing library code to %s" % self.bdist_dir) cmd = self.call_command('install_lib', warn_dir=0) @@ -193,24 +196,12 @@ archive_root = self.bdist_dir egg_info = os.path.join(archive_root,'EGG-INFO') self.mkpath(egg_info) - self.mkpath(self.egg_info) if self.distribution.scripts: script_dir = os.path.join(egg_info, 'scripts') log.info("installing scripts to %s" % script_dir) self.call_command('install_scripts', install_dir=script_dir) - self.write_requirements() - log.info("writing %s" % os.path.join(self.egg_info,'PKG-INFO')) - - if not self.dry_run: - metadata = self.distribution.metadata - metadata.version, oldver = self.egg_version, metadata.version - metadata.name, oldname = self.egg_name, metadata.name - try: - metadata.write_pkg_info(self.egg_info) - finally: - metadata.name, metadata.version = oldname, oldver native_libs = os.path.join(self.egg_info,"native_libs.txt") if ext_outputs: @@ -235,49 +226,17 @@ "WARNING: 'depends.txt' will not be used by setuptools 0.6!\n" "Use the install_requires/extras_require setup() args instead." ) + # Make the archive make_zipfile(self.egg_output, archive_root, verbose=self.verbose, dry_run=self.dry_run) if not self.keep_temp: remove_tree(self.bdist_dir, dry_run=self.dry_run) + # Add to 'Distribution.dist_files' so that the "upload" command works getattr(self.distribution,'dist_files',[]).append( ('bdist_egg',get_python_version(),self.egg_output)) - def tagged_version(self): - version = self.distribution.get_version() - if self.tag_build: - version+='-'+self.tag_build - - if self.tag_svn_revision and os.path.exists('.svn'): - version += '-%s' % self.get_svn_revision() - - if self.tag_date: - import time - version += time.strftime("-%Y%m%d") - - return safe_version(version) - - def get_svn_revision(self): - stdin, stdout = os.popen4("svn info"); stdin.close() - result = stdout.read(); stdout.close() - import re - match = re.search(r'Last Changed Rev: (\d+)', result) - if not match: - raise RuntimeError("svn info error: %s" % result.strip()) - return match.group(1) - - def call_command(self,cmdname,**kw): - """Invoke reinitialized command `cmdname` with keyword args""" - for dirname in INSTALL_DIRECTORY_ATTRS: - kw.setdefault(dirname,self.bdist_dir) - kw.setdefault('skip_build',self.skip_build) - kw.setdefault('dry_run', self.dry_run) - cmd = self.reinitialize_command(cmdname, **kw) - self.run_command(cmdname) - return cmd - -

1 0

python/dist/src/Modules posixmodule.c, 2.336, 2.337
by mwh＠users.sourceforge.net July 5, 2005

July 5, 2005

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9704/Modules Modified Files: posixmodule.c Log Message: Fix bug [ 1232517 ] OverflowError in time.utime() causes strange traceback A needed error check was missing. (Actually, this error check may only have become necessary in fairly recent Python, not sure). Backport candidate. Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.336 retrieving revision 2.337 diff -u -d -r2.336 -r2.337 --- posixmodule.c 2 Jun 2005 13:09:28 -0000 2.336 +++ posixmodule.c 5 Jul 2005 15:21:58 -0000 2.337 @@ -1991,6 +1991,8 @@ return -1; intval = PyInt_AsLong(intobj); Py_DECREF(intobj); + if (intval == -1 && PyErr_Occurred()) + return -1; *sec = intval; *usec = (long)((tval - intval) * 1e6); /* can't exceed 1000000 */ if (*usec < 0)

1 0

python/dist/src/Misc NEWS,1.1309,1.1310
by mwh＠users.sourceforge.net July 5, 2005

July 5, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9704/Misc Modified Files: NEWS Log Message: Fix bug [ 1232517 ] OverflowError in time.utime() causes strange traceback A needed error check was missing. (Actually, this error check may only have become necessary in fairly recent Python, not sure). Backport candidate. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1309 retrieving revision 1.1310 diff -u -d -r1.1309 -r1.1310 --- NEWS 4 Jul 2005 17:16:05 -0000 1.1309 +++ NEWS 5 Jul 2005 15:21:55 -0000 1.1310 @@ -12,6 +12,9 @@ Core and builtins ----------------- +- SF bug #1232517: An overflow error was not detected properly when + attempting to convert a large float to an int in os.utime(). + - SF bug #1224347: hex longs now print with lowercase letters just like their int counterparts.

1 0

python/dist/src/Tools/bgen/bgen bgenBuffer.py, 1.11, 1.12 bgenHeapBuffer.py, 1.6, 1.7 bgenType.py, 1.18, 1.19 bgenVariable.py, 1.9, 1.10
by jackjansen＠users.sourceforge.net July 5, 2005

July 5, 2005

Update of /cvsroot/python/python/dist/src/Tools/bgen/bgen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17531 Modified Files: bgenBuffer.py bgenHeapBuffer.py bgenType.py bgenVariable.py Log Message: Allow for (optional) const declaration. Index: bgenBuffer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/bgen/bgen/bgenBuffer.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- bgenBuffer.py 28 Jun 2005 15:14:34 -0000 1.11 +++ bgenBuffer.py 5 Jul 2005 10:00:57 -0000 1.12 @@ -38,19 +38,26 @@ self.sizeformat = sizeformat or type2format[sizetype] self.label_needed = 0 - def getArgDeclarations(self, name, reference=False): + def getArgDeclarations(self, name, reference=False, constmode=False): if reference: raise RuntimeError, "Cannot pass buffer types by reference" - return (self.getBufferDeclarations(name) + + return (self.getBufferDeclarations(name, constmode) + self.getSizeDeclarations(name)) - def getBufferDeclarations(self, name): - return self.getInputBufferDeclarations(name) + self.getOutputBufferDeclarations(name) + def getBufferDeclarations(self, name, constmode=False): + return self.getInputBufferDeclarations(name, constmode) + \ + self.getOutputBufferDeclarations(name, constmode) - def getInputBufferDeclarations(self, name): - return ["%s *%s__in__" % (self.datatype, name)] + def getInputBufferDeclarations(self, name, constmode=False): + if constmode: + const = "const " + else: + const = "" + return ["%s%s *%s__in__" % (const, self.datatype, name)] - def getOutputBufferDeclarations(self, name): + def getOutputBufferDeclarations(self, name, constmode=False): + if constmode: + raise RuntimeError, "Cannot use const output buffer" return ["%s %s__out__[%s]" % (self.datatype, name, self.size)] def getSizeDeclarations(self, name): @@ -105,13 +112,13 @@ class InputOnlyBufferMixIn(InputOnlyMixIn): - def getOutputBufferDeclarations(self, name): + def getOutputBufferDeclarations(self, name, constmode=False): return [] class OutputOnlyBufferMixIn(OutputOnlyMixIn): - def getInputBufferDeclarations(self, name): + def getInputBufferDeclarations(self, name, constmode=False): return [] class OptionalInputBufferMixIn: @@ -186,8 +193,12 @@ FixedInputOutputBufferType.__init__(self, "sizeof(%s)" % type) self.typeName = self.type = type - def getInputBufferDeclarations(self, name): - return ["%s *%s__in__" % (self.type, name)] + def getInputBufferDeclarations(self, name, constmode=False): + if constmode: + const = "const " + else: + const = "" + return ["%s%s *%s__in__" % (const, self.type, name)] def getSizeDeclarations(self, name): return [] @@ -195,7 +206,9 @@ def getAuxDeclarations(self, name): return ["int %s__in_len__" % (name)] - def getOutputBufferDeclarations(self, name): + def getOutputBufferDeclarations(self, name, constmode=False): + if constmode: + raise RuntimeError, "Cannot use const output buffer" return ["%s %s__out__" % (self.type, name)] def getargsArgs(self, name): Index: bgenHeapBuffer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/bgen/bgen/bgenHeapBuffer.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- bgenHeapBuffer.py 22 Jun 2005 20:35:23 -0000 1.6 +++ bgenHeapBuffer.py 5 Jul 2005 10:00:57 -0000 1.7 @@ -16,7 +16,9 @@ def __init__(self, datatype = 'char', sizetype = 'int', sizeformat = None): FixedInputOutputBufferType.__init__(self, "0", datatype, sizetype, sizeformat) - def getOutputBufferDeclarations(self, name): + def getOutputBufferDeclarations(self, name, constmode=False): + if constmode: + raise RuntimeError, "Cannot use const output buffer" return ["%s *%s__out__" % (self.datatype, name)] def getargsCheck(self, name): @@ -74,7 +76,7 @@ Call from Python with buffer size. """ - def getInputBufferDeclarations(self, name): + def getInputBufferDeclarations(self, name, constmode=False): return [] def getargsFormat(self): Index: bgenType.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/bgen/bgen/bgenType.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- bgenType.py 1 Jul 2005 20:23:27 -0000 1.18 +++ bgenType.py 5 Jul 2005 10:00:57 -0000 1.19 @@ -29,13 +29,18 @@ for decl in self.getAuxDeclarations(name): Output("%s;", decl) - def getArgDeclarations(self, name, reference=False): + def getArgDeclarations(self, name, reference=False, constmode=False): """Return the main part of the declarations for this type: the items that will be passed as arguments in the C/C++ function call.""" if reference: - return ["%s& %s" % (self.typeName, name)] + ref = "&" else: - return ["%s %s" % (self.typeName, name)] + ref = "" + if constmode: + const = "const " + else: + const = "" + return ["%s%s%s %s" % (const, self.typeName, ref, name)] def getAuxDeclarations(self, name): """Return any auxiliary declarations needed for implementing this @@ -208,7 +213,7 @@ self.substitute = substitute self.typeName = None # Don't show this argument in __doc__ string - def getArgDeclarations(self, name, reference=False): + def getArgDeclarations(self, name, reference=False, constmode=False): return [] def getAuxDeclarations(self, name, reference=False): Index: bgenVariable.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/bgen/bgen/bgenVariable.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- bgenVariable.py 1 Jul 2005 20:23:27 -0000 1.9 +++ bgenVariable.py 5 Jul 2005 10:00:57 -0000 1.10 @@ -45,9 +45,12 @@ elif self.flags != SelfMode: self.type.declare(self.name) - def getArgDeclarations(self): + def getArgDeclarations(self, constmode=False): refmode = (self.flags & RefMode) - return self.type.getArgDeclarations(self.name, reference=refmode) + if constmode: + constmode = (self.flags & ConstMode) + return self.type.getArgDeclarations(self.name, + reference=refmode, constmode=constmode) def getAuxDeclarations(self): return self.type.getAuxDeclarations(self.name)

1 0

python/dist/src/Lib/test test_set.py,1.17,1.18
by rhettinger＠users.sourceforge.net July 5, 2005

July 5, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22257 Modified Files: test_set.py Log Message: Add test for hash commutativity. Index: test_set.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_set.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- test_set.py 18 Jun 2005 21:00:26 -0000 1.17 +++ test_set.py 5 Jul 2005 05:34:43 -0000 1.18 @@ -5,6 +5,7 @@ import copy import pickle import os +from random import randrange, shuffle class PassThru(Exception): pass @@ -399,6 +400,15 @@ self.assertEqual(hash(self.thetype('abcdeb')), hash(self.thetype('ebecda'))) + # make sure that all permutations give the same hash value + n = 100 + seq = [randrange(n) for i in xrange(n)] + results = set() + for i in xrange(200): + shuffle(seq) + results.add(hash(self.thetype(seq))) + self.assertEqual(len(results), 1) + def test_copy(self): dup = self.s.copy() self.assertEqual(id(self.s), id(dup))

1 0

python/dist/src/Lib imaplib.py,1.76,1.77
by pierslauder＠users.sourceforge.net July 5, 2005

July 5, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19841/dist/src/Lib Modified Files: imaplib.py Log Message: fixed tag generation to avoid null tags Index: imaplib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/imaplib.py,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- imaplib.py 1 Jun 2005 23:50:51 -0000 1.76 +++ imaplib.py 5 Jul 2005 04:20:07 -0000 1.77 @@ -20,7 +20,7 @@ # PROXYAUTH contributed by Rick Holbert <holbert.13(a)osu.edu> November 2002. # GET/SETANNOTATION contributed by Tomas Lindroos <skitta(a)abo.fi> June 2005. -__version__ = "2.56" +__version__ = "2.57" import binascii, os, random, re, socket, sys, time @@ -165,7 +165,7 @@ # Create unique tag for this session, # and compile tagged response matcher. - self.tagpre = Int2AP(random.randint(0, 31999)) + self.tagpre = Int2AP(random.randint(4096, 65535)) self.tagre = re.compile(r'(?P<tag>' + self.tagpre + r'\d+) (?P<type>[A-Z]+) (?P<data>.*)')

1 0

[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command bdist_egg.py, 1.19, 1.20
by pje＠users.sourceforge.net July 4, 2005

July 4, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10252/setuptools/command Modified Files: bdist_egg.py Log Message: Fix a problem using bdist_egg with non-setuptools distributions. Index: bdist_egg.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/bdist_egg.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- bdist_egg.py 27 Jun 2005 00:31:03 -0000 1.19 +++ bdist_egg.py 4 Jul 2005 18:45:41 -0000 1.20 @@ -201,9 +201,8 @@ self.call_command('install_scripts', install_dir=script_dir) self.write_requirements() - - log.info("writing %s" % os.path.join(self.egg_info,'PKG-INFO')) + if not self.dry_run: metadata = self.distribution.metadata metadata.version, oldver = self.egg_version, metadata.version @@ -233,9 +232,7 @@ if os.path.exists(os.path.join(self.egg_info,'depends.txt')): log.warn( - "WARNING: 'depends.txt' will not be used by setuptools 0.6!" - ) - log.warn( + "WARNING: 'depends.txt' will not be used by setuptools 0.6!\n" "Use the install_requires/extras_require setup() args instead." ) # Make the archive @@ -244,6 +241,9 @@ if not self.keep_temp: remove_tree(self.bdist_dir, dry_run=self.dry_run) + getattr(self.distribution,'dist_files',[]).append( + ('bdist_egg',get_python_version(),self.egg_output)) + def tagged_version(self): version = self.distribution.get_version() if self.tag_build:

1 0

python/nondist/sandbox/setuptools/setuptools dist.py, 1.8, 1.9
by pje＠users.sourceforge.net July 4, 2005

July 4, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10252/setuptools Modified Files: dist.py Log Message: Fix a problem using bdist_egg with non-setuptools distributions. Index: dist.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/dist.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- dist.py 27 Jun 2005 00:31:02 -0000 1.8 +++ dist.py 4 Jul 2005 18:45:41 -0000 1.9 @@ -89,6 +89,7 @@ self.requires = [] self.install_requires = [] self.extras_require = {} + self.dist_files = [] _Distribution.__init__(self,attrs) if not have_package_data: from setuptools.command.build_py import build_py @@ -120,7 +121,6 @@ - def finalize_options(self): _Distribution.finalize_options(self)

1 0

python/nondist/sandbox/setuptools easy_install.py, 1.24, 1.25
by pje＠users.sourceforge.net July 4, 2005

July 4, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9903 Modified Files: easy_install.py Log Message: Fix typo Index: easy_install.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/easy_install.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- easy_install.py 27 Jun 2005 00:31:02 -0000 1.24 +++ easy_install.py 4 Jul 2005 18:45:02 -0000 1.25 @@ -192,7 +192,7 @@ def add_output(self, path): if os.path.isdir(path): - for base, dirs, files in walk(path): + for base, dirs, files in os.walk(path): for filename in files: self.outputs.append(os.path.join(base,filename)) else:

1 0

python/nondist/sandbox/setuptools EasyInstall.txt, 1.16, 1.17
by pje＠users.sourceforge.net July 4, 2005

July 4, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9525 Modified Files: EasyInstall.txt Log Message: Add missing download links Index: EasyInstall.txt =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/EasyInstall.txt,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- EasyInstall.txt 27 Jun 2005 00:31:02 -0000 1.16 +++ EasyInstall.txt 4 Jul 2005 18:44:26 -0000 1.17 @@ -26,8 +26,12 @@ Windows <http://peak.telecommunity.com/dist/setuptools-0.5a4.win32.exe>`_. All others should just download `ez_setup.py <http://peak.telecommunity.com/dist/ez_setup.py>`_, and run it; this will -download and install the correct version of ``setuptools`` for your Python -version. You may receive a message telling you about an obsolete version of +download and install the `Python 2.3 egg`_ or `Python 2.4 egg`_ for you. + +.. _Python 2.3 egg: http://peak.telecommunity.com/dist/setuptools-0.5a4-py2.3.egg +.. _Python 2.4 egg: http://peak.telecommunity.com/dist/setuptools-0.5a4-py2.4.egg + +You may receive a message telling you about an obsolete version of setuptools being present; if so, you must be sure to delete it entirely, along with the old ``pkg_resources`` module if it's present on ``sys.path``. @@ -74,7 +78,7 @@ easy_install /my_downloads/OtherPackage-3.2.1-py2.3.egg **Example 5**. Upgrade an already-installed package to the latest version -listed on PyPI: +listed on PyPI:: easy_install --upgrade PyProtocols

1 0