Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
gridtk
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
software
gridtk
Commits
ed9f657b
Commit
ed9f657b
authored
12 years ago
by
Manuel Günther
Browse files
Options
Downloads
Patches
Plain Diff
Switched to the latest buildout version.
parent
cd062475
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
bootstrap.py
+59
-156
59 additions, 156 deletions
bootstrap.py
buildout.cfg
+7
-13
7 additions, 13 deletions
buildout.cfg
setup.py
+1
-1
1 addition, 1 deletion
setup.py
with
67 additions
and
170 deletions
bootstrap.py
+
59
−
156
View file @
ed9f657b
...
...
@@ -18,75 +18,10 @@ 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
,
urllib
,
urllib2
,
subprocess
import
os
,
shutil
,
sys
,
tempfile
from
optparse
import
OptionParser
if
sys
.
platform
==
'
win32
'
:
def
quote
(
c
):
if
'
'
in
c
:
return
'"
%s
"'
%
c
# work around spawn lamosity on windows
else
:
return
c
else
:
quote
=
str
# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
stdout
,
stderr
=
subprocess
.
Popen
(
[
sys
.
executable
,
'
-Sc
'
,
'
try:
\n
'
'
import ConfigParser
\n
'
'
except ImportError:
\n
'
'
print 1
\n
'
'
else:
\n
'
'
print 0
\n
'
],
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
).
communicate
()
has_broken_dash_S
=
bool
(
int
(
stdout
.
strip
()))
# In order to be more robust in the face of system Pythons, we want to
# run without site-packages loaded. This is somewhat tricky, in
# particular because Python 2.6's distutils imports site, so starting
# with the -S flag is not sufficient. However, we'll start with that:
if
not
has_broken_dash_S
and
'
site
'
in
sys
.
modules
:
# We will restart with python -S.
args
=
sys
.
argv
[:]
args
[
0
:
0
]
=
[
sys
.
executable
,
'
-S
'
]
args
=
map
(
quote
,
args
)
os
.
execv
(
sys
.
executable
,
args
)
# Now we are running with -S. We'll get the clean sys.path, import site
# because distutils will do it later, and then reset the path and clean
# out any namespace packages from site-packages that might have been
# loaded by .pth files.
clean_path
=
sys
.
path
[:]
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
'
))):
# This is a namespace package. Remove it.
sys
.
modules
.
pop
(
k
)
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.
value
=
'
file://%s
'
%
(
urllib
.
pathname2url
(
os
.
path
.
abspath
(
os
.
path
.
expanduser
(
value
))),)
if
opt_str
==
'
--download-base
'
and
not
value
.
endswith
(
'
/
'
):
# Download base needs a trailing slash to make the world happy.
value
+=
'
/
'
else
:
value
=
None
name
=
opt_str
[
2
:].
replace
(
'
-
'
,
'
_
'
)
setattr
(
parser
.
values
,
name
,
value
)
tmpeggs
=
tempfile
.
mkdtemp
()
usage
=
'''
\
[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
...
...
@@ -101,26 +36,8 @@ local resources, you can keep this script from going over the network.
'''
parser
=
OptionParser
(
usage
=
usage
)
parser
.
add_option
(
"
-v
"
,
"
--version
"
,
dest
=
"
version
"
,
help
=
"
use a specific zc.buildout version
"
)
parser
.
add_option
(
"
-d
"
,
"
--distribute
"
,
action
=
"
store_true
"
,
dest
=
"
use_distribute
"
,
default
=
False
,
help
=
"
Use Distribute rather than Setuptools.
"
)
parser
.
add_option
(
"
--setup-source
"
,
action
=
"
callback
"
,
dest
=
"
setup_source
"
,
callback
=
normalize_to_url
,
nargs
=
1
,
type
=
"
string
"
,
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
+
"
.
"
))
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
"
"
zc.buildout and either Setuptools or Distribute.
"
"
Defaults to PyPI.
"
))
parser
.
add_option
(
"
--eggs
"
,
help
=
(
"
Specify a directory for storing eggs. Defaults to
"
"
a temporary directory that is deleted when the
"
"
bootstrap script completes.
"
))
parser
.
add_option
(
"
-v
"
,
"
--version
"
,
help
=
"
use a specific zc.buildout version
"
)
parser
.
add_option
(
"
-t
"
,
"
--accept-buildout-test-releases
"
,
dest
=
'
accept_buildout_test_releases
'
,
action
=
"
store_true
"
,
default
=
False
,
...
...
@@ -130,49 +47,38 @@ parser.add_option("-t", "--accept-buildout-test-releases",
"
extensions for you. If you use this flag,
"
"
bootstrap and buildout will get the newest releases
"
"
even if they are alphas or betas.
"
))
parser
.
add_option
(
"
-c
"
,
None
,
action
=
"
store
"
,
dest
=
"
config
_
file
"
,
parser
.
add_option
(
"
-c
"
,
"
--
config
-
file
"
,
help
=
(
"
Specify the path to the buildout configuration
"
"
file to be used.
"
))
parser
.
add_option
(
"
-f
"
,
"
--find-links
"
,
help
=
(
"
Specify a URL to search for buildout releases
"
))
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
:
eggs_dir
=
tempfile
.
mkdtemp
()
options
,
args
=
parser
.
parse_args
()
if
options
.
setup_source
is
None
:
if
options
.
use_distribute
:
options
.
setup_source
=
distribute_source
else
:
options
.
setup_source
=
setuptools_source
if
options
.
accept_buildout_test_releases
:
args
.
append
(
'
buildout:accept-buildout-test-releases=true
'
)
args
.
append
(
'
bootstrap
'
)
######################################################################
# load/install distribute
to_reload
=
False
try
:
import
pkg_resources
import
setuptools
# A flag. Sometimes pkg_resources is installed alone.
import
pkg_resources
,
setuptools
if
not
hasattr
(
pkg_resources
,
'
_distribute
'
):
to_reload
=
True
raise
ImportError
except
ImportError
:
ez_code
=
urllib2
.
urlopen
(
options
.
setup_source
).
read
().
replace
(
'
\r\n
'
,
'
\n
'
)
ez
=
{}
exec
ez_code
in
ez
setup_args
=
dict
(
to_dir
=
eggs_dir
,
download_delay
=
0
)
if
options
.
download_base
:
setup_args
[
'
download_base
'
]
=
options
.
download_base
if
options
.
use_distribute
:
setup_args
[
'
no_fake
'
]
=
True
try
:
from
urllib.request
import
urlopen
except
ImportError
:
from
urllib2
import
urlopen
exec
(
urlopen
(
'
http://python-distribute.org/distribute_setup.py
'
).
read
(),
ez
)
setup_args
=
dict
(
to_dir
=
tmpeggs
,
download_delay
=
0
,
no_fake
=
True
)
ez
[
'
use_setuptools
'
](
**
setup_args
)
if
'
pkg_resources
'
in
sys
.
modules
:
reload
(
sys
.
modules
[
'
pkg_resources
'
])
if
to_reload
:
reload
(
pkg_resources
)
import
pkg_resources
# This does not (always?) update the default working set. We will
# do it.
...
...
@@ -180,31 +86,26 @@ except ImportError:
if
path
not
in
pkg_resources
.
working_set
.
entries
:
pkg_resources
.
working_set
.
add_entry
(
path
)
cmd
=
[
quote
(
sys
.
executable
),
'
-c
'
,
quote
(
'
from setuptools.command.easy_install import main; main()
'
),
'
-mqNxd
'
,
quote
(
eggs_dir
)]
######################################################################
# Install buildout
if
not
has_broken_dash_S
:
cmd
.
insert
(
1
,
'
-S
'
)
ws
=
pkg_resources
.
working_set
cmd
=
[
sys
.
executable
,
'
-c
'
,
'
from setuptools.command.easy_install import main; main()
'
,
'
-mZqNxd
'
,
tmpeggs
]
find_links
=
options
.
download_base
if
not
find_links
:
find_links
=
os
.
environ
.
get
(
'
bootstrap-testing-find-links
'
)
find_links
=
os
.
environ
.
get
(
'
bootstrap-testing-find-links
'
,
options
.
find_links
or
(
'
http://downloads.buildout.org/
'
if
options
.
accept_buildout_test_releases
else
None
)
)
if
find_links
:
cmd
.
extend
([
'
-f
'
,
quote
(
find_links
)
])
cmd
.
extend
([
'
-f
'
,
find_links
])
if
options
.
use_distribute
:
setup_requirement
=
'
distribute
'
else
:
setup_requirement
=
'
setuptools
'
ws
=
pkg_resources
.
working_set
setup_requirement_path
=
ws
.
find
(
pkg_resources
.
Requirement
.
parse
(
setup_requirement
)).
location
env
=
dict
(
os
.
environ
,
PYTHONPATH
=
setup_requirement_path
)
distribute_path
=
ws
.
find
(
pkg_resources
.
Requirement
.
parse
(
'
distribute
'
)).
location
requirement
=
'
zc.buildout
'
version
=
options
.
version
...
...
@@ -212,14 +113,13 @@ 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
):
return
False
return
True
index
=
setuptools
.
package_index
.
PackageIndex
(
search_path
=
[
setup_requirement
_path
])
search_path
=
[
distribute
_path
])
if
find_links
:
index
.
add_find_links
((
find_links
,))
req
=
pkg_resources
.
Requirement
.
parse
(
requirement
)
...
...
@@ -241,22 +141,25 @@ if version:
requirement
=
'
==
'
.
join
((
requirement
,
version
))
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
exitcode
=
os
.
spawnle
(
*
([
os
.
P_WAIT
,
sys
.
executable
]
+
cmd
+
[
env
]))
if
exitcode
!=
0
:
sys
.
stdout
.
flush
()
sys
.
stderr
.
flush
()
print
(
"
An error occurred when trying to install zc.buildout.
"
"
Look above this message for any errors that
"
"
were output by easy_install.
"
)
sys
.
exit
(
exitcode
)
if
subprocess
.
call
(
cmd
,
env
=
dict
(
os
.
environ
,
PYTHONPATH
=
distribute_path
))
!=
0
:
raise
Exception
(
"
Failed to execute command:
\n
%s
"
,
repr
(
cmd
)[
1
:
-
1
])
######################################################################
# Import and run buildout
ws
.
add_entry
(
eggs
_dir
)
ws
.
add_entry
(
tmp
eggs
)
ws
.
require
(
requirement
)
import
zc.buildout.buildout
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' 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
shutil
.
rmtree
(
eggs_dir
)
shutil
.
rmtree
(
tmpeggs
)
This diff is collapsed.
Click to expand it.
buildout.cfg
+
7
−
13
View file @
ed9f657b
[buildout]
parts
=
python sphinx
parts
=
scripts
develop
=
.
; required packages: our package
; optional package: ipdb (for debugging)
eggs
=
gridtk
ipdb
[python]
recipe
=
zc.recipe.egg
interpreter
=
python
eggs
=
${buildout:eggs}
; This section enables the generation of the documentation using bin/sphinx
[sphinx]
recipe
=
xbob.buildout:sphinx
eggs
=
${buildout:eggs}
source
=
${buildout:directory}/docs
build
=
${buildout:directory}/sphinx
[scripts]
recipe
=
xbob.buildout:scripts
This diff is collapsed.
Click to expand it.
setup.py
+
1
−
1
View file @
ed9f657b
...
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup
(
name
=
'
gridtk
'
,
version
=
'
0.3.
5
'
,
version
=
'
0.3.
6
'
,
description
=
'
SGE Grid Submission and Monitoring Tools for Idiap
'
,
url
=
'
https://github.com/idiap/gridtk
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment