diff --git a/Makefile b/Makefile index bb68335..89f16e8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Generated by Medikit 0.4a5 on 2017-10-29. +# Generated by Medikit 0.4a9 on 2017-11-01. # All changes will be overriden. PACKAGE ?= bonobo diff --git a/Projectfile b/Projectfile index 3a10d0b..c51ac38 100644 --- a/Projectfile +++ b/Projectfile @@ -45,7 +45,6 @@ python.add_requirements( 'mondrian >=0.2,<0.3', 'packaging >=16,<17', 'psutil >=5.4,<6.0', - 'python-dotenv >=0.7,<0.8', 'requests >=2.0,<3.0', 'stevedore >=1.27,<1.28', dev=[ diff --git a/requirements-dev.txt b/requirements-dev.txt index 553fefc..8000471 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,29 +1,21 @@ -e .[dev] alabaster==0.7.10 -arrow==0.10.0 babel==2.5.1 -binaryornot==0.4.4 certifi==2017.7.27.1 chardet==3.0.4 -click==6.7 -cookiecutter==1.5.1 coverage==4.4.1 docutils==0.14 -future==0.16.0 idna==2.6 imagesize==0.7.1 -jinja2-time==0.2.0 jinja2==2.9.6 markupsafe==1.0 -poyo==0.4.1 py==1.4.34 pygments==2.2.0 pytest-cov==2.5.1 pytest-sugar==0.8.0 pytest-timeout==1.2.0 pytest==3.2.3 -python-dateutil==2.6.1 -pytz==2017.2 +pytz==2017.3 requests==2.18.4 six==1.11.0 snowballstemmer==1.2.1 @@ -31,4 +23,4 @@ sphinx==1.6.5 sphinxcontrib-websupport==1.0.1 termcolor==1.1.0 urllib3==1.22 -whichcraft==0.4.1 +yapf==0.19.0 diff --git a/requirements-docker.txt b/requirements-docker.txt index d6f1160..8eb4059 100644 --- a/requirements-docker.txt +++ b/requirements-docker.txt @@ -3,7 +3,6 @@ appdirs==1.4.3 bonobo-docker==0.5.0 certifi==2017.7.27.1 chardet==3.0.4 -click==6.7 colorama==0.3.9 docker-pycreds==0.2.1 docker==2.3.0 @@ -13,8 +12,7 @@ packaging==16.8 pbr==3.1.1 psutil==5.4.0 pyparsing==2.2.0 -python-dotenv==0.7.1 -pytz==2017.2 +pytz==2017.3 requests==2.18.4 six==1.11.0 stevedore==1.27.1 diff --git a/requirements-jupyter.txt b/requirements-jupyter.txt index 4e1d024..1978875 100644 --- a/requirements-jupyter.txt +++ b/requirements-jupyter.txt @@ -13,7 +13,7 @@ jinja2==2.9.6 jsonschema==2.6.0 jupyter-client==5.1.0 jupyter-console==5.2.0 -jupyter-core==4.3.0 +jupyter-core==4.4.0 jupyter==1.0.0 markupsafe==1.0 mistune==0.8 @@ -28,7 +28,7 @@ prompt-toolkit==1.0.15 ptyprocess==0.5.2 pygments==2.2.0 python-dateutil==2.6.1 -pyzmq==16.0.2 +pyzmq==16.0.3 qtconsole==4.3.1 simplegeneric==0.8.1 six==1.11.0 diff --git a/requirements-sqlalchemy.txt b/requirements-sqlalchemy.txt new file mode 100644 index 0000000..7083f9e --- /dev/null +++ b/requirements-sqlalchemy.txt @@ -0,0 +1,18 @@ +-e .[sqlalchemy] +appdirs==1.4.3 +bonobo-sqlalchemy==0.5.1 +certifi==2017.7.27.1 +chardet==3.0.4 +colorama==0.3.9 +fs==2.0.12 +idna==2.6 +packaging==16.8 +pbr==3.1.1 +psutil==5.4.0 +pyparsing==2.2.0 +pytz==2017.3 +requests==2.18.4 +six==1.11.0 +sqlalchemy==1.1.14 +stevedore==1.27.1 +urllib3==1.22 diff --git a/requirements.txt b/requirements.txt index 0d69f1a..0b8ada0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,18 +2,17 @@ appdirs==1.4.3 certifi==2017.7.27.1 chardet==3.0.4 -click==6.7 colorama==0.3.9 fs==2.0.12 idna==2.6 jinja2==2.9.6 markupsafe==1.0 +mondrian==0.2.0 packaging==16.8 pbr==3.1.1 psutil==5.4.0 pyparsing==2.2.0 -python-dotenv==0.7.1 -pytz==2017.2 +pytz==2017.3 requests==2.18.4 six==1.11.0 stevedore==1.27.1 diff --git a/setup.py b/setup.py index 0c01b43..2b949c0 100644 --- a/setup.py +++ b/setup.py @@ -53,18 +53,17 @@ setup( packages=find_packages(exclude=['ez_setup', 'example', 'test']), include_package_data=True, install_requires=[ - 'colorama (>= 0.3, < 0.4)', 'fs (>= 2.0, < 2.1)', 'jinja2 (>= 2.9, < 2.10)', 'packaging (>= 16, < 17)', - 'psutil (>= 5.4, < 6.0)', 'python-dotenv (>= 0.7, < 0.8)', 'requests (>= 2.0, < 3.0)', - 'stevedore (>= 1.27, < 1.28)' + 'colorama (>= 0.3)', 'fs (>= 2.0, < 2.1)', 'jinja2 (>= 2.9, < 2.10)', 'mondrian (>= 0.2, < 0.3)', + 'packaging (>= 16, < 17)', 'psutil (>= 5.4, < 6.0)', 'requests (>= 2.0, < 3.0)', 'stevedore (>= 1.27, < 1.28)' ], extras_require={ 'dev': [ - 'cookiecutter (>= 1.5, < 1.6)', 'coverage (>= 4.4, < 5.0)', 'pytest (>= 3.1, < 4.0)', - 'pytest-cov (>= 2.5, < 3.0)', 'pytest-sugar (>= 0.8, < 0.9)', 'pytest-timeout (>= 1, < 2)', - 'sphinx (>= 1.6, < 2.0)' + 'coverage (>= 4.4, < 5.0)', 'pytest (>= 3.1, < 4.0)', 'pytest-cov (>= 2.5, < 3.0)', + 'pytest-sugar (>= 0.8, < 0.9)', 'pytest-timeout (>= 1, < 2)', 'sphinx (>= 1.6, < 2.0)', 'yapf' ], - 'docker': ['bonobo-docker'], - 'jupyter': ['ipywidgets (>= 6.0.0, < 7)', 'jupyter (>= 1.0, < 1.1)'] + 'docker': ['bonobo-docker (>= 0.5.0)'], + 'jupyter': ['ipywidgets (>= 6.0.0, < 7)', 'jupyter (>= 1.0, < 1.1)'], + 'sqlalchemy': ['bonobo-sqlalchemy (>= 0.5.1)'] }, entry_points={ 'bonobo.commands': [