Mailman 3 May 2005 - Python-checkins

python/nondist/sandbox/setuptools easy_install.py, 1.6, 1.7
by pje＠users.sourceforge.net May 29, 2005

May 29, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20147 Modified Files: easy_install.py Log Message: Add SourceForge download support, graciously contributed by Ian Bicking. Also, move some more imports to the top. Index: easy_install.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/easy_install.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- easy_install.py 29 May 2005 22:08:46 -0000 1.6 +++ easy_install.py 30 May 2005 03:37:50 -0000 1.7 @@ -154,6 +154,7 @@ """ import sys, os.path, pkg_resources, re, zipimport, zipfile, tarfile, shutil +import urlparse, urllib, tempfile from distutils.sysconfig import get_python_lib from shutil import rmtree # must have, because it can be called from __del__ from pkg_resources import * @@ -161,7 +162,6 @@ - class Installer: """Manage a download/build/install process""" @@ -170,8 +170,7 @@ def __init__(self, instdir=None, zip_ok=False, multi=None, tmpdir=None): if tmpdir is None: - from tempfile import mkdtemp - tmpdir = mkdtemp(prefix="easy_install-") + tmpdir = tempfile.mkdtemp(prefix="easy_install-") self.tmpdir = tmpdir @@ -203,6 +202,7 @@ + def samefile(self,p1,p2): if hasattr(os.path,'samefile') and ( os.path.exists(p1) and os.path.exists(p2) @@ -286,9 +286,7 @@ def _extract_zip(self,zipname,extract_dir): - import zipfile z = zipfile.ZipFile(zipname) - try: for info in z.infolist(): name = info.filename @@ -326,6 +324,8 @@ finally: tarobj.close() + + def _run_setup(self, setup_script): from setuptools.command import bdist_egg sys.modules.setdefault('distutils.command.bdist_egg', bdist_egg) @@ -368,7 +368,7 @@ def install_egg(self, egg_path, zip_ok): - import shutil + destination = os.path.join(self.instdir, os.path.basename(egg_path)) ensure_directory(destination) @@ -409,9 +409,9 @@ self.pth_file.save() def _download_url(self, scheme, url): + # Determine download filename - from urlparse import urlparse - name = filter(None,urlparse(url)[2].split('/'))[-1] + name = filter(None,urlparse.urlparse(url)[2].split('/'))[-1] while '..' in name: name = name.replace('..','.').replace('\\','_') @@ -422,10 +422,8 @@ return self._download_svn(url, filename) # Download the file - from urllib import FancyURLopener, URLopener - - class _opener(FancyURLopener): - http_error_default = URLopener.http_error_default + class _opener(urllib.FancyURLopener): + http_error_default = urllib.URLopener.http_error_default try: filename,headers = _opener().retrieve( @@ -449,6 +447,8 @@ + + def _extract_file(self, dist_filename): if zipfile.is_zipfile(dist_filename): self._extract_zip(dist_filename, self.tmpdir) @@ -464,16 +464,28 @@ def _download_html(self, url, headers, filename): - # Check if it is a subversion index page: + # Check for a sourceforge URL + sf_url = url.startswith('http://prdownloads.') file = open(filename) for line in file: if line.strip(): + # Check for a subversion index page if re.search(r'<title>Revision \d+:', line): + # it's a subversion index page: file.close() os.unlink(filename) return self._download_svn(url, filename) - else: - break # not an index page + # Check for a SourceForge header + elif sf_url: + if re.search(r'^<HTML><HEAD>', line, re.I): + continue # skip first line + elif re.search(r'<TITLE>Select a Mirror for File:',line): + # Sourceforge mirror page + page = file.read() + file.close() + os.unlink(filename) + return self._download_sourceforge(url, page) + break # not an index page file.close() raise RuntimeError("Unexpected HTML page found at "+url) @@ -482,6 +494,35 @@ os.system("svn checkout -q %s %s" % (url, filename)) return filename + def _download_sourceforge(self, source_url, sf_page): + """Download package from randomly-selected SourceForge mirror""" + + mirror_regex = re.compile(r'HREF=(/.*?\?use_mirror=[^>]*)') + urls = [m.group(1) for m in mirror_regex.finditer(sf_page)] + if not urls: + raise RuntimeError( + "URL looks like a Sourceforge mirror page, but no URLs found" + ) + + import random + url = urlparse.urljoin(source_url, random.choice(urls)) + f = urllib.urlopen(url) + match = re.search( + r'<META HTTP-EQUIV="refresh" content=".*?URL=(.*?)"', + f.read() + ) + f.close() + + if match: + download_url = match.group(1) + scheme = URL_SCHEME(download_url) + return self._download_url(scheme.group(1), download_url) + else: + raise RuntimeError( + 'No META HTTP-EQUIV="refresh" found in Sourceforge page at %s' + % url + ) +

1 0

python/nondist/sandbox/setuptools setup.py, 1.5, 1.6
by pje＠users.sourceforge.net May 29, 2005

May 29, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10063 Modified Files: setup.py Log Message: Bump version to 0.3a2 for release Index: setup.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setup.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- setup.py 29 May 2005 00:17:22 -0000 1.5 +++ setup.py 29 May 2005 22:14:30 -0000 1.6 @@ -7,7 +7,7 @@ setup( name="setuptools", - version="0.3a1", + version="0.3a2", description="Distutils enhancements", author="Phillip J. Eby",

1 0

python/nondist/sandbox/setuptools easy_install.py, 1.5, 1.6
by pje＠users.sourceforge.net May 29, 2005

May 29, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5768 Modified Files: easy_install.py Log Message: Add subversion support, loosely based on an implementation by Ian Bicking. EasyInstall now recognizes both 'svn' URLs (including 'svn+ssh' et al), and notices when it connects to an HTTP server that's actually a subversion repository. In either case it does a subversion checkout of the package. Also, fixed a bug on platforms with os.samefile(). Index: easy_install.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/easy_install.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- easy_install.py 29 May 2005 07:13:43 -0000 1.5 +++ easy_install.py 29 May 2005 22:08:46 -0000 1.6 @@ -153,23 +153,21 @@ need. """ -import sys, os.path, pkg_resources, re, zipimport +import sys, os.path, pkg_resources, re, zipimport, zipfile, tarfile, shutil +from distutils.sysconfig import get_python_lib +from shutil import rmtree # must have, because it can be called from __del__ from pkg_resources import * - - class Installer: """Manage a download/build/install process""" pth_file = None def __init__(self, instdir=None, zip_ok=False, multi=None, tmpdir=None): - from distutils.sysconfig import get_python_lib - site_packages = get_python_lib() if tmpdir is None: from tempfile import mkdtemp @@ -177,6 +175,7 @@ self.tmpdir = tmpdir + site_packages = get_python_lib() if instdir is None or self.samefile(site_packages,instdir): instdir = site_packages self.pth_file = PthDistributions( @@ -197,22 +196,23 @@ def close(self): if os.path.isdir(self.tmpdir): - from shutil import rmtree rmtree(self.tmpdir,True) def __del__(self): self.close() + + def samefile(self,p1,p2): - try: - os.path.samefile - except AttributeError: - return ( - os.path.normpath(os.path.normcase(p1)) == - os.path.normpath(os.path.normcase(p2)) - ) - else: + if hasattr(os.path,'samefile') and ( + os.path.exists(p1) and os.path.exists(p2) + ): return os.path.samefile(p1,p2) + return ( + os.path.normpath(os.path.normcase(p1)) == + os.path.normpath(os.path.normcase(p2)) + ) + def download(self, spec): """Locate and/or download or `spec`, returning a local filename""" @@ -222,7 +222,7 @@ scheme = URL_SCHEME(spec) if scheme: # It's a url, download it to self.tmpdir - return self._download_url(scheme, spec) + return self._download_url(scheme.group(1), spec) elif os.path.exists(spec): # Existing file or directory, just return it @@ -250,19 +250,8 @@ return self.install_egg(dist_filename,True) # Anything else, try to extract and build - import zipfile, tarfile - if zipfile.is_zipfile(dist_filename): - self._extract_zip(dist_filename, self.tmpdir) - else: - import tarfile - try: - tar = tarfile.open(dist_filename) - except tarfile.TarError: - raise RuntimeError( - "Not a valid tar or zip archive: %s" % dist_filename - ) - else: - self._extract_tar(tar) + if os.path.isfile(dist_filename): + self._extract_file(dist_filename) # Find the setup.py file from glob import glob @@ -285,6 +274,17 @@ ): self.install_egg(egg, self.zip_ok) + + + + + + + + + + + def _extract_zip(self,zipname,extract_dir): import zipfile z = zipfile.ZipFile(zipname) @@ -351,7 +351,7 @@ sys.argv[:] = save_argv - def _find_package(self, req): + def _find_package(self, req): # TODO: search here for a distro to download, matching Requirement # 'req' and return the package URL or filename raise DistributionNotFound(spec) @@ -412,16 +412,24 @@ # Determine download filename from urlparse import urlparse name = filter(None,urlparse(url)[2].split('/'))[-1] + while '..' in name: name = name.replace('..','.').replace('\\','_') + filename = os.path.join(self.tmpdir,name) + + if scheme=='svn' or scheme.startswith('svn+'): + return self._download_svn(url, filename) + # Download the file from urllib import FancyURLopener, URLopener - class opener(FancyURLopener): + + class _opener(FancyURLopener): http_error_default = URLopener.http_error_default + try: - filename,headers = opener().retrieve( - url,os.path.join(self.tmpdir,name) + filename,headers = _opener().retrieve( + url,filename ) except IOError,v: if v.args and v.args[0]=='http error': @@ -430,6 +438,10 @@ ) else: raise + + if headers['content-type'].lower().startswith('text/html'): + return self._download_html(url, headers, filename) + # and return its filename return filename @@ -437,9 +449,38 @@ + def _extract_file(self, dist_filename): + if zipfile.is_zipfile(dist_filename): + self._extract_zip(dist_filename, self.tmpdir) + else: + try: + tar = tarfile.open(dist_filename) + except tarfile.TarError: + raise RuntimeError( + "Not a valid tar or zip archive: %s" % dist_filename + ) + else: + self._extract_tar(tar) + def _download_html(self, url, headers, filename): + # Check if it is a subversion index page: + file = open(filename) + for line in file: + if line.strip(): + if re.search(r'<title>Revision \d+:', line): + file.close() + os.unlink(filename) + return self._download_svn(url, filename) + else: + break # not an index page + file.close() + raise RuntimeError("Unexpected HTML page found at "+url) + + def _download_svn(self, url, filename): + os.system("svn checkout -q %s %s" % (url, filename)) + return filename @@ -511,7 +552,7 @@ try: if not args: - raise RuntimeError("No urls, filenames, or requirements specified") + parser.error("No urls, filenames, or requirements specified") for spec in args: inst = factory(options.instdir, options.zip_ok, options.multi) @@ -523,11 +564,11 @@ finally: inst.close() except RuntimeError, v: - parser.error(str(v)) + print >>sys.stderr,"error:",v + sys.exit(1) if __name__ == '__main__': main(sys.argv[1:]) -

