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

Reverts/Fixes #16 (removes bb alias).

Browse Source
This commit is contained in:
Romain Dorgueil
2017-04-24 21:36:27 +02:00
parent 476923dc44
commit 9fc2e0ef94
3 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -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-04-23 14:52:31.862565 # Updated at 2017-04-24 21:35:29.734614
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.

1
Projectfile
View File

@ -59,7 +59,6 @@ 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',

93
setup.py
View File

@ -8,63 +8,72 @@ root_dir = os.path.dirname(os.path.abspath(__file__))
tolines = lambda c: list(filter(None, map(lambda s: s.strip(), c.split('\n')))) 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: 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 FileNotFoundError: except EnvironmentError:
return '' return ''
# Py3 compatibility hacks, borrowed from IPython. # Py3 compatibility hacks, borrowed from IPython.
try: try:
execfile execfile
except NameError: except NameError:
def execfile(fname, globs, locs=None): def execfile(fname, globs, locs=None):
locs = locs or globs locs = locs or globs
exec(compile(open(fname).read(), fname, "exec"), globs, locs) exec(compile(open(fname).read(), fname, "exec"), globs, locs)
version_ns = {} version_ns = {}
execfile(os.path.join(root_dir, 'bonobo/_version.py'), version_ns) try:
version = version_ns.get('__version__', 'dev') execfile(os.path.join(root_dir, 'bonobo/_version.py'), version_ns)
except EnvironmentError:
version = 'dev'
else:
version = version_ns.get('__version__', 'dev')
setup( setup(
name = 'bonobo', name='bonobo',
description = 'Bonobo', description='Bonobo',
license = 'Apache License, Version 2.0', license='Apache License, Version 2.0',
install_requires = ['blessings >=1.6,<1.7', install_requires=[
'colorama >=0.3,<0.4', 'blessings >=1.6,<1.7', 'colorama >=0.3,<0.4', 'psutil >=5.0,<5.1',
'psutil >=5.0,<5.1', 'requests >=2.12,<2.13', 'stevedore >=1.19,<1.20', 'toolz >=0.8,<0.9'
'requests >=2.12,<2.13', ],
'stevedore >=1.19,<1.20', version=version,
'toolz >=0.8,<0.9'], long_description=read('README.rst'),
version = version, classifiers=read('classifiers.txt', tolines),
long_description = read('README.rst'), packages=find_packages(exclude=['ez_setup', 'example', 'test']),
classifiers = read('classifiers.txt', tolines), include_package_data=True,
packages = find_packages(exclude=['ez_setup', 'example', 'test']), data_files=[('share/jupyter/nbextensions/bonobo-jupyter', [
include_package_data = True, 'bonobo/ext/jupyter/static/extension.js',
data_files = [('share/jupyter/nbextensions/bonobo-jupyter', 'bonobo/ext/jupyter/static/index.js',
['bonobo/ext/jupyter/static/extension.js', 'bonobo/ext/jupyter/static/index.js.map'
'bonobo/ext/jupyter/static/index.js', ])],
'bonobo/ext/jupyter/static/index.js.map'])], extras_require={
extras_require = {'dev': ['coverage >=4.3,<4.4', 'dev': [
'mock >=2.0,<2.1', 'coverage >=4.3,<4.4', 'mock >=2.0,<2.1', 'nose >=1.3,<1.4',
'nose >=1.3,<1.4', 'pylint >=1.6,<1.7', 'pytest >=3,<4', 'pytest-cov >=2.4,<2.5',
'pylint >=1.6,<1.7', 'pytest-timeout >=1.2,<1.3', 'sphinx', 'sphinx_rtd_theme', 'yapf'
'pytest >=3,<4', ],
'pytest-cov >=2.4,<2.5', 'jupyter': ['jupyter >=1.0,<1.1', 'ipywidgets >=6.0.0.beta5']
'pytest-timeout >=1.2,<1.3', },
'sphinx', entry_points={
'sphinx_rtd_theme', 'bonobo.commands': [
'yapf'], 'init = bonobo.commands.init:register',
'jupyter': ['jupyter >=1.0,<1.1', 'ipywidgets >=6.0.0.beta5']}, 'run = bonobo.commands.run:register',
entry_points = {'bonobo.commands': ['init = bonobo.commands.init:register', 'version = bonobo.commands.version:register'
'run = bonobo.commands.run:register', ],
'version = bonobo.commands.version:register'], 'console_scripts': ['bonobo = bonobo.commands:entrypoint'],
'console_scripts': ['bonobo = bonobo.commands:entrypoint', 'edgy.project.features':
'bb = bonobo.commands:entrypoint'], ['bonobo = '
'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), )