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

Update requirements, fix formating.

Browse Source
This commit is contained in:
Romain Dorgueil
2019-05-16 10:03:30 +01:00
parent 307326d7f9
commit c6818dc960
18 changed files with 78 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
# Generated by Medikit 0.7.1 on 2019-05-08.
# Generated by Medikit 0.7.1 on 2019-05-16.
# All changes will be overriden.
# Edit Projectfile and run “make update” (or “medikit update”) to regenerate.

2
Projectfile
View File

@ -47,7 +47,7 @@ python.add_requirements(
'graphviz >=0.8,<0.9',
'jinja2 ~=2.9',
'mondrian ~=0.8',
'packaging ~=17.0',
'packaging ~=19.0',
'psutil ~=5.4',
'python-slugify ~=1.2.0',
'requests ~=2.0',

49
bonobo/__init__.py
View File

@ -8,50 +8,17 @@
import sys
from pathlib import Path
from bonobo._api import (
CsvReader, CsvWriter, FileReader, FileWriter, Filter, FixedWindow, Format, Graph, JsonReader, JsonWriter,
LdjsonReader, LdjsonWriter, Limit, MapFields, OrderFields, PickleReader, PickleWriter, PrettyPrinter, RateLimited,
Rename, SetFields, Tee, UnpackItems, __all__, __doc__, count, create_reader, create_strategy, create_writer,
get_argument_parser, get_examples_path, identity, inspect, noop, open_examples_fs, open_fs, parse_args, run
)
from bonobo._version import __version__
if sys.version_info < (3, 5):
raise RuntimeError("Python 3.5+ is required to use Bonobo.")
from bonobo._api import (
run,
inspect,
Graph,
create_strategy,
open_fs,
CsvReader,
CsvWriter,
FileReader,
FileWriter,
Filter,
FixedWindow,
Format,
JsonReader,
JsonWriter,
LdjsonReader,
LdjsonWriter,
Limit,
MapFields,
OrderFields,
PickleReader,
PickleWriter,
PrettyPrinter,
RateLimited,
Rename,
SetFields,
Tee,
UnpackItems,
count,
identity,
noop,
create_reader,
create_writer,
get_examples_path,
open_examples_fs,
get_argument_parser,
parse_args,
__all__,
__doc__,
)
from bonobo._version import __version__
__all__ = ["__version__"] + __all__
with (Path(__file__).parent / "bonobo.svg").open() as f:

1
bonobo/commands/__init__.py
View File

@ -2,6 +2,7 @@ import argparse
import logging
import mondrian
from bonobo import settings
from bonobo.commands.base import BaseCommand, BaseGraphCommand

6
bonobo/config/__init__.py
View File

@ -5,10 +5,10 @@ configurable transformations, either class-based or function-based.
"""
from bonobo.config.configurables import Configurable
from bonobo.config.functools import transformation_factory, partial
from bonobo.config.functools import partial, transformation_factory
from bonobo.config.options import Method, Option
from bonobo.config.processors import ContextProcessor, use_context, use_context_processor, use_raw_input, use_no_input
from bonobo.config.services import Container, Exclusive, Service, use, create_container
from bonobo.config.processors import ContextProcessor, use_context, use_context_processor, use_no_input, use_raw_input
from bonobo.config.services import Container, Exclusive, Service, create_container, use
from bonobo.util import deprecated_alias
requires = deprecated_alias("requires", use)

2
bonobo/contrib/django/__init__.py
View File

@ -6,7 +6,7 @@ This module contains all tools for Bonobo and Django to interract nicely.
"""
from .utils import create_or_update
from .commands import ETLCommand
from .utils import create_or_update
__all__ = ["ETLCommand", "create_or_update"]

4
bonobo/contrib/django/commands.py
View File

@ -2,13 +2,13 @@ from logging import getLogger
from types import GeneratorType
from colorama import Back, Fore, Style
from django.core.management import BaseCommand
from django.core.management.base import OutputWrapper
from mondrian import term
import bonobo
from bonobo.plugins.console import ConsoleOutputPlugin
from bonobo.util.term import CLEAR_EOL
from django.core.management import BaseCommand
from django.core.management.base import OutputWrapper
from .utils import create_or_update

7
bonobo/contrib/google/__init__.py
View File

@ -1,14 +1,15 @@
import os
# https://developers.google.com/api-client-library/python/guide/aaa_oauth
# pip install google-api-python-client (1.6.4)
import httplib2
from apiclient import discovery
from oauth2client import client, tools
from oauth2client.file import Storage
from oauth2client.tools import argparser
# https://developers.google.com/api-client-library/python/guide/aaa_oauth
# pip install google-api-python-client (1.6.4)
HOME_DIR = os.path.expanduser("~")
GOOGLE_SECRETS = os.path.join(HOME_DIR, ".cache/secrets/client_secrets.json")

2
bonobo/contrib/opendatasoft/__init__.py
View File

@ -3,8 +3,8 @@ from urllib.parse import urlencode
import requests # todo: make this a service so we can substitute it ?
from bonobo.config import Option
from bonobo.config.processors import ContextProcessor
from bonobo.config.configurables import Configurable
from bonobo.config.processors import ContextProcessor
from bonobo.util.objects import ValueHolder

2
bonobo/examples/__init__.py
View File

@ -1,7 +1,7 @@
import os
import bonobo
from bonobo.execution.strategies import STRATEGIES, DEFAULT_STRATEGY
from bonobo.execution.strategies import DEFAULT_STRATEGY, STRATEGIES
from bonobo.util.statistics import Timer

4
bonobo/execution/strategies/__init__.py
View File

@ -7,9 +7,7 @@ at home if you want to give it a shot.
"""
from bonobo.execution.strategies.executor import (
ProcessPoolExecutorStrategy,
ThreadPoolExecutorStrategy,
AsyncThreadPoolExecutorStrategy,
AsyncThreadPoolExecutorStrategy, ProcessPoolExecutorStrategy, ThreadPoolExecutorStrategy
)
from bonobo.execution.strategies.naive import NaiveStrategy

12
bonobo/util/__init__.py
View File

@ -6,17 +6,9 @@ and inspect transformations, graphs, and nodes.
from bonobo.util.collections import cast, ensure_tuple, sortedlist, tuplize
from bonobo.util.compat import deprecated, deprecated_alias
from bonobo.util.inspect import (
inspect_node,
isconfigurable,
isconfigurabletype,
iscontextprocessor,
isdict,
ismethod,
isoption,
istuple,
istype,
inspect_node, isconfigurable, isconfigurabletype, iscontextprocessor, isdict, ismethod, isoption, istuple, istype
)
from bonobo.util.objects import get_name, get_attribute_or_create, ValueHolder
from bonobo.util.objects import ValueHolder, get_attribute_or_create, get_name
# Bonobo's util API
__all__ = [

3
requirements-dev.txt
View File

@ -20,11 +20,10 @@ jinja2==2.10.1
markupsafe==1.1.1
more-itertools==7.0.0
packaging==19.0
pathlib2==2.3.3
pluggy==0.11.0
poyo==0.4.2
py==1.8.0
pygments==2.3.1
pygments==2.4.0
pyparsing==2.4.0
pytest-cov==2.7.1
pytest-timeout==1.3.3

1
requirements-docker.txt
View File

@ -24,7 +24,6 @@ requests==2.21.0
semantic-version==2.6.0
six==1.12.0
stevedore==1.30.1
typing==3.6.6
unidecode==1.0.23
urllib3==1.24.3
websocket-client==0.56.0

6
requirements-jupyter.txt
View File

@ -7,7 +7,7 @@ bleach==3.1.0
decorator==4.4.0
defusedxml==0.6.0
entrypoints==0.3
ipykernel==5.1.0
ipykernel==5.1.1
ipython-genutils==0.2.0
ipython==7.5.0
ipywidgets==6.0.1
@ -30,8 +30,8 @@ pickleshare==0.7.5
prometheus-client==0.6.0
prompt-toolkit==2.0.9
ptyprocess==0.6.0
pygments==2.3.1
pyrsistent==0.15.1
pygments==2.4.0
pyrsistent==0.15.2
python-dateutil==2.8.0
pyzmq==18.0.1
qtconsole==4.4.4

1
requirements-sqlalchemy.txt
View File

@ -22,7 +22,6 @@ requests==2.21.0
six==1.12.0
sqlalchemy==1.3.3
stevedore==1.30.1
typing==3.6.6
unidecode==1.0.23
urllib3==1.24.3
whistle==1.0.1

3
requirements.txt
View File

@ -10,7 +10,7 @@ idna==2.8
jinja2==2.10.1
markupsafe==1.1.1
mondrian==0.8.0
packaging==17.1
packaging==19.0
pbr==5.2.0
psutil==5.6.2
pyparsing==2.4.0
@ -19,7 +19,6 @@ pytz==2019.1
requests==2.21.0
six==1.12.0
stevedore==1.30.1
typing==3.6.6
unidecode==1.0.23
urllib3==1.24.3
whistle==1.0.1

107
setup.py
View File

@ -1,12 +1,11 @@
# Generated by Medikit 0.7.1 on 2019-05-08.
# Generated by Medikit 0.7.1 on 2019-05-16.
# All changes will be overriden.
# Edit Projectfile and run “make update” (or “medikit update”) to regenerate.
from setuptools import setup, find_packages
from codecs import open
from os import path
from setuptools import find_packages, setup
here = path.abspath(path.dirname(__file__))
# Py3 compatibility hacks, borrowed from IPython.
@ -21,88 +20,76 @@ except NameError:
# Get the long description from the README file
try:
with open(path.join(here, "README.rst"), encoding="utf-8") as f:
with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
long_description = f.read()
except:
long_description = ""
long_description = ''
# 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'))))
try:
with open(path.join(here, "classifiers.txt"), encoding="utf-8") as f:
with open(path.join(here, 'classifiers.txt'), encoding='utf-8') as f:
classifiers = tolines(f.read())
except:
classifiers = []
version_ns = {}
try:
execfile(path.join(here, "bonobo/_version.py"), version_ns)
execfile(path.join(here, 'bonobo/_version.py'), version_ns)
except EnvironmentError:
version = "dev"
version = 'dev'
else:
version = version_ns.get("__version__", "dev")
version = version_ns.get('__version__', 'dev')
setup(
author="Romain Dorgueil",
author_email="romain@dorgueil.net",
data_files=[
(
"share/jupyter/nbextensions/bonobo-jupyter",
[
"bonobo/contrib/jupyter/static/extension.js",
"bonobo/contrib/jupyter/static/index.js",
"bonobo/contrib/jupyter/static/index.js.map",
],
)
],
description=("Bonobo, a simple, modern and atomic extract-transform-load toolkit for " "python 3.5+."),
license="Apache License, Version 2.0",
name="bonobo",
python_requires=">=3.5",
author='Romain Dorgueil',
author_email='romain@dorgueil.net',
data_files=[('share/jupyter/nbextensions/bonobo-jupyter', [
'bonobo/contrib/jupyter/static/extension.js',
'bonobo/contrib/jupyter/static/index.js',
'bonobo/contrib/jupyter/static/index.js.map'
])],
description=(
'Bonobo, a simple, modern and atomic extract-transform-load toolkit for '
'python 3.5+.'),
license='Apache License, Version 2.0',
name='bonobo',
python_requires='>=3.5',
version=version,
long_description=long_description,
classifiers=classifiers,
packages=find_packages(exclude=["ez_setup", "example", "test"]),
packages=find_packages(exclude=['ez_setup', 'example', 'test']),
include_package_data=True,
install_requires=[
"cached-property (~= 1.4)",
"fs (~= 2.0)",
"graphviz (>= 0.8, < 0.9)",
"jinja2 (~= 2.9)",
"mondrian (~= 0.8)",
"packaging (~= 17.0)",
"psutil (~= 5.4)",
"python-slugify (~= 1.2.0)",
"requests (~= 2.0)",
"stevedore (~= 1.27)",
"whistle (~= 1.0)",
'cached-property (~= 1.4)', 'fs (~= 2.0)', 'graphviz (>= 0.8, < 0.9)',
'jinja2 (~= 2.9)', 'mondrian (~= 0.8)', 'packaging (~= 19.0)',
'psutil (~= 5.4)', 'python-slugify (~= 1.2.0)', 'requests (~= 2.0)',
'stevedore (~= 1.27)', 'whistle (~= 1.0)'
],
extras_require={
"dev": [
"cookiecutter (>= 1.5, < 1.6)",
"coverage (~= 4.4)",
"pytest (~= 3.4)",
"pytest-cov (~= 2.5)",
"pytest-timeout (>= 1, < 2)",
"sphinx (~= 1.7)",
"sphinx-sitemap (>= 0.2, < 0.3)",
'dev': [
'cookiecutter (>= 1.5, < 1.6)', 'coverage (~= 4.4)',
'pytest (~= 3.4)', 'pytest-cov (~= 2.5)',
'pytest-timeout (>= 1, < 2)', 'sphinx (~= 1.7)',
'sphinx-sitemap (>= 0.2, < 0.3)'
],
"docker": ["bonobo-docker (~= 0.6.0a1)"],
"jupyter": ["ipywidgets (~= 6.0)", "jupyter (~= 1.0)"],
"sqlalchemy": ["bonobo-sqlalchemy (~= 0.6.0a1)"],
'docker': ['bonobo-docker (~= 0.6.0a1)'],
'jupyter': ['ipywidgets (~= 6.0)', 'jupyter (~= 1.0)'],
'sqlalchemy': ['bonobo-sqlalchemy (~= 0.6.0a1)']
},
entry_points={
"bonobo.commands": [
"convert = bonobo.commands.convert:ConvertCommand",
"download = bonobo.commands.download:DownloadCommand",
"examples = bonobo.commands.examples:ExamplesCommand",
"init = bonobo.commands.init:InitCommand",
"inspect = bonobo.commands.inspect:InspectCommand",
"run = bonobo.commands.run:RunCommand",
"version = bonobo.commands.version:VersionCommand",
'bonobo.commands': [
'convert = bonobo.commands.convert:ConvertCommand',
'download = bonobo.commands.download:DownloadCommand',
'examples = bonobo.commands.examples:ExamplesCommand',
'init = bonobo.commands.init:InitCommand',
'inspect = bonobo.commands.inspect:InspectCommand',
'run = bonobo.commands.run:RunCommand',
'version = bonobo.commands.version:VersionCommand'
],
"console_scripts": ["bonobo = bonobo.commands:entrypoint"],
'console_scripts': ['bonobo = bonobo.commands:entrypoint']
},
url="https://www.bonobo-project.org/",
download_url="https://github.com/python-bonobo/bonobo/tarball/{version}".format(version=version),
url='https://www.bonobo-project.org/',
download_url='https://github.com/python-bonobo/bonobo/tarball/{version}'.
format(version=version),
)