paulin/bonobo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code formating.

Browse Source
This commit is contained in:
Romain Dorgueil
2017-10-22 18:05:39 +02:00
parent 28fe41c0bd
commit 3c453f0be7
11 changed files with 115 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,5 +1,5 @@
# This file has been auto-generated by Medikit. All changes will be lost. # Generated by Medikit 0.4a5 on 2017-10-22.
# Updated on 2017-10-21. # All changes will be overriden.
PACKAGE ?= bonobo PACKAGE ?= bonobo
PYTHON ?= $(shell which python) PYTHON ?= $(shell which python)

28
bonobo/commands/run.py
View File

@ -46,7 +46,17 @@ def _install_requirements(requirements):
importlib.reload(site) importlib.reload(site)
def read(filename, module, install=False, quiet=False, verbose=False, default_env_file=None, default_env=None, env_file=None, env=None): def read(
filename,
module,
install=False,
quiet=False,
verbose=False,
default_env_file=None,
default_env=None,
env_file=None,
env=None
):
import runpy import runpy
from bonobo import Graph, settings from bonobo import Graph, settings
@ -129,8 +139,20 @@ def set_env_var(e, override=False):
os.environ.setdefault(ename, evalue) os.environ.setdefault(ename, evalue)
def execute(filename, module, install=False, quiet=False, verbose=False, default_env_file=None, default_env=None, env_file=None, env=None): def execute(
graph, plugins, services = read(filename, module, install, quiet, verbose, default_env_file, default_env, env_file, env) filename,
module,
install=False,
quiet=False,
verbose=False,
default_env_file=None,
default_env=None,
env_file=None,
env=None
):
graph, plugins, services = read(
filename, module, install, quiet, verbose, default_env_file, default_env, env_file, env
)
return bonobo.run(graph, plugins=plugins, services=services) return bonobo.run(graph, plugins=plugins, services=services)

2
bonobo/ext/console.py
View File

@ -169,4 +169,4 @@ class ConsoleOutputPlugin(Plugin):
def memory_usage(): def memory_usage():
import os, psutil import os, psutil
process = psutil.Process(os.getpid()) process = psutil.Process(os.getpid())
return process.memory_info()[0] / float(2 ** 20) return process.memory_info()[0] / float(2**20)

2
bonobo/ext/google.py
View File

@ -7,7 +7,7 @@ from oauth2client.file import Storage
from oauth2client.tools import argparser from oauth2client.tools import argparser
HOME_DIR = os.path.expanduser('~') HOME_DIR = os.path.expanduser('~')
GOOGLE_SCOPES = ('https://www.googleapis.com/auth/spreadsheets',) GOOGLE_SCOPES = ('https://www.googleapis.com/auth/spreadsheets', )
GOOGLE_SECRETS = os.path.join(HOME_DIR, '.cache/secrets/client_secrets.json') GOOGLE_SECRETS = os.path.join(HOME_DIR, '.cache/secrets/client_secrets.json')

4
bonobo/structs/bags.py
View File

@ -96,7 +96,7 @@ class Bag:
@classmethod @classmethod
def inherit(cls, *args, **kwargs): def inherit(cls, *args, **kwargs):
return cls(*args, _flags=(INHERIT_INPUT,), **kwargs) return cls(*args, _flags=(INHERIT_INPUT, ), **kwargs)
def __eq__(self, other): def __eq__(self, other):
# XXX there are overlapping cases, but this is very handy for now. Let's think about it later. # XXX there are overlapping cases, but this is very handy for now. Let's think about it later.
@ -136,7 +136,7 @@ class Bag:
class LoopbackBag(Bag): class LoopbackBag(Bag):
default_flags = (LOOPBACK,) default_flags = (LOOPBACK, )
class ErrorBag(Bag): class ErrorBag(Bag):

2
bonobo/util/iterators.py
View File

@ -35,5 +35,3 @@ def tuplize(generator):
return tuple(generator(*args, **kwargs)) return tuple(generator(*args, **kwargs))
return tuplized return tuplized

4
bonobo/util/objects.py
View File

@ -142,10 +142,10 @@ class ValueHolder:
return divmod(other, self._value) return divmod(other, self._value)
def __pow__(self, other): def __pow__(self, other):
return self._value ** other return self._value**other
def __rpow__(self, other): def __rpow__(self, other):
return other ** self._value return other**self._value
def __ipow__(self, other): def __ipow__(self, other):
self._value **= other self._value **= other

2
requirements-docker.txt
View File

