Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.buildout
Commits
022bab05
Commit
022bab05
authored
May 07, 2007
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Log scripts created, as suggested in:
https://bugs.launchpad.net/zc.buildout/+bug/71353
parent
b9545981
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
71 additions
and
34 deletions
+71
-34
CHANGES.txt
CHANGES.txt
+13
-10
src/zc/buildout/buildout.txt
src/zc/buildout/buildout.txt
+11
-10
src/zc/buildout/downloadcache.txt
src/zc/buildout/downloadcache.txt
+3
-0
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+4
-0
src/zc/buildout/tests.py
src/zc/buildout/tests.py
+3
-0
src/zc/buildout/update.txt
src/zc/buildout/update.txt
+2
-0
zc.recipe.egg_/src/zc/recipe/egg/README.txt
zc.recipe.egg_/src/zc/recipe/egg/README.txt
+16
-3
zc.recipe.egg_/src/zc/recipe/egg/custom.txt
zc.recipe.egg_/src/zc/recipe/egg/custom.txt
+6
-0
zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
+13
-11
No files found.
CHANGES.txt
View file @
022bab05
...
@@ -11,6 +11,16 @@ priorities include:
...
@@ -11,6 +11,16 @@ priorities include:
Change History
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)
1.0.0b23 (2007-03-19)
=====================
=====================
...
@@ -23,22 +33,15 @@ Feature Changes
...
@@ -23,22 +33,15 @@ Feature Changes
distributions for applications allowing install without network
distributions for applications allowing install without network
access.
access.
- Log scripts created, as suggested in:
https://bugs.launchpad.net/zc.buildout/+bug/71353
Bugs Fixed
Bugs Fixed
----------
----------
- It wasn't possible to give options on the command line for sections
- It wasn't possible to give options on the command line for sections
not defined in a configuration file.
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)
1.0.0b22 (2007-03-15)
=====================
=====================
...
...
src/zc/buildout/buildout.txt
View file @
022bab05
...
@@ -1693,16 +1693,17 @@ If zc.buildout is installed, you can use it to create a new buildout
...
@@ -1693,16 +1693,17 @@ If zc.buildout is installed, you can use it to create a new buildout
with it's own local copies of zc.buildout and setuptools and with
with it's own local copies of zc.buildout and setuptools and with
local buildout scripts.
local buildout scripts.
>>> sample_bootstrapped = tmpdir('sample-bootstrapped')
>>> sample_bootstrapped = tmpdir('sample-bootstrapped')
>>> print system(buildout
>>> print system(buildout
... +' -c'+os.path.join(sample_bootstrapped, 'setup.cfg')
... +' -c'+os.path.join(sample_bootstrapped, 'setup.cfg')
... +' bootstrap'),
... +' bootstrap'),
Warning: creating /sample-bootstrapped/setup.cfg
Warning: creating /sample-bootstrapped/setup.cfg
buildout: Creating directory /sample-bootstrapped/bin
buildout: Creating directory /sample-bootstrapped/bin
buildout: Creating directory /sample-bootstrapped/parts
buildout: Creating directory /sample-bootstrapped/parts
buildout: Creating directory /sample-bootstrapped/eggs
buildout: Creating directory /sample-bootstrapped/eggs
buildout: Creating directory /sample-bootstrapped/develop-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.
Note that a basic setup.cfg was created for us.
...
...
src/zc/buildout/downloadcache.txt
View file @
022bab05
...
@@ -64,6 +64,7 @@ server as usual:
...
@@ -64,6 +64,7 @@ server as usual:
zc.buildout.easy_install: Got demo 0.2
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 demoneeded
zc.buildout.easy_install: Got demoneeded 1.1
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
We'll also get the download cache populated. The buildout doesn't put
files in the cache directly. It creates an intermediate directory,
files in the cache directly. It creates an intermediate directory,
...
@@ -91,6 +92,7 @@ If we remove the installed eggs from eggs directory and re-run the buildout:
...
@@ -91,6 +92,7 @@ If we remove the installed eggs from eggs directory and re-run the buildout:
zc.buildout.easy_install: Got demo 0.2
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 demoneeded
zc.buildout.easy_install: Got demoneeded 1.1
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
We see that the distributions aren't downloaded, because they're
downloaded from the cache.
downloaded from the cache.
...
@@ -134,3 +136,4 @@ install-from-cache option set to true:
...
@@ -134,3 +136,4 @@ install-from-cache option set to true:
zc.buildout.easy_install: Got demo 0.2
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 demoneeded
zc.buildout.easy_install: Got demoneeded 1.1
zc.buildout.easy_install: Got demoneeded 1.1
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
src/zc/buildout/easy_install.py
View file @
022bab05
...
@@ -829,6 +829,7 @@ def scripts(reqs, working_set, executable, dest,
...
@@ -829,6 +829,7 @@ def scripts(reqs, working_set, executable, dest,
def
_script
(
module_name
,
attrs
,
path
,
dest
,
executable
,
arguments
,
def
_script
(
module_name
,
attrs
,
path
,
dest
,
executable
,
arguments
,
initialization
):
initialization
):
generated
=
[]
generated
=
[]
script
=
dest
if
sys
.
platform
==
'win32'
:
if
sys
.
platform
==
'win32'
:
# generate exe file and give the script a magic name:
# generate exe file and give the script a magic name:
open
(
dest
+
'.exe'
,
'wb'
).
write
(
open
(
dest
+
'.exe'
,
'wb'
).
write
(
...
@@ -850,6 +851,7 @@ def _script(module_name, attrs, path, dest, executable, arguments,
...
@@ -850,6 +851,7 @@ def _script(module_name, attrs, path, dest, executable, arguments,
except
(
AttributeError
,
os
.
error
):
except
(
AttributeError
,
os
.
error
):
pass
pass
generated
.
append
(
dest
)
generated
.
append
(
dest
)
logger
.
info
(
"Generated script %s."
,
script
)
return
generated
return
generated
script_template
=
'''
\
script_template
=
'''
\
...
@@ -869,6 +871,7 @@ if __name__ == '__main__':
...
@@ -869,6 +871,7 @@ if __name__ == '__main__':
def
_pyscript
(
path
,
dest
,
executable
):
def
_pyscript
(
path
,
dest
,
executable
):
generated
=
[]
generated
=
[]
script
=
dest
if
sys
.
platform
==
'win32'
:
if
sys
.
platform
==
'win32'
:
# generate exe file and give the script a magic name:
# generate exe file and give the script a magic name:
open
(
dest
+
'.exe'
,
'wb'
).
write
(
open
(
dest
+
'.exe'
,
'wb'
).
write
(
...
@@ -886,6 +889,7 @@ def _pyscript(path, dest, executable):
...
@@ -886,6 +889,7 @@ def _pyscript(path, dest, executable):
except
(
AttributeError
,
os
.
error
):
except
(
AttributeError
,
os
.
error
):
pass
pass
generated
.
append
(
dest
)
generated
.
append
(
dest
)
logger
.
info
(
"Generated interpreter %s."
,
script
)
return
generated
return
generated
py_script_template
=
'''
\
py_script_template
=
'''
\
...
...
src/zc/buildout/tests.py
View file @
022bab05
...
@@ -793,6 +793,7 @@ bootstrapping.
...
@@ -793,6 +793,7 @@ bootstrapping.
buildout: Creating directory /sample-bootstrap/parts
buildout: Creating directory /sample-bootstrap/parts
buildout: Creating directory /sample-bootstrap/eggs
buildout: Creating directory /sample-bootstrap/eggs
buildout: Creating directory /sample-bootstrap/develop-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
():
def
removing_eggs_from_develop_section_causes_egg_link_to_be_removed
():
...
@@ -1856,6 +1857,7 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around():
...
@@ -1856,6 +1857,7 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around():
zc.buildout.easy_install: Got demo 0.3
zc.buildout.easy_install: Got demo 0.3
zc.buildout.easy_install: Getting new distribution for demoneeded
zc.buildout.easy_install: Getting new distribution for demoneeded
zc.buildout.easy_install: Got demoneeded 1.1
zc.buildout.easy_install: Got demoneeded 1.1
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> print system(join('bin', 'demo')),
>>> print system(join('bin', 'demo')),
3 1
3 1
...
@@ -1876,6 +1878,7 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around():
...
@@ -1876,6 +1878,7 @@ def bug_105081_Specific_egg_versions_are_ignored_when_newer_eggs_are_around():
buildout: Installing x
buildout: Installing x
zc.buildout.easy_install: Getting new distribution for demo==0.1
zc.buildout.easy_install: Getting new distribution for demo==0.1
zc.buildout.easy_install: Got 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')),
>>> print system(join('bin', 'demo')),
1 1
1 1
...
...
src/zc/buildout/update.txt
View file @
022bab05
...
@@ -72,6 +72,7 @@ new versions found in new releases:
...
@@ -72,6 +72,7 @@ new versions found in new releases:
zc.buildout version 99.99,
zc.buildout version 99.99,
setuptools version 99.99;
setuptools version 99.99;
restarting.
restarting.
zc.buildout.easy_install: Generated script /sample-buildout/bin/buildout.
buildout: Develop: /sample-buildout/showversions
buildout: Develop: /sample-buildout/showversions
buildout: Installing show-versions
buildout: Installing show-versions
zc.buildout 99.99
zc.buildout 99.99
...
@@ -120,6 +121,7 @@ We'll actually "upgrade" to an earlier version.
...
@@ -120,6 +121,7 @@ We'll actually "upgrade" to an earlier version.
zc.buildout version 1.0.0,
zc.buildout version 1.0.0,
setuptools version 0.6;
setuptools version 0.6;
restarting.
restarting.
zc.buildout.easy_install: Generated script /sample-buildout/bin/buildout.
buildout: Develop: /sample-buildout/showversions
buildout: Develop: /sample-buildout/showversions
buildout: Updating show-versions
buildout: Updating show-versions
zc.buildout 1.0.0
zc.buildout 1.0.0
...
...
zc.recipe.egg_/src/zc/recipe/egg/README.txt
View file @
022bab05
...
@@ -111,6 +111,7 @@ scripts recipe:
...
@@ -111,6 +111,7 @@ scripts recipe:
>>> print system(buildout),
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Uninstalling demo
buildout: Installing 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:
Now we also see the script defined by the dmo script:
...
@@ -169,9 +170,11 @@ Note that we ommitted the entry point name from the recipe
...
@@ -169,9 +170,11 @@ Note that we ommitted the entry point name from the recipe
specification. We were able to do this because the scripts recipe if
specification. We were able to do this because the scripts recipe if
the default entry point for the zc.recipe.egg egg.
the default entry point for the zc.recipe.egg egg.
>>> print system(buildout),
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Uninstalling demo
buildout: Installing 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
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.
the path for demo and any eggs it depends on included in sys.path.
...
@@ -228,6 +231,7 @@ and run the buildout in non-newest mode:
...
@@ -228,6 +231,7 @@ and run the buildout in non-newest mode:
>>> print system(buildout+' -N'),
>>> print system(buildout+' -N'),
buildout: Uninstalling demo
buildout: Uninstalling demo
buildout: Installing 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
Note that we removed the eggs option, and the eggs defaulted to the
part name. Because we removed the eggs option, the demo was
part name. Because we removed the eggs option, the demo was
...
@@ -237,6 +241,7 @@ We'll also run the buildout in off-line mode:
...
@@ -237,6 +241,7 @@ We'll also run the buildout in off-line mode:
>>> print system(buildout+' -o'),
>>> print system(buildout+' -o'),
buildout: Updating demo
buildout: Updating demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
We didn't get an update for demo:
We didn't get an update for demo:
...
@@ -253,6 +258,7 @@ we'll get an update for demo:
...
@@ -253,6 +258,7 @@ we'll get an update for demo:
buildout: Updating demo
buildout: Updating demo
zc.buildout.easy_install: Getting new distribution for demo
zc.buildout.easy_install: Getting new distribution for demo
zc.buildout.easy_install: Got demo 0.3
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:
Then we'll get a new demo egg:
...
@@ -312,6 +318,7 @@ You can also control the name used for scripts:
...
@@ -312,6 +318,7 @@ You can also control the name used for scripts:
>>> print system(buildout),
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Uninstalling demo
buildout: Installing demo
buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
>>> ls(sample_buildout, 'bin')
>>> ls(sample_buildout, 'bin')
- buildout
- buildout
...
@@ -341,6 +348,7 @@ extra-paths option:
...
@@ -341,6 +348,7 @@ extra-paths option:
>>> print system(buildout),
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Uninstalling demo
buildout: Installing demo
buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
Let's look at the script that was generated:
Let's look at the script that was generated:
...
@@ -389,6 +397,7 @@ to be included in generated scripts:
...
@@ -389,6 +397,7 @@ to be included in generated scripts:
>>> print system(buildout),
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Uninstalling demo
buildout: Installing demo
buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
>>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
>>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
#!/usr/local/bin/python2.4
#!/usr/local/bin/python2.4
...
@@ -438,6 +447,9 @@ declare entry points using the entry-points option:
...
@@ -438,6 +447,9 @@ declare entry points using the entry-points option:
>>> print system(buildout),
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Uninstalling demo
buildout: Installing 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')
>>> ls(sample_buildout, 'bin')
- alt
- alt
...
@@ -482,3 +494,4 @@ be made to contact an index server:
...
@@ -482,3 +494,4 @@ be made to contact an index server:
>>> print system(buildout),
>>> print system(buildout),
buildout: Uninstalling demo
buildout: Uninstalling demo
buildout: Installing demo
buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/foo.
zc.recipe.egg_/src/zc/recipe/egg/custom.txt
View file @
022bab05
...
@@ -192,6 +192,7 @@ Let's define a script that uses out ext demo:
...
@@ -192,6 +192,7 @@ Let's define a script that uses out ext demo:
buildout: Develop: /sample-buildout/demo
buildout: Develop: /sample-buildout/demo
buildout: Updating extdemo
buildout: Updating extdemo
buildout: Installing demo
buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
When we run the script, we'll 42 printed:
When we run the script, we'll 42 printed:
...
@@ -214,11 +215,13 @@ If we run the buildout in non-newest or offline modes:
...
@@ -214,11 +215,13 @@ If we run the buildout in non-newest or offline modes:
buildout: Develop: /sample-buildout/demo
buildout: Develop: /sample-buildout/demo
buildout: Updating extdemo
buildout: Updating extdemo
buildout: Updating demo
buildout: Updating demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> print system(buildout+' -o'),
>>> print system(buildout+' -o'),
buildout: Develop: /sample-buildout/demo
buildout: Develop: /sample-buildout/demo
buildout: Updating extdemo
buildout: Updating extdemo
buildout: Updating demo
buildout: Updating demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
We won't get an update.
We won't get an update.
...
@@ -235,6 +238,7 @@ will:
...
@@ -235,6 +238,7 @@ will:
buildout: Updating extdemo
buildout: Updating extdemo
zip_safe flag not set; analyzing archive contents...
zip_safe flag not set; analyzing archive contents...
buildout: Updating demo
buildout: Updating demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> ls(sample_buildout, 'develop-eggs')
>>> ls(sample_buildout, 'develop-eggs')
- demo.egg-link
- demo.egg-link
...
@@ -274,6 +278,7 @@ We can specify a specific version using the egg option:
...
@@ -274,6 +278,7 @@ We can specify a specific version using the egg option:
buildout: Installing extdemo
buildout: Installing extdemo
zip_safe flag not set; analyzing archive contents...
zip_safe flag not set; analyzing archive contents...
buildout: Installing demo
buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
>>> ls(sample_buildout, 'develop-eggs')
>>> ls(sample_buildout, 'develop-eggs')
- demo.egg-link
- demo.egg-link
...
@@ -383,6 +388,7 @@ set with a value of 2.
...
@@ -383,6 +388,7 @@ set with a value of 2.
buildout: Uninstalling extdemo
buildout: Uninstalling extdemo
buildout: Installing extdemo
buildout: Installing extdemo
buildout: Installing demo
buildout: Installing demo
zc.buildout.easy_install: Generated script /sample-buildout/bin/demo.
Our develop-eggs now includes an egg link for extdemo:
Our develop-eggs now includes an egg link for extdemo:
...
...
zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
View file @
022bab05
...
@@ -44,17 +44,19 @@ install the demo package using Python 2.3.
...
@@ -44,17 +44,19 @@ install the demo package using Python 2.3.
Now, if we run the buildout:
Now, if we run the buildout:
>>> import os
>>> import os
>>> os.chdir(sample_buildout)
>>> os.chdir(sample_buildout)
>>> buildout = os.path.join(sample_buildout, 'bin', 'buildout')
>>> buildout = os.path.join(sample_buildout, 'bin', 'buildout')
>>> print system(buildout),
>>> print system(buildout),
buildout: Installing demo
buildout: Installing demo
zc.buildout.easy_install: Getting new distribution for demo<0.3
zc.buildout.easy_install: Getting new distribution for demo<0.3
zc.buildout.easy_install: Got demo 0.2
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 demoneeded
zc.buildout.easy_install: Getting new distribution for setuptools
zc.buildout.easy_install: Getting new distribution for setuptools
zc.buildout.easy_install: Got setuptools 0.6
zc.buildout.easy_install: Got setuptools 0.6
zc.buildout.easy_install: Got demoneeded 1.1
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:
we'll get the Python 2.3 eggs for demo and demoneeded:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment