[Checkins] SVN: zc.buildout/branches/regebro-python3/ More prints fixed
Lennart Regebro
regebro at gmail.com
Sat Jul 24 10:27:44 EDT 2010
Log message for revision 115008:
More prints fixed
Changed:
U zc.buildout/branches/regebro-python3/buildout.cfg
U zc.buildout/branches/regebro-python3/setup.py
U zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.txt
U zc.buildout/branches/regebro-python3/src/zc/buildout/debugging.txt
U zc.buildout/branches/regebro-python3/src/zc/buildout/downloadcache.txt
U zc.buildout/branches/regebro-python3/src/zc/buildout/repeatable.txt
U zc.buildout/branches/regebro-python3/src/zc/buildout/update.txt
U zc.buildout/branches/regebro-python3/src/zc/buildout/windows.txt
U zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/README.txt
U zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/custom.txt
U zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
-=-
Modified: zc.buildout/branches/regebro-python3/buildout.cfg
===================================================================
--- zc.buildout/branches/regebro-python3/buildout.cfg 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/buildout.cfg 2010-07-24 14:27:44 UTC (rev 115008)
@@ -1,7 +1,12 @@
[buildout]
develop = zc.recipe.egg_ z3c.recipe.scripts_ .
parts = test oltest py
+find-links = .
+versions = versions
+[versions]
+distribute = 0.6.15dev
+
[py]
recipe = z3c.recipe.scripts
eggs = zc.buildout
Modified: zc.buildout/branches/regebro-python3/setup.py
===================================================================
--- zc.buildout/branches/regebro-python3/setup.py 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/setup.py 2010-07-24 14:27:44 UTC (rev 115008)
@@ -90,5 +90,4 @@
'Topic :: Software Development :: Build Tools',
'Topic :: Software Development :: Libraries :: Python Modules',
],
- #dependency_links = ['.'], # Needed until zope.testing 4.0 is released.
)
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.txt
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.txt 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.txt 2010-07-24 14:27:44 UTC (rev 115008)
@@ -289,7 +289,7 @@
>>> import os
>>> os.chdir(sample_buildout)
>>> buildout = os.path.join(sample_buildout, 'bin', 'buildout')
- >>> print(system(buildout))
+ >>> print(system(buildout).decode())
Develop: '/sample-buildout/recipes'
Installing data-dir.
data-dir: Creating directory mystuff
@@ -340,11 +340,12 @@
... path = mydata
... """)
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling data-dir.
Installing data-dir.
data-dir: Creating directory mydata
+ <BLANKLINE>
>>> ls(sample_buildout)
- .installed.cfg
@@ -360,11 +361,12 @@
the part will be reinstalled:
>>> rmdir(sample_buildout, 'mydata')
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling data-dir.
Installing data-dir.
data-dir: Creating directory mydata
+ <BLANKLINE>
Error reporting
---------------
@@ -391,7 +393,7 @@
We'll get a user error, not a traceback.
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
data-dir: Cannot create /xxx/mydata. /xxx is not a directory.
While:
@@ -399,6 +401,7 @@
Getting section data-dir.
Initializing part data-dir.
Error: Invalid Path
+ <BLANKLINE>
Recipe Error Handling
@@ -456,7 +459,7 @@
... path = foo bin
... """)
- >>> print system(buildout), # doctest: +ELLIPSIS
+ >>> print(system(buildout)) # doctest: +ELLIPSIS
Develop: '/sample-buildout/recipes'
Uninstalling data-dir.
Installing data-dir.
@@ -470,6 +473,7 @@
Traceback (most recent call last):
...
OSError: [Errno 17] File exists: '/sample-buildout/bin'
+ <BLANKLINE>
We meant to create a directory bins, but typed bin. Now foo was
left behind.
@@ -490,7 +494,7 @@
... path = foo bins
... """)
- >>> print system(buildout), # doctest: +ELLIPSIS
+ >>> print(system(buildout)) # doctest: +ELLIPSIS
Develop: '/sample-buildout/recipes'
Installing data-dir.
data-dir: Creating directory foo
@@ -502,6 +506,7 @@
Traceback (most recent call last):
...
OSError: [Errno 17] File exists: '/sample-buildout/foo'
+ <BLANKLINE>
Now they fail because foo exists, because it was left behind.
@@ -566,7 +571,7 @@
When we rerun the buildout:
- >>> print system(buildout), # doctest: +ELLIPSIS
+ >>> print(system(buildout)) # doctest: +ELLIPSIS
Develop: '/sample-buildout/recipes'
Installing data-dir.
data-dir: Creating directory foo
@@ -579,6 +584,7 @@
Traceback (most recent call last):
...
OSError: [Errno 17] File exists: '/sample-buildout/bin'
+ <BLANKLINE>
.. Wait for the file to really disappear. My linux is weird.
@@ -647,7 +653,7 @@
If we rerun the buildout, again, we'll get the error and no
directories will be created:
- >>> print system(buildout), # doctest: +ELLIPSIS
+ >>> print(system(buildout)) # doctest: +ELLIPSIS
Develop: '/sample-buildout/recipes'
Installing data-dir.
data-dir: Creating directory foo
@@ -660,6 +666,7 @@
Traceback (most recent call last):
...
OSError: [Errno 17] File exists: '/sample-buildout/bin'
+ <BLANKLINE>
>>> os.path.exists('foo')
False
@@ -677,11 +684,12 @@
... path = foo bins
... """)
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Installing data-dir.
data-dir: Creating directory foo
data-dir: Creating directory bins
+ <BLANKLINE>
>>> os.path.exists('foo')
True
@@ -861,7 +869,7 @@
Now, if we run the buildout, we'll see the options with the values
substituted.
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling data-dir.
Installing data-dir.
@@ -870,6 +878,7 @@
File 1 /sample-buildout/mydata/file
File 2 /sample-buildout/mydata/file/log
recipe recipes:debug
+ <BLANKLINE>
Note that the substitution of the data-dir path option reflects the
update to the option performed by the mkdir recipe.
@@ -880,13 +889,14 @@
recipe, so it assumed it could and reinstalled mydata. If we rerun
the buildout:
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Updating data-dir.
Updating debug.
File 1 /sample-buildout/mydata/file
File 2 /sample-buildout/mydata/file/log
recipe recipes:debug
+ <BLANKLINE>
We can see that mydata was not recreated.
@@ -919,7 +929,7 @@
... path = mydata
... """)
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling debug.
Updating data-dir.
@@ -928,6 +938,7 @@
File 2 /sample-buildout/mydata/file/log
my_name debug
recipe recipes:debug
+ <BLANKLINE>
Automatic part selection and ordering
-------------------------------------
@@ -957,7 +968,7 @@
It will still be treated as a part:
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling debug.
Updating data-dir.
@@ -965,6 +976,7 @@
File 1 /sample-buildout/mydata/file
File 2 /sample-buildout/mydata/file/log
recipe recipes:debug
+ <BLANKLINE>
>>> cat('.installed.cfg') # doctest: +ELLIPSIS
[buildout]
@@ -996,13 +1008,14 @@
It will still be treated as a part:
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Updating data-dir.
Updating debug.
File 1 /sample-buildout/mydata/file
File 2 /sample-buildout/mydata/file/log
recipe recipes:debug
+ <BLANKLINE>
>>> cat('.installed.cfg') # doctest: +ELLIPSIS
[buildout]
@@ -1045,7 +1058,7 @@
... path = mydata
... """)
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling debug.
Uninstalling data-dir.
@@ -1055,6 +1068,7 @@
file2 mydata/file2
path mydata
recipe recipes:debug
+ <BLANKLINE>
In this example, the debug, with_file1 and with_file2 sections act as
macros. In particular, the variable substitutions are performed
@@ -1262,11 +1276,12 @@
... op = base
... """)
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Installing debug.
op buildout
recipe recipes:debug
+ <BLANKLINE>
The example is pretty trivial, but the pattern it illustrates is
pretty common. In a more practical example, the base buildout might
@@ -1332,7 +1347,7 @@
... name = base
... """)
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling debug.
Installing debug.
@@ -1344,6 +1359,7 @@
op4 b3 4
op5 b3base 5
recipe recipes:debug
+ <BLANKLINE>
There are several things to note about this example:
@@ -1467,7 +1483,7 @@
... """)
>>> os.environ['HOME'] = home
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling debug.
Installing debug.
@@ -1480,6 +1496,7 @@
op5 b3base 5
op7 7
recipe recipes:debug
+ <BLANKLINE>
A buildout command-line argument, -U, can be used to suppress reading
user defaults:
@@ -1513,12 +1530,13 @@
... extends = b1.cfg b2.cfg
... """)
- >>> print system(buildout),
+ >>> print(system(buildout))
name base
op1 b1 1
op2 b2 2
op3 b2 3
recipe recipes:debug
+ <BLANKLINE>
Uninstall recipes
-----------------
@@ -1903,7 +1921,7 @@
... recipe = recipes:debug
... """)
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling debug.
Installing debug.
@@ -1914,6 +1932,7 @@
d2: Creating directory d2
Installing d3.
d3: Creating directory d3
+ <BLANKLINE>
>>> ls(sample_buildout)
- .installed.cfg
@@ -2058,7 +2077,7 @@
Now, if we run the buildout without the install command:
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling d2.
Uninstalling d1.
@@ -2070,6 +2089,7 @@
d2: Creating directory data2
Updating d3.
Updating d4.
+ <BLANKLINE>
We see the output of the debug recipe and that data2 was created. We
also see that d1 and d2 have gone away:
@@ -2115,7 +2135,7 @@
... work = os.path.join(alt, 'work'),
... ))
- >>> print system(buildout),
+ >>> print(system(buildout))
Creating directory '/sample-alt/scripts'.
Creating directory '/sample-alt/work'.
Creating directory '/sample-alt/basket'.
@@ -2125,6 +2145,7 @@
Uninstalling d3.
Uninstalling d2.
Uninstalling debug.
+ <BLANKLINE>
>>> ls(alt)
d basket
@@ -2151,12 +2172,13 @@
... recipes=os.path.join(sample_buildout, 'recipes'),
... ))
- >>> print system(buildout),
+ >>> print(system(buildout))
Creating directory '/sample-alt/bin'.
Creating directory '/sample-alt/parts'.
Creating directory '/sample-alt/eggs'.
Creating directory '/sample-alt/develop-eggs'.
Develop: '/sample-buildout/recipes'
+ <BLANKLINE>
>>> ls(alt)
- .installed.cfg
@@ -2203,8 +2225,9 @@
configuration file. Because the verbosity is subtracted from the log
level, we get a final log level of 20, which is the INFO level.
- >>> print system(buildout),
+ >>> print(system(buildout))
INFO Develop: '/sample-buildout/recipes'
+ <BLANKLINE>
Predefined buildout options
---------------------------
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/debugging.txt
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/debugging.txt 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/debugging.txt 2010-07-24 14:27:44 UTC (rev 115008)
@@ -56,12 +56,13 @@
If we run the buildout, we'll get an error:
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Installing data-dir.
While:
Installing data-dir.
Error: Missing option: data-dir:directory
+ <BLANKLINE>
If we want to debug the error, we can add the -D option. Here's we'll
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/downloadcache.txt
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/downloadcache.txt 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/downloadcache.txt 2010-07-24 14:27:44 UTC (rev 115008)
@@ -58,7 +58,7 @@
If we run the buildout, we'll see the eggs installed from the link
server as usual:
- >>> print system(buildout),
+ >>> print(system(buildout))
GET 200 /
GET 200 /demo-0.2-py2.4.egg
GET 200 /demoneeded-1.2c1.zip
@@ -68,6 +68,7 @@
Getting distribution for 'demoneeded'.
Got demoneeded 1.2c1.
Generated script '/sample-buildout/bin/demo'.
+ <BLANKLINE>
We'll also get the download cache populated. The buildout doesn't put
files in the cache directly. It creates an intermediate directory,
@@ -88,13 +89,14 @@
... if f.startswith('demo'):
... remove('eggs', f)
- >>> print system(buildout),
+ >>> print(system(buildout))
GET 200 /
Updating eggs.
Getting distribution for 'demo==0.2'.
Got demo 0.2.
Getting distribution for 'demoneeded'.
Got demoneeded 1.2c1.
+ <BLANKLINE>
We see that the distributions aren't downloaded, because they're
downloaded from the cache.
@@ -131,7 +133,7 @@
... eggs = demo
... ''' % globals())
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling eggs.
Installing eggs.
Getting distribution for 'demo'.
@@ -139,3 +141,4 @@
Getting distribution for 'demoneeded'.
Got demoneeded 1.2c1.
Generated script '/sample-buildout/bin/demo'.
+ <BLANKLINE>
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/repeatable.txt
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/repeatable.txt 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/repeatable.txt 2010-07-24 14:27:44 UTC (rev 115008)
@@ -82,11 +82,12 @@
If we run the buildout, it will use version 2:
- >>> print system(buildout),
+ >>> print(system(buildout))
Getting distribution for 'spam'.
Got spam 2.
Installing foo.
recipe v2
+ <BLANKLINE>
We can specify a versions section that lists our recipe and name it in
the buildout section:
@@ -112,12 +113,13 @@
Now, if we run the buildout, we'll use version 1 of the spam recipe:
- >>> print system(buildout),
+ >>> print(system(buildout))
Getting distribution for 'spam==1'.
Got spam 1.
Uninstalling foo.
Installing foo.
recipe v1
+ <BLANKLINE>
Running the buildout in verbose mode will help us get information
about versions used. If we run the buildout in verbose mode without
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/update.txt
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/update.txt 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/update.txt 2010-07-24 14:27:44 UTC (rev 115008)
@@ -63,7 +63,7 @@
Now if we run the buildout, the buildout will upgrade itself to the
new versions found in new releases:
- >>> print system(buildout),
+ >>> print(system(buildout))
Getting distribution for 'zc.buildout'.
Got zc.buildout 99.99.
Getting distribution for 'setuptools'.
@@ -77,6 +77,7 @@
Installing show-versions.
zc.buildout 99.99
setuptools 99.99
+ <BLANKLINE>
Our buildout script's site.py has been updated to use the new eggs:
@@ -120,7 +121,7 @@
Now we can see that we actually "upgrade" to an earlier version.
- >>> print system(buildout),
+ >>> print(system(buildout))
Upgraded:
zc.buildout version 1.0.0,
setuptools version 0.6;
@@ -129,6 +130,7 @@
Updating show-versions.
zc.buildout 1.0.0
setuptools 0.6
+ <BLANKLINE>
There are a number of cases, described below, in which the updates
don't happen.
@@ -175,7 +177,7 @@
... """ % dict(new_releases=new_releases))
>>> cd(sample_buildout2)
- >>> print system(buildout),
+ >>> print(system(buildout))
Creating directory '/sample_buildout2/bin'.
Creating directory '/sample_buildout2/parts'.
Creating directory '/sample_buildout2/eggs'.
@@ -185,5 +187,6 @@
Getting distribution for 'setuptools'.
Got setuptools 99.99.
Not upgrading because not running a local buildout command.
+ <BLANKLINE>
>>> ls('bin')
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/windows.txt
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/windows.txt 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/windows.txt 2010-07-24 14:27:44 UTC (rev 115008)
@@ -59,8 +59,9 @@
... recipe = spam
... ''' % join('recipe', 'dist'))
- >>> print system(buildout),
+ >>> print(system(buildout))
Getting distribution for 'spam'.
Got spam 1.
Installing foo.
can't remove read only files
+ <BLANKLINE>
Modified: zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/README.txt
===================================================================
--- zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/README.txt 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/README.txt 2010-07-24 14:27:44 UTC (rev 115008)
@@ -67,12 +67,13 @@
Let's run the buildout:
>>> import os
- >>> print system(buildout),
+ >>> print(system(buildout))
Installing demo.
Getting distribution for 'demo<0.3'.
Got demo 0.2.
Getting distribution for 'demoneeded'.
Got demoneeded 1.2c1.
+ <BLANKLINE>
Now, if we look at the buildout eggs directory:
@@ -111,10 +112,11 @@
... index = %(server)s/index
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling demo.
Installing demo.
Generated script '/sample-buildout/bin/demo'.
+ <BLANKLINE>
Now we also see the script defined by the demo script:
@@ -193,11 +195,12 @@
specification. We were able to do this because the scripts recipe is
the default entry point for the zc.recipe.egg egg.
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling demo.
Installing demo.
Generated script '/sample-buildout/bin/demo'.
Generated interpreter '/sample-buildout/bin/py-demo'.
+ <BLANKLINE>
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.
@@ -276,11 +279,12 @@
If we run the buildout on the default online and newest modes,
we'll get an update for demo:
- >>> print system(buildout),
+ >>> print(system(buildout))
Updating demo.
Getting distribution for 'demo'.
Got demo 0.4c1.
Generated script '/sample-buildout/bin/demo'.
+ <BLANKLINE>
Then we'll get a new demo egg:
@@ -316,9 +320,10 @@
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling demo.
Installing demo.
+ <BLANKLINE>
>>> ls(sample_buildout, 'bin')
- buildout
@@ -337,10 +342,11 @@
... scripts = demo=foo
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling demo.
Installing demo.
Generated script '/sample-buildout/bin/foo'.
+ <BLANKLINE>
>>> ls(sample_buildout, 'bin')
- buildout
@@ -367,10 +373,11 @@
... ${buildout:directory}/spam
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling demo.
Installing demo.
Generated script '/sample-buildout/bin/foo'.
+ <BLANKLINE>
Let's look at the script that was generated:
@@ -414,10 +421,11 @@
... ${buildout:directory}/spam
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling demo.
Installing demo.
Generated script '/sample-buildout/bin/foo'.
+ <BLANKLINE>
Let's look at the script that was generated:
@@ -463,10 +471,11 @@
... ${buildout:directory}/spam
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling demo.
Installing demo.
Generated script '/sample-buildout/bin/foo'.
+ <BLANKLINE>
>>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
#!/usr/local/bin/python2.4
@@ -516,10 +525,11 @@
... arguments = a, 2
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling demo.
Installing demo.
Generated script '/sample-buildout/bin/foo'.
+ <BLANKLINE>
>>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
#!/usr/local/bin/python2.4
@@ -566,12 +576,13 @@
... entry-points = alt=eggrecipedemo:alt other=foo.bar:a.b.c
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling demo.
Installing demo.
Generated script '/sample-buildout/bin/demo'.
Generated script '/sample-buildout/bin/alt'.
Generated script '/sample-buildout/bin/other'.
+ <BLANKLINE>
>>> ls(sample_buildout, 'bin')
- alt
@@ -638,8 +649,9 @@
... scripts = demo=foo
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Uninstalling bigdemo.
Installing demo.
Generated script '/sample-buildout/bin/foo'.
+ <BLANKLINE>
Modified: zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/custom.txt
===================================================================
--- zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/custom.txt 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/custom.txt 2010-07-24 14:27:44 UTC (rev 115008)
@@ -137,9 +137,10 @@
...
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Installing extdemo.
zip_safe flag not set; analyzing archive contents...
+ <BLANKLINE>
We got the zip_safe warning because the source distribution we used
wasn't setuptools based and thus didn't set the option.
@@ -194,11 +195,12 @@
... entry-points = demo=demo:main
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/demo'
Updating extdemo.
Installing demo.
Generated script '/sample-buildout/bin/demo'.
+ <BLANKLINE>
When we run the script, we'll 42 printed:
@@ -239,12 +241,13 @@
will. This time we also get the test-variable message again, because the new
version is imported:
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/demo'
Updating extdemo.
zip_safe flag not set; analyzing archive contents...
Updating demo.
Generated script '/sample-buildout/bin/demo'.
+ <BLANKLINE>
>>> ls(sample_buildout, 'develop-eggs')
- demo.egg-link
@@ -355,7 +358,7 @@
... recipe = recipes:environ
...
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling demo.
Uninstalling extdemo.
@@ -364,6 +367,7 @@
zip_safe flag not set; analyzing archive contents...
Installing checkenv.
checkenv: test-variable left over: False
+ <BLANKLINE>
The setup.py also printed out that we have set the environment `test-variable`
@@ -375,11 +379,12 @@
>>> import os
>>> os.environ['test-variable'] = 'bar'
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Updating extdemo.
Updating checkenv.
checkenv: test-variable left over: True
+ <BLANKLINE>
>>> os.environ['test-variable']
'bar'
@@ -409,7 +414,7 @@
... recipe = recipes:environ
...
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling extdemo.
Installing extdemo.
@@ -417,6 +422,7 @@
zip_safe flag not set; analyzing archive contents...
Updating checkenv.
checkenv: test-variable left over: True
+ <BLANKLINE>
>>> os.environ['test-variable']
'bar'
@@ -438,12 +444,13 @@
... include-dirs = include
...
... """ % dict(server=link_server))
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/recipes'
Uninstalling checkenv.
Uninstalling extdemo.
Installing extdemo.
zip_safe flag not set; analyzing archive contents...
+ <BLANKLINE>
>>> rmdir(sample_buildout, 'recipes')
@@ -545,12 +552,13 @@
TWO to be defined. This will cause the module-variable, 'val', to be
set with a value of 2.
- >>> print system(buildout),
+ >>> print(system(buildout))
Develop: '/sample-buildout/demo'
Uninstalling extdemo.
Installing extdemo.
Installing demo.
Generated script '/sample-buildout/bin/demo'.
+ <BLANKLINE>
Our develop-eggs now includes an egg link for extdemo:
Modified: zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
===================================================================
--- zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt 2010-07-24 14:25:59 UTC (rev 115007)
+++ zc.buildout/branches/regebro-python3/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt 2010-07-24 14:27:44 UTC (rev 115008)
@@ -50,7 +50,7 @@
>>> import os
>>> os.chdir(sample_buildout)
>>> buildout = os.path.join(sample_buildout, 'bin', 'buildout')
- >>> print system(buildout),
+ >>> print(system(buildout))
Installing demo.
Getting distribution for 'demo<0.3'.
Got demo 0.2.
@@ -58,7 +58,8 @@
Got demoneeded 1.2c1.
Generated script '/sample-buildout/bin/demo'.
Generated interpreter '/sample-buildout/bin/py-demo'.
-
+ <BLANKLINE>
+
we'll get the Python 2.4 eggs for demo and demoneeded:
>>> ls(sample_buildout, 'eggs')
More information about the checkins
mailing list