@ -1,6 +1,6 @@
-e .[docker] -e .[docker]
appdirs==1.4.3 appdirs==1.4.3
bonobo-docker==0.2.12 bonobo-docker==0.5.0
certifi==2017.7.27.1 certifi==2017.7.27.1
chardet==3.0.4 chardet==3.0.4
colorama==0.3.9 colorama==0.3.9

3
tests/execution/test_node.py
View File

@ -103,6 +103,7 @@ def test_node_dict_chained():
assert output[0] == {'id': 1, 'name': 'FOO'} assert output[0] == {'id': 1, 'name': 'FOO'}
assert output[1] == {'id': 2, 'name': 'BAR'} assert output[1] == {'id': 2, 'name': 'BAR'}
def test_node_tuple(): def test_node_tuple():
def f(): def f():
return 'foo', 'bar' return 'foo', 'bar'
@ -126,6 +127,7 @@ def test_node_tuple():
assert output[0] == ('foo', 'bar') assert output[0] == ('foo', 'bar')
assert output[1] == ('foo', 'baz') assert output[1] == ('foo', 'baz')
def test_node_tuple_chained(): def test_node_tuple_chained():
strategy = NaiveStrategy(GraphExecutionContextType=BufferingGraphExecutionContext) strategy = NaiveStrategy(GraphExecutionContextType=BufferingGraphExecutionContext)
@ -154,6 +156,7 @@ def test_node_tuple_chained():
assert output[0] == ('FOO', 'BAR') assert output[0] == ('FOO', 'BAR')
assert output[1] == ('FOO', 'BAZ') assert output[1] == ('FOO', 'BAZ')
def test_node_tuple_dict(): def test_node_tuple_dict():
def f(): def f():
return 'foo', 'bar', {'id': 1} return 'foo', 'bar', {'id': 1}

18
tests/structs/test_bags.py
View File

@ -99,22 +99,36 @@ def test_eq_operator_bag():
assert Bag('foo') != Token('foo') assert Bag('foo') != Token('foo')
assert Token('foo') != Bag('foo') assert Token('foo') != Bag('foo')
def test_eq_operator_tuple_mixed(): def test_eq_operator_tuple_mixed():
assert Bag('foo', bar='baz') == ('foo', {'bar': 'baz'}) assert Bag('foo', bar='baz') == ('foo', {'bar': 'baz'})
assert Bag('foo') == ('foo', {}) assert Bag('foo') == ('foo', {})
assert Bag() == ({}, ) assert Bag() == ({}, )
def test_eq_operator_tuple_not_mixed(): def test_eq_operator_tuple_not_mixed():
assert Bag('foo', 'bar') == ('foo', 'bar') assert Bag('foo', 'bar') == ('foo', 'bar')
assert Bag('foo') == ('foo', ) assert Bag('foo') == ('foo', )
assert Bag() == () assert Bag() == ()
def test_eq_operator_dict(): def test_eq_operator_dict():
assert Bag(foo='bar') == {'foo': 'bar'} assert Bag(foo='bar') == {'foo': 'bar'}
assert Bag(foo='bar', corp='acme') == {'foo': 'bar', 'corp': 'acme', } assert Bag(
assert Bag(foo='bar', corp='acme') == {'corp': 'acme', 'foo': 'bar', } foo='bar', corp='acme'
) == {
'foo': 'bar',
'corp': 'acme',
}
assert Bag(
foo='bar', corp='acme'
) == {
'corp': 'acme',
'foo': 'bar',
}
assert Bag() == {} assert Bag() == {}
def test_repr(): def test_repr():
bag = Bag('a', a=1) bag = Bag('a', a=1)
assert repr(bag) == "<Bag ('a', a=1)>" assert repr(bag) == "<Bag ('a', a=1)>"

107
tests/test_commands.py
View File

