[Checkins] SVN: zc.buildout/branches/2/ Only use distribute
jim
cvs-admin at zope.org
Sat Mar 24 19:55:44 UTC 2012
Log message for revision 124708:
Only use distribute
Changed:
U zc.buildout/branches/2/bootstrap/bootstrap.py
U zc.buildout/branches/2/dev.py
U zc.buildout/branches/2/src/zc/buildout/easy_install.py
U zc.buildout/branches/2/src/zc/buildout/tests.py
-=-
Modified: zc.buildout/branches/2/bootstrap/bootstrap.py
===================================================================
--- zc.buildout/branches/2/bootstrap/bootstrap.py 2012-03-23 12:31:29 UTC (rev 124707)
+++ zc.buildout/branches/2/bootstrap/bootstrap.py 2012-03-24 19:55:40 UTC (rev 124708)
@@ -75,8 +75,7 @@
is_jython = sys.platform.startswith('java')
-setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
-distribute_source = 'http://python-distribute.org/distribute_setup.py'
+setup_source = 'http://python-distribute.org/distribute_setup.py'
# parsing arguments
def normalize_to_url(option, opt_str, value, parser):
@@ -109,21 +108,11 @@
parser.add_option("-v", "--version", dest="version",
help="use a specific zc.buildout version")
parser.add_option("--setup-version", dest="setup_version",
- help="The version of setuptools or distribute to use.")
-parser.add_option("-d", "--distribute",
- action="store_true", dest="use_distribute",
- default= sys.version_info[0] >= 3,
- help="Use Distribute rather than Setuptools.")
-parser.add_option("--setup-source", action="callback", dest="setup_source",
- callback=normalize_to_url, nargs=1, type="string",
- help=("Specify a URL or file location for the setup file. "
- "If you use Setuptools, this will default to " +
- setuptools_source + "; if you use Distribute, this "
- "will default to " + distribute_source +"."))
+ help="The version of distribute to use.")
parser.add_option("--download-base", action="callback", dest="download_base",
callback=normalize_to_url, nargs=1, type="string",
help=("Specify a URL or directory for downloading "
- "zc.buildout and either Setuptools or Distribute. "
+ "zc.buildout and Distribute. "
"Defaults to PyPI."))
parser.add_option("--eggs",
help=("Specify a directory for storing eggs. Defaults to "
@@ -154,12 +143,6 @@
else:
eggs_dir = tempfile.mkdtemp()
-if options.setup_source is None:
- if options.use_distribute:
- options.setup_source = distribute_source
- else:
- options.setup_source = setuptools_source
-
if options.accept_buildout_test_releases:
args.append('buildout:accept-buildout-test-releases=true')
args.append('bootstrap')
@@ -171,7 +154,7 @@
raise ImportError
except ImportError:
ez_code = urllib2.urlopen(
- options.setup_source).read().replace('\r\n'.encode(), '\n'.encode())
+ setup_source).read().replace('\r\n'.encode(), '\n'.encode())
ez = {}
exec(ez_code, ez)
setup_args = dict(to_dir=eggs_dir, download_delay=0)
@@ -179,8 +162,7 @@
setup_args['download_base'] = options.download_base
if options.setup_version:
setup_args['version'] = options.setup_version
- if options.use_distribute:
- setup_args['no_fake'] = True
+ setup_args['no_fake'] = True
ez['use_setuptools'](**setup_args)
if 'pkg_resources' in sys.modules:
if sys.version_info[0] >= 3:
@@ -212,10 +194,7 @@
if find_links:
cmd.extend(['-f', quote(find_links)])
-if options.use_distribute:
- setup_requirement = 'distribute'
-else:
- setup_requirement = 'setuptools'
+setup_requirement = 'distribute'
ws = pkg_resources.working_set
setup_requirement_path = ws.find(
pkg_resources.Requirement.parse(setup_requirement)).location
Modified: zc.buildout/branches/2/dev.py
===================================================================
--- zc.buildout/branches/2/dev.py 2012-03-23 12:31:29 UTC (rev 124707)
+++ zc.buildout/branches/2/dev.py 2012-03-24 19:55:40 UTC (rev 124708)
@@ -23,8 +23,6 @@
except ImportError:
import urllib2
-from optparse import OptionParser
-
if sys.platform == 'win32':
def quote(c):
if ' ' in c:
@@ -64,11 +62,10 @@
is_jython = sys.platform.startswith('java')
-setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
-distribute_source = 'http://python-distribute.org/distribute_setup.py'
+setup_source = 'http://python-distribute.org/distribute_setup.py'
usage = '''\
-[DESIRED PYTHON FOR DEVELOPING BUILDOUT] dev.py [options]
+[DESIRED PYTHON FOR DEVELOPING BUILDOUT] dev.py
Bootstraps buildout itself for development.
@@ -76,21 +73,8 @@
buildout egg itself is installed as a develop egg.
'''
-parser = OptionParser(usage=usage)
-parser.add_option("-d", "--distribute",
- action="store_true", dest="use_distribute",
- default=sys.version_info[0] >= 3,
- help="Use Distribute rather than Setuptools.")
-options, args = parser.parse_args()
-if args:
- parser.error('This script accepts no arguments other than its options.')
-if options.use_distribute:
- setup_source = distribute_source
-else:
- setup_source = setuptools_source
-
for d in 'eggs', 'develop-eggs', 'bin':
if not os.path.exists(d):
os.mkdir(d)
@@ -109,9 +93,7 @@
'\r\n'.encode(), '\n'.encode())
ez = {}
exec(ez_code, ez)
- setup_args = dict(to_dir='eggs', download_delay=0)
- if options.use_distribute:
- setup_args['no_fake'] = True
+ setup_args = dict(to_dir='eggs', download_delay=0, no_fake=True)
ez['use_setuptools'](**setup_args)
if to_reload:
reload(pkg_resources)
Modified: zc.buildout/branches/2/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/2/src/zc/buildout/easy_install.py 2012-03-23 12:31:29 UTC (rev 124707)
+++ zc.buildout/branches/2/src/zc/buildout/easy_install.py 2012-03-24 19:55:40 UTC (rev 124708)
@@ -55,8 +55,6 @@
is_win32 = sys.platform == 'win32'
is_jython = sys.platform.startswith('java')
setuptools_key = pkg_resources.Requirement.parse('setuptools').key
-is_distribute = (
- pkg_resources.Requirement.parse('setuptools').key=='distribute')
BROKEN_DASH_S_WARNING = (
'Buildout has been asked to exclude or limit site-packages so that '
Modified: zc.buildout/branches/2/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/branches/2/src/zc/buildout/tests.py 2012-03-23 12:31:29 UTC (rev 124707)
+++ zc.buildout/branches/2/src/zc/buildout/tests.py 2012-03-24 19:55:40 UTC (rev 124708)
@@ -3234,13 +3234,9 @@
>>> write('foo.py', '')
>>> _ = system(buildout+' setup . sdist')
- >>> if zc.buildout.easy_install.is_distribute:
- ... distribute_version = 'distribute = %s' % (
+ >>> distribute_version = 'distribute = %s' % (
... pkg_resources.working_set.find(
... pkg_resources.Requirement.parse('distribute')).version,)
- ... else:
- ... distribute_version = ''
- ...
>>> write('buildout.cfg',
... '''
... [buildout]
More information about the checkins
mailing list