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
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
isaak yansane-sisk
slapos.buildout
Commits
6a48ee6e
Commit
6a48ee6e
authored
Aug 27, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add setup-eggs option in zc.recipe.egg:custom.
parent
21f6cba1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
4 deletions
+28
-4
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+7
-4
zc.recipe.egg_/src/zc/recipe/egg/custom.py
zc.recipe.egg_/src/zc/recipe/egg/custom.py
+17
-0
zc.recipe.egg_/src/zc/recipe/egg/custom.rst
zc.recipe.egg_/src/zc/recipe/egg/custom.rst
+4
-0
No files found.
src/zc/buildout/easy_install.py
View file @
6a48ee6e
...
...
@@ -321,10 +321,13 @@ class Installer:
tmp
=
tempfile
.
mkdtemp
(
dir
=
dest
)
try
:
path
=
setuptools_loc
path_list
=
[
setuptools_loc
]
extra_path
=
os
.
environ
.
get
(
'PYTHONEXTRAPATH'
)
if
extra_path
:
path_list
+=
extra_path
.
split
(
os
.
pathsep
)
args
=
[
sys
.
executable
,
'-c'
,
(
'import sys; sys.path[0:0] =
[%r]; '
%
path
)
+
(
'import sys; sys.path[0:0] =
%r; '
%
path_list
)
+
_easy_install_cmd
,
'-mZUNxd'
,
tmp
]
level
=
logger
.
getEffectiveLevel
()
if
level
>
0
:
...
...
@@ -335,8 +338,8 @@ class Installer:
args
.
append
(
spec
)
if
level
<=
logging
.
DEBUG
:
logger
.
debug
(
'Running easy_install:
\
n
"%s"
\
n
path
=%s
\
n
'
,
'" "'
.
join
(
args
),
path
)
logger
.
debug
(
'Running easy_install:
\
n
"%s"
\
n
path
_list=%r
\
n
'
,
'" "'
.
join
(
args
),
path
_list
)
sys
.
stdout
.
flush
()
# We want any pending output first
...
...
zc.recipe.egg_/src/zc/recipe/egg/custom.py
View file @
6a48ee6e
...
...
@@ -83,6 +83,23 @@ class Custom(Base):
distribution
=
options
.
get
(
'egg'
,
options
.
get
(
'eggs'
,
self
.
name
)
).
strip
()
setup_eggs
=
[
r
.
strip
()
for
r
in
options
.
get
(
'setup-eggs'
,
''
).
split
(
'
\
n
'
)
if
r
.
strip
()]
if
setup_eggs
:
ws
=
zc
.
buildout
.
easy_install
.
install
(
setup_eggs
,
options
[
'_e'
],
links
=
self
.
links
,
index
=
self
.
index
,
executable
=
sys
.
executable
,
path
=
[
options
[
'_d'
],
options
[
'_e'
]],
newest
=
self
.
newest
,
)
extra_path
=
os
.
pathsep
.
join
(
ws
.
entries
)
self
.
environment
[
'PYTHONEXTRAPATH'
]
=
os
.
environ
[
'PYTHONEXTRAPATH'
]
=
extra_path
self
.
_set_environment
()
try
:
return
zc
.
buildout
.
easy_install
.
build
(
...
...
zc.recipe.egg_/src/zc/recipe/egg/custom.rst
View file @
6a48ee6e
...
...
@@ -20,6 +20,10 @@ rpath
A new-line separated list of directories to search for dynamic libraries
at run time.
setup-eggs
A new-line separated list of eggs that need to be installed
beforehand. It is useful to meet the `setup_requires` requirement.
define
A comma-separated list of names of C preprocessor variables to
define.
...
...
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