From a4c051963e49c84cd0bad65578180f081ca4d94c Mon Sep 17 00:00:00 2001 From: Romain Dorgueil Date: Thu, 29 Dec 2016 17:34:14 +0100 Subject: [PATCH] version --- Makefile | 4 ++-- docs/conf.py | 3 +-- setup.py | 52 ++++++++++++++++++++++++++-------------------------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index e84f7a5..a26569b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # This file has been auto-generated. # All changes will be lost, see Projectfile. # -# Updated at 2016-12-29 17:04:15.403353 +# Updated at 2016-12-29 17:33:45.585172 PYTHON ?= $(shell which python) PYTHON_BASENAME ?= $(shell basename $(PYTHON)) @@ -41,7 +41,7 @@ clean: # Setup the local virtualenv, or use the one provided by the current environment. $(VIRTUAL_ENV): virtualenv -p $(PYTHON) $(VIRTUAL_ENV) - $(PIP) install -U pip\>=8.1.2,\<9 wheel\>=0.29,\<1.0 + $(PIP) install -U pip\>=9,\<10 wheel\>=0.29,\<1.0 ln -fs $(VIRTUAL_ENV)/bin/activate activate-$(PYTHON_BASENAME) lint: install-dev diff --git a/docs/conf.py b/docs/conf.py index 80d0660..8fb96ed 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,8 +42,7 @@ author = 'Romain Dorgueil' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. -version = bonobo.__version__ -release = bonobo.__version__ +version = release = bonobo.__version__ # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index a19e5bd..f0d6724 100644 --- a/setup.py +++ b/setup.py @@ -8,47 +8,47 @@ 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): with open(filename) as f: content = f.read().strip() return flt(content) if callable(flt) else content - # 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') setup( - name='bonobo', - description='Bonobo', - license='Apache License, Version 2.0', - install_requires=['blessings >=1.6,<1.7', 'psutil >=5.0,<5.1'], - 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.2,<4.3', 'mock >=2.0,<2.1', 'nose >=1.3,<1.4', 'pylint >=1.6,<1.7', 'pytest >=3,<4', - 'pytest-cov >=2.4,<2.5', 'sphinx', 'sphinx_rtd_theme', 'yapf' - ], - 'jupyter': ['jupyter >=1.0,<1.1', 'ipywidgets >=6.0.0.beta5'] - }, - 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', 'psutil >=5.0,<5.1'], + 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.2,<4.3', + 'mock >=2.0,<2.1', + 'nose >=1.3,<1.4', + 'pylint >=1.6,<1.7', + 'pytest >=3,<4', + 'pytest-cov >=2.4,<2.5', + 'sphinx', + 'sphinx_rtd_theme', + 'yapf'], + 'jupyter': ['jupyter >=1.0,<1.1', 'ipywidgets >=6.0.0.beta5']}, + url = 'https://bonobo-project.org/', + download_url = 'https://github.com/python-bonobo/bonobo/tarball/{version}'.format(version=version), +)