1 0

[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command bdist_egg.py, 1.9, 1.10
by pje＠users.sourceforge.net May 29, 2005

May 29, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4227/setuptools/command Modified Files: bdist_egg.py Log Message: Added options to alter eggs' version number by tagging with the subversion revision number, date, and/or a custom tag. This should make it easier for people to produce e.g. automated nightly builds of eggs. Index: bdist_egg.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/bdist_egg.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- bdist_egg.py 29 May 2005 05:19:59 -0000 1.9 +++ bdist_egg.py 29 May 2005 22:05:39 -0000 1.10 @@ -13,31 +13,31 @@ from pkg_resources import parse_requirements, get_platform 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"), - ('plat-name=', 'p', + 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()), - ('keep-temp', 'k', + ('keep-temp', 'k', "keep the pseudo-installation tree around after " + "creating the distribution archive"), - ('dist-dir=', 'd', + ('dist-dir=', 'd', "directory to put final built distributions in"), - ('skip-build', None, + ('skip-build', None, "skip rebuilding everything (for testing/debugging)"), - ('relative', None, - "build the archive using relative paths" - "(default: false)"), - ] - - boolean_options = ['keep-temp', 'skip-build', 'relative'] + ] + boolean_options = [ + 'keep-temp', 'skip-build', 'relative','tag-date','tag-svn-revision' + ] def initialize_options (self): self.egg_name = None @@ -49,12 +49,13 @@ self.keep_temp = 0 self.dist_dir = None self.skip_build = 0 - self.relative = 0 - + self.tag_build = None + self.tag_svn_revision = 0 + self.tag_date = 0 def finalize_options (self): - self.egg_name = self.distribution.get_name().replace('-','_').replace(' ','_') - self.egg_version = self.distribution.get_version().replace('-','_') + self.egg_name = self.distribution.get_name().replace(' ','-') + self.egg_version = self.tagged_version() try: list( parse_requirements('%s==%s' % (self.egg_name,self.egg_version)) @@ -79,7 +80,6 @@ self.plat_name = get_platform() self.set_undefined_options('bdist',('dist_dir', 'dist_dir')) - def write_stub(self, resource, pyfile): f = open(pyfile,'w') f.write('\n'.join([ @@ -135,9 +135,8 @@ # And make an archive relative to the root of the # pseudo-installation tree. - archive_basename = "%s-%s-py%s" % (self.egg_name, self.egg_version, - get_python_version()) - + archive_basename = "%s-%s-py%s" % ( self.egg_name.replace('-','_'), + self.egg_version.replace('-','_'), get_python_version()) if ext_outputs: archive_basename += "-" + self.plat_name @@ -156,11 +155,12 @@ log.info("writing %s" % os.path.join(self.egg_info,'PKG-INFO')) if not self.dry_run: - self.distribution.metadata.write_pkg_info(self.egg_info) - - - - + metadata = self.distribution.metadata + metadata.version, oldver = self.egg_version, metadata.version + try: + metadata.write_pkg_info(self.egg_info) + finally: + metadata.version = oldver native_libs = os.path.join(self.egg_info,"native_libs.txt") if ext_outputs: @@ -181,8 +181,6 @@ if os.path.isfile(path): self.copy_file(path,os.path.join(egg_info,filename)) - - # Make the archive make_zipfile(pseudoinstall_root+'.egg', archive_root, verbose=self.verbose, @@ -191,16 +189,28 @@ if not self.keep_temp: remove_tree(self.bdist_dir, dry_run=self.dry_run) + 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 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 make_zipfile (zip_filename, base_dir, verbose=0, dry_run=0): @@ -211,7 +221,6 @@ raises DistutilsExecError. Returns the name of the output zip file. """ import zipfile - mkpath(os.path.dirname(zip_filename), dry_run=dry_run) # If zipfile module is not available, try spawning an external @@ -230,17 +239,8 @@ if not dry_run: z = zipfile.ZipFile(zip_filename, "w", compression=zipfile.ZIP_DEFLATED) - os.path.walk(base_dir, visit, z) z.close() return zip_filename -# make_zipfile () - - - - - - -

1 0

python/nondist/sandbox/setuptools easy_install.py, 1.4, 1.5
by pje＠users.sourceforge.net May 29, 2005

May 29, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13044 Modified Files: easy_install.py Log Message: Add support for using Installer subclasses, especially ones with support for searching a package database. Index: easy_install.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/easy_install.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- easy_install.py 29 May 2005 06:41:14 -0000 1.4 +++ easy_install.py 29 May 2005 07:13:43 -0000 1.5 @@ -235,14 +235,14 @@ "Not a URL, existing file, or requirement spec: %r" % (spec,) ) + # process a Requirement dist = AvailableDistributions().best_match(spec,[]) if dist is not None and dist.path.endswith('.egg'): return dist.path - # TODO: search here for a distro to download + return self.download(self._find_package(spec)) - raise DistributionNotFound(spec) def install_eggs(self, dist_filename): # .egg dirs or files are already built, so just return them @@ -351,10 +351,10 @@ sys.argv[:] = save_argv - - - - + def _find_package(self, req): + # TODO: search here for a distro to download, matching Requirement + # 'req' and return the package URL or filename + raise DistributionNotFound(spec) @@ -492,7 +492,7 @@ URL_SCHEME = re.compile('([-+.a-z0-9]{2,}):',re.I).match -def main(argv): +def main(argv, factory=Installer): from optparse import OptionParser parser = OptionParser(usage = "usage: %prog [options] url [url...]") @@ -514,7 +514,7 @@ raise RuntimeError("No urls, filenames, or requirements specified") for spec in args: - inst = Installer(options.instdir, options.zip_ok, options.multi) + inst = factory(options.instdir, options.zip_ok, options.multi) try: print "Downloading", spec downloaded = inst.download(spec)

