diff --git a/Makefile b/Makefile index a978826..244e031 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # This file has been auto-generated. # All changes will be lost, see Projectfile. # -# Updated at 2017-01-19 12:12:07.294619 +# Updated at 2017-04-21 10:27:25.709949 PYTHON ?= $(shell which python) PYTHON_BASENAME ?= $(shell basename $(PYTHON)) @@ -10,6 +10,7 @@ PYTHON_REQUIREMENTS_DEV_FILE ?= requirements-dev.txt QUICK ?= VIRTUAL_ENV ?= .virtualenv-$(PYTHON_BASENAME) PIP ?= $(VIRTUAL_ENV)/bin/pip +PIP_INSTALL_OPTIONS ?= PYTEST ?= $(VIRTUAL_ENV)/bin/pytest PYTEST_OPTIONS ?= --capture=no --cov=bonobo --cov-report html SPHINX_OPTS ?= @@ -24,13 +25,13 @@ YAPF_OPTIONS ?= -rip # Installs the local project dependencies. install: $(VIRTUAL_ENV) if [ -z "$(QUICK)" ]; then \ - $(PIP) install -U pip wheel -r $(PYTHON_REQUIREMENTS_FILE) ; \ + $(PIP) install -U pip wheel $(PIP_INSTALL_OPTIONS) -r $(PYTHON_REQUIREMENTS_FILE) ; \ fi # Installs the local project dependencies, including development-only libraries. install-dev: $(VIRTUAL_ENV) if [ -z "$(QUICK)" ]; then \ - $(PIP) install -U pip wheel -r $(PYTHON_REQUIREMENTS_DEV_FILE) ; \ + $(PIP) install -U pip wheel $(PIP_INSTALL_OPTIONS) -r $(PYTHON_REQUIREMENTS_DEV_FILE) ; \ fi # Cleans up the local mess. diff --git a/Projectfile b/Projectfile index 2ef816b..0873ff4 100644 --- a/Projectfile +++ b/Projectfile @@ -57,11 +57,13 @@ data_files = [ entry_points = { 'console_scripts': [ - 'bonobo = bonobo.commands:entrypoint' + 'bonobo = bonobo.commands:entrypoint', + 'bb = bonobo.commands:entrypoint', ], 'bonobo.commands': [ 'init = bonobo.commands.init:register', 'run = bonobo.commands.run:register', + 'version = bonobo.commands.version:register', ], 'edgy.project.features': [ 'bonobo = bonobo.ext.edgy.project.feature:BonoboFeature' diff --git a/README.rst b/README.rst index 2d7a1f1..8f66ce6 100644 --- a/README.rst +++ b/README.rst @@ -65,13 +65,13 @@ Version 0.2 * Changelog * Migration guide * Update documentation -* Threaded does not terminate anymore +* Threaded does not terminate anymore (fixed ?) * More tests Bugs: -- KeyboardInterrupt does not work anymore. -- ThreadPool does not stop anymore. +- KeyboardInterrupt does not work anymore. (fixed ?) +- ThreadPool does not stop anymore. (fiexd ?) Configuration ............. diff --git a/bonobo/commands/version.py b/bonobo/commands/version.py new file mode 100644 index 0000000..332286a --- /dev/null +++ b/bonobo/commands/version.py @@ -0,0 +1,9 @@ +import bonobo + + +def execute(): + print('{} v.{}'.format(bonobo.__name__, bonobo.__version__)) + + +def register(parser): + return execute diff --git a/setup.py b/setup.py index a9b983c..e08d0ac 100644 --- a/setup.py +++ b/setup.py @@ -10,9 +10,12 @@ tolines = lambda c: list(filter(None, map(lambda s: s.strip(), c.split('\n')))) def read(filename, flt=None): - with open(filename) as f: - content = f.read().strip() - return flt(content) if callable(flt) else content + try: + with open(filename) as f: + content = f.read().strip() + return flt(content) if callable(flt) else content + except EnvironmentError: + return '' # Py3 compatibility hacks, borrowed from IPython. @@ -26,43 +29,53 @@ except NameError: version_ns = {} -execfile(os.path.join(root_dir, 'bonobo/_version.py'), version_ns) -version = version_ns.get('__version__', 'dev') +try: + execfile(os.path.join(root_dir, 'bonobo/_version.py'), version_ns) +except EnvironmentError: + version = 'dev' +else: + version = version_ns.get('__version__', 'dev') setup( name='bonobo', description='Bonobo', license='Apache License, Version 2.0', install_requires=[ - 'blessings >=1.6,<1.7', 'psutil >=5.0,<5.1', 'requests >=2.12,<2.13', 'stevedore >=1.19,<1.20', - 'toolz >=0.8,<0.9' + 'blessings >=1.6,<1.7', 'psutil >=5.0,<5.1', 'requests >=2.12,<2.13', + 'stevedore >=1.19,<1.20', 'toolz >=0.8,<0.9' ], version=version, long_description=read('README.rst'), classifiers=read('classifiers.txt', tolines), packages=find_packages(exclude=['ez_setup', 'example', 'test']), include_package_data=True, - data_files=[ - ( - 'share/jupyter/nbextensions/bonobo-jupyter', [ - 'bonobo/ext/jupyter/static/extension.js', 'bonobo/ext/jupyter/static/index.js', - 'bonobo/ext/jupyter/static/index.js.map' - ] - ) - ], + data_files=[('share/jupyter/nbextensions/bonobo-jupyter', [ + 'bonobo/ext/jupyter/static/extension.js', + 'bonobo/ext/jupyter/static/index.js', + 'bonobo/ext/jupyter/static/index.js.map' + ])], extras_require={ 'dev': [ - 'coverage >=4.3,<4.4', 'mock >=2.0,<2.1', 'nose >=1.3,<1.4', 'pylint >=1.6,<1.7', 'pytest >=3,<4', - 'pytest-cov >=2.4,<2.5', 'pytest-timeout >=1.2,<1.3', 'sphinx', 'sphinx_rtd_theme', 'yapf' + 'coverage >=4.3,<4.4', 'mock >=2.0,<2.1', 'nose >=1.3,<1.4', + 'pylint >=1.6,<1.7', 'pytest >=3,<4', 'pytest-cov >=2.4,<2.5', + 'pytest-timeout >=1.2,<1.3', 'sphinx', 'sphinx_rtd_theme', 'yapf' ], 'jupyter': ['jupyter >=1.0,<1.1', 'ipywidgets >=6.0.0.beta5'] }, entry_points={ - 'bonobo.commands': ['init = bonobo.commands.init:register', 'run = bonobo.commands.run:register'], - 'console_scripts': ['bonobo = bonobo.commands:entrypoint'], - 'edgy.project.features': ['bonobo = ' - 'bonobo.ext.edgy.project.feature:BonoboFeature'] + 'bonobo.commands': [ + 'init = bonobo.commands.init:register', + 'run = bonobo.commands.run:register', + 'version = bonobo.commands.version:register' + ], + 'console_scripts': [ + 'bonobo = bonobo.commands:entrypoint', + 'bb = bonobo.commands:entrypoint' + ], + 'edgy.project.features': + ['bonobo = ' + 'bonobo.ext.edgy.project.feature:BonoboFeature'] }, url='https://bonobo-project.org/', - download_url='https://github.com/python-bonobo/bonobo/tarball/{version}'.format(version=version), -) + download_url='https://github.com/python-bonobo/bonobo/tarball/{version}'. + format(version=version), )