adds version command, adds bb alias
This commit is contained in:
7
Makefile
7
Makefile
@ -1,7 +1,7 @@
|
|||||||
# This file has been auto-generated.
|
# This file has been auto-generated.
|
||||||
# All changes will be lost, see Projectfile.
|
# 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 ?= $(shell which python)
|
||||||
PYTHON_BASENAME ?= $(shell basename $(PYTHON))
|
PYTHON_BASENAME ?= $(shell basename $(PYTHON))
|
||||||
@ -10,6 +10,7 @@ PYTHON_REQUIREMENTS_DEV_FILE ?= requirements-dev.txt
|
|||||||
QUICK ?=
|
QUICK ?=
|
||||||
VIRTUAL_ENV ?= .virtualenv-$(PYTHON_BASENAME)
|
VIRTUAL_ENV ?= .virtualenv-$(PYTHON_BASENAME)
|
||||||
PIP ?= $(VIRTUAL_ENV)/bin/pip
|
PIP ?= $(VIRTUAL_ENV)/bin/pip
|
||||||
|
PIP_INSTALL_OPTIONS ?=
|
||||||
PYTEST ?= $(VIRTUAL_ENV)/bin/pytest
|
PYTEST ?= $(VIRTUAL_ENV)/bin/pytest
|
||||||
PYTEST_OPTIONS ?= --capture=no --cov=bonobo --cov-report html
|
PYTEST_OPTIONS ?= --capture=no --cov=bonobo --cov-report html
|
||||||
SPHINX_OPTS ?=
|
SPHINX_OPTS ?=
|
||||||
@ -24,13 +25,13 @@ YAPF_OPTIONS ?= -rip
|
|||||||
# Installs the local project dependencies.
|
# Installs the local project dependencies.
|
||||||
install: $(VIRTUAL_ENV)
|
install: $(VIRTUAL_ENV)
|
||||||
if [ -z "$(QUICK)" ]; then \
|
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
|
fi
|
||||||
|
|
||||||
# Installs the local project dependencies, including development-only libraries.
|
# Installs the local project dependencies, including development-only libraries.
|
||||||
install-dev: $(VIRTUAL_ENV)
|
install-dev: $(VIRTUAL_ENV)
|
||||||
if [ -z "$(QUICK)" ]; then \
|
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
|
fi
|
||||||
|
|
||||||
# Cleans up the local mess.
|
# Cleans up the local mess.
|
||||||
|
|||||||
@ -57,11 +57,13 @@ data_files = [
|
|||||||
|
|
||||||
entry_points = {
|
entry_points = {
|
||||||
'console_scripts': [
|
'console_scripts': [
|
||||||
'bonobo = bonobo.commands:entrypoint'
|
'bonobo = bonobo.commands:entrypoint',
|
||||||
|
'bb = bonobo.commands:entrypoint',
|
||||||
],
|
],
|
||||||
'bonobo.commands': [
|
'bonobo.commands': [
|
||||||
'init = bonobo.commands.init:register',
|
'init = bonobo.commands.init:register',
|
||||||
'run = bonobo.commands.run:register',
|
'run = bonobo.commands.run:register',
|
||||||
|
'version = bonobo.commands.version:register',
|
||||||
],
|
],
|
||||||
'edgy.project.features': [
|
'edgy.project.features': [
|
||||||
'bonobo = bonobo.ext.edgy.project.feature:BonoboFeature'
|
'bonobo = bonobo.ext.edgy.project.feature:BonoboFeature'
|
||||||
|
|||||||
@ -65,13 +65,13 @@ Version 0.2
|
|||||||
* Changelog
|
* Changelog
|
||||||
* Migration guide
|
* Migration guide
|
||||||
* Update documentation
|
* Update documentation
|
||||||
* Threaded does not terminate anymore
|
* Threaded does not terminate anymore (fixed ?)
|
||||||
* More tests
|
* More tests
|
||||||
|
|
||||||
Bugs:
|
Bugs:
|
||||||
|
|
||||||
- KeyboardInterrupt does not work anymore.
|
- KeyboardInterrupt does not work anymore. (fixed ?)
|
||||||
- ThreadPool does not stop anymore.
|
- ThreadPool does not stop anymore. (fiexd ?)
|
||||||
|
|
||||||
Configuration
|
Configuration
|
||||||
.............
|
.............
|
||||||
|
|||||||
9
bonobo/commands/version.py
Normal file
9
bonobo/commands/version.py
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
import bonobo
|
||||||
|
|
||||||
|
|
||||||
|
def execute():
|
||||||
|
print('{} v.{}'.format(bonobo.__name__, bonobo.__version__))
|
||||||
|
|
||||||
|
|
||||||
|
def register(parser):
|
||||||
|
return execute
|
||||||
45
setup.py
45
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):
|
def read(filename, flt=None):
|
||||||
|
try:
|
||||||
with open(filename) as f:
|
with open(filename) as f:
|
||||||
content = f.read().strip()
|
content = f.read().strip()
|
||||||
return flt(content) if callable(flt) else content
|
return flt(content) if callable(flt) else content
|
||||||
|
except EnvironmentError:
|
||||||
|
return ''
|
||||||
|
|
||||||
|
|
||||||
# Py3 compatibility hacks, borrowed from IPython.
|
# Py3 compatibility hacks, borrowed from IPython.
|
||||||
@ -26,7 +29,11 @@ except NameError:
|
|||||||
|
|
||||||
|
|
||||||
version_ns = {}
|
version_ns = {}
|
||||||
|
try:
|
||||||
execfile(os.path.join(root_dir, 'bonobo/_version.py'), version_ns)
|
execfile(os.path.join(root_dir, 'bonobo/_version.py'), version_ns)
|
||||||
|
except EnvironmentError:
|
||||||
|
version = 'dev'
|
||||||
|
else:
|
||||||
version = version_ns.get('__version__', 'dev')
|
version = version_ns.get('__version__', 'dev')
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
@ -34,35 +41,41 @@ setup(
|
|||||||
description='Bonobo',
|
description='Bonobo',
|
||||||
license='Apache License, Version 2.0',
|
license='Apache License, Version 2.0',
|
||||||
install_requires=[
|
install_requires=[
|
||||||
'blessings >=1.6,<1.7', 'psutil >=5.0,<5.1', 'requests >=2.12,<2.13', 'stevedore >=1.19,<1.20',
|
'blessings >=1.6,<1.7', 'psutil >=5.0,<5.1', 'requests >=2.12,<2.13',
|
||||||
'toolz >=0.8,<0.9'
|
'stevedore >=1.19,<1.20', 'toolz >=0.8,<0.9'
|
||||||
],
|
],
|
||||||
version=version,
|
version=version,
|
||||||
long_description=read('README.rst'),
|
long_description=read('README.rst'),
|
||||||
classifiers=read('classifiers.txt', tolines),
|
classifiers=read('classifiers.txt', tolines),
|
||||||
packages=find_packages(exclude=['ez_setup', 'example', 'test']),
|
packages=find_packages(exclude=['ez_setup', 'example', 'test']),
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
data_files=[
|
data_files=[('share/jupyter/nbextensions/bonobo-jupyter', [
|
||||||
(
|
'bonobo/ext/jupyter/static/extension.js',
|
||||||
'share/jupyter/nbextensions/bonobo-jupyter', [
|
'bonobo/ext/jupyter/static/index.js',
|
||||||
'bonobo/ext/jupyter/static/extension.js', 'bonobo/ext/jupyter/static/index.js',
|
|
||||||
'bonobo/ext/jupyter/static/index.js.map'
|
'bonobo/ext/jupyter/static/index.js.map'
|
||||||
]
|
])],
|
||||||
)
|
|
||||||
],
|
|
||||||
extras_require={
|
extras_require={
|
||||||
'dev': [
|
'dev': [
|
||||||
'coverage >=4.3,<4.4', 'mock >=2.0,<2.1', 'nose >=1.3,<1.4', 'pylint >=1.6,<1.7', 'pytest >=3,<4',
|
'coverage >=4.3,<4.4', 'mock >=2.0,<2.1', 'nose >=1.3,<1.4',
|
||||||
'pytest-cov >=2.4,<2.5', 'pytest-timeout >=1.2,<1.3', 'sphinx', 'sphinx_rtd_theme', 'yapf'
|
'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']
|
'jupyter': ['jupyter >=1.0,<1.1', 'ipywidgets >=6.0.0.beta5']
|
||||||
},
|
},
|
||||||
entry_points={
|
entry_points={
|
||||||
'bonobo.commands': ['init = bonobo.commands.init:register', 'run = bonobo.commands.run:register'],
|
'bonobo.commands': [
|
||||||
'console_scripts': ['bonobo = bonobo.commands:entrypoint'],
|
'init = bonobo.commands.init:register',
|
||||||
'edgy.project.features': ['bonobo = '
|
'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']
|
'bonobo.ext.edgy.project.feature:BonoboFeature']
|
||||||
},
|
},
|
||||||
url='https://bonobo-project.org/',
|
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), )
|
||||||
|
|||||||
Reference in New Issue
Block a user