1 0

python/nondist/sandbox/setuptools easy_install.py, 1.3, 1.4
by pje＠users.sourceforge.net May 29, 2005

May 29, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29069 Modified Files: easy_install.py Log Message: Oddly enough, some setup.py files actually check __name__=='__main__' Index: easy_install.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/easy_install.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- easy_install.py 29 May 2005 01:36:01 -0000 1.3 +++ easy_install.py 29 May 2005 06:41:14 -0000 1.4 @@ -184,7 +184,7 @@ ) elif multi is None: multi = True - + elif not multi: # explicit false, raise an error raise RuntimeError( @@ -337,7 +337,9 @@ try: sys.argv[:] = [setup_script, '-q', 'bdist_egg'] sys.path.insert(0,os.getcwd()) - execfile(setup_script, {'__file__':setup_script}) + execfile(setup_script, + {'__file__':setup_script, '__name__':'__main__'} + ) except SystemExit, v: if v.args and v.args[0]: raise RuntimeError( @@ -365,8 +367,6 @@ - - def install_egg(self, egg_path, zip_ok): import shutil destination = os.path.join(self.instdir, os.path.basename(egg_path)) @@ -383,10 +383,10 @@ shutil.move(egg_path, destination) else: shutil.copy2(egg_path, destination) - + elif os.path.isdir(egg_path): shutil.move(egg_path, destination) - + else: os.mkdir(destination) self._extract_zip(egg_path, destination) @@ -502,7 +502,7 @@ parser.add_option("-z", "--zip", action="store_true", dest="zip_ok", default=False, help="install package as a zipfile") - + parser.add_option("-m", "--multi-version", action="store_true", dest="multi", default=None, help="make apps have to require() a version") @@ -512,7 +512,7 @@ try: if not args: raise RuntimeError("No urls, filenames, or requirements specified") - + for spec in args: inst = Installer(options.instdir, options.zip_ok, options.multi) try:

