[Checkins] SVN: zc.buildout/branches/jim-logging/ checkpointing
Jim Fulton
jim at zope.com
Wed May 30 15:31:44 EDT 2007
Log message for revision 76006:
checkpointing
Changed:
U zc.buildout/branches/jim-logging/buildout.cfg
U zc.buildout/branches/jim-logging/src/zc/buildout/buildout.py
U zc.buildout/branches/jim-logging/src/zc/buildout/debugging.txt
U zc.buildout/branches/jim-logging/src/zc/buildout/downloadcache.txt
U zc.buildout/branches/jim-logging/src/zc/buildout/easy_install.py
U zc.buildout/branches/jim-logging/src/zc/buildout/easy_install.txt
U zc.buildout/branches/jim-logging/src/zc/buildout/repeatable.txt
U zc.buildout/branches/jim-logging/src/zc/buildout/runsetup.txt
U zc.buildout/branches/jim-logging/src/zc/buildout/tests.py
U zc.buildout/branches/jim-logging/src/zc/buildout/update.txt
U zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/README.txt
U zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/custom.txt
U zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
-=-
Modified: zc.buildout/branches/jim-logging/buildout.cfg
===================================================================
--- zc.buildout/branches/jim-logging/buildout.cfg 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/buildout.cfg 2007-05-30 19:31:43 UTC (rev 76006)
@@ -1,6 +1,6 @@
[buildout]
develop = zc.recipe.egg_ .
-parts = test py
+parts = test py oltest
find-links = http://download.zope.org/distribution
[py]
@@ -14,3 +14,15 @@
eggs =
zc.buildout
zc.recipe.egg
+
+# Tests that can be run wo a network
+[oltest]
+recipe = zc.recipe.testrunner
+eggs =
+ zc.buildout
+ zc.recipe.egg
+defaults =
+ [
+ '-t',
+ '!(bootstrap|selectingpython|selecting-python)',
+ ]
Modified: zc.buildout/branches/jim-logging/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/branches/jim-logging/src/zc/buildout/buildout.py 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/src/zc/buildout/buildout.py 2007-05-30 19:31:43 UTC (rev 76006)
@@ -1,4 +1,4 @@
-############################################################################
+##############################################################################
#
# Copyright (c) 2005 Zope Corporation and Contributors.
# All Rights Reserved.
@@ -1149,7 +1149,7 @@
options = buildout[section]
unused = [option for option in options._raw if option not in options._data]
if unused:
- buildout._logger.warn("Unused options for %s: %s"
+ buildout._logger.warn("Unused options for %s: %s."
% (section, ' '.join(map(repr, unused)))
)
Modified: zc.buildout/branches/jim-logging/src/zc/buildout/debugging.txt
===================================================================
--- zc.buildout/branches/jim-logging/src/zc/buildout/debugging.txt 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/src/zc/buildout/debugging.txt 2007-05-30 19:31:43 UTC (rev 76006)
@@ -57,10 +57,10 @@
If we run the buildout, we'll get an error:
>>> print system(buildout),
- Develop: /sample-buildout/recipes
- Installing data-dir
+ Develop: '/sample-buildout/recipes'
+ Installing data-dir.
While:
- Installing data-dir
+ Installing data-dir.
Error: Missing option: data-dir:directory
@@ -72,10 +72,10 @@
... p self.options.keys()
... q
... """),
- Develop: /sample-buildout/recipes
- Installing data-dir
+ Develop: '/sample-buildout/recipes'
+ Installing data-dir.
While:
- Installing data-dir
+ Installing data-dir.
Traceback (most recent call last):
File "/zc/buildout/buildout.py", line 1294, in main
getattr(buildout, command)(args)
Modified: zc.buildout/branches/jim-logging/src/zc/buildout/downloadcache.txt
===================================================================
--- zc.buildout/branches/jim-logging/src/zc/buildout/downloadcache.txt 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/src/zc/buildout/downloadcache.txt 2007-05-30 19:31:43 UTC (rev 76006)
@@ -59,12 +59,12 @@
GET 200 /
GET 200 /demo-0.2-py2.4.egg
GET 200 /demoneeded-1.1.zip
- Installing eggs
- Getting new distribution for demo==0.2
- Got demo 0.2
- Getting new distribution for demoneeded
- Got demoneeded 1.1
- Generated script /sample-buildout/bin/demo.
+ Installing eggs.
+ Getting distribution for 'demo==0.2'.
+ Got demo 0.2.
+ Getting distribution for 'demoneeded'.
+ Got demoneeded 1.1.
+ Generated script '/sample-buildout/bin/demo'.
We'll also get the download cache populated. The buildout doesn't put
files in the cache directly. It creates an intermediate directory,
@@ -87,12 +87,11 @@
>>> print system(buildout),
GET 200 /
- Updating eggs
- Getting new distribution for demo==0.2
- Got demo 0.2
- Getting new distribution for demoneeded
- Got demoneeded 1.1
- Generated script /sample-buildout/bin/demo.
+ Updating eggs.
+ Getting distribution for 'demo==0.2'.
+ Got demo 0.2.
+ Getting distribution for 'demoneeded'.
+ Got demoneeded 1.1.
We see that the distributions aren't downloaded, because they're
downloaded from the cache.
@@ -130,10 +129,10 @@
... ''' % globals())
>>> print system(buildout),
- Uninstalling eggs
- Installing eggs
- Getting new distribution for demo
- Got demo 0.2
- Getting new distribution for demoneeded
- Got demoneeded 1.1
- Generated script /sample-buildout/bin/demo.
+ Uninstalling eggs.
+ Installing eggs.
+ Getting distribution for 'demo'.
+ Got demo 0.2.
+ Getting distribution for 'demoneeded'.
+ Got demoneeded 1.1.
+ Generated script '/sample-buildout/bin/demo'.
Modified: zc.buildout/branches/jim-logging/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/jim-logging/src/zc/buildout/easy_install.py 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/src/zc/buildout/easy_install.py 2007-05-30 19:31:43 UTC (rev 76006)
@@ -381,7 +381,7 @@
def _get_dist(self, requirement, ws, always_unzip):
- __doing__ = 'Getting distribution for %s.', str(requirement)
+ __doing__ = 'Getting distribution for %r.', str(requirement)
# Maybe an existing dist is already the best dist that satisfies the
# requirement
@@ -389,8 +389,7 @@
if dist is None:
if self._dest is not None:
- logger.info("Getting new distribution for %r",
- str(requirement))
+ logger.info(*__doing__)
# Retrieve the dist:
if avail is None:
@@ -464,7 +463,7 @@
self._env.scan([self._dest])
dist = self._env.best_match(requirement, ws)
- logger.info("Got %s", dist)
+ logger.info("Got %s.", dist)
else:
dists = [dist]
@@ -569,9 +568,9 @@
[requirement] = err
requirement = self._constrain(requirement)
if dest:
- logger.debug('Getting required %r.', str(requirement))
+ logger.debug('Getting required %r', str(requirement))
else:
- logger.debug('Adding required %r.', str(requirement))
+ logger.debug('Adding required %r', str(requirement))
_log_requirement(ws, requirement)
for dist in self._get_dist(requirement, ws, self._always_unzip
@@ -597,8 +596,8 @@
# Retrieve the dist:
if avail is None:
raise zc.buildout.UserError(
- "Couldn't find a source distribution for %s."
- % requirement)
+ "Couldn't find a source distribution for %r."
+ % str(requirement))
logger.debug('Building %r', spec)
@@ -970,7 +969,7 @@
]
for dist in self.ws:
if req in dist.requires():
- result.append("but %s requires %s." % (dist, req))
+ result.append("but %s requires %r." % (dist, str(req)))
return '\n'.join(result)
class MissingDistribution(zc.buildout.UserError):
@@ -982,7 +981,7 @@
def __str__(self):
req, ws = self.data
- return "Couldn't find a distribution for %s." % req
+ return "Couldn't find a distribution for %r." % str(req)
def _log_requirement(ws, req):
ws = list(ws)
Modified: zc.buildout/branches/jim-logging/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/branches/jim-logging/src/zc/buildout/easy_install.txt 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/src/zc/buildout/easy_install.txt 2007-05-30 19:31:43 UTC (rev 76006)
@@ -249,7 +249,7 @@
zc.buildout.easy_install DEBUG
Picked: demo = 0.3
zc.buildout.easy_install DEBUG
- Getting required 'demoneeded'.
+ Getting required 'demoneeded'
zc.buildout.easy_install DEBUG
required by demo 0.3.
zc.buildout.easy_install DEBUG
Modified: zc.buildout/branches/jim-logging/src/zc/buildout/repeatable.txt
===================================================================
--- zc.buildout/branches/jim-logging/src/zc/buildout/repeatable.txt 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/src/zc/buildout/repeatable.txt 2007-05-30 19:31:43 UTC (rev 76006)
@@ -40,7 +40,7 @@
>>> write('recipe', 'README', '')
>>> print system(buildout+' setup recipe bdist_egg'), # doctest: +ELLIPSIS
- Running setup script recipe/setup.py
+ Running setup script 'recipe/setup.py'.
...
>>> rmdir('recipe', 'build')
@@ -65,7 +65,7 @@
>>> print system(buildout+' setup recipe bdist_egg'), # doctest: +ELLIPSIS
- Running setup script recipe/setup.py
+ Running setup script 'recipe/setup.py'.
...
and we'll configure a buildout to use it:
@@ -83,9 +83,9 @@
If we run the buildout, it will use version 2:
>>> print system(buildout),
- Getting new distribution for spam
- Got spam 2
- Installing foo
+ Getting distribution for 'spam'.
+ Got spam 2.
+ Installing foo.
recipe v2
We can specify a versions section that lists our recipe and name it in
@@ -113,10 +113,10 @@
Now, if we run the buildout, we'll use version 1 of the spam recipe:
>>> print system(buildout),
- Getting new distribution for spam==1
- Got spam 1
- Uninstalling foo
- Installing foo
+ Getting distribution for 'spam==1'.
+ Got spam 1.
+ Uninstalling foo.
+ Installing foo.
recipe v1
Running the buildout in verbose mode will help us get information
@@ -124,17 +124,15 @@
specifying a versions section:
>>> print system(buildout+' buildout:versions= -v'), # doctest: +ELLIPSIS
- Installing 'zc.buildout', 'setuptools'
- We have a develop egg for zc.buildout
- We have the best distribution that satisfies
- setuptools
+ Installing 'zc.buildout', 'setuptools'.
+ We have a develop egg: zc.buildout 1.0.0.
+ We have the best distribution that satisfies 'setuptools'.
Picked: setuptools = 0.6
- Installing 'spam'
- We have the best distribution that satisfies
- spam
- Picked: spam = 2
- Uninstalling foo
- Installing foo
+ Installing 'spam'.
+ We have the best distribution that satisfies 'spam'.
+ Picked: spam = 2.
+ Uninstalling foo.
+ Installing foo.
recipe v2
We'll get output that includes lines that tell us what versions
@@ -148,16 +146,14 @@
If we run the buildout with the versions section:
>>> print system(buildout+' -v'), # doctest: +ELLIPSIS
- Installing 'zc.buildout', 'setuptools'
- We have a develop egg for zc.buildout
- We have the best distribution that satisfies
- setuptools
+ Installing 'zc.buildout', 'setuptools'.
+ We have a develop egg: zc.buildout 1.0.0.
+ We have the best distribution that satisfies 'setuptools'.
Picked: setuptools = 0.6
- Installing 'spam'
- We have the best distribution that satisfies
- spam==1
- Uninstalling foo
- Installing foo
+ Installing 'spam'.
+ We have the best distribution that satisfies 'spam==1'.
+ Uninstalling foo.
+ Installing foo.
recipe v1
We won't get output for the spam distribution, which we didn't pick,
Modified: zc.buildout/branches/jim-logging/src/zc/buildout/runsetup.txt
===================================================================
--- zc.buildout/branches/jim-logging/src/zc/buildout/runsetup.txt 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/src/zc/buildout/runsetup.txt 2007-05-30 19:31:43 UTC (rev 76006)
@@ -33,7 +33,7 @@
We can use the buildout command to generate the hello egg:
>>> print system(buildout +' setup hello -q bdist_egg'),
- Running setup script hello/setup.py
+ Running setup script 'hello/setup.py'.
zip_safe flag not set; analyzing archive contents...
The hello directory now has a hello egg in it's dist directory:
Modified: zc.buildout/branches/jim-logging/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/branches/jim-logging/src/zc/buildout/tests.py 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/src/zc/buildout/tests.py 2007-05-30 19:31:43 UTC (rev 76006)
@@ -45,7 +45,7 @@
... ''')
>>> print system(join('bin', 'buildout')),
- Develop: /sample-buildout/foo
+ Develop: '/sample-buildout/foo'
>>> ls('develop-eggs')
- foo.egg-link
@@ -72,8 +72,8 @@
... ''')
>>> print system(join('bin', 'buildout')+' -vv'), # doctest: +ELLIPSIS
- zc.buildout...
- Develop: /sample-buildout/foo
+ Installing...
+ Develop: '/sample-buildout/foo'
...
Installed /sample-buildout/foo
...
@@ -119,13 +119,13 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
... # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
While:
- Initializing
- Getting section buildout
- Initializing section buildout
- Getting option buildout:y
- Getting option buildout:z
- Getting option buildout:x
- Getting option buildout:y
+ Initializing.
+ Getting section buildout.
+ Initializing section buildout.
+ Getting option buildout:y.
+ Getting option buildout:z.
+ Getting option buildout:x.
+ Getting option buildout:y.
Error: Circular reference in substitutions.
It is an error to use funny characters in variable refereces:
@@ -140,10 +140,10 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
While:
- Initializing
- Getting section buildout
- Initializing section buildout
- Getting option buildout:x
+ Initializing.
+ Getting section buildout.
+ Initializing section buildout.
+ Getting option buildout:x.
Error: The section name in substitution, ${bui$ldout:y},
has invalid characters.
@@ -157,10 +157,10 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
While:
- Initializing
- Getting section buildout
- Initializing section buildout
- Getting option buildout:x
+ Initializing.
+ Getting section buildout.
+ Initializing section buildout.
+ Getting option buildout:x.
Error: The option name in substitution, ${buildout:y{z},
has invalid characters.
@@ -176,10 +176,10 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
While:
- Initializing
- Getting section buildout
- Initializing section buildout
- Getting option buildout:x
+ Initializing.
+ Getting section buildout.
+ Initializing section buildout.
+ Getting option buildout:x.
Error: The substitution, ${parts},
doesn't contain a colon.
@@ -193,10 +193,10 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
While:
- Initializing
- Getting section buildout
- Initializing section buildout
- Getting option buildout:x
+ Initializing.
+ Getting section buildout.
+ Initializing section buildout.
+ Getting option buildout:x.
Error: The substitution, ${buildout:y:z},
has too many colons.
@@ -210,8 +210,8 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
While:
- Installing
- Getting section x
+ Installing.
+ Getting section x.
Error: The referenced section, 'x', was not defined.
and all parts have to have a specified recipe:
@@ -228,7 +228,7 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout')),
While:
- Installing
+ Installing.
Error: Missing option: x:recipe
"""
@@ -276,16 +276,16 @@
... ''' % globals())
>>> print system(buildout),
- Develop: /sample-buildout/sampley
- Develop: /sample-buildout/samplez
- Installing eggs
- Getting new distribution for demoneeded==1.1
- Got demoneeded 1.1
+ Develop: '/sample-buildout/sampley'
+ Develop: '/sample-buildout/samplez'
+ Installing eggs.
+ Getting distribution for 'demoneeded==1.1'.
+ Got demoneeded 1.1.
While:
- Installing eggs
+ Installing eggs.
Error: There is a version conflict.
We already have: demoneeded 1.1
- but sampley 1 requires demoneeded==1.0.
+ but sampley 1 requires 'demoneeded==1.0'.
Here, we see that sampley required an older version of demoneeded.
What if we hadn't required sampley ourselves:
@@ -306,19 +306,37 @@
... samplez
... ''' % globals())
- >>> print system(buildout),
- Develop: /sample-buildout/sampley
- Develop: /sample-buildout/samplez
- Develop: /sample-buildout/samplea
- Develop: /sample-buildout/sampleb
- Installing eggs
+If we use the verbose switch, we can see where requirements are comning from:
+
+ >>> print system(buildout+' -v'),
+ Installing 'zc.buildout', 'setuptools'.
+ We have a develop egg: zc.buildout 1.0.0
+ We have the best distribution that satisfies 'setuptools'.
+ Picked: setuptools = 0.6
+ Develop: '/sample-buildout/sampley'
+ Develop: '/sample-buildout/samplez'
+ Develop: '/sample-buildout/samplea'
+ Develop: '/sample-buildout/sampleb'
+ Installing 'zc.recipe.egg'.
+ We have a develop egg: zc.recipe.egg 1.0.0
+ Installing eggs.
+ Installing 'samplea', 'samplez'.
+ We have a develop egg: samplea 1
+ We have a develop egg: samplez 1
+ Getting required 'demoneeded==1.1'
+ required by samplez 1.
+ We have the best distribution that satisfies 'demoneeded==1.1'.
+ Getting required 'sampleb'
+ required by samplea 1.
+ We have a develop egg: sampleb 1
+ Getting required 'sampley'
+ required by sampleb 1.
+ We have a develop egg: sampley 1
While:
- Installing eggs
+ Installing eggs.
Error: There is a version conflict.
We already have: demoneeded 1.1
- but sampley 1 requires demoneeded==1.0.
- sampley 1 is required by sampleb 1.
- sampleb 1 is required by samplea 1.
+ but sampley 1 requires 'demoneeded==1.0'.
"""
def show_who_requires_missing_distributions():
@@ -345,20 +363,16 @@
... ''')
>>> print system(buildout),
- Develop: /sample-buildout/sampley
- Develop: /sample-buildout/samplea
- Develop: /sample-buildout/sampleb
- Installing eggs
+ Develop: '/sample-buildout/sampley'
+ Develop: '/sample-buildout/samplea'
+ Develop: '/sample-buildout/sampleb'
+ Installing eggs.
Couldn't find index page for 'demoneeded' (maybe misspelled?)
- Getting new distribution for demoneeded
+ Getting distribution for 'demoneeded'.
While:
- Installing eggs
- Getting distribution for demoneeded
- Error: Couldn't find a distribution for demoneeded.
- demoneeded is required by sampley 1.
- sampley 1 is required by sampleb 1.
- sampleb 1 is required by samplea 1.
-
+ Installing eggs.
+ Getting distribution for 'demoneeded'.
+ Error: Couldn't find a distribution for 'demoneeded'.
"""
@@ -426,15 +440,15 @@
>>> buildout = os.path.join(sample_buildout, 'bin', 'buildout')
>>> print system(buildout),
- Develop: /sample-buildout/recipes
- Installing debug
+ Develop: '/sample-buildout/recipes'
+ Installing debug.
If we run the buildout again, we shoudn't get a message about
uninstalling anything because the configuration hasn't changed.
>>> print system(buildout),
- Develop: /sample-buildout/recipes
- Updating debug
+ Develop: '/sample-buildout/recipes'
+ Updating debug.
"""
def finding_eggs_as_local_directories():
@@ -507,7 +521,7 @@
... ''')
>>> print system(join('bin', 'buildout')),
- Develop: /sample-buildout/demo
+ Develop: '/sample-buildout/demo'
>>> import zc.buildout.easy_install
>>> ws = zc.buildout.easy_install.working_set(
@@ -535,8 +549,8 @@
... x = ${foo:bar}
... ''')
- >>> print system(buildout + ' foo:bar=1 -vD'), # doctest: +ELLIPSIS
- Installing ['zc.buildout', 'setuptools']
+ >>> print system(buildout + ' foo:bar=1 -vv'), # doctest: +ELLIPSIS
+ Installing 'zc.buildout', 'setuptools'.
...
[foo]
bar = 1
@@ -551,11 +565,11 @@
## listed in the configuration.
## >>> print system(join('bin', 'buildout') + ' install foo'),
-## buildout: Invalid install parts: foo.
+## Invalid install parts: foo.
## Install parts must be listed in the configuration.
## >>> print system(join('bin', 'buildout') + ' install foo bar'),
-## buildout: Invalid install parts: foo bar.
+## Invalid install parts: foo bar.
## Install parts must be listed in the configuration.
## """
@@ -671,11 +685,11 @@
>>> os.chdir(d)
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout')
... + ' bootstrap'),
- Creating directory /sample-bootstrap/bin
- Creating directory /sample-bootstrap/parts
- Creating directory /sample-bootstrap/eggs
- Creating directory /sample-bootstrap/develop-eggs
- Generated script /sample-bootstrap/bin/buildout.
+ Creating directory '/sample-bootstrap/bin'.
+ Creating directory '/sample-bootstrap/parts'.
+ Creating directory '/sample-bootstrap/eggs'.
+ Creating directory '/sample-bootstrap/develop-eggs'.
+ Generated script '/sample-bootstrap/bin/buildout'.
>>> print system(os.path.join('bin', 'buildout')),
Unused options for buildout: 'scripts' 'eggs'
@@ -702,7 +716,7 @@
... """)
>>> print system(join('bin', 'buildout')),
- Develop: /sample-buildout/foo
+ Develop: '/sample-buildout/foo'
>>> ls('develop-eggs')
- foox.egg-link
@@ -724,8 +738,8 @@
... """)
>>> print system(join('bin', 'buildout')),
- Develop: /sample-buildout/foo
- Develop: /sample-buildout/bar
+ Develop: '/sample-buildout/foo'
+ Develop: '/sample-buildout/bar'
>>> ls('develop-eggs')
- foox.egg-link
@@ -741,7 +755,7 @@
... parts =
... """)
>>> print system(join('bin', 'buildout')),
- Develop: /sample-buildout/bar
+ Develop: '/sample-buildout/bar'
It is gone
@@ -802,15 +816,15 @@
... """)
>>> print system(join('bin', 'buildout')),
- Develop: /sample-buildout/foo
+ Develop: '/sample-buildout/foo'
Now, if we generate a working set using the egg link, we will get a warning
and we will get setuptools included in the working set.
>>> import logging, zope.testing.loggingsupport
>>> handler = zope.testing.loggingsupport.InstalledHandler(
- ... 'zc.buildout', level=logging.WARNING)
- >>> logging.getLogger('zc').propagate = False
+ ... 'zc.buildout.easy_install', level=logging.WARNING)
+ >>> logging.getLogger('zc.buildout.easy_install').propagate = False
>>> [dist.project_name
... for dist in zc.buildout.easy_install.working_set(
@@ -822,7 +836,7 @@
>>> print handler
zc.buildout.easy_install WARNING
- Develop distribution for foox 0.0.0
+ Develop distribution: foox 0.0.0
uses namespace packages but the distribution does not require setuptools.
>>> handler.clear()
@@ -873,8 +887,8 @@
... """)
>>> print system(join('bin', 'buildout')),
- Develop: /sample-buildout/foo
- Develop: /sample-buildout/bar
+ Develop: '/sample-buildout/foo'
+ Develop: '/sample-buildout/bar'
>>> [dist.project_name
... for dist in zc.buildout.easy_install.working_set(
@@ -886,11 +900,11 @@
>>> print handler,
zc.buildout.easy_install WARNING
- Develop distribution for foox 0.0.0
+ Develop distribution: foox 0.0.0
uses namespace packages but the distribution does not require setuptools.
- >>> logging.getLogger('zc').propagate = True
+ >>> logging.getLogger('zc.buildout.easy_install').propagate = True
>>> handler.uninstall()
'''
@@ -974,8 +988,8 @@
... ''')
>>> print system(join('bin', 'buildout')),
- Develop: /sample-buildout/recipes
- Installing demo
+ Develop: '/sample-buildout/recipes'
+ Installing demo.
installing
@@ -989,11 +1003,11 @@
... ''')
>>> print system(join('bin', 'buildout')),
- Develop: /sample-buildout/recipes
- Uninstalling demo
- Running uninstall recipe
+ Develop: '/sample-buildout/recipes'
+ Uninstalling demo.
+ Running uninstall recipe.
uninstalling
- Installing demo
+ Installing demo.
installing
@@ -1004,9 +1018,9 @@
... ''')
>>> print system(join('bin', 'buildout')),
- Develop: /sample-buildout/recipes
- Uninstalling demo
- Running uninstall recipe
+ Develop: '/sample-buildout/recipes'
+ Uninstalling demo.
+ Running uninstall recipe.
uninstalling
"""
@@ -1082,21 +1096,21 @@
>>> print system(join(sample_buildout, 'bin', 'buildout')),
- Develop: /sample-buildout/recipe
- Installing foo
+ Develop: '/sample-buildout/recipe'
+ Installing foo.
>>> mkdir('recipe', '.svn')
>>> mkdir('recipe', 'CVS')
>>> print system(join(sample_buildout, 'bin', 'buildout')),
- Develop: /sample-buildout/recipe
- Updating foo
+ Develop: '/sample-buildout/recipe'
+ Updating foo.
>>> write('recipe', '.svn', 'x', '1')
>>> write('recipe', 'CVS', 'x', '1')
>>> print system(join(sample_buildout, 'bin', 'buildout')),
- Develop: /sample-buildout/recipe
- Updating foo
+ Develop: '/sample-buildout/recipe'
+ Updating foo.
"""
@@ -1139,7 +1153,7 @@
>>> write('recipe', 'README', '')
>>> print system(buildout+' setup recipe bdist_egg'), # doctest: +ELLIPSIS
- Running setup script recipe/setup.py
+ Running setup script 'recipe/setup.py'.
...
>>> rmdir('recipe', 'build')
@@ -1157,9 +1171,9 @@
... ''' % join('recipe', 'dist'))
>>> print system(buildout),
- Getting new distribution for recipe
- Got recipe 1
- Installing foo
+ Getting distribution for 'recipe'.
+ Got recipe 1.
+ Installing foo.
recipe v1
Now, if we update the recipe egg:
@@ -1184,28 +1198,28 @@
>>> print system(buildout+' setup recipe bdist_egg'), # doctest: +ELLIPSIS
- Running setup script recipe/setup.py
+ Running setup script 'recipe/setup.py'.
...
We won't get the update if we specify -N:
>>> print system(buildout+' -N'),
- Updating foo
+ Updating foo.
recipe v1
or if we use -o:
>>> print system(buildout+' -o'),
- Updating foo
+ Updating foo.
recipe v1
But we will if we use neither of these:
>>> print system(buildout),
- Getting new distribution for recipe
- Got recipe 2
- Uninstalling foo
- Installing foo
+ Getting distribution for 'recipe'.
+ Got recipe 2.
+ Uninstalling foo.
+ Installing foo.
recipe v2
We can also select a particular recipe version:
@@ -1221,8 +1235,8 @@
... ''' % join('recipe', 'dist'))
>>> print system(buildout),
- Uninstalling foo
- Installing foo
+ Uninstalling foo.
+ Installing foo.
recipe v1
"""
@@ -1270,12 +1284,12 @@
... ''')
>>> print system(buildout),
- Develop: /tmp/tmpbHOHnU/_TEST_/sample-buildout/recipe
- Installing foo
+ Develop: '/tmp/tmpbHOHnU/_TEST_/sample-buildout/recipe'
+ Installing foo.
>>> print system(buildout),
- Develop: /tmp/tmpbHOHnU/_TEST_/sample-buildout/recipe
- Updating foo
+ Develop: '/tmp/tmpbHOHnU/_TEST_/sample-buildout/recipe'
+ Updating foo.
>>> cat('.installed.cfg') # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
[buildout]
@@ -1307,9 +1321,9 @@
>>> print handler # doctest: +ELLIPSIS
zc.buildout.easy_install DEBUG
- Installing ['demo==0.2']
+ Installing 'demo==0.2'.
zc.buildout.easy_install DEBUG
- We have no distributions for demo that satisfies demo==0.2.
+ We have no distributions for demo that satisfies 'demo==0.2'.
...
>>> handler.uninstall()
@@ -1352,11 +1366,11 @@
... ''')
>>> print system(buildout),
- Develop: /sample-buildout/recipes
+ Develop: '/sample-buildout/recipes'
While:
- Installing
- Getting section data-dir
- Initializing part data-dir
+ Installing.
+ Getting section data-dir.
+ Initializing part data-dir.
<BLANKLINE>
An internal error occured due to a bug in either zc.buildout or in a
recipe being used:
@@ -1376,9 +1390,9 @@
>>> print system(buildout), # doctest: +ELLIPSIS
While:
- Installing
- Checking for upgrades
- Getting distribution for setuptools
+ Installing.
+ Checking for upgrades.
+ Getting distribution for 'setuptools'.
Error: Download error...
"""
@@ -1421,10 +1435,10 @@
... """)
>>> print system(buildout),
- Develop: /tmp/tmpsueWpG/_TEST_/sample-buildout/.
- Unused options for buildout: 'a'
- Installing foo
- Unused options for foo: 'z'
+ Develop: '/tmp/tmpsueWpG/_TEST_/sample-buildout/.'
+ Unused options for buildout: 'a'.
+ Installing foo.
+ Unused options for foo: 'z'.
'''
def abnormal_exit():
@@ -1489,21 +1503,21 @@
... ''')
>>> print system(buildout),
- Develop: /sample-buildout/recipes
- Installing p1
- Installing p2
- Installing p3
+ Develop: '/sample-buildout/recipes'
+ Installing p1.
+ Installing p2.
+ Installing p3.
>>> print system(buildout),
- Develop: /sample-buildout/recipes
- Updating p1
- Updating p2
- Installing p3
+ Develop: '/sample-buildout/recipes'
+ Updating p1.
+ Updating p2.
+ Installing p3.
>>> print system(buildout+' buildout:parts='),
- Develop: /sample-buildout/recipes
- Uninstalling p2
- Uninstalling p1
+ Develop: '/sample-buildout/recipes'
+ Uninstalling p2.
+ Uninstalling p1.
2. We exit while updating:
@@ -1527,24 +1541,24 @@
... ''')
>>> print system(buildout),
- Develop: /sample-buildout/recipes
- Installing p1
- Installing p2
- Installing p3
- Installing p4
+ Develop: '/sample-buildout/recipes'
+ Installing p1.
+ Installing p2.
+ Installing p3.
+ Installing p4.
>>> print system(buildout),
- Develop: /sample-buildout/recipes
- Updating p1
- Updating p2
- Updating p3
+ Develop: '/sample-buildout/recipes'
+ Updating p1.
+ Updating p2.
+ Updating p3.
>>> print system(buildout+' buildout:parts='),
- Develop: /sample-buildout/recipes
- Uninstalling p2
- Uninstalling p1
- Uninstalling p4
- Uninstalling p3
+ Develop: '/sample-buildout/recipes'
+ Uninstalling p2.
+ Uninstalling p1.
+ Uninstalling p4.
+ Uninstalling p3.
3. We exit while installing or updating after uninstalling:
@@ -1568,11 +1582,11 @@
... ''')
>>> print system(buildout),
- Develop: /sample-buildout/recipes
- Installing p1
- Installing p2
- Installing p3
- Installing p4
+ Develop: '/sample-buildout/recipes'
+ Installing p1.
+ Installing p2.
+ Installing p3.
+ Installing p4.
>>> write('buildout.cfg',
... '''
@@ -1595,9 +1609,9 @@
... ''')
>>> print system(buildout),
- Develop: /sample-buildout/recipes
- Uninstalling p4
- Updating p1
+ Develop: '/sample-buildout/recipes'
+ Uninstalling p4.
+ Updating p1.
>>> write('buildout.cfg',
... '''
@@ -1619,12 +1633,12 @@
... ''')
>>> print system(buildout),
- Develop: /sample-buildout/recipes
- Uninstalling p1
- Installing p1
- Updating p2
- Updating p3
- Installing p4
+ Develop: '/sample-buildout/recipes'
+ Uninstalling p1.
+ Installing p1.
+ Updating p2.
+ Updating p3.
+ Installing p4.
"""
@@ -1652,7 +1666,7 @@
... ''')
>>> print system(buildout+' setup badegg sdist'), # doctest: +ELLIPSIS
- Running setup script badegg/setup.py
+ Running setup script 'badegg/setup.py'.
...
>>> dist = join('badegg', 'dist')
@@ -1673,18 +1687,18 @@
... scripts = buildout=bo
... ''' % globals())
- >>> print system('buildout'),
- Not upgrading because not running a local buildout command
- Installing eggs
- Getting new distribution for badegg
+ >>> print system(buildout),
+ Installing eggs.
+ Getting distribution for 'badegg'.
File "build/bdist.linux-i686/egg/badegg/scripts/one.py", line 2
return 1
SyntaxError: 'return' outside function
File "/sample-buildout/eggs/badegg-1-py2.4.egg/badegg/scripts/one.py", line 2
return 1
SyntaxError: 'return' outside function
- Got badegg 1
- Installing bo
+ Got badegg 1.
+ Installing bo.
+ Generated script '/sample-buildout/bin/bo'.
>>> ls('eggs') # doctest: +ELLIPSIS
d badegg-1-py2.4.egg
@@ -1738,12 +1752,12 @@
... ''' % globals())
>>> print system(buildout),
- Installing x
- Getting new distribution for demo
- Got demo 0.3
- Getting new distribution for demoneeded
- Got demoneeded 1.1
- Generated script /sample-buildout/bin/demo.
+ Installing x.
+ Getting distribution for 'demo'.
+ Got demo 0.3.
+ Getting distribution for 'demoneeded'.
+ Got demoneeded 1.1.
+ Generated script '/sample-buildout/bin/demo'.
>>> print system(join('bin', 'demo')),
3 1
@@ -1760,11 +1774,11 @@
... ''' % globals())
>>> print system(buildout),
- Uninstalling x
- Installing x
- Getting new distribution for demo==0.1
- Got demo 0.1
- Generated script /sample-buildout/bin/demo.
+ Uninstalling x.
+ Installing x.
+ Getting distribution for 'demo==0.1'.
+ Got demo 0.1.
+ Generated script '/sample-buildout/bin/demo'.
>>> print system(join('bin', 'demo')),
1 1
@@ -1793,8 +1807,8 @@
>>> call(buildout)
While:
- Installing
- Getting section x
+ Installing.
+ Getting section x.
Error: The referenced section, 'x', was not defined.
<BLANKLINE>
Exit: True
@@ -1822,12 +1836,12 @@
... ''')
>>> call(buildout)
- buildout: Develop: /sample-buildout/.
+ Develop: '/sample-buildout/.'
While:
- Installing
- Getting section x
- Initializing section x
- Loading zc.buildout recipe entry zc.buildout.testexit:default
+ Installing.
+ Getting section x.
+ Initializing section x.
+ Loading zc.buildout recipe entry zc.buildout.testexit:default.
<BLANKLINE>
An internal error occured due to a bug in either zc.buildout or in a
recipe being used:
@@ -1878,13 +1892,13 @@
>>> os.chdir('bad_start')
>>> print system(join(sample_buildout, 'bin', 'buildout')
... +' -c '+join(sample_buildout, 'buildout.cfg')),
- Develop: /tmp/tmpV9ptXUbuildoutSetUp/_TEST_/sample-buildout/.
+ Develop: '/tmp/tmpV9ptXUbuildoutSetUp/_TEST_/sample-buildout/.'
/sample-buildout
/sample-buildout
- Installing b1
+ Installing b1.
/sample-buildout
/sample-buildout/bad_start
- Installing b2
+ Installing b2.
/sample-buildout
/sample-buildout/bad_start
@@ -1920,7 +1934,7 @@
>>> remove('buildout.cfg')
>>> print system(buildout),
While:
- Initializing
+ Initializing.
Error: Couldn't open /sample-buildout/buildout.cfg
@@ -1960,24 +1974,63 @@
... ''')
>>> print system(buildout),
- Develop: /sample-buildout/pack0
- Develop: /sample-buildout/pack1
- Develop: /sample-buildout/pack2
- Develop: /sample-buildout/pack3
- Develop: /sample-buildout/pack4
- Installing pack1
+ Develop: '/sample-buildout/pack0'
+ Develop: '/sample-buildout/pack1'
+ Develop: '/sample-buildout/pack2'
+ Develop: '/sample-buildout/pack3'
+ Develop: '/sample-buildout/pack4'
+ Installing pack1.
Couldn't find index page for 'pack5' (maybe misspelled?)
- Getting new distribution for pack5
+ Getting distribution for 'pack5'.
While:
- Installing pack1
- Getting distribution for pack5
- Error: Couldn't find a distribution for pack5.
+ Installing pack1.
+ Getting distribution for 'pack5'.
+ Error: Couldn't find a distribution for 'pack5'.
However, if we run in verbose mode, we can see why packages were included:
>>> print system(buildout+' -v'),
-
-
+ Installing 'zc.buildout', 'setuptools'.
+ We have a develop egg: zc.buildout 1.0.0
+ We have the best distribution that satisfies 'setuptools'.
+ Picked: setuptools = 0.6
+ Develop: '/sample-buildout/pack0'
+ Develop: '/sample-buildout/pack1'
+ Develop: '/sample-buildout/pack2'
+ Develop: '/sample-buildout/pack3'
+ Develop: '/sample-buildout/pack4'
+ Installing 'zc.recipe.egg'.
+ We have a develop egg: zc.recipe.egg 1.0.0
+ Installing pack1.
+ Installing 'pack0'.
+ We have a develop egg: pack0 0.0.0
+ Getting required 'pack4'
+ required by pack0 0.0.0.
+ We have a develop egg: pack4 0.0.0
+ Getting required 'pack3'
+ required by pack0 0.0.0.
+ required by pack4 0.0.0.
+ We have a develop egg: pack3 0.0.0
+ Getting required 'pack2'
+ required by pack0 0.0.0.
+ required by pack3 0.0.0.
+ required by pack4 0.0.0.
+ We have a develop egg: pack2 0.0.0
+ Getting required 'pack1'
+ required by pack0 0.0.0.
+ required by pack2 0.0.0.
+ required by pack3 0.0.0.
+ required by pack4 0.0.0.
+ We have a develop egg: pack1 0.0.0
+ Getting required 'pack5'
+ required by pack4 0.0.0.
+ We have no distributions for pack5 that satisfies 'pack5'.
+ Couldn't find index page for 'pack5' (maybe misspelled?)
+ Getting distribution for 'pack5'.
+ While:
+ Installing pack1.
+ Getting distribution for 'pack5'.
+ Error: Couldn't find a distribution for 'pack5'.
"""
@@ -2250,6 +2303,11 @@
'zc.buildout.egg'),
(re.compile('File "\S+one.py"'),
'File "one.py"'),
+ (re.compile(r'We have a develop egg: (\S+) (\S+)'),
+ r'We have a develop egg: \1 V'),
+ (re.compile('Picked: setuptools = \S+'),
+ 'Picked: setuptools = V'),
+
]),
),
))
Modified: zc.buildout/branches/jim-logging/src/zc/buildout/update.txt
===================================================================
--- zc.buildout/branches/jim-logging/src/zc/buildout/update.txt 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/src/zc/buildout/update.txt 2007-05-30 19:31:43 UTC (rev 76006)
@@ -64,17 +64,17 @@
new versions found in new releases:
>>> print system(buildout),
- Getting new distribution for zc.buildout
- Got zc.buildout 99.99
- Getting new distribution for setuptools
- Got setuptools 99.99
+ Getting distribution for 'zc.buildout'.
+ Got zc.buildout 99.99.
+ Getting distribution for 'setuptools'.
+ Got setuptools 99.99.
Upgraded:
zc.buildout version 99.99,
setuptools version 99.99;
restarting.
- Generated script /sample-buildout/bin/buildout.
- Develop: /sample-buildout/showversions
- Installing show-versions
+ Generated script '/sample-buildout/bin/buildout'.
+ Develop: '/sample-buildout/showversions'
+ Installing show-versions.
zc.buildout 99.99
setuptools 99.99
@@ -121,9 +121,9 @@
zc.buildout version 1.0.0,
setuptools version 0.6;
restarting.
- Generated script /sample-buildout/bin/buildout.
- Develop: /sample-buildout/showversions
- Updating show-versions
+ Generated script '/sample-buildout/bin/buildout'.
+ Develop: '/sample-buildout/showversions'
+ Updating show-versions.
zc.buildout 1.0.0
setuptools 0.6
@@ -142,16 +142,16 @@
... """ % dict(new_releases=new_releases))
>>> print system(buildout+' -o'),
- Develop: /sample-buildout/showversions
- Updating show-versions
+ Develop: '/sample-buildout/showversions'
+ Updating show-versions.
zc.buildout 1.0.0
setuptools 0.6
Or in non-newest mode:
>>> print system(buildout+' -N'),
- Develop: /sample-buildout/showversions
- Updating show-versions
+ Develop: '/sample-buildout/showversions'
+ Updating show-versions.
zc.buildout 1.0.0
setuptools 0.6
@@ -170,14 +170,14 @@
>>> cd(sample_buildout2)
>>> print system(buildout),
- Creating directory /sample_buildout2/bin
- Creating directory /sample_buildout2/parts
- Creating directory /sample_buildout2/eggs
- Creating directory /sample_buildout2/develop-eggs
- Getting new distribution for zc.buildout
- Got zc.buildout 99.99
- Getting new distribution for setuptools
- Got setuptools 99.99
- Not upgrading because not running a local buildout command
+ Creating directory '/sample_buildout2/bin'.
+ Creating directory '/sample_buildout2/parts'.
+ Creating directory '/sample_buildout2/eggs'.
+ Creating directory '/sample_buildout2/develop-eggs'.
+ Getting distribution for 'zc.buildout'.
+ Got zc.buildout 99.99.
+ Getting distribution for 'setuptools'.
+ Got setuptools 99.99.
+ Not upgrading because not running a local buildout command.
>>> ls('bin')
Modified: zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/README.txt
===================================================================
--- zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/README.txt 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/README.txt 2007-05-30 19:31:43 UTC (rev 76006)
@@ -65,11 +65,11 @@
>>> import os
>>> print system(buildout),
- buildout: Installing demo
- zc.buildout.easy_install: Getting new distribution for demo<0.3
- zc.buildout.easy_install: Got demo 0.2
- zc.buildout.easy_install: Getting new distribution for demoneeded
- zc.buildout.easy_install: Got demoneeded 1.1
+ Installing demo.
+ Getting distribution for 'demo<0.3'.
+ Got demo 0.2.
+ Getting distribution for 'demoneeded'.
+ Got demoneeded 1.1.
Now, if we look at the buildout eggs directory:
@@ -109,9 +109,9 @@
... """ % dict(server=link_server))
>>> print system(buildout),
- buildout: Uninstalling demo
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
+ Uninstalling demo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/demo'.
Now we also see the script defined by the dmo script:
@@ -171,10 +171,10 @@
the default entry point for the zc.recipe.egg egg.
>>> print system(buildout),
- buildout: Uninstalling demo
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
- zc.buildout.easy_install: Generated interpreter /sample-buildout/bin/py-demo.
+ Uninstalling demo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/demo'.
+ Generated interpreter '/sample-buildout/bin/py-demo'.
Now we also get a py-demo script for giving us a Python prompt with
the path for demo and any eggs it depends on included in sys.path.
@@ -229,9 +229,9 @@
and run the buildout in non-newest mode:
>>> print system(buildout+' -N'),
- buildout: Uninstalling demo
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
+ Uninstalling demo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/demo'.
Note that we removed the eggs option, and the eggs defaulted to the
part name. Because we removed the eggs option, the demo was
@@ -240,8 +240,7 @@
We'll also run the buildout in off-line mode:
>>> print system(buildout+' -o'),
- buildout: Updating demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
+ Updating demo.
We didn't get an update for demo:
@@ -255,10 +254,10 @@
we'll get an update for demo:
>>> print system(buildout),
- buildout: Updating demo
- zc.buildout.easy_install: Getting new distribution for demo
- zc.buildout.easy_install: Got demo 0.3
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
+ Updating demo.
+ Getting distribution for 'demo'.
+ Got demo 0.3.
+ Generated script '/sample-buildout/bin/demo'.
Then we'll get a new demo egg:
@@ -295,8 +294,8 @@
>>> print system(buildout),
- buildout: Uninstalling demo
- buildout: Installing demo
+ Uninstalling demo.
+ Installing demo.
>>> ls(sample_buildout, 'bin')
- buildout
@@ -316,9 +315,9 @@
... """ % dict(server=link_server))
>>> print system(buildout),
- buildout: Uninstalling demo
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
+ Uninstalling demo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/foo'.
>>> ls(sample_buildout, 'bin')
- buildout
@@ -346,9 +345,9 @@
... """ % dict(server=link_server))
>>> print system(buildout),
- buildout: Uninstalling demo
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
+ Uninstalling demo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/foo'.
Let's look at the script that was generated:
@@ -395,9 +394,9 @@
... """ % dict(server=link_server))
>>> print system(buildout),
- buildout: Uninstalling demo
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
+ Uninstalling demo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/foo'.
>>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
#!/usr/local/bin/python2.4
@@ -445,11 +444,11 @@
... """ % dict(server=link_server))
>>> print system(buildout),
- buildout: Uninstalling demo
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
- zc.buildout.easy_install: Generated script /sample-buildout/bin/alt.
- zc.buildout.easy_install: Generated script /sample-buildout/bin/other.
+ Uninstalling demo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/demo'.
+ Generated script '/sample-buildout/bin/alt'.
+ Generated script '/sample-buildout/bin/other'.
>>> ls(sample_buildout, 'bin')
- alt
@@ -492,6 +491,6 @@
... """ % dict(server=link_server))
>>> print system(buildout),
- buildout: Uninstalling demo
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
+ Uninstalling demo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/foo'.
Modified: zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/custom.txt
===================================================================
--- zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/custom.txt 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/custom.txt 2007-05-30 19:31:43 UTC (rev 76006)
@@ -133,7 +133,7 @@
... """ % dict(server=link_server))
>>> print system(buildout),
- buildout: Installing extdemo
+ Installing extdemo.
zip_safe flag not set; analyzing archive contents...
We got the zip_safe warning because the source distribution we used
@@ -189,10 +189,10 @@
... """ % dict(server=link_server))
>>> print system(buildout),
- buildout: Develop: /sample-buildout/demo
- buildout: Updating extdemo
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
+ Develop: '/sample-buildout/demo'
+ Updating extdemo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/demo'.
When we run the script, we'll 42 printed:
@@ -212,16 +212,14 @@
If we run the buildout in non-newest or offline modes:
>>> print system(buildout+' -N'),
- buildout: Develop: /sample-buildout/demo
- buildout: Updating extdemo
- buildout: Updating demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
+ Develop: '/sample-buildout/demo'
+ Updating extdemo.
+ Updating demo.
>>> print system(buildout+' -o'),
- buildout: Develop: /sample-buildout/demo
- buildout: Updating extdemo
- buildout: Updating demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
+ Develop: '/sample-buildout/demo'
+ Updating extdemo.
+ Updating demo.
We won't get an update.
@@ -234,11 +232,11 @@
will:
>>> print system(buildout),
- buildout: Develop: /sample-buildout/demo
- buildout: Updating extdemo
+ Develop: '/sample-buildout/demo'
+ Updating extdemo.
zip_safe flag not set; analyzing archive contents...
- buildout: Updating demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
+ Updating demo.
+ Generated script '/sample-buildout/bin/demo'.
>>> ls(sample_buildout, 'develop-eggs')
- demo.egg-link
@@ -272,13 +270,13 @@
... """ % dict(server=link_server))
>>> print system(buildout+' -D'),
- buildout: Develop: /sample-buildout/demo
- buildout: Uninstalling demo
- buildout: Uninstalling extdemo
- buildout: Installing extdemo
+ Develop: '/sample-buildout/demo'
+ Uninstalling demo.
+ Uninstalling extdemo.
+ Installing extdemo.
zip_safe flag not set; analyzing archive contents...
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/demo'.
>>> ls(sample_buildout, 'develop-eggs')
- demo.egg-link
@@ -383,12 +381,12 @@
set with a value of 2.
>>> print system(buildout),
- buildout: Develop: /sample-buildout/demo
- buildout: Uninstalling demo
- buildout: Uninstalling extdemo
- buildout: Installing extdemo
- buildout: Installing demo
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
+ Develop: '/sample-buildout/demo'
+ Uninstalling demo.
+ Uninstalling extdemo.
+ Installing extdemo.
+ Installing demo.
+ Generated script '/sample-buildout/bin/demo'.
Our develop-eggs now includes an egg link for extdemo:
Modified: zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
===================================================================
--- zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt 2007-05-30 19:29:54 UTC (rev 76005)
+++ zc.buildout/branches/jim-logging/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt 2007-05-30 19:31:43 UTC (rev 76006)
@@ -48,15 +48,15 @@
>>> os.chdir(sample_buildout)
>>> buildout = os.path.join(sample_buildout, 'bin', 'buildout')
>>> print system(buildout),
- buildout: Installing demo
- zc.buildout.easy_install: Getting new distribution for demo<0.3
- zc.buildout.easy_install: Got demo 0.2
- zc.buildout.easy_install: Getting new distribution for demoneeded
- zc.buildout.easy_install: Getting new distribution for setuptools
- zc.buildout.easy_install: Got setuptools 0.6
- zc.buildout.easy_install: Got demoneeded 1.1
- zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
- zc.buildout.easy_install: Generated interpreter /sample-buildout/bin/py-demo.
+ Installing demo.
+ Getting new distribution for 'demo<0.3'.
+ Got demo 0.2.
+ Getting distribution for 'demoneeded'.
+ Getting distribution for 'setuptools'.
+ Got setuptools 0.6.
+ Got demoneeded 1.1.
+ Generated script '/sample-buildout/bin/demo'.
+ Generated interpreter '/sample-buildout/bin/py-demo'.
we'll get the Python 2.3 eggs for demo and demoneeded:
More information about the Checkins
mailing list