diff options
| -rw-r--r-- | rambo/__init__.py | 3 | ||||
| -rw-r--r-- | rambo/__main__.py | 7 | ||||
| -rwxr-xr-x | rambo/rambo.py | 13 | ||||
| -rw-r--r-- | setup.py | 4 |
4 files changed, 12 insertions, 15 deletions
diff --git a/rambo/__init__.py b/rambo/__init__.py index 3a180c1..dce4f7f 100644 --- a/rambo/__init__.py +++ b/rambo/__init__.py @@ -1,6 +1,5 @@ -__all__ = ["rambo"] - from .rambo import __version__ from .rambo import Meta from .rambo import MetaSet +__all__ = ["rambo"] diff --git a/rambo/__main__.py b/rambo/__main__.py index 8f0eca2..3051676 100644 --- a/rambo/__main__.py +++ b/rambo/__main__.py @@ -9,15 +9,16 @@ import os import sys import argparse from . import rambo -#from ._version import __version__ -#from .rambo import * + def main(argv=None): if argv is None: argv = sys.argv - parser = argparse.ArgumentParser(prog='rambo') + parser = argparse.ArgumentParser( + prog='rambo', + description='Recipe Analyzer and Multi-Package Build Optimizer') parser.add_argument('-p', '--platform', type=str) parser.add_argument( '--python', diff --git a/rambo/rambo.py b/rambo/rambo.py index f8b65c0..7c8ff58 100755 --- a/rambo/rambo.py +++ b/rambo/rambo.py @@ -19,13 +19,12 @@ from ._version import __version__ try: import conda_build.api except ImportError: - raise ImportError('conda-build must be installed order to use this \n' - 'tool. Either conda-build is not installed, or you \n' - 'are working in an activated conda environment. \n' - 'If conda-build is installed deactivate the \n' - 'environment currently enabled or explicitly switch \n' - 'to the conda "root" environment to allow use of\n' - 'conda-build.') + print('conda-build must be installed order to use this tool. \n' + 'Either conda-build is not installed, or you are working in an \n' + 'activated conda environment. \n' + 'If conda-build is installed deactivate the environment currently \n' + 'enabled or explicitly switch to the conda "root" environment to \n' + 'allow use of conda-build.') DEFAULT_MINIMUM_NUMPY_VERSION = '1.11' @@ -22,7 +22,5 @@ setup( ], packages=find_packages(), package_data={'': ['README.md', 'LICENSE.txt']}, - entry_points = { - 'console_scripts': ['rambo=rambo.__main__:main'], - } + entry_points={'console_scripts': ['rambo=rambo.__main__:main'], } ) |