@ -129,8 +129,7 @@ class TestDefaultEnvFile(object):
def test_run_file_with_multiple_default_env_files(self, runner): def test_run_file_with_multiple_default_env_files(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', '--default-env-file', '.env_one', 'run', '--quiet', '--default-env-file', '.env_one', '--default-env-file', '.env_two',
'--default-env-file', '.env_two',
get_examples_path('environment/env_files/get_passed_env_file.py') get_examples_path('environment/env_files/get_passed_env_file.py')
) )
out = out.split('\n') out = out.split('\n')
@ -140,9 +139,8 @@ class TestDefaultEnvFile(object):
def test_run_module_with_default_env_file(self, runner): def test_run_module_with_default_env_file(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', '-m', 'run', '--quiet', '-m', 'bonobo.examples.environment.env_files.get_passed_env_file', '--default-env-file',
'bonobo.examples.environment.env_files.get_passed_env_file', '.env_one'
'--default-env-file', '.env_one'
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == '321' assert out[0] == '321'
@ -151,9 +149,14 @@ class TestDefaultEnvFile(object):
def test_run_module_with_multiple_default_env_files(self, runner): def test_run_module_with_multiple_default_env_files(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', '-m', 'run',
'--quiet',
'-m',
'bonobo.examples.environment.env_files.get_passed_env_file', 'bonobo.examples.environment.env_files.get_passed_env_file',
'--default-env-file', '.env_one', '--default-env-file', '.env_two', '--default-env-file',
'.env_one',
'--default-env-file',
'.env_two',
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == '321' assert out[0] == '321'
@ -165,9 +168,11 @@ class TestDefaultEnvFile(object):
class TestEnvFile(object): class TestEnvFile(object):
def test_run_file_with_file(self, runner): def test_run_file_with_file(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', 'run',
'--quiet',
get_examples_path('environment/env_files/get_passed_env_file.py'), get_examples_path('environment/env_files/get_passed_env_file.py'),
'--env-file', '.env_one', '--env-file',
'.env_one',
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == '321' assert out[0] == '321'
@ -176,9 +181,13 @@ class TestEnvFile(object):
def test_run_file_with_multiple_files(self, runner): def test_run_file_with_multiple_files(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', 'run',
'--quiet',
get_examples_path('environment/env_files/get_passed_env_file.py'), get_examples_path('environment/env_files/get_passed_env_file.py'),
'--env-file', '.env_one', '--env-file', '.env_two', '--env-file',
'.env_one',
'--env-file',
'.env_two',
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == '321' assert out[0] == '321'
@ -187,9 +196,12 @@ class TestEnvFile(object):
def test_run_module_with_file(self, runner): def test_run_module_with_file(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', '-m', 'run',
'--quiet',
'-m',
'bonobo.examples.environment.env_files.get_passed_env_file', 'bonobo.examples.environment.env_files.get_passed_env_file',
'--env-file', '.env_one', '--env-file',
'.env_one',
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == '321' assert out[0] == '321'
@ -198,9 +210,14 @@ class TestEnvFile(object):
def test_run_module_with_multiple_files(self, runner): def test_run_module_with_multiple_files(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', '-m', 'run',
'--quiet',
'-m',
'bonobo.examples.environment.env_files.get_passed_env_file', 'bonobo.examples.environment.env_files.get_passed_env_file',
'--env-file', '.env_one', '--env-file', '.env_two', '--env-file',
'.env_one',
'--env-file',
'.env_two',
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == '321' assert out[0] == '321'
@ -212,9 +229,13 @@ class TestEnvFile(object):
class TestEnvFileCombinations: class TestEnvFileCombinations:
def test_run_file_with_default_env_file_and_env_file(self, runner): def test_run_file_with_default_env_file_and_env_file(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', 'run',
'--quiet',
get_examples_path('environment/env_files/get_passed_env_file.py'), get_examples_path('environment/env_files/get_passed_env_file.py'),
'--default-env-file', '.env_one', '--env-file', '.env_two', '--default-env-file',
'.env_one',
'--env-file',
'.env_two',
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == '321' assert out[0] == '321'
@ -223,10 +244,16 @@ class TestEnvFileCombinations:
def test_run_file_with_default_env_file_and_env_file_and_env_vars(self, runner): def test_run_file_with_default_env_file_and_env_file_and_env_vars(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', 'run',
'--quiet',
get_examples_path('environment/env_files/get_passed_env_file.py'), get_examples_path('environment/env_files/get_passed_env_file.py'),
'--default-env-file', '.env_one', '--env-file', '.env_two', '--default-env-file',
'--env', 'TEST_USER_PASSWORD=SWEETpassWORD', '--env', '.env_one',
'--env-file',
'.env_two',
'--env',
'TEST_USER_PASSWORD=SWEETpassWORD',
'--env',
'MY_SECRET=444', 'MY_SECRET=444',
) )
out = out.split('\n') out = out.split('\n')
@ -240,8 +267,8 @@ class TestDefaultEnvVars:
def test_run_file_with_default_env_var(self, runner): def test_run_file_with_default_env_var(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', 'run', '--quiet',
get_examples_path('environment/env_vars/get_passed_env.py'), get_examples_path('environment/env_vars/get_passed_env.py'), '--default-env', 'USER=clowncity', '--env',
'--default-env', 'USER=clowncity', '--env', 'USER=ted' 'USER=ted'
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == 'user' assert out[0] == 'user'
@ -252,9 +279,8 @@ class TestDefaultEnvVars:
def test_run_file_with_default_env_vars(self, runner): def test_run_file_with_default_env_vars(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', 'run', '--quiet',
get_examples_path('environment/env_vars/get_passed_env.py'), get_examples_path('environment/env_vars/get_passed_env.py'), '--env', 'ENV_TEST_NUMBER=123', '--env',
'--env', 'ENV_TEST_NUMBER=123', '--env', 'ENV_TEST_USER=cwandrews', 'ENV_TEST_USER=cwandrews', '--default-env', "ENV_TEST_STRING='my_test_string'"
'--default-env', "ENV_TEST_STRING='my_test_string'"
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == 'cwandrews' assert out[0] == 'cwandrews'
@ -263,10 +289,8 @@ class TestDefaultEnvVars:
def test_run_module_with_default_env_var(self, runner): def test_run_module_with_default_env_var(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', '-m', 'run', '--quiet', '-m', 'bonobo.examples.environment.env_vars.get_passed_env', '--env',
'bonobo.examples.environment.env_vars.get_passed_env', 'ENV_TEST_NUMBER=123', '--default-env', 'ENV_TEST_STRING=string'
'--env', 'ENV_TEST_NUMBER=123',
'--default-env', 'ENV_TEST_STRING=string'
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == 'cwandrews' assert out[0] == 'cwandrews'
@ -275,10 +299,8 @@ class TestDefaultEnvVars:
def test_run_module_with_default_env_vars(self, runner): def test_run_module_with_default_env_vars(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', '-m', 'run', '--quiet', '-m', 'bonobo.examples.environment.env_vars.get_passed_env', '--env',
'bonobo.examples.environment.env_vars.get_passed_env', 'ENV_TEST_NUMBER=123', '--env', 'ENV_TEST_USER=cwandrews', '--default-env', "ENV_TEST_STRING='string'"
'--env', 'ENV_TEST_NUMBER=123', '--env', 'ENV_TEST_USER=cwandrews',
'--default-env', "ENV_TEST_STRING='string'"
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == 'cwandrews' assert out[0] == 'cwandrews'
@ -291,8 +313,7 @@ class TestEnvVars:
def test_run_file_with_env_var(self, runner): def test_run_file_with_env_var(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', 'run', '--quiet',
get_examples_path('environment/env_vars/get_passed_env.py'), get_examples_path('environment/env_vars/get_passed_env.py'), '--env', 'ENV_TEST_NUMBER=123'
'--env', 'ENV_TEST_NUMBER=123'
) )
out = out.split('\n') out = out.split('\n')
assert out[0] != 'test_user' assert out[0] != 'test_user'
@ -302,9 +323,8 @@ class TestEnvVars:
def test_run_file_with_env_vars(self, runner): def test_run_file_with_env_vars(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', 'run', '--quiet',
get_examples_path('environment/env_vars/get_passed_env.py'), get_examples_path('environment/env_vars/get_passed_env.py'), '--env', 'ENV_TEST_NUMBER=123', '--env',
'--env', 'ENV_TEST_NUMBER=123', '--env', 'ENV_TEST_USER=cwandrews', 'ENV_TEST_USER=cwandrews', '--env', "ENV_TEST_STRING='my_test_string'"
'--env', "ENV_TEST_STRING='my_test_string'"
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == 'cwandrews' assert out[0] == 'cwandrews'
@ -313,9 +333,8 @@ class TestEnvVars:
def test_run_module_with_env_var(self, runner): def test_run_module_with_env_var(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', '-m', 'run', '--quiet', '-m', 'bonobo.examples.environment.env_vars.get_passed_env', '--env',
'bonobo.examples.environment.env_vars.get_passed_env', 'ENV_TEST_NUMBER=123'
'--env', 'ENV_TEST_NUMBER=123'
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == 'cwandrews' assert out[0] == 'cwandrews'
@ -324,10 +343,8 @@ class TestEnvVars:
def test_run_module_with_env_vars(self, runner): def test_run_module_with_env_vars(self, runner):
out, err = runner( out, err = runner(
'run', '--quiet', '-m', 'run', '--quiet', '-m', 'bonobo.examples.environment.env_vars.get_passed_env', '--env',
'bonobo.examples.environment.env_vars.get_passed_env', 'ENV_TEST_NUMBER=123', '--env', 'ENV_TEST_USER=cwandrews', '--env', "ENV_TEST_STRING='my_test_string'"
'--env', 'ENV_TEST_NUMBER=123', '--env', 'ENV_TEST_USER=cwandrews',
'--env', "ENV_TEST_STRING='my_test_string'"
) )
out = out.split('\n') out = out.split('\n')
assert out[0] == 'cwandrews' assert out[0] == 'cwandrews'