[Checkins] SVN: zc.buildout/trunk/ Log scripts created,
as suggested in:
Jim Fulton
jim at zope.com
Mon May 7 02:41:37 EDT 2007
Log message for revision 75600:
Log scripts created, as suggested in:
https://bugs.launchpad.net/zc.buildout/+bug/71353
Changed:
U zc.buildout/trunk/CHANGES.txt
U zc.buildout/trunk/src/zc/buildout/buildout.txt
U zc.buildout/trunk/src/zc/buildout/downloadcache.txt
U zc.buildout/trunk/src/zc/buildout/easy_install.py
U zc.buildout/trunk/src/zc/buildout/tests.py
U zc.buildout/trunk/src/zc/buildout/update.txt
U zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt
U zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/custom.txt
U zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt 2007-05-07 02:45:30 UTC (rev 75599)
+++ zc.buildout/trunk/CHANGES.txt 2007-05-07 06:41:36 UTC (rev 75600)
@@ -11,6 +11,16 @@
Change History
**************
+1.0.0b23 (2007-05-??)
+=====================
+
+Feature Changes
+---------------
+
+- Improved error reporting by showing which packages require other
+ packages that can't be found or that cause version conflicts.
+
+
1.0.0b23 (2007-03-19)
=====================
@@ -23,22 +33,15 @@
distributions for applications allowing install without network
access.
+- Log scripts created, as suggested in:
+ https://bugs.launchpad.net/zc.buildout/+bug/71353
+
Bugs Fixed
----------
- It wasn't possible to give options on the command line for sections
not defined in a configuration file.
-1.0.0b23 (2007-05-??)
-=====================
-
-Feature Changes
----------------
-
-- Improved error reporting by showing which packages require other
- packages that can't be found or that cause version conflicts.
-
-
1.0.0b22 (2007-03-15)
=====================
Modified: zc.buildout/trunk/src/zc/buildout/buildout.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.txt 2007-05-07 02:45:30 UTC (rev 75599)
+++ zc.buildout/trunk/src/zc/buildout/buildout.txt 2007-05-07 06:41:36 UTC (rev 75600)
@@ -1693,16 +1693,17 @@
with it's own local copies of zc.buildout and setuptools and with
local buildout scripts.
- >>> sample_bootstrapped = tmpdir('sample-bootstrapped')
+ >>> sample_bootstrapped = tmpdir('sample-bootstrapped')
- >>> print system(buildout
- ... +' -c'+os.path.join(sample_bootstrapped, 'setup.cfg')
- ... +' bootstrap'),
- Warning: creating /sample-bootstrapped/setup.cfg
- buildout: Creating directory /sample-bootstrapped/bin
- buildout: Creating directory /sample-bootstrapped/parts
- buildout: Creating directory /sample-bootstrapped/eggs
- buildout: Creating directory /sample-bootstrapped/develop-eggs
+ >>> print system(buildout
+ ... +' -c'+os.path.join(sample_bootstrapped, 'setup.cfg')
+ ... +' bootstrap'),
+ Warning: creating /sample-bootstrapped/setup.cfg
+ buildout: Creating directory /sample-bootstrapped/bin
+ buildout: Creating directory /sample-bootstrapped/parts
+ buildout: Creating directory /sample-bootstrapped/eggs
+ buildout: Creating directory /sample-bootstrapped/develop-eggs
+ zc.buildout.easy_install: Generated script /sample-bootstrapped/bin/buildout.
Note that a basic setup.cfg was created for us.
Modified: zc.buildout/trunk/src/zc/buildout/downloadcache.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/downloadcache.txt 2007-05-07 02:45:30 UTC (rev 75599)
+++ zc.buildout/trunk/src/zc/buildout/downloadcache.txt 2007-05-07 06:41:36 UTC (rev 75600)
@@ -64,6 +64,7 @@
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
+ zc.buildout.easy_install: 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,
@@ -91,6 +92,7 @@
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
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
We see that the distributions aren't downloaded, because they're
downloaded from the cache.
@@ -134,3 +136,4 @@
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
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py 2007-05-07 02:45:30 UTC (rev 75599)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py 2007-05-07 06:41:36 UTC (rev 75600)
@@ -829,6 +829,7 @@
def _script(module_name, attrs, path, dest, executable, arguments,
initialization):
generated = []
+ script = dest
if sys.platform == 'win32':
# generate exe file and give the script a magic name:
open(dest+'.exe', 'wb').write(
@@ -850,6 +851,7 @@
except (AttributeError, os.error):
pass
generated.append(dest)
+ logger.info("Generated script %s.", script)
return generated
script_template = '''\
@@ -869,6 +871,7 @@
def _pyscript(path, dest, executable):
generated = []
+ script = dest
if sys.platform == 'win32':
# generate exe file and give the script a magic name:
open(dest+'.exe', 'wb').write(
@@ -886,6 +889,7 @@
except (AttributeError, os.error):
pass
generated.append(dest)
+ logger.info("Generated interpreter %s.", script)
return generated
py_script_template = '''\
Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py 2007-05-07 02:45:30 UTC (rev 75599)
+++ zc.buildout/trunk/src/zc/buildout/tests.py 2007-05-07 06:41:36 UTC (rev 75600)
@@ -793,6 +793,7 @@
buildout: Creating directory /sample-bootstrap/parts
buildout: Creating directory /sample-bootstrap/eggs
buildout: Creating directory /sample-bootstrap/develop-eggs
+ zc.buildout.easy_install: Generated script /sample-bootstrap/bin/buildout.
"""
def removing_eggs_from_develop_section_causes_egg_link_to_be_removed():
@@ -1856,6 +1857,7 @@
zc.buildout.easy_install: Got demo 0.3
zc.buildout.easy_install: Getting new distribution for demoneeded
zc.buildout.easy_install: Got demoneeded 1.1
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> print system(join('bin', 'demo')),
3 1
@@ -1876,6 +1878,7 @@
buildout: Installing x
zc.buildout.easy_install: Getting new distribution for demo==0.1
zc.buildout.easy_install: Got demo 0.1
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> print system(join('bin', 'demo')),
1 1
Modified: zc.buildout/trunk/src/zc/buildout/update.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/update.txt 2007-05-07 02:45:30 UTC (rev 75599)
+++ zc.buildout/trunk/src/zc/buildout/update.txt 2007-05-07 06:41:36 UTC (rev 75600)
@@ -72,6 +72,7 @@
zc.buildout version 99.99,
setuptools version 99.99;
restarting.
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/buildout.
buildout: Develop: /sample-buildout/showversions
buildout: Installing show-versions
zc.buildout 99.99
@@ -120,6 +121,7 @@
zc.buildout version 1.0.0,
setuptools version 0.6;
restarting.
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/buildout.
buildout: Develop: /sample-buildout/showversions
buildout: Updating show-versions
zc.buildout 1.0.0
Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt 2007-05-07 02:45:30 UTC (rev 75599)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt 2007-05-07 06:41:36 UTC (rev 75600)
@@ -111,6 +111,7 @@
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Installing demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
Now we also see the script defined by the dmo script:
@@ -169,9 +170,11 @@
specification. We were able to do this because the scripts recipe if
the default entry point for the zc.recipe.egg egg.
- >>> print system(buildout),
- buildout: Uninstalling demo
- buildout: Installing demo
+ >>> 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.
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.
@@ -228,6 +231,7 @@
>>> print system(buildout+' -N'),
buildout: Uninstalling demo
buildout: Installing demo
+ zc.buildout.easy_install: 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
@@ -237,6 +241,7 @@
>>> print system(buildout+' -o'),
buildout: Updating demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
We didn't get an update for demo:
@@ -253,6 +258,7 @@
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.
Then we'll get a new demo egg:
@@ -312,6 +318,7 @@
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Installing demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
>>> ls(sample_buildout, 'bin')
- buildout
@@ -341,6 +348,7 @@
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Installing demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
Let's look at the script that was generated:
@@ -389,6 +397,7 @@
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Installing demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
>>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
#!/usr/local/bin/python2.4
@@ -438,6 +447,9 @@
>>> 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.
>>> ls(sample_buildout, 'bin')
- alt
@@ -482,3 +494,4 @@
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Installing demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/custom.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/custom.txt 2007-05-07 02:45:30 UTC (rev 75599)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/custom.txt 2007-05-07 06:41:36 UTC (rev 75600)
@@ -192,6 +192,7 @@
buildout: Develop: /sample-buildout/demo
buildout: Updating extdemo
buildout: Installing demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
When we run the script, we'll 42 printed:
@@ -214,11 +215,13 @@
buildout: Develop: /sample-buildout/demo
buildout: Updating extdemo
buildout: Updating demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/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.
We won't get an update.
@@ -235,6 +238,7 @@
buildout: Updating extdemo
zip_safe flag not set; analyzing archive contents...
buildout: Updating demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> ls(sample_buildout, 'develop-eggs')
- demo.egg-link
@@ -274,6 +278,7 @@
buildout: Installing extdemo
zip_safe flag not set; analyzing archive contents...
buildout: Installing demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> ls(sample_buildout, 'develop-eggs')
- demo.egg-link
@@ -383,6 +388,7 @@
buildout: Uninstalling extdemo
buildout: Installing extdemo
buildout: Installing demo
+ zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
Our develop-eggs now includes an egg link for extdemo:
Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt 2007-05-07 02:45:30 UTC (rev 75599)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt 2007-05-07 06:41:36 UTC (rev 75600)
@@ -44,17 +44,19 @@
Now, if we run the buildout:
- >>> import os
- >>> 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
+ >>> import os
+ >>> 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.
we'll get the Python 2.3 eggs for demo and demoneeded:
More information about the Checkins
mailing list