From 9fc2e0ef94377bc8dabda94800fdbd94b2a0002e Mon Sep 17 00:00:00 2001 From: Romain Dorgueil Date: Mon, 24 Apr 2017 21:36:27 +0200 Subject: [PATCH] Reverts/Fixes #16 (removes bb alias). --- Makefile | 7 ++-- Projectfile | 1 - setup.py | 93 +++++++++++++++++++++++++++++------------------------ 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/Makefile b/Makefile index c281228..3be1d05 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-04-23 14:52:31.862565 +# Updated at 2017-04-24 21:35:29.734614 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 6e80bb7..7677c08 100644 --- a/Projectfile +++ b/Projectfile @@ -59,7 +59,6 @@ data_files = [ entry_points = { 'console_scripts': [ 'bonobo = bonobo.commands:entrypoint', - 'bb = bonobo.commands:entrypoint', ], 'bonobo.commands': [ 'init = bonobo.commands.init:register', diff --git a/setup.py b/setup.py index df95728..b7615f9 100644 --- a/setup.py +++ b/setup.py @@ -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')))) + def read(filename, flt=None): try: with open(filename) as f: content = f.read().strip() return flt(content) if callable(flt) else content - except FileNotFoundError: + except EnvironmentError: return '' + # Py3 compatibility hacks, borrowed from IPython. try: execfile except NameError: + def execfile(fname, globs, locs=None): locs = locs or globs exec(compile(open(fname).read(), fname, "exec"), globs, locs) + 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', - 'colorama >=0.3,<0.4', - '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'])], - 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'], - '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', - '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), -) + name='bonobo', + description='Bonobo', + license='Apache License, Version 2.0', + install_requires=[ + 'blessings >=1.6,<1.7', 'colorama >=0.3,<0.4', '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' + ])], + 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' + ], + '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', + 'version = bonobo.commands.version:register' + ], + 'console_scripts': ['bonobo = 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), )