[misc] updating dependencies.

This commit is contained in:
Romain Dorgueil
2017-05-28 12:04:49 +02:00
parent 9ad1d19dfc
commit 5013708c85
6 changed files with 80 additions and 105 deletions

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-05-03 18:02:59.359160 # Updated at 2017-05-28 12:03:49.427061
PACKAGE ?= bonobo PACKAGE ?= bonobo
PYTHON ?= $(shell which python) PYTHON ?= $(shell which python)
@ -20,8 +20,9 @@ SPHINX_SOURCEDIR ?= docs
SPHINX_BUILDDIR ?= $(SPHINX_SOURCEDIR)/_build SPHINX_BUILDDIR ?= $(SPHINX_SOURCEDIR)/_build
YAPF ?= $(PYTHON_DIRNAME)/yapf YAPF ?= $(PYTHON_DIRNAME)/yapf
YAPF_OPTIONS ?= -rip YAPF_OPTIONS ?= -rip
VERSION ?= $(shell git describe 2>/dev/null || echo dev)
.PHONY: $(SPHINX_SOURCEDIR) clean format install install-dev lint test .PHONY: $(SPHINX_SOURCEDIR) clean format install install-dev test
# Installs the local project dependencies. # Installs the local project dependencies.
install: install:
@ -39,9 +40,6 @@ install-dev:
clean: clean:
rm -rf build dist *.egg-info rm -rf build dist *.egg-info
lint: install-dev
$(PYTHON_DIRNAME)/pylint --py3k $(PACKAGE) -f html > pylint.html
test: install-dev test: install-dev
$(PYTEST) $(PYTEST_OPTIONS) tests $(PYTEST) $(PYTEST_OPTIONS) tests

View File

@ -1,73 +1,52 @@
# bonobo (see github.com/python-edgy/project) # bonobo (see github.com/python-edgy/project)
name = 'bonobo' from edgy.project import require
description = 'Bonobo, a simple, modern and atomic extract-transform-load toolkit for python 3.5+.'
license = 'Apache License, Version 2.0'
url = 'https://www.bonobo-project.org/' pytest = require('pytest')
download_url = 'https://github.com/python-bonobo/bonobo/tarball/{version}' python = require('python')
sphinx = require('sphinx')
yapf = require('yapf')
author = 'Romain Dorgueil' python.setup(
author_email = 'romain@dorgueil.net' name='bonobo',
description='Bonobo, a simple, modern and atomic extract-transform-load toolkit for python 3.5+.',
license='Apache License, Version 2.0',
url='https://www.bonobo-project.org/',
download_url='https://github.com/python-bonobo/bonobo/tarball/{version}',
author='Romain Dorgueil',
author_email='romain@dorgueil.net',
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',
]),
],
enable_features = { entry_points={
'make', 'console_scripts': [
'sphinx', 'bonobo = bonobo.commands:entrypoint',
'pytest', ],
'git', 'bonobo.commands': [
'pylint', 'init = bonobo.commands.init:register',
'python', 'run = bonobo.commands.run:register',
'yapf', 'version = bonobo.commands.version:register',
} ],
}
# stricts deendencies in requirements.txt )
install_requires = [
python.add_requirements(
'colorama >=0.3,<1.0', 'colorama >=0.3,<1.0',
'fs >=2.0,<3.0', 'fs >=2.0,<3.0',
'psutil >=5.2,<6.0', 'psutil >=5.2,<6.0',
'requests >=2.0,<3.0', 'requests >=2.0,<3.0',
'stevedore >=1.21,<2.0', 'stevedore >=1.21,<2.0',
] dev=[
extras_require = {
'jupyter': [
'jupyter >=1.0,<1.1',
'ipywidgets >=6.0.0.beta5'
],
'dev': [
'coverage >=4,<5',
'pylint >=1,<2',
'pytest >=3,<4',
'pytest-cov >=2,<3',
'pytest-timeout >=1,<2', 'pytest-timeout >=1,<2',
'sphinx',
'sphinx_rtd_theme',
'yapf',
], ],
} jupyter=[
'jupyter >=1.0,<1.1',
data_files = [ 'ipywidgets >=6.0.0.beta5',
('share/jupyter/nbextensions/bonobo-jupyter', [
'bonobo/ext/jupyter/static/extension.js',
'bonobo/ext/jupyter/static/index.js',
'bonobo/ext/jupyter/static/index.js.map',
]),
]
entry_points = {
'console_scripts': [
'bonobo = 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'
] ]
} )
@listen('edgy.project.feature.make.on_generate', priority=10)
def on_make_generate_docker_targets(event):
event.makefile['SPHINX_SOURCEDIR'] = 'docs'

View File

@ -1,27 +1,24 @@
-e .[dev] -e .[dev]
alabaster==0.7.10 alabaster==0.7.10
astroid==1.5.2
babel==2.4.0 babel==2.4.0
coverage==4.3.4 certifi==2017.4.17
chardet==3.0.3
coverage==4.4.1
docutils==0.13.1 docutils==0.13.1
idna==2.5
imagesize==0.7.1 imagesize==0.7.1
isort==4.2.5
jinja2==2.9.6 jinja2==2.9.6
lazy-object-proxy==1.2.2
markupsafe==1.0 markupsafe==1.0
mccabe==0.6.1
py==1.4.33 py==1.4.33
pygments==2.2.0 pygments==2.2.0
pylint==1.7.1 pytest-cov==2.5.1
pytest-cov==2.4.0
pytest-timeout==1.2.0 pytest-timeout==1.2.0
pytest==3.0.7 pytest==3.1.0
pytz==2017.2 pytz==2017.2
requests==2.13.0 requests==2.16.5
six==1.10.0 six==1.10.0
snowballstemmer==1.2.1 snowballstemmer==1.2.1
sphinx-rtd-theme==0.2.4 sphinx==1.6.1
sphinx==1.5.5 sphinxcontrib-websupport==1.0.1
wrapt==1.10.10 typing==3.6.1
yapf==0.16.1 urllib3==1.21.1

