Update dependencies, add sitemap.

This commit is contained in:
Romain Dorgueil
2017-12-08 07:59:15 +01:00
parent 3df81b4d35
commit 5490609ed5
9 changed files with 61 additions and 34 deletions

View File

@ -1,4 +1,4 @@
# Generated by Medikit 0.4a5 on 2017-10-30.
# Generated by Medikit 0.4.3 on 2017-12-08.
# All changes will be overriden.
PACKAGE ?= bonobo
@ -10,6 +10,7 @@ PYTHON_REQUIREMENTS_DEV_FILE ?= requirements-dev.txt
QUICK ?=
PIP ?= $(PYTHON_DIRNAME)/pip
PIP_INSTALL_OPTIONS ?=
VERSION ?= $(shell git describe 2>/dev/null || git rev-parse --short HEAD)
PYTEST ?= $(PYTHON_DIRNAME)/pytest
PYTEST_OPTIONS ?= --capture=no --cov=$(PACKAGE) --cov-report html
SPHINX_BUILD ?= $(PYTHON_DIRNAME)/sphinx-build
@ -18,9 +19,9 @@ SPHINX_SOURCEDIR ?= docs
SPHINX_BUILDDIR ?= $(SPHINX_SOURCEDIR)/_build
YAPF ?= $(PYTHON) -m yapf
YAPF_OPTIONS ?= -rip
VERSION ?= $(shell git describe 2>/dev/null || echo dev)
SPHINX_AUTOBUILD ?= $(PYTHON_DIRNAME)/sphinx-autobuild
.PHONY: $(SPHINX_SOURCEDIR) clean format install install-dev test update update-requirements
.PHONY: $(SPHINX_SOURCEDIR) clean format install install-dev test update update-requirements watch-$(SPHINX_SOURCEDIR)
# Installs the local project dependencies.
install:
@ -57,3 +58,6 @@ $(SPHINX_SOURCEDIR): install-dev
format: install-dev
$(YAPF) $(YAPF_OPTIONS) .
$(YAPF) $(YAPF_OPTIONS) Projectfile
watch-$(SPHINX_SOURCEDIR):
$(SPHINX_AUTOBUILD) $(SPHINX_SOURCEDIR) $(shell mktemp -d)

View File

@ -2,6 +2,7 @@
from medikit import require
make = require('make')
pytest = require('pytest')
python = require('python')
sphinx = require('sphinx')
@ -49,6 +50,7 @@ python.add_requirements(
'cookiecutter >=1.5,<1.6',
'pytest-sugar >=0.8,<0.9',
'pytest-timeout >=1,<2',
'sphinx-sitemap >=0.2,<0.3',
],
docker=[
'bonobo-docker',
@ -59,4 +61,11 @@ python.add_requirements(
]
)
@listen(make.on_generate)
def on_make_generate(event):
event.makefile['SPHINX_AUTOBUILD'] = '$(PYTHON_DIRNAME)/sphinx-autobuild'
event.makefile.add_target('watch-$(SPHINX_SOURCEDIR)', '''
$(SPHINX_AUTOBUILD) $(SPHINX_SOURCEDIR) $(shell mktemp -d)
''', phony=True)
# vim: ft=python:

View File

@ -9,6 +9,7 @@ dependencies:
- fs ==2.0.3
- psutil ==5.2.2
- requests ==2.13.0
- sphinx-sitemap==0.2
- stevedore ==1.21.0
# for examples
- pycountry ==17.9.23

View File

@ -20,8 +20,11 @@ extensions = [
'sphinx.ext.ifconfig',
'sphinx.ext.viewcode',
'sphinx.ext.graphviz',
'sphinx_sitemap',
]
site_url = 'http://docs.bonobo-project.org/en/master/'
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

View File

@ -1,34 +1,38 @@
-e .[dev]
alabaster==0.7.10
arrow==0.10.0
arrow==0.12.0
attrs==17.3.0
babel==2.5.1
binaryornot==0.4.4
certifi==2017.7.27.1
certifi==2017.11.5
chardet==3.0.4
click==6.7
cookiecutter==1.5.1
coverage==4.4.1
coverage==4.4.2
docutils==0.14
future==0.16.0
idna==2.6
imagesize==0.7.1
jinja2-time==0.2.0
jinja2==2.9.6
jinja2==2.10
markupsafe==1.0
pluggy==0.6.0
poyo==0.4.1
py==1.4.34
py==1.5.2
pygments==2.2.0
pytest-cov==2.5.1
pytest-sugar==0.8.0
pytest-timeout==1.2.0
pytest==3.2.3
pytest-timeout==1.2.1
pytest==3.3.1
python-dateutil==2.6.1
pytz==2017.2
pytz==2017.3
requests==2.18.4
six==1.11.0
snowballstemmer==1.2.1
sphinx-sitemap==0.2
sphinx==1.6.5
sphinxcontrib-websupport==1.0.1
termcolor==1.1.0
urllib3==1.22
whichcraft==0.4.1
yapf==0.20.0

View File

@ -1,22 +1,20 @@
-e .[docker]
appdirs==1.4.3
bonobo-docker==0.5.0
certifi==2017.7.27.1
certifi==2017.11.5
chardet==3.0.4
click==6.7
colorama==0.3.9
docker-pycreds==0.2.1
docker==2.3.0
fs==2.0.12
fs==2.0.17
idna==2.6
packaging==16.8
pbr==3.1.1
psutil==5.4.0
psutil==5.4.2
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
stevedore==1.28.0
urllib3==1.22
websocket-client==0.44.0

View File

@ -1,38 +1,38 @@
-e .[jupyter]
appnope==0.1.0
bleach==2.1.1
bleach==2.1.2
decorator==4.1.2
entrypoints==0.2.3
html5lib==0.999999999
ipykernel==4.6.1
html5lib==1.0.1
ipykernel==4.7.0
ipython-genutils==0.2.0
ipython==6.2.1
ipywidgets==6.0.1
jedi==0.11.0
jinja2==2.9.6
jinja2==2.10
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
mistune==0.8.3
nbconvert==5.3.1
nbformat==4.4.0
notebook==5.2.0
notebook==5.2.2
pandocfilters==1.4.2
parso==0.1.0
pexpect==4.2.1
pexpect==4.3.0
pickleshare==0.7.4
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
terminado==0.6
terminado==0.8.1
testpath==0.3.1
tornado==4.5.2
traitlets==4.3.2

View File

@ -1,16 +1,16 @@
-e .
appdirs==1.4.3
certifi==2017.7.27.1
certifi==2017.11.5
chardet==3.0.4
colorama==0.3.9
fs==2.0.12
fs==2.0.17
idna==2.6
packaging==16.8
pbr==3.1.1
psutil==5.4.0
psutil==5.4.2
pyparsing==2.2.0
pytz==2017.2
pytz==2017.3
requests==2.18.4
six==1.11.0
stevedore==1.27.1
stevedore==1.28.0
urllib3==1.22

View File

@ -43,6 +43,14 @@ else:
setup(
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'
]
)
],
description=('Bonobo, a simple, modern and atomic extract-transform-load toolkit for '
'python 3.5+.'),
license='Apache License, Version 2.0',
@ -60,7 +68,7 @@ setup(
'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)'
'sphinx (>= 1.6, < 2.0)', 'sphinx-sitemap (>= 0.2, < 0.3)', 'yapf'
],
'docker': ['bonobo-docker'],
'jupyter': ['ipywidgets (>= 6.0.0, < 7)', 'jupyter (>= 1.0, < 1.1)']