Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
850fb7bb
Commit
850fb7bb
authored
Mar 02, 2013
by
Hanno Schlichting
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.13'
parents
834cc7ff
4d749067
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
21 deletions
+36
-21
bootstrap.py
bootstrap.py
+34
-17
versions.cfg
versions.cfg
+2
-4
No files found.
bootstrap.py
View file @
850fb7bb
...
...
@@ -18,13 +18,13 @@ The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file.
"""
import
os
,
shutil
,
sys
,
tempfile
,
textwrap
,
urllib
,
urllib2
,
subprocess
import
os
,
shutil
,
sys
,
tempfile
,
urllib
,
urllib2
,
subprocess
from
optparse
import
OptionParser
if
sys
.
platform
==
'win32'
:
def
quote
(
c
):
if
' '
in
c
:
return
'"%s"'
%
c
# work around spawn lamosity on windows
return
'"%s"'
%
c
# work around spawn lamosity on windows
else
:
return
c
else
:
...
...
@@ -57,13 +57,13 @@ if not has_broken_dash_S and 'site' in sys.modules:
# out any namespace packages from site-packages that might have been
# loaded by .pth files.
clean_path
=
sys
.
path
[:]
import
site
import
site
# imported because of its side effects
sys
.
path
[:]
=
clean_path
for
k
,
v
in
sys
.
modules
.
items
():
if
k
in
(
'setuptools'
,
'pkg_resources'
)
or
(
hasattr
(
v
,
'__path__'
)
and
len
(
v
.
__path__
)
==
1
and
not
os
.
path
.
exists
(
os
.
path
.
join
(
v
.
__path__
[
0
],
'__init__.py'
))):
len
(
v
.
__path__
)
==
1
and
not
os
.
path
.
exists
(
os
.
path
.
join
(
v
.
__path__
[
0
],
'__init__.py'
))):
# This is a namespace package. Remove it.
sys
.
modules
.
pop
(
k
)
...
...
@@ -72,10 +72,11 @@ is_jython = sys.platform.startswith('java')
setuptools_source
=
'http://peak.telecommunity.com/dist/ez_setup.py'
distribute_source
=
'http://python-distribute.org/distribute_setup.py'
# parsing arguments
def
normalize_to_url
(
option
,
opt_str
,
value
,
parser
):
if
value
:
if
'://'
not
in
value
:
# It doesn't smell like a URL.
if
'://'
not
in
value
:
# It doesn't smell like a URL.
value
=
'file://%s'
%
(
urllib
.
pathname2url
(
os
.
path
.
abspath
(
os
.
path
.
expanduser
(
value
))),)
...
...
@@ -110,7 +111,7 @@ parser.add_option("--setup-source", action="callback", dest="setup_source",
help
=
(
"Specify a URL or file location for the setup file. "
"If you use Setuptools, this will default to "
+
setuptools_source
+
"; if you use Distribute, this "
"will default to "
+
distribute_source
+
"."
))
"will default to "
+
distribute_source
+
"."
))
parser
.
add_option
(
"--download-base"
,
action
=
"callback"
,
dest
=
"download_base"
,
callback
=
normalize_to_url
,
nargs
=
1
,
type
=
"string"
,
help
=
(
"Specify a URL or directory for downloading "
...
...
@@ -135,10 +136,6 @@ parser.add_option("-c", None, action="store", dest="config_file",
options
,
args
=
parser
.
parse_args
()
# if -c was provided, we push it back into args for buildout's main function
if
options
.
config_file
is
not
None
:
args
+=
[
'-c'
,
options
.
config_file
]
if
options
.
eggs
:
eggs_dir
=
os
.
path
.
abspath
(
os
.
path
.
expanduser
(
options
.
eggs
))
else
:
...
...
@@ -151,12 +148,11 @@ if options.setup_source is None:
options
.
setup_source
=
setuptools_source
if
options
.
accept_buildout_test_releases
:
args
.
append
(
'buildout:accept-buildout-test-releases=true'
)
args
.
append
(
'bootstrap'
)
args
.
insert
(
0
,
'buildout:accept-buildout-test-releases=true'
)
try
:
import
pkg_resources
import
setuptools
# A flag. Sometimes pkg_resources is installed alone.
import
setuptools
# A flag. Sometimes pkg_resources is installed alone.
if
not
hasattr
(
pkg_resources
,
'_distribute'
):
raise
ImportError
except
ImportError
:
...
...
@@ -169,6 +165,8 @@ except ImportError:
setup_args
[
'download_base'
]
=
options
.
download_base
if
options
.
use_distribute
:
setup_args
[
'no_fake'
]
=
True
if
sys
.
version_info
[:
2
]
==
(
2
,
4
):
setup_args
[
'version'
]
=
'0.6.32'
ez
[
'use_setuptools'
](
**
setup_args
)
if
'pkg_resources'
in
sys
.
modules
:
reload
(
sys
.
modules
[
'pkg_resources'
])
...
...
@@ -191,6 +189,8 @@ if not has_broken_dash_S:
find_links
=
options
.
download_base
if
not
find_links
:
find_links
=
os
.
environ
.
get
(
'bootstrap-testing-find-links'
)
if
not
find_links
and
options
.
accept_buildout_test_releases
:
find_links
=
'http://downloads.buildout.org/'
if
find_links
:
cmd
.
extend
([
'-f'
,
quote
(
find_links
)])
...
...
@@ -211,6 +211,7 @@ if version is None and not options.accept_buildout_test_releases:
# Figure out the most recent final version of zc.buildout.
import
setuptools.package_index
_final_parts
=
'*final-'
,
'*final'
def
_final_version
(
parsed_version
):
for
part
in
parsed_version
:
if
(
part
[:
1
]
==
'*'
)
and
(
part
not
in
_final_parts
):
...
...
@@ -226,6 +227,8 @@ if version is None and not options.accept_buildout_test_releases:
bestv
=
None
for
dist
in
index
[
req
.
project_name
]:
distv
=
dist
.
parsed_version
if
distv
>=
pkg_resources
.
parse_version
(
'2dev'
):
continue
if
_final_version
(
distv
):
if
bestv
is
None
or
distv
>
bestv
:
best
=
[
dist
]
...
...
@@ -235,14 +238,18 @@ if version is None and not options.accept_buildout_test_releases:
if
best
:
best
.
sort
()
version
=
best
[
-
1
].
version
if
version
:
requirement
=
'=='
.
join
((
requirement
,
version
))
requirement
+=
'=='
+
version
else
:
requirement
+=
'<2dev'
cmd
.
append
(
requirement
)
if
is_jython
:
import
subprocess
exitcode
=
subprocess
.
Popen
(
cmd
,
env
=
env
).
wait
()
else
:
# Windows prefers this, apparently; otherwise we would prefer subprocess
else
:
# Windows prefers this, apparently; otherwise we would prefer subprocess
exitcode
=
os
.
spawnle
(
*
([
os
.
P_WAIT
,
sys
.
executable
]
+
cmd
+
[
env
]))
if
exitcode
!=
0
:
sys
.
stdout
.
flush
()
...
...
@@ -255,6 +262,16 @@ if exitcode != 0:
ws
.
add_entry
(
eggs_dir
)
ws
.
require
(
requirement
)
import
zc.buildout.buildout
# If there isn't already a command in the args, add bootstrap
if
not
[
a
for
a
in
args
if
'='
not
in
a
]:
args
.
append
(
'bootstrap'
)
# if -c was provided, we push it back into args for buildout's main function
if
options
.
config_file
is
not
None
:
args
[
0
:
0
]
=
[
'-c'
,
options
.
config_file
]
zc
.
buildout
.
buildout
.
main
(
args
)
if
not
options
.
eggs
:
# clean up temporary egg directory
if
not
options
.
eggs
:
# clean up temporary egg directory
shutil
.
rmtree
(
eggs_dir
)
versions.cfg
View file @
850fb7bb
...
...
@@ -32,11 +32,9 @@ Products.PythonScripts = 2.13.2
Products.StandardCacheManagers = 2.13.0
# ZTK KGS overrides
distribute = 0.6.29
docutils = 0.9.1
manuel = 1.6.0
mr.developer = 1.22
python-gettext = 1
.2
zc.buildout = 1.7.1
zc.recipe.egg = 1.3
.2
# Zope2 dependencies
repoze.retry = 1.2
...
...
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