Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
genotoul-bioinfo
jflow
Commits
ea7f16b8
Commit
ea7f16b8
authored
Mar 09, 2017
by
Floreal Cabanettes
Browse files
add_path is now a set (prevent duplicates)
parent
aa33296e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/jflow/component.py
View file @
ea7f16b8
...
...
@@ -572,12 +572,11 @@ class Component(object):
return
new_ios
,
includes
def
add_python_execution
(
self
,
function
,
inputs
=
[],
outputs
=
[],
arguments
=
[],
includes
=
[],
add_path
=
li
st
(),
collect
=
False
,
local
=
False
,
map
=
False
,
cmd_format
=
""
):
add_path
=
s
e
t
(),
collect
=
False
,
local
=
False
,
map
=
False
,
cmd_format
=
""
):
workflow_dir
=
Path
(
os
.
path
.
dirname
(
inspect
.
getfile
(
self
.
__class__
))).
parent
lib_dir
=
str
(
workflow_dir
)
+
os
.
path
.
sep
+
"lib"
if
not
lib_dir
in
add_path
:
add_path
.
append
(
lib_dir
)
add_path
.
add
(
lib_dir
)
if
map
:
if
not
issubclass
(
inputs
.
__class__
,
list
)
or
not
issubclass
(
outputs
.
__class__
,
list
):
...
...
src/weaver/function.py
View file @
ea7f16b8
...
...
@@ -276,11 +276,11 @@ if __name__ == '__main__':
pass
if
add_path
:
add_path
+=
[
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
)),
'..'
),
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
)),
'..'
,
'..'
)]
add_path
.
update
(
[
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
)),
'..'
),
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
)),
'..'
,
'..'
)]
)
else
:
add_path
=
[
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
)),
'..'
),
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
)),
'..'
,
'..'
)
]
add_path
=
{
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
)),
'..'
),
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
)),
'..'
,
'..'
)
}
path
=
""
for
apath
in
add_path
:
path
+=
"sys.path.insert(0, '"
+
apath
+
"')
\n
"
...
...
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