View File

@ -1,5 +1,4 @@
-e .[jupyter] -e .[jupyter]
appnope==0.1.0 appnope==0.1.0
bleach==2.0.0 bleach==2.0.0
decorator==4.0.11 decorator==4.0.11
@ -18,7 +17,7 @@ jupyter-core==4.3.0
jupyter==1.0.0 jupyter==1.0.0
markupsafe==1.0 markupsafe==1.0
mistune==0.7.4 mistune==0.7.4
nbconvert==5.1.1 nbconvert==5.2.1
nbformat==4.3.0 nbformat==4.3.0
notebook==5.0.0 notebook==5.0.0
pandocfilters==1.4.1 pandocfilters==1.4.1
@ -33,7 +32,7 @@ qtconsole==4.3.0
simplegeneric==0.8.1 simplegeneric==0.8.1
six==1.10.0 six==1.10.0
terminado==0.6 terminado==0.6
testpath==0.3 testpath==0.3.1
tornado==4.5.1 tornado==4.5.1
traitlets==4.3.2 traitlets==4.3.2
wcwidth==0.1.7 wcwidth==0.1.7

View File

@ -1,12 +1,15 @@
-e . -e .
appdirs==1.4.3 appdirs==1.4.3
certifi==2017.4.17
chardet==3.0.3
colorama==0.3.9 colorama==0.3.9
enum34==1.1.6 enum34==1.1.6
fs==2.0.3 fs==2.0.3
pbr==3.0.0 idna==2.5
pbr==3.0.1
psutil==5.2.2 psutil==5.2.2
pytz==2017.2 pytz==2017.2
requests==2.13.0 requests==2.16.5
six==1.10.0 six==1.10.0
stevedore==1.21.0 stevedore==1.21.0
urllib3==1.21.1

View File

@ -18,13 +18,19 @@ except NameError:
# Get the long description from the README file # Get the long description from the README file
with open(path.join(here, 'README.rst'), encoding='utf-8') as f: try:
long_description = f.read() with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
long_description = f.read()
except:
long_description = ''
# Get the classifiers from the classifiers file # Get the classifiers from the classifiers 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'))))
with open(path.join(here, 'classifiers.txt'), encoding='utf-8') as f: try:
classifiers = tolines(f.read()) with open(path.join(here, 'classifiers.txt'), encoding='utf-8') as f:
classifiers = tolines(f.read())
except:
classifiers = []
version_ns = {} version_ns = {}
try: try:
@ -35,41 +41,34 @@ else:
version = version_ns.get('__version__', 'dev') version = version_ns.get('__version__', 'dev')
setup( setup(
name='bonobo', author='Romain Dorgueil',
author_email='romain@dorgueil.net',
description=('Bonobo, a simple, modern and atomic extract-transform-load toolkit for ' description=('Bonobo, a simple, modern and atomic extract-transform-load toolkit for '
'python 3.5+.'), 'python 3.5+.'),
license='Apache License, Version 2.0', license='Apache License, Version 2.0',
install_requires=[ name='bonobo',
'colorama >=0.3,<1.0', 'fs >=2.0,<3.0', 'psutil >=5.2,<6.0', 'requests >=2.0,<3.0', 'stevedore >=1.21,<2.0'
],
version=version, version=version,
long_description=long_description, long_description=long_description,
classifiers=classifiers, classifiers=classifiers,
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=[ install_requires=[
( 'colorama (>= 0.3, < 1.0)', 'fs (>= 2.0, < 3.0)', 'psutil (>= 5.2, < 6.0)', 'requests (>= 2.0, < 3.0)',
'share/jupyter/nbextensions/bonobo-jupyter', [ 'stevedore (>= 1.21, < 2.0)'
'bonobo/ext/jupyter/static/extension.js', 'bonobo/ext/jupyter/static/index.js',
'bonobo/ext/jupyter/static/index.js.map'
]
)
], ],
extras_require={ extras_require={
'dev': [ 'dev': [
'coverage >=4,<5', 'pylint >=1,<2', 'pytest >=3,<4', 'pytest-cov >=2,<3', 'pytest-timeout >=1,<2', 'sphinx', 'coverage (>= 4.4, < 5.0)', 'pytest (>= 3.1, < 4.0)', 'pytest-cov (>= 2.5, < 3.0)',
'sphinx_rtd_theme', 'yapf' 'pytest-timeout (>= 1, < 2)', 'sphinx (>= 1.6, < 2.0)'
], ],
'jupyter': ['jupyter >=1.0,<1.1', 'ipywidgets >=6.0.0.beta5'] 'jupyter': ['ipywidgets (>= 6.0.0.beta5)', 'jupyter (>= 1.0, < 1.1)']
}, },
entry_points={ entry_points={
'bonobo.commands': [ 'bonobo.commands': [
'init = bonobo.commands.init:register', 'run = bonobo.commands.run:register', 'init = bonobo.commands.init:register', 'run = bonobo.commands.run:register',
'version = bonobo.commands.version:register' 'version = bonobo.commands.version:register'
], ],
'console_scripts': ['bonobo = bonobo.commands:entrypoint'], 'console_scripts': ['bonobo = bonobo.commands:entrypoint']
'edgy.project.features': ['bonobo = '
'bonobo.ext.edgy.project.feature:BonoboFeature']
}, },
url='https://www.bonobo-project.org/', url='https://www.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),