[Checkins] SVN: zc.buildout/branches/regebro-python3/ z3c.recipe.scripts tests pass
Lennart Regebro
regebro at gmail.com
Wed Nov 24 08:53:32 EST 2010
Log message for revision 118557:
z3c.recipe.scripts tests pass
Changed:
U zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.txt
U zc.buildout/branches/regebro-python3/src/zc/buildout/easy_install.py
U zc.buildout/branches/regebro-python3/src/zc/buildout/rmtree.py
U zc.buildout/branches/regebro-python3/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt
U zc.buildout/branches/regebro-python3/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py
-=-
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.txt
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.txt 2010-11-24 13:30:50 UTC (rev 118556)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.txt 2010-11-24 13:53:32 UTC (rev 118557)
@@ -2701,7 +2701,8 @@
... """)
>>> bprint(system(buildout+' buildout:installed=inst.cfg'), )
-
+ <BLANKLINE>
+
>>> ls(sample_buildout)
- b1.cfg
- b2.cfg
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/easy_install.py 2010-11-24 13:30:50 UTC (rev 118556)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/easy_install.py 2010-11-24 13:53:32 UTC (rev 118557)
@@ -1618,7 +1618,7 @@
real_sitecustomize = open(real_sitecustomize_path, 'r')
sitecustomize.write(
'\n# The following is from\n# %s\n' %
- (real_sitecustomize_path,))
+ (real_sitecustomize_path.decode(),))
sitecustomize.write(real_sitecustomize.read())
real_sitecustomize.close()
sitecustomize.close()
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/rmtree.py
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/rmtree.py 2010-11-24 13:30:50 UTC (rev 118556)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/rmtree.py 2010-11-24 13:53:32 UTC (rev 118557)
@@ -42,7 +42,7 @@
and make it unwriteable
- >>> os.chmod (foo, 0400)
+ >>> os.chmod (foo, 256) # 256 = 0400 octal
rmtree should be able to remove it:
Modified: zc.buildout/branches/regebro-python3/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt
===================================================================
--- zc.buildout/branches/regebro-python3/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt 2010-11-24 13:30:50 UTC (rev 118556)
+++ zc.buildout/branches/regebro-python3/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt 2010-11-24 13:53:32 UTC (rev 118557)
@@ -202,7 +202,6 @@
... ' -c "import sys, pprint; pprint.pprint(sys.path[-2:])"'))
['/sample-buildout/eggs/demo-0.2-pyN.N.egg',
'/sample-buildout/eggs/demoneeded-1.2c1-pyN.N.egg']
- <BLANKLINE>
Including site-packages and sitecustomize
-----------------------------------------
@@ -281,7 +280,6 @@
'/sample-buildout/eggs/demoneeded-1.2c1-pyN.N.egg',
'/executable_buildout/eggs/setuptools-X-pyN.N.egg',
'/executable_buildout/site-packages']
- <BLANKLINE>
If you set it to false, they are excluded.
@@ -313,7 +311,6 @@
...,
'/sample-buildout/eggs/demo-0.2-pyN.N.egg',
'/sample-buildout/eggs/demoneeded-1.2c1-pyN.N.egg']
- <BLANKLINE>
As described above, the allowed-eggs-from-site-packages option lets us
control what site-packages eggs zc.buildout will allow to fulfill
@@ -489,7 +486,6 @@
>>> cat(sample_buildout, 'parts', 'py', 'sitecustomize.py')
... # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
- <BLANKLINE>
# The following is from
# /executable_buildout/parts/py/sitecustomize.py
...
@@ -499,7 +495,6 @@
>>> bprint(system(join(sample_buildout, 'bin', 'py') +
... ''' -c "import os; print(os.environ['zc.buildout'])"'''))
foo bar baz shazam
- <BLANKLINE>
It also will be honored in the buildout section if it is not set locally.
@@ -525,7 +520,6 @@
>>> cat(sample_buildout, 'parts', 'py', 'sitecustomize.py')
... # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
- <BLANKLINE>
# The following is from
# /executable_buildout/parts/py/sitecustomize.py
...
@@ -535,7 +529,6 @@
>>> bprint(system(join(sample_buildout, 'bin', 'py') +
... ''' -c "import os; print(os.environ['zc.buildout'])"'''))
foo bar baz shazam
- <BLANKLINE>
Options
-------
@@ -584,7 +577,6 @@
... ' -c "import sys, pprint; pprint.pprint(sys.path[-2:])"'))
['/sample-buildout/eggs/demo-0.2-pyN.N.egg',
'/sample-buildout/eggs/demoneeded-1.2c1-pyN.N.egg']
- <BLANKLINE>
>>> bprint(system(join(sample_buildout, 'bin', 'python') +
... ''' -c "import os; print(os.environ['zc.buildout'])"'''), )
foo bar baz shazam
@@ -654,7 +646,6 @@
>>> bprint(system(join(sample_buildout, 'bin', 'python2') +
... ' -c "print(42)"'))
42
- <BLANKLINE>
The other options all identical to zc.recipe.egg.
Modified: zc.buildout/branches/regebro-python3/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py
===================================================================
--- zc.buildout/branches/regebro-python3/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py 2010-11-24 13:30:50 UTC (rev 118556)
+++ zc.buildout/branches/regebro-python3/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py 2010-11-24 13:53:32 UTC (rev 118557)
@@ -176,7 +176,6 @@
>>> cat(sample_buildout, 'parts', 'py', 'sitecustomize.py')
... # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
- <BLANKLINE>
import os
os.environ['zc.recipe.egg'] = 'baLOOba'
<BLANKLINE>
@@ -305,7 +304,6 @@
Installing eggs.
Getting distribution for 'demoneeded'.
Error: Couldn't find a distribution for 'demoneeded'.
- <BLANKLINE>
We get an error if we specify anything but true or false:
@@ -327,7 +325,6 @@
Getting section eggs.
Initializing part eggs.
Error: Invalid value for include-site-packages option: no
- <BLANKLINE>
"""
@@ -365,7 +362,6 @@
>>> bprint(system(buildout))
Installing eggs.
- <BLANKLINE>
Specifying the egg exactly will work as well. This shows we correctly
parse a multi-line value.
@@ -392,7 +388,6 @@
>>> bprint(system(buildout))
Uninstalling eggs.
Installing eggs.
- <BLANKLINE>
It will also work if we use a glob ("*" or "?"). (We won't show that here
because we already tested it in
More information about the checkins
mailing list