1 0

python/nondist/sandbox/setuptools pkg_resources.py, 1.21, 1.22
by pje＠users.sourceforge.net May 29, 2005

May 29, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23732 Modified Files: pkg_resources.py Log Message: Correctly recognize .egg files that are already on sys.path (or whatever path AvailableDistributions is scanning) Index: pkg_resources.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/pkg_resources.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- pkg_resources.py 29 May 2005 00:17:22 -0000 1.21 +++ pkg_resources.py 29 May 2005 05:20:59 -0000 1.22 @@ -755,6 +755,15 @@ return finder(importer,path_item) +def find_in_zip(importer,path_item): + # for now, we only yield the .egg file itself, if applicable; + # i.e., we don't support "baskets" yet, just eggs + for item in find_on_path(importer,path_item): + yield item + +register_finder(zipimport.zipimporter,find_in_zip) + + def StringIO(*args, **kw): """Thunk to load the real StringIO on demand""" global StringIO @@ -770,13 +779,6 @@ - - - - - - - def find_nothing(importer,path_item): return ()

1 0

[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command bdist_egg.py, 1.8, 1.9
by pje＠users.sourceforge.net May 29, 2005

May 29, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23525/setuptools/command Modified Files: bdist_egg.py Log Message: Handle distributions with ' ' in their names Index: bdist_egg.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/bdist_egg.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- bdist_egg.py 28 May 2005 23:05:59 -0000 1.8 +++ bdist_egg.py 29 May 2005 05:19:59 -0000 1.9 @@ -53,7 +53,7 @@ def finalize_options (self): - self.egg_name = self.distribution.get_name().replace('-','_') + self.egg_name = self.distribution.get_name().replace('-','_').replace(' ','_') self.egg_version = self.distribution.get_version().replace('-','_') try: list(

1 0

python/nondist/sandbox/setuptools easy_install.py, 1.2, 1.3
by pje＠users.sourceforge.net May 28, 2005

May 28, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10742 Modified Files: easy_install.py Log Message: Add link to Python Eggs page in doc; fix a problem with non-standard source distros (where setup.py is in the archive root). Index: easy_install.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/easy_install.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- easy_install.py 29 May 2005 00:18:25 -0000 1.2 +++ easy_install.py 29 May 2005 01:36:01 -0000 1.3 @@ -13,7 +13,9 @@ ------------------------------------ For basic use of ``easy_install``, you need only supply the filename or URL of -a source distribution or .egg file (Python Egg). +a source distribution or .egg file (`Python Egg`__). + +__ http://peak.telecommunity.com/DevCenter/PythonEggs **Example 1**. Download a source distribution, automatically building and installing it:: @@ -160,8 +162,6 @@ - - class Installer: """Manage a download/build/install process""" @@ -279,7 +279,7 @@ ) setup_script = setups[0] - self._run_setup(setups[0]) + self._run_setup(setup_script) for egg in glob( os.path.join(os.path.dirname(setup_script),'dist','*.egg') ):

1 0

python/nondist/sandbox/setuptools easy_install.py, 1.1, 1.2
by pje＠users.sourceforge.net May 28, 2005

May 28, 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4736 Modified Files: easy_install.py Log Message: Remove exemaker spew from easy_install.py Index: easy_install.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/easy_install.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- easy_install.py 29 May 2005 00:17:22 -0000 1.1 +++ easy_install.py 29 May 2005 00:18:25 -0000 1.2 @@ -1,6 +1,3 @@ -#!python.exe -import site - #!python """\ Easy Install

1 0