Merge pull request #91 from hartym/develop

Doc and fixes.
This commit is contained in:
Romain Dorgueil
2017-05-28 14:19:54 -07:00
committed by GitHub
22 changed files with 313 additions and 112 deletions

View File

@ -5,6 +5,7 @@ from stevedore import ExtensionManager
def entrypoint(args=None):
logging.basicConfig()
parser = argparse.ArgumentParser()
subparsers = parser.add_subparsers(dest='command')
@ -19,9 +20,7 @@ def entrypoint(args=None):
except Exception:
logging.exception('Error while loading command {}.'.format(ext.name))
mgr = ExtensionManager(
namespace='bonobo.commands',
)
mgr = ExtensionManager(namespace='bonobo.commands')
mgr.map(register_extension)
args = parser.parse_args(args).__dict__

View File

@ -1,3 +1,4 @@
import importlib
import os
import runpy
@ -44,7 +45,13 @@ def execute(filename, module, install=False, quiet=False, verbose=False):
if os.path.isdir(filename):
if install:
requirements = os.path.join(filename, 'requirements.txt')
pip.main(['install', '-qr', requirements])
pip.main(['install', '-r', requirements])
# Some shenanigans to be sure everything is importable after this, especially .egg-link files which
# are referenced in *.pth files and apparently loaded by site.py at some magic bootstrap moment of the
# python interpreter.
pip.utils.pkg_resources = importlib.reload(pip.utils.pkg_resources)
import site
importlib.reload(site)
filename = os.path.join(filename, DEFAULT_GRAPH_FILENAME)
elif install:
raise RuntimeError('Cannot --install on a file (only available for dirs containing requirements.txt).')