diff --git a/Makefile b/Makefile index 841d9a2..cead17d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Generated by Medikit 0.7.1 on 2019-05-16. +# Generated by Medikit 0.7.2 on 2019-06-01. # All changes will be overriden. # Edit Projectfile and run “make update” (or “medikit update”) to regenerate. @@ -30,7 +30,7 @@ SPHINX_BUILDDIR ?= $(SPHINX_SOURCEDIR)/_build SPHINX_AUTOBUILD ?= $(PYTHON_DIRNAME)/sphinx-autobuild MEDIKIT ?= $(PYTHON) -m medikit MEDIKIT_UPDATE_OPTIONS ?= -MEDIKIT_VERSION ?= 0.7.1 +MEDIKIT_VERSION ?= 0.7.2 .PHONY: $(SPHINX_SOURCEDIR) clean format help install install-dev install-docker install-jupyter install-sqlalchemy medikit quick test update update-requirements watch-$(SPHINX_SOURCEDIR) @@ -43,7 +43,7 @@ else ifneq ($(QUICK),) @printf "Skipping \033[36m%s\033[0m because \033[36m$$QUICK\033[0m is not empty.\n" $(target) else @printf "Applying \033[36m%s\033[0m target...\n" $(target) - $(PIP) install $(PIP_INSTALL_OPTIONS) -U "pip ~=18.0" wheel + $(PIP) install $(PIP_INSTALL_OPTIONS) -U "pip ~=19.0" wheel $(PIP) install $(PIP_INSTALL_OPTIONS) -U $(PYTHON_REQUIREMENTS_INLINE) -r $(PYTHON_REQUIREMENTS_FILE) @mkdir -p .medikit; touch $@ endif @@ -61,7 +61,7 @@ else ifneq ($(QUICK),) @printf "Skipping \033[36m%s\033[0m because \033[36m$$QUICK\033[0m is not empty.\n" $(target) else @printf "Applying \033[36m%s\033[0m target...\n" $(target) - $(PIP) install $(PIP_INSTALL_OPTIONS) -U "pip ~=18.0" wheel + $(PIP) install $(PIP_INSTALL_OPTIONS) -U "pip ~=19.0" wheel $(PIP) install $(PIP_INSTALL_OPTIONS) -U $(PYTHON_REQUIREMENTS_DEV_INLINE) -r $(PYTHON_REQUIREMENTS_DEV_FILE) @mkdir -p .medikit; touch $@ endif @@ -78,7 +78,7 @@ else ifneq ($(QUICK),) @printf "Skipping \033[36m%s\033[0m because \033[36m$$QUICK\033[0m is not empty.\n" $(target) else @printf "Applying \033[36m%s\033[0m target...\n" $(target) - $(PIP) install $(PIP_INSTALL_OPTIONS) -U "pip ~=18.0" wheel + $(PIP) install $(PIP_INSTALL_OPTIONS) -U "pip ~=19.0" wheel $(PIP) install $(PIP_INSTALL_OPTIONS) -U $(PYTHON_REQUIREMENTS_DOCKER_INLINE) -r $(PYTHON_REQUIREMENTS_DOCKER_FILE) @mkdir -p .medikit; touch $@ endif @@ -92,7 +92,7 @@ else ifneq ($(QUICK),) @printf "Skipping \033[36m%s\033[0m because \033[36m$$QUICK\033[0m is not empty.\n" $(target) else @printf "Applying \033[36m%s\033[0m target...\n" $(target) - $(PIP) install $(PIP_INSTALL_OPTIONS) -U "pip ~=18.0" wheel + $(PIP) install $(PIP_INSTALL_OPTIONS) -U "pip ~=19.0" wheel $(PIP) install $(PIP_INSTALL_OPTIONS) -U $(PYTHON_REQUIREMENTS_JUPYTER_INLINE) -r $(PYTHON_REQUIREMENTS_JUPYTER_FILE) @mkdir -p .medikit; touch $@ endif @@ -106,7 +106,7 @@ else ifneq ($(QUICK),) @printf "Skipping \033[36m%s\033[0m because \033[36m$$QUICK\033[0m is not empty.\n" $(target) else @printf "Applying \033[36m%s\033[0m target...\n" $(target) - $(PIP) install $(PIP_INSTALL_OPTIONS) -U "pip ~=18.0" wheel + $(PIP) install $(PIP_INSTALL_OPTIONS) -U "pip ~=19.0" wheel $(PIP) install $(PIP_INSTALL_OPTIONS) -U $(PYTHON_REQUIREMENTS_SQLALCHEMY_INLINE) -r $(PYTHON_REQUIREMENTS_SQLALCHEMY_FILE) @mkdir -p .medikit; touch $@ endif @@ -125,7 +125,7 @@ format: ## Reformats the whole codebase using our standards (requires black an isort -rc -o mondrian -o whistle -y . medikit: # Checks installed medikit version and updates it if it is outdated. - @$(PYTHON) -c 'import medikit, pip, sys; from packaging.version import Version; sys.exit(0 if (Version(medikit.__version__) >= Version("$(MEDIKIT_VERSION)")) and (Version(pip.__version__) < Version("10")) else 1)' || $(PYTHON) -m pip install -U "pip ~=18.0" "medikit>=$(MEDIKIT_VERSION)" + @$(PYTHON) -c 'import medikit, pip, sys; from packaging.version import Version; sys.exit(0 if (Version(medikit.__version__) >= Version("$(MEDIKIT_VERSION)")) and (Version(pip.__version__) < Version("10")) else 1)' || $(PYTHON) -m pip install -U "pip ~=19.0" "medikit>=$(MEDIKIT_VERSION)" update: medikit ## Update project artifacts using medikit. $(MEDIKIT) update $(MEDIKIT_UPDATE_OPTIONS) diff --git a/bonobo/__init__.py b/bonobo/__init__.py index ee146fd..181e64a 100644 --- a/bonobo/__init__.py +++ b/bonobo/__init__.py @@ -9,13 +9,51 @@ 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 + 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__ +from bonobo._api import * +from bonobo._api import __all__, __doc__ +from bonobo._version import __version__ + if sys.version_info < (3, 5): raise RuntimeError("Python 3.5+ is required to use Bonobo.") diff --git a/bonobo/_version.py b/bonobo/_version.py index 63af887..364e7ba 100644 --- a/bonobo/_version.py +++ b/bonobo/_version.py @@ -1 +1 @@ -__version__ = "0.6.3" +__version__ = "0.6.4" diff --git a/bonobo/contrib/django/commands.py b/bonobo/contrib/django/commands.py index e96eac4..4974540 100644 --- a/bonobo/contrib/django/commands.py +++ b/bonobo/contrib/django/commands.py @@ -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 diff --git a/bonobo/execution/strategies/__init__.py b/bonobo/execution/strategies/__init__.py index 5995bf0..fc802ad 100644 --- a/bonobo/execution/strategies/__init__.py +++ b/bonobo/execution/strategies/__init__.py @@ -7,7 +7,9 @@ at home if you want to give it a shot. """ from bonobo.execution.strategies.executor import ( - AsyncThreadPoolExecutorStrategy, ProcessPoolExecutorStrategy, ThreadPoolExecutorStrategy + AsyncThreadPoolExecutorStrategy, + ProcessPoolExecutorStrategy, + ThreadPoolExecutorStrategy, ) from bonobo.execution.strategies.naive import NaiveStrategy diff --git a/bonobo/util/__init__.py b/bonobo/util/__init__.py index c3c33e2..b4be454 100644 --- a/bonobo/util/__init__.py +++ b/bonobo/util/__init__.py @@ -6,7 +6,15 @@ 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 ValueHolder, get_attribute_or_create, get_name diff --git a/requirements-dev.txt b/requirements-dev.txt index 4cc73b8..0c56690 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,10 +1,10 @@ -e .[dev] -r requirements.txt alabaster==0.7.12 -arrow==0.13.1 +arrow==0.14.0 atomicwrites==1.3.0 attrs==19.1.0 -babel==2.6.0 +babel==2.7.0 binaryornot==0.4.4 certifi==2019.3.9 chardet==3.0.4 @@ -15,26 +15,29 @@ docutils==0.14 future==0.17.1 idna==2.8 imagesize==1.1.0 +importlib-metadata==0.17 jinja2-time==0.2.0 jinja2==2.10.1 markupsafe==1.1.1 more-itertools==7.0.0 packaging==19.0 -pluggy==0.11.0 +pathlib2==2.3.3 +pluggy==0.12.0 poyo==0.4.2 py==1.8.0 -pygments==2.4.0 +pygments==2.4.2 pyparsing==2.4.0 pytest-cov==2.7.1 pytest-timeout==1.3.3 pytest==3.10.1 python-dateutil==2.8.0 pytz==2019.1 -requests==2.21.0 +requests==2.22.0 six==1.12.0 snowballstemmer==1.2.1 sphinx-sitemap==0.2 sphinx==1.8.5 -sphinxcontrib-websupport==1.1.0 -urllib3==1.24.3 +sphinxcontrib-websupport==1.1.2 +urllib3==1.25.3 whichcraft==0.5.2 +zipp==0.5.1 diff --git a/requirements-docker.txt b/requirements-docker.txt index 223cc84..4757fe6 100644 --- a/requirements-docker.txt +++ b/requirements-docker.txt @@ -2,7 +2,6 @@ -r requirements.txt appdirs==1.4.3 bonobo-docker==0.6.0 -cached-property==1.5.1 certifi==2019.3.9 chardet==3.0.4 colorama==0.3.9 @@ -14,17 +13,18 @@ idna==2.8 jinja2==2.10.1 markupsafe==1.1.1 mondrian==0.8.0 -packaging==17.1 -pbr==5.2.0 +packaging==19.0 +pbr==5.2.1 psutil==5.6.2 pyparsing==2.4.0 python-slugify==1.2.6 pytz==2019.1 -requests==2.21.0 +requests==2.22.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 +urllib3==1.25.3 websocket-client==0.56.0 whistle==1.0.1 diff --git a/requirements-jupyter.txt b/requirements-jupyter.txt index f8b23f3..77746b4 100644 --- a/requirements-jupyter.txt +++ b/requirements-jupyter.txt @@ -30,11 +30,11 @@ pickleshare==0.7.5 prometheus-client==0.6.0 prompt-toolkit==2.0.9 ptyprocess==0.6.0 -pygments==2.4.0 +pygments==2.4.2 pyrsistent==0.15.2 python-dateutil==2.8.0 pyzmq==18.0.1 -qtconsole==4.4.4 +qtconsole==4.5.1 send2trash==1.5.0 six==1.12.0 terminado==0.8.2 diff --git a/requirements-sqlalchemy.txt b/requirements-sqlalchemy.txt index 3e386b6..f101ca9 100644 --- a/requirements-sqlalchemy.txt +++ b/requirements-sqlalchemy.txt @@ -2,7 +2,6 @@ -r requirements.txt appdirs==1.4.3 bonobo-sqlalchemy==0.6.0 -cached-property==1.5.1 certifi==2019.3.9 chardet==3.0.4 colorama==0.3.9 @@ -12,16 +11,17 @@ idna==2.8 jinja2==2.10.1 markupsafe==1.1.1 mondrian==0.8.0 -packaging==17.1 -pbr==5.2.0 +packaging==19.0 +pbr==5.2.1 psutil==5.6.2 pyparsing==2.4.0 python-slugify==1.2.6 pytz==2019.1 -requests==2.21.0 +requests==2.22.0 six==1.12.0 -sqlalchemy==1.3.3 +sqlalchemy==1.3.4 stevedore==1.30.1 +typing==3.6.6 unidecode==1.0.23 -urllib3==1.24.3 +urllib3==1.25.3 whistle==1.0.1 diff --git a/requirements.txt b/requirements.txt index 7ea6f18..80bc1e6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,14 +11,15 @@ jinja2==2.10.1 markupsafe==1.1.1 mondrian==0.8.0 packaging==19.0 -pbr==5.2.0 +pbr==5.2.1 psutil==5.6.2 pyparsing==2.4.0 python-slugify==1.2.6 pytz==2019.1 -requests==2.21.0 +requests==2.22.0 six==1.12.0 stevedore==1.30.1 +typing==3.6.6 unidecode==1.0.23 -urllib3==1.24.3 +urllib3==1.25.3 whistle==1.0.1 diff --git a/setup.cfg b/setup.cfg index c0f0846..61b41b9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,5 +2,5 @@ description-file = README.rst [bdist_wheel] -universal=1 +universal = 1 diff --git a/setup.py b/setup.py index 16fb16c..d3d291b 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# Generated by Medikit 0.7.1 on 2019-05-16. +# Generated by Medikit 0.7.2 on 2019-06-01. # All changes will be overriden. # Edit Projectfile and run “make update” (or “medikit update”) to regenerate. @@ -65,31 +65,31 @@ setup( 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 (~= 19.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)", + "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": [